Commit Graph

394 Commits

Author SHA1 Message Date
Christoph Jentzsch
e53f831510 Added dynamic jump out of code test 2014-11-05 21:02:16 +01:00
Christoph Jentzsch
8e6bfb1fb3 Merge remote-tracking branch 'upstream/develop' into stateTests
Conflicts:
	test/vm.cpp
	test/vmArithmeticTestFiller.json
	test/vmSha3TestFiller.json
2014-11-05 20:24:26 +01:00
Christoph Jentzsch
1d156a5726 Moved code export to export function in ImportHelper 2014-11-05 20:21:33 +01:00
subtly
d59a648985 Merge branch 'develop' into crypto
Conflicts:
	test/crypto.cpp
2014-11-05 19:08:25 +01:00
Gav Wood
7586bd2761 Merge pull request #473 from CJentzsch/newTests
new tests + reorganization
2014-11-05 17:42:47 +00:00
Christoph Jentzsch
6b6bb65eb8 Update transactions, style fix 2014-11-05 18:30:38 +01:00
Christoph Jentzsch
b67ed5d065 remove vmSystemOperationsTest completely 2014-11-05 16:27:22 +01:00
subtly
90a0998968 Merge branch 'develop' into crypto 2014-11-05 16:11:06 +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
f8deb4b046 Transaction documentation and build fixes. 2014-11-05 14:32:23 +00:00
Gav Wood
d7da8b1aaa Documentation for Transaction. 2014-11-05 14:28:29 +00:00
Gav Wood
aa41f1c6f1 Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop 2014-11-05 13:48:23 +00:00
Gav Wood
07ee2e4847 Classify Transaction. 2014-11-05 13:45:19 +00:00
subtly
25811ce5ff Merge branch 'develop' into crypto 2014-11-05 14:15:06 +01:00
subtly
4aeeb68d77 coding standards, documentation, new exception syntax 2014-11-05 14:13:27 +01:00
subtly
127747fd4e Merge branch 'develop' into crypto 2014-11-05 13:30:58 +01:00
Christian
2432e2dbf3 Bugfix: Special case of statements starting with type conversion. 2014-11-05 07:35:31 +01:00
Christoph Jentzsch
adaf26d9ca uncomment vmIOandFlowOPerations test 2014-11-05 00:12:29 +01:00
Christoph Jentzsch
564764d5f7 Merge remote-tracking branch 'upstream/develop' into stateTests 2014-11-04 23:54:56 +01:00
Gav Wood
2d9771e4fe Merge pull request #465 from ethereum/bugfix
jsonrpc to run once, and only when jsonrpc test suite is invoked
2014-11-04 20:08:48 +00:00
Christoph Jentzsch
415a73f52b Merge remote-tracking branch 'upstream/develop' into newTests 2014-11-04 18:19:23 +01:00
subtly
838b6b4b44 coding standards. suite setup struct. 2014-11-04 15:24:02 +01:00
Gav Wood
b01be526db Merge pull request #468 from CJentzsch/bugfix
bugfix jumps after push
2014-11-04 13:29:40 +00:00
subtly
adc08af7c6 Merge branch 'develop' into bugfix 2014-11-04 13:46:33 +01:00
Christoph Jentzsch
37939c565d Merge pull request #454 from jorisbontje/423-dockerfile
update Dockerfile with cryptopp and jsonrpc dependencies, fixes #423

Cleaned up jsonrpc test

Forgot the #if

Undo jsonrpc test changes
2014-11-04 13:43:13 +01:00
Christoph Jentzsch
919d3c56eb # This is a combination of 2 commits.
# The first commit's message is:

Merge pull request #454 from jorisbontje/423-dockerfile

update Dockerfile with cryptopp and jsonrpc dependencies, fixes #423

Cleaned up jsonrpc test

# This is the 2nd commit message:

Forgot the #if
2014-11-04 13:43:04 +01:00
Christoph Jentzsch
3a5808c39f Update tests to latest protocol changes (PoC7) 2014-11-04 13:36:29 +01:00
subtly
2d7176b79c json rpc only runs once, and only when json rpc test suite is invoked 2014-11-04 10:56:22 +01:00
subtly
7562f8fff2 codereview fixes 2014-11-04 10:54:46 +01:00
subtly
2fe6c6c472 Merge branch 'crypto' into cryptable 2014-11-03 18:17:52 +01:00
subtly
9557fea39c Merge branch 'develop' into cryptable 2014-11-03 18:17:31 +01:00
Christoph Jentzsch
c931e3ceec style 2014-11-03 17:53:29 +01:00
Christoph Jentzsch
72c7132a3a Merge remote-tracking branch 'upstream/develop' into stateTests
Conflicts:
	test/vmBitwiseLogicOperationTestFiller.json
2014-11-03 16:34:40 +01:00
Christoph Jentzsch
6eeef2762c Clean up and organize tests + state class tests 2014-11-03 16:33:02 +01:00
Christian
47d37b12a3 Bugfix: Swap before mod and div. 2014-11-03 12:23:53 +01:00
subtly
af35240e37 Merge branch 'develop' into crypto 2014-11-03 01:35:29 +01:00
subtly
51fea10bbe Placeholder kdf. More cleanup and tests. 2014-11-02 04:41:16 +01:00
Marek Kotewicz
07d08e3af3 boost_auto_test_suite for jsonrpc && @brief description for WebThreeStubServer 2014-10-31 17:30:04 +01:00
Marek Kotewicz
f64c53ac62 Merge branch 'develop' into mk_jsonrpc 2014-10-31 17:13:32 +01:00
Marek Kotewicz
d645388fa9 fixed style issue 2014-10-31 17:13:06 +01:00
Gav Wood
882b8ad089 Big fixes. 2014-10-31 14:35:13 +01:00
chriseth
be45d11e4c Merge pull request #415 from chriseth/sol_expressionCompiler
Solidity expression compiler
2014-10-31 13:42:24 +01:00
Gav Wood
882ee7db3e Merge pull request #432 from CJentzsch/newTests
Added tests for SIGNEXTEND and BNOT
2014-10-31 13:12:25 +01:00
Marek Kotewicz
53b422c64a applied changes from ethereum.js 5538ff725235f30a9afbbedc098fd18dfd9f1293 2014-10-31 11:49:28 +01:00
Marek Kotewicz
57ef1fbd9b Merge branch 'develop' into mk_jsonrpc 2014-10-31 11:27:49 +01:00
Christoph Jentzsch
bc1aaa78a8 Merge remote-tracking branch 'upstream/develop' into stateTests
Conflicts:
	libethereum/AddressState.h
	test/vm.cpp
2014-10-31 09:46:20 +01:00
Christoph Jentzsch
3d17d7b2f1 Clean up FakeExtVM - move to state tests 2014-10-31 09:41:02 +01:00
Gav Wood
bf763824f3 Fix for Trie roots.
AddressState -> Account.
2014-10-30 13:47:28 +01:00
Marek Kotewicz
f301ee29f7 common changes 2014-10-30 13:06:45 +01:00
Marek Kotewicz
7aa61b8297 Merge branch 'develop' into mk_jsonrpc 2014-10-30 11:56:53 +01:00