(feat)!: upgrade to geth 1.13

.gitignore

@@ -32,4 +32,4 @@ contracts/@openzeppelin/*
 # Build files
 evmd/build/
 
-build/
+build/

ante/evm/05_signature_verification.go

@@ -35,7 +35,7 @@ func (esvd EthSigVerificationDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, s
 	evmParams := esvd.evmKeeper.GetParams(ctx)
 	ethCfg := evmtypes.GetEthChainConfig()
 	blockNum := big.NewInt(ctx.BlockHeight())
-	signer := ethtypes.MakeSigner(ethCfg, blockNum)
+	signer := ethtypes.MakeSigner(ethCfg, blockNum, uint64(ctx.BlockTime().Unix())) //#nosec G115 -- int overflow is not a concern here
 	allowUnprotectedTxs := evmParams.GetAllowUnprotectedTxs()
 
 	msgs := tx.GetMsgs()

ante/evm/06_account_verification.go

@@ -41,7 +41,7 @@ func VerifyAccountBalance(
 		account = statedb.NewEmptyAccount()
 	}
 
-	if err := keeper.CheckSenderBalance(sdkmath.NewIntFromBigInt(account.Balance), txData); err != nil {
+	if err := keeper.CheckSenderBalance(sdkmath.NewIntFromBigInt(account.Balance.ToBig()), txData); err != nil {
 		return errorsmod.Wrap(err, "failed to check sender balance")
 	}
 

ante/evm/07_can_transfer.go

@@ -7,6 +7,7 @@ import (
 	"github.com/ethereum/go-ethereum/core"
 
 	anteinterfaces "github.com/cosmos/evm/ante/interfaces"
+	"github.com/cosmos/evm/utils"
 	"github.com/cosmos/evm/x/vm/statedb"
 	evmtypes "github.com/cosmos/evm/x/vm/types"
 
@@ -25,11 +26,11 @@ func CanTransfer(
 	params evmtypes.Params,
 	isLondon bool,
 ) error {
-	if isLondon && msg.GasFeeCap().Cmp(baseFee) < 0 {
+	if isLondon && msg.GasFeeCap.Cmp(baseFee) < 0 {
 		return errorsmod.Wrapf(
 			errortypes.ErrInsufficientFee,
 			"max fee per gas less than block base fee (%s < %s)",
-			msg.GasFeeCap(), baseFee,
+			msg.GasFeeCap, baseFee,
 		)
 	}
 
@@ -41,16 +42,20 @@ func CanTransfer(
 	}
 
 	stateDB := statedb.New(ctx, evmKeeper, statedb.NewEmptyTxConfig(common.BytesToHash(ctx.HeaderHash())))
-	evm := evmKeeper.NewEVM(ctx, msg, cfg, evmtypes.NewNoOpTracer(), stateDB)
+	evm := evmKeeper.NewEVM(ctx, msg, cfg, nil, stateDB)
 
 	// check that caller has enough balance to cover asset transfer for **topmost** call
 	// NOTE: here the gas consumed is from the context with the infinite gas meter
-	if msg.Value().Sign() > 0 && !evm.Context.CanTransfer(stateDB, msg.From(), msg.Value()) {
+	convertedValue, err := utils.Uint256FromBigInt(msg.Value)
+	if err != nil {
+		return err
+	}
+	if msg.Value.Sign() > 0 && !evm.Context.CanTransfer(stateDB, msg.From, convertedValue) {
 		return errorsmod.Wrapf(
 			errortypes.ErrInsufficientFunds,
 			"failed to transfer %s from address %s using the EVM block context transfer function",
-			msg.Value(),
-			msg.From(),
+			msg.Value,
+			msg.From,
 		)
 	}
 

ante/evm/07_can_transfer_test.go

@@ -77,7 +77,7 @@ func (suite *EvmAnteTestSuite) TestCanTransfer() {
 			evmParams, err := grpcHandler.GetEvmParams()
 			suite.Require().NoError(err)
 			ctx := unitNetwork.GetContext()
-			signer := gethtypes.MakeSigner(ethCfg, big.NewInt(ctx.BlockHeight()))
+			signer := gethtypes.MakeSigner(ethCfg, big.NewInt(ctx.BlockHeight()), uint64(ctx.BlockTime().Unix())) //#nosec G115 -- int overflow is not a concern here
 			txArgs, err := txFactory.GenerateDefaultTxTypeArgs(senderKey.Addr, suite.ethTxType)
 			suite.Require().NoError(err)
 			txArgs.Amount = big.NewInt(100)
@@ -95,7 +95,7 @@ func (suite *EvmAnteTestSuite) TestCanTransfer() {
 			err = evm.CanTransfer(
 				unitNetwork.GetContext(),
 				unitNetwork.App.EVMKeeper,
-				coreMsg,
+				*coreMsg,
 				baseFeeResp.BaseFee.BigInt(),
 				evmParams.Params,
 				tc.isLondon,

ante/evm/ante_test.go

@@ -9,6 +9,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 	ethparams "github.com/ethereum/go-ethereum/params"
+	"github.com/holiman/uint256"
 
 	testconstants "github.com/cosmos/evm/testutil/constants"
 	utiltx "github.com/cosmos/evm/testutil/tx"
@@ -1089,7 +1090,7 @@ func (suite *AnteTestSuite) TestAnteHandlerWithDynamicTxFee() {
 			suite.GetNetwork().App.AccountKeeper.SetAccount(ctx, acc)
 
 			ctx = ctx.WithIsCheckTx(tc.checkTx).WithIsReCheckTx(tc.reCheckTx)
-			err := suite.GetNetwork().App.EVMKeeper.SetBalance(ctx, addr, big.NewInt((ethparams.InitialBaseFee+10)*100000))
+			err := suite.GetNetwork().App.EVMKeeper.SetBalance(ctx, addr, uint256.NewInt((ethparams.InitialBaseFee+10)*100000))
 			suite.Require().NoError(err)
 
 			anteHandler := suite.GetAnteHandler()
@@ -1216,7 +1217,7 @@ func (suite *AnteTestSuite) TestAnteHandlerWithParams() {
 			suite.GetNetwork().App.AccountKeeper.SetAccount(ctx, acc)
 
 			ctx = ctx.WithIsCheckTx(true)
-			err := suite.GetNetwork().App.EVMKeeper.SetBalance(ctx, addr, big.NewInt((ethparams.InitialBaseFee+10)*100000))
+			err := suite.GetNetwork().App.EVMKeeper.SetBalance(ctx, addr, uint256.NewInt((ethparams.InitialBaseFee+10)*100000))
 			suite.Require().NoError(err)
 
 			anteHandler := suite.GetAnteHandler()

ante/evm/mono_decorator.go

@@ -162,7 +162,7 @@ func (md MonoDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool, ne
 		if err := CanTransfer(
 			ctx,
 			md.evmKeeper,
-			coreMsg,
+			*coreMsg,
 			decUtils.BaseFee,
 			decUtils.EvmParams,
 			decUtils.Rules.IsLondon,
@@ -177,6 +177,7 @@ func (md MonoDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool, ne
 			decUtils.BaseFee,
 			decUtils.Rules.IsHomestead,
 			decUtils.Rules.IsIstanbul,
+			decUtils.Rules.IsShanghai,
 			ctx.IsCheckTx(),
 		)
 		if err != nil {

ante/evm/utils.go

@@ -48,7 +48,7 @@ func NewMonoDecoratorUtils(
 	ethCfg := evmtypes.GetEthChainConfig()
 	evmDenom := evmtypes.GetEVMCoinDenom()
 	blockHeight := big.NewInt(ctx.BlockHeight())
-	rules := ethCfg.Rules(blockHeight, true)
+	rules := ethCfg.Rules(blockHeight, true, uint64(ctx.BlockTime().Unix())) //#nosec G115 -- int overflow is not a concern here
 	baseFee := ek.GetBaseFee(ctx)
 
 	if rules.IsLondon && baseFee == nil {
@@ -67,7 +67,7 @@ func NewMonoDecoratorUtils(
 	return &DecoratorUtils{
 		EvmParams:          evmParams,
 		Rules:              rules,
-		Signer:             ethtypes.MakeSigner(ethCfg, blockHeight),
+		Signer:             ethtypes.MakeSigner(ethCfg, blockHeight, uint64(ctx.BlockTime().Unix())), //#nosec G115 -- int overflow is not a concern here
 		BaseFee:            baseFee,
 		MempoolMinGasPrice: mempoolMinGasPrice,
 		GlobalMinGasPrice:  globalMinGasPrice,

ante/evm/utils_test.go

@@ -3,10 +3,10 @@ package evm_test
 import (
 	"encoding/json"
 	"fmt"
-	"math/big"
 	"time"
 
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/holiman/uint256"
 
 	"github.com/cosmos/evm/ante/testutils"
 	"github.com/cosmos/evm/crypto/ethsecp256k1"
@@ -448,7 +448,7 @@ func (suite *AnteTestSuite) generateMultikeySignatures(signMode signing.SignMode
 }
 
 // RegisterAccount creates an account with the keeper and populates the initial balance
-func (suite *AnteTestSuite) RegisterAccount(pubKey cryptotypes.PubKey, balance *big.Int) {
+func (suite *AnteTestSuite) RegisterAccount(pubKey cryptotypes.PubKey, balance *uint256.Int) {
 	ctx := suite.GetNetwork().GetContext()
 
 	acc := suite.GetNetwork().App.AccountKeeper.NewAccountWithAddress(ctx, sdk.AccAddress(pubKey.Address()))
@@ -513,7 +513,7 @@ func (suite *AnteTestSuite) CreateTestSignedMultisigTx(privKeys []cryptotypes.Pr
 	numKeys := len(privKeys)
 	multiKey := kmultisig.NewLegacyAminoPubKey(numKeys, pubKeys)
 
-	suite.RegisterAccount(multiKey, big.NewInt(10000000000))
+	suite.RegisterAccount(multiKey, uint256.NewInt(10000000000))
 
 	txBuilder := suite.createBaseTxBuilder(msg, gas)
 
@@ -546,7 +546,7 @@ func (suite *AnteTestSuite) CreateTestSignedMultisigTx(privKeys []cryptotypes.Pr
 func (suite *AnteTestSuite) CreateTestSingleSignedTx(privKey cryptotypes.PrivKey, signMode signing.SignMode, msg sdk.Msg, chainID string, gas uint64, signType string) client.TxBuilder {
 	pubKey := privKey.PubKey()
 
-	suite.RegisterAccount(pubKey, big.NewInt(10_000_000_000))
+	suite.RegisterAccount(pubKey, uint256.NewInt(10_000_000_000))
 
 	txBuilder := suite.createBaseTxBuilder(msg, gas)
 

ante/interfaces/evm.go

@@ -6,6 +6,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core"
 	"github.com/ethereum/go-ethereum/core/vm"
+	"github.com/holiman/uint256"
 
 	feemarkettypes "github.com/cosmos/evm/x/feemarket/types"
 	"github.com/cosmos/evm/x/vm/statedb"
@@ -23,7 +24,7 @@ type EVMKeeper interface {
 
 	NewEVM(ctx sdk.Context, msg core.Message, cfg *statedb.EVMConfig, tracer vm.EVMLogger, stateDB vm.StateDB) *vm.EVM
 	DeductTxCostsFromUserBalance(ctx sdk.Context, fees sdk.Coins, from common.Address) error
-	GetBalance(ctx sdk.Context, addr common.Address) *big.Int
+	GetBalance(ctx sdk.Context, addr common.Address) *uint256.Int
 	ResetTransientGasUsed(ctx sdk.Context)
 	GetTxIndexTransient(ctx sdk.Context) uint64
 	GetParams(ctx sdk.Context) evmtypes.Params

ante/testutils/testutil.go

@@ -96,8 +96,8 @@ func (suite *AnteTestSuite) SetupTest() {
 		chainConfig.ArrowGlacierBlock = &maxInt
 		chainConfig.GrayGlacierBlock = &maxInt
 		chainConfig.MergeNetsplitBlock = &maxInt
-		chainConfig.ShanghaiBlock = &maxInt
-		chainConfig.CancunBlock = &maxInt
+		chainConfig.ShanghaiTime = &maxInt
+		chainConfig.CancunTime = &maxInt
 	}
 
 	// get the denom and decimals set when initialized the chain