From 61be63bb9b8527bb3e2357ad35a0f4ef29304da1 Mon Sep 17 00:00:00 2001 From: Jeffrey Wilcke Date: Mon, 29 Feb 2016 10:01:01 +0100 Subject: [PATCH] [release/1.3.4] cmd/utils, params: homestead block (cherry picked from commit e22fd22c97b4f5d4af118dca3fb2cb6292a520a6) Conflicts: cmd/utils/flags.go --- cmd/utils/flags.go | 2 ++ params/util.go | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 815e233a82..fd73b4417c 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -472,6 +472,8 @@ func MakeEthConfig(clientID, version string, ctx *cli.Context) *eth.Config { cfg.DataDir += "/testnet" cfg.NetworkId = 2 cfg.TestNet = true + // overwrite homestead block + params.HomesteadBlock = params.TestNetHomesteadBlock } if ctx.GlobalBool(VMEnableJitFlag.Name) { diff --git a/params/util.go b/params/util.go index 856a39e3a6..6a49a20135 100644 --- a/params/util.go +++ b/params/util.go @@ -18,7 +18,11 @@ package params import "math/big" -var HomesteadBlock *big.Int = big.NewInt(2000000) +var ( + TestNetHomesteadBlock = big.NewInt(494000) // testnet homestead block + MainNetHomesteadBlock = big.NewInt(1150000) // mainnet homestead block + HomesteadBlock = MainNetHomesteadBlock // homestead block used to check against +) func IsHomestead(blockNumber *big.Int) bool { // for unit tests TODO: flip to true after homestead is live