chore: migrate cosmos/evm v0.3.1 to v0.4.1

.golangci.yml

@@ -1,59 +1,59 @@
 run:
-    tests: true
-    timeout: 5m
-    concurrency: 4
+  tests: true
+  timeout: 5m
+  concurrency: 4
 
 linters:
-    enable:
-        - dogsled
-        - dupl
-        - errcheck
-        - goconst
-        - gocritic
-        - gofumpt
-        - revive
-        - gosec
-        - gosimple
-        - govet
-        - ineffassign
-        - misspell
-        - nakedret
-        - prealloc
-        - exportloopref
-        - staticcheck
-        - stylecheck
-        - typecheck
-        - unconvert
-        - unparam
-        - unused
-        - nolintlint
-        - asciicheck
-        - exportloopref
-        - gofumpt
-        - gomodguard
+  enable:
+    - dogsled
+    - dupl
+    - errcheck
+    - goconst
+    - gocritic
+    - gofumpt
+    - revive
+    - gosec
+    - gosimple
+    - govet
+    - ineffassign
+    - misspell
+    - nakedret
+    - prealloc
+    - exportloopref
+    - staticcheck
+    - stylecheck
+    - typecheck
+    - unconvert
+    - unparam
+    - unused
+    - nolintlint
+    - asciicheck
+    - exportloopref
+    - gofumpt
+    - gomodguard
 
 linters-settings:
-    dogsled:
-        max-blank-identifiers: 3
-    golint:
-        min-confidence: 0
-    maligned:
-        suggest-new: true
-    misspell:
-        locale: US
-    nolintlint:
-        allow-unused: false
-        allow-leading-space: true
-        require-explanation: false
-        require-specific: false
-    gofumpt:
-        lang-version: "1.22"
-    gomodguard:
-        blocked:
-            versions: # List of blocked module version constraints
-                - https://github.com/etcd-io/etcd: # Blocked module with version constraint
-                      version: ">= 3.4.10 || ~3.3.23" # Version constraint, see https://github.com/Masterminds/semver#basic-comparisons
-                      reason: "CVE-2020-15114; CVE-2020-15136; CVE-2020-15115" # Reason why the version constraint exists. (Optional)
-                - https://github.com/dgrijalva/jwt-go: # Blocked module with version constraint
-                      version: ">= 4.0.0-preview1" # Version constraint, see https://github.com/Masterminds/semver#basic-comparisons
-                      reason: "CVE-2020-26160" # Reason why the version constraint exists. (Optional)
+  dogsled:
+    max-blank-identifiers: 3
+  golint:
+    min-confidence: 0
+  maligned:
+    suggest-new: true
+  misspell:
+    locale: US
+  nolintlint:
+    allow-unused: false
+    allow-leading-space: true
+    require-explanation: false
+    require-specific: false
+  gofumpt:
+    lang-version: "1.22"
+  gomodguard:
+    blocked:
+      versions: # List of blocked module version constraints
+        - https://github.com/etcd-io/etcd: # Blocked module with version constraint
+            version: ">= 3.4.10 || ~3.3.23" # Version constraint, see https://github.com/Masterminds/semver#basic-comparisons
+            reason: "CVE-2020-15114; CVE-2020-15136; CVE-2020-15115" # Reason why the version constraint exists. (Optional)
+        - https://github.com/dgrijalva/jwt-go: # Blocked module with version constraint
+            version: ">= 4.0.0-preview1" # Version constraint, see https://github.com/Masterminds/semver#basic-comparisons
+            reason: "CVE-2020-26160" # Reason why the version constraint exists. (Optional)

Makefile

@@ -144,11 +144,11 @@ test: test-poa test-integration test-upgrade test-sim-benchmark-simulation test-
 
 test-upgrade:
 	@echo "--> Running upgrade testsuite"
-	@go test -mod=readonly -v ./tests/upgrade
+	@go test -mod=readonly -tags=test -v ./tests/upgrade
 
 test-integration:
 	@echo "--> Running integration testsuite"
-	@go test -mod=readonly -v ./tests/integration
+	@go test -mod=readonly -tags=test -v ./tests/integration
 
 test-poa:
 	@echo "--> Running POA tests"

app/ante/ante.go

@@ -0,0 +1,51 @@
+package ante
+
+import (
+	errorsmod "cosmossdk.io/errors"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	errortypes "github.com/cosmos/cosmos-sdk/types/errors"
+	authante "github.com/cosmos/cosmos-sdk/x/auth/ante"
+)
+
+// NewAnteHandler routes Ethereum or SDK transactions to the appropriate handler
+func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) {
+	if err := options.Validate(); err != nil {
+		return nil, err
+	}
+
+	return func(ctx sdk.Context, tx sdk.Tx, sim bool) (newCtx sdk.Context, err error) {
+		var anteHandler sdk.AnteHandler
+
+		txWithExtensions, ok := tx.(authante.HasExtensionOptionsTx)
+		if ok {
+			opts := txWithExtensions.GetExtensionOptions()
+			if len(opts) > 0 {
+				switch typeURL := opts[0].GetTypeUrl(); typeURL {
+				case "/cosmos.evm.vm.v1.ExtensionOptionsEthereumTx":
+					// handle as *evmtypes.MsgEthereumTx
+					anteHandler = newMonoEVMAnteHandler(options)
+				case "/cosmos.evm.types.v1.ExtensionOptionDynamicFeeTx":
+					// cosmos-sdk tx with dynamic fee extension
+					anteHandler = newCosmosAnteHandler(options)
+				default:
+					return ctx, errorsmod.Wrapf(
+						errortypes.ErrUnknownExtensionOptions,
+						"rejecting tx with unsupported extension option: %s", typeURL,
+					)
+				}
+
+				return anteHandler(ctx, tx, sim)
+			}
+		}
+
+		// handle as totally normal Cosmos SDK tx
+		switch tx.(type) {
+		case sdk.Tx:
+			anteHandler = newCosmosAnteHandler(options)
+		default:
+			return ctx, errorsmod.Wrapf(errortypes.ErrUnknownRequest, "invalid transaction type: %T", tx)
+		}
+
+		return anteHandler(ctx, tx, sim)
+	}, nil
+}

app/ante/ante_cosmos.go

@@ -0,0 +1,35 @@
+package ante
+
+import (
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/x/auth/ante"
+	ibcante "github.com/cosmos/ibc-go/v10/modules/core/ante"
+
+	cosmosante "github.com/cosmos/cosmos-sdk/x/auth/ante"
+	evmante "github.com/cosmos/evm/ante/evm"
+)
+
+// newCosmosAnteHandler creates the default SDK ante handler for Cosmos transactions
+func newCosmosAnteHandler(options HandlerOptions) sdk.AnteHandler {
+	return sdk.ChainAnteDecorators(
+		ante.NewSetUpContextDecorator(),
+		ante.NewExtensionOptionsDecorator(options.ExtensionOptionChecker),
+		cosmosante.NewValidateBasicDecorator(),
+		ante.NewTxTimeoutHeightDecorator(),
+		ante.NewValidateMemoDecorator(options.AccountKeeper),
+		ante.NewConsumeGasForTxSizeDecorator(options.AccountKeeper),
+		cosmosante.NewDeductFeeDecorator(
+			options.AccountKeeper,
+			options.BankKeeper,
+			options.FeegrantKeeper,
+			options.TxFeeChecker,
+		),
+		ante.NewSetPubKeyDecorator(options.AccountKeeper),
+		ante.NewValidateSigCountDecorator(options.AccountKeeper),
+		ante.NewSigGasConsumeDecorator(options.AccountKeeper, options.SigGasConsumer),
+		ante.NewSigVerificationDecorator(options.AccountKeeper, options.SignModeHandler),
+		ante.NewIncrementSequenceDecorator(options.AccountKeeper),
+		ibcante.NewRedundantRelayDecorator(options.IBCKeeper),
+		evmante.NewGasWantedDecorator(options.EvmKeeper, options.FeeMarketKeeper),
+	)
+}

app/ante/ante_evm.go

@@ -0,0 +1,18 @@
+package ante
+
+import (
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	evmante "github.com/cosmos/evm/ante/evm"
+)
+
+// newMonoEVMAnteHandler creates the sdk.AnteHandler for EVM transactions
+func newMonoEVMAnteHandler(options HandlerOptions) sdk.AnteHandler {
+	return sdk.ChainAnteDecorators(
+		evmante.NewEVMMonoDecorator(
+			options.AccountKeeper,
+			options.FeeMarketKeeper,
+			options.EvmKeeper,
+			options.MaxTxGasWanted,
+		),
+	)
+}

app/ante/handler_options.go

@@ -0,0 +1,65 @@
+package ante
+
+import (
+	errorsmod "cosmossdk.io/errors"
+	storetypes "cosmossdk.io/store/types"
+	"github.com/cosmos/cosmos-sdk/codec"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	errortypes "github.com/cosmos/cosmos-sdk/types/errors"
+	"github.com/cosmos/cosmos-sdk/types/tx/signing"
+	"github.com/cosmos/cosmos-sdk/x/auth/ante"
+	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
+	ibckeeper "github.com/cosmos/ibc-go/v10/modules/core/keeper"
+
+	txsigning "cosmossdk.io/x/tx/signing"
+
+	anteinterfaces "github.com/cosmos/evm/ante/interfaces"
+)
+
+type HandlerOptions struct {
+	Cdc                    codec.BinaryCodec
+	AccountKeeper          anteinterfaces.AccountKeeper
+	BankKeeper             anteinterfaces.BankKeeper
+	IBCKeeper              *ibckeeper.Keeper
+	FeeMarketKeeper        anteinterfaces.FeeMarketKeeper
+	EvmKeeper              anteinterfaces.EVMKeeper
+	FeegrantKeeper         ante.FeegrantKeeper
+	ExtensionOptionChecker ante.ExtensionOptionChecker
+	SignModeHandler        *txsigning.HandlerMap
+	SigGasConsumer         func(meter storetypes.GasMeter, sig signing.SignatureV2, params authtypes.Params) error
+	MaxTxGasWanted         uint64
+	TxFeeChecker           ante.TxFeeChecker
+	StakingKeeper          StakingKeeper
+	DistributionKeeper     DistributionKeeper
+	ExtraDecorator         sdk.AnteDecorator
+	AuthzDisabledMsgTypes  []string
+}
+
+// Validate checks if the keepers are defined
+func (options *HandlerOptions) Validate() error {
+	if options.Cdc == nil {
+		return errorsmod.Wrap(errortypes.ErrLogic, "codec is required for ante builder")
+	}
+	if options.AccountKeeper == nil {
+		return errorsmod.Wrap(errortypes.ErrLogic, "account keeper is required for ante builder")
+	}
+	if options.BankKeeper == nil {
+		return errorsmod.Wrap(errortypes.ErrLogic, "bank keeper is required for ante builder")
+	}
+	if options.SignModeHandler == nil {
+		return errorsmod.Wrap(errortypes.ErrLogic, "sign mode handler is required for ante builder")
+	}
+	if options.EvmKeeper == nil {
+		return errorsmod.Wrap(errortypes.ErrLogic, "evm keeper is required for ante builder")
+	}
+	if options.FeeMarketKeeper == nil {
+		return errorsmod.Wrap(errortypes.ErrLogic, "feemarket keeper is required for ante builder")
+	}
+	if options.StakingKeeper == nil {
+		return errorsmod.Wrap(errortypes.ErrLogic, "staking keeper is required for AnteHandler")
+	}
+	if options.DistributionKeeper == nil {
+		return errorsmod.Wrap(errortypes.ErrLogic, "distribution keeper is required for AnteHandler")
+	}
+	return nil
+}

app/ante_interfaces.go → app/ante/interfaces.go

@@ -1,4 +1,4 @@
-package app
+package ante
 
 import (
 	"context"