From 2f066ed64307eb556508f2b71cdb5ca144a14208 Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Thu, 15 Aug 2024 10:43:08 +0200 Subject: [PATCH] build(deps): use Go 1.23 instead of Go 1.22 (#21280) (cherry picked from commit 819330872cc1edd779ddec8880b59dd84e4df077) # Conflicts: # .github/workflows/sims-052.yml # .github/workflows/software-compat-v052.yml # client/v2/go.mod # collections/go.mod # core/go.mod # core/testing/go.mod # go.mod # indexer/postgres/tests/go.mod # orm/go.mod # runtime/v2/go.mod # schema/testing/go.mod # server/v2/appmanager/go.mod # server/v2/cometbft/go.mod # server/v2/go.mod # server/v2/stf/go.mod # simapp/go.mod # simapp/v2/go.mod # store/v2/go.mod # tests/go.mod # tools/cosmovisor/go.mod # x/accounts/defaults/lockup/go.mod # x/accounts/defaults/multisig/go.mod # x/accounts/go.mod # x/auth/go.mod # x/authz/go.mod # x/bank/go.mod # x/circuit/go.mod # x/consensus/go.mod # x/distribution/go.mod # x/epochs/go.mod # x/evidence/go.mod # x/feegrant/go.mod # x/gov/go.mod # x/group/go.mod # x/mint/go.mod # x/nft/go.mod # x/params/go.mod # x/protocolpool/go.mod # x/slashing/go.mod # x/staking/go.mod # x/tx/go.mod # x/upgrade/go.mod --- .github/workflows/build.yml | 2 +- .github/workflows/codeql-analysis.yml | 4 +- .github/workflows/dependabot-update-all.yml | 2 +- .github/workflows/dependencies-review.yml | 2 +- .github/workflows/lint.yml | 2 +- .github/workflows/pr-go-mod-tidy-mocks.yml | 4 +- .github/workflows/release-confix.yml | 2 +- .github/workflows/release-cosmovisor.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/sims-047.yml | 10 +- .github/workflows/sims-050.yml | 10 +- .github/workflows/sims-052.yml | 136 ++++++++++++++ .github/workflows/sims-nightly.yml | 2 +- .github/workflows/sims.yml | 10 +- .github/workflows/software-compat-v052.yml | 75 ++++++++ .github/workflows/test.yml | 84 ++++----- .github/workflows/v2-test.yml | 8 +- Dockerfile | 2 +- client/v2/go.mod | 7 +- collections/go.mod | 22 +++ contrib/devtools/Dockerfile | 4 +- contrib/images/simd-dlv/Dockerfile | 2 +- contrib/images/simd-env/Dockerfile | 2 +- core/go.mod | 9 + core/testing/go.mod | 10 ++ crypto/armor_test.go | 4 +- flake.lock | 6 +- flake.nix | 2 +- go.mod | 9 +- go.work.example | 2 +- indexer/postgres/tests/go.mod | 35 ++++ orm/go.mod | 71 ++++++++ runtime/v2/go.mod | 103 +++++++++++ schema/testing/go.mod | 21 +++ scripts/build/linting.mk | 2 +- scripts/build/protobuf.mk | 2 +- server/v2/appmanager/go.mod | 7 + server/v2/cometbft/go.mod | 7 +- server/v2/go.mod | 115 ++++++++++++ server/v2/stf/go.mod | 23 +++ simapp/go.mod | 8 +- simapp/v2/go.mod | 6 +- store/v2/go.mod | 70 ++++++++ tests/go.mod | 8 +- tests/systemtests/go.mod | 2 +- tools/confix/go.mod | 2 +- tools/cosmovisor/go.mod | 186 ++++++++++++++++++++ types/context_test.go | 6 +- x/accounts/defaults/lockup/go.mod | 7 +- x/accounts/defaults/multisig/go.mod | 7 +- x/accounts/go.mod | 9 +- x/auth/go.mod | 9 +- x/authz/go.mod | 7 +- x/bank/go.mod | 8 +- x/circuit/go.mod | 9 +- x/consensus/go.mod | 9 +- x/distribution/go.mod | 9 +- x/epochs/go.mod | 9 +- x/evidence/go.mod | 9 +- x/feegrant/go.mod | 9 +- x/gov/go.mod | 9 +- x/group/go.mod | 7 +- x/mint/go.mod | 9 +- x/nft/go.mod | 7 +- x/params/go.mod | 7 +- x/protocolpool/go.mod | 9 +- x/slashing/go.mod | 9 +- x/staking/go.mod | 9 +- x/tx/go.mod | 41 +++++ x/upgrade/go.mod | 8 +- 70 files changed, 1210 insertions(+), 118 deletions(-) create mode 100644 .github/workflows/sims-052.yml create mode 100644 .github/workflows/software-compat-v052.yml create mode 100644 collections/go.mod create mode 100644 core/go.mod create mode 100644 core/testing/go.mod create mode 100644 indexer/postgres/tests/go.mod create mode 100644 orm/go.mod create mode 100644 runtime/v2/go.mod create mode 100644 schema/testing/go.mod create mode 100644 server/v2/appmanager/go.mod create mode 100644 server/v2/go.mod create mode 100644 server/v2/stf/go.mod create mode 100644 store/v2/go.mod create mode 100644 tools/cosmovisor/go.mod create mode 100644 x/tx/go.mod diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 713b5841e155..63a430c4f2c9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,7 +25,7 @@ jobs: - uses: DeterminateSystems/magic-nix-cache-action@main - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true ################### #### Build App #### diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index ed85efa0d1b8..da75289545b6 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -29,7 +29,7 @@ jobs: uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL @@ -37,7 +37,7 @@ jobs: with: languages: "go" config-file: ./.github/codeql/config.yml - + # If you wish to specify custom queries, you can do so here or in a config file. # By default, queries listed here will override any specified in a config file. # Prefix the list here with "+" to use these queries and those in the config file. diff --git a/.github/workflows/dependabot-update-all.yml b/.github/workflows/dependabot-update-all.yml index 1b50b9ab5de6..f68935443670 100644 --- a/.github/workflows/dependabot-update-all.yml +++ b/.github/workflows/dependabot-update-all.yml @@ -17,7 +17,7 @@ jobs: token: ${{ secrets.PRBOT_PAT }} - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true - name: Extract updated dependency id: deps diff --git a/.github/workflows/dependencies-review.yml b/.github/workflows/dependencies-review.yml index 5a08d1c6e0ec..553b6efbf3e9 100644 --- a/.github/workflows/dependencies-review.yml +++ b/.github/workflows/dependencies-review.yml @@ -14,7 +14,7 @@ jobs: uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true - name: "Dependency Review" uses: actions/dependency-review-action@v4 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 35755a276d7a..004fdd39d550 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22.2" + go-version: "1.23" check-latest: true - uses: technote-space/get-diff-action@v6.1.2 id: git_diff diff --git a/.github/workflows/pr-go-mod-tidy-mocks.yml b/.github/workflows/pr-go-mod-tidy-mocks.yml index 30f4a697385f..76b5ad1f86f7 100644 --- a/.github/workflows/pr-go-mod-tidy-mocks.yml +++ b/.github/workflows/pr-go-mod-tidy-mocks.yml @@ -20,7 +20,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true - name: Run go mod tidy run: ./scripts/go-mod-tidy-all.sh @@ -40,7 +40,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true - name: Generate mocks run: make mocks diff --git a/.github/workflows/release-confix.yml b/.github/workflows/release-confix.yml index 2ea64f987853..da465a088103 100644 --- a/.github/workflows/release-confix.yml +++ b/.github/workflows/release-confix.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true # get 'v*.*.*' part from 'confix/v*.*.*' and save to $GITHUB_ENV - name: Set env diff --git a/.github/workflows/release-cosmovisor.yml b/.github/workflows/release-cosmovisor.yml index 0256a4433e18..acef3820e26b 100644 --- a/.github/workflows/release-cosmovisor.yml +++ b/.github/workflows/release-cosmovisor.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true # get 'v*.*.*' part from 'cosmovisor/v*.*.*' and save to $GITHUB_ENV - name: Set env diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ea3521e9e411..962a75136f06 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,7 +20,7 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true - name: Unshallow run: git fetch --prune --unshallow diff --git a/.github/workflows/sims-047.yml b/.github/workflows/sims-047.yml index 2115681b3d3d..4a6a0427d751 100644 --- a/.github/workflows/sims-047.yml +++ b/.github/workflows/sims-047.yml @@ -21,7 +21,7 @@ jobs: ref: "release/v0.47.x" - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true - run: make build @@ -33,7 +33,7 @@ jobs: steps: - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true - name: Install runsim run: go install github.com/cosmos/tools/cmd/runsim@v1.0.0 @@ -52,7 +52,7 @@ jobs: ref: "release/v0.47.x" - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true - uses: actions/cache@v4 with: @@ -71,7 +71,7 @@ jobs: ref: "release/v0.47.x" - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true - uses: actions/cache@v4 with: @@ -90,7 +90,7 @@ jobs: ref: "release/v0.47.x" - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true - uses: actions/cache@v4 with: diff --git a/.github/workflows/sims-050.yml b/.github/workflows/sims-050.yml index e22e8e4aa895..afc04b2a0ea5 100644 --- a/.github/workflows/sims-050.yml +++ b/.github/workflows/sims-050.yml @@ -21,7 +21,7 @@ jobs: ref: "release/v0.50.x" - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true - run: make build @@ -33,7 +33,7 @@ jobs: steps: - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true - name: Install runsim run: go install github.com/cosmos/tools/cmd/runsim@v1.0.0 @@ -52,7 +52,7 @@ jobs: ref: "release/v0.50.x" - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true - uses: actions/cache@v4 with: @@ -71,7 +71,7 @@ jobs: ref: "release/v0.50.x" - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true - uses: actions/cache@v4 with: @@ -90,7 +90,7 @@ jobs: ref: "release/v0.50.x" - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true - uses: actions/cache@v4 with: diff --git a/.github/workflows/sims-052.yml b/.github/workflows/sims-052.yml new file mode 100644 index 000000000000..03ee9ef9234e --- /dev/null +++ b/.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.23" + 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.23" + 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.23" + 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.23" + 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.23" + 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/action-slack-notify@v2.3.0 + 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/action-slack-notify@v2.3.0 + 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: "" diff --git a/.github/workflows/sims-nightly.yml b/.github/workflows/sims-nightly.yml index a4a1526223fb..35f6232bdf25 100644 --- a/.github/workflows/sims-nightly.yml +++ b/.github/workflows/sims-nightly.yml @@ -21,7 +21,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true - name: test-sim-multi-seed-long run: | diff --git a/.github/workflows/sims.yml b/.github/workflows/sims.yml index 4b695d79ab4b..bb7cf1faf417 100644 --- a/.github/workflows/sims.yml +++ b/.github/workflows/sims.yml @@ -21,7 +21,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true - run: make build @@ -33,7 +33,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true - name: test-sim-import-export run: | @@ -47,7 +47,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true - name: test-sim-after-import run: | @@ -61,7 +61,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true - name: test-sim-nondeterminism-streaming run: | @@ -75,7 +75,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true - name: test-sim-multi-seed-short run: | diff --git a/.github/workflows/software-compat-v052.yml b/.github/workflows/software-compat-v052.yml new file mode 100644 index 000000000000..c3b6d02c64d7 --- /dev/null +++ b/.github/workflows/software-compat-v052.yml @@ -0,0 +1,75 @@ +name: SimApp (v2) v0.52 Integration with Main +on: + push: + branches: + - main + workflow_dispatch: +jobs: + compat: + name: Software Compat + runs-on: ubuntu-latest + steps: + - name: Check out source + uses: actions/checkout@v4 + with: + sparse-checkout: | + .github/scripts/check-compat.sh + sparse-checkout-cone-mode: false + - name: Set up Go + uses: actions/setup-go@v5 + with: + go-version: "1.23" + check-latest: true + - name: Test v052 with latest main + run: | + .github/scripts/check-compat.sh $BRANCH $SIMAPP_VERSION cosmossdk.io/runtime/v2 cosmossdk.io/server/v2 cosmossdk.io/store/v2 cosmossdk.io/server/v2/stf cosmossdk.io/server/v2/appmanager cosmossdk.io/api cosmossdk.io/store cosmossdk.io/core cosmossdk.io/core/testing + env: + BRANCH: release/v0.52.x + SIMAPP_VERSION: v1 + - name: Test v052 v2 with latest main + run: | + .github/scripts/check-compat.sh $BRANCH $SIMAPP_VERSION cosmossdk.io/runtime/v2 cosmossdk.io/server/v2 cosmossdk.io/store/v2 cosmossdk.io/server/v2/stf cosmossdk.io/server/v2/appmanager cosmossdk.io/api cosmossdk.io/store cosmossdk.io/core cosmossdk.io/core/testing + env: + BRANCH: release/v0.52.x + SIMAPP_VERSION: v2 + sims-notify-success: + needs: [compat] + runs-on: ubuntu-latest + 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/action-slack-notify@v2.3.0 + env: + SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} + SLACK_CHANNEL: sdk-sims + SLACK_USERNAME: release/v0.52.x x main compat + SLACK_ICON_EMOJI: ":white_check_mark:" + SLACK_COLOR: good + SLACK_MESSAGE: Latest main x v0.52.x is compatible + SLACK_FOOTER: "" + + sims-notify-failure: + permissions: + contents: none + needs: [compat] + runs-on: ubuntu-latest + if: ${{ failure() }} + steps: + - name: Notify Slack on failure + uses: rtCamp/action-slack-notify@v2.3.0 + env: + SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} + SLACK_CHANNEL: sdk-sims + SLACK_USERNAME: release/v0.52.x x main compat + SLACK_ICON_EMOJI: ":skull:" + SLACK_COLOR: danger + SLACK_MESSAGE: Latest main x v0.52.x is breaking + SLACK_FOOTER: "" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 92c9914c14dc..99b3d1c1b1ee 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,7 +20,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true - name: Create a file with all core Cosmos SDK pkgs run: go list ./... > pkgs.txt @@ -54,7 +54,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true cache: true cache-dependency-path: go.sum @@ -88,7 +88,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true cache: true cache-dependency-path: go.sum @@ -119,7 +119,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true cache: true cache-dependency-path: go.sum @@ -153,7 +153,7 @@ jobs: fetch-tags: true - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true cache: true cache-dependency-path: | @@ -247,7 +247,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true cache: true cache-dependency-path: go.sum @@ -280,7 +280,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true cache: true cache-dependency-path: client/v2/go.sum @@ -311,7 +311,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.20" + go-version: "1.23" check-latest: true cache: true cache-dependency-path: core/go.sum @@ -341,7 +341,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.20" + go-version: "1.23" check-latest: true cache: true cache-dependency-path: core/testing/go.sum @@ -485,7 +485,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" cache: true cache-dependency-path: schema/testing/go.sum - uses: technote-space/get-diff-action@v6.1.2 @@ -515,7 +515,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" cache: true cache-dependency-path: indexer/postgres/tests/go.sum - uses: technote-space/get-diff-action@v6.1.2 @@ -551,7 +551,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true cache: true cache-dependency-path: simapp/go.sum @@ -579,7 +579,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true cache: true cache-dependency-path: go.sum @@ -621,7 +621,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true cache: true cache-dependency-path: collections/go.sum @@ -652,7 +652,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.20" + go-version: "1.23" check-latest: true cache: true cache-dependency-path: orm/go.sum @@ -683,7 +683,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true cache: true cache-dependency-path: tools/cosmovisor/go.sum @@ -714,7 +714,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true cache: true cache-dependency-path: tools/confix/go.sum @@ -745,7 +745,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true cache: true cache-dependency-path: tools/hubl/go.sum @@ -813,7 +813,7 @@ jobs: - uses: DeterminateSystems/magic-nix-cache-action@main - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true cache: true cache-dependency-path: store/v2/go.sum @@ -828,7 +828,7 @@ jobs: 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' ./... + nix develop ../.. -c 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 @@ -882,7 +882,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true cache: true cache-dependency-path: x/accounts/go.sum @@ -913,7 +913,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true cache: true cache-dependency-path: x/accounts/defaults/lockup/go.sum @@ -936,7 +936,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true cache: true cache-dependency-path: x/accounts/multisig/lockup/go.sum @@ -959,7 +959,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true cache: true cache-dependency-path: x/tx/go.sum @@ -990,7 +990,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true cache: true cache-dependency-path: x/nft/go.sum @@ -1021,7 +1021,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true cache: true cache-dependency-path: x/circuit/go.sum @@ -1052,7 +1052,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true cache: true cache-dependency-path: x/distribution/go.sum @@ -1083,7 +1083,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true cache: true cache-dependency-path: x/protocolpool/go.sum @@ -1114,7 +1114,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true cache: true cache-dependency-path: x/feegrant/go.sum @@ -1145,7 +1145,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true cache: true cache-dependency-path: x/evidence/go.sum @@ -1175,7 +1175,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true cache: true cache-dependency-path: x/params/go.sum @@ -1205,7 +1205,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true cache: true cache-dependency-path: x/upgrade/go.sum @@ -1235,7 +1235,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true cache: true cache-dependency-path: x/group/go.sum @@ -1265,7 +1265,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true cache: true cache-dependency-path: x/gov/go.sum @@ -1296,7 +1296,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true cache: true cache-dependency-path: x/slashing/go.sum @@ -1327,7 +1327,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true cache: true cache-dependency-path: x/staking/go.sum @@ -1358,7 +1358,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true cache: true cache-dependency-path: x/auth/go.sum @@ -1389,7 +1389,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true cache: true cache-dependency-path: x/authz/go.sum @@ -1420,7 +1420,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true cache: true cache-dependency-path: x/bank/go.sum @@ -1451,7 +1451,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true cache: true cache-dependency-path: x/mint/go.sum @@ -1482,7 +1482,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true cache: true cache-dependency-path: x/epochs/go.sum @@ -1513,7 +1513,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true cache: true cache-dependency-path: x/consensus/go.sum diff --git a/.github/workflows/v2-test.yml b/.github/workflows/v2-test.yml index 9bde9c3f39d1..6896f803a2c1 100644 --- a/.github/workflows/v2-test.yml +++ b/.github/workflows/v2-test.yml @@ -22,7 +22,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true cache: true cache-dependency-path: go.sum @@ -46,7 +46,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true cache: true cache-dependency-path: go.sum @@ -70,7 +70,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true cache: true cache-dependency-path: go.sum @@ -94,7 +94,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: "1.23" check-latest: true cache: true cache-dependency-path: go.sum diff --git a/Dockerfile b/Dockerfile index eb22d479a621..8c9eb8c65a92 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ # # This image is pushed to the GHCR as https://ghcr.io/cosmos/simapp -FROM golang:1.22-alpine AS build-env +FROM golang:1.23-alpine AS build-env # Install minimum necessary dependencies ENV PACKAGES curl make git libc-dev bash gcc linux-headers eudev-dev diff --git a/client/v2/go.mod b/client/v2/go.mod index 02268ef3b683..0c8b9a6b5195 100644 --- a/client/v2/go.mod +++ b/client/v2/go.mod @@ -1,10 +1,15 @@ module cosmossdk.io/client/v2 -go 1.22.2 +go 1.23 require ( +<<<<<<< HEAD cosmossdk.io/api v0.8.0 cosmossdk.io/core v0.12.1-0.20240812141913-3e413243db3c // main +======= + cosmossdk.io/api v0.7.5 + cosmossdk.io/core v1.0.0 +>>>>>>> 819330872 (build(deps): use Go 1.23 instead of Go 1.22 (#21280)) cosmossdk.io/depinject v1.0.0 cosmossdk.io/x/bank v0.0.0-20240226161501-23359a0b6d91 cosmossdk.io/x/gov v0.0.0-20231113122742-912390d5fc4a diff --git a/collections/go.mod b/collections/go.mod new file mode 100644 index 000000000000..12cafa6d7150 --- /dev/null +++ b/collections/go.mod @@ -0,0 +1,22 @@ +module cosmossdk.io/collections + +go 1.23 + +require ( + cosmossdk.io/core v1.0.0 + cosmossdk.io/core/testing v0.0.0-00010101000000-000000000000 + github.com/stretchr/testify v1.9.0 + pgregory.net/rapid v1.1.0 +) + +require ( + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/tidwall/btree v1.7.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect +) + +replace ( + cosmossdk.io/core => ../core + cosmossdk.io/core/testing => ../core/testing +) diff --git a/contrib/devtools/Dockerfile b/contrib/devtools/Dockerfile index 892bafdb0f73..99d6894af49f 100644 --- a/contrib/devtools/Dockerfile +++ b/contrib/devtools/Dockerfile @@ -2,8 +2,8 @@ # docker build --pull --rm -f "contrib/devtools/Dockerfile" -t cosmossdk-proto:latest "contrib/devtools" # docker run --rm -v $(pwd):/workspace --workdir /workspace cosmossdk-proto sh ./scripts/protocgen.sh -FROM bufbuild/buf:1.24.0 as BUILDER -FROM golang:1.22-alpine +FROM bufbuild/buf:1.36.0 as BUILDER +FROM golang:1.23-alpine RUN apk add --no-cache \ nodejs \ diff --git a/contrib/images/simd-dlv/Dockerfile b/contrib/images/simd-dlv/Dockerfile index 35266f5f271a..684eb55fedab 100644 --- a/contrib/images/simd-dlv/Dockerfile +++ b/contrib/images/simd-dlv/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22-alpine AS build +FROM golang:1.23-alpine AS build RUN apk add build-base git linux-headers libc-dev RUN go install github.com/go-delve/delve/cmd/dlv@latest diff --git a/contrib/images/simd-env/Dockerfile b/contrib/images/simd-env/Dockerfile index 07cfa091fd27..54e77e8775a6 100644 --- a/contrib/images/simd-env/Dockerfile +++ b/contrib/images/simd-env/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22-alpine AS build +FROM golang:1.23-alpine AS build RUN apk add build-base git linux-headers diff --git a/core/go.mod b/core/go.mod new file mode 100644 index 000000000000..8f691cc75063 --- /dev/null +++ b/core/go.mod @@ -0,0 +1,9 @@ +module cosmossdk.io/core + +// Core is meant to have zero dependencies, so we can use it as a dependency +// in other modules without having to worry about circular dependencies. + +go 1.23 + +// Version tagged too early and incompatible with v0.50 (latest at the time of tagging) +retract v0.12.0 diff --git a/core/testing/go.mod b/core/testing/go.mod new file mode 100644 index 000000000000..0952d63b869a --- /dev/null +++ b/core/testing/go.mod @@ -0,0 +1,10 @@ +module cosmossdk.io/core/testing + +go 1.23 + +replace cosmossdk.io/core => ../ + +require ( + cosmossdk.io/core v1.0.0 + github.com/tidwall/btree v1.7.0 +) diff --git a/crypto/armor_test.go b/crypto/armor_test.go index 45c16bfcc5e1..9d6c2b04b42a 100644 --- a/crypto/armor_test.go +++ b/crypto/armor_test.go @@ -43,7 +43,7 @@ func TestArmorUnarmorPrivKey(t *testing.T) { // empty string decrypted, algo, err = crypto.UnarmorDecryptPrivKey("", "passphrase") require.Error(t, err) - require.True(t, errors.Is(io.EOF, err)) + require.True(t, errors.Is(err, io.EOF)) require.Nil(t, decrypted) require.Empty(t, algo) @@ -165,7 +165,7 @@ func TestArmorInfoBytes(t *testing.T) { func TestUnarmorInfoBytesErrors(t *testing.T) { unarmoredBytes, err := crypto.UnarmorInfoBytes("") require.Error(t, err) - require.True(t, errors.Is(io.EOF, err)) + require.True(t, errors.Is(err, io.EOF)) require.Nil(t, unarmoredBytes) header := map[string]string{ diff --git a/flake.lock b/flake.lock index 25cc4479a38a..e442eb8cdd43 100644 --- a/flake.lock +++ b/flake.lock @@ -44,11 +44,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1714656196, - "narHash": "sha256-kjQkA98lMcsom6Gbhw8SYzmwrSo+2nruiTcTZp5jK7o=", + "lastModified": 1723603349, + "narHash": "sha256-VMg6N7MryOuvSJ8Sj6YydarnUCkL7cvMdrMcnsJnJCE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "94035b482d181af0a0f8f77823a790b256b7c3cc", + "rev": "daf7bb95821b789db24fc1ac21f613db0c1bf2cb", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 69569230fc76..4313af441445 100644 --- a/flake.nix +++ b/flake.nix @@ -54,7 +54,7 @@ devShells = rec { default = with pkgs; mkShell { buildInputs = [ - go_1_22 # Use Go 1.22 version + go_1_23 # Use Go 1.23 version rocksdb gomod2nix ]; diff --git a/go.mod b/go.mod index 241a41bd81c4..2cc7a20f83f2 100644 --- a/go.mod +++ b/go.mod @@ -1,13 +1,20 @@ -go 1.22.2 +go 1.23 module github.com/cosmos/cosmos-sdk require ( +<<<<<<< HEAD buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.34.2-20240701160653-fedbb9acfd2f.2 // indirect cosmossdk.io/api v0.8.0 // main cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab // main cosmossdk.io/core v0.12.1-0.20240812141913-3e413243db3c // main cosmossdk.io/core/testing v0.0.0-20240812125744-810a542d6bac // main +======= + cosmossdk.io/api v0.7.5 + cosmossdk.io/collections v0.4.0 + cosmossdk.io/core v1.0.0 + cosmossdk.io/core/testing v0.0.0-00010101000000-000000000000 +>>>>>>> 819330872 (build(deps): use Go 1.23 instead of Go 1.22 (#21280)) cosmossdk.io/depinject v1.0.0 cosmossdk.io/errors v1.0.1 cosmossdk.io/log v1.4.0 diff --git a/go.work.example b/go.work.example index 383971f56b33..ed8897838289 100644 --- a/go.work.example +++ b/go.work.example @@ -1,4 +1,4 @@ -go 1.22.2 +go 1.23 use ( . diff --git a/indexer/postgres/tests/go.mod b/indexer/postgres/tests/go.mod new file mode 100644 index 000000000000..72f6701e00bf --- /dev/null +++ b/indexer/postgres/tests/go.mod @@ -0,0 +1,35 @@ +module cosmossdk.io/indexer/postgres/testing + +go 1.23 + +require ( + cosmossdk.io/indexer/postgres v0.0.0-00010101000000-000000000000 + cosmossdk.io/schema v0.1.1 + github.com/fergusstrange/embedded-postgres v1.28.0 + github.com/hashicorp/consul/sdk v0.16.1 + github.com/jackc/pgx/v5 v5.6.0 + github.com/stretchr/testify v1.9.0 + gotest.tools/v3 v3.5.1 +) + +require ( + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect + github.com/google/go-cmp v0.6.0 // indirect + github.com/jackc/pgpassfile v1.0.0 // indirect + github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect + github.com/jackc/puddle/v2 v2.2.1 // indirect + github.com/kr/text v0.2.0 // indirect + github.com/lib/pq v1.10.9 // indirect + github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect + github.com/rogpeppe/go-internal v1.12.0 // indirect + github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect + golang.org/x/crypto v0.26.0 // indirect + golang.org/x/sync v0.8.0 // indirect + golang.org/x/sys v0.23.0 // indirect + golang.org/x/text v0.17.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect +) + +replace cosmossdk.io/indexer/postgres => ../. + +replace cosmossdk.io/schema => ../../../schema diff --git a/orm/go.mod b/orm/go.mod new file mode 100644 index 000000000000..9898b6606d01 --- /dev/null +++ b/orm/go.mod @@ -0,0 +1,71 @@ +module cosmossdk.io/orm + +go 1.23 + +require ( + cosmossdk.io/api v0.7.5 + cosmossdk.io/core v0.12.1-0.20231114100755-569e3ff6a0d7 + cosmossdk.io/depinject v1.0.0 + cosmossdk.io/errors v1.0.1 + github.com/cosmos/cosmos-db v1.0.2 + github.com/cosmos/cosmos-proto v1.0.0-beta.5 + github.com/golang/mock v1.6.0 + github.com/google/go-cmp v0.6.0 + github.com/iancoleman/strcase v0.3.0 + github.com/regen-network/gocuke v1.1.1 + github.com/stretchr/testify v1.9.0 + golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 + google.golang.org/grpc v1.65.0 + google.golang.org/protobuf v1.34.2 + gotest.tools/v3 v3.5.1 + pgregory.net/rapid v1.1.0 +) + +require ( + github.com/DataDog/zstd v1.5.5 // indirect + github.com/beorn7/perks v1.0.1 // indirect + github.com/bmatcuk/doublestar/v4 v4.6.1 // indirect + github.com/cespare/xxhash/v2 v2.3.0 // indirect + github.com/cockroachdb/apd/v3 v3.2.1 // indirect + github.com/cockroachdb/errors v1.11.1 // indirect + github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect + github.com/cockroachdb/pebble v1.1.0 // indirect + github.com/cockroachdb/redact v1.1.5 // indirect + github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect + github.com/cosmos/gogoproto v1.7.0 // indirect + github.com/cucumber/gherkin/go/v27 v27.0.0 // indirect + github.com/cucumber/messages/go/v22 v22.0.0 // indirect + github.com/cucumber/tag-expressions/go/v6 v6.1.0 // indirect + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect + github.com/fsnotify/fsnotify v1.6.0 // indirect + github.com/getsentry/sentry-go v0.27.0 // indirect + github.com/gofrs/uuid v4.4.0+incompatible // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/snappy v0.0.4 // indirect + github.com/google/btree v1.1.2 // indirect + github.com/klauspost/compress v1.17.7 // indirect + github.com/kr/pretty v0.3.1 // indirect + github.com/kr/text v0.2.0 // indirect + github.com/linxGnu/grocksdb v1.8.14 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect + github.com/onsi/gomega v1.20.0 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/prometheus/client_golang v1.19.1 // indirect + github.com/prometheus/client_model v0.6.1 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect + github.com/rogpeppe/go-internal v1.12.0 // indirect + github.com/spf13/cast v1.7.0 // indirect + github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect + github.com/tendermint/go-amino v0.16.0 // indirect + golang.org/x/net v0.28.0 // indirect + golang.org/x/sys v0.24.0 // indirect + golang.org/x/text v0.17.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240808171019-573a1156607a // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect + sigs.k8s.io/yaml v1.4.0 // indirect +) + +replace cosmossdk.io/core => ../core diff --git a/runtime/v2/go.mod b/runtime/v2/go.mod new file mode 100644 index 000000000000..a14951866a9f --- /dev/null +++ b/runtime/v2/go.mod @@ -0,0 +1,103 @@ +module cosmossdk.io/runtime/v2 + +go 1.23 + +// server v2 integration +replace ( + cosmossdk.io/api => ../../api + cosmossdk.io/core => ../../core + cosmossdk.io/core/testing => ../../core/testing + cosmossdk.io/server/v2/appmanager => ../../server/v2/appmanager + cosmossdk.io/server/v2/stf => ../../server/v2/stf + cosmossdk.io/store/v2 => ../../store/v2 + cosmossdk.io/x/tx => ../../x/tx +) + +require ( + cosmossdk.io/api v0.7.5 + cosmossdk.io/core v1.0.0 + cosmossdk.io/depinject v1.0.0 + cosmossdk.io/log v1.4.0 + cosmossdk.io/server/v2/appmanager v0.0.0-00010101000000-000000000000 + cosmossdk.io/server/v2/stf v0.0.0-00010101000000-000000000000 + cosmossdk.io/store/v2 v2.0.0-00010101000000-000000000000 + cosmossdk.io/x/tx v0.13.3 + github.com/cosmos/gogoproto v1.7.0 + github.com/spf13/viper v1.19.0 + golang.org/x/exp v0.0.0-20240531132922-fd00a4e0eefc + google.golang.org/grpc v1.65.0 + google.golang.org/protobuf v1.34.2 +) + +require ( + buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.34.2-20240701160653-fedbb9acfd2f.2 // indirect + buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.34.2-20240130113600-88ef6483f90f.2 // indirect + cosmossdk.io/core/testing v0.0.0-00010101000000-000000000000 // indirect + cosmossdk.io/errors/v2 v2.0.0-20240731132947-df72853b3ca5 // indirect + github.com/DataDog/zstd v1.5.5 // indirect + github.com/beorn7/perks v1.0.1 // indirect + github.com/cespare/xxhash/v2 v2.3.0 // indirect + github.com/cockroachdb/errors v1.11.1 // indirect + github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect + github.com/cockroachdb/pebble v1.1.0 // indirect + github.com/cockroachdb/redact v1.1.5 // indirect + github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect + github.com/cosmos/cosmos-db v1.0.2 // indirect + github.com/cosmos/cosmos-proto v1.0.0-beta.5 // indirect + github.com/cosmos/iavl v1.2.1-0.20240731145221-594b181f427e // indirect + github.com/cosmos/ics23/go v0.10.0 // indirect + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect + github.com/emicklei/dot v1.6.2 // indirect + github.com/fsnotify/fsnotify v1.7.0 // indirect + github.com/getsentry/sentry-go v0.27.0 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/snappy v0.0.4 // indirect + github.com/google/btree v1.1.2 // indirect + github.com/google/go-cmp v0.6.0 // indirect + github.com/hashicorp/go-immutable-radix v1.3.1 // indirect + github.com/hashicorp/go-metrics v0.5.3 // indirect + github.com/hashicorp/golang-lru v1.0.2 // indirect + github.com/hashicorp/hcl v1.0.0 // indirect + github.com/klauspost/compress v1.17.8 // indirect + github.com/kr/pretty v0.3.1 // indirect + github.com/kr/text v0.2.0 // indirect + github.com/linxGnu/grocksdb v1.8.14 // indirect + github.com/magiconair/properties v1.8.7 // indirect + github.com/mattn/go-colorable v0.1.13 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect + github.com/mattn/go-sqlite3 v1.14.22 // indirect + github.com/mitchellh/mapstructure v1.5.0 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect + github.com/onsi/gomega v1.28.1 // indirect + github.com/pelletier/go-toml/v2 v2.2.2 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect + github.com/prometheus/client_golang v1.19.1 // indirect + github.com/prometheus/client_model v0.6.1 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect + github.com/rogpeppe/go-internal v1.12.0 // indirect + github.com/rs/zerolog v1.33.0 // indirect + github.com/sagikazarmark/locafero v0.4.0 // indirect + github.com/sagikazarmark/slog-shim v0.1.0 // indirect + github.com/sourcegraph/conc v0.3.0 // indirect + github.com/spf13/afero v1.11.0 // indirect + github.com/spf13/cast v1.7.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + github.com/stretchr/testify v1.9.0 // indirect + github.com/subosito/gotenv v1.6.0 // indirect + github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect + github.com/tendermint/go-amino v0.16.0 // indirect + github.com/tidwall/btree v1.7.0 // indirect + go.uber.org/multierr v1.11.0 // indirect + golang.org/x/crypto v0.26.0 // indirect + golang.org/x/net v0.28.0 // indirect + golang.org/x/sync v0.8.0 // indirect + golang.org/x/sys v0.24.0 // indirect + golang.org/x/text v0.17.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240808171019-573a1156607a // indirect + gopkg.in/ini.v1 v1.67.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect + sigs.k8s.io/yaml v1.4.0 // indirect +) diff --git a/schema/testing/go.mod b/schema/testing/go.mod new file mode 100644 index 000000000000..cc96f2267fc8 --- /dev/null +++ b/schema/testing/go.mod @@ -0,0 +1,21 @@ +module cosmossdk.io/schema/testing + +go 1.23 + +require ( + cosmossdk.io/schema v0.0.0 + github.com/cockroachdb/apd/v3 v3.2.1 + github.com/stretchr/testify v1.9.0 + github.com/tidwall/btree v1.7.0 + gotest.tools/v3 v3.5.1 + pgregory.net/rapid v1.1.0 +) + +require ( + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/google/go-cmp v0.5.9 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect +) + +replace cosmossdk.io/schema => ./.. diff --git a/scripts/build/linting.mk b/scripts/build/linting.mk index eeeecc484c0a..58d481a235fb 100644 --- a/scripts/build/linting.mk +++ b/scripts/build/linting.mk @@ -1,4 +1,4 @@ -golangci_version=v1.59.0 +golangci_version=v1.60.1 #? setup-pre-commit: Set pre-commit git hook setup-pre-commit: diff --git a/scripts/build/protobuf.mk b/scripts/build/protobuf.mk index 54182e2432f5..a0f42f52f50a 100644 --- a/scripts/build/protobuf.mk +++ b/scripts/build/protobuf.mk @@ -1,4 +1,4 @@ -protoVer=0.14.1 +protoVer=0.15.0 protoImageName=ghcr.io/cosmos/proto-builder:$(protoVer) protoImage=$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(protoImageName) diff --git a/server/v2/appmanager/go.mod b/server/v2/appmanager/go.mod new file mode 100644 index 000000000000..53c6e1c150a5 --- /dev/null +++ b/server/v2/appmanager/go.mod @@ -0,0 +1,7 @@ +module cosmossdk.io/server/v2/appmanager + +go 1.23 + +replace cosmossdk.io/core => ../../../core + +require cosmossdk.io/core v1.0.0 diff --git a/server/v2/cometbft/go.mod b/server/v2/cometbft/go.mod index 4434509c4952..802ed5c5f26f 100644 --- a/server/v2/cometbft/go.mod +++ b/server/v2/cometbft/go.mod @@ -1,6 +1,6 @@ module cosmossdk.io/server/v2/cometbft -go 1.22.2 +go 1.23 replace ( // pseudo version lower than the latest tag @@ -16,8 +16,13 @@ replace ( require ( buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.34.2-20240701160653-fedbb9acfd2f.2 +<<<<<<< HEAD cosmossdk.io/api v0.8.0 cosmossdk.io/core v0.12.1-0.20240812141913-3e413243db3c // main +======= + cosmossdk.io/api v0.7.5 + cosmossdk.io/core v1.0.0 +>>>>>>> 819330872 (build(deps): use Go 1.23 instead of Go 1.22 (#21280)) cosmossdk.io/errors v1.0.1 cosmossdk.io/log v1.4.0 cosmossdk.io/server/v2 v2.0.0-20240802142126-a26970e547ab // main diff --git a/server/v2/go.mod b/server/v2/go.mod new file mode 100644 index 000000000000..ae344a0a9768 --- /dev/null +++ b/server/v2/go.mod @@ -0,0 +1,115 @@ +module cosmossdk.io/server/v2 + +go 1.23 + +replace ( + cosmossdk.io/api => ../../api + cosmossdk.io/core => ../../core + cosmossdk.io/core/testing => ../../core/testing + cosmossdk.io/server/v2/appmanager => ./appmanager + cosmossdk.io/server/v2/stf => ./stf + cosmossdk.io/store/v2 => ../../store/v2 + cosmossdk.io/store/v2/db => ../../store/v2/db + cosmossdk.io/x/tx => ../../x/tx +) + +require ( + cosmossdk.io/api v0.7.5 + cosmossdk.io/core v1.0.0 + cosmossdk.io/core/testing v0.0.0-00010101000000-000000000000 + cosmossdk.io/log v1.4.0 + cosmossdk.io/server/v2/appmanager v0.0.0-00010101000000-000000000000 + cosmossdk.io/store/v2 v2.0.0-00010101000000-000000000000 + github.com/cosmos/cosmos-proto v1.0.0-beta.5 + github.com/cosmos/gogogateway v1.2.0 + github.com/cosmos/gogoproto v1.7.0 + github.com/golang/protobuf v1.5.4 + github.com/gorilla/mux v1.8.1 + github.com/grpc-ecosystem/grpc-gateway v1.16.0 + github.com/hashicorp/go-hclog v1.6.3 + github.com/hashicorp/go-metrics v0.5.3 + github.com/hashicorp/go-plugin v1.6.1 + github.com/mitchellh/mapstructure v1.5.0 + github.com/pelletier/go-toml/v2 v2.2.2 + github.com/prometheus/client_golang v1.19.1 + github.com/prometheus/common v0.55.0 + github.com/rs/zerolog v1.33.0 + github.com/spf13/cobra v1.8.1 + github.com/spf13/pflag v1.0.5 + github.com/spf13/viper v1.19.0 + github.com/stretchr/testify v1.9.0 + golang.org/x/exp v0.0.0-20240531132922-fd00a4e0eefc + golang.org/x/sync v0.8.0 + google.golang.org/grpc v1.65.0 + google.golang.org/protobuf v1.34.2 +) + +require ( + cosmossdk.io/errors/v2 v2.0.0-20240731132947-df72853b3ca5 // indirect + github.com/DataDog/datadog-go v4.8.3+incompatible // indirect + github.com/DataDog/zstd v1.5.5 // indirect + github.com/Microsoft/go-winio v0.6.1 // indirect + github.com/beorn7/perks v1.0.1 // indirect + github.com/cespare/xxhash/v2 v2.3.0 // indirect + github.com/cockroachdb/errors v1.11.1 // indirect + github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect + github.com/cockroachdb/pebble v1.1.0 // indirect + github.com/cockroachdb/redact v1.1.5 // indirect + github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect + github.com/cosmos/cosmos-db v1.0.2 // indirect + github.com/cosmos/iavl v1.2.1-0.20240731145221-594b181f427e // indirect + github.com/cosmos/ics23/go v0.10.0 // indirect + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect + github.com/emicklei/dot v1.6.2 // indirect + github.com/fatih/color v1.17.0 // indirect + github.com/fsnotify/fsnotify v1.7.0 // indirect + github.com/getsentry/sentry-go v0.27.0 // indirect + github.com/gogo/googleapis v1.4.1 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/snappy v0.0.4 // indirect + github.com/google/btree v1.1.2 // indirect + github.com/google/go-cmp v0.6.0 // indirect + github.com/hashicorp/go-immutable-radix v1.3.1 // indirect + github.com/hashicorp/golang-lru v1.0.2 // indirect + github.com/hashicorp/hcl v1.0.0 // indirect + github.com/hashicorp/yamux v0.1.1 // indirect + github.com/inconshreveable/mousetrap v1.1.0 // indirect + github.com/jhump/protoreflect v1.15.3 // indirect + github.com/klauspost/compress v1.17.8 // indirect + github.com/kr/pretty v0.3.1 // indirect + github.com/kr/text v0.2.0 // indirect + github.com/linxGnu/grocksdb v1.8.14 // indirect + github.com/magiconair/properties v1.8.7 // indirect + github.com/mattn/go-colorable v0.1.13 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect + github.com/mattn/go-sqlite3 v1.14.22 // indirect + github.com/mitchellh/go-testing-interface v1.14.1 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect + github.com/oklog/run v1.1.0 // indirect + github.com/onsi/gomega v1.28.1 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect + github.com/prometheus/client_model v0.6.1 // indirect + github.com/prometheus/procfs v0.15.1 // indirect + github.com/rogpeppe/go-internal v1.12.0 // indirect + github.com/sagikazarmark/locafero v0.4.0 // indirect + github.com/sagikazarmark/slog-shim v0.1.0 // indirect + github.com/sourcegraph/conc v0.3.0 // indirect + github.com/spf13/afero v1.11.0 // indirect + github.com/spf13/cast v1.7.0 // indirect + github.com/subosito/gotenv v1.6.0 // indirect + github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect + github.com/tidwall/btree v1.7.0 // indirect + go.uber.org/multierr v1.11.0 // indirect + golang.org/x/crypto v0.26.0 // indirect + golang.org/x/mod v0.17.0 // indirect + golang.org/x/net v0.28.0 // indirect + golang.org/x/sys v0.24.0 // indirect + golang.org/x/text v0.17.0 // indirect + golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect + google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240808171019-573a1156607a // indirect + gopkg.in/ini.v1 v1.67.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect +) diff --git a/server/v2/stf/go.mod b/server/v2/stf/go.mod new file mode 100644 index 000000000000..a11fe22895ee --- /dev/null +++ b/server/v2/stf/go.mod @@ -0,0 +1,23 @@ +module cosmossdk.io/server/v2/stf + +go 1.23 + +replace cosmossdk.io/core => ../../../core + +require ( + cosmossdk.io/core v0.11.0 + github.com/cosmos/gogoproto v1.7.0 + github.com/stretchr/testify v1.9.0 + github.com/tidwall/btree v1.7.0 + golang.org/x/exp v0.0.0-20231006140011-7918f672742d +) + +require ( + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect + github.com/google/go-cmp v0.6.0 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + google.golang.org/protobuf v1.34.2 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect +) + +replace github.com/cosmos/gogoproto => github.com/cosmos/gogoproto v1.6.1-0.20240809124342-d6a57064ada0 diff --git a/simapp/go.mod b/simapp/go.mod index 3e761569b2fa..234664d75400 100644 --- a/simapp/go.mod +++ b/simapp/go.mod @@ -1,13 +1,19 @@ module cosmossdk.io/simapp -go 1.22.2 +go 1.23 require ( cosmossdk.io/api v0.8.0 // main cosmossdk.io/client/v2 v2.0.0-20230630094428-02b760776860 +<<<<<<< HEAD cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab // main cosmossdk.io/core v0.12.1-0.20240812141913-3e413243db3c // main cosmossdk.io/core/testing v0.0.0-20240812125744-810a542d6bac // indirect; main +======= + cosmossdk.io/collections v0.4.0 + cosmossdk.io/core v1.0.0 + cosmossdk.io/core/testing v0.0.0-00010101000000-000000000000 // indirect +>>>>>>> 819330872 (build(deps): use Go 1.23 instead of Go 1.22 (#21280)) cosmossdk.io/depinject v1.0.0 cosmossdk.io/log v1.4.0 cosmossdk.io/math v1.3.0 diff --git a/simapp/v2/go.mod b/simapp/v2/go.mod index e0f398b934e4..a06f315c650f 100644 --- a/simapp/v2/go.mod +++ b/simapp/v2/go.mod @@ -1,12 +1,16 @@ module cosmossdk.io/simapp/v2 -go 1.22.2 +go 1.23 require ( cosmossdk.io/api v0.8.0 // main cosmossdk.io/client/v2 v2.0.0-00010101000000-000000000000 +<<<<<<< HEAD cosmossdk.io/core v0.12.1-0.20240812141913-3e413243db3c // main cosmossdk.io/core/testing v0.0.0-20240812141913-3e413243db3c // indirect; main +======= + cosmossdk.io/core v1.0.0 +>>>>>>> 819330872 (build(deps): use Go 1.23 instead of Go 1.22 (#21280)) cosmossdk.io/depinject v1.0.0 cosmossdk.io/log v1.4.0 cosmossdk.io/math v1.3.0 diff --git a/store/v2/go.mod b/store/v2/go.mod new file mode 100644 index 000000000000..7e65bbf2e453 --- /dev/null +++ b/store/v2/go.mod @@ -0,0 +1,70 @@ +module cosmossdk.io/store/v2 + +go 1.23 + +require ( + cosmossdk.io/core v1.0.0 + cosmossdk.io/core/testing v0.0.0-00010101000000-000000000000 + cosmossdk.io/errors/v2 v2.0.0-20240731132947-df72853b3ca5 + cosmossdk.io/log v1.4.0 + github.com/cockroachdb/pebble v1.1.0 + github.com/cosmos/cosmos-proto v1.0.0-beta.5 + github.com/cosmos/gogoproto v1.7.0 + github.com/cosmos/iavl v1.2.1-0.20240731145221-594b181f427e + github.com/cosmos/ics23/go v0.10.0 + github.com/google/btree v1.1.2 + github.com/hashicorp/go-metrics v0.5.3 + github.com/linxGnu/grocksdb v1.8.14 + github.com/mattn/go-sqlite3 v1.14.22 + github.com/spf13/cast v1.7.0 + github.com/stretchr/testify v1.9.0 + github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d + go.uber.org/mock v0.4.0 + golang.org/x/exp v0.0.0-20231006140011-7918f672742d + golang.org/x/sync v0.8.0 +) + +require ( + github.com/DataDog/zstd v1.5.5 // indirect + github.com/beorn7/perks v1.0.1 // indirect + github.com/cespare/xxhash/v2 v2.2.0 // indirect + github.com/cockroachdb/errors v1.11.1 // indirect + github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect + github.com/cockroachdb/redact v1.1.5 // indirect + github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect + github.com/cosmos/cosmos-db v1.0.0 // indirect + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect + github.com/emicklei/dot v1.6.2 // indirect + github.com/fsnotify/fsnotify v1.7.0 // indirect + github.com/getsentry/sentry-go v0.27.0 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/snappy v0.0.4 // indirect + github.com/google/go-cmp v0.6.0 // indirect + github.com/hashicorp/go-immutable-radix v1.3.1 // indirect + github.com/hashicorp/go-uuid v1.0.1 // indirect + github.com/hashicorp/golang-lru v1.0.2 // indirect + github.com/klauspost/compress v1.17.7 // indirect + github.com/kr/pretty v0.3.1 // indirect + github.com/kr/text v0.2.0 // indirect + github.com/mattn/go-colorable v0.1.13 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect + github.com/prometheus/client_golang v1.19.1 // indirect + github.com/prometheus/client_model v0.6.1 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect + github.com/rogpeppe/go-internal v1.12.0 // indirect + github.com/rs/zerolog v1.33.0 // indirect + github.com/tidwall/btree v1.7.0 // indirect + golang.org/x/crypto v0.26.0 // indirect + golang.org/x/sys v0.23.0 // indirect + golang.org/x/text v0.17.0 // indirect + google.golang.org/protobuf v1.34.2 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect +) + +replace cosmossdk.io/core => ../../core + +replace cosmossdk.io/core/testing => ../../core/testing diff --git a/tests/go.mod b/tests/go.mod index b5adf001116a..0b2cf1424aa7 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -1,11 +1,17 @@ module github.com/cosmos/cosmos-sdk/tests -go 1.22.2 +go 1.23 require ( +<<<<<<< HEAD cosmossdk.io/api v0.8.0 // main cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab // main cosmossdk.io/core v0.12.1-0.20240812141913-3e413243db3c // main +======= + cosmossdk.io/api v0.7.5 + cosmossdk.io/collections v0.4.0 + cosmossdk.io/core v1.0.0 +>>>>>>> 819330872 (build(deps): use Go 1.23 instead of Go 1.22 (#21280)) cosmossdk.io/depinject v1.0.0 cosmossdk.io/errors v1.0.1 // indirect cosmossdk.io/log v1.4.0 diff --git a/tests/systemtests/go.mod b/tests/systemtests/go.mod index 42d7a5f12815..bfea9ee583d2 100644 --- a/tests/systemtests/go.mod +++ b/tests/systemtests/go.mod @@ -1,6 +1,6 @@ module cosmossdk.io/tests/systemtests -go 1.22 +go 1.23 require ( github.com/cosmos/cosmos-proto v1.0.0-beta.5 // indirect diff --git a/tools/confix/go.mod b/tools/confix/go.mod index 8426f7c47a7d..40b4fa3693cf 100644 --- a/tools/confix/go.mod +++ b/tools/confix/go.mod @@ -1,6 +1,6 @@ module cosmossdk.io/tools/confix -go 1.21 +go 1.23 require ( github.com/cosmos/cosmos-sdk v0.50.8 diff --git a/tools/cosmovisor/go.mod b/tools/cosmovisor/go.mod new file mode 100644 index 000000000000..8ed819ec44b2 --- /dev/null +++ b/tools/cosmovisor/go.mod @@ -0,0 +1,186 @@ +module cosmossdk.io/tools/cosmovisor + +go 1.23 + +require ( + cosmossdk.io/log v1.4.0 + cosmossdk.io/x/upgrade v0.1.4 + github.com/otiai10/copy v1.14.0 + github.com/pelletier/go-toml/v2 v2.2.2 + github.com/spf13/cobra v1.8.1 + github.com/spf13/viper v1.19.0 + github.com/stretchr/testify v1.9.0 +) + +require ( + cloud.google.com/go v0.115.0 // indirect + cloud.google.com/go/auth v0.5.1 // indirect + cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect + cloud.google.com/go/compute/metadata v0.3.0 // indirect + cloud.google.com/go/iam v1.1.8 // indirect + cloud.google.com/go/storage v1.42.0 // indirect + cosmossdk.io/api v0.7.5 // indirect + cosmossdk.io/collections v0.4.0 // indirect + cosmossdk.io/core v0.11.0 // indirect + cosmossdk.io/depinject v1.0.0 // indirect + cosmossdk.io/errors v1.0.1 // indirect + cosmossdk.io/math v1.3.0 // indirect + cosmossdk.io/store v1.1.0 // indirect + cosmossdk.io/x/tx v0.13.3 // indirect + filippo.io/edwards25519 v1.1.0 // indirect + github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect + github.com/99designs/keyring v1.2.2 // indirect + github.com/DataDog/datadog-go v4.8.3+incompatible // indirect + github.com/DataDog/zstd v1.5.5 // indirect + github.com/Microsoft/go-winio v0.6.2 // indirect + github.com/aws/aws-sdk-go v1.54.6 // indirect + github.com/beorn7/perks v1.0.1 // indirect + github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect + github.com/bgentry/speakeasy v0.2.0 // indirect + github.com/btcsuite/btcd/btcec/v2 v2.3.3 // indirect + github.com/cenkalti/backoff/v4 v4.3.0 // indirect + github.com/cespare/xxhash/v2 v2.3.0 // indirect + github.com/cockroachdb/errors v1.11.3 // indirect + github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect + github.com/cockroachdb/pebble v1.1.0 // indirect + github.com/cockroachdb/redact v1.1.5 // indirect + github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect + github.com/cometbft/cometbft v0.38.9 // indirect + github.com/cometbft/cometbft-db v0.12.0 // indirect + github.com/cosmos/btcutil v1.0.5 // indirect + github.com/cosmos/cosmos-db v1.0.2 // indirect + github.com/cosmos/cosmos-proto v1.0.0-beta.5 // indirect + github.com/cosmos/cosmos-sdk v0.50.7 // indirect + github.com/cosmos/go-bip39 v1.0.0 // indirect + github.com/cosmos/gogogateway v1.2.0 // indirect + github.com/cosmos/gogoproto v1.7.0 // indirect + github.com/cosmos/iavl v1.2.0 // indirect + github.com/cosmos/ics23/go v0.10.0 // indirect + github.com/cosmos/ledger-cosmos-go v0.13.3 // indirect + github.com/danieljoos/wincred v1.2.1 // indirect + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect + github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect + github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect + github.com/dgraph-io/badger/v4 v4.2.0 // indirect + github.com/dgraph-io/ristretto v0.1.1 // indirect + github.com/dustin/go-humanize v1.0.1 // indirect + github.com/dvsekhvalnov/jose2go v1.7.0 // indirect + github.com/emicklei/dot v1.6.2 // indirect + github.com/fatih/color v1.17.0 // indirect + github.com/felixge/httpsnoop v1.0.4 // indirect + github.com/fsnotify/fsnotify v1.7.0 // indirect + github.com/getsentry/sentry-go v0.28.0 // indirect + github.com/go-kit/kit v0.13.0 // indirect + github.com/go-kit/log v0.2.1 // indirect + github.com/go-logfmt/logfmt v0.6.0 // indirect + github.com/go-logr/logr v1.4.2 // indirect + github.com/go-logr/stdr v1.2.2 // indirect + github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect + github.com/gogo/googleapis v1.4.1 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/glog v1.2.1 // indirect + github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/golang/protobuf v1.5.4 // indirect + github.com/golang/snappy v0.0.4 // indirect + github.com/google/btree v1.1.2 // indirect + github.com/google/flatbuffers v24.3.25+incompatible // indirect + github.com/google/go-cmp v0.6.0 // indirect + github.com/google/s2a-go v0.1.7 // indirect + github.com/google/uuid v1.6.0 // indirect + github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect + github.com/googleapis/gax-go/v2 v2.12.5 // indirect + github.com/gorilla/handlers v1.5.2 // indirect + github.com/gorilla/mux v1.8.1 // indirect + github.com/gorilla/websocket v1.5.1 // indirect + github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect + github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect + github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect + github.com/hashicorp/go-cleanhttp v0.5.2 // indirect + github.com/hashicorp/go-getter v1.7.5 // indirect + github.com/hashicorp/go-hclog v1.6.3 // indirect + github.com/hashicorp/go-immutable-radix v1.3.1 // indirect + github.com/hashicorp/go-metrics v0.5.3 // indirect + github.com/hashicorp/go-plugin v1.6.1 // indirect + github.com/hashicorp/go-safetemp v1.0.0 // indirect + github.com/hashicorp/go-version v1.7.0 // indirect + github.com/hashicorp/golang-lru v1.0.2 // indirect + github.com/hashicorp/hcl v1.0.0 // indirect + github.com/hashicorp/yamux v0.1.1 // indirect + github.com/hdevalence/ed25519consensus v0.2.0 // indirect + github.com/huandu/skiplist v1.2.0 // indirect + github.com/iancoleman/strcase v0.3.0 // indirect + github.com/improbable-eng/grpc-web v0.15.0 // indirect + github.com/inconshreveable/mousetrap v1.1.0 // indirect + github.com/jmespath/go-jmespath v0.4.0 // indirect + github.com/jmhodges/levigo v1.0.0 // indirect + github.com/klauspost/compress v1.17.9 // indirect + github.com/kr/pretty v0.3.1 // indirect + github.com/kr/text v0.2.0 // indirect + github.com/lib/pq v1.10.9 // indirect + github.com/libp2p/go-buffer-pool v0.1.0 // indirect + github.com/linxGnu/grocksdb v1.9.1 // indirect + github.com/magiconair/properties v1.8.7 // indirect + github.com/mattn/go-colorable v0.1.13 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect + github.com/mitchellh/go-homedir v1.1.0 // indirect + github.com/mitchellh/go-testing-interface v1.14.1 // indirect + github.com/mitchellh/mapstructure v1.5.0 // indirect + github.com/mtibben/percent v0.2.1 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect + github.com/oasisprotocol/curve25519-voi v0.0.0-20230904125328-1f23a7beb09a // indirect + github.com/oklog/run v1.1.0 // indirect + github.com/petermattis/goid v0.0.0-20240503122002-4b96552b8156 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect + github.com/prometheus/client_golang v1.19.1 // indirect + github.com/prometheus/client_model v0.6.1 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect + github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect + github.com/rogpeppe/go-internal v1.12.0 // indirect + github.com/rs/cors v1.11.0 // indirect + github.com/rs/zerolog v1.33.0 // indirect + github.com/sagikazarmark/locafero v0.6.0 // indirect + github.com/sagikazarmark/slog-shim v0.1.0 // indirect + github.com/sasha-s/go-deadlock v0.3.1 // indirect + github.com/sourcegraph/conc v0.3.0 // indirect + github.com/spf13/afero v1.11.0 // indirect + github.com/spf13/cast v1.7.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + github.com/subosito/gotenv v1.6.0 // indirect + github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect + github.com/tendermint/go-amino v0.16.0 // indirect + github.com/tidwall/btree v1.7.0 // indirect + github.com/ulikunitz/xz v0.5.12 // indirect + github.com/zondax/hid v0.9.2 // indirect + github.com/zondax/ledger-go v0.14.3 // indirect + go.etcd.io/bbolt v1.4.0-alpha.1 // indirect + go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect + go.opentelemetry.io/otel v1.27.0 // indirect + go.opentelemetry.io/otel/metric v1.27.0 // indirect + go.opentelemetry.io/otel/trace v1.27.0 // indirect + go.uber.org/multierr v1.11.0 // indirect + golang.org/x/crypto v0.26.0 // indirect + golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8 // indirect + golang.org/x/net v0.28.0 // indirect + golang.org/x/oauth2 v0.21.0 // indirect + golang.org/x/sync v0.8.0 // indirect + golang.org/x/sys v0.24.0 // indirect + golang.org/x/term v0.23.0 // indirect + golang.org/x/text v0.17.0 // indirect + golang.org/x/time v0.5.0 // indirect + google.golang.org/api v0.185.0 // indirect + google.golang.org/genproto v0.0.0-20240617180043-68d350f18fd4 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240617180043-68d350f18fd4 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240808171019-573a1156607a // indirect + google.golang.org/grpc v1.65.0 // indirect + google.golang.org/protobuf v1.34.2 // indirect + gopkg.in/ini.v1 v1.67.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect + gotest.tools/v3 v3.5.1 // indirect + nhooyr.io/websocket v1.8.11 // indirect + pgregory.net/rapid v1.1.0 // indirect + sigs.k8s.io/yaml v1.4.0 // indirect +) diff --git a/types/context_test.go b/types/context_test.go index f705bc33c87e..81edab5274ba 100644 --- a/types/context_test.go +++ b/types/context_test.go @@ -18,6 +18,8 @@ import ( "github.com/cosmos/cosmos-sdk/types" ) +type dummyCtxKey struct{} + type contextTestSuite struct { suite.Suite } @@ -137,7 +139,7 @@ func (s *contextTestSuite) TestContextWithCustom() { s.Require().Equal(cp, ctx.WithConsensusParams(cp).ConsensusParams()) // test inner context - newContext := context.WithValue(ctx.Context(), struct{}{}, "value") + newContext := context.WithValue(ctx.Context(), dummyCtxKey{}, "value") s.Require().NotEqual(ctx.Context(), ctx.WithContext(newContext).Context()) } @@ -225,7 +227,7 @@ func (s *contextTestSuite) TestUnwrapSDKContext() { s.Require().Panics(func() { types.UnwrapSDKContext(ctx) }) // test unwrapping when we've used context.WithValue - ctx = context.WithValue(sdkCtx, struct{}{}, "bar") + ctx = context.WithValue(sdkCtx, dummyCtxKey{}, "bar") sdkCtx2 = types.UnwrapSDKContext(ctx) s.Require().Equal(sdkCtx, sdkCtx2) } diff --git a/x/accounts/defaults/lockup/go.mod b/x/accounts/defaults/lockup/go.mod index a19531effa8d..72236a52acd8 100644 --- a/x/accounts/defaults/lockup/go.mod +++ b/x/accounts/defaults/lockup/go.mod @@ -1,10 +1,15 @@ module cosmossdk.io/x/accounts/defaults/lockup -go 1.22.2 +go 1.23 require ( +<<<<<<< HEAD cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab // main cosmossdk.io/core v0.12.1-0.20240812141913-3e413243db3c // main +======= + cosmossdk.io/collections v0.4.0 + cosmossdk.io/core v1.0.0 +>>>>>>> 819330872 (build(deps): use Go 1.23 instead of Go 1.22 (#21280)) cosmossdk.io/x/accounts v0.0.0-20240226161501-23359a0b6d91 cosmossdk.io/x/bank v0.0.0-20240226161501-23359a0b6d91 cosmossdk.io/x/distribution v0.0.0-00010101000000-000000000000 diff --git a/x/accounts/defaults/multisig/go.mod b/x/accounts/defaults/multisig/go.mod index 88049cd23f3b..38eec7454a58 100644 --- a/x/accounts/defaults/multisig/go.mod +++ b/x/accounts/defaults/multisig/go.mod @@ -1,10 +1,15 @@ module cosmossdk.io/x/accounts/defaults/multisig -go 1.22.2 +go 1.23 require ( +<<<<<<< HEAD cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab // main cosmossdk.io/core v0.12.1-0.20240812141913-3e413243db3c // main +======= + cosmossdk.io/collections v0.4.0 + cosmossdk.io/core v1.0.0 +>>>>>>> 819330872 (build(deps): use Go 1.23 instead of Go 1.22 (#21280)) cosmossdk.io/math v1.3.0 cosmossdk.io/x/accounts v0.0.0-00010101000000-000000000000 cosmossdk.io/x/bank v0.0.0-20240226161501-23359a0b6d91 diff --git a/x/accounts/go.mod b/x/accounts/go.mod index e82a63f57b93..7cda1aa97302 100644 --- a/x/accounts/go.mod +++ b/x/accounts/go.mod @@ -1,12 +1,19 @@ module cosmossdk.io/x/accounts -go 1.22.2 +go 1.23 require ( +<<<<<<< HEAD cosmossdk.io/api v0.8.0 // main cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab // main cosmossdk.io/core v0.12.1-0.20240812141913-3e413243db3c // main cosmossdk.io/core/testing v0.0.0-20240812125744-810a542d6bac // main +======= + cosmossdk.io/api v0.7.5 + cosmossdk.io/collections v0.4.0 + cosmossdk.io/core v1.0.0 + cosmossdk.io/core/testing v0.0.0-00010101000000-000000000000 +>>>>>>> 819330872 (build(deps): use Go 1.23 instead of Go 1.22 (#21280)) cosmossdk.io/depinject v1.0.0 cosmossdk.io/x/accounts/defaults/multisig v0.0.0-00010101000000-000000000000 cosmossdk.io/x/bank v0.0.0-20240226161501-23359a0b6d91 diff --git a/x/auth/go.mod b/x/auth/go.mod index aa85a44c67ae..520bf818848b 100644 --- a/x/auth/go.mod +++ b/x/auth/go.mod @@ -1,12 +1,19 @@ module cosmossdk.io/x/auth -go 1.22.2 +go 1.23 require ( +<<<<<<< HEAD cosmossdk.io/api v0.8.0 // main cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab // main cosmossdk.io/core v0.12.1-0.20240812141913-3e413243db3c // main cosmossdk.io/core/testing v0.0.0-20240812125744-810a542d6bac // +======= + cosmossdk.io/api v0.7.5 + cosmossdk.io/collections v0.4.0 + cosmossdk.io/core v1.0.0 + cosmossdk.io/core/testing v0.0.0-00010101000000-000000000000 +>>>>>>> 819330872 (build(deps): use Go 1.23 instead of Go 1.22 (#21280)) cosmossdk.io/depinject v1.0.0 cosmossdk.io/errors v1.0.1 cosmossdk.io/math v1.3.0 diff --git a/x/authz/go.mod b/x/authz/go.mod index aae339b70492..8f357def845c 100644 --- a/x/authz/go.mod +++ b/x/authz/go.mod @@ -1,10 +1,15 @@ module cosmossdk.io/x/authz -go 1.22.2 +go 1.23 require ( +<<<<<<< HEAD cosmossdk.io/api v0.8.0 // main cosmossdk.io/core v0.12.1-0.20240812141913-3e413243db3c // main +======= + cosmossdk.io/api v0.7.5 + cosmossdk.io/core v1.0.0 +>>>>>>> 819330872 (build(deps): use Go 1.23 instead of Go 1.22 (#21280)) cosmossdk.io/depinject v1.0.0 cosmossdk.io/errors v1.0.1 cosmossdk.io/log v1.4.0 diff --git a/x/bank/go.mod b/x/bank/go.mod index ea0b067d78ab..c541768ae307 100644 --- a/x/bank/go.mod +++ b/x/bank/go.mod @@ -1,12 +1,18 @@ module cosmossdk.io/x/bank -go 1.22.2 +go 1.23 require ( +<<<<<<< HEAD cosmossdk.io/api v0.8.0 // main cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab // main cosmossdk.io/core v0.12.1-0.20240812141913-3e413243db3c // main cosmossdk.io/core/testing v0.0.0-20240812125744-810a542d6bac // main +======= + cosmossdk.io/api v0.7.5 + cosmossdk.io/collections v0.4.0 + cosmossdk.io/core v1.0.0 +>>>>>>> 819330872 (build(deps): use Go 1.23 instead of Go 1.22 (#21280)) cosmossdk.io/depinject v1.0.0 cosmossdk.io/errors v1.0.1 cosmossdk.io/log v1.4.0 // indirect diff --git a/x/circuit/go.mod b/x/circuit/go.mod index b33ae4c50d67..dc9227dd2592 100644 --- a/x/circuit/go.mod +++ b/x/circuit/go.mod @@ -1,12 +1,19 @@ module cosmossdk.io/x/circuit -go 1.22.2 +go 1.23 require ( +<<<<<<< HEAD cosmossdk.io/api v0.8.0 // main cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab // main cosmossdk.io/core v0.12.1-0.20240812141913-3e413243db3c // main cosmossdk.io/core/testing v0.0.0-20240812125744-810a542d6bac // main +======= + cosmossdk.io/api v0.7.5 + cosmossdk.io/collections v0.4.0 + cosmossdk.io/core v1.0.0 + cosmossdk.io/core/testing v0.0.0-00010101000000-000000000000 +>>>>>>> 819330872 (build(deps): use Go 1.23 instead of Go 1.22 (#21280)) cosmossdk.io/depinject v1.0.0 cosmossdk.io/errors v1.0.1 cosmossdk.io/store v1.1.1-0.20240418092142-896cdf1971bc // main diff --git a/x/consensus/go.mod b/x/consensus/go.mod index 76485ff1cb9b..41e7f958c7ff 100644 --- a/x/consensus/go.mod +++ b/x/consensus/go.mod @@ -1,12 +1,19 @@ module cosmossdk.io/x/consensus -go 1.22.2 +go 1.23 require ( +<<<<<<< HEAD cosmossdk.io/api v0.8.0 // main cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab // main cosmossdk.io/core v0.12.1-0.20240812141913-3e413243db3c // main cosmossdk.io/core/testing v0.0.0-20240812125744-810a542d6bac // main +======= + cosmossdk.io/api v0.7.5 + cosmossdk.io/collections v0.4.0 + cosmossdk.io/core v1.0.0 + cosmossdk.io/core/testing v0.0.0-00010101000000-000000000000 +>>>>>>> 819330872 (build(deps): use Go 1.23 instead of Go 1.22 (#21280)) cosmossdk.io/depinject v1.0.0 cosmossdk.io/store v1.1.1-0.20240418092142-896cdf1971bc // main github.com/cometbft/cometbft v1.0.0-rc1 diff --git a/x/distribution/go.mod b/x/distribution/go.mod index e20eae7731a9..a8917c757917 100644 --- a/x/distribution/go.mod +++ b/x/distribution/go.mod @@ -1,12 +1,19 @@ module cosmossdk.io/x/distribution -go 1.22.2 +go 1.23 require ( +<<<<<<< HEAD cosmossdk.io/api v0.8.0 // main cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab // main cosmossdk.io/core v0.12.1-0.20240812141913-3e413243db3c // main cosmossdk.io/core/testing v0.0.0-20240812125744-810a542d6bac // main +======= + cosmossdk.io/api v0.7.5 + cosmossdk.io/collections v0.4.0 + cosmossdk.io/core v1.0.0 + cosmossdk.io/core/testing v0.0.0-00010101000000-000000000000 +>>>>>>> 819330872 (build(deps): use Go 1.23 instead of Go 1.22 (#21280)) cosmossdk.io/depinject v1.0.0 cosmossdk.io/errors v1.0.1 cosmossdk.io/log v1.4.0 diff --git a/x/epochs/go.mod b/x/epochs/go.mod index cc66b950d769..b99743c3f33b 100644 --- a/x/epochs/go.mod +++ b/x/epochs/go.mod @@ -1,12 +1,19 @@ module cosmossdk.io/x/epochs -go 1.22.2 +go 1.23 require ( +<<<<<<< HEAD cosmossdk.io/api v0.8.0 // main cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab // main cosmossdk.io/core v0.12.1-0.20240812141913-3e413243db3c // main cosmossdk.io/core/testing v0.0.0-20240812125744-810a542d6bac // main +======= + cosmossdk.io/api v0.7.5 + cosmossdk.io/collections v0.4.0 + cosmossdk.io/core v1.0.0 + cosmossdk.io/core/testing v0.0.0-00010101000000-000000000000 +>>>>>>> 819330872 (build(deps): use Go 1.23 instead of Go 1.22 (#21280)) cosmossdk.io/depinject v1.0.0 cosmossdk.io/errors v1.0.1 cosmossdk.io/store v1.1.1-0.20240418092142-896cdf1971bc // main diff --git a/x/evidence/go.mod b/x/evidence/go.mod index d5d80c98debd..9c49ca2b7ad4 100644 --- a/x/evidence/go.mod +++ b/x/evidence/go.mod @@ -1,12 +1,19 @@ module cosmossdk.io/x/evidence -go 1.22.2 +go 1.23 require ( +<<<<<<< HEAD cosmossdk.io/api v0.8.0 // main cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab // main cosmossdk.io/core v0.12.1-0.20240812141913-3e413243db3c // main cosmossdk.io/core/testing v0.0.0-20240812125744-810a542d6bac // main +======= + cosmossdk.io/api v0.7.5 + cosmossdk.io/collections v0.4.0 + cosmossdk.io/core v1.0.0 + cosmossdk.io/core/testing v0.0.0-00010101000000-000000000000 +>>>>>>> 819330872 (build(deps): use Go 1.23 instead of Go 1.22 (#21280)) cosmossdk.io/depinject v1.0.0 cosmossdk.io/errors v1.0.1 cosmossdk.io/math v1.3.0 diff --git a/x/feegrant/go.mod b/x/feegrant/go.mod index 2256171fc9ce..d12868fd01f6 100644 --- a/x/feegrant/go.mod +++ b/x/feegrant/go.mod @@ -1,12 +1,19 @@ module cosmossdk.io/x/feegrant -go 1.22.2 +go 1.23 require ( +<<<<<<< HEAD cosmossdk.io/api v0.8.0 // main cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab // main cosmossdk.io/core v0.12.1-0.20240812141913-3e413243db3c // main cosmossdk.io/core/testing v0.0.0-20240812125744-810a542d6bac // main +======= + cosmossdk.io/api v0.7.5 + cosmossdk.io/collections v0.4.0 + cosmossdk.io/core v1.0.0 + cosmossdk.io/core/testing v0.0.0-00010101000000-000000000000 +>>>>>>> 819330872 (build(deps): use Go 1.23 instead of Go 1.22 (#21280)) cosmossdk.io/depinject v1.0.0 cosmossdk.io/errors v1.0.1 cosmossdk.io/math v1.3.0 diff --git a/x/gov/go.mod b/x/gov/go.mod index 83c17f9b6704..9e4866467487 100644 --- a/x/gov/go.mod +++ b/x/gov/go.mod @@ -1,12 +1,19 @@ module cosmossdk.io/x/gov -go 1.22.2 +go 1.23 require ( +<<<<<<< HEAD cosmossdk.io/api v0.8.0 // main cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab // main cosmossdk.io/core v0.12.1-0.20240812141913-3e413243db3c // main cosmossdk.io/core/testing v0.0.0-20240812125744-810a542d6bac // main +======= + cosmossdk.io/api v0.7.5 + cosmossdk.io/collections v0.4.0 + cosmossdk.io/core v1.0.0 + cosmossdk.io/core/testing v0.0.0-00010101000000-000000000000 +>>>>>>> 819330872 (build(deps): use Go 1.23 instead of Go 1.22 (#21280)) cosmossdk.io/depinject v1.0.0 cosmossdk.io/errors v1.0.1 cosmossdk.io/log v1.4.0 diff --git a/x/group/go.mod b/x/group/go.mod index d8e903fb98ab..3e1bf855b292 100644 --- a/x/group/go.mod +++ b/x/group/go.mod @@ -1,10 +1,15 @@ module cosmossdk.io/x/group -go 1.22.2 +go 1.23 require ( +<<<<<<< HEAD cosmossdk.io/api v0.8.0 // main cosmossdk.io/core v0.12.1-0.20240812141913-3e413243db3c // main +======= + cosmossdk.io/api v0.7.5 + cosmossdk.io/core v1.0.0 +>>>>>>> 819330872 (build(deps): use Go 1.23 instead of Go 1.22 (#21280)) cosmossdk.io/depinject v1.0.0 cosmossdk.io/errors v1.0.1 cosmossdk.io/log v1.4.0 diff --git a/x/mint/go.mod b/x/mint/go.mod index 9f847d6377d9..86a9eeb1db1f 100644 --- a/x/mint/go.mod +++ b/x/mint/go.mod @@ -1,12 +1,19 @@ module cosmossdk.io/x/mint -go 1.22.2 +go 1.23 require ( +<<<<<<< HEAD cosmossdk.io/api v0.8.0 // main cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab // main cosmossdk.io/core v0.12.1-0.20240812141913-3e413243db3c // main cosmossdk.io/core/testing v0.0.0-20240812125744-810a542d6bac // main +======= + cosmossdk.io/api v0.7.5 + cosmossdk.io/collections v0.4.0 + cosmossdk.io/core v1.0.0 + cosmossdk.io/core/testing v0.0.0-00010101000000-000000000000 +>>>>>>> 819330872 (build(deps): use Go 1.23 instead of Go 1.22 (#21280)) cosmossdk.io/depinject v1.0.0 cosmossdk.io/errors v1.0.1 cosmossdk.io/log v1.4.0 diff --git a/x/nft/go.mod b/x/nft/go.mod index 285f2e47ae61..fa4bd3d3f674 100644 --- a/x/nft/go.mod +++ b/x/nft/go.mod @@ -1,10 +1,15 @@ module cosmossdk.io/x/nft -go 1.22.2 +go 1.23 require ( +<<<<<<< HEAD cosmossdk.io/api v0.8.0 // main cosmossdk.io/core v0.12.1-0.20240812141913-3e413243db3c // main +======= + cosmossdk.io/api v0.7.5 + cosmossdk.io/core v1.0.0 +>>>>>>> 819330872 (build(deps): use Go 1.23 instead of Go 1.22 (#21280)) cosmossdk.io/depinject v1.0.0 cosmossdk.io/errors v1.0.1 cosmossdk.io/log v1.4.0 diff --git a/x/params/go.mod b/x/params/go.mod index 779541783ff3..ad4e600828e1 100644 --- a/x/params/go.mod +++ b/x/params/go.mod @@ -1,10 +1,15 @@ module cosmossdk.io/x/params -go 1.22.2 +go 1.23 require ( +<<<<<<< HEAD cosmossdk.io/api v0.8.0 // main cosmossdk.io/core v0.12.1-0.20240812141913-3e413243db3c // main +======= + cosmossdk.io/api v0.7.5 + cosmossdk.io/core v1.0.0 +>>>>>>> 819330872 (build(deps): use Go 1.23 instead of Go 1.22 (#21280)) cosmossdk.io/depinject v1.0.0 cosmossdk.io/errors v1.0.1 cosmossdk.io/log v1.4.0 diff --git a/x/protocolpool/go.mod b/x/protocolpool/go.mod index d0027326dcc2..34a0aa716ba2 100644 --- a/x/protocolpool/go.mod +++ b/x/protocolpool/go.mod @@ -1,12 +1,19 @@ module cosmossdk.io/x/protocolpool -go 1.22.2 +go 1.23 require ( +<<<<<<< HEAD cosmossdk.io/api v0.8.0 // main cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab // main cosmossdk.io/core v0.12.1-0.20240812141913-3e413243db3c // main cosmossdk.io/core/testing v0.0.0-20240812125744-810a542d6bac // main +======= + cosmossdk.io/api v0.7.5 + cosmossdk.io/collections v0.4.0 + cosmossdk.io/core v1.0.0 + cosmossdk.io/core/testing v0.0.0-00010101000000-000000000000 +>>>>>>> 819330872 (build(deps): use Go 1.23 instead of Go 1.22 (#21280)) cosmossdk.io/depinject v1.0.0 cosmossdk.io/errors v1.0.1 cosmossdk.io/math v1.3.0 diff --git a/x/slashing/go.mod b/x/slashing/go.mod index d7455719b84d..bace33a21864 100644 --- a/x/slashing/go.mod +++ b/x/slashing/go.mod @@ -1,12 +1,19 @@ module cosmossdk.io/x/slashing -go 1.22.2 +go 1.23 require ( +<<<<<<< HEAD cosmossdk.io/api v0.8.0 // main cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab // main cosmossdk.io/core v0.12.1-0.20240812141913-3e413243db3c // main cosmossdk.io/core/testing v0.0.0-20240812125744-810a542d6bac // main +======= + cosmossdk.io/api v0.7.5 + cosmossdk.io/collections v0.4.0 + cosmossdk.io/core v1.0.0 + cosmossdk.io/core/testing v0.0.0-00010101000000-000000000000 +>>>>>>> 819330872 (build(deps): use Go 1.23 instead of Go 1.22 (#21280)) cosmossdk.io/depinject v1.0.0 cosmossdk.io/errors v1.0.1 cosmossdk.io/math v1.3.0 diff --git a/x/staking/go.mod b/x/staking/go.mod index 2e67c89b769e..ac67fc9ff950 100644 --- a/x/staking/go.mod +++ b/x/staking/go.mod @@ -1,12 +1,19 @@ module cosmossdk.io/x/staking -go 1.22.2 +go 1.23 require ( +<<<<<<< HEAD cosmossdk.io/api v0.8.0 // main cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab // main cosmossdk.io/core v0.12.1-0.20240812141913-3e413243db3c // main cosmossdk.io/core/testing v0.0.0-20240812125744-810a542d6bac // main +======= + cosmossdk.io/api v0.7.5 + cosmossdk.io/collections v0.4.0 + cosmossdk.io/core v1.0.0 + cosmossdk.io/core/testing v0.0.0-00010101000000-000000000000 +>>>>>>> 819330872 (build(deps): use Go 1.23 instead of Go 1.22 (#21280)) cosmossdk.io/depinject v1.0.0 cosmossdk.io/errors v1.0.1 cosmossdk.io/math v1.3.0 diff --git a/x/tx/go.mod b/x/tx/go.mod new file mode 100644 index 000000000000..69f3fcd4851e --- /dev/null +++ b/x/tx/go.mod @@ -0,0 +1,41 @@ +module cosmossdk.io/x/tx + +go 1.23 + +require ( + cosmossdk.io/api v0.7.5 + cosmossdk.io/core v0.11.0 + cosmossdk.io/errors v1.0.1 + cosmossdk.io/math v1.3.0 + github.com/cosmos/cosmos-proto v1.0.0-beta.5 + github.com/cosmos/gogoproto v1.7.0 + github.com/google/go-cmp v0.6.0 + github.com/google/gofuzz v1.2.0 + github.com/iancoleman/strcase v0.3.0 + github.com/pkg/errors v0.9.1 + github.com/stretchr/testify v1.9.0 + github.com/tendermint/go-amino v0.16.0 + google.golang.org/protobuf v1.34.2 + gotest.tools/v3 v3.5.1 + pgregory.net/rapid v1.1.0 +) + +require ( + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect + github.com/kr/text v0.2.0 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect + golang.org/x/net v0.28.0 // indirect + golang.org/x/sys v0.24.0 // indirect + golang.org/x/text v0.17.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240808171019-573a1156607a // indirect + google.golang.org/grpc v1.65.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect +) + +replace cosmossdk.io/core => ../../core + +// NOTE: we do not want to replace to the development version of cosmossdk.io/api yet +// Until https://github.com/cosmos/cosmos-sdk/issues/19228 is resolved +// We are tagging x/tx from main and must keep using released versions of x/tx dependencies diff --git a/x/upgrade/go.mod b/x/upgrade/go.mod index a33bafb5cad5..1505302329b7 100644 --- a/x/upgrade/go.mod +++ b/x/upgrade/go.mod @@ -1,11 +1,17 @@ module cosmossdk.io/x/upgrade -go 1.22.2 +go 1.23 require ( +<<<<<<< HEAD cosmossdk.io/api v0.8.0 cosmossdk.io/core v0.12.1-0.20240812141913-3e413243db3c // main cosmossdk.io/core/testing v0.0.0-20240812125744-810a542d6bac // main +======= + cosmossdk.io/api v0.7.5 + cosmossdk.io/core v1.0.0 + cosmossdk.io/core/testing v0.0.0-00010101000000-000000000000 +>>>>>>> 819330872 (build(deps): use Go 1.23 instead of Go 1.22 (#21280)) cosmossdk.io/depinject v1.0.0 cosmossdk.io/errors v1.0.1 cosmossdk.io/log v1.4.0