fix

CHANGELOG.md

@@ -96,6 +96,7 @@ Every module contains its own CHANGELOG.md. Please refer to the module you are i
 
 ### API Breaking Changes
 
+* (x/consensus) [#19488](https://github.com/cosmos/cosmos-sdk/pull/19488) Consensus module creation takes `appmodule.Environment` instead of individual services.
 * (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/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.

CONTRIBUTING.md

@@ -62,14 +62,14 @@ The Cosmos SDK has many stakeholders contributing and shaping the project. The C
 
 The developers work in sprints, which are available in a [GitHub Project](https://github.com/orgs/cosmos/projects/26/views/22). The current EPICs are pinned at the top of the [issues list](https://github.com/cosmos/cosmos-sdk/issues).
 
-The important development announcements are shared on [Discord](https://discord.com/invite/cosmosnetwork) in the `#dev-announcements` channel.
+The important development announcements are shared on [Discord](https://discord.gg/interchain) in the `#dev-announcements` channel.
 
 To synchronize we have few major meetings:
 
 * Cosmos SDK Sprint Review on Monday and Thursday at 14:00 UTC (limited participation to core devs).
 * Cosmos SDK Community Call on Thursday at 16:00 UTC.
 
-If you would like to join one of the community call, then please contact us on [Discord](https://discord.com/invite/cosmosnetwork) or reach out directly to Marko (@tac0turtle).
+If you would like to join one of the community call, then please contact us on [Discord](https://discord.gg/interchain) or reach out directly to Marko (@tac0turtle).
 
 ## Architecture Decision Records (ADR)
 

Dockerfile

@@ -28,6 +28,7 @@ COPY api/go.mod api/go.sum ./api/
 COPY core/go.mod core/go.sum ./core/
 COPY collections/go.mod collections/go.sum ./collections/
 COPY store/go.mod store/go.sum ./store/
+COPY x/accounts/go.mod x/accounts/go.sum ./x/accounts/
 COPY x/tx/go.mod x/tx/go.sum /x/tx/
 COPY x/protocolpool/go.mod x/protocolpool/go.sum ./x/protocolpool/
 COPY x/gov/go.mod x/gov/go.sum ./x/gov/

Makefile

@@ -445,42 +445,9 @@ proto-lint:
 proto-check-breaking:
 	@$(protoImage) buf breaking --against $(HTTPS_GIT)#branch=main
 
-CMT_URL              = https://raw.githubusercontent.com/cometbft/cometbft/v0.38.0/proto/tendermint
-
-CMT_CRYPTO_TYPES     = proto/tendermint/crypto
-CMT_ABCI_TYPES       = proto/tendermint/abci
-CMT_TYPES            = proto/tendermint/types
-CMT_VERSION          = proto/tendermint/version
-CMT_LIBS             = proto/tendermint/libs/bits
-CMT_P2P              = proto/tendermint/p2p
-
 #? proto-update-deps: Update protobuf dependencies
 proto-update-deps:
 	@echo "Updating Protobuf dependencies"
-
-	@mkdir -p $(CMT_ABCI_TYPES)
-	@curl -sSL $(CMT_URL)/abci/types.proto > $(CMT_ABCI_TYPES)/types.proto
-
-	@mkdir -p $(CMT_VERSION)
-	@curl -sSL $(CMT_URL)/version/types.proto > $(CMT_VERSION)/types.proto
-
-	@mkdir -p $(CMT_TYPES)
-	@curl -sSL $(CMT_URL)/types/types.proto > $(CMT_TYPES)/types.proto
-	@curl -sSL $(CMT_URL)/types/evidence.proto > $(CMT_TYPES)/evidence.proto
-	@curl -sSL $(CMT_URL)/types/params.proto > $(CMT_TYPES)/params.proto
-	@curl -sSL $(CMT_URL)/types/validator.proto > $(CMT_TYPES)/validator.proto
-	@curl -sSL $(CMT_URL)/types/block.proto > $(CMT_TYPES)/block.proto
-
-	@mkdir -p $(CMT_CRYPTO_TYPES)
-	@curl -sSL $(CMT_URL)/crypto/proof.proto > $(CMT_CRYPTO_TYPES)/proof.proto
-	@curl -sSL $(CMT_URL)/crypto/keys.proto > $(CMT_CRYPTO_TYPES)/keys.proto
-
-	@mkdir -p $(CMT_LIBS)
-	@curl -sSL $(CMT_URL)/libs/bits/types.proto > $(CMT_LIBS)/types.proto
-
-	@mkdir -p $(CMT_P2P)
-	@curl -sSL $(CMT_URL)/p2p/types.proto > $(CMT_P2P)/types.proto
-
 	$(DOCKER) run --rm -v $(CURDIR)/proto:/workspace --workdir /workspace $(protoImageName) buf mod update
 
 .PHONY: proto-all proto-gen proto-swagger-gen proto-format proto-lint proto-check-breaking proto-update-deps

README.md

@@ -22,7 +22,7 @@
   </a>
 </div>
 <div align="center">
-  <a href="https://discord.gg/cosmosnetwork">
+  <a href="https://discord.gg/interchain">
     <img alt="Discord" src="https://img.shields.io/discord/669268347736686612.svg" />
   </a>
   <a href="https://sourcegraph.com/github.com/cosmos/cosmos-sdk?badge">
@@ -49,7 +49,7 @@ For more information, see the [Cosmos SDK Documentation](https://docs.cosmos.net
 ## Contributing
 
 See [CONTRIBUTING.md](./CONTRIBUTING.md) for details on how to contribute and participate in our [dev calls](./CONTRIBUTING.md#teams-dev-calls).
-If you want to follow the updates or learn more about the latest design then join our [Discord](https://discord.gg/cosmosnetwork).
+If you want to follow the updates or learn more about the latest design then join our [Discord](https://discord.gg/interchain).
 
 ## Tools and Frameworks
 

UPGRADING.md

@@ -40,7 +40,7 @@ Refer to SimApp `root_v2.go` and `root.go` for an example with an app v2 and a l
 Circuit Breaker is used as an example. 
 
 ```go
-app.CircuitKeeper = circuitkeeper.NewKeeper(runtime.NewEnvironment((keys[circuittypes.StoreKey]), nil), appCodec, authtypes.NewModuleAddress(govtypes.ModuleName).String(), app.AuthKeeper.AddressCodec())
+app.CircuitKeeper = circuitkeeper.NewKeeper(runtime.NewEnvironment((keys[circuittypes.StoreKey])), appCodec, authtypes.NewModuleAddress(govtypes.ModuleName).String(), app.AuthKeeper.AddressCodec())
 ```
 
 #### Unordered Transactions
@@ -118,13 +118,20 @@ used as a TTL for the transaction and is used to provide replay protection. See
 [ADR-070](https://github.com/cosmos/cosmos-sdk/blob/main/docs/architecture/adr-070-unordered-transactions.md)
 for more details.
 
+### Protobuf
+
+The `cosmossdk.io/api/tendermint` package has been removed as CometBFT now publishes its protos to `buf.build/tendermint` and `buf.build/cometbft`.
+There is no longer a need for the Cosmos SDK to host these protos for itself and its dependencies.
+That package containing proto v2 generated code, but the SDK now uses [buf generated go SDK instead](https://buf.build/docs/bsr/generated-sdks/go).
+If you were depending on `cosmossdk.io/api/tendermint`, please use the buf generated go SDK instead, or ask CometBFT host the generated proto v2 code.
+
 ### Modules
 
 #### `**all**`
 
 ##### Params
 
-Old module migrations have been removed. It is required to migrate to v0.50 prior to upgrading to v0.51 for not missing any module migrations.
+Previous module migrations have been removed. It is required to migrate to v0.50 prior to upgrading to v0.51 for not missing any module migrations.
 
 ##### Core API
 
@@ -161,7 +168,6 @@ For modules that have migrated, verify you are checking against `collections.Err
 
 Auth was spun out into its own `go.mod`. To import it use `cosmossdk.io/x/auth`
 
-
 #### `x/authz`
 
 Authz was spun out into its own `go.mod`. To import it use `cosmossdk.io/x/authz`
@@ -196,14 +202,13 @@ Slashing was spun out into its own `go.mod`. To import it use `cosmossdk.io/x/sl
 
 Staking was spun out into its own `go.mod`. To import it use `cosmossdk.io/x/staking`
 
-
 #### `x/params`
 
 A standalone Go module was created and it is accessible at "cosmossdk.io/x/params".
 
 #### `x/protocolpool`
 
-Introducing a new `x/protocolpool` module to handle community pool funds. Its store must be added while upgrading to v0.51.x
+Introducing a new `x/protocolpool` module to handle community pool funds. Its store must be added while upgrading to v0.51.x.
 
 Example: