From 2a53d5f751439474762cb5527eb164e3b5f177f7 Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Thu, 6 Feb 2014 18:53:46 +0000 Subject: [PATCH] AlephZero renamed AlethZero and moved to cmake project. Other minor changes. --- CMakeLists.txt | 3 ++ alethzero/CMakeLists.txt | 16 ++++++++ {alephzero => alethzero}/Main.ui | 4 +- {alephzero => alethzero}/MainWin.cpp | 53 +++++--------------------- {alephzero => alethzero}/MainWin.h | 0 {alephzero => alethzero}/alephzero.pro | 0 {alephzero => alethzero}/main.cpp | 0 eth/main.cpp | 2 +- libethereum/AddressState.cpp | 2 +- libethereum/AddressState.h | 2 +- libethereum/BlockChain.cpp | 4 +- libethereum/BlockChain.h | 2 +- libethereum/BlockInfo.h | 2 +- libethereum/Client.cpp | 2 +- libethereum/Client.h | 2 +- libethereum/Common.cpp | 42 +++++++++++++++++++- libethereum/Common.h | 4 +- libethereum/MemTrie.cpp | 2 +- libethereum/MemTrie.h | 2 +- libethereum/PeerNetwork.cpp | 2 +- libethereum/PeerNetwork.h | 2 +- libethereum/RLP.cpp | 2 +- libethereum/RLP.h | 2 +- libethereum/State.cpp | 2 +- libethereum/State.h | 2 +- libethereum/Transaction.cpp | 2 +- libethereum/Transaction.h | 2 +- libethereum/TransactionQueue.cpp | 2 +- libethereum/TransactionQueue.h | 2 +- libethereum/TrieCommon.cpp | 2 +- libethereum/TrieCommon.h | 2 +- libethereum/TrieDB.cpp | 2 +- libethereum/TrieDB.h | 2 +- libethereum/TrieHash.cpp | 2 +- libethereum/TrieHash.h | 2 +- test/crypto.cpp | 2 +- test/dagger.cpp | 2 +- test/hexPrefix.cpp | 2 +- test/main.cpp | 2 +- test/peer.cpp | 2 +- test/rlp.cpp | 2 +- test/state.cpp | 2 +- test/trie.cpp | 2 +- 43 files changed, 111 insertions(+), 81 deletions(-) create mode 100644 alethzero/CMakeLists.txt rename {alephzero => alethzero}/Main.ui (98%) rename {alephzero => alethzero}/MainWin.cpp (73%) rename {alephzero => alethzero}/MainWin.h (100%) rename {alephzero => alethzero}/alephzero.pro (100%) rename {alephzero => alethzero}/main.cpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 75f81c8f1..5dd4c0928 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,8 @@ project(ethereum) cmake_minimum_required(VERSION 2.8) +set(CMAKE_AUTOMOC ON) + cmake_policy(SET CMP0015 NEW) # Initialize CXXFLAGS. @@ -74,3 +76,4 @@ add_subdirectory(secp256k1) add_subdirectory(libethereum) add_subdirectory(test) add_subdirectory(eth) +add_subdirectory(alethzero) diff --git a/alethzero/CMakeLists.txt b/alethzero/CMakeLists.txt new file mode 100644 index 000000000..7e50a171c --- /dev/null +++ b/alethzero/CMakeLists.txt @@ -0,0 +1,16 @@ +cmake_policy(SET CMP0015 NEW) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) +aux_source_directory(. SRC_LIST) + +include_directories(..) +link_directories(../libethereum) + +find_package(Qt5Widgets REQUIRED) + +add_executable(alethzero Main.ui ${SRC_LIST}) +qt5_wrap_ui(ui_Main.h Main.ui) + +qt5_use_modules(alethzero Widgets Network ) +target_link_libraries(alethzero ethereum) + diff --git a/alephzero/Main.ui b/alethzero/Main.ui similarity index 98% rename from alephzero/Main.ui rename to alethzero/Main.ui index de452a125..d2f4e893e 100644 --- a/alephzero/Main.ui +++ b/alethzero/Main.ui @@ -6,12 +6,12 @@ 0 0 - 978 + 991 556 - AlephZero Ethereum Client + AlethZero Ethereum Client true diff --git a/alephzero/MainWin.cpp b/alethzero/MainWin.cpp similarity index 73% rename from alephzero/MainWin.cpp rename to alethzero/MainWin.cpp index 56bab0a5f..6e8bc64fc 100644 --- a/alephzero/MainWin.cpp +++ b/alethzero/MainWin.cpp @@ -10,7 +10,7 @@ using namespace eth; Main::Main(QWidget *parent) : QDialog(parent), ui(new Ui::Main), - m_client("AlephZero/v0.1") + m_client("AlethZero/v0.1") { setWindowFlags(Qt::Window); ui->setupUi(this); @@ -44,16 +44,22 @@ Main::~Main() void Main::writeSettings() { - QSettings s("ethereum", "alephzero"); + QSettings s("ethereum", "alethzero"); QByteArray b; b.resize(32); memcpy(b.data(), &m_myKey, 32); s.setValue("address", b); + + // TODO: save peers - implement it in PeerNetwork though returning RLP bytes + /*for (uint i = 0; !s.value(QString("peer%1").arg(i)).isNull(); ++i) + { + s.value(QString("peer%1").arg(i)).toString(); + }*/ } void Main::readSettings() { - QSettings s("ethereum", "alephzero"); + QSettings s("ethereum", "alethzero"); QByteArray b = s.value("address").toByteArray(); if (b.isEmpty()) m_myKey = KeyPair::create(); @@ -67,52 +73,13 @@ void Main::readSettings() writeSettings(); + // TODO: restore peers - implement it in PeerNetwork though giving RLP bytes /*for (uint i = 0; !s.value(QString("peer%1").arg(i)).isNull(); ++i) { s.value(QString("peer%1").arg(i)).toString(); }*/ } -std::string formatBalance(u256 _b) -{ - static const vector> c_units = - { - {((((u256(1000000000) * 1000000000) * 1000000000) * 1000000000) * 1000000000) * 1000000000, "Uether"}, - {((((u256(1000000000) * 1000000000) * 1000000000) * 1000000000) * 1000000000) * 1000000, "Vether"}, - {((((u256(1000000000) * 1000000000) * 1000000000) * 1000000000) * 1000000000) * 1000, "Dether"}, - {(((u256(1000000000) * 1000000000) * 1000000000) * 1000000000) * 1000000000, "Nether"}, - {(((u256(1000000000) * 1000000000) * 1000000000) * 1000000000) * 1000000, "Yether"}, - {(((u256(1000000000) * 1000000000) * 1000000000) * 1000000000) * 1000, "Zether"}, - {((u256(1000000000) * 1000000000) * 1000000000) * 1000000000, "Eether"}, - {((u256(1000000000) * 1000000000) * 1000000000) * 1000000, "Pether"}, - {((u256(1000000000) * 1000000000) * 1000000000) * 1000, "Tether"}, - {(u256(1000000000) * 1000000000) * 1000000000, "Gether"}, - {(u256(1000000000) * 1000000000) * 1000000, "Mether"}, - {(u256(1000000000) * 1000000000) * 1000, "Kether"}, - {u256(1000000000) * 1000000000, "ether"}, - {u256(1000000000) * 1000000, "finney"}, - {u256(1000000000) * 1000, "szabo"}, - {u256(1000000000), "Gwei"}, - {u256(1000000), "Mwei"}, - {u256(1000), "Kwei"} - }; - ostringstream ret; - if (_b > c_units[0].first * 10000) - { - ret << (_b / c_units[0].first) << " " << c_units[0].second; - return ret.str(); - } - ret << setprecision(5); - for (auto const& i: c_units) - if (_b >= i.first * 100) - { - ret << (double(_b / (i.first / 1000)) / 1000.0) << " " << i.second; - return ret.str(); - } - ret << _b << " wei"; - return ret.str(); -} - void Main::refresh() { m_client.lock(); diff --git a/alephzero/MainWin.h b/alethzero/MainWin.h similarity index 100% rename from alephzero/MainWin.h rename to alethzero/MainWin.h diff --git a/alephzero/alephzero.pro b/alethzero/alephzero.pro similarity index 100% rename from alephzero/alephzero.pro rename to alethzero/alephzero.pro diff --git a/alephzero/main.cpp b/alethzero/main.cpp similarity index 100% rename from alephzero/main.cpp rename to alethzero/main.cpp diff --git a/eth/main.cpp b/eth/main.cpp index db1bfc871..3d87c9732 100644 --- a/eth/main.cpp +++ b/eth/main.cpp @@ -3,7 +3,7 @@ cpp-ethereum is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Foobar is distributed in the hope that it will be useful, diff --git a/libethereum/AddressState.cpp b/libethereum/AddressState.cpp index 5fa80962c..49adf882a 100644 --- a/libethereum/AddressState.cpp +++ b/libethereum/AddressState.cpp @@ -3,7 +3,7 @@ cpp-ethereum is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Foobar is distributed in the hope that it will be useful, diff --git a/libethereum/AddressState.h b/libethereum/AddressState.h index 5a8edfb05..8b063c3ac 100644 --- a/libethereum/AddressState.h +++ b/libethereum/AddressState.h @@ -3,7 +3,7 @@ cpp-ethereum is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Foobar is distributed in the hope that it will be useful, diff --git a/libethereum/BlockChain.cpp b/libethereum/BlockChain.cpp index 923cf5aac..2566d33f1 100644 --- a/libethereum/BlockChain.cpp +++ b/libethereum/BlockChain.cpp @@ -3,7 +3,7 @@ cpp-ethereum is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Foobar is distributed in the hope that it will be useful, @@ -76,7 +76,9 @@ BlockChain::BlockChain(std::string _path, bool _killExisting) ldb::Options o; o.create_if_missing = true; auto s = ldb::DB::Open(o, _path + "/blocks", &m_db); + assert(m_db); s = ldb::DB::Open(o, _path + "/details", &m_detailsDB); + assert(m_detailsDB); // Initialise with the genesis as the last block on the longest chain. m_genesisHash = BlockInfo::genesis().hash; diff --git a/libethereum/BlockChain.h b/libethereum/BlockChain.h index ad3e73ed9..524e75a55 100644 --- a/libethereum/BlockChain.h +++ b/libethereum/BlockChain.h @@ -3,7 +3,7 @@ cpp-ethereum is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Foobar is distributed in the hope that it will be useful, diff --git a/libethereum/BlockInfo.h b/libethereum/BlockInfo.h index 51d08b123..784874630 100644 --- a/libethereum/BlockInfo.h +++ b/libethereum/BlockInfo.h @@ -3,7 +3,7 @@ cpp-ethereum is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Foobar is distributed in the hope that it will be useful, diff --git a/libethereum/Client.cpp b/libethereum/Client.cpp index 3028f047f..1dd3df4d2 100644 --- a/libethereum/Client.cpp +++ b/libethereum/Client.cpp @@ -3,7 +3,7 @@ cpp-ethereum is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Foobar is distributed in the hope that it will be useful, diff --git a/libethereum/Client.h b/libethereum/Client.h index f49be40c9..cc335b594 100644 --- a/libethereum/Client.h +++ b/libethereum/Client.h @@ -3,7 +3,7 @@ cpp-ethereum is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Foobar is distributed in the hope that it will be useful, diff --git a/libethereum/Common.cpp b/libethereum/Common.cpp index 989e34937..548883a2e 100644 --- a/libethereum/Common.cpp +++ b/libethereum/Common.cpp @@ -3,7 +3,7 @@ cpp-ethereum is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Foobar is distributed in the hope that it will be useful, @@ -201,3 +201,43 @@ KeyPair KeyPair::create() ret.m_address = toAddress(ret.m_secret); return ret; } + +std::string eth::formatBalance(u256 _b) +{ + static const vector> c_units = + { + {((((u256(1000000000) * 1000000000) * 1000000000) * 1000000000) * 1000000000) * 1000000000, "Uether"}, + {((((u256(1000000000) * 1000000000) * 1000000000) * 1000000000) * 1000000000) * 1000000, "Vether"}, + {((((u256(1000000000) * 1000000000) * 1000000000) * 1000000000) * 1000000000) * 1000, "Dether"}, + {(((u256(1000000000) * 1000000000) * 1000000000) * 1000000000) * 1000000000, "Nether"}, + {(((u256(1000000000) * 1000000000) * 1000000000) * 1000000000) * 1000000, "Yether"}, + {(((u256(1000000000) * 1000000000) * 1000000000) * 1000000000) * 1000, "Zether"}, + {((u256(1000000000) * 1000000000) * 1000000000) * 1000000000, "Eether"}, + {((u256(1000000000) * 1000000000) * 1000000000) * 1000000, "Pether"}, + {((u256(1000000000) * 1000000000) * 1000000000) * 1000, "Tether"}, + {(u256(1000000000) * 1000000000) * 1000000000, "Gether"}, + {(u256(1000000000) * 1000000000) * 1000000, "Mether"}, + {(u256(1000000000) * 1000000000) * 1000, "Kether"}, + {u256(1000000000) * 1000000000, "ether"}, + {u256(1000000000) * 1000000, "finney"}, + {u256(1000000000) * 1000, "szabo"}, + {u256(1000000000), "Gwei"}, + {u256(1000000), "Mwei"}, + {u256(1000), "Kwei"} + }; + ostringstream ret; + if (_b > c_units[0].first * 10000) + { + ret << (_b / c_units[0].first) << " " << c_units[0].second; + return ret.str(); + } + ret << setprecision(5); + for (auto const& i: c_units) + if (_b >= i.first * 100) + { + ret << (double(_b / (i.first / 1000)) / 1000.0) << " " << i.second; + return ret.str(); + } + ret << _b << " wei"; + return ret.str(); +} diff --git a/libethereum/Common.h b/libethereum/Common.h index 817fba800..f4518651a 100644 --- a/libethereum/Common.h +++ b/libethereum/Common.h @@ -3,7 +3,7 @@ cpp-ethereum is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Foobar is distributed in the hope that it will be useful, @@ -217,6 +217,8 @@ public: +/// User-friendly string representation of the amount _b in wei. +std::string formatBalance(u256 _b); /// Converts arbitrary value to string representation using std::stringstream. template diff --git a/libethereum/MemTrie.cpp b/libethereum/MemTrie.cpp index 343de3466..e0b398208 100644 --- a/libethereum/MemTrie.cpp +++ b/libethereum/MemTrie.cpp @@ -3,7 +3,7 @@ cpp-ethereum is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Foobar is distributed in the hope that it will be useful, diff --git a/libethereum/MemTrie.h b/libethereum/MemTrie.h index f7b61aef7..b1cf93963 100644 --- a/libethereum/MemTrie.h +++ b/libethereum/MemTrie.h @@ -3,7 +3,7 @@ cpp-ethereum is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Foobar is distributed in the hope that it will be useful, diff --git a/libethereum/PeerNetwork.cpp b/libethereum/PeerNetwork.cpp index 9c1bc155b..b99f4269a 100644 --- a/libethereum/PeerNetwork.cpp +++ b/libethereum/PeerNetwork.cpp @@ -3,7 +3,7 @@ cpp-ethereum is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Foobar is distributed in the hope that it will be useful, diff --git a/libethereum/PeerNetwork.h b/libethereum/PeerNetwork.h index ae4ffe359..363658b64 100644 --- a/libethereum/PeerNetwork.h +++ b/libethereum/PeerNetwork.h @@ -3,7 +3,7 @@ cpp-ethereum is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Foobar is distributed in the hope that it will be useful, diff --git a/libethereum/RLP.cpp b/libethereum/RLP.cpp index b78d3230b..fd6d849c8 100644 --- a/libethereum/RLP.cpp +++ b/libethereum/RLP.cpp @@ -3,7 +3,7 @@ cpp-ethereum is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Foobar is distributed in the hope that it will be useful, diff --git a/libethereum/RLP.h b/libethereum/RLP.h index dd6ebfaf9..7c3b07afe 100644 --- a/libethereum/RLP.h +++ b/libethereum/RLP.h @@ -3,7 +3,7 @@ cpp-ethereum is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Foobar is distributed in the hope that it will be useful, diff --git a/libethereum/State.cpp b/libethereum/State.cpp index 692c22e1b..a52e6078d 100644 --- a/libethereum/State.cpp +++ b/libethereum/State.cpp @@ -3,7 +3,7 @@ cpp-ethereum is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Foobar is distributed in the hope that it will be useful, diff --git a/libethereum/State.h b/libethereum/State.h index 4bb81edea..c7bdfb1fc 100644 --- a/libethereum/State.h +++ b/libethereum/State.h @@ -3,7 +3,7 @@ cpp-ethereum is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Foobar is distributed in the hope that it will be useful, diff --git a/libethereum/Transaction.cpp b/libethereum/Transaction.cpp index d1cc8174d..53326cc6d 100644 --- a/libethereum/Transaction.cpp +++ b/libethereum/Transaction.cpp @@ -3,7 +3,7 @@ cpp-ethereum is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Foobar is distributed in the hope that it will be useful, diff --git a/libethereum/Transaction.h b/libethereum/Transaction.h index 03cfe3a98..742f7d40c 100644 --- a/libethereum/Transaction.h +++ b/libethereum/Transaction.h @@ -3,7 +3,7 @@ cpp-ethereum is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Foobar is distributed in the hope that it will be useful, diff --git a/libethereum/TransactionQueue.cpp b/libethereum/TransactionQueue.cpp index 08a818728..9c5704f06 100644 --- a/libethereum/TransactionQueue.cpp +++ b/libethereum/TransactionQueue.cpp @@ -3,7 +3,7 @@ cpp-ethereum is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Foobar is distributed in the hope that it will be useful, diff --git a/libethereum/TransactionQueue.h b/libethereum/TransactionQueue.h index 6eb12a211..f4aa67e28 100644 --- a/libethereum/TransactionQueue.h +++ b/libethereum/TransactionQueue.h @@ -3,7 +3,7 @@ cpp-ethereum is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Foobar is distributed in the hope that it will be useful, diff --git a/libethereum/TrieCommon.cpp b/libethereum/TrieCommon.cpp index 564d0b242..956fafc29 100644 --- a/libethereum/TrieCommon.cpp +++ b/libethereum/TrieCommon.cpp @@ -3,7 +3,7 @@ cpp-ethereum is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Foobar is distributed in the hope that it will be useful, diff --git a/libethereum/TrieCommon.h b/libethereum/TrieCommon.h index 68d95f7c1..57ff54b12 100644 --- a/libethereum/TrieCommon.h +++ b/libethereum/TrieCommon.h @@ -3,7 +3,7 @@ cpp-ethereum is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Foobar is distributed in the hope that it will be useful, diff --git a/libethereum/TrieDB.cpp b/libethereum/TrieDB.cpp index 306c2cfc8..666069e7b 100644 --- a/libethereum/TrieDB.cpp +++ b/libethereum/TrieDB.cpp @@ -3,7 +3,7 @@ cpp-ethereum is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Foobar is distributed in the hope that it will be useful, diff --git a/libethereum/TrieDB.h b/libethereum/TrieDB.h index 06ec0e4b6..f5ede8996 100644 --- a/libethereum/TrieDB.h +++ b/libethereum/TrieDB.h @@ -3,7 +3,7 @@ cpp-ethereum is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Foobar is distributed in the hope that it will be useful, diff --git a/libethereum/TrieHash.cpp b/libethereum/TrieHash.cpp index 460465e01..40f63bb58 100644 --- a/libethereum/TrieHash.cpp +++ b/libethereum/TrieHash.cpp @@ -3,7 +3,7 @@ cpp-ethereum is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Foobar is distributed in the hope that it will be useful, diff --git a/libethereum/TrieHash.h b/libethereum/TrieHash.h index 92a289fd1..a6d4f98cd 100644 --- a/libethereum/TrieHash.h +++ b/libethereum/TrieHash.h @@ -3,7 +3,7 @@ cpp-ethereum is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Foobar is distributed in the hope that it will be useful, diff --git a/test/crypto.cpp b/test/crypto.cpp index 9d552101e..71fc41292 100644 --- a/test/crypto.cpp +++ b/test/crypto.cpp @@ -3,7 +3,7 @@ cpp-ethereum is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Foobar is distributed in the hope that it will be useful, diff --git a/test/dagger.cpp b/test/dagger.cpp index 389e0c514..97e575a68 100644 --- a/test/dagger.cpp +++ b/test/dagger.cpp @@ -3,7 +3,7 @@ cpp-ethereum is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Foobar is distributed in the hope that it will be useful, diff --git a/test/hexPrefix.cpp b/test/hexPrefix.cpp index 418dd10ff..cd45cf8dc 100644 --- a/test/hexPrefix.cpp +++ b/test/hexPrefix.cpp @@ -3,7 +3,7 @@ cpp-ethereum is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Foobar is distributed in the hope that it will be useful, diff --git a/test/main.cpp b/test/main.cpp index e80d5f150..14af62b8f 100644 --- a/test/main.cpp +++ b/test/main.cpp @@ -3,7 +3,7 @@ cpp-ethereum is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Foobar is distributed in the hope that it will be useful, diff --git a/test/peer.cpp b/test/peer.cpp index 330dec781..5a440a88f 100644 --- a/test/peer.cpp +++ b/test/peer.cpp @@ -3,7 +3,7 @@ cpp-ethereum is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Foobar is distributed in the hope that it will be useful, diff --git a/test/rlp.cpp b/test/rlp.cpp index 0f6dada5c..8e36771a5 100644 --- a/test/rlp.cpp +++ b/test/rlp.cpp @@ -3,7 +3,7 @@ cpp-ethereum is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Foobar is distributed in the hope that it will be useful, diff --git a/test/state.cpp b/test/state.cpp index 0e812f719..2ba409c43 100644 --- a/test/state.cpp +++ b/test/state.cpp @@ -3,7 +3,7 @@ cpp-ethereum is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Foobar is distributed in the hope that it will be useful, diff --git a/test/trie.cpp b/test/trie.cpp index ba998046b..8fe596a7f 100644 --- a/test/trie.cpp +++ b/test/trie.cpp @@ -3,7 +3,7 @@ cpp-ethereum is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Foobar is distributed in the hope that it will be useful,