Merge pull request #5079 from ethereum/rename-to-aleth

Rename to aleth

CMakeLists.txt

@@ -1,8 +1,3 @@
-#------------------------------------------------------------------------------
-# Top-level CMake file for cpp-ethereum.
-#
-# The documentation for cpp-ethereum is hosted at http://cpp-ethereum.org
-#
 # ------------------------------------------------------------------------------
 # This file is part of cpp-ethereum.
 #
@@ -35,8 +30,6 @@ cable_configure_toolchain(DEFAULT cxx11)
 set(ETH_CMAKE_DIR "${CMAKE_CURRENT_LIST_DIR}/cmake" CACHE PATH "The path to the cmake directory")
 list(APPEND CMAKE_MODULE_PATH ${ETH_CMAKE_DIR})
 
-set(CPP_ETHEREUM_DIR "${CMAKE_CURRENT_LIST_DIR}" CACHE PATH "Path to the root directory for cpp-ethereum")
-
 # Map current configuration to configurations of imported targets.
 set(CMAKE_MAP_IMPORTED_CONFIG_DEBUG Release)
 set(CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO Release)
@@ -62,7 +55,7 @@ HunterGate(
     LOCAL
 )
 
-project(cpp-ethereum)
+project(aleth)
 set(PROJECT_VERSION 1.4.0.dev1)
 
 if (NOT EXISTS ${CMAKE_SOURCE_DIR}/evmjit/.git)

README.md

@@ -1,11 +1,8 @@
-# cpp-ethereum - Ethereum C++ client
+# Aleth – Ethereum C++ client, tools and libraries
 
-This repository contains [cpp-ethereum](http://cpp-ethereum.org), the [Ethereum](https://ethereum.org) C++ client.
-
-It is the third most popular of the Ethereum clients, behind [geth](https://github.com/ethereum/go-ethereum) (the [go](https://golang.org)
-client) and [Parity](https://github.com/paritytech/parity) (the [rust](https://www.rust-lang.org/) client).  The code is 
-[portable](http://cpp-ethereum.org/portability.html) and has been used successfully on a very broad range
-of operating systems and hardware.
+> The collection of C++ libraries and tools for Ethereum, 
+> formerly known as _cpp-ethereum_ project.
+> This includes the full Ethereum client **aleth**.
 
 
 ## Contact
@@ -111,28 +108,28 @@ cmake --build .        # Build all default targets.
 On **Windows** Visual Studio 2015 is required. You should generate Visual Studio 
 solution file (.sln) for 64-bit architecture by adding 
 `-G "Visual Studio 14 2015 Win64"` argument to the CMake configure command.
-After configuration is completed, the `cpp-ethereum.sln` can be found in the
+After configuration is completed, the `aleth.sln` can be found in the
 `build` directory.
 
 ```shell
 cmake .. -G "Visual Studio 14 2015 Win64"
 ```
 
-## Contributing
+## Contribute
 
 [![Contributors](https://img.shields.io/github/contributors/ethereum/cpp-ethereum.svg)](https://github.com/ethereum/cpp-ethereum/graphs/contributors)
 [![Gitter](https://img.shields.io/gitter/room/ethereum/cpp-ethereum.svg)](https://gitter.im/ethereum/cpp-ethereum)
-[![up-for-grabs](https://img.shields.io/github/issues-raw/ethereum/cpp-ethereum/up-for-grabs.svg)](https://github.com/ethereum/cpp-ethereum/labels/up-for-grabs)
+[![up-for-grabs](https://img.shields.io/github/issues-raw/ethereum/cpp-ethereum/help%20wanted.svg)](https://github.com/ethereum/cpp-ethereum/labels/help%20wanted)
 
-The current codebase is the work of many, many hands, with nearly 100
+The current codebase is the work of many, many hands, with over 100
 [individual contributors](https://github.com/ethereum/cpp-ethereum/graphs/contributors) over the course of its development.
 
 Our day-to-day development chat happens on the
 [cpp-ethereum](https://gitter.im/ethereum/cpp-ethereum) Gitter channel.
 
 All contributions are welcome! We try to keep a list of tasks that are suitable
 for newcomers under the tag 
-[up-for-grabs](https://github.com/ethereum/cpp-ethereum/labels/up-for-grabs).
+[help wanted](https://github.com/ethereum/cpp-ethereum/labels/help%20wanted).
 If you have any questions, please just ask.
 
 Please read [CONTRIBUTING](CONTRIBUTING.md) and [CODING_STYLE](CODING_STYLE.md) 

aleth/MinerAux.h

@@ -16,9 +16,7 @@
     You should have received a copy of the GNU General Public License
     along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
 */
-/** @file MinerAux.cpp
- * @author Gav Wood <i@gavwood.com>
- * @date 2014
+/** @file
  * CLI module for mining.
  */
 
@@ -29,29 +27,6 @@
 #include <libethashseal/Ethash.h>
 #include <libethashseal/EthashCPUMiner.h>
 
-// TODO - having using derivatives in header files is very poor style, and we need to fix these up.
-//
-// http://stackoverflow.com/questions/4872373/why-is-including-using-namespace-into-a-header-file-a-bad-idea-in-c
-// 
-// "However you'll virtually never see a using directive in a header file (at least not outside of scope).
-// The reason is that using directive eliminate the protection of that particular namespace, and the effect last
-// until the end of current compilation unit. If you put a using directive (outside of a scope) in a header file,
-// it means that this loss of "namespace protection" will occur within any file that include this header,
-// which often mean other header files."
-//
-// Bob has already done just that in https://github.com/bobsummerwill/cpp-ethereum/commits/cmake_fixes/ethminer,
-// and we should apply those changes back to 'develop'.  It is probably best to defer that cleanup
-// until after attempting to backport the Genoil ethminer changes, because they are fairly extensive
-// in terms of lines of change, though all the changes are just adding explicit namespace prefixes.
-// So let's start with just the subset of changes which minimizes the #include dependencies.
-//
-// See https://github.com/bobsummerwill/cpp-ethereum/commit/53af845268b91bc6aa1dab53a6eac675157a072b
-// See https://github.com/bobsummerwill/cpp-ethereum/commit/3b9e581d7c04c637ebda18d3d86b5a24d29226f4
-//
-// More generally, the fact that nearly all of the code for ethminer is actually in the 'MinerAux.h'
-// header file, rather than in a source file, is also poor style and should probably be addressed.
-// Perhaps there is some historical reason for this which I am unaware of?
-
 using namespace std;
 using namespace dev;
 using namespace dev::eth;
@@ -66,15 +41,6 @@ bool isFalse(std::string const& _m)
     return _m == "off" || _m == "no" || _m == "false" || _m == "0";
 }
 
-inline std::string credits()
-{
-    std::ostringstream out;
-    out << "cpp-ethereum " << dev::Version << endl
-        << "   By cpp-ethereum contributors, (c) 2013-2018." << endl
-        << "   See the README for contributors and credits." << endl;
-    return out.str();
-}
-
 class BadArgument: public Exception {};
 
 class MinerCLI

aleth/main.cpp

@@ -76,15 +76,6 @@ namespace
 std::atomic<bool> g_silence = {false};
 unsigned const c_lineWidth = 160;
 
-string ethCredits(bool _interactive = false)
-{
-    std::ostringstream cout;
-    if (_interactive)
-        cout
-            << "Type 'exit' to quit\n\n";
-    return credits() + cout.str();
-}
-
 void version()
 {
     const auto* buildinfo = aleth_get_buildinfo();
@@ -760,7 +751,7 @@ int main(int argc, char** argv)
     if (vm.count("help"))
     {
         cout << "NAME:\n"
-             << credits() << '\n'
+             << "   aleth " << Version << '\n'
              << "USAGE:\n"
              << "   aleth [options]\n\n"
              << "WALLET USAGE:\n";
@@ -802,7 +793,7 @@ int main(int argc, char** argv)
         chainParams = ChainParams(genesisInfo(eth::Network::MainNetwork), genesisStateRoot(eth::Network::MainNetwork));
 
     if (loggingOptions.verbosity > 0)
-        cout << EthGrayBold "cpp-ethereum, a C++ Ethereum client" EthReset << "\n";
+        cout << EthGrayBold "aleth, a C++ Ethereum client" EthReset << "\n";
 
     m.execute();
 
@@ -998,7 +989,7 @@ int main(int argc, char** argv)
         keyManager.import(s, "Imported key (UNSAFE)");
     }
 
-    cout << ethCredits();
+    cout << "aleth " << Version << "\n";
 
     if (mode == OperationMode::ImportSnapshot)
     {

appveyor.yml

@@ -1,8 +1,3 @@
-#------------------------------------------------------------------------------
-# Appveyor configuration file for cpp-ethereum.
-#
-# The documentation for cpp-ethereum is hosted at http://cpp-ethereum.org
-#
 # ------------------------------------------------------------------------------
 # This file is part of cpp-ethereum.
 #
@@ -57,8 +52,8 @@ test_script:
     - cd %APPVEYOR_BUILD_FOLDER%
     - scripts\tests.bat %TESTS% %CONFIGURATION% %APPVEYOR_BUILD_FOLDER% %ETHEREUM_DEPS_PATH%
 artifacts:
-  - path: build\cpp-ethereum.zip
-    name: cpp-ethereum-windows.zip
+  - path: build\aleth.zip
+    name: aleth-windows.zip
 
 # This is the deploy target for Windows which generates ZIPs per commit.
 # We are in agreement that generating ZIPs per commit for the develop
@@ -78,6 +73,6 @@ deploy:
     provider: GitHub
     auth_token:
         secure: yukM9mHUbzuZSS5WSBLKSW0yGJerJEqAXkFhDhSHBBcKJE7GAryjQsdO9Kxh3yRv
-    artifact: cpp-ethereum-windows.zip
+    artifact: aleth-windows.zip
     on:
         branch: release

circle.yml

@@ -50,8 +50,8 @@ defaults:
 
   store-package: &store-package
     store_artifacts:
-      path: ~/build/cpp-ethereum.tar.gz
-      destination: cpp-ethereum.tar.gz
+      path: ~/build/aleth.tar.gz
+      destination: aleth.tar.gz
 
   store-randomcode-seed: &store-randomcode-seed
     store_artifacts:
@@ -204,7 +204,7 @@ jobs:
 # TODO: Separate builds from testing jobs.
 workflows:
   version: 2
-  cpp-ethereum:
+  aleth:
     jobs:
       - macos-xcode90
       - linux-clang6