v25 - stTIA Migration

app/app.go

@@ -736,6 +736,8 @@ func NewStrideApp(
 		app.BankKeeper,
 		app.ICAOracleKeeper,
 		app.RatelimitKeeper,
+		app.RecordsKeeper,
+		app.StakeibcKeeper,
 		app.TransferKeeper,
 	)
 	stakeTiaModule := staketia.NewAppModule(appCodec, app.StaketiaKeeper)

app/upgrades.go

@@ -34,6 +34,7 @@ import (
 	v22 "github.com/Stride-Labs/stride/v24/app/upgrades/v22"
 	v23 "github.com/Stride-Labs/stride/v24/app/upgrades/v23"
 	v24 "github.com/Stride-Labs/stride/v24/app/upgrades/v24"
+	v25 "github.com/Stride-Labs/stride/v24/app/upgrades/v25"
 	v3 "github.com/Stride-Labs/stride/v24/app/upgrades/v3"
 	v4 "github.com/Stride-Labs/stride/v24/app/upgrades/v4"
 	v5 "github.com/Stride-Labs/stride/v24/app/upgrades/v5"
@@ -324,6 +325,19 @@ func (app *StrideApp) setupUpgradeHandlers(appOpts servertypes.AppOptions) {
 		),
 	)
 
+	// v25 upgrade handler
+	app.UpgradeKeeper.SetUpgradeHandler(
+		v25.UpgradeName,
+		v25.CreateUpgradeHandler(
+			app.mm,
+			app.configurator,
+			app.BankKeeper,
+			app.RecordsKeeper,
+			app.StakeibcKeeper,
+			app.StaketiaKeeper,
+		),
+	)
+
 	upgradeInfo, err := app.UpgradeKeeper.ReadUpgradeInfoFromDisk()
 	if err != nil {
 		panic(fmt.Errorf("Failed to read upgrade info from disk: %w", err))

app/upgrades/v24/upgrades.go

@@ -25,7 +25,7 @@ var (
 	OsmosisRedemptionRateBuffer = sdk.MustNewDecFromStr("0.02")
 )
 
-// CreateUpgradeHandler creates an SDK upgrade handler for v23
+// CreateUpgradeHandler creates an SDK upgrade handler for v24
 func CreateUpgradeHandler(
 	mm *module.Manager,
 	configurator module.Configurator,

app/upgrades/v25/upgrades.go

@@ -0,0 +1,37 @@
+package v25
+
+import (
+	errorsmod "cosmossdk.io/errors"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/module"
+	bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
+	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
+
+	recordskeeper "github.com/Stride-Labs/stride/v24/x/records/keeper"
+	stakeibckeeper "github.com/Stride-Labs/stride/v24/x/stakeibc/keeper"
+	staketiakeeper "github.com/Stride-Labs/stride/v24/x/staketia/keeper"
+)
+
+const UpgradeName = "v25"
+
+// CreateUpgradeHandler creates an SDK upgrade handler for v25
+func CreateUpgradeHandler(
+	mm *module.Manager,
+	configurator module.Configurator,
+	bankKeeper bankkeeper.Keeper,
+	recordsKeeper recordskeeper.Keeper,
+	stakeibcKeeper stakeibckeeper.Keeper,
+	staketiaKeeper staketiakeeper.Keeper,
+) upgradetypes.UpgradeHandler {
+	return func(ctx sdk.Context, _ upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
+		ctx.Logger().Info("Starting upgrade v25...")
+
+		// Migrate staketia to stakeibc
+		if err := staketiakeeper.InitiateMigration(ctx, staketiaKeeper, bankKeeper, recordsKeeper, stakeibcKeeper); err != nil {
+			return vm, errorsmod.Wrapf(err, "unable to migrate staketia to stakeibc")
+		}
+
+		ctx.Logger().Info("Running module migrations...")
+		return mm.RunMigrations(ctx, configurator, vm)
+	}
+}

app/upgrades/v25/upgrades_test.go

@@ -0,0 +1,25 @@
+package v25_test
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/suite"
+
+	"github.com/Stride-Labs/stride/v24/app/apptesting"
+)
+
+type UpgradeTestSuite struct {
+	apptesting.AppTestHelper
+}
+
+func (s *UpgradeTestSuite) SetupTest() {
+	s.Setup()
+}
+
+func TestKeeperTestSuite(t *testing.T) {
+	suite.Run(t, new(UpgradeTestSuite))
+}
+
+func (s *UpgradeTestSuite) TestUpgrade() {
+
+}

proto/stride/staketia/staketia.proto

@@ -35,45 +35,8 @@ message HostZone {
   string safe_address_on_stride = 11
       [ (cosmos_proto.scalar) = "cosmos.AddressString" ];
 
-  // Previous redemption rate
-  string last_redemption_rate = 12 [
-    (cosmos_proto.scalar) = "cosmos.Dec",
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
-    (gogoproto.nullable) = false
-  ];
-  // Current redemption rate
-  string redemption_rate = 13 [
-    (cosmos_proto.scalar) = "cosmos.Dec",
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
-    (gogoproto.nullable) = false
-  ];
-  // Min outer redemption rate - adjusted by governance
-  string min_redemption_rate = 14 [
-    (cosmos_proto.scalar) = "cosmos.Dec",
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
-    (gogoproto.nullable) = false
-  ];
-  // Max outer redemption rate - adjusted by governance
-  string max_redemption_rate = 15 [
-    (cosmos_proto.scalar) = "cosmos.Dec",
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
-    (gogoproto.nullable) = false
-  ];
-  // Min inner redemption rate - adjusted by controller
-  string min_inner_redemption_rate = 16 [
-    (cosmos_proto.scalar) = "cosmos.Dec",
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
-    (gogoproto.nullable) = false
-  ];
-  // Max inner redemption rate - adjusted by controller
-  string max_inner_redemption_rate = 17 [
-    (cosmos_proto.scalar) = "cosmos.Dec",
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
-    (gogoproto.nullable) = false
-  ];
-
   // Total delegated balance on the host zone delegation account
-  string delegated_balance = 18 [
+  string remaining_delegated_balance = 18 [
     (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
     (gogoproto.nullable) = false
   ];
@@ -82,6 +45,8 @@ message HostZone {
   uint64 unbonding_period_seconds = 19;
   // Indicates whether the host zone has been halted
   bool halted = 20;
+
+  reserved 13;
 }
 
 // Status fields for a delegation record

proto/stride/staketia/tx.proto

@@ -75,10 +75,12 @@ service Msg {
       returns (MsgSetOperatorAddressResponse);
 }
 
+// Deprecated: Liquid stakes should be handled in stakeibc
 // LiquidStake
 message MsgLiquidStake {
   option (cosmos.msg.v1.signer) = "staker";
   option (amino.name) = "staketia/MsgLiquidStake";
+  option deprecated = true;
 
   string staker = 1;
   string native_amount = 2 [
@@ -87,6 +89,8 @@ message MsgLiquidStake {
   ];
 }
 message MsgLiquidStakeResponse {
+  option deprecated = true;
+
   cosmos.base.v1beta1.Coin st_token = 1 [
     (gogoproto.nullable) = false,
     (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
@@ -103,6 +107,9 @@ message MsgRedeemStake {
     (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
     (gogoproto.nullable) = false
   ];
+  // The receiver field is a celestia address
+  // It is only used in the case where the redemption spills over to stakeibc
+  string receiver = 3;
 }
 message MsgRedeemStakeResponse {
   cosmos.base.v1beta1.Coin native_token = 1 [

scripts/version.sh

@@ -50,15 +50,15 @@ update_version ./scripts/protocgen.sh
 
 echo ">>> Committing changes..."
 
-git add .
-git commit -m "updated package from $OLD_VERSION -> $NEW_VERSION"
+# git add .
+# git commit -m "updated package from $OLD_VERSION -> $NEW_VERSION"
 
 # Re-generate protos
 echo ">>> Rebuilding protos..."
 
 make proto-all
 
-git add .
-git commit -m 'generated protos'
+# git add .
+# git commit -m 'generated protos'
 
 echo "Done"

x/staketia/client/cli/tx.go

@@ -36,7 +36,6 @@ func GetTxCmd() *cobra.Command {
 	}
 
 	cmd.AddCommand(
-		CmdLiquidStake(),
 		CmdRedeemStake(),
 		CmdConfirmDelegation(),
 		CmdConfirmUndelegation(),
@@ -52,52 +51,10 @@ func GetTxCmd() *cobra.Command {
 	return cmd
 }
 
-// User transaction to liquid stake native tokens into stTokens
-func CmdLiquidStake() *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "liquid-stake [amount]",
-		Short: "Liquid stakes native tokens and receives stTokens",
-		Long: strings.TrimSpace(
-			fmt.Sprintf(`Liquid stakes native tokens and receives stTokens
-
-Example:
-  $ %[1]s tx %[2]s liquid-stake 10000
-`, version.AppName, types.ModuleName),
-		),
-		Args: cobra.ExactArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			amount, ok := sdkmath.NewIntFromString(args[0])
-			if !ok {
-				return errors.New("unable to parse amount")
-			}
-
-			clientCtx, err := client.GetClientTxContext(cmd)
-			if err != nil {
-				return err
-			}
-
-			msg := types.NewMsgLiquidStake(
-				clientCtx.GetFromAddress().String(),
-				amount,
-			)
-
-			if err := msg.ValidateBasic(); err != nil {
-				return err
-			}
-
-			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
-		},
-	}
-
-	flags.AddTxFlagsToCmd(cmd)
-
-	return cmd
-}
-
 // User transaction to redeem stake stTokens into native tokens
 func CmdRedeemStake() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "redeem-stake [amount]",
+		Use:   "redeem-stake [amount] [reciever]",
 		Short: "Redeems stTokens tokens for native tokens",
 		Long: strings.TrimSpace(
 			fmt.Sprintf(`Redeems stTokens tokens for native tokens. 
@@ -107,12 +64,13 @@ Example:
   $ %[1]s tx %[2]s redeem-stake 10000
 `, version.AppName, types.ModuleName),
 		),
-		Args: cobra.ExactArgs(1),
+		Args: cobra.ExactArgs(2),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			amount, ok := sdkmath.NewIntFromString(args[0])
 			if !ok {
 				return errors.New("unable to parse amount")
 			}
+			receiver := args[1]
 
 			clientCtx, err := client.GetClientTxContext(cmd)
 			if err != nil {
@@ -122,6 +80,7 @@ Example:
 			msg := types.NewMsgRedeemStake(
 				clientCtx.GetFromAddress().String(),
 				amount,
+				receiver,
 			)
 
 			if err := msg.ValidateBasic(); err != nil {

x/staketia/keeper/abci.go

@@ -4,13 +4,4 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
-func (k Keeper) BeginBlocker(ctx sdk.Context) {
-	// Check invariants
-
-	// Check redemption rate is within safety bounds
-	if err := k.CheckRedemptionRateExceedsBounds(ctx); err != nil {
-		k.Logger(ctx).Error(err.Error())
-		// If not, halt the zone
-		k.HaltZone(ctx)
-	}
-}
+func (k Keeper) BeginBlocker(ctx sdk.Context) {}