Commit Graph

9772 Commits

Author SHA1 Message Date
sveneh
8e9659752d Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into build_enhancement
Conflicts:
	windows/LibEthereum.vcxproj
	windows/LibEthereum.vcxproj.filters

Solved by removing files (not necessary anymore)
2014-12-12 23:42:28 +01:00
CJentzsch
ba3d2b43ae Added recursive create test + lesser output for safe VM exceptions 2014-12-12 22:16:51 +01:00
Gav Wood
dd309de94c Merge pull request #600 from CJentzsch/bugfix
set first 12 bytes to zero in ecrecover
2014-12-12 21:50:08 +01:00
CJentzsch
ab65cbb8be Merge remote-tracking branch 'upstream/develop' into bugfix
Conflicts:
	libevm/VM.h
2014-12-12 21:43:34 +01:00
CJentzsch
7f9f847c27 Fix import state for state tests
Conflicts:
	test/TestHelper.cpp
2014-12-12 21:21:18 +01:00
CJentzsch
fbcd86f484 Merge remote-tracking branch 'upstream/develop' into fixTest 2014-12-12 21:09:49 +01:00
CJentzsch
3a9837f7f2 include original trie test 2014-12-12 21:09:23 +01:00
CJentzsch
6c819747bc include original trie test 2014-12-12 21:07:47 +01:00
CJentzsch
bdb3a6d946 Merge remote-tracking branch 'upstream/develop' into fixTest
Conflicts:
	test/trie.cpp
2014-12-12 21:02:41 +01:00
Gav Wood
fe21a5c67e Style fix. 2014-12-12 20:49:28 +01:00
Gav Wood
def08a70c8 Merge pull request #594 from imapp-pl/tests
Test unexpected storage entries
2014-12-12 20:48:30 +01:00
Gav Wood
5ac816e5dd Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop 2014-12-12 20:45:09 +01:00
Christian
c0bba438b1 Calls to bare contracts. 2014-12-12 17:26:19 +01:00
Christian
6893d4d455 Merge remote-tracking branch 'ethereum/develop' into sol_swapConstants
Conflicts:
	test/solidityOptimizerTest.cpp
2014-12-12 17:22:45 +01:00
Christian
7d8ec26141 Merge remote-tracking branch 'ethereum/develop' into sol_swapConstants
Conflicts:
	test/solidityOptimizerTest.cpp
2014-12-12 17:22:45 +01:00
Gav Wood
2235f84aeb Cleanups. 2014-12-12 17:22:32 +01:00
chriseth
3860814fa0 Merge pull request #584 from chriseth/sol_strings
String types.
2014-12-12 17:14:43 +01:00
chriseth
1705ea1927 Merge pull request #584 from chriseth/sol_strings
String types.
2014-12-12 17:14:43 +01:00
Paweł Bylica
180b0fa9e3 Merge branch 'develop-evmcc' into pr-jit 2014-12-12 16:46:38 +01:00
Paweł Bylica
a9b5c1b9ca Merge remote-tracking branch 'upstream/develop' into develop-evmcc 2014-12-12 16:31:54 +01:00
Gav Wood
6b44029adc Beginnings of cleaning up the Executive/State code. 2014-12-12 15:53:57 +01:00
Gav Wood
696b5b3a49 Minor warning fix. 2014-12-12 15:44:18 +01:00
Gav Wood
80c1259239 Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop 2014-12-12 15:31:34 +01:00
Gav Wood
73a2647474 Fix tests. 2014-12-12 15:31:24 +01:00
Gav Wood
d420db9116 Merge pull request #583 from imapp-pl/vm
VM interface & factory
2014-12-12 14:58:50 +01:00
Gav Wood
c9ccbe2562 Reduce verbosity. 2014-12-12 13:35:05 +01:00
Marek Kotewicz
84b0fc08b7 jsonrpc _library -> _libraries 2014-12-12 13:13:29 +01:00
Marek Kotewicz
3fefc4df0b renamed _DIR -> _DIRS && _LIBRARY -> _LIBRARIES according to cmake guidelines 2014-12-12 12:01:32 +01:00
Paweł Bylica
49f995a890 Add "--jit" option to State tests 2014-12-12 11:54:44 +01:00
Marek Kotewicz
4fbf9105c3 Merge branch 'develop' into build_enhancement 2014-12-12 10:28:23 +01:00
Paweł Bylica
b0b14eca7f Merge remote-tracking branch 'upstream/develop' into develop-evmcc 2014-12-12 09:52:07 +01:00
Paweł Bylica
0d7f0a01fd Merge remote-tracking branch 'origin/vm' into develop-evmcc 2014-12-12 09:51:49 +01:00
CJentzsch
2a4e8228d7 efficiency, use reference instead of copy 2014-12-12 09:10:17 +01:00
CJentzsch
6a91ed0c1c remove permuatations in trietest (order is critical for test) 2014-12-12 09:05:39 +01:00
CJentzsch
473e10e0dc fix trie test# 2014-12-11 23:36:23 +01:00
Gav Wood
98722ae8e8 Whisper test fix. 2014-12-11 22:52:20 +01:00
Gav Wood
6e390ba059 Fix genesis test.
Refactor/cleaning.
2014-12-11 21:46:06 +01:00
Marek Kotewicz
6762c79745 Merge branch 'develop' into build_enhancement 2014-12-11 21:33:27 +01:00
Marek Kotewicz
b95fbab7c2 Merge branch 'develop' into build_enhancement 2014-12-11 21:33:27 +01:00
Paweł Bylica
8ada6f3cb9 Replace spaces with tabs 2014-12-11 20:46:05 +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
c044e1d1e9 Report wrong account address in case of unexpected storege key 2014-12-11 19:33:49 +01:00
Paweł Bylica
5d22ebe447 Test unexpected storage entries 2014-12-11 19:32:42 +01:00
Gav Wood
fee1a7f44c Fix for crazy compiler lambda behaviour. 2014-12-11 18:25:21 +01:00
Christian
e2547526ab Do not add at the end of the function selector "loop". 2014-12-11 17:48:44 +01:00
Christian
7ad8f94a7e Do not add at the end of the function selector "loop". 2014-12-11 17:48:44 +01:00
Christian
66d95abfd9 Swap literals to the end if optimizing. 2014-12-11 17:48:44 +01:00
Christian
c68d1c62e0 Swap literals to the end if optimizing. 2014-12-11 17:48:44 +01:00
chriseth
1db9bc1651 Whitespace change. 2014-12-11 17:04:26 +01:00