Upgrade SDK to 0.47

CONTRIBUTING.md

@@ -145,7 +145,7 @@ build, in which case we can fall back on `go mod tidy -v`.
 
 ## Protobuf
 
-We use [Protocol Buffers](https://developers.google.com/protocol-buffers) along with [gogoproto](https:/gogo/protobuf) to generate code for use in Ethermint.
+We use [Protocol Buffers](https://developers.google.com/protocol-buffers) along with [gogoproto](https:/cosmos/gogoproto) to generate code for use in Ethermint.
 
 For determinstic behavior around Protobuf tooling, everything is containerized using Docker. Make sure to have Docker installed on your machine, or head to [Docker's website](https://docs.docker.com/get-docker/) to install it.
 

Makefile

@@ -422,8 +422,8 @@ format-fix:
 ### Protobuf ###
 ###############################################################################
 
-protoVer=v0.2
-protoImageName=tendermintdev/sdk-proto-gen:$(protoVer)
+protoVer=0.11.0
+protoImageName=ghcr.io/cosmos/proto-builder:$(protoVer)
 containerProtoGen=$(PROJECT_NAME)-proto-gen-$(protoVer)
 containerProtoGenAny=$(PROJECT_NAME)-proto-gen-any-$(protoVer)
 containerProtoGenSwagger=$(PROJECT_NAME)-proto-gen-swagger-$(protoVer)

app/ante/ante_test.go

@@ -14,7 +14,6 @@ import (
  "github.com/cosmos/cosmos-sdk/crypto/keys/secp256r1"
  cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
  "github.com/cosmos/cosmos-sdk/crypto/types/multisig"
- "github.com/cosmos/cosmos-sdk/simapp"
  "github.com/cosmos/cosmos-sdk/types/tx/signing"
  "github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"
 
@@ -30,6 +29,7 @@ import (
  "github.com/evmos/ethermint/tests"
  evmtypes "github.com/evmos/ethermint/x/evm/types"
 
+ moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil"
  banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
  govtypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
 )
@@ -1225,7 +1225,7 @@ func (suite AnteTestSuite) TestAnteHandlerWithParams() {
 func (suite *AnteTestSuite) TestConsumeSignatureVerificationGas() {
  params := authtypes.DefaultParams()
  msg := []byte{1, 2, 3, 4}
- cdc := simapp.MakeTestEncodingConfig().Amino
+ cdc := moduletestutil.MakeTestEncodingConfig().Amino
 
  p := authtypes.DefaultParams()
  skR1, _ := secp256r1.GenPrivKey()

app/ante/eth.go

@@ -8,7 +8,6 @@ import (
 
  sdkmath "cosmossdk.io/math"
 
- storetypes "github.com/cosmos/cosmos-sdk/store/types"
  sdk "github.com/cosmos/cosmos-sdk/types"
  sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
  authante "github.com/cosmos/cosmos-sdk/x/auth/ante"
@@ -520,9 +519,10 @@ func (esc EthSetupContextDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simul
  }
 
  // We need to setup an empty gas config so that the gas is consistent with Ethereum.
- newCtx = ctx.WithGasMeter(sdk.NewInfiniteGasMeter()).
- WithKVGasConfig(storetypes.GasConfig{}).
- WithTransientKVGasConfig(storetypes.GasConfig{})
+ newCtx = ctx.WithGasMeter(sdk.NewInfiniteGasMeter())
+ //todo: fix .
+ // WithKVGasConfig(storetypes.GasConfig{}).
+ // WithTransientKVGasConfig(storetypes.GasConfig{})
 
  // Reset transient gas used to prepare the execution of current cosmos tx.
  // Transient gas-used is necessary to sum the gas-used of cosmos tx, when it contains multiple eth msgs.

app/ante/eth_test.go

@@ -546,8 +546,8 @@ func (suite AnteTestSuite) TestEthSetupContextDecorator() {
 
  if tc.expPass {
  suite.Require().NoError(err)
- suite.Equal(storetypes.GasConfig{}, ctx.KVGasConfig())
- suite.Equal(storetypes.GasConfig{}, ctx.TransientKVGasConfig())
+ suite.Equal(storetypes.GasConfig{}, ctx.BlockGasMeter())
+ suite.Equal(storetypes.GasConfig{}, ctx.BlockGasMeter())
  } else {
  suite.Require().Error(err)
  }

app/ante/handler_options.go

@@ -8,8 +8,8 @@ import (
  authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing"
  authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 
- ibcante "github.com/cosmos/ibc-go/v5/modules/core/ante"
- ibckeeper "github.com/cosmos/ibc-go/v5/modules/core/keeper"
+ ibcante "github.com/cosmos/ibc-go/v6/modules/core/ante"
+ ibckeeper "github.com/cosmos/ibc-go/v6/modules/core/keeper"
 
  evmtypes "github.com/evmos/ethermint/x/evm/types"
 )

app/ante/utils_test.go

@@ -23,13 +23,13 @@ import (
  "github.com/ethereum/go-ethereum/common"
  ethtypes "github.com/ethereum/go-ethereum/core/types"
 
+ "cosmossdk.io/simapp"
  "github.com/cosmos/cosmos-sdk/client"
  "github.com/cosmos/cosmos-sdk/client/tx"
  codectypes "github.com/cosmos/cosmos-sdk/codec/types"
  kmultisig "github.com/cosmos/cosmos-sdk/crypto/keys/multisig"
  cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
  "github.com/cosmos/cosmos-sdk/crypto/types/multisig"
- "github.com/cosmos/cosmos-sdk/simapp"
  "github.com/cosmos/cosmos-sdk/testutil/testdata"
  sdk "github.com/cosmos/cosmos-sdk/types"
  txtypes "github.com/cosmos/cosmos-sdk/types/tx"