gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[release/1.3.4] cmd/utils, params: homestead block

Browse Source 
(cherry picked from commit e22fd22c97b4f5d4af118dca3fb2cb6292a520a6)

Conflicts:
	cmd/utils/flags.go
This commit is contained in:
Jeffrey Wilcke 2016-02-29 10:01:01 +01:00
parent 5f7e74d5c8
commit 61be63bb9b
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/utils/flags.go
View File

@ -472,6 +472,8 @@ func MakeEthConfig(clientID, version string, ctx *cli.Context) *eth.Config {
cfg.DataDir += "/testnet" cfg.DataDir += "/testnet"
cfg.NetworkId = 2 cfg.NetworkId = 2
cfg.TestNet = true cfg.TestNet = true
// overwrite homestead block
params.HomesteadBlock = params.TestNetHomesteadBlock
} }
if ctx.GlobalBool(VMEnableJitFlag.Name) { if ctx.GlobalBool(VMEnableJitFlag.Name) {

6
params/util.go
View File

@ -18,7 +18,11 @@ package params
import "math/big" 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 { func IsHomestead(blockNumber *big.Int) bool {
// for unit tests TODO: flip to true after homestead is live // for unit tests TODO: flip to true after homestead is live