From 9d50cc774e07b506cf1bda4bb15e1ed74bf2efd5 Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Mon, 18 Apr 2016 21:18:34 +0000 Subject: [PATCH 01/76] updated submodules --- webthree-helpers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webthree-helpers b/webthree-helpers index f37cc061d..cd4121e00 160000 --- a/webthree-helpers +++ b/webthree-helpers @@ -1 +1 @@ -Subproject commit f37cc061d7004c7e69d2fc39f76651900edc3d78 +Subproject commit cd4121e007b7b94c561db5e112d19bf9a5f8687f From 8c21d609db8c29560736957b534dffbe0fe91ea7 Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Tue, 19 Apr 2016 13:10:07 +0000 Subject: [PATCH 02/76] updated submodules --- webthree-helpers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webthree-helpers b/webthree-helpers index cd4121e00..e833e093d 160000 --- a/webthree-helpers +++ b/webthree-helpers @@ -1 +1 @@ -Subproject commit cd4121e007b7b94c561db5e112d19bf9a5f8687f +Subproject commit e833e093d0ea2c64e6647ebdad4c186ba660610d From 68bf1a340c9654f1b7833ad44c7a6a78840a38b1 Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Tue, 19 Apr 2016 13:27:31 +0000 Subject: [PATCH 03/76] updated submodules --- libethereum | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libethereum b/libethereum index 4b55bf902..ec8ced98c 160000 --- a/libethereum +++ b/libethereum @@ -1 +1 @@ -Subproject commit 4b55bf902e2b5bc3e826e261099c2a4f52c3ef4d +Subproject commit ec8ced98c89235e6cc31985a0c38765258273e9b From de6a84070c2cd0f6cf6999ad83f9b94700eb5e9e Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Thu, 21 Apr 2016 03:23:30 +0000 Subject: [PATCH 04/76] updated submodules --- webthree-helpers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webthree-helpers b/webthree-helpers index e833e093d..e80b8fada 160000 --- a/webthree-helpers +++ b/webthree-helpers @@ -1 +1 @@ -Subproject commit e833e093d0ea2c64e6647ebdad4c186ba660610d +Subproject commit e80b8fada5d5e0321cd49b9cbd622f5e1cc89e1d From 7a70f0d38a4fe06d1cddd7d1d579882ecf2d80b9 Mon Sep 17 00:00:00 2001 From: Bob Summerwill Date: Thu, 21 Apr 2016 12:31:41 -0700 Subject: [PATCH 05/76] Dependency graph updated to reflect Mix to Mix-ide module renaming. --- dependency_graph/generate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency_graph/generate.py b/dependency_graph/generate.py index 2ca3f74bb..08da2499f 100755 --- a/dependency_graph/generate.py +++ b/dependency_graph/generate.py @@ -99,7 +99,7 @@ def processSubmodule(root, submodule): # Mix doesn't have the same sub-module structure as everything else if (submodule == "mix"): - print 'Mix\n' + print '"Mix-ide"\n' else: print getLibraryAndApplicationNames(submodulePath) From 4d2e1f8dcbe27e7400fae236a3ddf3b465142104 Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Fri, 22 Apr 2016 03:25:54 +0000 Subject: [PATCH 06/76] updated submodules --- alethzero | 2 +- libethereum | 2 +- webthree | 2 +- webthree-helpers | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/alethzero b/alethzero index 0e65260c8..860ca2b1b 160000 --- a/alethzero +++ b/alethzero @@ -1 +1 @@ -Subproject commit 0e65260c86c66a04dd97f80940850f63bce9e35e +Subproject commit 860ca2b1b907f630a912bdf5269fb140fc026d28 diff --git a/libethereum b/libethereum index ec8ced98c..3daea1940 160000 --- a/libethereum +++ b/libethereum @@ -1 +1 @@ -Subproject commit ec8ced98c89235e6cc31985a0c38765258273e9b +Subproject commit 3daea1940c0a3506eefebefe2c07568bf67f951c diff --git a/webthree b/webthree index 240a3aa7a..ea16732f1 160000 --- a/webthree +++ b/webthree @@ -1 +1 @@ -Subproject commit 240a3aa7af4d55f6551099583b74ac6fc557f65e +Subproject commit ea16732f1f849a8b43188f39ae7c705e2fe3abae diff --git a/webthree-helpers b/webthree-helpers index e80b8fada..9dfd29291 160000 --- a/webthree-helpers +++ b/webthree-helpers @@ -1 +1 @@ -Subproject commit e80b8fada5d5e0321cd49b9cbd622f5e1cc89e1d +Subproject commit 9dfd29291aabc562c903abdd94f648d273b2d149 From c2665f4dfa84b5339c13e296ae84bdc2eac75407 Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Fri, 22 Apr 2016 19:20:03 +0000 Subject: [PATCH 07/76] updated submodules --- libethereum | 2 +- solidity | 2 +- webthree-helpers | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libethereum b/libethereum index 3daea1940..93039abf7 160000 --- a/libethereum +++ b/libethereum @@ -1 +1 @@ -Subproject commit 3daea1940c0a3506eefebefe2c07568bf67f951c +Subproject commit 93039abf7daabbd25f33d9a4c1dba42ffd0740c9 diff --git a/solidity b/solidity index 81ae2a783..dd4300d5b 160000 --- a/solidity +++ b/solidity @@ -1 +1 @@ -Subproject commit 81ae2a78321fddcd2d32efc51568ebeca28866a8 +Subproject commit dd4300d5b83fa16c36970ed2dd04aeec70c7b5ef diff --git a/webthree-helpers b/webthree-helpers index 9dfd29291..36d6221c3 160000 --- a/webthree-helpers +++ b/webthree-helpers @@ -1 +1 @@ -Subproject commit 9dfd29291aabc562c903abdd94f648d273b2d149 +Subproject commit 36d6221c31be72ecf9b136e7c11c9ca5e0ecffd6 From 71619ca7a0a5703bb3d456ad0448ef7cbd1a3d35 Mon Sep 17 00:00:00 2001 From: Bob Summerwill Date: Sat, 23 Apr 2016 19:07:28 -0700 Subject: [PATCH 08/76] I would like to recommend that we change three elements of our coding standard, which in my experience are rather poor recommendations. 1. Using tabs for formatting. While this can be quite a religious issue, in my experience FORCING the use of tabs is a very poor practice, which causes lots of unnecessary work and problems. Most software engineers work on multiple projects, with multiple editors and tools, across multiple operating systems. The typical "well, just set up your tabs correctly in your editor" advice is inadequate and making the assumption that engineers are not switching between projects which likely have different standards. Being reliant on some definition of "what a tab means" ends up impacting every diff tool and every editor for every team member. Spaces just work everywhere. I have had negative feedback from engineers outside our team on this exact point, and I agree with them 100%. So does Greg. Having this as a GOLDEN RULE for our coding standard casts a very poor light on the standard. I think we should change it. We don't need to "fix" all the code immediately. 2. Explicitly listing authors and maintainers PER FILE is unnecessary and egotistical. It is a maintenance issue as well. We should stop doing this, except where maintaining existing author information, or author information from files copied from other projects. 3. Leading underscores are, I believe, reserved for compiler and library authors. Also, there should be no need for any prefixing if we are "m_" prefixing member variables - the most common source of naming clash. --- CodingStandards.txt | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/CodingStandards.txt b/CodingStandards.txt index 9e4765355..1725a1f65 100644 --- a/CodingStandards.txt +++ b/CodingStandards.txt @@ -1,11 +1,9 @@ 0. Formatting +GOLDEN RULE: Follow the style of the existing code when you make changes. -GOLDEN RULE: Never *ever* use spaces for formatting. - -a. Use tabs for indentation! -- tab stops are every 4 characters. -- One indentation level -> exactly one byte (i.e. a tab character) in the source file. +a. Prefer spaces for indentation, because they work the same for all editors and tools. +- indent with multiples of 4 characters - Never use spaces to line up sequential lines: If you have run-on lines, indent as you would for a block. b. Line widths: - Don't worry about having lines of code > 80-char wide. @@ -60,8 +58,6 @@ std::tuple meanAndSigma(std::vector const& _v); 2. Preprocessor; a. File comment is always at top, and includes: -- Original author, date. -- Later maintainers (not contributors - they can be seen through VCS log). - Copyright. - License (e.g. see COPYING). b. Never use #ifdef/#define/#endif file guards. Prefer #pragma once as first line below file comment. @@ -90,9 +86,7 @@ All other entities' first alpha is lower case. 4. Variable prefixes: -a. Leading underscore "_" to parameter names (both normal and template). -- Exception: "o_parameterName" when it is used exclusively for output. See 6(f). -- Exception: "io_parameterName" when it is used for both input and output. See 6(f). +a. Parameter names should have no prefixes. b. Leading "c_" to const variables (unless part of an external API). c. Leading "g_" to global (non-const) variables. d. Leading "s_" to static (non-const, non-global) variables. @@ -179,7 +173,7 @@ a. Collection conventions: b. Class conventions: - -Face means the interface of some shared concept. (e.g. FooFace might be a pure virtual class.) c. Avoid unpronouncable names; -- If you need to shorten a name favour a pronouncable slice of the original to a scatterred set of consonants. +- If you need to shorten a name favour a pronouncable slice of the original to a scattered set of consonants. - e.g. Manager shortens to Man rather than Mgr. d. Avoid prefixes of initials (e.g. DON'T use IMyInterface, CMyImplementation) e. Find short, memorable & (at least semi-) descriptive names for commonly used classes or name-fragments. @@ -201,6 +195,7 @@ c. Where there are exceptions to this (due to excessive use and clear meaning), d. In general expressions should be roughly as important/semantically meaningful as the space they occupy. + 11. Commenting a. Comments should be doxygen-compilable, using @notation rather than \notation. @@ -228,6 +223,8 @@ a. Includes should go in order of lower level (STL -> boost -> libdevcore -> lib b. The only exception to the above rule is the top of a .cpp file where its corresponding header should be located. + + 13. Logging Logging should be performed at appropriate verbosities depending on the logging message. @@ -239,3 +236,14 @@ Some rules to keep in mind: - Verbosity >= 2 -> Anything that is or might be displayed more than once every minute - Verbosity >= 3 -> Anything that only a developer would understand - Verbosity >= 4 -> Anything that is low-level (e.g. peer disconnects, timers being cancelled) + + +14. Recommended reading + +Herb Sutter and Andrei Alexandrescu +- "C++ Coding Standards: 101 Rules, Guidelines, and Best Practices" + +Scott Meyers +- "Effective C++: 55 Specific Ways to Improve Your Programs and Designs (3rd Edition)" +- "More Effective C++: 35 New Ways to Improve Your Programs and Designs" +- "Effective Modern C++: 42 Specific Ways to Improve Your Use of C++11 and C++14" From d54fd3bc55a6fb404b85831e21747ce45c77e745 Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Mon, 25 Apr 2016 04:32:38 +0000 Subject: [PATCH 09/76] updated submodules --- webthree-helpers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webthree-helpers b/webthree-helpers index 36d6221c3..3e78e1e5b 160000 --- a/webthree-helpers +++ b/webthree-helpers @@ -1 +1 @@ -Subproject commit 36d6221c31be72ecf9b136e7c11c9ca5e0ecffd6 +Subproject commit 3e78e1e5bd6bd8ba1cf7aeb0fed6e0096ba33090 From 4f0b95cf3a6fcc6ab46416986d21c3f8dc994056 Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Mon, 25 Apr 2016 15:13:09 +0000 Subject: [PATCH 10/76] updated submodules --- webthree-helpers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webthree-helpers b/webthree-helpers index 3e78e1e5b..d94fe2d11 160000 --- a/webthree-helpers +++ b/webthree-helpers @@ -1 +1 @@ -Subproject commit 3e78e1e5bd6bd8ba1cf7aeb0fed6e0096ba33090 +Subproject commit d94fe2d11554148a09726d5e9e4fed7d66fdf73a From 0fd4e5dee866b1f87fbd797381b7d38e4e8d3eeb Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Tue, 26 Apr 2016 17:56:56 +0000 Subject: [PATCH 11/76] updated submodules --- libethereum | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libethereum b/libethereum index 93039abf7..7fedeebce 160000 --- a/libethereum +++ b/libethereum @@ -1 +1 @@ -Subproject commit 93039abf7daabbd25f33d9a4c1dba42ffd0740c9 +Subproject commit 7fedeebce935443695e3f07db740a85b68b708b5 From f04a9c943fcbbd967711d8364ef8ae6c9daf6a4c Mon Sep 17 00:00:00 2001 From: Bob Summerwill Date: Tue, 26 Apr 2016 14:22:40 -0700 Subject: [PATCH 12/76] Added "C++ Core Guidelines" to reading list, as per Pawel. Softened off on the spaces changes back to almost nothing. Re-added the underscore prefix items. I don't think it's a good recommendation, but don't care enough to argue more about that. --- CodingStandards.txt | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/CodingStandards.txt b/CodingStandards.txt index 1725a1f65..c18d2722b 100644 --- a/CodingStandards.txt +++ b/CodingStandards.txt @@ -2,9 +2,10 @@ GOLDEN RULE: Follow the style of the existing code when you make changes. -a. Prefer spaces for indentation, because they work the same for all editors and tools. -- indent with multiples of 4 characters -- Never use spaces to line up sequential lines: If you have run-on lines, indent as you would for a block. +a. Use tabs for leading indentation +- tab stops are every 4 characters. +- One indentation level -> exactly one byte (i.e. a tab character) in the source file. +- If you have run-on lines, indent as you would for a block. b. Line widths: - Don't worry about having lines of code > 80-char wide. - Lines of comments should be formatted according to ease of viewing, but simplicity is to be prefered over beauty. @@ -86,7 +87,9 @@ All other entities' first alpha is lower case. 4. Variable prefixes: -a. Parameter names should have no prefixes. +a. Leading underscore "_" to parameter names (both normal and template). +- Exception: "o_parameterName" when it is used exclusively for output. See 6(f). +- Exception: "io_parameterName" when it is used for both input and output. See 6(f). b. Leading "c_" to const variables (unless part of an external API). c. Leading "g_" to global (non-const) variables. d. Leading "s_" to static (non-const, non-global) variables. @@ -240,6 +243,9 @@ Some rules to keep in mind: 14. Recommended reading +Herb Sutter and Bjarne Stroustrup +- "C++ Core Guidelines" (https://github.com/isocpp/CppCoreGuidelines/blob/master/CppCoreGuidelines.md) + Herb Sutter and Andrei Alexandrescu - "C++ Coding Standards: 101 Rules, Guidelines, and Best Practices" From 8d6314442da6b06e1220c867c051e2b7366d1e28 Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Wed, 27 Apr 2016 03:23:57 +0000 Subject: [PATCH 13/76] updated submodules --- libethereum | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libethereum b/libethereum index 7fedeebce..e9039e6fe 160000 --- a/libethereum +++ b/libethereum @@ -1 +1 @@ -Subproject commit 7fedeebce935443695e3f07db740a85b68b708b5 +Subproject commit e9039e6febf62dd4ec1d9a9c5560f452f8d1c55d From e53a958a920ef9eb2d61056c1ecfff2da70a9792 Mon Sep 17 00:00:00 2001 From: Bob Summerwill Date: Tue, 26 Apr 2016 22:45:56 -0700 Subject: [PATCH 14/76] Initial check-in for recreate-cpp-ethereum.sh script. --- recreate-cpp-ethereum.sh | 106 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100755 recreate-cpp-ethereum.sh diff --git a/recreate-cpp-ethereum.sh b/recreate-cpp-ethereum.sh new file mode 100755 index 000000000..9681e9af1 --- /dev/null +++ b/recreate-cpp-ethereum.sh @@ -0,0 +1,106 @@ +#!/usr/bin/env bash +# +# Script to recreate the cpp-ethereum repository by copying directories from webthree-umbrella. +# +# This is for one step of the "Dry run for repository reorganization" which is to get the content +# correct, automated and tested, before pulling the trigger on the real move, which will need to +# preserve history. +# +# See https://github.com/ethereum/webthree-umbrella/issues/453 + +outputDirectory=../cpp-ethereum-recreated + +rm -rf $outputDirectory +mkdir -p $outputDirectory +mkdir -p $outputDirectory/alethzero/ +mkdir -p $outputDirectory/test/ + +rsync -r ./alethzero/alethzero/ $outputDirectory/alethzero/alethzero/ +rsync -r ./alethzero/libaleth/ $outputDirectory/alethzero/libaleth/ +rsync ./alethzero/CMakeLists.txt $outputDirectory/alethzero/CMakeLists.txt +rsync -r ./dependency_graph/ $outputDirectory/dependency_graph/ +rsync -r ./doc/ $outputDirectory/doc/ +rsync -r ./docker/ $outputDirectory/docker/ +rsync -r ./libethereum/ConfigInfo.h.in $outputDirectory/ConfigInfo.h.in +rsync -r ./libethereum/ethkey/ $outputDirectory/ethkey/ +rsync -r ./libethereum/ethminer/ $outputDirectory/ethminer/ +rsync -r ./libethereum/ethvm/ $outputDirectory/ethvm/ +rsync -r ./libethereum/libethash/ $outputDirectory/libethash/ +rsync -r ./libethereum/libethash-cl/ $outputDirectory/libethash-cl/ +rsync -r ./libethereum/libethashseal/ $outputDirectory/libethashseal/ +rsync -r ./libethereum/libethcore/ $outputDirectory/libethcore/ +rsync -r ./libethereum/libethereum/ $outputDirectory/libethereum/ +rsync -r ./libethereum/libevm/ $outputDirectory/libevm/ +rsync -r ./libethereum/libevmcore/ $outputDirectory/libevmcore/ +rsync -r ./libethereum/libnatspec/ $outputDirectory/libnatspec/ +rsync -r ./libethereum/libtestutils/ $outputDirectory/libtestutils/ +rsync -r ./libethereum/test/deprecated/ $outputDirectory/test/deprecated/ +rsync -r ./libethereum/test/external-dependencies/ $outputDirectory/test/external-dependencies/ +rsync -r ./libethereum/test/fuzzTesting/ $outputDirectory/test/fuzzTesting/ +rsync -r ./libethereum/test/libethcore/ $outputDirectory/test/libethcore/ +rsync -r ./libethereum/test/libethereum/ $outputDirectory/test/libethereum/ +rsync -r ./libethereum/test/libevm/ $outputDirectory/test/libevm/ +rsync -r ./libethereum/test/libnatspec/ $outputDirectory/test/libnatspec/ +rsync -r ./libethereum/test/libweb3core/ $outputDirectory/test/libweb3core/ +rsync -r ./libethereum/test/BlockChainHelper.cpp $outputDirectory/test/BlockChainHelper.cpp +rsync -r ./libethereum/test/BlockChainHelper.h $outputDirectory/test/BlockChainHelper.h +rsync -r ./libethereum/test/boostTest.cpp $outputDirectory/test/boostTest.cpp +rsync -r ./libethereum/test/JSON_test.sol $outputDirectory/test/JSON_test.sol +rsync -r ./libethereum/test/JsonSpiritHeaders.h $outputDirectory/test/JsonSpiritHeaders.h +rsync -r ./libethereum/test/Stats.cpp $outputDirectory/test/Stats.cpp +rsync -r ./libethereum/test/Stats.h $outputDirectory/test/Stats.h +rsync -r ./libethereum/test/TestHelper.cpp $outputDirectory/test/TestHelper.cpp +rsync -r ./libethereum/test/TestHelper.h $outputDirectory/test/TestHelper.h +rsync -r ./libethereum/test/TestUtils.cpp $outputDirectory/test/TestUtils.cpp +rsync -r ./libethereum/test/TestUtils.h $outputDirectory/test/TestUtils.h +rsync -r ./libweb3core/bench/ $outputDirectory/bench/ +rsync -r ./libweb3core/libdevcore/ $outputDirectory/libdevcore/ +rsync -r ./libweb3core/libdevcrypto/ $outputDirectory/libdevcrypto/ +rsync -r ./libweb3core/libp2p/ $outputDirectory/libp2p/ +rsync -r ./libweb3core/rlp/ $outputDirectory/rlp/ +rsync -r ./libweb3core/test/libdevcore/ $outputDirectory/test/libdevcore/ +rsync -r ./libweb3core/test/libdevcrypto/ $outputDirectory/test/libdevcrypto/ +rsync -r ./libweb3core/test/libp2p/ $outputDirectory/test/libp2p/ +rsync -r ./libweb3core/test/memorydb.cpp $outputDirectory/test/memorydb.cpp +rsync -r ./libweb3core/test/overlaydb.cpp $outputDirectory/test/overlaydb.cpp +rsync -r ./libweb3core/test/test.cpp $outputDirectory/test/test.cpp +rsync -r ./libweb3core/test/test.h $outputDirectory/test/test.h +rsync -r ./webthree/eth/ $outputDirectory/eth/ +rsync -r ./webthree/libweb3jsonrpc/ $outputDirectory/libweb3jsonrpc/ +rsync -r ./webthree/libwebthree/ $outputDirectory/libwebthree/ +rsync -r ./webthree/libwhisper/ $outputDirectory/libwhisper/ +rsync -r ./webthree/test/ethrpctest/ $outputDirectory/test/ethrpctest/ +rsync -r ./webthree/test/libweb3jsonrpc/ $outputDirectory/test/libweb3jsonrpc/ +rsync -r ./webthree/test/libwhisper/ $outputDirectory/test/libwhisper/ +rsync -r ./webthree-helpers/cmake/ $outputDirectory/cmake/ +rsync -r ./webthree-helpers/extdep/ $outputDirectory/extdep/ +rsync -r ./webthree-helpers/homebrew/ $outputDirectory/homebrew/ +rsync -r ./webthree-helpers/js/ $outputDirectory/js/ +rsync -r ./webthree-helpers/scripts/ $outputDirectory/scripts/ +rsync -r ./webthree-helpers/templates/ $outputDirectory/templates/ +rsync -r ./webthree-helpers/utils/ $outputDirectory/utils/ +rsync -r ./astylerc $outputDirectory/astylerc +rsync -r ./CodingStandards.txt $outputDirectory/CodingStandards.txt +rsync -r ./CONTRIBUTING.md $outputDirectory/CONTRIBUTING.md +rsync -r ./diffscript.sh $outputDirectory/diffscript.sh +rsync -r ./foreach.sh $outputDirectory/foreach.sh +rsync -r ./getcoverage.sh $outputDirectory/getcoverage.sh +rsync -r ./getdev.sh $outputDirectory/getdev.sh +rsync -r ./GPLV3_LICENSE $outputDirectory/GPLV3_LICENSE +rsync -r ./LICENSE $outputDirectory/LICENSE +rsync -r ./nameeach.sh $outputDirectory/nameeach.sh +rsync -r ./new.sh $outputDirectory/new.sh +rsync -r ./push.sh $outputDirectory/push.sh +rsync -r ./sanitizer-blacklist.txt $outputDirectory/sanitizer-blacklist.txt +rsync -r ./sync.sh $outputDirectory/sync.sh + +# TODO - evmjit submodule +git clone https://github.com/ethereum/evmjit $outputDirectory/evmjit + +# TODO - Need to upstream my edits from https://github.com/bobsummerwill/cpp-ethereum/commits/merge_repos. +# TODO - README.md +# TODO - Synthesized composite CMakeList.txt files (root directory and test directory) +# TODO - Move Contributing and coding standards to http://ethdocs.org +# TODO - Move all these loose scripts in the root into /scripts +# TODO - Try to get astyle working, or switch to clang-format +# TODO - Where will qtcreator-style go? Ditto for res folder. \ No newline at end of file From b83b3330111899a9511cb06adf31bd7efc509168 Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Wed, 27 Apr 2016 19:09:26 +0000 Subject: [PATCH 15/76] updated submodules --- libethereum | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libethereum b/libethereum index e9039e6fe..91d76e293 160000 --- a/libethereum +++ b/libethereum @@ -1 +1 @@ -Subproject commit e9039e6febf62dd4ec1d9a9c5560f452f8d1c55d +Subproject commit 91d76e293b35ae19531307d9b0cf16e56dfe34dd From 551287d1f010188888082b627c284655907536e9 Mon Sep 17 00:00:00 2001 From: Bob Summerwill Date: Wed, 27 Apr 2016 14:35:11 -0700 Subject: [PATCH 16/76] Removed alethzero. Various other tweaks and comments. --- recreate-cpp-ethereum.sh | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/recreate-cpp-ethereum.sh b/recreate-cpp-ethereum.sh index 9681e9af1..0765ef549 100755 --- a/recreate-cpp-ethereum.sh +++ b/recreate-cpp-ethereum.sh @@ -15,9 +15,7 @@ mkdir -p $outputDirectory mkdir -p $outputDirectory/alethzero/ mkdir -p $outputDirectory/test/ -rsync -r ./alethzero/alethzero/ $outputDirectory/alethzero/alethzero/ -rsync -r ./alethzero/libaleth/ $outputDirectory/alethzero/libaleth/ -rsync ./alethzero/CMakeLists.txt $outputDirectory/alethzero/CMakeLists.txt +# alethzero intentionally omitted rsync -r ./dependency_graph/ $outputDirectory/dependency_graph/ rsync -r ./doc/ $outputDirectory/doc/ rsync -r ./docker/ $outputDirectory/docker/ @@ -65,6 +63,10 @@ rsync -r ./libweb3core/test/memorydb.cpp $outputDirectory/test/memorydb.cpp rsync -r ./libweb3core/test/overlaydb.cpp $outputDirectory/test/overlaydb.cpp rsync -r ./libweb3core/test/test.cpp $outputDirectory/test/test.cpp rsync -r ./libweb3core/test/test.h $outputDirectory/test/test.h +# mix intentionally omitted +# res intentionally omitted +# solidity intentionally omitted +# web3.js intentionally omitted rsync -r ./webthree/eth/ $outputDirectory/eth/ rsync -r ./webthree/libweb3jsonrpc/ $outputDirectory/libweb3jsonrpc/ rsync -r ./webthree/libwebthree/ $outputDirectory/libwebthree/ @@ -79,6 +81,13 @@ rsync -r ./webthree-helpers/js/ $outputDirectory/js/ rsync -r ./webthree-helpers/scripts/ $outputDirectory/scripts/ rsync -r ./webthree-helpers/templates/ $outputDirectory/templates/ rsync -r ./webthree-helpers/utils/ $outputDirectory/utils/ +# intentionally left /webthree-helpers root files behind: (LICENSE, new.sh, README.md) +# TODO /webthree-helpers/cmake has (LICENSE, README.md), but why? +# TODO /webthree-helpers/homebrew has (LICENSE, README.md), but why? +# Tried unsuccessfully to delete homebrew ones. Needed in some release flow? + +# Loose files in the root directory of webthree-umbrella. +# TODO - Move all these loose scripts in the root into /scripts rsync -r ./astylerc $outputDirectory/astylerc rsync -r ./CodingStandards.txt $outputDirectory/CodingStandards.txt rsync -r ./CONTRIBUTING.md $outputDirectory/CONTRIBUTING.md @@ -94,13 +103,18 @@ rsync -r ./push.sh $outputDirectory/push.sh rsync -r ./sanitizer-blacklist.txt $outputDirectory/sanitizer-blacklist.txt rsync -r ./sync.sh $outputDirectory/sync.sh -# TODO - evmjit submodule +# These CMakeLists.txt were manually synthesized by Bob. +curl https://raw.githubusercontent.com/bobsummerwill/cpp-ethereum/merge_repos/CMakeLists.txt > $outputDirectory/CMakeLists.txt +curl https://raw.githubusercontent.com/bobsummerwill/cpp-ethereum/merge_repos/test/CMakeLists.txt > $outputDirectory/test/CMakeLists.txt + +# This README.md is going to need to be manually updated to reflect the new repo organizational reality, +# which will need to be some kind of merger of the README.md content from cpp-ethereum and from webthree-umbrella. +curl https://raw.githubusercontent.com/bobsummerwill/cpp-ethereum/merge_repos/README.md > $outputDirectory/README.md + +# TODO - evmjit submodule will need "hooking up", for now we'll just git clone it into a local directory to get +# the content we need for testing. git clone https://github.com/ethereum/evmjit $outputDirectory/evmjit # TODO - Need to upstream my edits from https://github.com/bobsummerwill/cpp-ethereum/commits/merge_repos. -# TODO - README.md -# TODO - Synthesized composite CMakeList.txt files (root directory and test directory) # TODO - Move Contributing and coding standards to http://ethdocs.org -# TODO - Move all these loose scripts in the root into /scripts -# TODO - Try to get astyle working, or switch to clang-format -# TODO - Where will qtcreator-style go? Ditto for res folder. \ No newline at end of file +# TODO - Where will qtcreator-style go? Ditto for res folder. From b324eeecbeb60a2561d4dca04f4b1ce6445d14fe Mon Sep 17 00:00:00 2001 From: Bob Summerwill Date: Wed, 27 Apr 2016 16:25:00 -0700 Subject: [PATCH 17/76] Another round of edits. I think that what we have here should be buildable and testable. Let's try it out. --- recreate-cpp-ethereum.sh | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/recreate-cpp-ethereum.sh b/recreate-cpp-ethereum.sh index 0765ef549..2b84b8476 100755 --- a/recreate-cpp-ethereum.sh +++ b/recreate-cpp-ethereum.sh @@ -100,21 +100,28 @@ rsync -r ./LICENSE $outputDirectory/LICENSE rsync -r ./nameeach.sh $outputDirectory/nameeach.sh rsync -r ./new.sh $outputDirectory/new.sh rsync -r ./push.sh $outputDirectory/push.sh +# qtcreator-style intentionally omitted. rsync -r ./sanitizer-blacklist.txt $outputDirectory/sanitizer-blacklist.txt rsync -r ./sync.sh $outputDirectory/sync.sh +# These are hacks to overwrite BuildInfo.h conditionals which haven't been upstreamed yet, +# so instead I am just curl-ing them in directly from my own working branch. +# TODO - Need to upstream my edits from https://github.com/bobsummerwill/cpp-ethereum/commits/merge_repos. +curl https://raw.githubusercontent.com/bobsummerwill/libethereum/repo_merge/ethkey/main.cpp > $outputDirectory/ethkey/main.cpp +curl https://raw.githubusercontent.com/bobsummerwill/libethereum/repo_merge/ethminer/MinerAux.h > $outputDirectory/ethminer/MinerAux.h +curl https://raw.githubusercontent.com/bobsummerwill/libweb3core/merge_repos/libdevcore/Common.cpp > $outputDirectory/libdevcore/Common.cpp +curl https://raw.githubusercontent.com/bobsummerwill/webthree/repo_merge/libwebthree/WebThree.cpp > $outputDirectory/libwebthree/WebThree.cpp + +# These files cannot be upstreamed, but instead need to be manually maintained and then dropped into 'cpp-ethereum' when we merge. # These CMakeLists.txt were manually synthesized by Bob. +curl https://raw.githubusercontent.com/bobsummerwill/cpp-ethereum/merge_repos/cmake/EthOptions.cmake > $outputDirectory/cmake/EthOptions.cmake curl https://raw.githubusercontent.com/bobsummerwill/cpp-ethereum/merge_repos/CMakeLists.txt > $outputDirectory/CMakeLists.txt -curl https://raw.githubusercontent.com/bobsummerwill/cpp-ethereum/merge_repos/test/CMakeLists.txt > $outputDirectory/test/CMakeLists.txt - -# This README.md is going to need to be manually updated to reflect the new repo organizational reality, -# which will need to be some kind of merger of the README.md content from cpp-ethereum and from webthree-umbrella. curl https://raw.githubusercontent.com/bobsummerwill/cpp-ethereum/merge_repos/README.md > $outputDirectory/README.md +curl https://raw.githubusercontent.com/bobsummerwill/cpp-ethereum/merge_repos/test/CMakeLists.txt > $outputDirectory/test/CMakeLists.txt # TODO - evmjit submodule will need "hooking up", for now we'll just git clone it into a local directory to get # the content we need for testing. git clone https://github.com/ethereum/evmjit $outputDirectory/evmjit -# TODO - Need to upstream my edits from https://github.com/bobsummerwill/cpp-ethereum/commits/merge_repos. # TODO - Move Contributing and coding standards to http://ethdocs.org # TODO - Where will qtcreator-style go? Ditto for res folder. From 273719538e8613d51099b3864307467bb37ed004 Mon Sep 17 00:00:00 2001 From: Bob Summerwill Date: Wed, 27 Apr 2016 16:46:56 -0700 Subject: [PATCH 18/76] Removed a stray alethzero directory creation, which resulted in an empty directory in the created output. --- recreate-cpp-ethereum.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/recreate-cpp-ethereum.sh b/recreate-cpp-ethereum.sh index 2b84b8476..fbd8a5632 100755 --- a/recreate-cpp-ethereum.sh +++ b/recreate-cpp-ethereum.sh @@ -12,7 +12,6 @@ outputDirectory=../cpp-ethereum-recreated rm -rf $outputDirectory mkdir -p $outputDirectory -mkdir -p $outputDirectory/alethzero/ mkdir -p $outputDirectory/test/ # alethzero intentionally omitted From 759629a58c599cf4bfde4220f8a125b3a9956fd4 Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Thu, 28 Apr 2016 03:24:00 +0000 Subject: [PATCH 19/76] updated submodules --- libethereum | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libethereum b/libethereum index 91d76e293..0ecddeaeb 160000 --- a/libethereum +++ b/libethereum @@ -1 +1 @@ -Subproject commit 91d76e293b35ae19531307d9b0cf16e56dfe34dd +Subproject commit 0ecddeaeb0f0e87161c4bc7a116b53117f6da967 From e38382f15248bfc5e6e809d29f25972f6e4c14b3 Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Thu, 28 Apr 2016 04:37:19 +0000 Subject: [PATCH 20/76] updated submodules --- libethereum | 2 +- webthree | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libethereum b/libethereum index 0ecddeaeb..d05811a99 160000 --- a/libethereum +++ b/libethereum @@ -1 +1 @@ -Subproject commit 0ecddeaeb0f0e87161c4bc7a116b53117f6da967 +Subproject commit d05811a992114b091f2a471708c869fc6fe407d1 diff --git a/webthree b/webthree index ea16732f1..08d9ffab1 160000 --- a/webthree +++ b/webthree @@ -1 +1 @@ -Subproject commit ea16732f1f849a8b43188f39ae7c705e2fe3abae +Subproject commit 08d9ffab1e9d3d4072e650908d979c9ba258c60b From c30da6e12bdf352ad00657a98765e007f37e7c46 Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Thu, 28 Apr 2016 05:20:48 +0000 Subject: [PATCH 21/76] updated submodules --- libweb3core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libweb3core b/libweb3core index 300ade534..faf91790d 160000 --- a/libweb3core +++ b/libweb3core @@ -1 +1 @@ -Subproject commit 300ade534ff90acffb3e01db8b5de2789ed0227d +Subproject commit faf91790d6d37913f9fe3a4b568e32f47995ebe1 From 02412126419b087faf7e930f68031113d1bec7fd Mon Sep 17 00:00:00 2001 From: Bob Summerwill Date: Wed, 27 Apr 2016 23:11:14 -0700 Subject: [PATCH 22/76] Removed a few more lines from recreate-cpp-ethereum.sh, as more fixes have been unstreamed, so the workarounds are no longer required. Removed test.cpp and test.h files which clash between libethereum and libweb3core. The results of this script appear to generate "good" eth and testate binaries for OS X. So it looks like it is time to move on the next steps in the plan. --- recreate-cpp-ethereum.sh | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/recreate-cpp-ethereum.sh b/recreate-cpp-ethereum.sh index fbd8a5632..29254475b 100755 --- a/recreate-cpp-ethereum.sh +++ b/recreate-cpp-ethereum.sh @@ -18,7 +18,6 @@ mkdir -p $outputDirectory/test/ rsync -r ./dependency_graph/ $outputDirectory/dependency_graph/ rsync -r ./doc/ $outputDirectory/doc/ rsync -r ./docker/ $outputDirectory/docker/ -rsync -r ./libethereum/ConfigInfo.h.in $outputDirectory/ConfigInfo.h.in rsync -r ./libethereum/ethkey/ $outputDirectory/ethkey/ rsync -r ./libethereum/ethminer/ $outputDirectory/ethminer/ rsync -r ./libethereum/ethvm/ $outputDirectory/ethvm/ @@ -60,8 +59,7 @@ rsync -r ./libweb3core/test/libdevcrypto/ $outputDirectory/test/libdevcrypto/ rsync -r ./libweb3core/test/libp2p/ $outputDirectory/test/libp2p/ rsync -r ./libweb3core/test/memorydb.cpp $outputDirectory/test/memorydb.cpp rsync -r ./libweb3core/test/overlaydb.cpp $outputDirectory/test/overlaydb.cpp -rsync -r ./libweb3core/test/test.cpp $outputDirectory/test/test.cpp -rsync -r ./libweb3core/test/test.h $outputDirectory/test/test.h +# libweb3core/test/test.cpp and test.h intentionally omitted because they clash with boosttest.cpp from libethereum/test. # mix intentionally omitted # res intentionally omitted # solidity intentionally omitted @@ -103,14 +101,6 @@ rsync -r ./push.sh $outputDirectory/push.sh rsync -r ./sanitizer-blacklist.txt $outputDirectory/sanitizer-blacklist.txt rsync -r ./sync.sh $outputDirectory/sync.sh -# These are hacks to overwrite BuildInfo.h conditionals which haven't been upstreamed yet, -# so instead I am just curl-ing them in directly from my own working branch. -# TODO - Need to upstream my edits from https://github.com/bobsummerwill/cpp-ethereum/commits/merge_repos. -curl https://raw.githubusercontent.com/bobsummerwill/libethereum/repo_merge/ethkey/main.cpp > $outputDirectory/ethkey/main.cpp -curl https://raw.githubusercontent.com/bobsummerwill/libethereum/repo_merge/ethminer/MinerAux.h > $outputDirectory/ethminer/MinerAux.h -curl https://raw.githubusercontent.com/bobsummerwill/libweb3core/merge_repos/libdevcore/Common.cpp > $outputDirectory/libdevcore/Common.cpp -curl https://raw.githubusercontent.com/bobsummerwill/webthree/repo_merge/libwebthree/WebThree.cpp > $outputDirectory/libwebthree/WebThree.cpp - # These files cannot be upstreamed, but instead need to be manually maintained and then dropped into 'cpp-ethereum' when we merge. # These CMakeLists.txt were manually synthesized by Bob. curl https://raw.githubusercontent.com/bobsummerwill/cpp-ethereum/merge_repos/cmake/EthOptions.cmake > $outputDirectory/cmake/EthOptions.cmake From 4b6707716d92be2b2b7b88c999a1d41c45b3edd4 Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Fri, 29 Apr 2016 03:24:03 +0000 Subject: [PATCH 23/76] updated submodules --- webthree-helpers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webthree-helpers b/webthree-helpers index d94fe2d11..effabb3f8 160000 --- a/webthree-helpers +++ b/webthree-helpers @@ -1 +1 @@ -Subproject commit d94fe2d11554148a09726d5e9e4fed7d66fdf73a +Subproject commit effabb3f8f1a30df2f9cc3d73cbe6bd9a8d89c39 From d31eae2a6ca2b8a7a137e5c5302df8d66ab2a121 Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Fri, 29 Apr 2016 19:05:51 +0000 Subject: [PATCH 24/76] updated submodules --- webthree-helpers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webthree-helpers b/webthree-helpers index effabb3f8..5427d3ba4 160000 --- a/webthree-helpers +++ b/webthree-helpers @@ -1 +1 @@ -Subproject commit effabb3f8f1a30df2f9cc3d73cbe6bd9a8d89c39 +Subproject commit 5427d3ba40f8a1fd0df9555ef3014bc1f7666e49 From 62af4939971602cc2238fb451a2e84b398144c99 Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Fri, 29 Apr 2016 19:49:40 +0000 Subject: [PATCH 25/76] updated submodules --- webthree-helpers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webthree-helpers b/webthree-helpers index 5427d3ba4..ccae0330f 160000 --- a/webthree-helpers +++ b/webthree-helpers @@ -1 +1 @@ -Subproject commit 5427d3ba40f8a1fd0df9555ef3014bc1f7666e49 +Subproject commit ccae0330fd50c452e1aff590bd3c32f999cb3fdf From 03207e8fed71d77b373481f8040caf7bd07e8845 Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Fri, 29 Apr 2016 21:01:22 +0000 Subject: [PATCH 26/76] updated submodules --- webthree-helpers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webthree-helpers b/webthree-helpers index ccae0330f..4a1e872f9 160000 --- a/webthree-helpers +++ b/webthree-helpers @@ -1 +1 @@ -Subproject commit ccae0330fd50c452e1aff590bd3c32f999cb3fdf +Subproject commit 4a1e872f9dc7bf32f5119f235be7cc261e2b3d81 From f123e21c0de903f59a1cf6b5d1d7d737bcf54e86 Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Fri, 29 Apr 2016 21:15:16 +0000 Subject: [PATCH 27/76] updated submodules --- webthree-helpers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webthree-helpers b/webthree-helpers index 4a1e872f9..47b48037e 160000 --- a/webthree-helpers +++ b/webthree-helpers @@ -1 +1 @@ -Subproject commit 4a1e872f9dc7bf32f5119f235be7cc261e2b3d81 +Subproject commit 47b48037ecaf208e9d498b6fe236f0b7d6d680a4 From 863da5bc38427668421f5de78f45327458c8ebb0 Mon Sep 17 00:00:00 2001 From: Bob Summerwill Date: Wed, 27 Apr 2016 16:34:29 -0700 Subject: [PATCH 28/76] Deleted numerous miscellaneous Bash scripts which I don't think any of the development team are using. They look like they were mainly created for the purpose of creating the repositories, or for working with them "loose" which we aren't really doing anymore, or if we are, we are doing it without these scripts. If we find that any of them are still useful then they should be readded under webthree-helpers/scripts, not in the root directory. Also removed astyle file based on the feedback from chriseth and chfast that this style tool had not proved successful. chfast is now experimenting with clang-format instead. --- astylerc | 11 --------- diffscript.sh | 16 ------------ foreach.sh | 14 ----------- getcoverage.sh | 67 -------------------------------------------------- getdev.sh | 7 ------ nameeach.sh | 14 ----------- new.sh | 6 ----- push.sh | 7 ------ 8 files changed, 142 deletions(-) delete mode 100644 astylerc delete mode 100755 diffscript.sh delete mode 100755 foreach.sh delete mode 100755 getcoverage.sh delete mode 100755 getdev.sh delete mode 100755 nameeach.sh delete mode 100755 new.sh delete mode 100755 push.sh diff --git a/astylerc b/astylerc deleted file mode 100644 index d4e1188eb..000000000 --- a/astylerc +++ /dev/null @@ -1,11 +0,0 @@ -style=allman -indent=force-tab=4 -convert-tabs -indent-preprocessor -min-conditional-indent=1 -pad-oper -pad-header -unpad-paren -align-pointer=type -keep-one-line-blocks -close-templates diff --git a/diffscript.sh b/diffscript.sh deleted file mode 100755 index ef664e8cc..000000000 --- a/diffscript.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# author: Lefteris Karapetsas -# -# A script to list all changes of the submodule compared -# to a revision passed as the only argument. -# @ -echo "Listing changes for umbreall repo itself" -git --no-pager diff $1 -subs=(`git submodule | awk '{print $2}'`) -for sub in ${subs[*]}; do - lastrevision=`git diff $1 $sub | fgrep "Subproject" | head -n1 | awk '{print $3}'` - cd $sub - echo "Listing changes for $sub" - git --no-pager diff $lastrevision - cd .. -done diff --git a/foreach.sh b/foreach.sh deleted file mode 100755 index e46f63580..000000000 --- a/foreach.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -branch=$(git branch | grep "\*" | cut -c 3-) -for i in webthree-helpers libweb3core libethereum web3.js solidity webthree alethzero mix; do -cd $i -lbranch=$(git branch | grep "\*" | cut -c 3-) -if [ "$lbranch" == "$branch" ] ; then -echo Entering $i ... -"$@" -else -echo "Skipping $i (branch $lbranch is not $branch)". -fi -cd .. -done diff --git a/getcoverage.sh b/getcoverage.sh deleted file mode 100755 index b11f8dced..000000000 --- a/getcoverage.sh +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/bash - -CPP_ETHEREUM_PATH=$(pwd) -BUILD_DIR=$CPP_ETHEREUM_PATH/build -TEST_MODE="" - -for i in "$@" -do -case $i in - -builddir) - shift - ((i++)) - BUILD_DIR=${!i} - shift - ;; - --all) - TEST_MODE="--all" - shift - ;; - --filltests) - TEST_FILL="--filltests" - shift - ;; -esac -done - -which $BUILD_DIR/test/testeth >/dev/null 2>&1 -if [ $? != 0 ] -then - echo "You need to compile and build ethereum with cmake -DPROFILING option to the build dir!" - exit; -fi - -OUTPUT_DIR=$BUILD_DIR/test/coverage -if which lcov >/dev/null; then - if which genhtml >/dev/null; then - echo Cleaning previous report... - if [ -d "$OUTPUT_DIR" ]; then - rm -r $OUTPUT_DIR - fi - mkdir $OUTPUT_DIR - lcov --directory $BUILD_DIR --zerocounters - lcov --capture --initial --directory $BUILD_DIR --output-file $OUTPUT_DIR/coverage_base.info - - echo Running testeth... - $BUILD_DIR/test/testeth $TEST_MODE $TEST_FILL - $BUILD_DIR/test/testeth -t StateTests --jit $TEST_MODE - $BUILD_DIR/test/testeth -t VMTests --jit $TEST_MODE - - echo Prepearing coverage info... - lcov --capture --directory $BUILD_DIR --output-file $OUTPUT_DIR/coverage_test.info - lcov --add-tracefile $OUTPUT_DIR/coverage_base.info --add-tracefile $OUTPUT_DIR/coverage_test.info --output-file $OUTPUT_DIR/coverage_all.info - lcov --extract $OUTPUT_DIR/coverage_all.info *cpp-ethereum/* --output-file $OUTPUT_DIR/coverage_export.info - genhtml $OUTPUT_DIR/coverage_export.info --output-directory $OUTPUT_DIR/testeth - else - echo genhtml not found - exit; - fi -else - echo lcov not found - exit; -fi - -echo "Coverage info should be located at: $OUTPUT_DIR/testeth" -echo "Opening index..." - -xdg-open $OUTPUT_DIR/testeth/index.html & diff --git a/getdev.sh b/getdev.sh deleted file mode 100755 index 9f815f3e0..000000000 --- a/getdev.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -for i in libweb3core libethereum webthree alethzero; do -cd $i -git checkout develop -cd .. -done diff --git a/nameeach.sh b/nameeach.sh deleted file mode 100755 index c56badcdb..000000000 --- a/nameeach.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -branch=$(git branch | grep "\*" | cut -c 3-) -for i in webthree-helpers libweb3core libethereum web3.js solidity webthree alethzero mix; do -cd $i -lbranch=$(git branch | grep "\*" | cut -c 3-) -cd .. -if [ "$lbranch" == "$branch" ] ; then -echo Entering $i ... -"$@" "$i" -else -echo "Skipping $i (branch $lbranch is not $branch)". -fi -done diff --git a/new.sh b/new.sh deleted file mode 100755 index aac356576..000000000 --- a/new.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -cd webthree-helpers -./new.sh "$1" "../$2" "$3" -cd .. - diff --git a/push.sh b/push.sh deleted file mode 100755 index d9e1fb33e..000000000 --- a/push.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -cd $1 -git pull -git push git@github.com:ethereum/$1 -cd .. - From 6645e8d3601d120f986e58eab691c801a228401a Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Sat, 30 Apr 2016 17:04:34 +0000 Subject: [PATCH 29/76] updated submodules --- webthree-helpers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webthree-helpers b/webthree-helpers index 47b48037e..fd856d414 160000 --- a/webthree-helpers +++ b/webthree-helpers @@ -1 +1 @@ -Subproject commit 47b48037ecaf208e9d498b6fe236f0b7d6d680a4 +Subproject commit fd856d414786e2a21e9a25564616846acd409813 From 885b3bb7230aa6b58dcf58302e3c164a29d3adc0 Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Sat, 30 Apr 2016 20:56:07 +0000 Subject: [PATCH 30/76] updated submodules --- webthree-helpers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webthree-helpers b/webthree-helpers index fd856d414..0d1150637 160000 --- a/webthree-helpers +++ b/webthree-helpers @@ -1 +1 @@ -Subproject commit fd856d414786e2a21e9a25564616846acd409813 +Subproject commit 0d11506377c4f6e361d8f781df0de16610497739 From ad9c55c0c7fb74921fedc7b5e94bd18d8751ebe0 Mon Sep 17 00:00:00 2001 From: Bob Summerwill Date: Sat, 30 Apr 2016 15:28:05 -0700 Subject: [PATCH 31/76] Updated recreate-cpp-ethereum.sh, to reflect files deleted from the root of the webthree-umbrella. --- recreate-cpp-ethereum.sh | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/recreate-cpp-ethereum.sh b/recreate-cpp-ethereum.sh index 29254475b..18136d1a6 100755 --- a/recreate-cpp-ethereum.sh +++ b/recreate-cpp-ethereum.sh @@ -85,19 +85,13 @@ rsync -r ./webthree-helpers/utils/ $outputDirectory/utils/ # Loose files in the root directory of webthree-umbrella. # TODO - Move all these loose scripts in the root into /scripts -rsync -r ./astylerc $outputDirectory/astylerc +# CMakeLists.txt intentionally omitted. rsync -r ./CodingStandards.txt $outputDirectory/CodingStandards.txt rsync -r ./CONTRIBUTING.md $outputDirectory/CONTRIBUTING.md -rsync -r ./diffscript.sh $outputDirectory/diffscript.sh -rsync -r ./foreach.sh $outputDirectory/foreach.sh -rsync -r ./getcoverage.sh $outputDirectory/getcoverage.sh -rsync -r ./getdev.sh $outputDirectory/getdev.sh rsync -r ./GPLV3_LICENSE $outputDirectory/GPLV3_LICENSE rsync -r ./LICENSE $outputDirectory/LICENSE -rsync -r ./nameeach.sh $outputDirectory/nameeach.sh -rsync -r ./new.sh $outputDirectory/new.sh -rsync -r ./push.sh $outputDirectory/push.sh # qtcreator-style intentionally omitted. +# README.md intentionally omitted. rsync -r ./sanitizer-blacklist.txt $outputDirectory/sanitizer-blacklist.txt rsync -r ./sync.sh $outputDirectory/sync.sh From c42f77c65b05bdeba5b3ab59f6987e2bc68bcc0d Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Sun, 1 May 2016 00:00:58 +0000 Subject: [PATCH 32/76] updated submodules --- webthree | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webthree b/webthree index 08d9ffab1..6beb221bf 160000 --- a/webthree +++ b/webthree @@ -1 +1 @@ -Subproject commit 08d9ffab1e9d3d4072e650908d979c9ba258c60b +Subproject commit 6beb221bf2820b37f1f9898f003fe4a625ba26fd From 020661dbd2f180a2c4321b1b1a4bdff97fe17edb Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Sun, 1 May 2016 00:29:36 +0000 Subject: [PATCH 33/76] updated submodules --- webthree-helpers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webthree-helpers b/webthree-helpers index 0d1150637..1c03d60cc 160000 --- a/webthree-helpers +++ b/webthree-helpers @@ -1 +1 @@ -Subproject commit 0d11506377c4f6e361d8f781df0de16610497739 +Subproject commit 1c03d60ccb5452b31d8946f76b065be35dfe8277 From bb169f5b2a451df4aa6132d47c4b47d6ff28ab8f Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Sun, 1 May 2016 01:27:02 +0000 Subject: [PATCH 34/76] updated submodules --- solidity | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solidity b/solidity index dd4300d5b..bee80f1d8 160000 --- a/solidity +++ b/solidity @@ -1 +1 @@ -Subproject commit dd4300d5b83fa16c36970ed2dd04aeec70c7b5ef +Subproject commit bee80f1d812078a705c71ade76ab66461a33d099 From 53de5bd07c1b04b07713760887a9f1da70d13c9f Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Sun, 1 May 2016 02:27:33 +0000 Subject: [PATCH 35/76] updated submodules --- libethereum | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libethereum b/libethereum index d05811a99..959a24fa2 160000 --- a/libethereum +++ b/libethereum @@ -1 +1 @@ -Subproject commit d05811a992114b091f2a471708c869fc6fe407d1 +Subproject commit 959a24fa2418be7f0b2804d21c75f63753c653dd From 1d86c7d383c152ed9677c878b77f6997bb13602b Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Sun, 1 May 2016 07:13:27 +0000 Subject: [PATCH 36/76] updated submodules --- webthree-helpers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webthree-helpers b/webthree-helpers index 1c03d60cc..972668593 160000 --- a/webthree-helpers +++ b/webthree-helpers @@ -1 +1 @@ -Subproject commit 1c03d60ccb5452b31d8946f76b065be35dfe8277 +Subproject commit 972668593a09e3846ae2fb9d1e08bee1150a8c83 From c3901ad857cf97377a7b514286fef08f61ba0154 Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Sun, 1 May 2016 07:47:23 +0000 Subject: [PATCH 37/76] updated submodules --- webthree-helpers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webthree-helpers b/webthree-helpers index 972668593..0a124ca94 160000 --- a/webthree-helpers +++ b/webthree-helpers @@ -1 +1 @@ -Subproject commit 972668593a09e3846ae2fb9d1e08bee1150a8c83 +Subproject commit 0a124ca9427525e91aba88fe66c336cc1696417c From 0c62f7a246a47a9f3e371dd24b5cbdfd7fcce68c Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Sun, 1 May 2016 08:47:51 +0000 Subject: [PATCH 38/76] updated submodules --- webthree-helpers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webthree-helpers b/webthree-helpers index 0a124ca94..890ee391a 160000 --- a/webthree-helpers +++ b/webthree-helpers @@ -1 +1 @@ -Subproject commit 0a124ca9427525e91aba88fe66c336cc1696417c +Subproject commit 890ee391a34e6485881189e826d7a8fa31f5fc94 From a2286df8a7a189aafef22e8e6ab9240bf2496e50 Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Sun, 1 May 2016 08:54:59 +0000 Subject: [PATCH 39/76] updated submodules --- libweb3core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libweb3core b/libweb3core index faf91790d..e6a119c89 160000 --- a/libweb3core +++ b/libweb3core @@ -1 +1 @@ -Subproject commit faf91790d6d37913f9fe3a4b568e32f47995ebe1 +Subproject commit e6a119c89c1d101cb11c8e2c3c21c250af43d7f4 From 400e5d8b142d97ed2a0e8bc0681422352c13f774 Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Tue, 3 May 2016 03:46:25 +0000 Subject: [PATCH 40/76] updated submodules --- libethereum | 2 +- libweb3core | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libethereum b/libethereum index 959a24fa2..6f23e127f 160000 --- a/libethereum +++ b/libethereum @@ -1 +1 @@ -Subproject commit 959a24fa2418be7f0b2804d21c75f63753c653dd +Subproject commit 6f23e127f0115acfebeaff055ac46286bf1ccc19 diff --git a/libweb3core b/libweb3core index e6a119c89..cb2d6806b 160000 --- a/libweb3core +++ b/libweb3core @@ -1 +1 @@ -Subproject commit e6a119c89c1d101cb11c8e2c3c21c250af43d7f4 +Subproject commit cb2d6806be091cd09c3d0269526a5d1217ff959e From 484dae8f2b7656d32794a762a75f24ce6492fd22 Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Tue, 3 May 2016 06:53:28 +0000 Subject: [PATCH 41/76] updated submodules --- libweb3core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libweb3core b/libweb3core index cb2d6806b..8e979b415 160000 --- a/libweb3core +++ b/libweb3core @@ -1 +1 @@ -Subproject commit cb2d6806be091cd09c3d0269526a5d1217ff959e +Subproject commit 8e979b415980916aa88599a6bfba834b99e71b8a From dbeb50ca32073a178a471d3d5fc979c8e568fc7d Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Tue, 3 May 2016 09:18:29 +0000 Subject: [PATCH 42/76] updated submodules --- webthree-helpers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webthree-helpers b/webthree-helpers index 890ee391a..a61ddfb75 160000 --- a/webthree-helpers +++ b/webthree-helpers @@ -1 +1 @@ -Subproject commit 890ee391a34e6485881189e826d7a8fa31f5fc94 +Subproject commit a61ddfb75ad990e6f6ff1655a3a51ad74581946c From c1ba7f766856a051629b858d7c67c43351e71123 Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Wed, 4 May 2016 03:24:57 +0000 Subject: [PATCH 43/76] updated submodules --- solidity | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solidity b/solidity index bee80f1d8..aa4dcbb88 160000 --- a/solidity +++ b/solidity @@ -1 +1 @@ -Subproject commit bee80f1d812078a705c71ade76ab66461a33d099 +Subproject commit aa4dcbb88cd0096a79fa975ec353dfbc4e341f53 From a48d9194c98ca81741694e94101bf3f623c472b3 Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Wed, 4 May 2016 20:37:44 +0000 Subject: [PATCH 44/76] updated submodules --- webthree-helpers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webthree-helpers b/webthree-helpers index a61ddfb75..baa520c94 160000 --- a/webthree-helpers +++ b/webthree-helpers @@ -1 +1 @@ -Subproject commit a61ddfb75ad990e6f6ff1655a3a51ad74581946c +Subproject commit baa520c94b333e112b3c51f6d5b59e55c9c24a13 From 7c3b11807f2dc2ebfee5520462b157ea5c3697c7 Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Fri, 6 May 2016 03:25:12 +0000 Subject: [PATCH 45/76] updated submodules --- solidity | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solidity b/solidity index aa4dcbb88..1b7e2d306 160000 --- a/solidity +++ b/solidity @@ -1 +1 @@ -Subproject commit aa4dcbb88cd0096a79fa975ec353dfbc4e341f53 +Subproject commit 1b7e2d3068a8870b6d5ebb231cb611d01b4adfc8 From d4e325457e1bd33727f9d4f64eceab5243c8c404 Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Sat, 7 May 2016 03:24:29 +0000 Subject: [PATCH 46/76] updated submodules --- solidity | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solidity b/solidity index 1b7e2d306..9e36bdda8 160000 --- a/solidity +++ b/solidity @@ -1 +1 @@ -Subproject commit 1b7e2d3068a8870b6d5ebb231cb611d01b4adfc8 +Subproject commit 9e36bdda8a9552f1885e0a63a85db588623b39b2 From 9392778588cb35669402b22f9213acabee40cd10 Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Mon, 9 May 2016 19:15:21 +0000 Subject: [PATCH 47/76] updated submodules --- webthree-helpers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webthree-helpers b/webthree-helpers index baa520c94..90ffbb7d0 160000 --- a/webthree-helpers +++ b/webthree-helpers @@ -1 +1 @@ -Subproject commit baa520c94b333e112b3c51f6d5b59e55c9c24a13 +Subproject commit 90ffbb7d05795249458164811db9c17453c303eb From 15f0e14c039dbb6d144a25c7eeae994b560b7a2b Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Mon, 9 May 2016 19:25:18 +0000 Subject: [PATCH 48/76] updated submodules --- libethereum | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libethereum b/libethereum index 6f23e127f..01bbc615d 160000 --- a/libethereum +++ b/libethereum @@ -1 +1 @@ -Subproject commit 6f23e127f0115acfebeaff055ac46286bf1ccc19 +Subproject commit 01bbc615d3c8af811f9ea7e3438f3c2854325dbb From b41060d6d3e54c6b40ee16aefc68be6549a5254b Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Mon, 9 May 2016 22:32:30 +0000 Subject: [PATCH 49/76] updated submodules --- libweb3core | 2 +- webthree | 2 +- webthree-helpers | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libweb3core b/libweb3core index 8e979b415..c8eeb1af0 160000 --- a/libweb3core +++ b/libweb3core @@ -1 +1 @@ -Subproject commit 8e979b415980916aa88599a6bfba834b99e71b8a +Subproject commit c8eeb1af04f7d64f760ba057086e82a2607210d1 diff --git a/webthree b/webthree index 6beb221bf..e5b1059d5 160000 --- a/webthree +++ b/webthree @@ -1 +1 @@ -Subproject commit 6beb221bf2820b37f1f9898f003fe4a625ba26fd +Subproject commit e5b1059d56ffac347290abd6420160b4a4da0630 diff --git a/webthree-helpers b/webthree-helpers index 90ffbb7d0..c6341fafe 160000 --- a/webthree-helpers +++ b/webthree-helpers @@ -1 +1 @@ -Subproject commit 90ffbb7d05795249458164811db9c17453c303eb +Subproject commit c6341fafedb3f5238e29d42e5f871b58b7357e46 From 6ec5850c672a379d33e019fb1df42e5b9f992e53 Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Tue, 10 May 2016 08:35:15 +0000 Subject: [PATCH 50/76] updated submodules --- webthree-helpers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webthree-helpers b/webthree-helpers index c6341fafe..d2fbb64c6 160000 --- a/webthree-helpers +++ b/webthree-helpers @@ -1 +1 @@ -Subproject commit c6341fafedb3f5238e29d42e5f871b58b7357e46 +Subproject commit d2fbb64c6f4dd0aefee218afcc236e2b743d1169 From 806abe573937eeaddb10feed48cde02c5082576a Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Tue, 10 May 2016 20:56:12 +0000 Subject: [PATCH 51/76] updated submodules --- libethereum | 2 +- libweb3core | 2 +- webthree-helpers | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libethereum b/libethereum index 01bbc615d..1ddd2b956 160000 --- a/libethereum +++ b/libethereum @@ -1 +1 @@ -Subproject commit 01bbc615d3c8af811f9ea7e3438f3c2854325dbb +Subproject commit 1ddd2b956caadf3a885346d1d0a99d7e11a6ba57 diff --git a/libweb3core b/libweb3core index c8eeb1af0..baca8fe1b 160000 --- a/libweb3core +++ b/libweb3core @@ -1 +1 @@ -Subproject commit c8eeb1af04f7d64f760ba057086e82a2607210d1 +Subproject commit baca8fe1bdfaa1ec8548b828bc6b59727552b9c8 diff --git a/webthree-helpers b/webthree-helpers index d2fbb64c6..b6ab1f08f 160000 --- a/webthree-helpers +++ b/webthree-helpers @@ -1 +1 @@ -Subproject commit d2fbb64c6f4dd0aefee218afcc236e2b743d1169 +Subproject commit b6ab1f08f4a61a04fffc41c1bc748545209337a2 From d9a52713c42be4ffa80c424dfdeeb4e679b7499f Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Tue, 10 May 2016 22:38:31 +0000 Subject: [PATCH 52/76] updated submodules --- webthree-helpers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webthree-helpers b/webthree-helpers index b6ab1f08f..9e88b7caf 160000 --- a/webthree-helpers +++ b/webthree-helpers @@ -1 +1 @@ -Subproject commit b6ab1f08f4a61a04fffc41c1bc748545209337a2 +Subproject commit 9e88b7caf7fd939a3197a79d648303b4079168ac From b3fb19c0ab86da699183b1602e3bbbf6fb31279f Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Wed, 11 May 2016 00:57:49 +0000 Subject: [PATCH 53/76] updated submodules --- webthree-helpers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webthree-helpers b/webthree-helpers index 9e88b7caf..d1eff3c23 160000 --- a/webthree-helpers +++ b/webthree-helpers @@ -1 +1 @@ -Subproject commit 9e88b7caf7fd939a3197a79d648303b4079168ac +Subproject commit d1eff3c23813927ad5deff4344752a32cdcfa9ac From a6662ceef1404f6468112c01deeb68d1446bb5f5 Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Wed, 11 May 2016 02:58:43 +0000 Subject: [PATCH 54/76] updated submodules --- webthree-helpers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webthree-helpers b/webthree-helpers index d1eff3c23..a4a08fb3f 160000 --- a/webthree-helpers +++ b/webthree-helpers @@ -1 +1 @@ -Subproject commit d1eff3c23813927ad5deff4344752a32cdcfa9ac +Subproject commit a4a08fb3fff9ad7d51664f3ba2eec2e213106d6b From 5469b30aeaae8c3c8673016ccd33ea55241dd03c Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Wed, 11 May 2016 22:10:52 +0000 Subject: [PATCH 55/76] updated submodules --- webthree-helpers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webthree-helpers b/webthree-helpers index a4a08fb3f..2df794a61 160000 --- a/webthree-helpers +++ b/webthree-helpers @@ -1 +1 @@ -Subproject commit a4a08fb3fff9ad7d51664f3ba2eec2e213106d6b +Subproject commit 2df794a61619c36bc8ca42e032f769b25b0eaec4 From e1447a3e3c8cd0c1b466926ffb866bc42a647a6a Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Thu, 12 May 2016 14:25:38 +0000 Subject: [PATCH 56/76] updated submodules --- mix | 2 +- solidity | 2 +- webthree-helpers | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mix b/mix index 91fbfc104..022ff3440 160000 --- a/mix +++ b/mix @@ -1 +1 @@ -Subproject commit 91fbfc1046c80669bddcaaedcaa0109fe13e6c94 +Subproject commit 022ff3440f7a8e5272ef4d1fadbcd9644a67b71c diff --git a/solidity b/solidity index 9e36bdda8..73ede5bb3 160000 --- a/solidity +++ b/solidity @@ -1 +1 @@ -Subproject commit 9e36bdda8a9552f1885e0a63a85db588623b39b2 +Subproject commit 73ede5bb38e41ec2b96899105ef4a5badcb4be68 diff --git a/webthree-helpers b/webthree-helpers index 2df794a61..1dba2727a 160000 --- a/webthree-helpers +++ b/webthree-helpers @@ -1 +1 @@ -Subproject commit 2df794a61619c36bc8ca42e032f769b25b0eaec4 +Subproject commit 1dba2727abd9c01ee537500114082229314ee88a From 64facc9724e1b54c5c5740d7d089613136653280 Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Thu, 12 May 2016 15:37:41 +0000 Subject: [PATCH 57/76] updated submodules --- web3.js | 2 +- webthree-helpers | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web3.js b/web3.js index 3ba32a673..35a06d36d 160000 --- a/web3.js +++ b/web3.js @@ -1 +1 @@ -Subproject commit 3ba32a673426f888d9372591f6d6037bda03118a +Subproject commit 35a06d36d4569517e14cd58a0d602acb7a3be864 diff --git a/webthree-helpers b/webthree-helpers index 1dba2727a..9e4c2a1cf 160000 --- a/webthree-helpers +++ b/webthree-helpers @@ -1 +1 @@ -Subproject commit 1dba2727abd9c01ee537500114082229314ee88a +Subproject commit 9e4c2a1cf1efe7ba89f6db2425ec1fd3687683e2 From 672c65afdf5c75c48eaf5a7c788838624b3a6474 Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Fri, 13 May 2016 01:00:37 +0000 Subject: [PATCH 58/76] updated submodules --- libethereum | 2 +- libweb3core | 2 +- solidity | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libethereum b/libethereum index 1ddd2b956..309501d82 160000 --- a/libethereum +++ b/libethereum @@ -1 +1 @@ -Subproject commit 1ddd2b956caadf3a885346d1d0a99d7e11a6ba57 +Subproject commit 309501d8228e4bc1079c4809416a1c0bbc91f00b diff --git a/libweb3core b/libweb3core index baca8fe1b..c3f31bc89 160000 --- a/libweb3core +++ b/libweb3core @@ -1 +1 @@ -Subproject commit baca8fe1bdfaa1ec8548b828bc6b59727552b9c8 +Subproject commit c3f31bc895f1ec278da4fb5ed2ebfa26c20ff9ef diff --git a/solidity b/solidity index 73ede5bb3..c06051d38 160000 --- a/solidity +++ b/solidity @@ -1 +1 @@ -Subproject commit 73ede5bb38e41ec2b96899105ef4a5badcb4be68 +Subproject commit c06051d38da28dda515e889fe9f565b8b97a68f5 From 338b79194bdcc7d4db5cb4774baecda2d98c3a91 Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Sat, 14 May 2016 03:29:48 +0000 Subject: [PATCH 59/76] updated submodules --- libweb3core | 2 +- solidity | 2 +- webthree | 2 +- webthree-helpers | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libweb3core b/libweb3core index c3f31bc89..03944c60a 160000 --- a/libweb3core +++ b/libweb3core @@ -1 +1 @@ -Subproject commit c3f31bc895f1ec278da4fb5ed2ebfa26c20ff9ef +Subproject commit 03944c60a4795ecc7bdbb2d4fb21f5f663e059db diff --git a/solidity b/solidity index c06051d38..4b445b898 160000 --- a/solidity +++ b/solidity @@ -1 +1 @@ -Subproject commit c06051d38da28dda515e889fe9f565b8b97a68f5 +Subproject commit 4b445b898e49c79f4f0ad80aa656ee33ca5b0ebc diff --git a/webthree b/webthree index e5b1059d5..9918987f1 160000 --- a/webthree +++ b/webthree @@ -1 +1 @@ -Subproject commit e5b1059d56ffac347290abd6420160b4a4da0630 +Subproject commit 9918987f19f9a652c2935eda08da91b845af115b diff --git a/webthree-helpers b/webthree-helpers index 9e4c2a1cf..66bd968fb 160000 --- a/webthree-helpers +++ b/webthree-helpers @@ -1 +1 @@ -Subproject commit 9e4c2a1cf1efe7ba89f6db2425ec1fd3687683e2 +Subproject commit 66bd968fb7f178c90f431885a2b39bcd4d1de887 From 891b514eafba533038f9c4b88ea263e5787be291 Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Tue, 17 May 2016 07:26:07 +0000 Subject: [PATCH 60/76] updated submodules --- solidity | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solidity b/solidity index 4b445b898..c1995e9db 160000 --- a/solidity +++ b/solidity @@ -1 +1 @@ -Subproject commit 4b445b898e49c79f4f0ad80aa656ee33ca5b0ebc +Subproject commit c1995e9dbbb78f27959265793373e2a027f091ba From f90ced355010a07adac148e33ac17f6c729b2374 Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Tue, 17 May 2016 14:19:24 +0000 Subject: [PATCH 61/76] updated submodules --- solidity | 2 +- webthree-helpers | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/solidity b/solidity index c1995e9db..77f3a8544 160000 --- a/solidity +++ b/solidity @@ -1 +1 @@ -Subproject commit c1995e9dbbb78f27959265793373e2a027f091ba +Subproject commit 77f3a85441d7941998df6d3951449cd3af91a1cf diff --git a/webthree-helpers b/webthree-helpers index 66bd968fb..862294cca 160000 --- a/webthree-helpers +++ b/webthree-helpers @@ -1 +1 @@ -Subproject commit 66bd968fb7f178c90f431885a2b39bcd4d1de887 +Subproject commit 862294ccaef647c5a80533456c44fefd1e43cb33 From 8ee89e9c83dae906383956dfb072c39f3c144004 Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Wed, 18 May 2016 03:25:44 +0000 Subject: [PATCH 62/76] updated submodules --- solidity | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solidity b/solidity index 77f3a8544..0a37072e4 160000 --- a/solidity +++ b/solidity @@ -1 +1 @@ -Subproject commit 77f3a85441d7941998df6d3951449cd3af91a1cf +Subproject commit 0a37072e4c0b6413aa7aa37863230f3a0d26b2a9 From 3229ffc68d8dbf365cfd44fe5791970cf1b2f439 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Bylica?= Date: Wed, 18 May 2016 17:02:42 +0200 Subject: [PATCH 63/76] Update webthree-helpers submodule to fix deps submodule issue. --- webthree-helpers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webthree-helpers b/webthree-helpers index 862294cca..a2736dff4 160000 --- a/webthree-helpers +++ b/webthree-helpers @@ -1 +1 @@ -Subproject commit 862294ccaef647c5a80533456c44fefd1e43cb33 +Subproject commit a2736dff4b11823f163a462298441c9faba23f52 From 8570aecb6cb026e08836e7391eb3de63fb4d3824 Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Thu, 19 May 2016 03:24:48 +0000 Subject: [PATCH 64/76] updated submodules --- solidity | 2 +- webthree | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/solidity b/solidity index 0a37072e4..cb865fb2b 160000 --- a/solidity +++ b/solidity @@ -1 +1 @@ -Subproject commit 0a37072e4c0b6413aa7aa37863230f3a0d26b2a9 +Subproject commit cb865fb2b1be9d31b40bbd547c603c2bb81283b1 diff --git a/webthree b/webthree index 9918987f1..fa8e558a2 160000 --- a/webthree +++ b/webthree @@ -1 +1 @@ -Subproject commit 9918987f19f9a652c2935eda08da91b845af115b +Subproject commit fa8e558a28a0072fd2992086d87cb400a9ed9c0c From 19f476d4f81efd860e97b04d21926a3e64a74e0e Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Thu, 19 May 2016 14:55:34 +0000 Subject: [PATCH 65/76] updated submodules --- libethereum | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libethereum b/libethereum index 309501d82..768a347f9 160000 --- a/libethereum +++ b/libethereum @@ -1 +1 @@ -Subproject commit 309501d8228e4bc1079c4809416a1c0bbc91f00b +Subproject commit 768a347f9ef8f2eec7e0ad2730ed9adef5e75bdf From 06a097ff9a54a57940914b1aec3a541cc32210ef Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Fri, 20 May 2016 03:24:30 +0000 Subject: [PATCH 66/76] updated submodules --- solidity | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solidity b/solidity index cb865fb2b..7a51852ae 160000 --- a/solidity +++ b/solidity @@ -1 +1 @@ -Subproject commit cb865fb2b1be9d31b40bbd547c603c2bb81283b1 +Subproject commit 7a51852aee6b5f9625a6640e01760cc4c58e2f08 From 143274e689538e51bf9b5e0d9a0855bad7d704b0 Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Sat, 21 May 2016 03:25:01 +0000 Subject: [PATCH 67/76] updated submodules --- solidity | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solidity b/solidity index 7a51852ae..e3c541854 160000 --- a/solidity +++ b/solidity @@ -1 +1 @@ -Subproject commit 7a51852aee6b5f9625a6640e01760cc4c58e2f08 +Subproject commit e3c54185434e16591e15e94b9f0cbef49c83137c From ac9547b9f3a5223b420b73254ae1131f899bc626 Mon Sep 17 00:00:00 2001 From: Bob Summerwill Date: Sat, 21 May 2016 16:28:23 -0700 Subject: [PATCH 68/76] Added lines to recreate-cpp-ethereum.sh for copying the CircleCI, TravisCI, Appveyor and setup.sh scripts forward. (#522) --- recreate-cpp-ethereum.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/recreate-cpp-ethereum.sh b/recreate-cpp-ethereum.sh index 18136d1a6..e0a093df0 100755 --- a/recreate-cpp-ethereum.sh +++ b/recreate-cpp-ethereum.sh @@ -102,6 +102,12 @@ curl https://raw.githubusercontent.com/bobsummerwill/cpp-ethereum/merge_repos/CM curl https://raw.githubusercontent.com/bobsummerwill/cpp-ethereum/merge_repos/README.md > $outputDirectory/README.md curl https://raw.githubusercontent.com/bobsummerwill/cpp-ethereum/merge_repos/test/CMakeLists.txt > $outputDirectory/test/CMakeLists.txt +# These files could be upstreamed, but it isn't worth doing so, because they can only be used after the repo reorganization. +curl https://raw.githubusercontent.com/bobsummerwill/cpp-ethereum/merge_repos/.travis.yml > $outputDirectory/.travis.yml +curl https://raw.githubusercontent.com/bobsummerwill/cpp-ethereum/merge_repos/appveyor.yml > $outputDirectory/appveyor.yml +curl https://raw.githubusercontent.com/bobsummerwill/cpp-ethereum/merge_repos/circle.yml > $outputDirectory/circle.yml +curl https://raw.githubusercontent.com/bobsummerwill/cpp-ethereum/merge_repos/setup.sh > $outputDirectory/setup.sh + # TODO - evmjit submodule will need "hooking up", for now we'll just git clone it into a local directory to get # the content we need for testing. git clone https://github.com/ethereum/evmjit $outputDirectory/evmjit From e6405ef0e9c30ae452b781964ba77d975be3797a Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Mon, 23 May 2016 03:24:30 +0000 Subject: [PATCH 69/76] updated submodules --- libethereum | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libethereum b/libethereum index 768a347f9..f7ca381e5 160000 --- a/libethereum +++ b/libethereum @@ -1 +1 @@ -Subproject commit 768a347f9ef8f2eec7e0ad2730ed9adef5e75bdf +Subproject commit f7ca381e56201d91ebfb9c07a32b4f9875ab64f6 From 965c2723514aded62e79a86669e7474b2ac6da9a Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Tue, 24 May 2016 03:29:19 +0000 Subject: [PATCH 70/76] updated submodules --- libethereum | 2 +- webthree | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libethereum b/libethereum index f7ca381e5..41e88b7bf 160000 --- a/libethereum +++ b/libethereum @@ -1 +1 @@ -Subproject commit f7ca381e56201d91ebfb9c07a32b4f9875ab64f6 +Subproject commit 41e88b7bfba456d89bdee6ce085f5918ce538a2c diff --git a/webthree b/webthree index fa8e558a2..b5c116fe2 160000 --- a/webthree +++ b/webthree @@ -1 +1 @@ -Subproject commit fa8e558a28a0072fd2992086d87cb400a9ed9c0c +Subproject commit b5c116fe25ec09a4833945a6aa8ffcddb718e93d From 6a471ad169b93da88b79f63961834e76e0ffd73b Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Wed, 25 May 2016 03:24:51 +0000 Subject: [PATCH 71/76] updated submodules --- libethereum | 2 +- solidity | 2 +- web3.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libethereum b/libethereum index 41e88b7bf..bada89b1e 160000 --- a/libethereum +++ b/libethereum @@ -1 +1 @@ -Subproject commit 41e88b7bfba456d89bdee6ce085f5918ce538a2c +Subproject commit bada89b1eb9a87170bff196f2bdf2d4e7d94f2c9 diff --git a/solidity b/solidity index e3c541854..86c65c933 160000 --- a/solidity +++ b/solidity @@ -1 +1 @@ -Subproject commit e3c54185434e16591e15e94b9f0cbef49c83137c +Subproject commit 86c65c9339111b5a8e3ce001bbaa36528d2c0e25 diff --git a/web3.js b/web3.js index 35a06d36d..0f1ab3227 160000 --- a/web3.js +++ b/web3.js @@ -1 +1 @@ -Subproject commit 35a06d36d4569517e14cd58a0d602acb7a3be864 +Subproject commit 0f1ab3227b8985fa5b9cd1fdc75315383f4d7249 From 2c1be031061ab73baef263971ccae58e9c422166 Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Thu, 26 May 2016 03:26:11 +0000 Subject: [PATCH 72/76] updated submodules --- solidity | 2 +- webthree | 2 +- webthree-helpers | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/solidity b/solidity index 86c65c933..3c2056c68 160000 --- a/solidity +++ b/solidity @@ -1 +1 @@ -Subproject commit 86c65c9339111b5a8e3ce001bbaa36528d2c0e25 +Subproject commit 3c2056c688fea3254dbafcd6b1840f84ab5d5700 diff --git a/webthree b/webthree index b5c116fe2..99c3923ff 160000 --- a/webthree +++ b/webthree @@ -1 +1 @@ -Subproject commit b5c116fe25ec09a4833945a6aa8ffcddb718e93d +Subproject commit 99c3923ff4b4a929494c355c083235a85200bd46 diff --git a/webthree-helpers b/webthree-helpers index a2736dff4..01abfbc6b 160000 --- a/webthree-helpers +++ b/webthree-helpers @@ -1 +1 @@ -Subproject commit a2736dff4b11823f163a462298441c9faba23f52 +Subproject commit 01abfbc6b856c6306af60843094f13a155b06fbb From 55d9f19b95dc15921e51667a5778db4f080a8be5 Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Thu, 26 May 2016 07:26:27 +0000 Subject: [PATCH 73/76] updated submodules --- webthree-helpers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webthree-helpers b/webthree-helpers index 01abfbc6b..1d8923ebf 160000 --- a/webthree-helpers +++ b/webthree-helpers @@ -1 +1 @@ -Subproject commit 01abfbc6b856c6306af60843094f13a155b06fbb +Subproject commit 1d8923ebf07e0d864d14bc033e8a552ff3e686fa From c64c27f2556c1466cb7194b2801c95ea7ed3d1ee Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Fri, 27 May 2016 03:24:31 +0000 Subject: [PATCH 74/76] updated submodules --- libethereum | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libethereum b/libethereum index bada89b1e..c867e8d5a 160000 --- a/libethereum +++ b/libethereum @@ -1 +1 @@ -Subproject commit bada89b1eb9a87170bff196f2bdf2d4e7d94f2c9 +Subproject commit c867e8d5a1895f7387e11356ecf6321f717773b6 From 49c8bfe09ddeab46e347771d6611dde657d90647 Mon Sep 17 00:00:00 2001 From: eth-jenkins-bot Date: Fri, 27 May 2016 15:51:34 +0000 Subject: [PATCH 75/76] updated submodules --- alethzero | 2 +- libethereum | 2 +- libweb3core | 2 +- mix | 2 +- solidity | 2 +- webthree | 2 +- webthree-helpers | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/alethzero b/alethzero index 860ca2b1b..6a2a2f0b7 160000 --- a/alethzero +++ b/alethzero @@ -1 +1 @@ -Subproject commit 860ca2b1b907f630a912bdf5269fb140fc026d28 +Subproject commit 6a2a2f0b746052b5e065d47e44a4bacd98c9b2a8 diff --git a/libethereum b/libethereum index c867e8d5a..e63fcb0d1 160000 --- a/libethereum +++ b/libethereum @@ -1 +1 @@ -Subproject commit c867e8d5a1895f7387e11356ecf6321f717773b6 +Subproject commit e63fcb0d1b0174b32193699b792789e58b82ad2c diff --git a/libweb3core b/libweb3core index 03944c60a..53535c63a 160000 --- a/libweb3core +++ b/libweb3core @@ -1 +1 @@ -Subproject commit 03944c60a4795ecc7bdbb2d4fb21f5f663e059db +Subproject commit 53535c63a7ef766daeff3d1cf580519517495361 diff --git a/mix b/mix index 022ff3440..f3d50a8f4 160000 --- a/mix +++ b/mix @@ -1 +1 @@ -Subproject commit 022ff3440f7a8e5272ef4d1fadbcd9644a67b71c +Subproject commit f3d50a8f4f855d9689a50cdc2eab680e849ef414 diff --git a/solidity b/solidity index 3c2056c68..4dc1cb149 160000 --- a/solidity +++ b/solidity @@ -1 +1 @@ -Subproject commit 3c2056c688fea3254dbafcd6b1840f84ab5d5700 +Subproject commit 4dc1cb149c7e3677119b052ae0f7dc7a019fa952 diff --git a/webthree b/webthree index 99c3923ff..5ec02cbee 160000 --- a/webthree +++ b/webthree @@ -1 +1 @@ -Subproject commit 99c3923ff4b4a929494c355c083235a85200bd46 +Subproject commit 5ec02cbeeba4e83d38464ad337f6e811b63f8921 diff --git a/webthree-helpers b/webthree-helpers index 1d8923ebf..4900c17d5 160000 --- a/webthree-helpers +++ b/webthree-helpers @@ -1 +1 @@ -Subproject commit 1d8923ebf07e0d864d14bc033e8a552ff3e686fa +Subproject commit 4900c17d5c2c84ce8f34cc3699218039173e8f42 From ba110f16aa45b326d7187969715f7d728034ba0a Mon Sep 17 00:00:00 2001 From: chriseth Date: Fri, 27 May 2016 17:53:45 +0200 Subject: [PATCH 76/76] Set version to 1.2.5 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8385ea229..abd5b409a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,7 @@ include(EthPolicy) eth_policy() # project name and version should be set after cmake_policy CMP0048 -project(cpp-ethereum VERSION "1.2.4") +project(cpp-ethereum VERSION "1.2.5") include(EthCompilerSettings)