cmd/utils: set temporary HF number

cmd/utils/flags.go

@@ -853,8 +853,6 @@ 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
@@ -869,6 +867,23 @@ func MakeChainConfigFromDb(ctx *cli.Context, db ethdb.Database) *params.ChainCon
 				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):

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)
 )