Commit Graph

480 Commits

Author SHA1 Message Date
Marek Kotewicz
1c9bc82d88 Merge branch 'develop' into js_abi 2014-11-12 11:45:35 +01:00
Gav Wood
e4f4eaf7c8 Merge pull request #504 from CJentzsch/NewStateTests
All unintended VM exceptions work like OOG in tests
2014-11-11 10:57:47 +00:00
Gav Wood
a12aa613ca Make OOG on precompileds consistent.
Warning fix.
Use high-res clock for randoms.
Whisper test.
2014-11-11 10:54:48 +00:00
Marek Kotewicz
3b2a0063c0 contract create and contract call working 2014-11-11 09:06: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
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
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
Christoph Jentzsch
3c45877e2a added generic userDefinedTest function 2014-11-10 17:37:55 +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
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
34a01c5c30 Merge remote-tracking branch 'ethereum/develop' into sol_stateVariables
Conflicts:
	libsolidity/ExpressionCompiler.cpp
2014-11-10 00:45:58 +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
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
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
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
4fe64b22de Merge remote-tracking branch 'ethereum/develop' into sol_optimizer 2014-11-07 02:13:31 +01:00
Christian
d7f4e02dbd Evaluate expressions in convenient order. 2014-11-07 02:07:59 +01:00
Gav Wood
8eb6675bc6 Merge pull request #478 from chriseth/sol_typePromotion
Type promotion
2014-11-06 23:43:03 +00:00
Gav Wood
c5d0481836 Merge pull request #483 from chriseth/libevmcore
Moved instructions and assembly to new libevmcore.
2014-11-06 23:40:59 +00:00
Christian
1dfc8d9f2b Merge remote-tracking branch 'ethereum/develop' into sol_typePromotion 2014-11-06 22:07:02 +01:00
Christoph Jentzsch
e62f089a02 Merge remote-tracking branch 'upstream/develop' into NewStateTests 2014-11-06 17:47:13 +01:00
Christoph Jentzsch
a61bac692e Added precompiledContracts tests 2014-11-06 17:47:03 +01:00
Marek Kotewicz
543699df95 added eth_lll 2014-11-06 15:51:08 +01:00
Christian
26150755f6 Merge remote-tracking branch 'ethereum/develop' into sol_optimizer 2014-11-06 15:34:35 +01:00
Marek Kotewicz
7271412370 renaming calls to include a subprotocol prefix 2014-11-06 14:57:13 +01:00
Christian
34f16940ea Moved instructions and assembly to new libevmcore. 2014-11-06 14:50:18 +01:00
Christoph Jentzsch
85ded72014 Merge branch 'stateTests' into NewStateTests
Conflicts:
	test/TestHelper.cpp
	test/vm.cpp
2014-11-06 09:43:33 +01:00
Christoph Jentzsch
988ca7b6fc update SIGNEXTEND tests 2014-11-06 09:37:50 +01:00
Christian
008a91ca9d Ignore break and continue outside of loops. 2014-11-06 02:46:48 +01:00