aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2016-07-07 21:04:34 +0800
committerPéter Szilágyi <peterke@gmail.com>2016-07-15 21:52:55 +0800
commit6060e098c929792f455d7f580ed91e914d28cf3b (patch)
tree1518c9572c5c5609069e6d6c8d03fdf261fd4ad8 /core
parentaa1e052cb41c39363a9930added46dac5b6db832 (diff)
downloadgo-tangerine-6060e098c929792f455d7f580ed91e914d28cf3b.tar
go-tangerine-6060e098c929792f455d7f580ed91e914d28cf3b.tar.gz
go-tangerine-6060e098c929792f455d7f580ed91e914d28cf3b.tar.bz2
go-tangerine-6060e098c929792f455d7f580ed91e914d28cf3b.tar.lz
go-tangerine-6060e098c929792f455d7f580ed91e914d28cf3b.tar.xz
go-tangerine-6060e098c929792f455d7f580ed91e914d28cf3b.tar.zst
go-tangerine-6060e098c929792f455d7f580ed91e914d28cf3b.zip
cmd, core, eth, params: implement flags to control dao fork blocks
Diffstat (limited to 'core')
-rw-r--r--core/config.go4
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
}