diff options
| author | Martin Holst Swende <martin@swende.se> | 2018-12-11 20:19:03 +0800 |
|---|---|---|
| committer | Péter Szilágyi <peterke@gmail.com> | 2018-12-11 20:19:03 +0800 |
| commit | 83a9a73b899e816a0d1493b7fb1e37abe4bc4566 (patch) | |
| tree | a813e0e451a7a44ee12c91e40bcd76041f793895 /eth | |
| parent | 5584574217df29f5daf5db70b3d2536ec66a036c (diff) | |
| download | dexon-83a9a73b899e816a0d1493b7fb1e37abe4bc4566.tar.gz dexon-83a9a73b899e816a0d1493b7fb1e37abe4bc4566.tar.zst dexon-83a9a73b899e816a0d1493b7fb1e37abe4bc4566.zip | |
cmd/geth, core, eth: implement Constantinople override flag (#18273)
* geth/core/eth: implement constantinople override flag
* les: implemnent constantinople override flag for les clients
* cmd/geth, eth, les: fix typo, move flag to experimentals
Diffstat (limited to 'eth')
| -rw-r--r-- | eth/backend.go | 2 | ||||
| -rw-r--r-- | eth/config.go | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/eth/backend.go b/eth/backend.go index 3f538d5f5..354fc17d4 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -118,7 +118,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.ConstantinopleOverride) if _, ok := genesisErr.(*params.ConfigCompatError); genesisErr != nil && !ok { return nil, genesisErr } diff --git a/eth/config.go b/eth/config.go index a5c209512..7c041d1af 100644 --- a/eth/config.go +++ b/eth/config.go @@ -129,8 +129,12 @@ type Config struct { // Type of the EWASM interpreter ("" for default) EWASMInterpreter string + // Type of the EVM interpreter ("" for default) EVMInterpreter string + + // Constantinople block override (TODO: remove after the fork) + ConstantinopleOverride *big.Int } type configMarshaling struct { |