Skip to content
This repository has been archived by the owner on Apr 4, 2024. It is now read-only.

upgrade geth to v1.10.15 #935

Merged
merged 10 commits into from
Feb 14, 2022
Prev Previous commit
Next Next commit
add getblockvalue for chain config fork
  • Loading branch information
crypto-facs committed Feb 14, 2022
commit f70c36bd19bd688041af63defa1d788c9705b16c
2 changes: 2 additions & 0 deletions app/ante/utils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions x/evm/keeper/keeper_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions x/evm/types/chain_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down