Merge branch 'develop' into dogfood

.github/workflows/ante-benchmark.yml

@@ -3,12 +3,16 @@ name: AnteHandler Benchmark Tests
 on:
   push:
     branches:
+      - develop
       - main
+      - master
     paths: 
       - 'app/ante/**'
   pull_request:
     branches:
+      - develop
       - main
+      - master
     paths: 
       - 'app/ante/**'
 
@@ -22,7 +26,7 @@ jobs:
       - name: Setup Golang
         uses: actions/setup-go@v4
         with:
-          go-version: '1.20'
+          go-version: '1.21'
           check-latest: true
 
       - name: Run benchmark tests

.github/workflows/build.yml

@@ -2,24 +2,23 @@ name: Build
 on:
   pull_request:
     branches:
+      - develop
       - main
+      - master
 
-jobs:
-  cleanup-runs:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: rokroskar/workflow-run-cleanup-action@master
-        env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-    if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/main'"
+# Automatically cancel run if another commit to the same ref is detected.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
+jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
         with:
-          go-version: '1.20'
+          go-version: '1.21'
           check-latest: true
       - uses: technote-space/[email protected]
         id: git_diff

.github/workflows/codeql-analysis.yml

@@ -13,10 +13,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [main]
+    branches: [develop, main, master]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [main]
+    branches: [develop, main, master]
   schedule:
     - cron: '37 21 * * 4'
 

.github/workflows/dependencies.yml

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

.github/workflows/e2e-test-release.yml

@@ -13,7 +13,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v4
         with:
-          go-version: '1.20'
+          go-version: '1.21'
           check-latest: true
       - uses: actions/checkout@v4
       - name: Test E2E

.github/workflows/e2e-test.yml

@@ -2,18 +2,22 @@ name: E2E Test
 on:
   pull_request:
     branches:
+      - develop
       - main
+      - master
   push:
     branches:
+      - develop
       - main
+      - master
 
 jobs:
   test-e2e:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/setup-go@v4
         with:
-          go-version: '1.20'
+          go-version: '1.21'
           check-latest: true
       - uses: actions/checkout@v4
       - uses: technote-space/[email protected]

.github/workflows/goreleaser.yml

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

.github/workflows/labeler.yml

@@ -3,12 +3,14 @@ on:
   pull_request:
   push:
     branches:
+      - develop
       - main
+      - master
 
 jobs:
   triage:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/labeler@v4
-      with:
-        repo-token: "${{ secrets.GITHUB_TOKEN }}"
+      - uses: actions/labeler@v4
+        with:
+          repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/lint.yml

@@ -1,33 +1,43 @@
 name: Lint
-# Lint runs golangci-lint over the entire exocore repository This workflow is
-# run on every pull request and push to main The `golangci` will pass without
+# Lint runs golangci-lint over the entire exocore repository. The `golangci` will pass without
 # running if no *.{go, mod, sum} files have been changed.
 on:
   pull_request:
   push:
     branches:
+      - develop
       - main
+      - master
+
+permissions:
+  contents: read
+
 jobs:
   golangci:
     name: Run golangci-lint
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
       # Required: setup-go, for all versions v3.0.0+ of golangci-lint
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
-          go-version: '1.20'
-          check-latest: true
+          go-version: '1.21'
+          # Use pinned versions, not git versions
+          check-latest: false
+          # Match `golangci-lint-action` recommendation
+          cache: false
       - uses: actions/checkout@v4
+      # Only operate if there are any differences in go files
       - uses: technote-space/[email protected]
         with:
           PATTERNS: |
             **/**.go
             go.mod
             go.sum
-      - uses: golangci/[email protected]
+      # Now, the actual golangci-lint configuration
+      - uses: golangci/golangci-lint-action@v4
         with:
-          # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
+          # Required parameter
           version: latest
           args: --timeout 10m
           github-token: ${{ secrets.github_token }}

.github/workflows/markdown-links.yml

@@ -5,7 +5,9 @@ on:
       - '**.md'
   push:
     branches:
+      - develop
       - main
+      - master
     paths:
       - '**.md'
 

.github/workflows/security.yml

@@ -3,7 +3,9 @@ on:
   pull_request:
   push:
     branches:
+      - develop
       - main
+      - master
 
 jobs:
   Gosec:

.github/workflows/semgrep.yml

@@ -4,7 +4,9 @@ on:
   pull_request: {}
   push:
     branches:
+      - develop
       - main
+      - master
     paths:
       - .github/workflows/semgrep.yml
   schedule:
@@ -19,7 +21,8 @@ jobs:
     if: (github.actor != 'dependabot[bot]')
     steps:
       - name: Permission issue fix
-        run: git config --global --add safe.directory /__w/ExocoreNetwork/exocore
+        # semgrep for some reason sets the working directory to exocore/exocore
+        run: git config --global --add safe.directory /__w/exocore/exocore
       - uses: actions/checkout@v4
       - name: Get Diff
         uses: technote-space/[email protected]

.github/workflows/slither.yml

@@ -4,10 +4,14 @@ on:
   pull_request:
   push:
     branches:
+      - develop
       - main
+      - master
 
 jobs:
   analyze:
+    # disabled for now, since we don't have any Solidity files.
+    if: ${{ false }}
     name: Run Slither
     runs-on: ubuntu-latest
     permissions:

.github/workflows/solidity-test.yml

@@ -2,7 +2,9 @@ name: Solidity Test
 on:
   pull_request:
     branches:
+      - develop
       - main
+      - master
       - release/**
 
 jobs:
@@ -11,7 +13,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v4
         with:
-          go-version: '1.20'
+          go-version: '1.21'
           check-latest: true
       - uses: actions/checkout@v4
       - uses: technote-space/[email protected]

.github/workflows/super-linter.yml

@@ -9,9 +9,9 @@ name: Lint Code Base
 
 on:
   push:
-    branches: ["main"]
+    branches: ["develop", "main", "master"]
   pull_request:
-    branches: ["main"]
+    branches: ["develop", "main", "master"]
 jobs:
   run-lint:
     runs-on: ubuntu-latest
@@ -34,5 +34,5 @@ jobs:
           VALIDATE_OPENAPI: false
           VALIDATE_JSCPD: false
           VALIDATE_GO: false
-          DEFAULT_BRANCH: "main"
+          DEFAULT_BRANCH: "master"
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/test.yml

@@ -3,24 +3,23 @@ on:
   pull_request:
   push:
     branches:
+      - develop
       - main
+      - master
       - release/**
 
-jobs:
-  cleanup-runs:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: rokroskar/workflow-run-cleanup-action@master
-        env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-    if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/main'"
+# Automatically cancel run if another commit to the same ref is detected.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
+jobs:
   test-unit-cover:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/setup-go@v4
         with:
-          go-version: '1.20'
+          go-version: '1.21'
           check-latest: true
       - uses: actions/checkout@v4
       - uses: technote-space/[email protected]

.golangci.yml

@@ -1,5 +1,5 @@
 run:
-  tests: true
+  tests: false
   timeout: 5m
   concurrency: 4
 
@@ -50,7 +50,7 @@ linters-settings:
     require-explanation: false
     require-specific: false
   gofumpt:
-    lang-version: "1.20"
+    lang-version: "1.21"
   gomodguard:
     blocked:
       versions:                                                         # List of blocked module version constraints
@@ -60,3 +60,11 @@ linters-settings:
         - 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)
+
+issues:
+  exclude-rules:
+    # `gofmt` has made this rule strict, which `nolintlint` followed by removing the option.
+    # however, other linters have not yet caught up.
+    - text: 'leading space'
+      linters:
+        - nolintlint