Resolve CI and test errors (#34)

.github/workflows/build.yml

@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: '1.21'
           check-latest: true
       - uses: technote-space/[email protected]
         id: git_diff

.github/workflows/dependencies.yml

@@ -10,7 +10,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: '1.21'
           check-latest: true
       - name: "Checkout Repository"
         uses: actions/checkout@v3

.github/workflows/goreleaser.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: '1.21'
           check-latest: true
       - name: release dry run
         run: make release-dry-run

.github/workflows/lint.yml

@@ -16,7 +16,7 @@ jobs:
       # Required: setup-go, for all versions v3.0.0+ of golangci-lint
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: '1.21'
           check-latest: true
       - uses: actions/checkout@v3
       - uses: technote-space/[email protected]
@@ -58,9 +58,6 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: cachix/install-nix-action@v18
-      - uses: cachix/cachix-action@v12
-        with:
-          name: ethermint
       - uses: technote-space/[email protected]
         with:
           PATTERNS: |
@@ -74,9 +71,6 @@ jobs:
     steps:
       - uses: actions/[email protected]
       - uses: cachix/install-nix-action@v18
-      - uses: cachix/cachix-action@v12
-        with:
-          name: ethermint
       - uses: technote-space/[email protected]
         with:
           PATTERNS: |

.github/workflows/test.yml

@@ -20,7 +20,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: "1.21"
           check-latest: true
       - uses: actions/checkout@v3
       - uses: technote-space/[email protected]
@@ -34,20 +34,15 @@ jobs:
         run: |
           make test-unit-cover
         if: env.GIT_DIFF
-      - uses: codecov/codecov-action@v3
-        with:
-          file: ./coverage.txt
-          fail_ci_if_error: true
-          token: ${{ secrets.CODECOV_TOKEN }}
-        if: env.GIT_DIFF
+      # Coverage at ./coverage.txt is not used for now
 
   test-importer:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: "1.21"
           check-latest: true
       - uses: actions/checkout@v3
       - uses: technote-space/[email protected]
@@ -68,7 +63,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: "1.21"
           check-latest: true
       - uses: actions/checkout@v3
       - uses: technote-space/[email protected]
@@ -87,23 +82,46 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: cachix/install-nix-action@v18
-      - uses: cachix/cachix-action@v12
-        with:
-          name: ethermint
-          signingKey: "${{ secrets.CACHIX_SIGNING_KEY }}"
       - uses: technote-space/[email protected]
         with:
           PATTERNS: |
             **/**.sol
             **/**.go
             go.mod
             go.sum
-            tests/integration_tests/**
+      - uses: actions/setup-go@v3
+        with:
+          go-version: "1.21"
+          check-latest: true
+
+      - uses: nixbuild/nix-quick-install-action@v26
+      - name: Restore and cache Nix store
+        uses: nix-community/cache-nix-action@v5
+        with:
+          primary-key: nix-${{ runner.os }}-${{ hashFiles('**/*.nix') }}
+          # restore a cache by this prefix
+          restore-prefixes-first-match: nix-${{ runner.os }}-
+          # collect garbage until Nix store size (in bytes) is at most this number
+          # before trying to save a new cache
+          gc-max-store-size-linux: 1073741824
+
+      - name: Show Versions
+        run: python --version && python3 --version && pip --version && pip3 --version
+      - name: Install python
+        run: sudo apt-get update && sudo apt-get install -y python3.8
+#      - name: Downgrade Python
+#        run: pip install python==3.8
+      - name: Show Versions
+        run: python --version && python3 --version && pip --version && pip3 --version
+      - name: Install poetry
+        run: pipx install poetry
+      - name: Install deps
+        run: poetry install
+        working-directory: ./tests/integration_tests
       - name: Run integration tests
-        run: make run-integration-tests
+        run: make run-integration-tests-without-nix
         if: env.GIT_DIFF
-      - name: 'Tar debug files'
+      - name: "Tar debug files"
         if: failure()
         run: tar cfz debug_files.tar.gz -C /tmp/pytest-of-runner .
       - uses: actions/upload-artifact@v3
@@ -112,20 +130,3 @@ jobs:
           name: debug-files
           path: debug_files.tar.gz
           if-no-files-found: ignore
-
-  upload-cache:
-    if: github.event_name == 'push'
-    needs: ["integration_tests"]
-    strategy:
-      matrix:
-        os: [macos-latest]
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: cachix/install-nix-action@v18
-      - uses: cachix/cachix-action@v12
-        with:
-          name: ethermint
-          signingKey: "${{ secrets.CACHIX_SIGNING_KEY }}"
-      - name: 'instantiate integration test env'
-        run: nix-store -r "$(nix-instantiate tests/integration_tests/shell.nix)"

.golangci.yml

@@ -6,7 +6,6 @@ run:
 linters:
   enable:
     - bodyclose
-    - depguard
     - dogsled
     - dupl
     - errcheck
@@ -44,6 +43,9 @@ issues:
     - linters:
         - lll
       source: "https://"
+    - path: \.pb.go
+      linters:
+        - lll
   max-same-issues: 50
 
 linters-settings:

Makefile

@@ -163,7 +163,7 @@ all: build
 
 build-all: tools build lint test vulncheck
 
-.PHONY: distclean clean build-all
+.PHONY: distclean clean build build-all
 
 ###############################################################################
 ###                                Releasing                                ###
@@ -335,10 +335,13 @@ test-import:
 	go test -run TestImporterTestSuite -v --vet=off github.com/evmos/ethermint/tests/importer
 
 test-rpc:
-	./scripts/integration-test-all.sh -t "rpc" -q 1 -z 1 -s 2 -m "rpc" -r "true"
+	./scripts/integration-test-all.sh -t "rpc" -q 1 -z 1 -s 5 -m "rpc" -r "true"
 
 run-integration-tests:
-	@nix-shell ./tests/integration_tests/shell.nix --run ./scripts/run-integration-tests.sh
+	@nix-shell -I nixpkgs=./nix ./tests/integration_tests/shell.nix --run ./scripts/run-integration-tests.sh
+
+run-integration-tests-without-nix:
+	./scripts/run-integration-tests.sh
 
 .PHONY: run-integration-tests
 

app/ante/eip712.go

@@ -19,7 +19,6 @@ import (
 	"fmt"
 
 	errorsmod "cosmossdk.io/errors"
-	"github.com/cosmos/cosmos-sdk/codec"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -40,12 +39,9 @@ import (
 	evmtypes "github.com/evmos/ethermint/x/evm/types"
 )
 
-var ethermintCodec codec.ProtoCodecMarshaler
-
 func init() {
 	registry := codectypes.NewInterfaceRegistry()
 	ethermint.RegisterInterfaces(registry)
-	ethermintCodec = codec.NewProtoCodec(registry)
 }
 
 // Deprecated: NewLegacyCosmosAnteHandlerEip712 creates an AnteHandler to process legacy EIP-712

app/app.go

@@ -496,7 +496,7 @@
 		capability.NewAppModule(appCodec, *app.CapabilityKeeper, false),
 		feegrantmodule.NewAppModule(appCodec, app.AccountKeeper, app.BankKeeper, app.FeeGrantKeeper, app.interfaceRegistry),
 		gov.NewAppModule(appCodec, &app.GovKeeper, app.AccountKeeper, app.BankKeeper, app.GetSubspace(govtypes.ModuleName)),
 		slashing.NewAppModule(appCodec, app.SlashingKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper, app.GetSubspace(slashingtypes.ModuleName)),
 		distr.NewAppModule(appCodec, app.DistrKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper, app.GetSubspace(distrtypes.ModuleName)),
 		staking.NewAppModule(appCodec, &app.StakingKeeper, app.AccountKeeper, app.BankKeeper, app.GetSubspace(stakingtypes.ModuleName)),
 		upgrade.NewAppModule(&app.UpgradeKeeper),
@@ -856,12 +856,12 @@
 	paramsKeeper.Subspace(minttypes.ModuleName)
 	paramsKeeper.Subspace(distrtypes.ModuleName)
 	paramsKeeper.Subspace(slashingtypes.ModuleName)
 	paramsKeeper.Subspace(govtypes.ModuleName).WithKeyTable(govv1.ParamKeyTable())
 	paramsKeeper.Subspace(crisistypes.ModuleName)
 	paramsKeeper.Subspace(ibctransfertypes.ModuleName)
 	paramsKeeper.Subspace(ibcexported.ModuleName)
 	// ethermint subspaces
-	paramsKeeper.Subspace(evmtypes.ModuleName).WithKeyTable(legacyevmtypes.ParamKeyTable()) //nolint: staticcheck
+	paramsKeeper.Subspace(evmtypes.ModuleName).WithKeyTable(legacyevmtypes.ParamKeyTable())
 	paramsKeeper.Subspace(feemarkettypes.ModuleName).WithKeyTable(feemarkettypes.ParamKeyTable())
 	return paramsKeeper
 }

client/keys/add.go

@@ -17,11 +17,11 @@
 
 import (
 	"bufio"
 	"bytes"
 	"errors"
 	"fmt"
 	"sort"
 
 	"encoding/json"
 
 	etherminthd "github.com/evmos/ethermint/crypto/hd"
@@ -198,8 +198,8 @@
 	// Get bip39 mnemonic
 	var mnemonic, bip39Passphrase string
 
-	recover, _ := cmd.Flags().GetBool(flagRecover)
-	if recover {
+	shouldRecover, _ := cmd.Flags().GetBool(flagRecover)
+	if shouldRecover {
 		mnemonic, err = input.GetString("Enter your bip39 mnemonic", inBuf)
 		if err != nil {
 			return err
@@ -260,7 +260,7 @@
 	}
 
 	// Recover key from seed passphrase
-	if recover {
+	if shouldRecover {
 		// Hide mnemonic from output
 		showMnemonic = false
 		mnemonic = ""

ethereum/eip712/eip712.go

@@ -19,6 +19,7 @@ import (
 	"encoding/json"
 	"fmt"
 
+	errorsmod "cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	"github.com/cosmos/cosmos-sdk/types/tx"
@@ -71,13 +72,13 @@ func ConstructUntypedEIP712Data(
 func ComputeTypedDataHash(typedData apitypes.TypedData) ([]byte, error) {
 	domainSeparator, err := typedData.HashStruct("EIP712Domain", typedData.Domain.Map())
 	if err != nil {
-		err = sdkerrors.Wrap(err, "failed to pack and hash typedData EIP712Domain")
+		err = errorsmod.Wrap(err, "failed to pack and hash typedData EIP712Domain")
 		return nil, err
 	}
 
 	typedDataHash, err := typedData.HashStruct(typedData.PrimaryType, typedData.Message)
 	if err != nil {
-		err = sdkerrors.Wrap(err, "failed to pack and hash typedData primary type")
+		err = errorsmod.Wrap(err, "failed to pack and hash typedData primary type")
 		return nil, err
 	}
 
@@ -97,7 +98,7 @@ func WrapTxToTypedData(
 	txData := make(map[string]interface{})
 
 	if err := json.Unmarshal(data, &txData); err != nil {
-		return apitypes.TypedData{}, sdkerrors.Wrap(sdkerrors.ErrJSONUnmarshal, "failed to JSON unmarshal data")
+		return apitypes.TypedData{}, errorsmod.Wrap(sdkerrors.ErrJSONUnmarshal, "failed to JSON unmarshal data")
 	}
 
 	domain := getTypedDataDomain(chainID)
@@ -110,7 +111,7 @@ func WrapTxToTypedData(
 	if feeDelegation != nil {
 		feeInfo, ok := txData["fee"].(map[string]interface{})
 		if !ok {
-			return apitypes.TypedData{}, sdkerrors.Wrap(sdkerrors.ErrInvalidType, "cannot parse fee from tx data")
+			return apitypes.TypedData{}, errorsmod.Wrap(sdkerrors.ErrInvalidType, "cannot parse fee from tx data")
 		}
 
 		feeInfo["feePayer"] = feeDelegation.FeePayer.String()
@@ -149,15 +150,15 @@ func extractMsgTypes(msgs []sdk.Msg, params evmtypes.Params) (apitypes.Types, er
 		// ensure eip712 messages implement legacytx.LegacyMsg
 		_, ok := msg.(legacytx.LegacyMsg)
 		if !ok {
-			err := sdkerrors.Wrapf(sdkerrors.ErrInvalidType, "msg %T must implement legacytx.LegacyMsg", (*legacytx.LegacyMsg)(nil))
+			err := errorsmod.Wrapf(sdkerrors.ErrInvalidType, "msg %T must implement legacytx.LegacyMsg", (*legacytx.LegacyMsg)(nil))
 			return apitypes.Types{}, err
 		}
 
 		// get corresponding allowed msg from params
 		msgType := sdk.MsgTypeURL(msg)
 		allowedMsg := params.EIP712AllowedMsgFromMsgType(msgType)
 		if allowedMsg == nil {
-			err := sdkerrors.Wrapf(
+			err := errorsmod.Wrapf(
 				sdkerrors.ErrInvalidType,
 				"eip712 message type \"%s\" is not permitted",
 				msgType,