Commit Graph

830 Commits

Author SHA1 Message Date
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
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
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
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
Christian
7ad8f94a7e Do not add at the end of the function selector "loop". 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
Christian
568babfb5f Some (few) tests for the optimizer. 2014-12-11 16:37:17 +01:00
Marek Kotewicz
bf8a6ed878 fixed styling issues 2014-12-11 15:06:11 +01:00
Christian
6dcb545cc8 Support empty strings. 2014-12-11 14:19:11 +01:00
Marek Kotewicz
6a666eed2f Merge branch 'macox_fixes' into build_enhancement
Conflicts:
	test/solidityNatspecJSON.cpp
2014-12-11 12:08:51 +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
chriseth
1d17d34979 Merge pull request #586 from LefterisJP/natspec_contract_tags
Natspec title and author tag.
2014-12-10 19:23:57 +01:00
Paweł Bylica
1d85b074c8 Merge remote-tracking branch 'upstream/develop' into vm 2014-12-10 17:44:10 +01:00
Paweł Bylica
c1ffbbe797 VMFactory - a new way of creating VMs 2014-12-10 17:41:53 +01:00
Christian
1a76615a87 Tests for empty and too long strings. 2014-12-10 17:15:10 +01:00
Christian
bf8ea705b8 String types. 2014-12-10 16:30:20 +01:00
Marek Kotewicz
2ec5b1770b Merge branch 'develop' into build_enhancement 2014-12-10 15:32:50 +01:00
chriseth
93722eab8a Merge pull request #582 from chriseth/sol_varSizeVariables
Variably sized elements on the stack
2014-12-10 14:49:12 +01:00
Lefteris Karapetsas
7724cf1f58 Natspec title and author tag.
- Adding the title and author natspec documentation tags for contracts
- Also using the author tag for functions now
- Tests
2014-12-10 13:24:48 +01:00
subtly
0e98fec278 fix for windows compliation (circular dependency between statics initialized dynamically and dynamically initialized statics) 2014-12-09 18:52:04 +01:00
Marek Kotewicz
5a5973fc24 empty sha test && common fix on mac 2014-12-09 16:54:05 +01:00
debris
1d8593a177 added curl libaries, which are required for testeth project 2014-12-09 13:08:02 +01:00
debris
4d00b3d6fe msvc changes in tests, but tests not yet working there 2014-12-09 00:58:02 +01:00
Christian
125e39dd01 Variable-size stack elements for expression compiler. 2014-12-08 22:26:22 +01:00
Christian
7be59036e5 Register variably-sized variables on stack. 2014-12-08 16:56:41 +01:00
Marek Kotewicz
889740217f Merge branch 'develop' into build_enhancement 2014-12-08 14:49:24 +01:00
subtly
8aba43c5e0 Merge branch 'develop' into network 2014-12-08 14:44:07 +01:00
subtly
6475a4ffb6 cryptopp crash w/null plaintext passed to decrypt 2014-12-08 14:41:04 +01:00