LSM

.gitmodules

@@ -2,12 +2,18 @@
 	# Commit: v1.5.1
 	path = deps/hermes
 	url = https://github.com/informalsystems/ibc-rs.git
+# TODO [LSM]: Revert
+# [submodule "deps/relayer"]
+# 	# Commit: v2.3.1
+# 	path = deps/relayer
+# 	url = https://github.com/cosmos/relayer.git
 [submodule "deps/relayer"]
-	# Commit: e95dd80608536c31d37354bdd7f7ec46a2172009
+	# Branch: sam/lsm-poc
+	# Commit: 0136134766142f133f263f3bba72d7077e7bc2c1
 	path = deps/relayer
-	url = https://github.com/cosmos/relayer.git
+	url = https://github.com/Stride-Labs/relayer.git
 [submodule "deps/gaia"]
-	# Commit: v9.1.0
+	# Commit: v12.0.0-rc0
 	path = deps/gaia
 	url = https://github.com/cosmos/gaia.git
 [submodule "deps/juno"]

README.md

@@ -40,7 +40,7 @@ You can optionally pass build arguments to specify which binary to rebuild
 3. `j` This will re-build the Juno binary
 4. `o` This will re-build the Osmo binary
 5. `t` This will re-build the Stargaze binary
-6. `t` This will re-build the Evmos binary
+6. `e` This will re-build the Evmos binary
 7. `r` This will re-build the Go Relayer binary
 8. `h` This will re-build the Hermes binary
 

app/app.go

@@ -170,6 +170,7 @@ func getGovProposalHandlers() []govclient.ProposalHandler {
 		ibcclientclient.UpdateClientProposalHandler,
 		ibcclientclient.UpgradeProposalHandler,
 		stakeibcclient.AddValidatorsProposalHandler,
+		stakeibcclient.ToggleLSMProposalHandler,
 		ratelimitclient.AddRateLimitProposalHandler,
 		ratelimitclient.UpdateRateLimitProposalHandler,
 		ratelimitclient.RemoveRateLimitProposalHandler,

app/apptesting/test_helpers.go

@@ -6,10 +6,6 @@ import (
 	"time"
 
 	abci "github.com/cometbft/cometbft/abci/types"
-	ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"
-	ccvprovidertypes "github.com/cosmos/interchain-security/v3/x/ccv/provider/types"
-	ccvtypes "github.com/cosmos/interchain-security/v3/x/ccv/types"
-
 	"github.com/cometbft/cometbft/crypto/ed25519"
 	tmtypesproto "github.com/cometbft/cometbft/proto/tendermint/types"
 	tmtypes "github.com/cometbft/cometbft/types"
@@ -20,15 +16,19 @@ import (
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 	"github.com/cosmos/gogoproto/proto"
 	icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types"
+	ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"
 	transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"
 	clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"
+	connectiontypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types"
 	channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
-
+	tendermint "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint"
 	"github.com/cosmos/ibc-go/v7/testing/simapp"
 	appProvider "github.com/cosmos/interchain-security/v3/app/provider"
 	ibctesting "github.com/cosmos/interchain-security/v3/legacy_ibc_testing/testing"
 	icstestingutils "github.com/cosmos/interchain-security/v3/testutil/ibc_testing"
 	e2e "github.com/cosmos/interchain-security/v3/testutil/integration"
+	ccvprovidertypes "github.com/cosmos/interchain-security/v3/x/ccv/provider/types"
+	ccvtypes "github.com/cosmos/interchain-security/v3/x/ccv/types"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
@@ -39,6 +39,7 @@ import (
 var (
 	StrideChainID   = "STRIDE"
 	ProviderChainID = "PROVIDER"
+	FirstClientId   = "07-tendermint-0"
 
 	TestIcaVersion = string(icatypes.ModuleCdc.MustMarshalJSON(&icatypes.Metadata{
 		Version:                icatypes.Version,
@@ -225,7 +226,7 @@ func (s *AppTestHelper) CreateTransferChannel(hostChainID string) {
 
 // Creates an ICA channel through ibctesting
 // Also creates a transfer channel is if hasn't been done yet
-func (s *AppTestHelper) CreateICAChannel(owner string) string {
+func (s *AppTestHelper) CreateICAChannel(owner string) (channelID, portID string) {
 	// If we have yet to create a client/connection (through creating a transfer channel), do that here
 	_, transferChannelExists := s.App.IBCKeeper.ChannelKeeper.GetChannel(s.Ctx, ibctesting.TransferPort, ibctesting.FirstChannelID)
 	if !transferChannelExists {
@@ -249,17 +250,14 @@ func (s *AppTestHelper) CreateICAChannel(owner string) string {
 	err = icaPath.EndpointA.ChanOpenAck()
 	s.Require().NoError(err, "ChanOpenAck error")
 
-	// err = s.App.ICAControllerKeeper.RegisterInterchainAccount(s.Ctx, icaPath.EndpointA.ConnectionID, owner, TestIcaVersion)
-	// s.Require().NoError(err, "register interchain account error")
-
 	err = icaPath.EndpointB.ChanOpenConfirm()
 	s.Require().NoError(err, "ChanOpenConfirm error")
 
 	s.Ctx = s.StrideChain.GetContext()
 
 	// Confirm the ICA channel was created properly
-	portID := icaPath.EndpointA.ChannelConfig.PortID
-	channelID := icaPath.EndpointA.ChannelID
+	portID = icaPath.EndpointA.ChannelConfig.PortID
+	channelID = icaPath.EndpointA.ChannelID
 	_, found := s.App.IBCKeeper.ChannelKeeper.GetChannel(s.Ctx, portID, channelID)
 	s.Require().True(found, "Channel not found after creation, PortID: %s, ChannelID: %s", portID, channelID)
 
@@ -271,7 +269,7 @@ func (s *AppTestHelper) CreateICAChannel(owner string) string {
 	// Finally set the active channel
 	s.App.ICAControllerKeeper.SetActiveChannelID(s.Ctx, ibctesting.FirstConnectionID, portID, channelID)
 
-	return channelID
+	return channelID, portID
 }
 
 // Register's a new ICA account on the next channel available
@@ -411,11 +409,34 @@ func (s *AppTestHelper) GetIBCDenomTrace(denom string) transfertypes.DenomTrace
 	return transfertypes.ParseDenomTrace(prefixedDenom)
 }
 
+// Creates and stores an IBC denom from a base denom on transfer channel-0
+// This is only required for tests that use the transfer keeper and require that the IBC
+// denom is present in the store
+//
+// Returns the IBC hash
+func (s *AppTestHelper) CreateAndStoreIBCDenom(baseDenom string) (ibcDenom string) {
+	denomTrace := s.GetIBCDenomTrace(baseDenom)
+	s.App.TransferKeeper.SetDenomTrace(s.Ctx, denomTrace)
+	return denomTrace.IBCDenom()
+}
+
 func (s *AppTestHelper) MarshalledICS20PacketData() sdk.AccAddress {
 	data := ibctransfertypes.FungibleTokenPacketData{}
 	return data.GetBytes()
 }
 
+// Helper function to mock out a connection, client, and revision height
+func (s *AppTestHelper) MockClientLatestHeight(height uint64) {
+	clientState := tendermint.ClientState{
+		LatestHeight: clienttypes.NewHeight(1, height),
+	}
+	connection := connectiontypes.ConnectionEnd{
+		ClientId: FirstClientId,
+	}
+	s.App.IBCKeeper.ConnectionKeeper.SetConnection(s.Ctx, ibctesting.FirstConnectionID, connection)
+	s.App.IBCKeeper.ClientKeeper.SetClientState(s.Ctx, FirstClientId, &clientState)
+}
+
 func (s *AppTestHelper) ConfirmUpgradeSucceededs(upgradeName string, upgradeHeight int64) {
 	s.Ctx = s.Ctx.WithBlockHeight(upgradeHeight - 1)
 	plan := upgradetypes.Plan{Name: upgradeName, Height: upgradeHeight}
@@ -451,3 +472,82 @@ func GetAdminAddress() (address string, ok bool) {
 func SetupConfig() {
 	app.SetupConfig()
 }
+
+// Searches for an event using the current context
+func (s *AppTestHelper) getEventsFromEventType(eventType string) (events []sdk.Event) {
+	for _, event := range s.Ctx.EventManager().Events() {
+		if event.Type == eventType {
+			events = append(events, event)
+		}
+	}
+	return events
+}
+
+// Searches for an event attribute, given an event
+// Returns the value if found
+func (s *AppTestHelper) getEventValuesFromAttribute(event sdk.Event, attributeKey string) (values []string) {
+	for _, attribute := range event.Attributes {
+		if string(attribute.Key) == attributeKey {
+			values = append(values, string(attribute.Value))
+		}
+	}
+	return values
+}
+
+// Searches for an event that has an attribute value matching the expected value
+// Returns whether there was a match, as well as a list for all the values found
+// for that attribute (for the error message)
+func (s *AppTestHelper) checkEventAttributeValueMatch(
+	events []sdk.Event,
+	attributeKey,
+	expectedValue string,
+) (allValues []string, found bool) {
+	for _, event := range events {
+		allValues = append(allValues, s.getEventValuesFromAttribute(event, attributeKey)...)
+		for _, actualValue := range allValues {
+			if actualValue == expectedValue {
+				found = true
+			}
+		}
+	}
+	return allValues, found
+}
+
+// Checks if an event was emitted
+func (s *AppTestHelper) CheckEventTypeEmitted(eventType string) []sdk.Event {
+	events := s.getEventsFromEventType(eventType)
+	eventEmitted := len(events) > 0
+	s.Require().True(eventEmitted, "%s event should have been emitted", eventType)
+	return events
+}
+
+// Checks that an event was not emitted
+func (s *AppTestHelper) CheckEventTypeNotEmitted(eventType string) {
+	events := s.getEventsFromEventType(eventType)
+	eventNotEmitted := len(events) == 0
+	s.Require().True(eventNotEmitted, "%s event should not have been emitted", eventType)
+}
+
+// Checks that an event was emitted and that the value matches expectations
+func (s *AppTestHelper) CheckEventValueEmitted(eventType, attributeKey, expectedValue string) {
+	events := s.CheckEventTypeEmitted(eventType)
+
+	// Check all events and attributes for a match
+	allValues, valueFound := s.checkEventAttributeValueMatch(events, attributeKey, expectedValue)
+	s.Require().True(valueFound, "attribute %s with value %s should have been found in event %s. Values emitted for attribute: %+v",
+		attributeKey, expectedValue, eventType, allValues)
+}
+
+// Checks that there was no event emitted that matches the event type, attribute, and value
+func (s *AppTestHelper) CheckEventValueNotEmitted(eventType, attributeKey, expectedValue string) {
+	// Check that either the event or attribute were not emitted
+	events := s.getEventsFromEventType(eventType)
+	if len(events) == 0 {
+		return
+	}
+
+	// Check all events and attributes to make sure there's no match
+	allValues, valueFound := s.checkEventAttributeValueMatch(events, attributeKey, expectedValue)
+	s.Require().False(valueFound, "attribute %s with value %s should not have been found in event %s. Values emitted for attribute: %+v",
+		attributeKey, expectedValue, eventType, allValues)
+}

app/proposals_whitelisting.go

@@ -137,8 +137,6 @@ var WhitelistedParams = map[ccvgov.ParamChangeKey]struct{}{
 	{MsgType: stakeibctypes.ModuleName, Key: string(stakeibctypes.KeyDefaultMinRedemptionRateThreshold)}: {},
 	{MsgType: stakeibctypes.ModuleName, Key: string(stakeibctypes.KeyDefaultMaxRedemptionRateThreshold)}: {},
 	{MsgType: stakeibctypes.ModuleName, Key: string(stakeibctypes.KeyIBCTransferTimeoutNanos)}:           {},
-	{MsgType: stakeibctypes.ModuleName, Key: string(stakeibctypes.KeySafetyNumValidators)}:               {},
-	{MsgType: stakeibctypes.ModuleName, Key: string(stakeibctypes.KeySafetyMaxSlashPercent)}:             {},
 	{MsgType: stakeibctypes.ModuleName, Key: string(stakeibctypes.KeyMaxRedemptionRates)}:                {},
 	{MsgType: stakeibctypes.ModuleName, Key: string(stakeibctypes.KeyMinRedemptionRates)}:                {},
 	//ica

app/upgrades.go

@@ -92,6 +92,7 @@ func (app *StrideApp) setupUpgradeHandlers(appOpts servertypes.AppOptions) {
 			app.ICAHostKeeper,
 			app.MintKeeper,
 			app.StakeibcKeeper,
+			app.keys[stakeibctypes.StoreKey],
 		),
 	)
 

app/upgrades/v10/upgrades.go

@@ -246,7 +246,7 @@ func MigrateCallbackData(ctx sdk.Context, k icacallbackskeeper.Keeper) error {
 			newCallbackArgsBz, err = reserializeCallback(oldCallbackArgsBz, &stakeibctypes.ReinvestCallback{})
 		case stakeibckeeper.ICACallbackID_Undelegate:
 			newCallbackArgsBz, err = reserializeCallback(oldCallbackArgsBz, &stakeibctypes.UndelegateCallback{})
-		case recordskeeper.TRANSFER:
+		case recordskeeper.IBCCallbacksID_NativeTransfer:
 			newCallbackArgsBz, err = reserializeCallback(oldCallbackArgsBz, &recordstypes.TransferCallback{})
 		}
 		if err != nil {
@@ -343,21 +343,21 @@ func EnableRateLimits(
 			return errorsmod.Wrapf(err, "unable to add rate limit for %s", denom)
 		}
 
-		if hostZone.DelegationAccount == nil || hostZone.DelegationAccount.Address == "" {
+		if hostZone.DelegationIcaAddress == "" {
 			return stakeibctypes.ErrICAAccountNotFound
 		}
-		if hostZone.FeeAccount == nil || hostZone.FeeAccount.Address == "" {
+		if hostZone.FeeIcaAddress == "" {
 			return stakeibctypes.ErrICAAccountNotFound
 		}
 
 		ratelimitKeeper.SetWhitelistedAddressPair(ctx, ratelimittypes.WhitelistedAddressPair{
-			Sender:   hostZone.Address,
-			Receiver: hostZone.DelegationAccount.Address,
+			Sender:   hostZone.DepositAddress,
+			Receiver: hostZone.DelegationIcaAddress,
 		})
 
 		rewardCollectorAddress := accountKeeper.GetModuleAccount(ctx, stakeibctypes.RewardCollectorName).GetAddress()
 		ratelimitKeeper.SetWhitelistedAddressPair(ctx, ratelimittypes.WhitelistedAddressPair{
-			Sender:   hostZone.FeeAccount.Address,
+			Sender:   hostZone.FeeIcaAddress,
 			Receiver: rewardCollectorAddress.String(),
 		})
 	}

app/upgrades/v10/upgrades_test.go

@@ -181,7 +181,7 @@ func (s *UpgradeTestSuite) TestMigrateCallbackData() {
 		s.createCallbackData(stakeibckeeper.ICACallbackID_Redemption, &initialRedemptionCallbackArgs),
 		s.createCallbackData(stakeibckeeper.ICACallbackID_Reinvest, &initialReinvestCallbackArgs),
 		s.createCallbackData(stakeibckeeper.ICACallbackID_Undelegate, &initialUndelegateCallbackArgs),
-		s.createCallbackData(recordskeeper.TRANSFER, &initialTransferCallbackArgs),
+		s.createCallbackData(recordskeeper.IBCCallbacksID_NativeTransfer, &initialTransferCallbackArgs),
 	}
 	for i := range initialCallbackData {
 		initialCallbackData[i].CallbackKey = fmt.Sprintf("key-%d", i)
@@ -238,7 +238,7 @@ func (s *UpgradeTestSuite) TestMigrateCallbackData() {
 			s.mustUnmarshalCallback(finalCallback.CallbackArgs, &finalCallbackArgs)
 			s.Require().Equal(initialUndelegateCallbackArgs, finalCallbackArgs, "undelegate callback")
 
-		case recordskeeper.TRANSFER:
+		case recordskeeper.IBCCallbacksID_NativeTransfer:
 			var finalCallbackArgs recordstypes.TransferCallback
 			s.mustUnmarshalCallback(finalCallback.CallbackArgs, &finalCallbackArgs)
 			s.Require().Equal(initialTransferCallbackArgs, finalCallbackArgs, "transfer callback")
@@ -349,16 +349,12 @@ func (s *UpgradeTestSuite) createRewardCollectorModuleAccount() string {
 func (s *UpgradeTestSuite) setupRateLimitedHostZone(chainId, stDenom, channelId string) {
 	// Store host zone in stakeibc
 	s.App.StakeibcKeeper.SetHostZone(s.Ctx, stakeibctypes.HostZone{
-		ChainId:           chainId,
-		HostDenom:         strings.ReplaceAll(stDenom, "st", ""),
-		TransferChannelId: channelId,
-		Address:           chainId + ".STAKEIBC",
-		FeeAccount: &stakeibctypes.ICAAccount{
-			Address: chainId + ".FEE",
-		},
-		DelegationAccount: &stakeibctypes.ICAAccount{
-			Address: chainId + ".DELEGATION",
-		},
+		ChainId:              chainId,
+		HostDenom:            strings.ReplaceAll(stDenom, "st", ""),
+		TransferChannelId:    channelId,
+		DepositAddress:       chainId + ".STAKEIBC",
+		FeeIcaAddress:        chainId + ".FEE",
+		DelegationIcaAddress: chainId + ".DELEGATION",
 	})
 
 	// Create the transfer channel