open Istanbul and MuirGlacier from ChainConfig (#645)

* open Istanbul and MuirGlacier

* fix ut

* fix ut
This commit is contained in:
Pierre 2020-12-08 23:49:35 +08:00 committed by GitHub
parent c4a3c0a96e
commit 9cc464b5e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions

View File

@ -762,7 +762,7 @@ func TestEth_EstimateGas(t *testing.T) {
err := json.Unmarshal(rpcRes.Result, &gas) err := json.Unmarshal(rpcRes.Result, &gas)
require.NoError(t, err, string(rpcRes.Result)) require.NoError(t, err, string(rpcRes.Result))
require.Equal(t, "0xf552", gas) require.Equal(t, "0xf54c", gas)
} }
func TestEth_EstimateGas_ContractDeployment(t *testing.T) { func TestEth_EstimateGas_ContractDeployment(t *testing.T) {

View File

@ -85,8 +85,8 @@ func DefaultChainConfig() ChainConfig {
ByzantiumBlock: sdk.ZeroInt(), ByzantiumBlock: sdk.ZeroInt(),
ConstantinopleBlock: sdk.ZeroInt(), ConstantinopleBlock: sdk.ZeroInt(),
PetersburgBlock: sdk.ZeroInt(), PetersburgBlock: sdk.ZeroInt(),
IstanbulBlock: sdk.NewInt(-1), IstanbulBlock: sdk.ZeroInt(),
MuirGlacierBlock: sdk.NewInt(-1), MuirGlacierBlock: sdk.ZeroInt(),
YoloV2Block: sdk.NewInt(-1), YoloV2Block: sdk.NewInt(-1),
EWASMBlock: sdk.NewInt(-1), EWASMBlock: sdk.NewInt(-1),
} }

View File

@ -236,8 +236,8 @@ eip158_block: "0"
byzantium_block: "0" byzantium_block: "0"
constantinople_block: "0" constantinople_block: "0"
petersburg_block: "0" petersburg_block: "0"
istanbul_block: "-1" istanbul_block: "0"
muir_glacier_block: "-1" muir_glacier_block: "0"
yoloV2_block: "-1" yoloV2_block: "-1"
ewasm_block: "-1" ewasm_block: "-1"
` `