Commit Graph
5165 Commits
Author SHA1 Message Date
Gav Wood f98f77ec14 Merge pull request #1855 from imapp-pl/pr/cmake_runtime_output_directory
CMake: set default RUNTIME_OUTPUT_DIRECTORY property to "bin"
2015-05-13 00:55:38 +03:00
Gav Wood c600607eae Merge pull request #1829 from imapp-pl/pr/fix_singletest_option
testeth: fix --singletest option
2015-05-13 00:55:03 +03:00
Gav Wood 2087d3b6e3 Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop 2015-05-13 00:35:44 +03:00
Gav Wood a5fcf4ecd0 Extra diagnostics, assertions and fail-safes for tracking BadRoot bug. 2015-05-13 00:26:43 +03:00
chriseth da121c9a26 Reverse if and else body. 2015-05-12 17:50:51 +02:00
chriseth 43338fac9f Reverse if and else body. 2015-05-12 17:50:51 +02:00
chriseth 79f8a224ef Removed unnecessary include. 2015-05-12 17:00:23 +02:00
chriseth ca73a40170 Unify blocks with shared code. 2015-05-12 16:27:43 +02:00
chriseth ced4720faa Unify blocks with shared code. 2015-05-12 16:27:43 +02:00
chriseth b6bd56bccd Merge pull request #1864 from chriseth/sol_knowledgeEngine2
Transfer knowledge about the state across jumps.
2015-05-12 16:17:31 +02:00
Paweł Bylica 0785602ad5 Ping buildbot 2015-05-12 16:14:18 +02:00
Paweł Bylica 2a304c87a3 Merge remote-tracking branch 'upstream/develop' into evmjit-develop 2015-05-12 15:57:28 +02:00
Paweł Bylica d5841327a2 Merge remote-tracking branch 'upstream/develop' into feature/vm_gas_counter_refactor
Conflicts:
	evmjit/libevmjit-cpp/JitVM.cpp
	libevm/VMFactory.cpp
	libevm/VMFactory.h
2015-05-12 11:53:46 +02:00
chriseth 60d69c78f5 Fixed template problem. 2015-05-12 11:25:34 +02:00
Gav Wood fba1cc6e98 Merge pull request #1816 from LefterisJP/ethash_reloaded
Ethash reloaded
2015-05-12 12:20:49 +03:00
Gav Wood ae14cb9647 Merge pull request #1808 from imapp-pl/pr/evmjit
Smart VM
2015-05-12 12:10:39 +03:00
Lefteris Karapetsas 617dbcb9dd Merge branch 'develop' into ethash_reloaded 2015-05-12 10:58:19 +02:00
Paweł Bylica 2e169a9947 testeth: support for --singletest option with only test name param. 2015-05-12 09:37:39 +02:00
Marek Kotewicz 3b37952f2f Merge branch 'develop' into pr/cmake_runtime_output_directory 2015-05-12 09:00:49 +02:00
subtly f3acbcce2f Merge branch 'develop' into discovery 2015-05-12 02:04:59 +02:00
subtly 07df8175f0 Guard m_node.endpoint access and updates. 2015-05-12 02:03:36 +02:00
Vlad Gluhovsky e365643edc Fixed warning: unused parameter 2015-05-11 22:54:12 +02:00
Vlad Gluhovsky 6ebf0ffcd3 Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into develop 2015-05-11 22:29:12 +02:00
Gav Wood cf23eea716 Integrate KeyManager. 2015-05-11 21:21:00 +03:00
chriseth aafa354a95 Use returning erase variant. 2015-05-11 19:44:45 +02:00
Gav Wood df32882669 Merge pull request #1848 from debris/web3js
web3.js 0.3.6 - new ABI encoding implementation
2015-05-11 19:58:46 +03:00
Gav Wood ce8a0d7c87 Merge pull request #1858 from CJentzsch/adjustInputLimitsTests
reorganize input Limittests
2015-05-11 19:57:31 +03:00
subtly f9955c8ba1 Merge branch 'develop' into whisper 2015-05-11 17:40:01 +02:00
Paweł Bylica 976b64f660 Create symlink to old testeth location to make bildbot happy 2015-05-11 17:40:00 +02:00
Vlad Gluhovsky a4d4cf89da Coding Standards fix 2015-05-11 17:27:11 +02:00
Liana Husikyan 14b30c87ab Update SolidityABIJSON.cpp 2015-05-11 17:17:50 +02:00
Liana Husikyan 78a343d2ff updated unit test 2015-05-11 17:16:52 +02:00
Liana Husikyan 23925040a1 updated unit test 2015-05-11 17:16:52 +02:00
Liana Husikyan 342afb10d5 bug in abi. fixed external type for return parameters 2015-05-11 16:46:17 +02:00
Liana Husikyan ccc3d56542 bug in abi. fixed external type for return parameters 2015-05-11 16:46:17 +02:00
chriseth 54bc7dda53 Compute state intersection. 2015-05-11 16:40:28 +02:00
chriseth 2870281fe8 Compute state intersection. 2015-05-11 16:40:28 +02:00
CJentzsch 1532574367 add identity contract tests 2015-05-11 15:59:57 +02:00
Paweł Bylica 5c283ffeef Remove gas counter from interpreter VM. OnOp callback signature changed. 2015-05-11 15:47:34 +02:00
CJentzsch af9dbf9520 reorganize inout Limits tests 2015-05-11 14:26:27 +02:00
Paweł Bylica 504eff7cb3 Remove gas counter from VM interface (VMFace) 2015-05-11 14:07:27 +02:00
Vlad Gluhovsky 5249fa9d18 Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into develop 2015-05-11 12:57:56 +02:00
chriseth cc6647e671 Tests. 2015-05-11 12:56:40 +02:00
chriseth 2fbcb5b9c8 Store alternative stack locations during code generation. 2015-05-11 12:56:40 +02:00
chriseth 9d3f0de31b Reuse state during common subexpression elimination. 2015-05-11 12:56:40 +02:00
Vlad Gluhovsky 520dcc7e70 Coding Standards fix 2015-05-11 12:39:37 +02:00
chriseth 2cc62fbbfb Merge pull request #1831 from chriseth/sol_newABIEncoding
New ABI encoding for dynamic types.
2015-05-11 12:27:24 +02:00
chriseth 2bdbeaac9b Merge pull request #1831 from chriseth/sol_newABIEncoding
New ABI encoding for dynamic types.
2015-05-11 12:27:24 +02:00
Paweł Bylica b07331fbb3 CMake: set default RUNTIME_OUTPUT_DIRECTORY property to "bin"
This commit changes output directory for runtime components (executables and DLLs) to "bin" directory. That allows running executables on Windows without need of install step.

Closes ethereum/cpp-ethereum#1821
2015-05-11 11:47:29 +02:00
Lefteris Karapetsas b3a3b2f260 Merge branch 'develop' into ethash_reloaded 2015-05-11 11:06:00 +02:00