feat!: Introduce Partial Set Security

.changelog/unreleased/api-breaking/provider/1732-assigning-already-assigned-key-fix.md

@@ -0,0 +1,2 @@
+- Assigning a key that is already assigned by the same validator will now be a no-op instead of throwing an error.
+  ([\#1732](https://github.com/cosmos/interchain-security/pull/1732))

.changelog/unreleased/features/1809-pss.md

@@ -0,0 +1,3 @@
+- Adding the Partial Set Security (PSS) feature cf. [ADR 015](https://cosmos.github.io/interchain-security/adrs/adr-015-partial-set-security).
+  PSS enables consumer chains to join ICS as _Top N_ or _Opt In_ chains and enables validators to opt to validate the consumer chains they want.
+  ([\#1809](https://github.com/cosmos/interchain-security/pull/1809))

.changelog/unreleased/features/provider/1587-enable-opt-in-chains-through-gov-proposals.md

@@ -0,0 +1,2 @@
+- Enable Opt In and Top N chains through gov proposals.
+  ([\#1587](https://github.com/cosmos/interchain-security/pull/1587))

.changelog/unreleased/state-breaking/1809-pss.md

@@ -0,0 +1,2 @@
+- Adding the Partial Set Security feature cf. [ADR 015](https://cosmos.github.io/interchain-security/adrs/adr-015-partial-set-security).
+  ([\#1809](https://github.com/cosmos/interchain-security/pull/1809))

.changelog/unreleased/state-breaking/provider/1587-enable-opt-in-chains-through-gov-proposals.md

@@ -0,0 +1,2 @@
+- Enable Opt In and Top N chains through gov proposals.
+  ([\#1587](https://github.com/cosmos/interchain-security/pull/1587))

.changelog/unreleased/state-breaking/provider/1732-assigning-already-assigned-key-fix.md

@@ -0,0 +1,2 @@
+- Assigning a key that is already assigned by the same validator will now be a no-op instead of throwing an error.
+  ([\#1732](https://github.com/cosmos/interchain-security/pull/1732))

app/consumer-democracy/ante/forbidden_proposals_ante_test.go

@@ -14,8 +14,8 @@ import (
 	minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
 	"github.com/cosmos/cosmos-sdk/x/params/types/proposal"
 
-	app "github.com/cosmos/interchain-security/v4/app/consumer-democracy"
-	"github.com/cosmos/interchain-security/v4/app/consumer-democracy/ante"
+	app "github.com/cosmos/interchain-security/v5/app/consumer-democracy"
+	"github.com/cosmos/interchain-security/v5/app/consumer-democracy/ante"
 )
 
 // in SDKv47 parameter updates full params object is required

app/consumer-democracy/ante_handler.go

@@ -10,9 +10,9 @@ import (
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	"github.com/cosmos/cosmos-sdk/x/auth/ante"
 
-	democracyante "github.com/cosmos/interchain-security/v4/app/consumer-democracy/ante"
-	consumerante "github.com/cosmos/interchain-security/v4/app/consumer/ante"
-	ibcconsumerkeeper "github.com/cosmos/interchain-security/v4/x/ccv/consumer/keeper"
+	democracyante "github.com/cosmos/interchain-security/v5/app/consumer-democracy/ante"
+	consumerante "github.com/cosmos/interchain-security/v5/app/consumer/ante"
+	ibcconsumerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/consumer/keeper"
 )
 
 // HandlerOptions extend the SDK's AnteHandler options by requiring the IBC

app/consumer-democracy/app.go

@@ -103,14 +103,14 @@ import (
 	"github.com/cometbft/cometbft/libs/log"
 	tmos "github.com/cometbft/cometbft/libs/os"
 
-	appencoding "github.com/cosmos/interchain-security/v4/app/encoding"
-	testutil "github.com/cosmos/interchain-security/v4/testutil/integration"
-	consumer "github.com/cosmos/interchain-security/v4/x/ccv/consumer"
-	consumerkeeper "github.com/cosmos/interchain-security/v4/x/ccv/consumer/keeper"
-	consumertypes "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types"
-	ccvdistr "github.com/cosmos/interchain-security/v4/x/ccv/democracy/distribution"
-	ccvgov "github.com/cosmos/interchain-security/v4/x/ccv/democracy/governance"
-	ccvstaking "github.com/cosmos/interchain-security/v4/x/ccv/democracy/staking"
+	appencoding "github.com/cosmos/interchain-security/v5/app/encoding"
+	testutil "github.com/cosmos/interchain-security/v5/testutil/integration"
+	consumer "github.com/cosmos/interchain-security/v5/x/ccv/consumer"
+	consumerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/consumer/keeper"
+	consumertypes "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types"
+	ccvdistr "github.com/cosmos/interchain-security/v5/x/ccv/democracy/distribution"
+	ccvgov "github.com/cosmos/interchain-security/v5/x/ccv/democracy/governance"
+	ccvstaking "github.com/cosmos/interchain-security/v5/x/ccv/democracy/staking"
 )
 
 const (

app/consumer-democracy/proposals_whitelisting_test.go

@@ -6,9 +6,9 @@ import (
 	ibctesting "github.com/cosmos/ibc-go/v7/testing"
 	"github.com/stretchr/testify/require"
 
-	appConsumer "github.com/cosmos/interchain-security/v4/app/consumer-democracy"
-	icstestingutils "github.com/cosmos/interchain-security/v4/testutil/ibc_testing"
-	testutil "github.com/cosmos/interchain-security/v4/testutil/integration"
+	appConsumer "github.com/cosmos/interchain-security/v5/app/consumer-democracy"
+	icstestingutils "github.com/cosmos/interchain-security/v5/testutil/ibc_testing"
+	testutil "github.com/cosmos/interchain-security/v5/testutil/integration"
 )
 
 func TestDemocracyGovernanceWhitelistingKeys(t *testing.T) {

app/consumer/ante/disabled_modules_ante_test.go

@@ -12,8 +12,8 @@ import (
 	evidencetypes "github.com/cosmos/cosmos-sdk/x/evidence/types"
 	slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
 
-	"github.com/cosmos/interchain-security/v4/app/consumer/ante"
-	appencoding "github.com/cosmos/interchain-security/v4/app/encoding"
+	"github.com/cosmos/interchain-security/v5/app/consumer/ante"
+	appencoding "github.com/cosmos/interchain-security/v5/app/encoding"
 )
 
 func TestDisabledModulesDecorator(t *testing.T) {

app/consumer/ante/msg_filter_ante_test.go

@@ -9,8 +9,8 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 
-	"github.com/cosmos/interchain-security/v4/app/consumer/ante"
-	appencoding "github.com/cosmos/interchain-security/v4/app/encoding"
+	"github.com/cosmos/interchain-security/v5/app/consumer/ante"
+	appencoding "github.com/cosmos/interchain-security/v5/app/encoding"
 )
 
 type consumerKeeper struct {

app/consumer/ante_handler.go

@@ -10,8 +10,8 @@ import (
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	"github.com/cosmos/cosmos-sdk/x/auth/ante"
 
-	consumerante "github.com/cosmos/interchain-security/v4/app/consumer/ante"
-	ibcconsumerkeeper "github.com/cosmos/interchain-security/v4/x/ccv/consumer/keeper"
+	consumerante "github.com/cosmos/interchain-security/v5/app/consumer/ante"
+	ibcconsumerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/consumer/keeper"
 )
 
 // HandlerOptions extend the SDK's AnteHandler options by requiring the IBC

app/consumer/app.go

@@ -87,11 +87,11 @@ import (
 	"github.com/cometbft/cometbft/libs/log"
 	tmos "github.com/cometbft/cometbft/libs/os"
 
-	appencoding "github.com/cosmos/interchain-security/v4/app/encoding"
-	testutil "github.com/cosmos/interchain-security/v4/testutil/integration"
-	ibcconsumer "github.com/cosmos/interchain-security/v4/x/ccv/consumer"
-	ibcconsumerkeeper "github.com/cosmos/interchain-security/v4/x/ccv/consumer/keeper"
-	ibcconsumertypes "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types"
+	appencoding "github.com/cosmos/interchain-security/v5/app/encoding"
+	testutil "github.com/cosmos/interchain-security/v5/testutil/integration"
+	ibcconsumer "github.com/cosmos/interchain-security/v5/x/ccv/consumer"
+	ibcconsumerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/consumer/keeper"
+	ibcconsumertypes "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types"
 )
 
 const (

app/consumer/genesis.go

@@ -16,8 +16,8 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/version"
 
-	consumerTypes "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types"
-	"github.com/cosmos/interchain-security/v4/x/ccv/types"
+	consumerTypes "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types"
+	"github.com/cosmos/interchain-security/v5/x/ccv/types"
 )
 
 // The genesis state of the blockchain is represented here as a map of raw json

app/consumer/genesis_test.go

@@ -16,9 +16,9 @@ import (
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/x/auth/types"
 
-	app "github.com/cosmos/interchain-security/v4/app/consumer"
-	consumerTypes "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types"
-	ccvtypes "github.com/cosmos/interchain-security/v4/x/ccv/types"
+	app "github.com/cosmos/interchain-security/v5/app/consumer"
+	consumerTypes "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types"
+	ccvtypes "github.com/cosmos/interchain-security/v5/x/ccv/types"
 )
 
 const (

app/provider/app.go

@@ -100,12 +100,13 @@ import (
 	"github.com/cometbft/cometbft/libs/log"
 	tmos "github.com/cometbft/cometbft/libs/os"
 
-	appencoding "github.com/cosmos/interchain-security/v4/app/encoding"
-	testutil "github.com/cosmos/interchain-security/v4/testutil/integration"
-	ibcprovider "github.com/cosmos/interchain-security/v4/x/ccv/provider"
-	ibcproviderclient "github.com/cosmos/interchain-security/v4/x/ccv/provider/client"
-	ibcproviderkeeper "github.com/cosmos/interchain-security/v4/x/ccv/provider/keeper"
-	providertypes "github.com/cosmos/interchain-security/v4/x/ccv/provider/types"
+	appencoding "github.com/cosmos/interchain-security/v5/app/encoding"
+	testutil "github.com/cosmos/interchain-security/v5/testutil/integration"
+	"github.com/cosmos/interchain-security/v5/x/ccv/provider"
+	ibcprovider "github.com/cosmos/interchain-security/v5/x/ccv/provider"
+	ibcproviderclient "github.com/cosmos/interchain-security/v5/x/ccv/provider/client"
+	ibcproviderkeeper "github.com/cosmos/interchain-security/v5/x/ccv/provider/keeper"
+	providertypes "github.com/cosmos/interchain-security/v5/x/ccv/provider/types"
 )
 
 const (
@@ -470,12 +471,15 @@ func New(
 		app.BankKeeper,
 		scopedTransferKeeper,
 	)
-	transferModule := transfer.NewAppModule(app.TransferKeeper)
-	ibcmodule := transfer.NewIBCModule(app.TransferKeeper)
+
+	// Add an IBC middleware callback to track the consumer rewards
+	var transferStack porttypes.IBCModule
+	transferStack = transfer.NewIBCModule(app.TransferKeeper)
+	transferStack = provider.NewIBCMiddleware(transferStack, app.ProviderKeeper)
 
 	// create static IBC router, add transfer route, then set and seal it
 	ibcRouter := porttypes.NewRouter()
-	ibcRouter.AddRoute(ibctransfertypes.ModuleName, ibcmodule)
+	ibcRouter.AddRoute(ibctransfertypes.ModuleName, transferStack)
 	ibcRouter.AddRoute(providertypes.ModuleName, providerModule)
 	app.IBCKeeper.SetRouter(ibcRouter)
 
@@ -514,7 +518,7 @@ func New(
 		evidence.NewAppModule(app.EvidenceKeeper),
 		ibc.NewAppModule(app.IBCKeeper),
 		params.NewAppModule(app.ParamsKeeper),
-		transferModule,
+		transfer.NewAppModule(app.TransferKeeper),
 		providerModule,
 	)
 
@@ -610,7 +614,7 @@ func New(
 		params.NewAppModule(app.ParamsKeeper),
 		evidence.NewAppModule(app.EvidenceKeeper),
 		ibc.NewAppModule(app.IBCKeeper),
-		transferModule,
+		transfer.NewAppModule(app.TransferKeeper),
 	)
 
 	app.sm.RegisterStoreDecoders()

app/sovereign/app.go

@@ -79,6 +79,7 @@ import (
 	govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 	govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
+
 	// add mint
 	mint "github.com/cosmos/cosmos-sdk/x/mint"
 	mintkeeper "github.com/cosmos/cosmos-sdk/x/mint/keeper"
@@ -105,8 +106,8 @@ import (
 	"github.com/cometbft/cometbft/libs/log"
 	tmos "github.com/cometbft/cometbft/libs/os"
 
-	appencoding "github.com/cosmos/interchain-security/v4/app/encoding"
-	testutil "github.com/cosmos/interchain-security/v4/testutil/integration"
+	appencoding "github.com/cosmos/interchain-security/v5/app/encoding"
+	testutil "github.com/cosmos/interchain-security/v5/testutil/integration"
 )
 
 const (

cmd/interchain-security-cd/cmd/root.go

@@ -31,8 +31,8 @@ import (
 	tmcfg "github.com/cometbft/cometbft/config"
 	"github.com/cometbft/cometbft/libs/log"
 
-	consumer "github.com/cosmos/interchain-security/v4/app/consumer"
-	appencoding "github.com/cosmos/interchain-security/v4/app/encoding"
+	consumer "github.com/cosmos/interchain-security/v5/app/consumer"
+	appencoding "github.com/cosmos/interchain-security/v5/app/encoding"
 )
 
 // NewRootCmd creates a new root command for simd. It is called once in the

cmd/interchain-security-cd/main.go

@@ -6,9 +6,9 @@ import (
 	"github.com/cosmos/cosmos-sdk/server"
 	svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
 
-	app "github.com/cosmos/interchain-security/v4/app/consumer"
-	appparams "github.com/cosmos/interchain-security/v4/app/params"
-	"github.com/cosmos/interchain-security/v4/cmd/interchain-security-cd/cmd"
+	app "github.com/cosmos/interchain-security/v5/app/consumer"
+	appparams "github.com/cosmos/interchain-security/v5/app/params"
+	"github.com/cosmos/interchain-security/v5/cmd/interchain-security-cd/cmd"
 )
 
 func main() {

cmd/interchain-security-cdd/cmd/root.go

@@ -31,8 +31,8 @@ import (
 	tmcfg "github.com/cometbft/cometbft/config"
 	"github.com/cometbft/cometbft/libs/log"
 
-	cdd "github.com/cosmos/interchain-security/v4/app/consumer-democracy"
-	appencoding "github.com/cosmos/interchain-security/v4/app/encoding"
+	cdd "github.com/cosmos/interchain-security/v5/app/consumer-democracy"
+	appencoding "github.com/cosmos/interchain-security/v5/app/encoding"
 )
 
 // NewRootCmd creates a new root command for simd. It is called once in the

cmd/interchain-security-cdd/main.go

@@ -6,9 +6,9 @@ import (
 	"github.com/cosmos/cosmos-sdk/server"
 	svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
 
-	app "github.com/cosmos/interchain-security/v4/app/consumer-democracy"
-	appparams "github.com/cosmos/interchain-security/v4/app/params"
-	"github.com/cosmos/interchain-security/v4/cmd/interchain-security-cdd/cmd"
+	app "github.com/cosmos/interchain-security/v5/app/consumer-democracy"
+	appparams "github.com/cosmos/interchain-security/v5/app/params"
+	"github.com/cosmos/interchain-security/v5/cmd/interchain-security-cdd/cmd"
 )
 
 func main() {

cmd/interchain-security-pd/cmd/root.go

@@ -31,8 +31,8 @@ import (
 	tmcfg "github.com/cometbft/cometbft/config"
 	"github.com/cometbft/cometbft/libs/log"
 
-	appencoding "github.com/cosmos/interchain-security/v4/app/encoding"
-	providerApp "github.com/cosmos/interchain-security/v4/app/provider"
+	appencoding "github.com/cosmos/interchain-security/v5/app/encoding"
+	providerApp "github.com/cosmos/interchain-security/v5/app/provider"
 )
 
 // NewRootCmd creates a new root command for simd. It is called once in the

cmd/interchain-security-pd/main.go

@@ -6,9 +6,9 @@ import (
 	"github.com/cosmos/cosmos-sdk/server"
 	svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
 
-	appparams "github.com/cosmos/interchain-security/v4/app/params"
-	app "github.com/cosmos/interchain-security/v4/app/provider"
-	"github.com/cosmos/interchain-security/v4/cmd/interchain-security-pd/cmd"
+	appparams "github.com/cosmos/interchain-security/v5/app/params"
+	app "github.com/cosmos/interchain-security/v5/app/provider"
+	"github.com/cosmos/interchain-security/v5/cmd/interchain-security-pd/cmd"
 )
 
 func main() {

cmd/interchain-security-sd/cmd/root.go

@@ -31,8 +31,8 @@ import (
 	tmcfg "github.com/cometbft/cometbft/config"
 	"github.com/cometbft/cometbft/libs/log"
 
-	appencoding "github.com/cosmos/interchain-security/v4/app/encoding"
-	sovereignApp "github.com/cosmos/interchain-security/v4/app/sovereign"
+	appencoding "github.com/cosmos/interchain-security/v5/app/encoding"
+	sovereignApp "github.com/cosmos/interchain-security/v5/app/sovereign"
 )
 
 // NewRootCmd creates a new root command for simd. It is called once in the

cmd/interchain-security-sd/main.go

@@ -6,9 +6,9 @@ import (
 	"github.com/cosmos/cosmos-sdk/server"
 	svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
 
-	appparams "github.com/cosmos/interchain-security/v4/app/params"
-	app "github.com/cosmos/interchain-security/v4/app/sovereign"
-	"github.com/cosmos/interchain-security/v4/cmd/interchain-security-sd/cmd"
+	appparams "github.com/cosmos/interchain-security/v5/app/params"
+	app "github.com/cosmos/interchain-security/v5/app/sovereign"
+	"github.com/cosmos/interchain-security/v5/cmd/interchain-security-sd/cmd"
 )
 
 func main() {

go.mod

@@ -1,4 +1,4 @@
-module github.com/cosmos/interchain-security/v4
+module github.com/cosmos/interchain-security/v5
 
 go 1.21.1
 

proto/interchain_security/ccv/consumer/v1/consumer.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 package interchain_security.ccv.consumer.v1;
 
-option go_package = "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types";
+option go_package = "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types";
 
 import "google/protobuf/any.proto";
 import "gogoproto/gogo.proto";

proto/interchain_security/ccv/consumer/v1/genesis.proto

@@ -2,7 +2,7 @@
 
 package interchain_security.ccv.consumer.v1;
 
-option go_package = "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types";
+option go_package = "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types";
 
 import "interchain_security/ccv/v1/shared_consumer.proto";
 import "ibc/lightclients/tendermint/v1/tendermint.proto";

proto/interchain_security/ccv/consumer/v1/query.proto

@@ -2,7 +2,7 @@
 
 package interchain_security.ccv.consumer.v1;
 import "interchain_security/ccv/v1/shared_consumer.proto";
-option go_package = "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types";
+option go_package = "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types";
 
 import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";

proto/interchain_security/ccv/provider/v1/genesis.proto

@@ -2,7 +2,7 @@
 
 package interchain_security.ccv.provider.v1;
 
-option go_package = "github.com/cosmos/interchain-security/v4/x/ccv/provider/types";
+option go_package = "github.com/cosmos/interchain-security/v5/x/ccv/provider/types";
 
 import "gogoproto/gogo.proto";
 import "interchain_security/ccv/v1/shared_consumer.proto";