Commit Graph

20188 Commits

Author SHA1 Message Date
Marek Kotewicz
c3e80e69f9 Merge branch 'develop' into js_abi
Conflicts:
	libjsqrc/main.js
	libweb3jsonrpc/WebThreeStubServer.cpp
	libweb3jsonrpc/WebThreeStubServer.h
	libweb3jsonrpc/abstractwebthreestubserver.h
	libweb3jsonrpc/spec.json
	test/webthreestubclient.h
2014-11-10 23:04:35 +01:00
Marek Kotewicz
af5b12b249 Merge branch 'develop' into js_abi
Conflicts:
	libjsqrc/main.js
	libweb3jsonrpc/WebThreeStubServer.cpp
	libweb3jsonrpc/WebThreeStubServer.h
	libweb3jsonrpc/abstractwebthreestubserver.h
	libweb3jsonrpc/spec.json
	test/webthreestubclient.h
2014-11-10 23:04:35 +01:00
Marek Kotewicz
a44bd8c987 merge 2014-11-10 22:51:10 +01:00
Marek Kotewicz
5a3a5b9abc merge 2014-11-10 22:51:10 +01:00
Marek Kotewicz
4309464384 merge 2014-11-10 22:51:10 +01:00
Christoph Jentzsch
5654600311 Merge remote-tracking branch 'upstream/develop' into NewStateTests 2014-11-10 22:26:29 +01:00
Christoph Jentzsch
d3910593a0 All unintended VM exceptions work like OOG in tests 2014-11-10 22:26:07 +01:00
Marek Kotewicz
96292f9199 js abi connection 2014-11-10 21:32:13 +01:00
sveneh
c492df94fb compiles fine now (on Linux) with both cryptopp and json-rpc-cpp dependencies 2014-11-10 20:31:15 +01:00
Gav Wood
4c05e6c967 Merge pull request #499 from CJentzsch/NewStateTests
New state tests, precompiled contracts tests and user defined tests
2014-11-10 17:34:01 +00:00
Gav Wood
0ae55a16a9 Merge pull request #486 from chriseth/sol_optimizer
Fix and activate optimizer for Solidity, add some new rules.
2014-11-10 17:31:18 +00:00
Christoph Jentzsch
9b14af5c15 build fix 2014-11-10 18:30:35 +01:00
Gav Wood
c153afafbf Merge pull request #482 from ethereum/jsonrpc_interface
renaming calls to include a subprotocol prefix
2014-11-10 17:28:47 +00:00
Christian
f0dd0d797e Allow void return type. 2014-11-10 18:08:26 +01:00
Christoph Jentzsch
3c45877e2a added generic userDefinedTest function 2014-11-10 17:37:55 +01:00
Christian
315223fc41 Tests on ranges of input data. 2014-11-10 15:38:06 +01:00
Christian
a0c72065fe Merge remote-tracking branch 'ethereum/develop' into sol_optimizer
Conflicts:
	libevmcore/Instruction.cpp
2014-11-10 13:30:59 +01:00
Christian
3fbe72cc47 Merge remote-tracking branch 'ethereum/develop' into sol_optimizer
Conflicts:
	libevmcore/Instruction.cpp
2014-11-10 13:30:59 +01:00
Christian
41b26e491b Replace function selector jump table by more resilient linear time check. 2014-11-10 13:13:53 +01:00
Christian
3a016ea0b4 Replace function selector jump table by more resilient linear time check. 2014-11-10 13:13:53 +01:00
Gav Wood
d9822190c6 Merge pull request #498 from ethereum/solidity_cmake
add headers to solidity's add_library
2014-11-10 11:57:29 +00:00
Gav Wood
16007bd191 Merge pull request #494 from chriseth/sol_stateVariables
State variables for Solidity
2014-11-10 11:57:01 +00:00
Gav Wood
af4f3e1eff Merge pull request #488 from LefterisJP/develop
solidity endToEnd testing gets equivalent CPP contracts
2014-11-10 11:56:09 +00:00
Christoph Jentzsch
99c3957eca undefine FILL_TESTS 2014-11-10 07:30:56 +01:00
Christoph Jentzsch
43bab79fbc Merge remote-tracking branch 'upstream/develop' into NewStateTests
Conflicts:
	test/state.cpp
	test/tmpFiller.json
2014-11-10 07:15:27 +01:00
Christoph Jentzsch
b4d8ff5fdc specified user defined test 2014-11-10 07:12:29 +01:00
Christian
5af66a6cb3 Merge remote-tracking branch 'ethereum/develop' into sol_stateVariables
Conflicts:
	libsolidity/ExpressionCompiler.cpp
2014-11-10 00:45:58 +01:00
Christian
34a01c5c30 Merge remote-tracking branch 'ethereum/develop' into sol_stateVariables
Conflicts:
	libsolidity/ExpressionCompiler.cpp
2014-11-10 00:45:58 +01:00
Christian
91f9a7b7c4 Do not return after throw. 2014-11-10 00:42:12 +01:00
Lefteris Karapetsas
e75bf22733 style fixes 2014-11-09 13:22:47 +01:00
Lefteris Karapetsas
39f90683e3 solidity endToEnd testing gets equivalent CPP contracts
- Just testing the waters of our codebase by introducing C++
  version of the contract functions in the end to end solidity tests

- This way there is no need to check for some specific output but
  instead strive for consistency between the C++ and solidity code.
2014-11-09 13:05:19 +01:00
Marek Kotewicz
f2649a2cf5 Merge branch 'develop' into jsonrpc_interface 2014-11-08 23:52:20 +01:00
Marek Kotewicz
d6e7b82d3c add headers to solidity's add_library 2014-11-08 23:48:24 +01:00
Gav Wood
215e9e2657 Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop 2014-11-08 18:14:36 +00:00
Gav Wood
c447914a0b Merge pull request #490 from CJentzsch/StateBug
Quick fix for OOG in deep calls
2014-11-08 18:11:46 +00:00
Gav Wood
dded93e31d Merge pull request #487 from chriseth/sol_arbitraryEvaluationOrder
Evaluate expressions in convenient order.
2014-11-08 18:10:18 +00:00
Gav Wood
6c6cf8d01c Merge pull request #487 from chriseth/sol_arbitraryEvaluationOrder
Evaluate expressions in convenient order.
2014-11-08 18:10:18 +00:00
Christian
1b1b72046b State variables. 2014-11-07 20:02:57 +01:00
Christian
64a4d77c8b State variables. 2014-11-07 20:02:57 +01:00
Christian
4c8e670530 Bugfix: Bit width of address types. 2014-11-07 17:34:50 +01:00
Marek Kotewicz
3f15425277 Merge branch 'develop' into jsonrpc_interface 2014-11-07 17:29:30 +01:00
Christoph Jentzsch
a6ba0f7908 style 2014-11-07 15:16:42 +01:00
Gav Wood
8be49ae288 Fixes for warnings. Take note. 2014-11-07 13:50:51 +00:00
Christoph Jentzsch
dbcce8b7b9 Clean up state tests 2014-11-07 14:10:00 +01:00
Christoph Jentzsch
f88f5a7702 Merge remote-tracking branch 'upstream/develop' into StateBug 2014-11-07 13:42:44 +01:00
Christoph Jentzsch
a77d78d994 Merge remote-tracking branch 'upstream/develop' into NewStateTests 2014-11-07 13:29:33 +01:00
Christoph Jentzsch
ab3a1ec6ef Added random test execution 2014-11-07 13:29:13 +01:00
Marek Kotewicz
5a0f9a35c1 small fix in solidityCompiler 2014-11-07 13:22:45 +01:00
Christian
dc8fb45e1f Merge remote-tracking branch 'ethereum/develop' into sol_optimizer 2014-11-07 02:13:31 +01:00
Christian
4fe64b22de Merge remote-tracking branch 'ethereum/develop' into sol_optimizer 2014-11-07 02:13:31 +01:00