From f70c36bd19bd688041af63defa1d788c9705b16c Mon Sep 17 00:00:00 2001 From: Freddy Caceres Date: Mon, 14 Feb 2022 18:02:34 -0500 Subject: [PATCH] add getblockvalue for chain config fork --- app/ante/utils_test.go | 2 ++ x/evm/keeper/keeper_test.go | 2 ++ x/evm/types/chain_config.go | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/ante/utils_test.go b/app/ante/utils_test.go index 4a474cd13c..418513adc8 100644 --- a/app/ante/utils_test.go +++ b/app/ante/utils_test.go @@ -68,6 +68,8 @@ func (suite *AnteTestSuite) SetupTest() { evmGenesis := evmtypes.DefaultGenesisState() maxInt := sdk.NewInt(math.MaxInt64) evmGenesis.Params.ChainConfig.LondonBlock = &maxInt + evmGenesis.Params.ChainConfig.ArrowGlacierBlock = &maxInt + evmGenesis.Params.ChainConfig.MergeForkBlock = &maxInt genesis[evmtypes.ModuleName] = app.AppCodec().MustMarshalJSON(evmGenesis) } return genesis diff --git a/x/evm/keeper/keeper_test.go b/x/evm/keeper/keeper_test.go index e4464d47af..073fcdaf15 100644 --- a/x/evm/keeper/keeper_test.go +++ b/x/evm/keeper/keeper_test.go @@ -101,6 +101,8 @@ func (suite *KeeperTestSuite) DoSetupTest(t require.TestingT) { evmGenesis := types.DefaultGenesisState() maxInt := sdk.NewInt(math.MaxInt64) evmGenesis.Params.ChainConfig.LondonBlock = &maxInt + evmGenesis.Params.ChainConfig.ArrowGlacierBlock = &maxInt + evmGenesis.Params.ChainConfig.MergeForkBlock = &maxInt genesis[types.ModuleName] = app.AppCodec().MustMarshalJSON(evmGenesis) } return genesis diff --git a/x/evm/types/chain_config.go b/x/evm/types/chain_config.go index 94977b7f7f..fbc0288ff5 100644 --- a/x/evm/types/chain_config.go +++ b/x/evm/types/chain_config.go @@ -30,8 +30,8 @@ func (cc ChainConfig) EthereumConfig(chainID *big.Int) *params.ChainConfig { MuirGlacierBlock: getBlockValue(cc.MuirGlacierBlock), BerlinBlock: getBlockValue(cc.BerlinBlock), LondonBlock: getBlockValue(cc.LondonBlock), - ArrowGlacierBlock: nil, - MergeForkBlock: nil, + ArrowGlacierBlock: getBlockValue(cc.ArrowGlacierBlock), + MergeForkBlock: getBlockValue(cc.MergeForkBlock), TerminalTotalDifficulty: nil, Ethash: nil, Clique: nil,