Commit Graph

4215 Commits

Author SHA1 Message Date
Christian
d706631412 NEG->BNOT change 2014-10-29 14:26:37 +01:00
Christian
01224287f5 NEG->BNOT change 2014-10-29 14:26:37 +01:00
Christian
f6fabb268b Merge remote-tracking branch 'ethereum/develop' into sol_contractCompiler
Conflicts:
	libsolidity/Types.cpp
2014-10-29 13:54:36 +01:00
Christian
9eacf5737f Merge remote-tracking branch 'ethereum/develop' into sol_contractCompiler
Conflicts:
	libsolidity/Types.cpp
2014-10-29 13:54:36 +01:00
Christian
413b315a03 Merge remote-tracking branch 'ethereum/develop' into sol_contractCompiler
Conflicts:
	libsolidity/Types.cpp
2014-10-29 13:54:36 +01:00
Christian
2939b180ba Parser fix: Consume break and continue. 2014-10-29 13:00:22 +01:00
Christian
3f4befd6b4 Parser fix: Consume break and continue. 2014-10-29 13:00:22 +01:00
artur-zawlocki
ec9330609f Merge branch 'develop-evmcc' of github.com:imapp-pl/ethereum into develop-evmcc
Conflicts:
	test/vm.cpp
2014-10-29 11:02:37 +00:00
Marek Kotewicz
48f6b4a8c6 whisper polling, not finished 2014-10-29 11:42:15 +01:00
artur-zawlocki
621d7fa4b0 MULMOD/ADDMOD implemented in separate functions [FIXES #80566276] 2014-10-29 10:29:34 +00:00
Paweł Bylica
f73a461e13 Expose VM kind setting of State in FakeExtVM
This reverts commit 6ad065bb3e30b5e67283f70e84ac55368e843e6a.
2014-10-29 10:23:17 +01:00
subtly
3c98874b97 Merge branch 'develop' into crypto 2014-10-29 02:44:30 +01:00
Paweł Bylica
878c41b3e3 Merge branch 'develop' into develop-evmcc
Conflicts:
	libevm/VM.h
2014-10-28 17:41:18 +01:00
Marek Kotewicz
59b3f48637 Merge branch 'develop' into mk_jsonrpc 2014-10-28 17:16:21 +01:00
Christian
eb254f6fdf Adjustments for the NEG->BNOT change. 2014-10-28 17:09:06 +01:00
Christian
f91ddc2788 Adjustments for the NEG->BNOT change. 2014-10-28 17:09:06 +01:00
Christian
bb2b4ed3a3 Merge remote-tracking branch 'ethereum/develop' into sol_expressionCompiler
Conflicts:
	libsolidity/Types.cpp
2014-10-28 17:01:04 +01:00
Christian
d2a474f7fa Merge remote-tracking branch 'ethereum/develop' into sol_expressionCompiler
Conflicts:
	libsolidity/Types.cpp
2014-10-28 17:01:04 +01:00
Christian
2541a403c3 Merge remote-tracking branch 'ethereum/develop' into sol_expressionCompiler
Conflicts:
	libsolidity/Types.cpp
2014-10-28 17:01:04 +01:00
Christian
28ef0f0f1e Forgot some asterisks. 2014-10-28 16:57:20 +01:00
Christian
7bb3311be6 Forgot some asterisks. 2014-10-28 16:57:20 +01:00
Christian
3306835c9d Asterisk-syntax for doxygen class documentation. 2014-10-28 16:51:26 +01:00
Christian
933fbd7d60 Asterisk-syntax for doxygen class documentation. 2014-10-28 16:51:26 +01:00
Paweł Bylica
cacc4477bf Fix VM test code loading conditions 2014-10-28 16:26:33 +01:00
subtly
0466f758dd Merge branch 'develop' into crypto 2014-10-28 16:23:34 +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
Paweł Bylica
f8c396c4c1 Merge branch 'develop' into develop-evmcc
Conflicts:
	libevm/ExtVMFace.h
	libevm/VM.h
	test/vm.cpp
	test/vm.h
	windows/LibEthereum.vcxproj.filters
2014-10-28 12:26:45 +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
Christian
fae8ca001e Stylistic corrections. 2014-10-28 09:25:01 +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
subtly
fb5248b27c Merge branch 'develop' into crypto 2014-10-27 17:41:25 +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
subtly
8dec48b6a3 Require secret for hmac. 2014-10-27 17:21:01 +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