Merge branch 'main' into marko/52_tut

cosmos · Jan 7, 2025 · f8ff404 · f8ff404
2 parents 7b21047 + c1192da
commit f8ff404
Show file tree

Hide file tree

Showing 246 changed files with 3,453 additions and 4,055 deletions.
diff --git a/.github/ISSUE_TEMPLATE/qa.md b/.github/ISSUE_TEMPLATE/qa.md
@@ -28,7 +28,6 @@ v                     without deliberation
     * [ ] Audit x/bank/v2
     * [ ] Audit x/circuit
     * [ ] Audit x/consensus 
-    * [ ] Audit x/crisis 
     * [ ] Audit x/distribution 
     * [ ] Audit x/evidence 
     * [ ] Audit x/epochs

diff --git a/.github/pr_labeler.yml b/.github/pr_labeler.yml
@@ -51,8 +51,6 @@
   - x/circuit/**/*
 "C:x/consensus":
   - x/consensus/**/*
-"C:x/crisis":
-  - x/crisis/**/*
 "C:x/distribution":
   - x/distribution/**/*
 "C:x/evidence":

diff --git a/.github/scripts/get-rocksdb-version.sh b/.github/scripts/get-rocksdb-version.sh
diff --git a/.github/scripts/install-rocksdb-deps.sh b/.github/scripts/install-rocksdb-deps.sh
diff --git a/.github/scripts/install-rocksdb.sh b/.github/scripts/install-rocksdb.sh
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -25,33 +25,14 @@ jobs:
         with:
           go-version: "1.23"
           check-latest: true
-      - name: Get rocksdb version
-        run: ./.github/scripts/get-rocksdb-version.sh
-      - name: Fix permissions for cache
-        run: sudo chown $(whoami) /usr/local/lib /usr/local/include
-      - name: Restore rocksdb libraries cache
-        id: cache-rocksdb
-        if: matrix.go-arch == 'amd64'
-        uses: actions/cache/restore@v4
-        with:
-          path: |
-            /usr/local/lib/librocksdb.*
-            /usr/local/include/rocksdb
-          key: ${{ runner.os }}-rocksdb-${{ env.ROCKSDB_VERSION }}-${{ matrix.go-arch }}
-      - name: Install rocksdb deps
-        if: matrix.go-arch == 'amd64'
-        run: ./.github/scripts/install-rocksdb-deps.sh
-      - name: Install rocksdb
-        if: matrix.go-arch == 'amd64' && steps.cache-rocksdb.outputs.cache-hit != 'true'
-        run: ./.github/scripts/install-rocksdb.sh
+      - name: install aarch64-gcc
+        if: matrix.go-arch == 'arm64'
+        run: sudo apt-get install gcc-aarch64-linux-gnu binutils-aarch64-linux-gnu
         ###################
         #### Build App ####
         ###################
-      - name: Build v2
-        run: GOARCH=${{ matrix.go-arch }} COSMOS_BUILD_OPTIONS=v2 make build
-      - name: Build with rocksdb backend
-        if: matrix.go-arch == 'amd64'
-        run: GOARCH=${{ matrix.go-arch }} COSMOS_BUILD_OPTIONS=v2,rocksdb make build
+      - name: Build with sqlite backend
+        run: GOARCH=${{ matrix.go-arch }} COSMOS_BUILD_OPTIONS=v2,sqlite make build
       - name: Build with BLS12381
         if: matrix.go-arch == 'amd64'
         run: GOARCH=${{ matrix.go-arch }} COSMOS_BUILD_OPTIONS=v2,bls12381 make build

diff --git a/.github/workflows/cache-rocksdb.yml b/.github/workflows/cache-rocksdb.yml
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -27,54 +27,21 @@ jobs:
             Makefile
             **/Makefile
             .golangci.yml
-      - name: Get rocksdb version
-        run: ./.github/scripts/get-rocksdb-version.sh
-      - name: Fix permissions for cache
-        run: sudo chown $(whoami) /usr/local/lib /usr/local/include
-      - name: Restore rocksdb libraries cache
-        id: cache-rocksdb
-        uses: actions/cache/restore@v4
-        with:
-          path: |
-            /usr/local/lib/librocksdb.*
-            /usr/local/include/rocksdb
-          key: ${{ runner.os }}-rocksdb-${{ env.ROCKSDB_VERSION }}-amd64
-      - name: Install rocksdb deps
-        run: ./.github/scripts/install-rocksdb-deps.sh
-      - name: Install rocksdb
-        if: steps.cache-rocksdb.outputs.cache-hit != 'true'
-        run: ./.github/scripts/install-rocksdb.sh
       - name: run linting (long)
         if: env.GIT_DIFF
         id: lint_long
         run: |
           make lint
-        env:
-          ROCKSDB: 1
       - uses: technote-space/[email protected]
         if: steps.lint_long.outcome == 'skipped'
         with:
           PATTERNS: |
             **/*.go
             *.go
-            !store/**
-      - name: run linting (short)
-        if: steps.lint_long.outcome == 'skipped' && env.GIT_DIFF
-        run: |
-          make lint
-        env:
-          GIT_DIFF: ${{ env.GIT_DIFF }}
-          LINT_DIFF: 1
-      - uses: technote-space/[email protected]
-        if: steps.lint_long.outcome == 'skipped'
-        with:
-          PATTERNS: |
-            store/**
       - name: run linting (short)
         if: steps.lint_long.outcome == 'skipped' && env.GIT_DIFF
         run: |
           make lint
         env:
           GIT_DIFF: ${{ env.GIT_DIFF }}
           LINT_DIFF: 1
-          ROCKSDB: 1
diff --git a/.github/workflows/pr-reminder.yml b/.github/workflows/pr-reminder.yml
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -283,7 +283,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
+          go-version: "1.22"
           check-latest: false
           cache: true
           cache-dependency-path: depinject/go.sum
@@ -312,7 +312,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.20"
+          go-version: "1.22"
           check-latest: true
           cache: true
           cache-dependency-path: errors/go.sum
@@ -343,7 +343,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.20"
+          go-version: "1.22"
           check-latest: true
           cache: true
           cache-dependency-path: math/go.sum
@@ -701,28 +701,11 @@ jobs:
             store/**/*.go
             store/go.mod
             store/go.sum
-      - name: Get rocksdb version
-        run: ./.github/scripts/get-rocksdb-version.sh
-      - name: Fix permissions for cache
-        run: sudo chown $(whoami) /usr/local/lib /usr/local/include
-      - name: Restore rocksdb libraries cache
-        id: cache-rocksdb
-        uses: actions/cache/restore@v4
-        with:
-          path: |
-            /usr/local/lib/librocksdb.*
-            /usr/local/include/rocksdb
-          key: ${{ runner.os }}-rocksdb-${{ env.ROCKSDB_VERSION }}-amd64
-      - name: Install rocksdb deps
-        run: ./.github/scripts/install-rocksdb-deps.sh
-      - name: Install rocksdb
-        if: steps.cache-rocksdb.outputs.cache-hit != 'true'
-        run: ./.github/scripts/install-rocksdb.sh
       - name: tests
         if: env.GIT_DIFF
         run: |
           cd store
-          go test -ldflags "-r /usr/local/lib" -mod=readonly -timeout 30m -coverprofile=coverage.out -covermode=atomic -tags='norace ledger test_ledger_mock rocksdb' ./...
+          go test -ldflags "-r /usr/local/lib" -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
@@ -751,28 +734,11 @@ jobs:
             store/v2/**/*.go
             store/v2/go.mod
             store/v2/go.sum
-      - name: Get rocksdb version
-        run: ./.github/scripts/get-rocksdb-version.sh
-      - name: Fix permissions for cache
-        run: sudo chown $(whoami) /usr/local/lib /usr/local/include
-      - name: Restore rocksdb libraries cache
-        id: cache-rocksdb
-        uses: actions/cache/restore@v4
-        with:
-          path: |
-            /usr/local/lib/librocksdb.*
-            /usr/local/include/rocksdb
-          key: ${{ runner.os }}-rocksdb-${{ env.ROCKSDB_VERSION }}-amd64
-      - name: Install rocksdb deps
-        run: ./.github/scripts/install-rocksdb-deps.sh
-      - name: Install rocksdb
-        if: steps.cache-rocksdb.outputs.cache-hit != 'true'
-        run: ./.github/scripts/install-rocksdb.sh
       - name: test & coverage report creation
         if: env.GIT_DIFF
         run: |
           cd store/v2
-          go test -ldflags "-r /usr/local/lib" -mod=readonly -timeout 30m -coverprofile=coverage.out -covermode=atomic -tags='norace ledger test_ledger_mock rocksdb' ./...
+          go test -ldflags "-r /usr/local/lib" -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

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -44,11 +44,18 @@ Every module contains its own CHANGELOG.md. Please refer to the module you are i
 
 * (baseapp) [#20291](https://github.com/cosmos/cosmos-sdk/pull/20291) Simulate nested messages.
 * (client/keys) [#21829](https://github.com/cosmos/cosmos-sdk/pull/21829) Add support for importing hex key using standard input.
+* (x/auth/ante) [#23128](https://github.com/cosmos/cosmos-sdk/pull/23128) Allow custom verifyIsOnCurve when validate tx for public key like ethsecp256k1.
 
 ### Improvements
 
+* (codec) [#22988](https://github.com/cosmos/cosmos-sdk/pull/22988) Improve edge case handling for recursion limits.
+
 ### Bug Fixes
 
+* (query) [23002](https://github.com/cosmos/cosmos-sdk/pull/23002) Fix collection filtered pagination.
+* (x/auth/tx) [23144](https://github.com/cosmos/cosmos-sdk/pull/23144) Add missing CacheWithValue for ExtensionOptions.
+* (x/auth/tx) [#23148](https://github.com/cosmos/cosmos-sdk/pull/23148) Avoid panic from intoAnyV2 when v1.PublicKey is optional.
+
 ### API Breaking Changes
 
 * (x/params) [#22995](https://github.com/cosmos/cosmos-sdk/pull/22995) Remove `x/params`.  Migrate to the new params system introduced in `v0.47` as demonstrated [here](https://github.com/cosmos/cosmos-sdk/blob/main/UPGRADING.md#xparams).

diff --git a/Dockerfile b/Dockerfile
@@ -68,4 +68,4 @@ WORKDIR /root
 RUN apk add --no-cache curl make bash jq sed
 
 # Copy over binaries from the build-env
-COPY --from=build-env /go/src/github.com/cosmos/cosmos-sdk/build/simd /usr/bin/simd
+COPY --from=build-env /go/src/github.com/cosmos/cosmos-sdk/build/simdv2 /usr/bin/simd
diff --git a/api/go.mod b/api/go.mod
@@ -3,16 +3,16 @@ module cosmossdk.io/api
 go 1.23
 
 require (
-	buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.36.0-20241120201313-68e42a58b301.1
+	buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.36.1-20241120201313-68e42a58b301.1
 	github.com/cosmos/cosmos-proto v1.0.0-beta.5
 	github.com/cosmos/gogoproto v1.7.0
 	google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1
 	google.golang.org/grpc v1.68.1
-	google.golang.org/protobuf v1.36.0
+	google.golang.org/protobuf v1.36.1
 )
 
 require (
-	buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.36.0-20240130113600-88ef6483f90f.1 // indirect
+	buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.36.1-20240130113600-88ef6483f90f.1 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	golang.org/x/net v0.32.0 // indirect
 	golang.org/x/sys v0.28.0 // indirect