fix conflict

.github/CODEOWNERS

@@ -2,12 +2,76 @@
 
 # NOTE: Order is important; the last matching pattern takes the most precedence
 
-# Primary repo maintainers
+# Cosmos SDK Codeowners
 
-*       @cosmos/sdk-core-dev
+# Core team as default owners
 
-# CODEOWNERS for docs configuration
+* @cosmos/sdk-core-dev
 
+# Components
+
+/baseapp/ @facundomedica @aaronc @testinginprod @kocubinski @cosmos/sdk-core-dev
+/client/ @julienrbrt @JulianToledano @cosmos/sdk-core-dev
+/client/v2/ @julienrbrt @JulianToledano @cosmos/sdk-core-dev
+/collections/ @testinginprod @facundomedica @cosmos/sdk-core-dev
+/core/ @cosmos/sdk-core-dev
+/crypto/ @JulianToledano @raynaudoe @cosmos/sdk-core-dev
+/depinject/ @aaronc @kocubinski @julienrbrt @cosmos/sdk-core-dev
+/indexer/ @aaronc @cool-develope @cosmos/sdk-core-dev
+/log/ @julienrbrt @sontrinh16 @cosmos/sdk-core-dev
+/math/ @testinginprod @alpe @cosmos/sdk-core-dev
+/orm/ @aaronc @testinginprod @lucaslopezf @cosmos/sdk-core-dev
+/runtime/ @julienrbrt @hieuvubk @cosmos/sdk-core-dev
+/runtime/v2/ @julienrbrt @hieuvubk @cosmos/sdk-core-dev
+/schema/ @aaronc @testinginprod @cosmos/sdk-core-dev
+/server/ @cosmos/sdk-core-dev
+/server/v2/ @julienrbrt @hieuvubk @cosmos/sdk-core-dev
+/server/v2/stf/ @testinginprod @kocubinski @cosmos/sdk-core-dev
+/server/v2/appmanager/ @testinginprod @facundomedica @cosmos/sdk-core-dev
+/server/v2/cometbft/ @facundomedica @sontrinh16 @cosmos/sdk-core-dev
+/simapp/ @facundomedica @julienrbrt @cosmos/sdk-core-dev
+/simapp/v2/ @kocubinski @julienrbrt @cosmos/sdk-core-dev
+/store/ @cool-develope @kocubinski @cosmos/sdk-core-dev
+/store/v2/ @cool-develope @kocubinski @cosmos/sdk-core-dev
+/types/mempool/ @kocubinski @cosmos/sdk-core-dev
+/tools/hubl @julienrbrt @JulianToledano @cosmos/sdk-core-dev
+/tools/cosmovisor @julienrbrt @facundomedica @cosmos/sdk-core-dev
+/tools/confix @julienrbrt @akhilkumarpilli @cosmos/sdk-core-dev
+
+# x modules
+
+/x/accounts/ @testinginprod @sontrinh16 @cosmos/sdk-core-dev
+/x/auth/ @facundomedica @testinginprod @aaronc @cosmos/sdk-core-dev
+/x/authz/ @akhilkumarpilli @raynaudoe @cosmos/sdk-core-dev
+/x/bank/ @julienrbrt @sontrinh16 @cosmos/sdk-core-dev
+/x/bank/v2 @julienrbrt @hieuvubk @akhilkumarpilli @cosmos/sdk-core-dev
+/x/circuit/ @kocubinski @akhilkumarpilli @raynaudoe @cosmos/sdk-core-dev
+/x/consensus/ @testinginprod @raynaudoe @cosmos/sdk-core-dev
+/x/distribution/ @alpe @JulianToledano @cosmos/sdk-core-dev
+/x/epochs/ @alpe @facundomedica @cosmos/sdk-core-dev
+/x/evidence/ @alpe @akhilkumarpilli @cosmos/sdk-core-dev
+/x/feegrant/ @cool-develope @alpe @cosmos/sdk-core-dev
+/x/genutil/ @kocubinski @hieuvubk @julienrbrt @cosmos/sdk-core-dev
+/x/gov/ @julienrbrt @sontrinh16 @cosmos/sdk-core-dev
+/x/group/ @kocubinski @akhilkumarpilli @cosmos/sdk-core-dev
+/x/mint/ @lucaslopezf @facundomedica @cosmos/sdk-core-dev
+/x/nft/ @alpe @lucaslopezf @cosmos/sdk-core-dev
+/x/params/ @cosmos/sdk-core-dev # deprecated so whole team
+/x/protocolpool/ @facundomedica @hieuvubk @alpe @cosmos/sdk-core-dev
+/x/simulation/ @cosmos/sdk-core-dev # deprecated so whole team
+/x/slashing/ @testinginprod @raynaudoe @lucaslopezf @cosmos/sdk-core-dev
+/x/staking/ @facundomedica @testinginprod @JulianToledano @ziscky @cosmos/sdk-core-dev
+/x/tx/ @kocubinski @testinginprod @aaronc @cosmos/sdk-core-dev
+/x/upgrade/ @facundomedica @cool-develope @akhilkumarpilli @lucaslopezf @cosmos/sdk-core-dev
+
+# go mods
+
+**/go.mod @cosmos/sdk-core-dev
+**/go.sum @cosmos/sdk-core-dev
+
+# docs configuration
+
+/docs/ @cosmos/sdk-core-dev
 /docs/docusaurus.config.js @julienrbrt @tac0turtle
 /docs/sidebars.js @julienrbrt @tac0turtle
 /docs/pre.sh @julienrbrt @tac0turtle

.github/dependabot.yml

@@ -305,6 +305,15 @@ updates:
     labels:
       - "A:automerge"
       - dependencies
+  - package-ecosystem: gomod
+    directory: "/x/bank"
+    schedule:
+      interval: weekly
+      day: wednesday
+      time: "03:20"
+    labels:
+      - "A:automerge"
+      - dependencies
 
   # Dependencies should be up to date on release branch
   - package-ecosystem: gomod

.github/pr_labeler.yml

@@ -38,6 +38,8 @@
   - x/authz/**/*
 "C:x/bank":
   - x/bank/**/*
+"C:x/bank/v2":
+  - x/bank/v2/**/*
 "C:x/circuit":
   - x/circuit/**/*
 "C:x/consensus":

.github/workflows/misspell.yml

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

.github/workflows/sims-nightly.yml

@@ -24,6 +24,8 @@ jobs:
           go-version: "1.23"
           check-latest: true
       - name: test-sim-multi-seed-long
+        env:
+          GOMEMLIMIT: 14GiB # reserve 2 GiB as buffer for GC to avoid OOM
         run: |
           make test-sim-multi-seed-long
 

.github/workflows/test.yml

@@ -605,7 +605,7 @@ jobs:
           simdv2 start &
           SIMD_PID=$!
           cnt=0
-          while ! simdv2 query block --type=height 5; do
+          while ! simdv2 query comet block --type=height 5; do
             cnt=$((cnt + 1))
             if [ $cnt -gt 30 ]; then
               kill -9 "$SIMD_PID"
@@ -1352,37 +1352,6 @@ jobs:
         with:
           projectBaseDir: x/staking/
 
-  test-x-auth:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
-        with:
-          go-version: "1.23"
-          check-latest: true
-          cache: true
-          cache-dependency-path: x/auth/go.sum
-      - uses: technote-space/[email protected]
-        id: git_diff
-        with:
-          PATTERNS: |
-            x/auth/**/*.go
-            x/auth/go.mod
-            x/auth/go.sum
-      - name: tests
-        if: env.GIT_DIFF
-        run: |
-          cd x/auth
-          go test -mod=readonly -timeout 30m -coverprofile=coverage.out -covermode=atomic -tags='norace ledger test_ledger_mock' ./...
-      - name: sonarcloud
-        if: ${{ env.GIT_DIFF && !github.event.pull_request.draft && env.SONAR_TOKEN != null }}
-        uses: SonarSource/sonarcloud-github-action@master
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        with:
-          projectBaseDir: x/auth/
-
   test-x-authz:
     runs-on: ubuntu-latest
     steps:

CHANGELOG.md

@@ -43,16 +43,26 @@ Every module contains its own CHANGELOG.md. Please refer to the module you are i
 ### Features
 
 * (baseapp) [#20291](https://github.com/cosmos/cosmos-sdk/pull/20291) Simulate nested messages.
+* (cli) [#21372](https://github.com/cosmos/cosmos-sdk/pull/21372) Add a `bulk-add-genesis-account` genesis command to add many genesis accounts at once.
 
 ### Improvements
 
+* (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.
+
 ### Bug Fixes
 
 * (baseapp) [#21256](https://github.com/cosmos/cosmos-sdk/pull/21256) Halt height will not commit the block indicated, meaning that if halt-height is set to 10, only blocks until 9 (included) will be committed. This is to go back to the original behavior before a change was introduced in v0.50.0.
-
+* (baseapp) [#21413](https://github.com/cosmos/cosmos-sdk/pull/21413) Fix data race in sdk mempool.
 
 ### API Breaking Changes
 
+* (baseapp) [#21413](https://github.com/cosmos/cosmos-sdk/pull/21413) Add `SelectBy` method to `Mempool` interface, which is thread-safe to use.
+
+### Deprecated
+
+* (types) [#21435](https://github.com/cosmos/cosmos-sdk/pull/21435) The `String()` method on `AccAddress`, `ValAddress` and `ConsAddress` have been deprecated. This is done because those are still using the deprecated global `sdk.Config`. Use an `address.Codec` instead.
+
 ## [v0.52.0](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.52.0) - 2024-XX-XX
 
 Every module contains its own CHANGELOG.md. Please refer to the module you are interested in.
@@ -75,6 +85,9 @@ Every module contains its own CHANGELOG.md. Please refer to the module you are i
 * (client) [#19905](https://github.com/cosmos/cosmos-sdk/pull/19905) Add grpc client config to `client.toml`.
 * (genutil) [#19971](https://github.com/cosmos/cosmos-sdk/pull/19971) Allow manually setting the consensus key type in genesis
 * (runtime) [#19953](https://github.com/cosmos/cosmos-sdk/pull/19953) Implement `core/transaction.Service` in runtime.
+* (runtime) [#18475](https://github.com/cosmos/cosmos-sdk/pull/18475) Adds an implementation for `core.branch.Service`.
+* (runtime) [#19004](https://github.com/cosmos/cosmos-sdk/pull/19004) Adds an implementation for `core/header.Service` in runtime.
+* (runtime) [#20238](https://github.com/cosmos/cosmos-sdk/pull/20238) Adds an implementation for `core/comet.Service` in runtime.
 * (tests) [#20013](https://github.com/cosmos/cosmos-sdk/pull/20013) Introduce system tests to run multi node local testnet in CI
 * (crypto/keyring) [#20212](https://github.com/cosmos/cosmos-sdk/pull/20212) Expose the db keyring used in the keystore.
 * (client/tx) [#20870](https://github.com/cosmos/cosmos-sdk/pull/20870) Add `timeout-timestamp` field for tx body defines time based timeout.Add `WithTimeoutTimestamp` to tx factory. Increased gas cost for processing newly added timeout timestamp field in tx body.
@@ -140,7 +153,7 @@ Every module contains its own CHANGELOG.md. Please refer to the module you are i
 * (client) [#17215](https://github.com/cosmos/cosmos-sdk/pull/17215) `server.StartCmd`,`server.ExportCmd`,`server.NewRollbackCmd`,`pruning.Cmd`,`genutilcli.InitCmd`,`genutilcli.GenTxCmd`,`genutilcli.CollectGenTxsCmd`,`genutilcli.AddGenesisAccountCmd`, do not take a home directory anymore. It is inferred from the root command.
 * (client) [#17259](https://github.com/cosmos/cosmos-sdk/pull/17259) Remove deprecated `clientCtx.PrintObjectLegacy`. Use `clientCtx.PrintProto` or `clientCtx.PrintRaw` instead.
 * (types) [#17348](https://github.com/cosmos/cosmos-sdk/pull/17348) Remove the `WrapServiceResult` function.
-    * The `*sdk.Result` returned by the msg server router will not contain the `.Data` field. 
+    * The `*sdk.Result` returned by the msg server router will not contain the `.Data` field.
 * (types) [#17426](https://github.com/cosmos/cosmos-sdk/pull/17426) `NewContext` does not take a `cmtproto.Header{}` any longer.
     * `WithChainID` / `WithBlockHeight` / `WithBlockHeader` must be used to set values on the context
 * (client/keys) [#17503](https://github.com/cosmos/cosmos-sdk/pull/17503) `clientkeys.NewKeyOutput`, `MkConsKeyOutput`, `MkValKeyOutput`, `MkAccKeyOutput`, `MkAccKeysOutput` now take their corresponding address codec instead of using the global SDK config.
@@ -154,7 +167,6 @@ Every module contains its own CHANGELOG.md. Please refer to the module you are i
 * (x/gov/testutil) [#17986](https://github.com/cosmos/cosmos-sdk/pull/18036) `MsgDeposit` has been removed because of AutoCLI migration.
 * (x/staking/testutil) [#17986](https://github.com/cosmos/cosmos-sdk/pull/17986) `MsgRedelegateExec`, `MsgUnbondExec` has been removed because of AutoCLI migration.
 * (x/group) [#17937](https://github.com/cosmos/cosmos-sdk/pull/17937) Groups module was moved to its own go.mod `cosmossdk.io/x/group`
-* (x/slashing) [#18115](https://github.com/cosmos/cosmos-sdk/pull/18115) `NewValidatorSigningInfo` takes strings instead of `sdk.AccAddress`
 * (x/gov) [#18197](https://github.com/cosmos/cosmos-sdk/pull/18197) Gov module was moved to its own go.mod `cosmossdk.io/x/gov`
 * (x/distribution) [#18199](https://github.com/cosmos/cosmos-sdk/pull/18199) Distribution module was moved to its own go.mod `cosmossdk.io/x/distribution`
 * (x/slashing) [#18201](https://github.com/cosmos/cosmos-sdk/pull/18201) Slashing module was moved to its own go.mod `cosmossdk.io/x/slashing`
@@ -163,7 +175,6 @@ Every module contains its own CHANGELOG.md. Please refer to the module you are i
 * (x/authz) [#18265](https://github.com/cosmos/cosmos-sdk/pull/18265) Authz module was moved to its own go.mod `cosmossdk.io/x/authz`
 * (x/mint) [#18283](https://github.com/cosmos/cosmos-sdk/pull/18283) Mint module was moved to its own go.mod `cosmossdk.io/x/mint`
 * (server) [#18303](https://github.com/cosmos/cosmos-sdk/pull/18303) `x/genutil` now handles the application export. `server.AddCommands` does not take an `AppExporter` but instead `genutilcli.Commands` does.
-* (x/auth) [#18351](https://github.com/cosmos/cosmos-sdk/pull/18351) Auth module was moved to its own go.mod `cosmossdk.io/x/auth`
 * (types) [#18372](https://github.com/cosmos/cosmos-sdk/pull/18372) Removed global configuration for coin type and purpose. Setters and getters should be removed and access directly to defined types.
 * (types) [#18607](https://github.com/cosmos/cosmos-sdk/pull/18607) Removed address verifier from global config, moved verifier function to bech32 codec.
 * (types) [#18695](https://github.com/cosmos/cosmos-sdk/pull/18695) Removed global configuration for txEncoder.
@@ -196,7 +207,7 @@ Every module contains its own CHANGELOG.md. Please refer to the module you are i
 * (x/crisis) [#20043](https://github.com/cosmos/cosmos-sdk/pull/20043) Changed `NewMsgVerifyInvariant` to accept a string as argument instead of an `AccAddress`.
 * (x/simulation)[#20056](https://github.com/cosmos/cosmos-sdk/pull/20056) `SimulateFromSeed` now takes an address codec as argument.
 * (server) [#20140](https://github.com/cosmos/cosmos-sdk/pull/20140) Remove embedded grpc-web proxy in favor of standalone grpc-web proxy. [Envoy Proxy](https://www.envoyproxy.io/docs/envoy/latest/start/start)
-* (client) [#20255](https://github.com/cosmos/cosmos-sdk/pull/20255) Use comet proofOp proto type instead of sdk version to avoid needing to translate to later be proven in the merkle proof runtime. 
+* (client) [#20255](https://github.com/cosmos/cosmos-sdk/pull/20255) Use comet proofOp proto type instead of sdk version to avoid needing to translate to later be proven in the merkle proof runtime.
 * (types)[#20369](https://github.com/cosmos/cosmos-sdk/pull/20369) The signature of `HasAminoCodec` has changed to accept a `core/legacy.Amino` interface instead of `codec.LegacyAmino`.
 * (server) [#20422](https://github.com/cosmos/cosmos-sdk/pull/20422) Deprecated `ServerContext`. To get `cmtcfg.Config` from cmd, use `client.GetCometConfigFromCmd(cmd)` instead of `server.GetServerContextFromCmd(cmd).Config`
 * (x/genutil) [#20740](https://github.com/cosmos/cosmos-sdk/pull/20740) Update `genutilcli.Commands` and `genutilcli.CommandsWithCustomMigrationMap` to take the genesis module and abstract the module manager.
@@ -208,7 +219,7 @@ Every module contains its own CHANGELOG.md. Please refer to the module you are i
 
 ### Client Breaking Changes
 
-* (runtime) [#19040](https://github.com/cosmos/cosmos-sdk/pull/19040) Simplify app config implementation and deprecate `/cosmos/app/v1alpha1/config` query. 
+* (runtime) [#19040](https://github.com/cosmos/cosmos-sdk/pull/19040) Simplify app config implementation and deprecate `/cosmos/app/v1alpha1/config` query.
 
 ### CLI Breaking Changes
 
@@ -272,7 +283,7 @@ Every module contains its own CHANGELOG.md. Please refer to the module you are i
 * (types) [#19759](https://github.com/cosmos/cosmos-sdk/pull/19759) Align SignerExtractionAdapter in PriorityNonceMempool Remove.
 * (client) [#19870](https://github.com/cosmos/cosmos-sdk/pull/19870) Add new query command `wait-tx`. Alias `event-query-tx-for` to `wait-tx` for backward compatibility.
 
-### Improvements 
+### Improvements
 
 * (telemetry) [#19903](https://github.com/cosmos/cosmos-sdk/pull/19903) Conditionally emit metrics based on enablement.
     * **Introduction of `Now` Function**: Added a new function called `Now` to the telemetry package. It returns the current system time if telemetry is enabled, or a zero time if telemetry is not enabled.

Makefile

@@ -10,10 +10,7 @@ include scripts/build/build.mk
 
 .DEFAULT_GOAL := help
 
-###############################################################################
-###                          Tools & Dependencies                           ###
-###############################################################################
-
+#? go.sum: Run go mod tidy and ensure dependencies have not been modified
 go.sum: go.mod
 	echo "Ensure dependencies have not been modified ..." >&2
 	go mod verify

README.md

@@ -85,7 +85,6 @@ Module Dependencies are the modules that an application may depend on and which
 
 | Cosmos SDK                  | 0.50.z | 0.52.z |
 | --------------------------- | ------ | ------ |
-| cosmossdk.io/x/auth         | X      | 0.2.z  |
 | cosmossdk.io/x/accounts     | N/A    | 0.2.z  |
 | cosmossdk.io/x/bank         | X      | 0.2.z  |
 | cosmossdk.io/x/circuit      | 0.1.z  | 0.2.z  |