Commit Graph

157 Commits

Author SHA1 Message Date
Gav Wood
be5989f134 Implemented 256-long history for PREVHASH, though still optional. 2014-12-24 11:36:08 +01:00
Paweł Bylica
14a8cb34e3 Remove unnecessary changes 2014-12-19 14:38:03 +01:00
Paweł Bylica
35d8b94e73 Merge branch 'develop' into develop-evmcc
Conflicts:
	CMakeLists.txt
	alethzero/CMakeLists.txt
	eth/CMakeLists.txt
	exp/CMakeLists.txt
	libethereum/CMakeLists.txt
	neth/CMakeLists.txt
	test/CMakeLists.txt
	test/TestHelper.cpp
	windows/Eth.vcxproj
	windows/Ethereum.sln
	windows/LibEthereum.vcxproj
	windows/LibEthereum.vcxproj.filters
	windows/TestEthereum.vcxproj
	windows/TestEthereum.vcxproj.filters
	windows/bootstrap.sh
2014-12-18 19:08:04 +01:00
wanderer
9e7fcbb7bd append JSON objects to log 2014-12-16 14:28:28 -05:00
wanderer
35aa48567f using json_spirit 2014-12-16 14:28:28 -05:00
wanderer
ab5953b555 changed output stacktrace format to json 2014-12-16 14:28:28 -05:00
Paweł Bylica
59fe1fdf92 Merge commit '1b8f9fdc3b44503890ed1bcb5da8bd5cb8dd83a5' into develop-evmcc
Conflicts:
	test/TestHelper.cpp
2014-12-15 15:11:35 +01:00
CJentzsch
ba3d2b43ae Added recursive create test + lesser output for safe VM exceptions 2014-12-12 22:16:51 +01:00
Gav Wood
6b44029adc Beginnings of cleaning up the Executive/State code. 2014-12-12 15:53:57 +01:00
Paweł Bylica
49f995a890 Add "--jit" option to State tests 2014-12-12 11:54:44 +01:00
Paweł Bylica
0d7f0a01fd Merge remote-tracking branch 'origin/vm' into develop-evmcc 2014-12-12 09:51:49 +01:00
Paweł Bylica
6b8bc1669e Merge remote-tracking branch 'upstream/develop' into vm
Conflicts:
	libethereum/Executive.cpp
	libethereum/Executive.h
	libethereum/State.cpp
2014-12-11 20:39:48 +01:00
Gav Wood
1d879a9bb4 Remove extraneous old stuff for PoC-7.
Fix gas remaining issue.
2014-12-11 20:07:07 +01:00
Paweł Bylica
3ba2d4195f Merge remote-tracking branch 'origin/vm' into develop-evmcc
Conflicts:
	libethereum/Executive.cpp
	libethereum/Executive.h
	libethereum/State.cpp
	libevm/VM.cpp
	libevm/VM.h
	libevm/VMFace.h
	test/createRandomTest.cpp
	test/vm.cpp
	windows/LibEthereum.vcxproj.filters
2014-12-10 23:42:01 +01:00
Paweł Bylica
c1ffbbe797 VMFactory - a new way of creating VMs 2014-12-10 17:41:53 +01:00
Paweł Bylica
eafe303e08 Merge branch 'develop' into vm 2014-12-08 11:48:26 +01:00
CJentzsch
9101b7073a state log tests 2014-12-05 19:26:32 +01:00
Paweł Bylica
bb6fcfe3f9 Use safe pointers in Executive 2014-12-05 17:00:29 +01:00
Paweł Bylica
20b6b30b99 Merge branch 'develop' into develop-evmcc
Conflicts:
	libevm/VM.h
	test/createRandomTest.cpp
2014-12-05 09:24:47 +01:00
CJentzsch
b7601aee9f fix stackoverflow in calldataload, codecopy, extcodecopy + some tests 2014-12-04 17:55:04 +01:00
Gav Wood
2f5b9151d5 Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop
Conflicts:
	test/vm.cpp
2014-12-02 20:09:00 +01:00
Gav Wood
8d0a664740 PV46. Minor protocol alterations. 2014-12-02 17:13:17 +01:00
CJentzsch
fb7c3bb302 style
Conflicts:
	libevm/VM.h
2014-12-01 22:44:31 +01:00
CJentzsch
d952833c1b added logs to state tests 2014-12-01 22:41:16 +01:00
Artur Zawłocki
b78dc045f6 resolved circular dependency between libevm and libevmjit 2014-11-28 00:37:24 +01:00
Paweł Bylica
a5d0496ea4 Merge branch 'develop' into develop-evmcc
Conflicts:
	libevm/VM.h
	test/vm.cpp
2014-11-26 20:20:52 +01:00
Christoph Jentzsch
70a1f73047 style 2014-11-21 07:42:41 +01:00
Paweł Bylica
508d9f3b68 Do not catch OutOfGas exception in tests separately 2014-11-20 20:13:28 +01:00
Paweł Bylica
14366250c5 Merge branch 'develop' into develop-evmcc
Conflicts:
	test/vm.cpp
2014-11-20 17:15:43 +01:00
Christoph Jentzsch
dcc0361c7c Merge remote-tracking branch 'upstream/develop' into newTests
Conflicts:
	test/vm.cpp
2014-11-20 16:59:27 +01:00
Christoph Jentzsch
b1e26e28e3 Add Log tests 2014-11-19 14:30:42 +01:00
Paweł Bylica
7df5ec34c7 In VM tests, check only if an exception occurred if an exception expected (no post state and output checking) 2014-11-19 13:13:19 +01:00
Paweł Bylica
fda1fd586f Fix VM tester 2014-11-14 11:07:14 +01:00
Paweł Bylica
6d8de298ed Merge branch 'develop' into develop-evmcc
Conflicts:
	libdevcrypto/EC.cpp
	test/vm.cpp
2014-11-12 12:37:19 +01:00
Christoph Jentzsch
d3910593a0 All unintended VM exceptions work like OOG in tests 2014-11-10 22:26:07 +01:00
Christoph Jentzsch
9b14af5c15 build fix 2014-11-10 18:30:35 +01:00
Christoph Jentzsch
3c45877e2a added generic userDefinedTest function 2014-11-10 17:37:55 +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
Christoph Jentzsch
a6ba0f7908 style 2014-11-07 15:16:42 +01:00
Christoph Jentzsch
f88f5a7702 Merge remote-tracking branch 'upstream/develop' into StateBug 2014-11-07 13:42:44 +01:00
Christoph Jentzsch
ab3a1ec6ef Added random test execution 2014-11-07 13:29:13 +01:00
Paweł Bylica
6d2979ed5c Merge branch 'develop' into develop-evmcc
Conflicts:
	libevm/VM.h
	test/vm.cpp
2014-11-06 17:58:13 +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
139668dea4 style 2014-11-05 21:55:10 +01:00
Christoph Jentzsch
e53f831510 Added dynamic jump out of code test 2014-11-05 21:02:16 +01:00
Christoph Jentzsch
6b6bb65eb8 Update transactions, style fix 2014-11-05 18:30:38 +01:00
Christoph Jentzsch
26f4637205 Merge remote-tracking branch 'upstream/develop' into stateTests
Conflicts:
	test/state.cpp
	test/vm.cpp
2014-11-05 15:55:50 +01:00
Gav Wood
07ee2e4847 Classify Transaction. 2014-11-05 13:45:19 +00:00
Christoph Jentzsch
adaf26d9ca uncomment vmIOandFlowOPerations test 2014-11-05 00:12:29 +01:00