aboutsummaryrefslogtreecommitdiffstats
path: root/eth
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2019-08-23 17:09:27 +0800
committerPéter Szilágyi <peterke@gmail.com>2019-08-23 17:09:27 +0800
commite39b2a2bde3f2f1a82f7836cf957af94a45acfc2 (patch)
treedaa7163f40b60ebee34b4d416933cd12630f2ef4 /eth
parent961aa0533f75027bc5bc80f994adb80d14635553 (diff)
downloadgo-tangerine-e39b2a2bde3f2f1a82f7836cf957af94a45acfc2.tar
go-tangerine-e39b2a2bde3f2f1a82f7836cf957af94a45acfc2.tar.gz
go-tangerine-e39b2a2bde3f2f1a82f7836cf957af94a45acfc2.tar.bz2
go-tangerine-e39b2a2bde3f2f1a82f7836cf957af94a45acfc2.tar.lz
go-tangerine-e39b2a2bde3f2f1a82f7836cf957af94a45acfc2.tar.xz
go-tangerine-e39b2a2bde3f2f1a82f7836cf957af94a45acfc2.tar.zst
go-tangerine-e39b2a2bde3f2f1a82f7836cf957af94a45acfc2.zip
acmd, core, eth, les: support --override.istanbul
Diffstat (limited to 'eth')
-rw-r--r--eth/backend.go2
-rw-r--r--eth/config.go3
2 files changed, 4 insertions, 1 deletions
diff --git a/eth/backend.go b/eth/backend.go
index dc4ff8ade..ce37541f4 100644
--- a/eth/backend.go
+++ b/eth/backend.go
@@ -137,7 +137,7 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) {
if err != nil {
return nil, err
}
- chainConfig, genesisHash, genesisErr := core.SetupGenesisBlock(chainDb, config.Genesis)
+ chainConfig, genesisHash, genesisErr := core.SetupGenesisBlockWithOverride(chainDb, config.Genesis, config.OverrideIstanbul)
if _, ok := genesisErr.(*params.ConfigCompatError); genesisErr != nil && !ok {
return nil, genesisErr
}
diff --git a/eth/config.go b/eth/config.go
index 688787227..5094a533b 100644
--- a/eth/config.go
+++ b/eth/config.go
@@ -154,4 +154,7 @@ type Config struct {
// CheckpointOracle is the configuration for checkpoint oracle.
CheckpointOracle *params.CheckpointOracleConfig `toml:",omitempty"`
+
+ // Istanbul block override (TODO: remove after the fork)
+ OverrideIstanbul *big.Int
}