cmd/utils: set temporary HF number

2 files changed, 31 insertions, 13 deletions

diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index 52b78a5c3..2d6bb4f5b 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -853,22 +853,37 @@ func MakeChainConfigFromDb(ctx *cli.Context, db ethdb.Database) *params.ChainCon
 			}
 			config.DAOForkSupport = true
 		}
-		config.DAOForkSupport = true
-	}
-	if config.EIP150Block == nil {
-		if ctx.GlobalBool(TestNetFlag.Name) {
-			config.EIP150Block = params.TestNetHomesteadGasRepriceBlock
-		} else {
-			config.EIP150Block = params.MainNetHomesteadGasRepriceBlock
+		if config.EIP150Block == nil {
+			if ctx.GlobalBool(TestNetFlag.Name) {
+				config.EIP150Block = params.TestNetHomesteadGasRepriceBlock
+			} else {
+				config.EIP150Block = params.MainNetHomesteadGasRepriceBlock
+			}
 		}
-	}
-	if config.EIP150Hash == (common.Hash{}) {
-		if ctx.GlobalBool(TestNetFlag.Name) {
-			config.EIP150Hash = params.TestNetHomesteadGasRepriceHash
-		} else {
-			config.EIP150Hash = params.MainNetHomesteadGasRepriceHash
+		if config.EIP150Hash == (common.Hash{}) {
+			if ctx.GlobalBool(TestNetFlag.Name) {
+				config.EIP150Hash = params.TestNetHomesteadGasRepriceHash
+			} else {
+				config.EIP150Hash = params.MainNetHomesteadGasRepriceHash
+			}
 		}
+		if config.EIP155Block == nil {
+			if ctx.GlobalBool(TestNetFlag.Name) {
+				config.EIP150Block = params.TestNetSpuriousDragon
+			} else {
+				config.EIP155Block = params.MainNetSpuriousDragon
+			}
+		}
+		if config.EIP158Block == nil {
+			if ctx.GlobalBool(TestNetFlag.Name) {
+				config.EIP158Block = params.TestNetSpuriousDragon
+			} else {
+				config.EIP158Block = params.MainNetSpuriousDragon
+			}
+		}
+		config.DAOForkSupport = true
 	}
+
 	// Force override any existing configs if explicitly requested
 	switch {
 	case ctx.GlobalBool(SupportDAOFork.Name):
diff --git a/params/util.go b/params/util.go
index 63f571a17..377f4ce7c 100644
--- a/params/util.go
+++ b/params/util.go
@@ -34,4 +34,7 @@ var (
 
 	TestNetHomesteadGasRepriceHash = common.HexToHash("0xf376243aeff1f256d970714c3de9fd78fa4e63cf63e32a51fe1169e375d98145") // Testnet gas reprice block hash (used by fast sync)
 	MainNetHomesteadGasRepriceHash = common.HexToHash("0x2086799aeebeae135c246c65021c82b4e15a2c451340993aacfd2751886514f0") // Mainnet gas reprice block hash (used by fast sync)
+
+	TestNetSpuriousDragon = big.NewInt(3000000)
+	MainNetSpuriousDragon = big.NewInt(3000000)
 )