Merge branch 'son/gov_audit' of https://github.com/cosmos/cosmos-sdk …

…into son/gov_audit
cosmos · Sep 11, 2024 · 3011f8a · 3011f8a
2 parents 94763c6 + cbe12da
commit 3011f8a
Show file tree

Hide file tree

Showing 158 changed files with 1,358 additions and 2,575 deletions.
diff --git a/.github/scripts/install-rocksdb.sh b/.github/scripts/install-rocksdb.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+set -Eeuo pipefail
+
+if [ -z "$ROCKSDB_VERSION" ]; then
+  echo "ROCKSDB_VERSION is not set."
+  exit 1
+fi
+
+# Update and install dependencies
+sudo apt update && sudo apt-get install -y libsnappy-dev zlib1g-dev libbz2-dev liblz4-dev libzstd-dev build-essential
+
+# Clone RocksDB repository
+git clone https://github.com/facebook/rocksdb.git /home/runner/rocksdb
+cd /home/runner/rocksdb || exit 1
+git checkout "v${ROCKSDB_VERSION}"
+
+# Build shared library
+sudo make -j "$(nproc --all)" shared_lib
+sudo cp --preserve=links ./librocksdb.* /usr/local/lib/
+sudo cp -r ./include/rocksdb/ /usr/local/include/
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,6 +13,9 @@ concurrency:
   group: ci-${{ github.ref }}-build
   cancel-in-progress: true
 
+env:
+  ROCKSDB_VERSION: 8.11.3
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -21,12 +24,33 @@ jobs:
         go-arch: ["amd64", "arm", "arm64"]
     steps:
       - uses: actions/checkout@v4
-      - uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
       - uses: actions/setup-go@v5
         with:
           go-version: "1.23"
           check-latest: true
+      - 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
+        if: matrix.go-arch == 'amd64' && steps.cache-rocksdb.outputs.cache-hit != 'true'
+        id: install_rocksdb
+        run: ./.github/scripts/install-rocksdb.sh
+      - name: Saves rocksdb libraries cache
+        if: matrix.go-arch == 'amd64' && steps.install_rocksdb.outcome == 'success'
+        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 }}
         ###################
         #### Build App ####
         ###################
@@ -35,10 +59,8 @@ jobs:
       - name: Build Legacy
         run: GOARCH=${{ matrix.go-arch }} COSMOS_BUILD_OPTIONS=legacy make build
       - name: Build with rocksdb backend
-        if: |
-          env.GIT_DIFF &&
-          matrix.go-arch == 'amd64'
-        run: nix run . -- version --long
+        if: matrix.go-arch == 'amd64'
+        run: GOARCH=${{ matrix.go-arch }} COSMOS_BUILD_OPTIONS="rocksdb" make build
         ###################
         ## Build Tooling ##
         ###################

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -8,14 +8,16 @@ on:
   merge_group:
 permissions:
   contents: read
+
+env:
+  ROCKSDB_VERSION: 8.11.3
+
 jobs:
   golangci:
     name: golangci-lint
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
       - uses: actions/setup-go@v5
         with:
           go-version: "1.23"
@@ -28,13 +30,35 @@ jobs:
             Makefile
             **/Makefile
             .golangci.yml
+      - 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
+        if: env.GIT_DIFF && steps.cache-rocksdb.outputs.cache-hit != 'true'
+        id: install_rocksdb
+        run: ./.github/scripts/install-rocksdb.sh
+      - name: Saves rocksdb libraries cache
+        if: steps.install_rocksdb.outcome == 'success'
+        uses: actions/cache/restore@v4
+        with:
+          path: |
+            /usr/local/lib/librocksdb.*
+            /usr/local/include/rocksdb
+          key: ${{ runner.os }}-rocksdb-${{ env.ROCKSDB_VERSION }}-amd64
       - name: run linting (long)
         if: env.GIT_DIFF
         id: lint_long
         run: |
-          nix develop -c make lint
+          make lint
         env:
-          NIX: 1
+          ROCKSDB: 1
       - uses: technote-space/[email protected]
         if: steps.lint_long.outcome == 'skipped'
         with:
@@ -57,8 +81,8 @@ jobs:
       - name: run linting (short)
         if: steps.lint_long.outcome == 'skipped' && env.GIT_DIFF
         run: |
-          nix develop -c make lint
+          make lint
         env:
           GIT_DIFF: ${{ env.GIT_DIFF }}
           LINT_DIFF: 1
-          NIX: 1
+          ROCKSDB: 1
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -13,6 +13,9 @@ concurrency:
   group: ci-${{ github.ref }}-tests
   cancel-in-progress: true
 
+env:
+  ROCKSDB_VERSION: 8.11.3
+
 jobs:
   split-test-files:
     runs-on: ubuntu-latest
@@ -774,11 +777,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.20"
+          go-version: "1.23"
           check-latest: true
           cache: true
           cache-dependency-path: store/go.sum
@@ -789,11 +790,33 @@ jobs:
             store/**/*.go
             store/go.mod
             store/go.sum
+      - 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
+        if: env.GIT_DIFF && steps.cache-rocksdb.outputs.cache-hit != 'true'
+        id: install_rocksdb
+        run: ./.github/scripts/install-rocksdb.sh
+      - name: Saves rocksdb libraries cache
+        if: steps.install_rocksdb.outcome == 'success'
+        uses: actions/cache/restore@v4
+        with:
+          path: |
+            /usr/local/lib/librocksdb.*
+            /usr/local/include/rocksdb
+          key: ${{ runner.os }}-rocksdb-${{ env.ROCKSDB_VERSION }}-amd64
       - name: tests
         if: env.GIT_DIFF
         run: |
           cd store
-          nix develop .. -c go test -mod=readonly -timeout 30m -coverprofile=coverage.out -covermode=atomic -tags='norace ledger test_ledger_mock rocksdb' ./...
+          go test -mod=readonly -timeout 30m -coverprofile=coverage.out -covermode=atomic -tags='norace ledger test_ledger_mock rocksdb' ./...
       - name: sonarcloud
         if: ${{ env.GIT_DIFF && !github.event.pull_request.draft && env.SONAR_TOKEN != null }}
         uses: SonarSource/sonarcloud-github-action@master
@@ -809,8 +832,6 @@ jobs:
       fail-fast: false
     steps:
       - uses: actions/checkout@v4
-      - uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
       - uses: actions/setup-go@v5
         with:
           go-version: "1.23"
@@ -824,11 +845,33 @@ jobs:
             store/v2/**/*.go
             store/v2/go.mod
             store/v2/go.sum
+      - 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
+        if: env.GIT_DIFF && steps.cache-rocksdb.outputs.cache-hit != 'true'
+        id: install_rocksdb
+        run: ./.github/scripts/install-rocksdb.sh
+      - name: Saves rocksdb libraries cache
+        if: steps.install_rocksdb.outcome == 'success'
+        uses: actions/cache/restore@v4
+        with:
+          path: |
+            /usr/local/lib/librocksdb.*
+            /usr/local/include/rocksdb
+          key: ${{ runner.os }}-rocksdb-${{ env.ROCKSDB_VERSION }}-amd64
       - name: test & coverage report creation
         if: env.GIT_DIFF
         run: |
           cd store/v2
-          nix develop ../.. -c go test -mod=readonly -timeout 30m -coverprofile=coverage.out -covermode=atomic -tags='norace ledger test_ledger_mock rocksdb' ./...
+          go test -mod=readonly -timeout 30m -coverprofile=coverage.out -covermode=atomic -tags='norace ledger test_ledger_mock rocksdb' ./...
       - 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
@@ -49,6 +49,7 @@ Every module contains its own CHANGELOG.md. Please refer to the module you are i
 
 * (client) [#21436](https://github.com/cosmos/cosmos-sdk/pull/21436) Use `address.Codec` from client.Context in `tx.Sign`.
 * (internal) [#21412](https://github.com/cosmos/cosmos-sdk/pull/21412) Using unsafe.String and unsafe.SliceData.
+* (x/genutil) [#21249](https://github.com/cosmos/cosmos-sdk/pull/21249) Incremental JSON parsing for AppGenesis where possible.
 
 ### Bug Fixes
 

diff --git a/UPGRADING.md b/UPGRADING.md
@@ -1040,7 +1040,7 @@ The `simapp` package **should not be imported in your own app**. Instead, you sh
 
 #### App Wiring
 
-SimApp's `app_v2.go` is using [App Wiring](https://docs.cosmos.network/main/build/building-apps/app-go-v2), the dependency injection framework of the Cosmos SDK.
+SimApp's `app_di.go` is using [App Wiring](https://docs.cosmos.network/main/build/building-apps/app-go-di), the dependency injection framework of the Cosmos SDK.
 This means that modules are injected directly into SimApp thanks to a [configuration file](https://github.com/cosmos/cosmos-sdk/blob/v0.47.0-rc1/simapp/app_config.go).
 The previous behavior, without the dependency injection framework, is still present in [`app.go`](https://github.com/cosmos/cosmos-sdk/blob/v0.47.0-rc1/simapp/app.go) and is not going anywhere.