Split params into evm-related and mining/block-related.

libethcore/BlockInfo.cpp

@@ -23,7 +23,7 @@
 #include <libdevcore/RLP.h>
 #include <libdevcrypto/TrieDB.h>
 #include <libethcore/Common.h>
-#include <libevmcore/Params.h>
+#include <libethcore/Params.h>
 #include "EthashAux.h"
 #include "ProofOfWork.h"
 #include "Exceptions.h"

libethcore/EthashAux.cpp

@@ -33,7 +33,6 @@
 #include <libdevcrypto/CryptoPP.h>
 #include <libdevcrypto/SHA3.h>
 #include <libdevcrypto/FileSystem.h>
-#include <libevmcore/Params.h>
 #include "BlockInfo.h"
 using namespace std;
 using namespace chrono;

libethcore/Params.cpp

@@ -0,0 +1,43 @@
+/*
+	This file is part of cpp-ethereum.
+
+	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 3 of the License, or
+	(at your option) any later version.
+
+	cpp-ethereum is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	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 Params.cpp
+ * @author Gav Wood <i@gavwood.com>
+ * @date 2014
+ */
+
+#include "Params.h"
+
+using namespace std;
+namespace dev
+{
+namespace eth
+{
+
+//--- BEGIN: AUTOGENERATED FROM github.com/ethereum/common/params.json
+u256 const c_genesisDifficulty = 131072;
+u256 const c_maximumExtraDataSize = 1024;
+u256 const c_genesisGasLimit = 3141592;
+u256 const c_minGasLimit = 125000;
+u256 const c_gasLimitBoundDivisor = 1024;
+u256 const c_minimumDifficulty = 131072;
+u256 const c_difficultyBoundDivisor = 2048;
+u256 const c_durationLimit = 8;
+//--- END: AUTOGENERATED FROM /feeStructure.json
+
+}
+}
+

libethcore/Params.h

@@ -0,0 +1,42 @@
+/*
+	This file is part of cpp-ethereum.
+
+	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 3 of the License, or
+	(at your option) any later version.
+
+	cpp-ethereum is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	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 Params.h
+ * @author Gav Wood <i@gavwood.com>
+ * @date 2014
+ */
+
+#pragma once
+
+#include <libdevcore/Common.h>
+
+namespace dev
+{
+namespace eth
+{
+
+//--- BEGIN: AUTOGENERATED FROM /feeStructure.json
+extern u256 const c_genesisGasLimit;
+extern u256 const c_minGasLimit;
+extern u256 const c_gasLimitBoundDivisor;
+extern u256 const c_genesisDifficulty;
+extern u256 const c_minimumDifficulty;
+extern u256 const c_difficultyBoundDivisor;
+extern u256 const c_durationLimit;
+extern u256 const c_maximumExtraDataSize;
+
+}
+}

libethereum/BlockChain.cpp

@@ -36,6 +36,7 @@
 #include <libethcore/Exceptions.h>
 #include <libethcore/ProofOfWork.h>
 #include <libethcore/BlockInfo.h>
+#include <libethcore/Params.h>
 #include <liblll/Compiler.h>
 #include "GenesisInfo.h"
 #include "State.h"

libethereum/CanonBlockChain.cpp

@@ -29,6 +29,7 @@
 #include <libethcore/Exceptions.h>
 #include <libethcore/ProofOfWork.h>
 #include <libethcore/BlockInfo.h>
+#include <libethcore/Params.h>
 #include <liblll/Compiler.h>
 #include "GenesisInfo.h"
 #include "State.h"

libethereum/Interface.h

@@ -25,7 +25,6 @@
 #include <libdevcore/CommonIO.h>
 #include <libdevcore/Guards.h>
 #include <libdevcrypto/Common.h>
-#include <libevmcore/Params.h>
 #include <libethcore/ProofOfWork.h>
 #include "LogFilter.h"
 #include "Transaction.h"

libethereum/State.h

@@ -31,7 +31,6 @@
 #include <libethcore/BlockInfo.h>
 #include <libethcore/ProofOfWork.h>
 #include <libethcore/Miner.h>
-#include <libevmcore/Params.h>
 #include <libevm/ExtVMFace.h>
 #include "TransactionQueue.h"
 #include "Account.h"

libevmcore/Params.cpp

@@ -28,14 +28,6 @@ namespace eth
 {
 
 //--- BEGIN: AUTOGENERATED FROM github.com/ethereum/common/params.json
-u256 const c_genesisDifficulty = 131072;
-u256 const c_maximumExtraDataSize = 1024;
-u256 const c_genesisGasLimit = 3141592;
-u256 const c_minGasLimit = 125000;
-u256 const c_gasLimitBoundDivisor = 1024;
-u256 const c_minimumDifficulty = 131072;
-u256 const c_difficultyBoundDivisor = 2048;
-u256 const c_durationLimit = 8;
 u256 const c_stackLimit = 1024;
 u256 const c_tierStepGas[] = {0, 2, 3, 5, 8, 10, 20, 0};
 u256 const c_expGas = 10;

libevmcore/Params.h

@@ -29,14 +29,6 @@ namespace eth
 {
 
 //--- BEGIN: AUTOGENERATED FROM /feeStructure.json
-extern u256 const c_genesisGasLimit;
-extern u256 const c_minGasLimit;
-extern u256 const c_gasLimitBoundDivisor;
-extern u256 const c_genesisDifficulty;
-extern u256 const c_minimumDifficulty;
-extern u256 const c_difficultyBoundDivisor;
-extern u256 const c_durationLimit;
-extern u256 const c_maximumExtraDataSize;
 extern u256 const c_stackLimit;
 
 extern u256 const c_tierStepGas[8];			///< Once per operation, for a selection of them.

mix/MixClient.cpp

@@ -28,6 +28,7 @@
 #include <libethereum/Executive.h>
 #include <libethereum/ExtVM.h>
 #include <libethereum/BlockChain.h>
+#include <libethcore/Params.h>
 #include <libevm/VM.h>
 #include "Exceptions.h"
 using namespace std;