Merge pull request #424 from ethereum/develop

Merge develop branch to release branch for the 1.3.0 release
ethereum · Mar 31, 2016 · 0eb025d · 0eb025d
2 parents f3a75a2 + 075bf91
commit 0eb025d
Show file tree

Hide file tree

Showing 11 changed files with 55 additions and 33 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,3 +1,12 @@
+# Define color codes
+
+if(NOT WIN32)
+  string(ASCII 27 Esc)
+  set(ColourReset "${Esc}[m")
+  set(BoldRed     "${Esc}[1;31m")
+  set(BoldGreen   "${Esc}[1;32m")
+endif()
+
 cmake_minimum_required(VERSION 3.0.0)
 
 set(ETH_CMAKE_DIR "${CMAKE_CURRENT_LIST_DIR}/webthree-helpers/cmake" CACHE PATH "The path to the cmake directory")
@@ -10,11 +19,16 @@ set(WEB3_DIR "${CMAKE_CURRENT_LIST_DIR}/webthree" CACHE PATH "The path to the we
 set(SOL_DIR "${CMAKE_CURRENT_LIST_DIR}/solidity" CACHE PATH "The path to the solidity libraries directory")
 
 # set cmake_policies
+
+if (NOT EXISTS "${CMAKE_CURRENT_LIST_DIR}/webthree-helpers/cmake")
+   message(FATAL_ERROR "${BoldRed}Could not find sub-modules ${BoldGreen}\nDid you use 'git clone --recursive' to checkout all repositories?${ColourReset}")
+endif()
+
 include(EthPolicy)
 eth_policy()
 
 # project name and version should be set after cmake_policy CMP0048
-project(cpp-ethereum VERSION "1.2.2")
+project(cpp-ethereum VERSION "1.2.3")
 
 include(EthCompilerSettings)
 

diff --git a/README.md b/README.md
@@ -1,34 +1,43 @@
-## Ethereum C++ Client.
+# webthree-umbrella
 
-[![Join the chat at https://gitter.im/ethereum/cpp-ethereum](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/ethereum/cpp-ethereum?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+This repository is an umbrella repository with git sub-module references to all of the components of [cpp-ethereum](http://www.ethdocs.org/en/latest/ethereum-clients/cpp-ethereum/), the [Ethereum](http://ethereum.org) C++ client.  The project was initiated by [Gavin Wood](http://gavwood.com/>), the [former CTO](<https://blog.ethereum.org/2016/01/11/last-blog-post/>) of the [Ethereum Foundation](http://www.ethdocs.org/en/latest/introduction/foundation.html), in December 2013.   It is the second most popular of the clients with around [5% of 'market share'](http://ethernodes.org/>), trailing a long way behind
+[go-ethereum](https://github.com/ethereum/go-ethereum).
+
+![C++](http://www.ethdocs.org/en/latest/_images/cpp_35k9.png) 
+![Ethereum](http://www.ethdocs.org/en/latest/_images/ETHEREUM-ICON_Black.png)
 
-By Gav Wood et al*, 2013, 2014, 2015.
+Read more about the project at **[our swanky new website](http://www.ethdocs.org/en/latest/ethereum-clients/cpp-ethereum/)**.
+
+[![Join the chat at https://gitter.im/ethereum/cpp-ethereum](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/ethereum/cpp-ethereum?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
           | Status
 ----------|-----------
 develop   | [![Build Status](http://52.28.164.97/buildStatus/icon?job=ethbinaries-develop)](http://52.28.164.97/job/ethbinaries-develop/)
 release   | [![Build Status](http://52.28.164.97/buildStatus/icon?job=ethbinaries-release)](http://52.28.164.97/job/ethbinaries-release/)
 
-Ethereum is based on a design in an original whitepaper by Vitalik Buterin. This implementation is based on the formal specification of a refinement of that idea detailed in the 'yellow paper' by Gavin Wood. Contributors, builders and testers include:
-
-- *arkpar* (**Arkadiy Paronyan**) Mix, PV61/BlockQueue
-- *debris* (**Marek Kotewicz**) JSONRPC, web3.js
-- *CJentzsch* (**Christoph Jentzsch**) tests, lots of tests
-- *LefterisJP* (**Lefteris Karapetsas**) Solidity, libethash
-- *chriseth* (**Christian Reitwiessner**) Solidity
-- *subtly* (**Alex Leverington**) libp2p, rlpx
-- *yann300* (**Yann Levreau**) Mix
-- *LianaHus* (**Liana Husikyan**) Solidity
-- *chfast* (**Paweł Bylica**) EVMJIT
-- *cubedro* (**Marian Oancea**) web3.js
-- *gluk256* (**Vlad Gluhovsky**) Whisper
-- *programmerTim* (**Tim Hughes**) libethash-cl
-
-And let's not forget: Caktux (neth, ongoing CI), Eric Lombrozo (original MinGW32 cross-compilation), Marko Simovic (original CI).
-
-### Building
-
-See the [Wiki](https://github.com/ethereum/webthree-umbrella/wiki) for build instructions, compatibility information and build tips. 
+The current codebase is the work of many, many hands, with probably close to 100 individual contributors over the course of its development.   Perhaps we will write a script to maintain a 'credits list' at some stage?   In the meantime, here are all of the per-repo contributions:
+
+- [alethzero](https://github.com/ethereum/alethzero/graphs/contributors)
+- [cpp-dependencies](https://github.com/ethereum/cpp-dependencies/graphs/contributors)
+- [cpp-ethereum](https://github.com/ethereum/cpp-ethereum/graphs/contributors)
+- [evmjit](https://github.com/ethereum/evmjit/graphs/contributors)
+- [homebrew-ethereum](https://github.com/ethereum/homebrew-ethereum/graphs/contributors)
+- [libethereum](https://github.com/ethereum/libethereum/graphs/contributors)
+- [libweb3core](https://github.com/ethereum/libweb3core/graphs/contributors)
+- [solidity](https://github.com/ethereum/solidity/graphs/contributors)
+- [web3.js](https://github.com/ethereum/web3.js/graphs/contributors)
+- [webthree](https://github.com/ethereum/webthree/graphs/contributors)
+- [webthree-helpers](https://github.com/ethereum/webthree-helpers/graphs/contributors)
+- [webthree-umbrella](https://github.com/ethereum/webthree-umbrella/graphs/contributors)
+
+The following individuals are currently employed or contracted by the Ethereum Foundation for C++ client work:
+
+- [Greg Colvin](https://github.com/gcolvin)
+- [Liana Husikyan](https://github.com/LianaHus)
+- [Dimitry Khoklov](https://github.com/winsvega)
+- [Yann Levreau](https://github.com/yann300)
+- [Christian Reitwiessner](https://github.com/chriseth) - C++ Lead
+- [Bob Summerwill](https://github.com/bobsummerwill)
 
 ### Testing
 

diff --git a/alethzero b/alethzero
diff --git a/dependency_graph/generate.py b/dependency_graph/generate.py
@@ -167,7 +167,6 @@ def processUmbrella(root):
 # to go with it, because the library is only used by the Aleth* applications,
 # and is not exposed to other applications.
 print '    "AlethZero" -> "aleth"'
-print '    "AlethOne" -> "aleth"'
 
 processUmbrella('..')
 

diff --git a/libethereum b/libethereum
diff --git a/libweb3core b/libweb3core
diff --git a/mix b/mix
diff --git a/solidity b/solidity
diff --git a/web3.js b/web3.js
diff --git a/webthree b/webthree
diff --git a/webthree-helpers b/webthree-helpers
+1 −2		CMakeLists.txt
+2 −60		README.md
+0 −257		alethone/AlethOne.cpp
+0 −69		alethone/AlethOne.h
+ −		alethone/AlethOne.png
+0 −764		alethone/AlethOne.ui
+0 −19		alethone/CMakeLists.txt
+0 −38		alethone/EthereumMacOSXBundleInfo.plist.in
+ −		alethone/alethone.icns
+ −		alethone/alethone.ico
+0 −8		alethone/alethone.qrc
+0 −1		alethone/alethone.rc
+0 −11		alethone/main.cpp
+ −		alethone/power-off.png
+ −		alethone/power-on.png
+ −		alethone/withdraw.png
+1 −1		alethzero/CMakeLists.txt
+3 −2		alethzero/TransactDialog.cpp
+3 −3		alethzero/plugins/browser/Browser.cpp
+1 −1		alethzero/plugins/transactions/InjectTransactions.cpp
+1 −3		libaleth/JSResources.cmake
+1 −16		CMakeLists.txt
+2 −1		README.md
+1 −1		ethminer/MinerAux.h
+15 −11		ethvm/main.cpp
+11 −0		evmjit/CMakeLists.txt
+0 −1		evmjit/libevmjit/support/Path.cpp
+1 −2		libethereum/Account.cpp
+0 −1		libethereum/Account.h
+0 −1		libethereum/BlockChain.cpp
+3 −7		libethereum/BlockChainSync.cpp
+6 −0		libethereum/BlockQueue.cpp
+2 −0		libethereum/BlockQueue.h
+1 −1		libethereum/CMakeLists.txt
+5 −5		libethereum/EthereumHost.cpp
+0 −545		libevmasm/Assembly.cpp
+0 −151		libevmasm/Assembly.h
+0 −134		libevmasm/AssemblyItem.cpp
+0 −123		libevmasm/AssemblyItem.h
+0 −126		libevmasm/BlockDeduplicator.cpp
+0 −77		libevmasm/BlockDeduplicator.h
+0 −14		libevmasm/CMakeLists.txt
+0 −506		libevmasm/CommonSubexpressionEliminator.cpp
+0 −183		libevmasm/CommonSubexpressionEliminator.h
+0 −225		libevmasm/ConstantOptimiser.cpp
+0 −155		libevmasm/ConstantOptimiser.h
+0 −369		libevmasm/ControlFlowGraph.cpp
+0 −120		libevmasm/ControlFlowGraph.h
+0 −37		libevmasm/Exceptions.h
+0 −511		libevmasm/ExpressionClasses.cpp
+0 −190		libevmasm/ExpressionClasses.h
+0 −217		libevmasm/GasMeter.cpp
+0 −102		libevmasm/GasMeter.h
+0 −411		libevmasm/KnownState.cpp
+0 −179		libevmasm/KnownState.h
+0 −62		libevmasm/LinkerObject.cpp
+0 −55		libevmasm/LinkerObject.h
+0 −128		libevmasm/PathGasMeter.cpp
+0 −66		libevmasm/PathGasMeter.h
+0 −181		libevmasm/SemanticInformation.cpp
+0 −59		libevmasm/SemanticInformation.h
+0 −102		libevmasm/SourceLocation.h
+0 −38		libevmasm/Version.cpp
+0 −36		libevmasm/Version.h
+0 −6		liblll/All.h
+0 −23		liblll/CMakeLists.txt
+0 −586		liblll/CodeFragment.cpp
+0 −64		liblll/CodeFragment.h
+0 −95		liblll/Compiler.cpp
+0 −38		liblll/Compiler.h
+0 −82		liblll/CompilerState.cpp
+0 −57		liblll/CompilerState.h
+0 −44		liblll/Exceptions.h
+0 −145		liblll/Parser.cpp
+0 −41		liblll/Parser.h
+0 −11		lllc/CMakeLists.txt
+0 −124		lllc/main.cpp
+4 −1		test/BlockChainHelper.cpp
+0 −4		test/CMakeLists.txt
+52 −3		test/TestHelper.cpp
+2 −0		test/TestHelper.h
+9 −0		test/boostTest.cpp
+7 −3		test/libethereum/BlockChain.cpp
+399 −103		test/libethereum/StateTestsFiller/Homestead/stCallCodesFiller.json
+215 −131		test/libethereum/StateTestsFiller/Homestead/stCallDelegateCodesCallCodeFiller.json
+231 −132		test/libethereum/StateTestsFiller/Homestead/stCallDelegateCodesFiller.json
+1 −1		test/libethereum/StateTestsFiller/Homestead/stDelegatecallTestFiller.json
+2 −2		test/libethereum/StateTestsFiller/Homestead/stLogTestsFiller.json
+2 −2		test/libethereum/StateTestsFiller/Homestead/stPreCompiledContractsFiller.json
+462 −110		test/libethereum/StateTestsFiller/stCallCodesFiller.json
+2 −2		test/libethereum/StateTestsFiller/stLogTestsFiller.json
+2 −2		test/libethereum/StateTestsFiller/stPreCompiledContractsFiller.json
+1 −2		test/libethereum/TransactionQueue.cpp
+0 −1		test/libevm/vm.h
+0 −5		test/libjsengine/CMakeLists.txt
+0 −71		test/libjsengine/JSV8Engine.cpp
+4 −1		CMakeLists.txt
+444 −0		docs/control-structures.rst
+35 −0		docs/frequently-asked-questions.rst
+1 −0		docs/installing-solidity.rst
+0 −2		docs/structure-of-a-contract.rst
+8 −2		docs/style-guide.rst
+21 −0		docs/types.rst
+545 −0		libevmasm/Assembly.cpp
+151 −0		libevmasm/Assembly.h
+134 −0		libevmasm/AssemblyItem.cpp
+123 −0		libevmasm/AssemblyItem.h
+126 −0		libevmasm/BlockDeduplicator.cpp
+77 −0		libevmasm/BlockDeduplicator.h
+15 −0		libevmasm/CMakeLists.txt
+506 −0		libevmasm/CommonSubexpressionEliminator.cpp
+183 −0		libevmasm/CommonSubexpressionEliminator.h
+225 −0		libevmasm/ConstantOptimiser.cpp
+155 −0		libevmasm/ConstantOptimiser.h
+369 −0		libevmasm/ControlFlowGraph.cpp
+120 −0		libevmasm/ControlFlowGraph.h
+37 −0		libevmasm/Exceptions.h
+511 −0		libevmasm/ExpressionClasses.cpp
+190 −0		libevmasm/ExpressionClasses.h
+217 −0		libevmasm/GasMeter.cpp
+102 −0		libevmasm/GasMeter.h
+411 −0		libevmasm/KnownState.cpp
+179 −0		libevmasm/KnownState.h
+62 −0		libevmasm/LinkerObject.cpp
+55 −0		libevmasm/LinkerObject.h
+128 −0		libevmasm/PathGasMeter.cpp
+66 −0		libevmasm/PathGasMeter.h
+181 −0		libevmasm/SemanticInformation.cpp
+59 −0		libevmasm/SemanticInformation.h
+102 −0		libevmasm/SourceLocation.h
+38 −0		libevmasm/Version.cpp
+36 −0		libevmasm/Version.h
+6 −0		liblll/All.h
+23 −0		liblll/CMakeLists.txt
+586 −0		liblll/CodeFragment.cpp
+64 −0		liblll/CodeFragment.h
+95 −0		liblll/Compiler.cpp
+38 −0		liblll/Compiler.h
+82 −0		liblll/CompilerState.cpp
+57 −0		liblll/CompilerState.h
+44 −0		liblll/Exceptions.h
+145 −0		liblll/Parser.cpp
+41 −0		liblll/Parser.h
+2 −1		libsolidity/CMakeLists.txt
+22 −0		libsolidity/analysis/ReferencesResolver.cpp
+1 −0		libsolidity/analysis/ReferencesResolver.h
+57 −0		libsolidity/analysis/TypeChecker.cpp
+1 −0		libsolidity/analysis/TypeChecker.h
+7 −0		libsolidity/ast/AST.cpp
+30 −0		libsolidity/ast/AST.h
+11 −0		libsolidity/ast/ASTAnnotations.h
+10 −0		libsolidity/ast/ASTJsonConverter.cpp
+2 −0		libsolidity/ast/ASTJsonConverter.h
+12 −0		libsolidity/ast/ASTPrinter.cpp
+2 −0		libsolidity/ast/ASTPrinter.h
+4 −0		libsolidity/ast/ASTVisitor.h
+12 −0		libsolidity/ast/AST_accept.h
+86 −0		libsolidity/codegen/Compiler.cpp
+1 −0		libsolidity/codegen/Compiler.h
+2 −0		libsolidity/codegen/CompilerContext.h
+2 −1		libsolidity/codegen/ExpressionCompiler.cpp
+1 −1		libsolidity/formal/Why3Translator.cpp
+263 −0		libsolidity/inlineasm/AsmCodeGen.cpp
+66 −0		libsolidity/inlineasm/AsmCodeGen.h
+64 −0		libsolidity/inlineasm/AsmData.h
+221 −0		libsolidity/inlineasm/AsmParser.cpp
+58 −0		libsolidity/inlineasm/AsmParser.h
+47 −0		libsolidity/inlineasm/AsmStack.cpp
+59 −0		libsolidity/inlineasm/AsmStack.h
+11 −7		libsolidity/interface/SourceReferenceFormatter.cpp
+2 −1		libsolidity/interface/SourceReferenceFormatter.h
+21 −0		libsolidity/parsing/Parser.cpp
+1 −0		libsolidity/parsing/Parser.h
+12 −0		lllc/CMakeLists.txt
+124 −0		lllc/main.cpp
+57 −4		solc/CommandLineInterface.cpp
+9 −1		solc/CommandLineInterface.h
+12 −6		solc/jsonCompiler.cpp
+9 −1		test/boostTest.cpp
+9 −0		test/contracts/FixedFeeRegistrar.cpp
+9 −0		test/contracts/Wallet.cpp
+155 −0		test/libsolidity/InlineAssembly.cpp
+89 −0		test/libsolidity/SolidityEndToEndTest.cpp
+1 −1		test/libsolidity/SolidityNameAndTypeResolution.cpp
+1 −1		test/libsolidity/SolidityParser.cpp
+1 −6		CMakeLists.txt
+2 −1		README.md
+1 −2		eth/CMakeLists.txt
+4 −73		eth/main.cpp
+0 −13		libjsconsole/CMakeLists.txt
+0 −66		libjsconsole/CURLRequest.cpp
+0 −58		libjsconsole/CURLRequest.h
+0 −24		libjsconsole/JSConsole.cpp
+0 −113		libjsconsole/JSConsole.h
+0 −24		libjsconsole/JSLocalConsole.cpp
+0 −45		libjsconsole/JSLocalConsole.h
+0 −23		libjsconsole/JSRemoteConsole.cpp
+0 −48		libjsconsole/JSRemoteConsole.h
+0 −54		libjsconsole/JSV8Connector.cpp
+0 −55		libjsconsole/JSV8Connector.h
+0 −35		libjsconsole/JSV8RemoteConnector.cpp
+0 −52		libjsconsole/JSV8RemoteConnector.h
+0 −22		libjsengine/CMakeLists.txt
+0 −4		libjsengine/Common.js
+0 −36		libjsengine/JSEngine.cpp
+0 −69		libjsengine/JSEngine.h
+0 −23		libjsengine/JSPrinter.cpp
+0 −43		libjsengine/JSPrinter.h
+0 −8		libjsengine/JSResources.cmake
+0 −237		libjsengine/JSV8Engine.cpp
+0 −65		libjsengine/JSV8Engine.h
+0 −48		libjsengine/JSV8Printer.cpp
+0 −45		libjsengine/JSV8Printer.h
+0 −103		libjsengine/JSV8RPC.cpp
+0 −47		libjsengine/JSV8RPC.h
+0 −101		libjsengine/PrettyPrint.js
+0 −1		libweb3jsonrpc/CMakeLists.txt
+19 −88		libweb3jsonrpc/Eth.cpp
+1 −4		libweb3jsonrpc/Eth.h
+7 −25		libweb3jsonrpc/EthFace.h
+0 −1		libweb3jsonrpc/JsonHelper.cpp
+1 −4		libweb3jsonrpc/eth.json
+5 −2		libwebthree/libexecstream/exec-stream.cpp
+0 −40		test/libweb3jsonrpc/WebThreeStubClient.h
+9 −0		test/libwhisper/whisperDB.cpp
+8 −1		test/test.cpp
+21 −0		LICENSE
+3 −0		README.md
+40 −20		cmake/EthCompilerSettings.cmake
+1 −5		cmake/EthExecutableHelper.cmake
+0 −4		cmake/EthOptions.cmake
+1 −1		cmake/FindEth.cmake
+0 −34		cmake/FindReadline.cmake
+24 −20		cmake/FindSolidity.cmake
+1 −1		cmake/FindWeb3.cmake
+0 −69		cmake/Findv8.cmake
+1 −11		cmake/UseEth.cmake
+1 −1		cmake/UseJsonRpc.cmake
+0 −12		cmake/UseReadline.cmake
+17 −4		cmake/UseSolidity.cmake
+0 −17		cmake/UseV8.cmake
+0 −11		cmake/UseWeb3.cmake
+0 −1		cmake/scripts/appdmg.cmake
+1 −2		extdep/getstuff.bat
+1 −1		homebrew/INSTALL_RECEIPT.json
+3 −71		homebrew/README.md
+2 −7		homebrew/cpp-ethereum.rb.in
+1 −1		scripts/ethbinaries.sh
+1 −1		utils/CMakeLists.txt