feat: Bump cosmos-sdk v0.45.16 and cometbft v0.34.33 (#16)

* feat: Bump up cosmos-sdk v0.45.16, tendermint v0.34.33 * feat: Bump up go v1.21 * feat: Apply code diffs * chore: Bump up viper v1.18.2 * test: Update lint.yml from ethermint v0.22.0-sdk50-1 * test: Change path from .markdownlintignore for proto-docs.md * test: Fix lint(ref. ethermint v0.22.0-sdk50-1) * test: Fix lint * test: Fix tests(ref. ethermint v0.22.0-sdk50-1) * chore: Remove matrix from integration test ci * test: Fix nix for go v1.21 * chore: go_1_21_overlay.nix * test: Update nixpkgs, poetry2nix * chore: Update geth hash * chore: Update geth hash * test: Remove go_1_21_overlay.nix * chore: Remove toolchain from go.mod * test: Fix nix contents * test: Fix integration codes for web3 * test: Fix integration tests * test: Fix flake8 lint * chore: Apply comments * chore: fix lint
b-harvest · Aug 19, 2024 · e234684 · e234684
1 parent db8920e
commit e234684
Show file tree

Hide file tree

Showing 74 changed files with 3,305 additions and 2,030 deletions.
diff --git a/.envrc.example b/.envrc.example
@@ -0,0 +1,5 @@
+# default: go, gomod2nix
+# rocksdb: go, gomod2nix, librocksdb
+# full:    go, gomod2nix, librocksdb, python env
+use flake .#full
+TMPDIR=/tmp
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.18
+          go-version: 1.21
           check-latest: true
       - uses: technote-space/[email protected]
         id: git_diff

diff --git a/.github/workflows/goreleaser.yml b/.github/workflows/goreleaser.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.18
+          go-version: 1.21
           check-latest: true
       - name: release dry run
         run: make release-dry-run

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -13,48 +13,55 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
-      - uses: actions/setup-go@v3
+      # Required: setup-go, for all versions v3.0.0+ of golangci-lint
+      - uses: actions/setup-go@v4
         with:
-          go-version: 1.18
+          go-version: 1.21
+          check-latest: true
       - uses: actions/checkout@v3
-      - uses: technote-space/[email protected].0
+      - uses: technote-space/[email protected].2
         with:
           PATTERNS: |
             **/**.go
             go.mod
             go.sum
-      - uses: golangci/golangci-lint-action@v3
+      - uses: golangci/golangci-lint-action@v3.4.0
         with:
-          version: v1.48.0
+          # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
+          version: latest
           args: --timeout 10m
           github-token: ${{ secrets.github_token }}
         # Check only if there are differences in the source code
-        if: "env.GIT_DIFF"
+        if: env.GIT_DIFF
   markdown-lint:
     name: Run markdown-lint
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
       - uses: actions/checkout@v3
-      - uses: technote-space/[email protected].0
+      - uses: technote-space/[email protected].2
         with:
           PATTERNS: |
             docs/**/*.md
             x/**/*.md
             README.md
-      - uses: articulate/[email protected]
+      - uses: nosborn/[email protected]
+        with:
+          files: .
+          config_file: .markdownlint.yml
+          ignore_path: .markdownlintignore
         # Check only if there are differences in the source code
         if: env.GIT_DIFF
   python-lint:
     name: Run flake8 on python integration tests
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: cachix/install-nix-action@v17
-      - uses: cachix/cachix-action@v10
+      - uses: actions/checkout@v3
+      - uses: cachix/install-nix-action@v20
+      - uses: cachix/cachix-action@v12
         with:
           name: ethermint
-      - uses: technote-space/[email protected].0
+      - uses: technote-space/[email protected].2
         with:
           PATTERNS: |
             **/**.py
@@ -65,12 +72,17 @@ jobs:
     name: Check gomod2nix.toml file is up to date
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2.3.4
-      - uses: cachix/install-nix-action@v17
-      - uses: cachix/cachix-action@v10
+      - uses: actions/checkout@v3
+      - uses: cachix/install-nix-action@v20
+      - uses: cachix/cachix-action@v12
         with:
           name: ethermint
+      - uses: technote-space/[email protected]
+        with:
+          PATTERNS: |
+            **/**.py
       - name: run gomod2nix
         run: |
           nix run -f ./nix gomod2nix
           git diff --no-ext-diff --exit-code
+        if: env.GIT_DIFF
diff --git a/.github/workflows/semgrep.yml b/.github/workflows/semgrep.yml
@@ -18,9 +18,11 @@ jobs:
       image: returntocorp/semgrep
     if: (github.actor != 'dependabot[bot]')
     steps:
+      - name: Permission issue fix
+        run: git config --global --add safe.directory /__w/ethermint/ethermint
       - uses: actions/checkout@v3
       - name: Get Diff
-        uses: technote-space/[email protected].0
+        uses: technote-space/[email protected].2
         with:
           PATTERNS: |
             **/*.go
@@ -30,7 +32,7 @@ jobs:
             go.mod
             go.sum
       - uses: actions/checkout@v3
-      - run: semgrep scan --sarif --output=semgrep.sarif
+      - run: semgrep scan --sarif --output=semgrep.sarif --config auto
         env:
           # Upload findings to GitHub Advanced Security Dashboard [step 1/2]
           SEMGREP_APP_TOKEN: ${{ secrets.SEMGREP_APP_TOKEN }}

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -3,8 +3,8 @@ on:
   pull_request:
   push:
     branches:
-      - main
-      - release/**
+      - '*'
+      - '*/*'
 
 jobs:
   cleanup-runs:
@@ -18,14 +18,15 @@ jobs:
   test-unit-cover:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v4
         with:
-          go-version: 1.18
+          go-version: 1.21
           check-latest: true
       - uses: actions/checkout@v3
-      - uses: technote-space/[email protected].0
+      - uses: technote-space/[email protected].2
         with:
           PATTERNS: |
+            **/**.sol
             **/**.go
             go.mod
             go.sum
@@ -37,18 +38,19 @@ jobs:
         with:
           file: ./coverage.txt
           fail_ci_if_error: true
+          token: ${{ secrets.CODECOV_TOKEN }}
         if: env.GIT_DIFF
 
   test-importer:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v4
         with:
-          go-version: 1.18
+          go-version: 1.21
           check-latest: true
       - uses: actions/checkout@v3
-      - uses: technote-space/[email protected].0
+      - uses: technote-space/[email protected].2
         id: git_diff
         with:
           PATTERNS: |
@@ -59,17 +61,17 @@ jobs:
         run: |
           make test-import
         if: env.GIT_DIFF
-      
+
   test-rpc:
     runs-on: ubuntu-latest
-    timeout-minutes: 15
+    timeout-minutes: 30
     steps:
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v4
         with:
-          go-version: 1.18
+          go-version: 1.21
           check-latest: true
       - uses: actions/checkout@v3
-      - uses: technote-space/[email protected].0
+      - uses: technote-space/[email protected].2
         with:
           PATTERNS: |
             **/**.sol
@@ -87,7 +89,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.18
+          go-version: 1.21
           check-latest: true
       - uses: actions/checkout@v3
       - uses: technote-space/[email protected]
@@ -105,13 +107,13 @@ jobs:
   integration_tests:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: cachix/install-nix-action@v15
-      - uses: cachix/cachix-action@v10
+      - uses: actions/checkout@v3
+      - uses: cachix/install-nix-action@v20
+      - uses: cachix/cachix-action@v12
         with:
           name: ethermint
           signingKey: "${{ secrets.CACHIX_SIGNING_KEY }}"
-      - uses: technote-space/[email protected].0
+      - uses: technote-space/[email protected].2
         with:
           PATTERNS: |
             **/**.sol
@@ -121,24 +123,40 @@ jobs:
             tests/integration_tests/**
       - name: Run integration tests
         run: make run-integration-tests
-        if: env.GIT_DIFF
+       if: env.GIT_DIFF
       - name: 'Tar debug files'
         if: failure()
         run: tar cfz debug_files.tar.gz -C /tmp/pytest-of-runner .
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         if: failure()
         with:
           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@v3
+      - uses: cachix/install-nix-action@v20
+      - 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)"
   test-sim-nondeterminism:
     runs-on: ubuntu-latest
     timeout-minutes: 25
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.18
+          go-version: 1.21
           check-latest: true
       - uses: actions/checkout@v3
       - uses: technote-space/[email protected]
@@ -158,7 +176,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.18
+          go-version: 1.21
           check-latest: true
       - uses: actions/checkout@v3
       - uses: technote-space/[email protected]
@@ -178,7 +196,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.18
+          go-version: 1.21
           check-latest: true
       - uses: actions/checkout@v3
       - uses: technote-space/[email protected]
@@ -198,7 +216,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.18
+          go-version: 1.21
           check-latest: true
       - uses: actions/checkout@v3
       - uses: technote-space/[email protected]

diff --git a/.golangci.yml b/.golangci.yml
@@ -5,46 +5,35 @@ run:
 
 linters:
   enable:
-    # - bodyclose
-    - deadcode
-    - depguard
+    - bodyclose
     - dogsled
     - dupl
     - errcheck
     - goconst
     - gocritic
-    - gofmt
-    - goimports
+    - gofumpt
     - revive
     - gosec
     - gosimple
     - govet
     - ineffassign
-    # - lll TODO: enable
+    - lll
     - misspell
     - nakedret
     - prealloc
     - exportloopref
     - staticcheck
-    # - structcheck
     - stylecheck
-    # - typecheck #TODO: enable
+    - typecheck
     - unconvert
-    # - unparam
+    - unparam
     - unused
-    - varcheck
     - nolintlint
     - asciicheck
-    # - exhaustive
     - exportloopref
     - gofumpt
     - gomodguard
-    # - nestif
-    # - nlreturn
-    # - noctx
-    # - rowserrcheck
-    # - whitespace
-    # - wsl
+    - whitespace
 
 issues:
   exclude-rules:
@@ -57,6 +46,8 @@ issues:
   max-same-issues: 50
 
 linters-settings:
+  lll:
+    line-length: 150
   dogsled:
     max-blank-identifiers: 3
   golint:
@@ -71,13 +62,13 @@ linters-settings:
     require-explanation: false
     require-specific: false
   gofumpt:
-    lang-version: "1.18"
+    lang-version: "1.21"
   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)
+        - 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)
diff --git a/.markdownlintignore b/.markdownlintignore
@@ -1,3 +1,3 @@
 CHANGELOG.md
-docs/protocol/proto-docs.md
+docs/api/proto-docs.md
 docs/node_modules