Merge pull request #2281 from obscuren/configurable-genesis

core: homestead chain configuration & artificial gas floor target mining flag

2 files changed, 5 insertions, 13 deletions

diff --git a/params/protocol_params.go b/params/protocol_params.go
index 45a9a2549..2dfc251b6 100644
--- a/params/protocol_params.go
+++ b/params/protocol_params.go
@@ -40,8 +40,9 @@ var (
 	EcrecoverGas           = big.NewInt(3000)   //
 	Sha256WordGas          = big.NewInt(12)     //
 
-	MinGasLimit     = big.NewInt(5000)    // Minimum the gas limit may ever be.
-	GenesisGasLimit = big.NewInt(4712388) // Gas limit of the Genesis block.
+	MinGasLimit     = big.NewInt(5000)                  // Minimum the gas limit may ever be.
+	GenesisGasLimit = big.NewInt(4712388)               // Gas limit of the Genesis block.
+	TargetGasLimit  = new(big.Int).Set(GenesisGasLimit) // The artificial target
 
 	Sha3Gas              = big.NewInt(30)     // Once per SHA3 operation.
 	Sha256Gas            = big.NewInt(60)     //
diff --git a/params/util.go b/params/util.go
index 6a49a2013..b37bc79b2 100644
--- a/params/util.go
+++ b/params/util.go
@@ -19,15 +19,6 @@ package params
 import "math/big"
 
 var (
-	TestNetHomesteadBlock = big.NewInt(494000)    // testnet homestead block
-	MainNetHomesteadBlock = big.NewInt(1150000)   // mainnet homestead block
-	HomesteadBlock        = MainNetHomesteadBlock // homestead block used to check against
+	TestNetHomesteadBlock = big.NewInt(494000)  // testnet homestead block
+	MainNetHomesteadBlock = big.NewInt(1150000) // mainnet homestead block
 )
-
-func IsHomestead(blockNumber *big.Int) bool {
-	// for unit tests TODO: flip to true after homestead is live
-	if blockNumber == nil {
-		return false
-	}
-	return blockNumber.Cmp(HomesteadBlock) >= 0
-}