Merge branch 'main' into bls-into-sdk2

.github/.codespellignore

@@ -3,4 +3,6 @@ pullrequest
 keypair
 pastTime
 hasTables
-Nam
+Nam
+EyT
+upTo

.github/dependabot.yml

@@ -356,3 +356,23 @@ updates:
         # cometbft 0.38 is not semver, but we want to only update "patch" versions for 0.38.x
         update-types:
           ["version-update:semver-major", "version-update:semver-minor"]
+
+  - package-ecosystem: gomod
+    directory: "/"
+    target-branch: "release/v0.52.x"
+    schedule:
+      interval: daily
+      time: "03:00"
+    labels:
+      - "A:automerge"
+      - dependencies
+      - "testing-required"
+    allow:
+      - dependency-name: "github.com/cosmos/cosmos-sdk/*"
+        dependency-type: "all"
+      - dependency-name: "github.com/cosmos/*"
+        dependency-type: "all"
+      - dependency-name: "cosmossdk.io/*"
+        dependency-type: "all"
+      - dependency-name: "github.com/cometbft/*"
+        dependency-type: "all"

.github/pr_labeler.yml

@@ -74,6 +74,16 @@
   - x/upgrade/**/*
 "C:x/epochs":
   - x/epochs/**/*
+"C:server/v2":
+  - server/v2/**/*
+"C:server/v2 stf":
+  - server/v2/stf/**/*
+"C:server/v2 appmanager":
+  - server/v2/appmanager/**/*
+"C:server/v2 cometbft":
+  - server/v2/cometbft/**/*
+"C:server/v2 api":
+  - server/v2/api/**/*
 "Type: ADR":
   - docs/architecture/**/*
 "Type: Build":

.github/workflows/misspell.yml

@@ -15,7 +15,7 @@ jobs:
         continue-on-error: true
         run: |
           sudo apt-get install codespell -y
-          codespell -w --skip="*.pulsar.go,*.pb.go,*.pb.gw.go,*.cosmos_orm.go,*.json,*.git,*.js,crypto/keys,fuzz,*.h,proto/tendermint,*.bin" --ignore-words=.github/.codespellignore
+          codespell -w --skip="*.pulsar.go,*.pb.go,*.pb.gw.go,*.cosmos_orm.go,*.json,*.git,*.js,crypto/keys,fuzz,*.h,proto/tendermint,*.bin,go.sum,go.mod" --ignore-words=.github/.codespellignore
       - uses: peter-evans/create-pull-request@v6
         if: github.event_name != 'pull_request'
         with:

.github/workflows/proto.yml

@@ -15,7 +15,7 @@ jobs:
     timeout-minutes: 5
     steps:
       - uses: actions/checkout@v4
-      - uses: bufbuild/buf-setup-action@v1.34.0
+      - uses: bufbuild/buf-setup-action@v1.35.1
       - uses: bufbuild/buf-lint-action@v1
         with:
           input: "proto"
@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: bufbuild/buf-setup-action@v1.34.0
+      - uses: bufbuild/buf-setup-action@v1.35.1
       - uses: bufbuild/buf-breaking-action@v1
         with:
           input: "proto"

.github/workflows/sims-052.yml

@@ -0,0 +1,136 @@
+name: Sims release/0.52.x
+# Sims workflow runs multiple types of simulations (nondeterminism, import-export, after-import, multi-seed-short)
+# This workflow will run on all Pull Requests, if a .go, .mod or .sum file have been changed
+on:
+  schedule:
+    - cron: "0 0,12 * * *"
+  release:
+    types: [published]
+
+concurrency:
+  group: ci-${{ github.ref }}-sims-052
+  cancel-in-progress: true
+
+jobs:
+  build:
+    permissions:
+      contents: read # for actions/checkout to fetch code
+    runs-on: large-sdk-runner
+    if: "!contains(github.event.head_commit.message, 'skip-sims')"
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: "release/v0.52.x"
+      - uses: actions/setup-go@v5
+        with:
+          go-version: "1.22"
+          check-latest: true
+      - run: make build
+
+  test-sim-import-export:
+    runs-on: large-sdk-runner
+    needs: [build]
+    timeout-minutes: 60
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: "release/v0.52.x"
+      - uses: actions/setup-go@v5
+        with:
+          go-version: "1.22"
+          check-latest: true
+      - name: test-sim-import-export
+        run: |
+          make test-sim-import-export
+
+  test-sim-after-import:
+    runs-on: large-sdk-runner
+    needs: [build]
+    timeout-minutes: 60
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: "release/v0.52.x"
+      - uses: actions/setup-go@v5
+        with:
+          go-version: "1.22"
+          check-latest: true
+      - name: test-sim-after-import
+        run: |
+          make test-sim-after-import
+
+  test-sim-deterministic:
+    runs-on: large-sdk-runner
+    needs: [build]
+    timeout-minutes: 60
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: "release/v0.52.x"
+      - uses: actions/setup-go@v5
+        with:
+          go-version: "1.22"
+          check-latest: true
+      - name: test-sim-nondeterminism-streaming
+        run: |
+          make test-sim-nondeterminism-streaming
+
+  test-sim-multi-seed-short:
+    runs-on: large-sdk-runner
+    needs: [build]
+    timeout-minutes: 60
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: "release/v0.52.x"
+      - uses: actions/setup-go@v5
+        with:
+          go-version: "1.22"
+          check-latest: true
+      - name: test-sim-multi-seed-short
+        run: |
+          make test-sim-multi-seed-short
+
+  sims-notify-success:
+    needs:
+      [test-sim-multi-seed-short, test-sim-after-import, test-sim-import-export]
+    runs-on: large-sdk-runner
+    if: ${{ success() }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Get previous workflow status
+        uses: ./.github/actions/last-workflow-status
+        id: last_status
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Notify Slack on success
+        if: ${{ steps.last_status.outputs.last_status == 'failure' }}
+        uses: rtCamp/[email protected]
+        env:
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
+          SLACK_CHANNEL: sdk-sims
+          SLACK_USERNAME: Sim Tests release/0.52.x
+          SLACK_ICON_EMOJI: ":white_check_mark:"
+          SLACK_COLOR: good
+          SLACK_MESSAGE: 0.52.x Sims are passing
+          SLACK_FOOTER: ""
+
+  sims-notify-failure:
+    permissions:
+      contents: none
+    needs:
+      [test-sim-multi-seed-short, test-sim-after-import, test-sim-import-export]
+    runs-on: large-sdk-runner
+    if: ${{ failure() }}
+    steps:
+      - name: Notify Slack on failure
+        uses: rtCamp/[email protected]
+        env:
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
+          SLACK_CHANNEL: sdk-sims
+          SLACK_USERNAME: Sim Tests release/0.52.x
+          SLACK_ICON_EMOJI: ":skull:"
+          SLACK_COLOR: danger
+          SLACK_MESSAGE: 0.52.x Sims are failing
+          SLACK_FOOTER: ""

.github/workflows/test.yml

@@ -357,14 +357,6 @@ jobs:
         run: |
           cd core/testing
           go test -mod=readonly -timeout 30m -coverprofile=coverage.out -covermode=atomic -tags='norace ledger test_ledger_mock' ./...
-      - name: sonarcloud
-        if: ${{ env.GIT_DIFF && !github.event.pull_request.draft && env.SONAR_TOKEN != null }}
-        uses: SonarSource/sonarcloud-github-action@master
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        with:
-          projectBaseDir: core/testing/
 
   test-depinject:
     runs-on: ubuntu-latest
@@ -544,7 +536,7 @@ jobs:
         if: env.GIT_DIFF
         run: |
           cd simapp
-          go test -mod=readonly -timeout 30m -coverprofile=coverage.out -covermode=atomic -tags='norace ledger test_ledger_mock' ./...
+          go test -mod=readonly -timeout 30m -tags='norace ledger test_ledger_mock' ./...
       - name: tests simapp v1
         if: env.GIT_DIFF
         run: |
@@ -570,10 +562,28 @@ jobs:
             go.sum
             **/go.mod
             **/go.sum
+      - name: tests simapp
+        if: env.GIT_DIFF
+        run: |
+          cd simapp/v2
+          go test -mod=readonly -timeout 30m -tags='norace ledger test_ledger_mock' ./...
       - name: simapp-v2-smoke-test
         if: env.GIT_DIFF
         run: |
-          ./scripts/simapp-v2-init.sh
+          COSMOS_BUILD_OPTIONS=v2 make install
+          ./scripts/init-simapp-v2.sh
+          simdv2 start &
+          SIMD_PID=$!
+          cnt=0
+          while ! simdv2 query block --type=height 5; do
+            cnt=$((cnt + 1))
+            if [ $cnt -gt 30 ]; then
+              kill -9 "$SIMD_PID"
+              exit 1
+            fi
+            sleep 1
+          done
+          kill -9 "$SIMD_PID"
 
   test-collections:
     runs-on: ubuntu-latest

.github/workflows/v2-test.yml

@@ -1,4 +1,4 @@
-name: v2 core Tests 
+name: v2 core Tests
 on:
   pull_request:
   merge_group:
@@ -37,7 +37,7 @@ jobs:
       - name: test & coverage report creation
         if: env.GIT_DIFF
         run: |
-          cd server/v2 && go test -mod=readonly -race -timeout 30m -covermode=atomic -tags='ledger test_ledger_mock'
+          cd server/v2 && go test -mod=readonly -race -timeout 30m -tags='ledger test_ledger_mock'
   stf:
     runs-on: ubuntu-latest
     strategy:
@@ -60,9 +60,9 @@ jobs:
       - name: test & coverage report creation
         if: env.GIT_DIFF
         run: |
-          cd server/v2/stf && go test -mod=readonly -race -timeout 30m -covermode=atomic -tags='ledger test_ledger_mock'
-          
-  appamanger:
+          cd server/v2/stf && go test -mod=readonly -race -timeout 30m -tags='ledger test_ledger_mock'
+
+  appmanager:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -84,4 +84,28 @@ jobs:
       - name: test & coverage report creation
         if: env.GIT_DIFF
         run: |
-          cd server/v2/appmanager && go test -mod=readonly -race -timeout 30m -covermode=atomic -tags='ledger test_ledger_mock'
+          cd server/v2/appmanager && go test -mod=readonly -race -timeout 30m -tags='ledger test_ledger_mock'
+
+  cometbft:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: "1.22"
+          check-latest: true
+          cache: true
+          cache-dependency-path: go.sum
+      - uses: technote-space/[email protected]
+        id: git_diff
+        with:
+          PATTERNS: |
+            server/v2/cometbft/**/*.go
+            server/v2/cometbft/go.mod
+            server/v2/cometbft/go.sum
+      - name: test & coverage report creation
+        if: env.GIT_DIFF
+        run: |
+          cd server/v2/cometbft && go test -mod=readonly -race -timeout 30m -tags='ledger test_ledger_mock'

.gitignore

@@ -63,3 +63,4 @@ debug_container.log
 *.synctex.gz
 /x/genutil/config/priv_validator_key.json
 /x/genutil/data/priv_validator_state.json
+simapp/simapp.test

.mergify.yml

@@ -16,6 +16,14 @@ pull_request_rules:
         commit_message_template: |
           {{ title }} (#{{ number }})
           {{ body }}
+  - name: backport patches to v0.52.x branch
+    conditions:
+      - base=main
+      - label=backport/v0.52.x
+    actions:
+      backport:
+        branches:
+          - release/v0.52.x
   - name: backport patches to v0.50.x branch
     conditions:
       - base=main

.vscode/launch.json

@@ -20,6 +20,15 @@
       "program": "${workspaceFolder}/simapp/v2/simdv2",
       "args": ["start"],
       "buildFlags": ""
+    },
+    {
+      "name": "Start: simapp/v1",
+      "type": "go",
+      "request": "launch",
+      "mode": "debug",
+      "program": "${workspaceFolder}/simapp/simd",
+      "args": ["start"],
+      "buildFlags": ""
     }
   ]
 }