Merge branch 'develop' into copy-app-chain

# Conflicts:
#	app/export.go
#	go.mod
#	precompiles/delegation/delegation.sol
#	precompiles/delegation/delegation_test.go
#	precompiles/deposit/deposit.sol
#	precompiles/deposit/types.go
#	precompiles/reward/claimReward.sol
#	precompiles/slash/slash.sol
#	proto/exocore/delegation/v1/query.proto
#	proto/exocore/delegation/v1/tx.proto
#	proto/exocore/restaking_assets_manage/v1/query.proto
#	proto/exocore/restaking_assets_manage/v1/tx.proto
#	testutil/utils.go
#	x/delegation/client/cli/tx.go
#	x/delegation/keeper/abci.go
#	x/delegation/keeper/cross_chain_tx_process.go
#	x/delegation/keeper/delegation_op_test.go
#	x/delegation/keeper/delegation_state.go
#	x/delegation/keeper/grpc_query.go
#	x/delegation/keeper/keeper.go
#	x/delegation/keeper/msg_server.go
#	x/delegation/keeper/operator_info_test.go
#	x/delegation/keeper/un_delegation_state.go
#	x/delegation/types/expected_keepers.go
#	x/delegation/types/keys.go
#	x/delegation/types/query.pb.go
#	x/delegation/types/query.pb.gw.go
#	x/delegation/types/tx.pb.go
#	x/deposit/types/deposit.pb.go
#	x/deposit/types/query.pb.go
#	x/deposit/types/tx.pb.go
#	x/dogfood/keeper/impl_sdk.go
#	x/dogfood/types/expected_keepers.go
#	x/native_token/types/tx.pb.go
#	x/operator/types/codec.go
#	x/restaking_assets_manage/client/cli/query.go
#	x/restaking_assets_manage/genesis.go
#	x/restaking_assets_manage/keeper/client_chain_asset.go
#	x/restaking_assets_manage/keeper/exocore_addr.go
#	x/restaking_assets_manage/keeper/grpc_query.go
#	x/restaking_assets_manage/keeper/operator_asset.go
#	x/restaking_assets_manage/keeper/staker_asset.go
#	x/restaking_assets_manage/types/genesis.pb.go
#	x/restaking_assets_manage/types/keys.go
#	x/restaking_assets_manage/types/query.pb.go
#	x/restaking_assets_manage/types/query.pb.gw.go
#	x/restaking_assets_manage/types/tx.pb.go
#	x/reward/keeper/claim_reward.go
#	x/reward/types/genesis.pb.go
#	x/reward/types/params.pb.go
#	x/reward/types/query.pb.go
#	x/reward/types/tx.pb.go
#	x/reward/types/types.pb.go
#	x/slash/keeper/execute_slash.go
#	x/slash/types/genesis.pb.go
#	x/slash/types/params.pb.go
#	x/slash/types/query.pb.go
#	x/slash/types/tx.pb.go
#	x/withdraw/client/cli/tx.go
#	x/withdraw/keeper/claim_withdraw.go
#	x/withdraw/module.go

.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/consensuswarn.yml

@@ -18,4 +18,4 @@ jobs:
       - uses: orijtech/consensuswarn@main
         with:
           # example.com/pkg/path.Type.Method
-          roots: 'github.com/ExocoreNetwork/exocore/app.ExocoreApp.BaseApp.DeliverTx,github.com/ExocoreNetwork/exocore/app.ExocoreApp.BaseApp.BeginBlocker,github.com/ExocoreNetwork/exocore/app.ExocoreApp.BaseApp.EndBlocker'
+          roots: 'github.com/ExocoreNetwork/exocore/app.ExocoreApp.DeliverTx,github.com/ExocoreNetwork/exocore/app.ExocoreApp.BeginBlocker,github.com/ExocoreNetwork/exocore/app.ExocoreApp.EndBlocker'

.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
@@ -23,6 +23,8 @@ jobs:
       - name: "Dependency Review"
         uses: actions/dependency-review-action@v3
         if: env.GIT_DIFF
+        with:
+          fail-on-severity: high
       - name: "Go vulnerability check"
         run: make vulncheck
         if: env.GIT_DIFF

.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,24 @@ name: E2E Test
 on:
   pull_request:
     branches:
+      - develop
       - main
+      - master
   push:
     branches:
+      - develop
       - main
+      - master
 
 jobs:
   test-e2e:
+    # disabled for now, since we don't have any e2e tests.
+    if: ${{ false }}
     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

@@ -1,14 +1,15 @@
 name: "Pull Request Labeler"
+
 on:
-  pull_request:
-  push:
-    branches:
-      - main
+  pull_request_target:
 
 jobs:
   triage:
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write
     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/proto.yml

@@ -41,4 +41,8 @@ jobs:
       - uses: bufbuild/buf-breaking-action@v1
         with:
           input: "proto"
-          against: "https://github.com/${{ github.repository }}.git#branch=${{ github.event.pull_request.base.ref }},ref=HEAD~1,subdir=proto"
+          # previously, this ran on ref=HEAD~1, which is incorrect as it can
+          # only be used to compare within a branch. it is designed to run
+          # on a PR, so it must compare the HEAD of the base branch against
+          # the PR branch.
+          against: "https://github.com/${{ github.repository }}.git#branch=${{ github.event.pull_request.base.ref }},subdir=proto"

.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,16 +2,20 @@ name: Solidity Test
 on:
   pull_request:
     branches:
+      - develop
       - main
+      - master
       - release/**
 
 jobs:
   test-solidity:
+    # disabled for now, since we don't have any Solidity files.
+    if: ${{ false }}
     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/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
@@ -23,7 +23,7 @@ jobs:
           fetch-depth: 0
 
       - name: Lint Code Base
-        uses: github/super-linter@v5
+        uses: super-linter/super-linter@v6.3.0  # x-release-please-version
         env:
           LINTER_RULES_PATH: /
           YAML_CONFIG_FILE: .yamllint
@@ -33,6 +33,9 @@ jobs:
           VALIDATE_NATURAL_LANGUAGE: false
           VALIDATE_OPENAPI: false
           VALIDATE_JSCPD: false
+          # separate workflow
           VALIDATE_GO: false
-          DEFAULT_BRANCH: "main"
+          VALIDATE_GO_MODULES: false
+          # TODO: enable docker coverage later
+          VALIDATE_CHECKOV: false
           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]
@@ -35,7 +34,9 @@ jobs:
           make test-unit-cover
         if: env.GIT_DIFF
       - uses: codecov/codecov-action@v3
+        # disabled for now, since we don't have any codecov
+        if: ${{ false }}
         with:
           file: ./coverage.txt
           fail_ci_if_error: true
-        if: env.GIT_DIFF
+        # if: env.GIT_DIFF