chore: consensus spinout

.github/workflows/test.yml

@@ -1253,3 +1253,34 @@ jobs:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         with:
           projectBaseDir: x/epochs/
+
+  test-x-consensus:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: "1.22"
+          check-latest: true
+          cache: true
+          cache-dependency-path: x/consensus/go.sum
+      - uses: technote-space/get-diff-action@v6.1.2
+        id: git_diff
+        with:
+          PATTERNS: |
+            x/consensus/**/*.go
+            x/consensus/go.mod
+            x/consensus/go.sum
+      - name: tests
+        if: env.GIT_DIFF
+        run: |
+          cd x/consensus
+          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/consensus/

CHANGELOG.md

@@ -62,9 +62,9 @@ Every module contains its own CHANGELOG.md. Please refer to the module you are i
 ### 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.
-  * **Atomic Global Variable**: Implemented an atomic global variable to manage the state of telemetry's enablement. This ensures thread safety for the telemetry state.
-  * **Conditional Telemetry Emission**: All telemetry functions have been updated to emit metrics only when telemetry is enabled. They perform a check with `isTelemetryEnabled()` and return early if telemetry is disabled, minimizing unnecessary operations and overhead.
+    * **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.
+    * **Atomic Global Variable**: Implemented an atomic global variable to manage the state of telemetry's enablement. This ensures thread safety for the telemetry state.
+    * **Conditional Telemetry Emission**: All telemetry functions have been updated to emit metrics only when telemetry is enabled. They perform a check with `isTelemetryEnabled()` and return early if telemetry is disabled, minimizing unnecessary operations and overhead.
 * (types) [#19869](https://github.com/cosmos/cosmos-sdk/pull/19869) Removed `Any` type from `codec/types` and replaced it with an alias for `cosmos/gogoproto/types/any`.
 * (server) [#19854](https://github.com/cosmos/cosmos-sdk/pull/19854) Add customizability to start command.
     * Add `StartCmdOptions` in `server.AddCommands` instead of `servertypes.ModuleInitFlags`. To set custom flags set them in the `StartCmdOptions` struct on the `AddFlags` field.
@@ -179,6 +179,7 @@ Every module contains its own CHANGELOG.md. Please refer to the module you are i
     * Additionally, to reflect this change, the module manager does not take a codec either.
 * (runtime) [#19747](https://github.com/cosmos/cosmos-sdk/pull/19747) `runtime.ValidatorAddressCodec` and `runtime.ConsensusAddressCodec` have been moved to `core`.
 * (baseapp) [#19993](https://github.com/cosmos/cosmos-sdk/pull/19993) Indicate pruning with error code "not found" rather than "invalid request".
+* (x/consensus) [#20010](https://github.com/cosmos/cosmos-sdk/pull/20010) Move consensus module to be its own go.mod
 
 ### Client Breaking Changes
 

Dockerfile

@@ -39,6 +39,7 @@ COPY x/auth/go.mod x/auth/go.sum ./x/auth/
 COPY x/authz/go.mod x/authz/go.sum ./x/authz/
 COPY x/bank/go.mod x/bank/go.sum ./x/bank/
 COPY x/mint/go.mod x/mint/go.sum ./x/mint/
+COPY x/consensus/go.mod x/consensus/go.sum ./x/consensus/
 COPY depinject/go.mod depinject/go.sum ./depinject/
 RUN go mod download
 

client/v2/go.mod

@@ -1,6 +1,6 @@
 module cosmossdk.io/client/v2
 
-go 1.21
+go 1.22.2
 
 require (
 	cosmossdk.io/api v0.7.3
@@ -180,6 +180,7 @@ replace (
 	cosmossdk.io/x/accounts => ./../../x/accounts
 	cosmossdk.io/x/auth => ./../../x/auth
 	cosmossdk.io/x/bank => ./../../x/bank
+	cosmossdk.io/x/consensus => ./../../x/consensus
 	cosmossdk.io/x/distribution => ./../../x/distribution
 	cosmossdk.io/x/gov => ./../../x/gov
 	cosmossdk.io/x/mint => ./../../x/mint

contrib/images/simd-env/Dockerfile

@@ -20,6 +20,7 @@ COPY x/auth/go.mod x/auth/go.sum /work/x/auth/
 COPY x/authz/go.mod x/authz/go.sum /work/x/authz/
 COPY x/bank/go.mod x/bank/go.sum /work/x/bank/
 COPY x/mint/go.mod x/mint/go.sum /work/x/mint/
+COPY x/consensus/go.mod x/consensus/go.sum /work/x/consensus/
 COPY x/accounts/go.mod x/accounts/go.sum /work/x/accounts/
 RUN go mod download
 

go.mod

@@ -1,4 +1,4 @@
-go 1.21
+go 1.22.2
 
 module github.com/cosmos/cosmos-sdk
 
@@ -14,6 +14,7 @@ require (
 	cosmossdk.io/x/accounts v0.0.0-00010101000000-000000000000
 	cosmossdk.io/x/auth v0.0.0-00010101000000-000000000000
 	cosmossdk.io/x/bank v0.0.0-00010101000000-000000000000
+	cosmossdk.io/x/consensus v0.0.0-00010101000000-000000000000
 	cosmossdk.io/x/staking v0.0.0-00010101000000-000000000000
 	cosmossdk.io/x/tx v0.13.1
 	github.com/99designs/keyring v1.2.2
@@ -31,7 +32,6 @@ require (
 	github.com/golang/mock v1.6.0
 	github.com/golang/protobuf v1.5.4
 	github.com/google/go-cmp v0.6.0
-	github.com/google/gofuzz v1.2.0
 	github.com/gorilla/handlers v1.5.2
 	github.com/gorilla/mux v1.8.1
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
@@ -186,6 +186,7 @@ replace (
 	cosmossdk.io/x/accounts => ./x/accounts
 	cosmossdk.io/x/auth => ./x/auth
 	cosmossdk.io/x/bank => ./x/bank
+	cosmossdk.io/x/consensus => ./x/consensus
 	cosmossdk.io/x/staking => ./x/staking
 )
 

proto/cosmos/consensus/v1/consensus.proto

@@ -4,7 +4,7 @@
 
 import "tendermint/types/params.proto";
 
-option go_package = "github.com/cosmos/cosmos-sdk/x/consensus/types";
+option go_package = "cosmossdk.io/x/consensus/types";
 
 // ConsensusMsgParams is the Msg/Params request type. This is a consensus message that is sent from cometbft.
 message ConsensusMsgParams {

simapp/app.go

@@ -47,6 +47,9 @@ import (
 	"cosmossdk.io/x/circuit"
 	circuitkeeper "cosmossdk.io/x/circuit/keeper"
 	circuittypes "cosmossdk.io/x/circuit/types"
+	"cosmossdk.io/x/consensus"
+	consensusparamkeeper "cosmossdk.io/x/consensus/keeper"
+	consensusparamtypes "cosmossdk.io/x/consensus/types"
 	distr "cosmossdk.io/x/distribution"
 	distrkeeper "cosmossdk.io/x/distribution/keeper"
 	distrtypes "cosmossdk.io/x/distribution/types"
@@ -107,9 +110,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/msgservice"
 	sigtypes "github.com/cosmos/cosmos-sdk/types/tx/signing"
 	"github.com/cosmos/cosmos-sdk/version"
-	"github.com/cosmos/cosmos-sdk/x/consensus"
-	consensusparamkeeper "github.com/cosmos/cosmos-sdk/x/consensus/keeper"
-	consensusparamtypes "github.com/cosmos/cosmos-sdk/x/consensus/types"
 	"github.com/cosmos/cosmos-sdk/x/genutil"
 	genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
 )

simapp/app_config.go

@@ -31,7 +31,6 @@ import (
 	vestingmodulev1 "cosmossdk.io/api/cosmos/vesting/module/v1"
 	"cosmossdk.io/depinject/appconfig"
 	"cosmossdk.io/x/accounts"
-	_ "cosmossdk.io/x/accounts"       // import for side-effects
 	_ "cosmossdk.io/x/auth/tx/config" // import for side-effects
 	authtypes "cosmossdk.io/x/auth/types"
 	_ "cosmossdk.io/x/auth/vesting" // import for side-effects
@@ -42,6 +41,8 @@ import (
 	banktypes "cosmossdk.io/x/bank/types"
 	_ "cosmossdk.io/x/circuit" // import for side-effects
 	circuittypes "cosmossdk.io/x/circuit/types"
+	_ "cosmossdk.io/x/consensus" // import for side-effects
+	consensustypes "cosmossdk.io/x/consensus/types"
 	_ "cosmossdk.io/x/distribution" // import for side-effects
 	distrtypes "cosmossdk.io/x/distribution/types"
 	_ "cosmossdk.io/x/epochs" // import for side-effects
@@ -68,8 +69,6 @@ import (
 	upgradetypes "cosmossdk.io/x/upgrade/types"
 
 	"github.com/cosmos/cosmos-sdk/runtime"
-	_ "github.com/cosmos/cosmos-sdk/x/consensus" // import for side-effects
-	consensustypes "github.com/cosmos/cosmos-sdk/x/consensus/types"
 	genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
 )
 

simapp/app_di.go

@@ -25,6 +25,7 @@ import (
 	authzkeeper "cosmossdk.io/x/authz/keeper"
 	bankkeeper "cosmossdk.io/x/bank/keeper"
 	circuitkeeper "cosmossdk.io/x/circuit/keeper"
+	consensuskeeper "cosmossdk.io/x/consensus/keeper"
 	distrkeeper "cosmossdk.io/x/distribution/keeper"
 	epochskeeper "cosmossdk.io/x/epochs/keeper"
 	evidencekeeper "cosmossdk.io/x/evidence/keeper"
@@ -51,7 +52,6 @@ import (
 	servertypes "github.com/cosmos/cosmos-sdk/server/types"
 	testdata_pulsar "github.com/cosmos/cosmos-sdk/testutil/testdata/testpb"
 	"github.com/cosmos/cosmos-sdk/types/module"
-	consensuskeeper "github.com/cosmos/cosmos-sdk/x/consensus/keeper"
 )
 
 // DefaultNodeHome default home directories for the application daemon
@@ -306,7 +306,7 @@ func NewSimApp(
 	return app
 }
 
-// overwritte default ante handlers with custom ante handlers
+// overwrite default ante handlers with custom ante handlers
 // set SkipAnteHandler to true in app config and set custom ante handler on baseapp
 func (app *SimApp) setCustomAnteHandler() {
 	anteHandler, err := NewAnteHandler(

simapp/go.mod

@@ -1,6 +1,6 @@
 module cosmossdk.io/simapp
 
-go 1.22
+go 1.22.2
 
 require (
 	cosmossdk.io/api v0.7.3
@@ -45,6 +45,8 @@ require (
 	google.golang.org/protobuf v1.33.0
 )
 
+require cosmossdk.io/x/consensus v0.0.0-00010101000000-000000000000
+
 require (
 	buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.32.0-20240130113600-88ef6483f90f.1 // indirect
 	buf.build/gen/go/tendermint/tendermint/protocolbuffers/go v1.32.0-20231117195010-33ed361a9051.1 // indirect
@@ -246,6 +248,7 @@ replace (
 	cosmossdk.io/x/authz => ../x/authz
 	cosmossdk.io/x/bank => ../x/bank
 	cosmossdk.io/x/circuit => ../x/circuit
+	cosmossdk.io/x/consensus => ../x/consensus
 	cosmossdk.io/x/distribution => ../x/distribution
 	cosmossdk.io/x/epochs => ../x/epochs
 	cosmossdk.io/x/evidence => ../x/evidence

simapp/upgrades.go

@@ -8,6 +8,7 @@ import (
 	epochstypes "cosmossdk.io/x/epochs/types"
 	protocolpooltypes "cosmossdk.io/x/protocolpool/types"
 	upgradetypes "cosmossdk.io/x/upgrade/types"
+
 	"github.com/cosmos/cosmos-sdk/types/module"
 	crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types"
 )

store/db/db.go

@@ -10,9 +10,9 @@ type RawDBType string
 
 const (
 	DBTypeGoLevelDB RawDBType = "goleveldb"
-	DBTypeRocksDB             = "rocksdb"
-	DBTypePebbleDB            = "pebbledb"
-	DBTypePrefixDB            = "prefixdb"
+	DBTypeRocksDB   RawDBType = "rocksdb"
+	DBTypePebbleDB  RawDBType = "pebbledb"
+	DBTypePrefixDB  RawDBType = "prefixdb"
 
 	DBFileSuffix string = ".db"
 )

store/db/rocksdb_noflag.go

@@ -82,7 +82,3 @@ func (itr *rocksDBIterator) Error() error {
 func (itr *rocksDBIterator) Close() error {
 	panic("rocksdb must be built with -tags rocksdb")
 }
-
-func (itr *rocksDBIterator) assertIsValid() {
-	panic("rocksdb must be built with -tags rocksdb")
-}

tests/e2e/baseapp/utils.go

@@ -13,6 +13,7 @@ import (
 	authtypes "cosmossdk.io/x/auth/types"
 	_ "cosmossdk.io/x/bank"
 	banktypes "cosmossdk.io/x/bank/types"
+	_ "cosmossdk.io/x/consensus"
 	_ "cosmossdk.io/x/staking"
 
 	"github.com/cosmos/cosmos-sdk/codec"
@@ -21,7 +22,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/testutil/mock"
 	simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	_ "github.com/cosmos/cosmos-sdk/x/consensus"
 )
 
 // GenesisStateWithSingleValidator initializes GenesisState with a single validator and genesis accounts

tests/go.mod

@@ -1,8 +1,6 @@
 module github.com/cosmos/cosmos-sdk/tests
 
-go 1.22
-
-toolchain go1.22.0
+go 1.22.2
 
 require (
 	cosmossdk.io/api v0.7.3
@@ -40,13 +38,15 @@ require (
 	cosmossdk.io/x/auth v0.0.0-20240226161501-23359a0b6d91
 	cosmossdk.io/x/authz v0.0.0-00010101000000-000000000000
 	cosmossdk.io/x/bank v0.0.0-20240226161501-23359a0b6d91
+	cosmossdk.io/x/consensus v0.0.0-00010101000000-000000000000
 	cosmossdk.io/x/distribution v0.0.0-20240227221813-a248d05f70f4
 	cosmossdk.io/x/gov v0.0.0-20231113122742-912390d5fc4a
 	cosmossdk.io/x/group v0.0.0-00010101000000-000000000000
 	cosmossdk.io/x/mint v0.0.0-00010101000000-000000000000
 	cosmossdk.io/x/slashing v0.0.0-00010101000000-000000000000
 	cosmossdk.io/x/staking v0.0.0-20240226161501-23359a0b6d91
 	github.com/google/go-cmp v0.6.0
+	github.com/google/gofuzz v1.2.0
 	github.com/jhump/protoreflect v1.15.6
 )
 
@@ -242,6 +242,7 @@ replace (
 	cosmossdk.io/x/authz => ../x/authz
 	cosmossdk.io/x/bank => ../x/bank
 	cosmossdk.io/x/circuit => ../x/circuit
+	cosmossdk.io/x/consensus => ../x/consensus
 	cosmossdk.io/x/distribution => ../x/distribution
 	cosmossdk.io/x/epochs => ../x/epochs
 	cosmossdk.io/x/evidence => ../x/evidence

tests/integration/auth/keeper/msg_server_test.go

@@ -17,10 +17,8 @@ import (
 	"cosmossdk.io/x/auth"
 	authkeeper "cosmossdk.io/x/auth/keeper"
 	authsims "cosmossdk.io/x/auth/simulation"
-	"cosmossdk.io/x/auth/types"
 	authtypes "cosmossdk.io/x/auth/types"
 	"cosmossdk.io/x/bank"
-	"cosmossdk.io/x/bank/keeper"
 	bankkeeper "cosmossdk.io/x/bank/keeper"
 	"cosmossdk.io/x/bank/testutil"
 	banktypes "cosmossdk.io/x/bank/types"
@@ -109,7 +107,7 @@ func initFixture(t *testing.T) *fixture {
 	blockedAddresses := map[string]bool{
 		authKeeper.GetAuthority(): false,
 	}
-	bankKeeper := keeper.NewBaseKeeper(
+	bankKeeper := bankkeeper.NewBaseKeeper(
 		runtime.NewEnvironment(runtime.NewKVStoreService(keys[banktypes.StoreKey]), log.NewNopLogger()),
 		cdc,
 		authKeeper,
@@ -187,13 +185,13 @@ func TestAsyncExec(t *testing.T) {
 
 	testCases := []struct {
 		name      string
-		req       *types.MsgNonAtomicExec
+		req       *authtypes.MsgNonAtomicExec
 		expectErr bool
 		expErrMsg string
 	}{
 		{
 			name: "empty signer address",
-			req: &types.MsgNonAtomicExec{
+			req: &authtypes.MsgNonAtomicExec{
 				Signer: "",
 				Msgs:   []*codectypes.Any{},
 			},
@@ -202,7 +200,7 @@ func TestAsyncExec(t *testing.T) {
 		},
 		{
 			name: "invalid signer address",
-			req: &types.MsgNonAtomicExec{
+			req: &authtypes.MsgNonAtomicExec{
 				Signer: "invalid",
 				Msgs:   []*codectypes.Any{},
 			},
@@ -211,7 +209,7 @@ func TestAsyncExec(t *testing.T) {
 		},
 		{
 			name: "empty msgs",
-			req: &types.MsgNonAtomicExec{
+			req: &authtypes.MsgNonAtomicExec{
 				Signer: addrs[0].String(),
 				Msgs:   []*codectypes.Any{},
 			},
@@ -220,23 +218,23 @@ func TestAsyncExec(t *testing.T) {
 		},
 		{
 			name: "valid msg",
-			req: &types.MsgNonAtomicExec{
+			req: &authtypes.MsgNonAtomicExec{
 				Signer: addrs[0].String(),
 				Msgs:   []*codectypes.Any{msgAny},
 			},
 			expectErr: false,
 		},
 		{
 			name: "multiple messages being executed",
-			req: &types.MsgNonAtomicExec{
+			req: &authtypes.MsgNonAtomicExec{
 				Signer: addrs[0].String(),
 				Msgs:   []*codectypes.Any{msgAny, msgAny},
 			},
 			expectErr: false,
 		},
 		{
 			name: "multiple messages with different signers",
-			req: &types.MsgNonAtomicExec{
+			req: &authtypes.MsgNonAtomicExec{
 				Signer: addrs[0].String(),
 				Msgs:   []*codectypes.Any{msgAny, msgAny2},
 			},
@@ -245,7 +243,7 @@ func TestAsyncExec(t *testing.T) {
 		},
 		{
 			name: "multi msg with one failing being executed",
-			req: &types.MsgNonAtomicExec{
+			req: &authtypes.MsgNonAtomicExec{
 				Signer: addrs[0].String(),
 				Msgs:   []*codectypes.Any{msgAny, failingMsgAny},
 			},