Commit Graph

326 Commits

Author SHA1 Message Date
Marek Kotewicz
d645388fa9 fixed style issue 2014-10-31 17:13:06 +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
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
Gav Wood
5110ffe304 Merge pull request #442 from chriseth/sol_fix_break
Parser fix: Consume break and continue.
2014-10-29 19:07:39 +01:00
Gav Wood
4c895be53f Merge pull request #434 from CJentzsch/vmtraceBugFix
Vmtrace bug fix
2014-10-29 19:06:54 +01:00
Christian
3f4befd6b4 Parser fix: Consume break and continue. 2014-10-29 13:00:22 +01:00
Marek Kotewicz
48f6b4a8c6 whisper polling, not finished 2014-10-29 11:42:15 +01:00
Marek Kotewicz
59b3f48637 Merge branch 'develop' into mk_jsonrpc 2014-10-28 17:16:21 +01:00
Paweł Bylica
cacc4477bf Fix VM test code loading conditions 2014-10-28 16:26:33 +01:00
Marek Kotewicz
45f271a394 Merge branch 'develop' into mk_jsonrpc
Conflicts:
	libevm/VM.h
	libqethereum/QEthereum.h
2014-10-28 15:16:57 +01:00
Marek Kotewicz
7f0440e710 whisper in web3jsonrpc 2014-10-28 13:25:31 +01:00
Christoph Jentzsch
3381372200 merge 2014-10-28 12:17:53 +01:00
Christoph Jentzsch
01e9cf0cad Fixed storage output in VMTRACE for vm tests 2014-10-28 12:11:52 +01:00
Marek Kotewicz
79bb03513b ldb access from api 2014-10-28 11:39:55 +01:00
Christoph Jentzsch
6b4d35259a Added tests for SIGNEXTEND and BNOT 2014-10-28 08:50:05 +01:00
Christoph Jentzsch
a54c3ae704 Merge remote-tracking branch 'upstream/develop' into newTests
Conflicts:
	test/vm.cpp
	test/vm.h
2014-10-28 07:28:05 +01:00
Gav Wood
f59a8f5824 Merge pull request #428 from CJentzsch/useETHEREUM_TEST_PATH
use ETHEREUM_TEST_PATH in all tests
2014-10-28 03:41:27 +01:00
Christoph Jentzsch
f1f8e2632d Update vm.h 2014-10-27 22:33:50 +01:00
Christoph Jentzsch
a0cfe7aeef Update vm.cpp 2014-10-27 22:33:23 +01:00
Christoph Jentzsch
8f05f86e16 Merge remote-tracking branch 'upstream/develop' into vmtrace 2014-10-27 22:21:46 +01:00
Christoph Jentzsch
7a3517ed3a log VMTRACE in file for user defined test 2014-10-27 22:21:30 +01:00
Gav Wood
0006d8fefa Draft of new LOG/bloom/headers/block format. 2014-10-27 20:26:34 +01:00
Christoph Jentzsch
6d1c06a719 VMTRACE for internal calls
Conflicts:
	test/vm.cpp
2014-10-27 19:01:10 +01:00
Christoph Jentzsch
1905208649 Add VMTRACE to user defined vm test
Conflicts:
	test/vm.cpp
2014-10-27 18:59:42 +01:00
Christoph Jentzsch
88cb7f5c8b Merge remote-tracking branch 'upstream/develop' into newTests
Conflicts:
	libevm/VM.h
	libevmface/Instruction.h
	test/vm.cpp
2014-10-27 18:29:30 +01:00
Christoph Jentzsch
0a3b337be5 use ETHEREUM_TEST_PATH in all tests 2014-10-27 17:30:27 +01:00
Christoph Jentzsch
f6e60137e9 bugfix 2014-10-27 17:23:17 +01:00
Marek Kotewicz
c30ce74fe0 missing setDefaultBlock method 2014-10-27 17:06:14 +01:00
Marek Kotewicz
f87714cf23 Merge branch 'develop' into mk_jsonrpc
Conflicts:
	alethzero/MainWin.cpp
	alethzero/MainWin.h
	libqethereum/QEthereum.cpp
	libqethereum/QEthereum.h
	third/MainWin.cpp
	third/MainWin.h
2014-10-27 17:05:31 +01:00
Christoph Jentzsch
fb21574455 use ETHEREUM_TEST_PATH in all tests 2014-10-27 17:04:18 +01:00
Gav Wood
dba99342ba Move suicides into SubState and include logs and refunds.
Refund gas from zero-resetting SSTOREs.
2014-10-27 16:32:53 +01:00
Gav Wood
ed7a56cc16 PoC-7: Reversion of 0-hashes, empty-list hashes and sha3('') -> '' 2014-10-27 14:13:16 +01:00
Christoph Jentzsch
b69cc9815f VMTRACE for internal calls 2014-10-27 13:54:59 +01:00
Christoph Jentzsch
4651b9f3a7 Add VMTRACE to user defined vm test 2014-10-27 12:45:29 +01:00
Marek Kotewicz
7ca5c65731 common changes in tests 2014-10-27 10:31:49 +01:00
Marek Kotewicz
e262ebf496 Merge branch 'develop' into mk_jsonrpc 2014-10-24 17:00:29 +02:00
Marek Kotewicz
ac3ac9095a checked headless builds with and without jsonrpc 2014-10-24 16:14:00 +02:00
Gav Wood
08c45c85b4 Merge pull request #412 from CJentzsch/newTests
New vm tests
2014-10-24 15:12:35 +02:00
Marek Kotewicz
b072b8687a ethrpc -> web3jsonrpc, other issues fixed 2014-10-24 14:21:20 +02:00
subtly
9a6b5fd613 style. remove unused code. 2014-10-23 22:12:47 +02:00
subtly
1c8ef38124 coding standards 2014-10-23 21:59:05 +02:00
subtly
f02987e219 remove irrelevant test code 2014-10-23 19:25:12 +02:00
subtly
2b66efb72d cleanup more headers 2014-10-23 19:19:02 +02:00
Marek Kotewicz
5bedf3c21f Merge branch 'develop' into mk_jsonrpc 2014-10-23 19:08:45 +02:00
subtly
5d74c0edb9 Merge branch 'develop' into crypto 2014-10-23 19:07:19 +02:00
subtly
ee062e564b add ecies encrypt/decrypt support to common crypto 2014-10-23 19:06:31 +02:00
Christoph Jentzsch
a203fb7ae8 merge 2014-10-23 18:58:59 +02:00