diff options
author | Péter Szilágyi <peterke@gmail.com> | 2016-07-07 21:04:34 +0800 |
---|---|---|
committer | Péter Szilágyi <peterke@gmail.com> | 2016-07-16 19:29:52 +0800 |
commit | 3dd46bc884d4ca666e912108ef9b7142068d86f4 (patch) | |
tree | 4465869790c63b07d7da79a4f2b8354c88e73934 /core | |
parent | e44d50fb52537a784a48eedc23cb180b18218da0 (diff) | |
download | go-tangerine-3dd46bc884d4ca666e912108ef9b7142068d86f4.tar go-tangerine-3dd46bc884d4ca666e912108ef9b7142068d86f4.tar.gz go-tangerine-3dd46bc884d4ca666e912108ef9b7142068d86f4.tar.bz2 go-tangerine-3dd46bc884d4ca666e912108ef9b7142068d86f4.tar.lz go-tangerine-3dd46bc884d4ca666e912108ef9b7142068d86f4.tar.xz go-tangerine-3dd46bc884d4ca666e912108ef9b7142068d86f4.tar.zst go-tangerine-3dd46bc884d4ca666e912108ef9b7142068d86f4.zip |
[release/1.4.10] cmd, core, eth, params: implement flags to control dao fork blocks
(cherry picked from commit 6060e098c929792f455d7f580ed91e914d28cf3b)
Diffstat (limited to 'core')
-rw-r--r-- | core/config.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/config.go b/core/config.go index 81ca76aa3..d557ae5a4 100644 --- a/core/config.go +++ b/core/config.go @@ -31,7 +31,8 @@ var ChainConfigNotFoundErr = errors.New("ChainConfig not found") // general conf // that any network, identified by its genesis block, can have its own // set of configuration options. type ChainConfig struct { - HomesteadBlock *big.Int // homestead switch block + HomesteadBlock *big.Int `json:"homesteadBlock"` // homestead switch block (0 = already homestead) + DAOForkBlock *big.Int `json:"daoForkBlock"` // TheDAO hard-fork block (nil = no fork) VmConfig vm.Config `json:"-"` } @@ -41,6 +42,5 @@ func (c *ChainConfig) IsHomestead(num *big.Int) bool { if num == nil { return false } - return num.Cmp(c.HomesteadBlock) >= 0 } |