diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2019-08-23 16:55:43 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-23 16:55:43 +0800 |
| commit | c8a1c0a1156e23625cdca98b65286084609dca43 (patch) | |
| tree | 1b197b83e44fea8f105dad41576f49958aa3d782 /cmd | |
| parent | 961aa0533f75027bc5bc80f994adb80d14635553 (diff) | |
| parent | 4aeeddc6586ec2d405e1c67ee22cd367d805368b (diff) | |
| download | go-tangerine-c8a1c0a1156e23625cdca98b65286084609dca43.tar go-tangerine-c8a1c0a1156e23625cdca98b65286084609dca43.tar.gz go-tangerine-c8a1c0a1156e23625cdca98b65286084609dca43.tar.bz2 go-tangerine-c8a1c0a1156e23625cdca98b65286084609dca43.tar.lz go-tangerine-c8a1c0a1156e23625cdca98b65286084609dca43.tar.xz go-tangerine-c8a1c0a1156e23625cdca98b65286084609dca43.tar.zst go-tangerine-c8a1c0a1156e23625cdca98b65286084609dca43.zip | |
Merge pull request #19993 from karalabe/istanbul-eip-integration
core/vm: enable istanbul EIPs in the jump table
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/geth/retesteth.go | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/cmd/geth/retesteth.go b/cmd/geth/retesteth.go index f20f2295a..bda19324d 100644 --- a/cmd/geth/retesteth.go +++ b/cmd/geth/retesteth.go @@ -132,6 +132,7 @@ type CParamsParams struct { ByzantiumForkBlock *math.HexOrDecimal64 `json:"byzantiumForkBlock"` ConstantinopleForkBlock *math.HexOrDecimal64 `json:"constantinopleForkBlock"` ConstantinopleFixForkBlock *math.HexOrDecimal64 `json:"constantinopleFixForkBlock"` + IstanbulBlock *math.HexOrDecimal64 `json:"istanbulForkBlock"` ChainID *math.HexOrDecimal256 `json:"chainID"` MaximumExtraDataSize math.HexOrDecimal64 `json:"maximumExtraDataSize"` TieBreakingGas bool `json:"tieBreakingGas"` @@ -319,6 +320,7 @@ func (api *RetestethAPI) SetChainParams(ctx context.Context, chainParams ChainPa byzantiumBlock *big.Int constantinopleBlock *big.Int petersburgBlock *big.Int + istanbulBlock *big.Int ) if chainParams.Params.HomesteadForkBlock != nil { homesteadBlock = big.NewInt(int64(*chainParams.Params.HomesteadForkBlock)) @@ -345,6 +347,10 @@ func (api *RetestethAPI) SetChainParams(ctx context.Context, chainParams ChainPa if constantinopleBlock != nil && petersburgBlock == nil { petersburgBlock = big.NewInt(100000000000) } + if chainParams.Params.IstanbulBlock != nil { + istanbulBlock = big.NewInt(int64(*chainParams.Params.IstanbulBlock)) + } + genesis := &core.Genesis{ Config: ¶ms.ChainConfig{ ChainID: chainId, @@ -357,6 +363,7 @@ func (api *RetestethAPI) SetChainParams(ctx context.Context, chainParams ChainPa ByzantiumBlock: byzantiumBlock, ConstantinopleBlock: constantinopleBlock, PetersburgBlock: petersburgBlock, + IstanbulBlock: istanbulBlock, }, Nonce: uint64(chainParams.Genesis.Nonce), Timestamp: uint64(chainParams.Genesis.Timestamp), |