feat(perp): MsgShiftPegMultiplier, MsgShiftSwapInvariant

CHANGELOG.md

@@ -60,6 +60,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * [#1617](https://github.com/NibiruChain/nibiru/pull/1617) - fix(app)!: non-nil snapshot manager is not guaranteed in testapp
 * [#1645](https://github.com/NibiruChain/nibiru/pull/1645) - fix(tokenfactory)!: token supply in bank keeper must be correct after MsgBurn.
 * [#1646](https://github.com/NibiruChain/nibiru/pull/1646) - feat(wasmbinding)!: whitelisted stargate queries for QueryRequest::Stargate: auth, bank, gov, tokenfactory, epochs, inflation, oracle, sudo, devgas
+* [#1680](https://github.com/NibiruChain/nibiru/pull/1680) - feat(perp): MsgShiftPegMultiplier, MsgShiftSwapInvariant.
 
 ### Improvements
 

proto/nibiru/perp/v2/tx.proto

@@ -32,9 +32,21 @@ service Msg {
   rpc ChangeCollateralDenom(MsgChangeCollateralDenom)
       returns (MsgChangeCollateralDenomResponse) {}
 
-  rpc AllocateEpochRebates(MsgAllocateEpochRebates) returns (MsgAllocateEpochRebatesResponse) {}
+  rpc AllocateEpochRebates(MsgAllocateEpochRebates)
+      returns (MsgAllocateEpochRebatesResponse) {}
 
-  rpc WithdrawEpochRebates(MsgWithdrawEpochRebates) returns (MsgWithdrawEpochRebatesResponse) {}
+  rpc WithdrawEpochRebates(MsgWithdrawEpochRebates)
+      returns (MsgWithdrawEpochRebatesResponse) {}
+
+  // ShiftPegMultiplier: gRPC tx msg for changing the peg multiplier.
+  // Admin-only.
+  rpc ShiftPegMultiplier(MsgShiftPegMultiplier)
+      returns (MsgShiftPegMultiplierResponse) {}
+
+  // ShiftSwapInvariant: gRPC tx msg for changing the swap invariant.
+  // Admin-only.
+  rpc ShiftSwapInvariant(MsgShiftSwapInvariant)
+      returns (MsgShiftSwapInvariantResponse) {}
 }
 
 // -------------------------- Settle Position --------------------------
@@ -376,4 +388,42 @@ message MsgWithdrawEpochRebatesResponse {
     (gogoproto.nullable) = false,
     (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
   ];
-}
+}
+
+// -------------------------- ShiftPegMultiplier --------------------------
+
+// ShiftPegMultiplier: gRPC tx msg for changing the peg multiplier.
+// Admin-only.
+message MsgShiftPegMultiplier {
+  string sender = 1;
+  string pair = 2 [
+    (gogoproto.customtype) =
+        "github.com/NibiruChain/nibiru/x/common/asset.Pair",
+    (gogoproto.nullable) = false
+  ];
+  string new_peg_mult = 3 [
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+    (gogoproto.nullable) = false
+  ];
+}
+
+message MsgShiftPegMultiplierResponse {}
+
+// -------------------------- ShiftSwapInvariant --------------------------
+
+// ShiftSwapInvariant: gRPC tx msg for changing the swap invariant.
+// Admin-only.
+message MsgShiftSwapInvariant {
+  string sender = 1;
+  string pair = 2 [
+    (gogoproto.customtype) =
+        "github.com/NibiruChain/nibiru/x/common/asset.Pair",
+    (gogoproto.nullable) = false
+  ];
+  string new_swap_invariant = 3 [
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+    (gogoproto.nullable) = false
+  ];
+}
+
+message MsgShiftSwapInvariantResponse {}

wasmbinding/bindings/msg.go

@@ -20,8 +20,6 @@ type NibiruMsg struct {
 	RemoveMargin          *RemoveMargin          `json:"remove_margin,omitempty"`
 	DonateToInsuranceFund *DonateToInsuranceFund `json:"donate_to_insurance_fund,omitempty"` // TODO
 	InsuranceFundWithdraw *InsuranceFundWithdraw `json:"insurance_fund_withdraw,omitempty"`
-	PegShift              *PegShift              `json:"peg_shift,omitempty"`
-	DepthShift            *DepthShift            `json:"depth_shift,omitempty"`
 	SetMarketEnabled      *SetMarketEnabled      `json:"set_market_enabled,omitempty"`
 	CreateMarket          *CreateMarket          `json:"create_market,omitempty"`
 
@@ -62,16 +60,6 @@ type RemoveMargin struct {
 	Margin sdk.Coin `json:"margin"`
 }
 
-type PegShift struct {
-	Pair    string  `json:"pair"`
-	PegMult sdk.Dec `json:"peg_mult"`
-}
-
-type DepthShift struct {
-	Pair      string  `json:"pair"`
-	DepthMult sdk.Dec `json:"depth_mult"`
-}
-
 type DonateToInsuranceFund struct {
 	Sender   string   `json:"sender"`
 	Donation sdk.Coin `json:"donation"`

wasmbinding/exec_perp.go

@@ -137,39 +137,6 @@ func (exec *ExecutorPerp) RemoveMargin(
 	return exec.MsgServer().RemoveMargin(goCtx, sdkMsg)
 }
 
-func (exec *ExecutorPerp) PegShift(
-	cwMsg *bindings.PegShift, contractAddr sdk.AccAddress, ctx sdk.Context,
-) (err error) {
-	if cwMsg == nil {
-		return wasmvmtypes.InvalidRequest{Err: "null msg"}
-	}
-
-	pair, err := asset.TryNewPair(cwMsg.Pair)
-	if err != nil {
-		return err
-	}
-
-	return exec.PerpV2.EditPriceMultiplier(
-		ctx,
-		// contractAddr,
-		pair,
-		cwMsg.PegMult,
-	)
-}
-
-func (exec *ExecutorPerp) DepthShift(cwMsg *bindings.DepthShift, ctx sdk.Context) (err error) {
-	if cwMsg == nil {
-		return wasmvmtypes.InvalidRequest{Err: "null msg"}
-	}
-
-	pair, err := asset.TryNewPair(cwMsg.Pair)
-	if err != nil {
-		return err
-	}
-
-	return exec.PerpV2.EditSwapInvariant(ctx, pair, cwMsg.DepthMult)
-}
-
 func (exec *ExecutorPerp) InsuranceFundWithdraw(
 	cwMsg *bindings.InsuranceFundWithdraw, ctx sdk.Context,
 ) (err error) {

wasmbinding/exec_perp_test.go

@@ -91,7 +91,6 @@ func (s *TestSuitePerpExecutor) TestOpenAddRemoveClose() {
 		s.DoRemoveIncorrectMarginTest(pair, incorrectMargin),
 		s.DoRemoveMarginTest(pair, margin),
 		s.DoClosePositionTest(pair),
-		s.DoPegShiftTest(pair),
 		s.DoInsuranceFundWithdrawTest(sdk.NewInt(69), s.contractDeployer),
 		s.DoCreateMarketTest(asset.MustNewPair("ufoo:ubar")),
 		s.DoCreateMarketTestWithParams(asset.MustNewPair("ufoo2:ubar")),
@@ -212,27 +211,6 @@ func (s *TestSuitePerpExecutor) DoClosePositionTest(pair asset.Pair) error {
 	return err
 }
 
-func (s *TestSuitePerpExecutor) DoPegShiftTest(pair asset.Pair) error {
-	contractAddr := s.contractPerp
-	cwMsg := &bindings.PegShift{
-		Pair:    pair.String(),
-		PegMult: sdk.NewDec(420),
-	}
-
-	err := s.exec.PegShift(cwMsg, contractAddr, s.ctx)
-	return err
-}
-
-func (s *TestSuitePerpExecutor) DoDepthShiftTest(pair asset.Pair) error {
-	cwMsg := &bindings.DepthShift{
-		Pair:      pair.String(),
-		DepthMult: sdk.NewDec(420),
-	}
-
-	err := s.exec.DepthShift(cwMsg, s.ctx)
-	return err
-}
-
 func (s *TestSuitePerpExecutor) DoInsuranceFundWithdrawTest(
 	amt sdkmath.Int, to sdk.AccAddress,
 ) error {
@@ -302,13 +280,6 @@ func (s *TestSuitePerpExecutor) TestSadPaths_Nil() {
 	_, err = s.exec.ClosePosition(nil, nil, s.ctx)
 	s.Error(err)
 
-	err = s.exec.PegShift(
-		nil, sdk.AccAddress([]byte("contract")), s.ctx)
-	s.Error(err)
-
-	err = s.exec.DepthShift(nil, s.ctx)
-	s.Error(err)
-
 	err = s.exec.InsuranceFundWithdraw(nil, s.ctx)
 	s.Error(err)
 }
@@ -348,8 +319,6 @@ func (s *TestSuitePerpExecutor) TestSadPaths_InvalidPair() {
 		s.DoAddMarginTest(pair, margin),
 		s.DoRemoveMarginTest(pair, margin),
 		s.DoClosePositionTest(pair),
-		s.DoPegShiftTest(pair),
-		s.DoDepthShiftTest(pair),
 		s.DoSetMarketEnabledTest(pair, true),
 		s.DoSetMarketEnabledTest(pair, false),
 		s.DoCreateMarketTest(pair),

wasmbinding/exec_test.go

@@ -362,40 +362,6 @@ func (s *TestSuiteExecutor) TestOracleParams() {
 	s.Require().Equal(theValidatorFeeRatio, params.ValidatorFeeRatio)
 }
 
-func (s *TestSuiteExecutor) TestPegShift() {
-	pair := asset.MustNewPair(s.happyFields.Pair)
-	execMsg := bindings.NibiruMsg{
-		PegShift: &bindings.PegShift{
-			Pair:    pair.String(),
-			PegMult: sdk.NewDec(420),
-		},
-	}
-
-	s.T().Log("Executing with permission should succeed")
-	contract := s.contractShifter
-	s.keeper.SetSudoContracts(
-		[]string{contract.String()}, s.ctx,
-	)
-	contractRespBz, err := s.ExecuteAgainstContract(contract, execMsg)
-	s.NoErrorf(err, "contractRespBz: %s", contractRespBz)
-
-	s.T().Log("Executing without permission should fail")
-	s.keeper.SetSudoContracts(
-		[]string{}, s.ctx,
-	)
-	contractRespBz, err = s.ExecuteAgainstContract(contract, execMsg)
-	s.Errorf(err, "contractRespBz: %s", contractRespBz)
-
-	s.T().Log("Executing the wrong contract should fail")
-	contract = s.contractPerp
-	s.keeper.SetSudoContracts(
-		[]string{contract.String()}, s.ctx,
-	)
-	contractRespBz, err = s.ExecuteAgainstContract(contract, execMsg)
-	s.Errorf(err, "contractRespBz: %s", contractRespBz)
-	s.Contains(err.Error(), "Error parsing into type")
-}
-
 func (s *TestSuiteExecutor) TestNoOp() {
 	contract := s.contractShifter
 	execMsg := bindings.NibiruMsg{
@@ -405,40 +371,6 @@ func (s *TestSuiteExecutor) TestNoOp() {
 	s.NoErrorf(err, "contractRespBz: %s", contractRespBz)
 }
 
-func (s *TestSuiteExecutor) TestDepthShift() {
-	pair := asset.MustNewPair(s.happyFields.Pair)
-	execMsg := bindings.NibiruMsg{
-		DepthShift: &bindings.DepthShift{
-			Pair:      pair.String(),
-			DepthMult: sdk.NewDec(2),
-		},
-	}
-
-	s.T().Log("Executing with permission should succeed")
-	contract := s.contractShifter
-	s.keeper.SetSudoContracts(
-		[]string{contract.String()}, s.ctx,
-	)
-	contractRespBz, err := s.ExecuteAgainstContract(contract, execMsg)
-	s.NoErrorf(err, "contractRespBz: %s", contractRespBz)
-
-	s.T().Log("Executing without permission should fail")
-	s.keeper.SetSudoContracts(
-		[]string{}, s.ctx,
-	)
-	contractRespBz, err = s.ExecuteAgainstContract(contract, execMsg)
-	s.Errorf(err, "contractRespBz: %s", contractRespBz)
-
-	s.T().Log("Executing the wrong contract should fail")
-	contract = s.contractPerp
-	s.keeper.SetSudoContracts(
-		[]string{contract.String()}, s.ctx,
-	)
-	contractRespBz, err = s.ExecuteAgainstContract(contract, execMsg)
-	s.Errorf(err, "contractRespBz: %s", contractRespBz)
-	s.Contains(err.Error(), "Error parsing into type")
-}
-
 func (s *TestSuiteExecutor) TestInsuranceFundWithdraw() {
 	admin := s.contractDeployer.String()
 	amtToWithdraw := sdk.NewInt(69)

wasmbinding/message_plugin.go

@@ -80,22 +80,6 @@ func (messenger *CustomMessenger) DispatchMsg(
 			_, err = messenger.Perp.RemoveMargin(cwMsg, contractAddr, ctx)
 			return events, data, err
 
-		// Perp module | shifter
-		case contractExecuteMsg.ExecuteMsg.PegShift != nil:
-			if err := messenger.Sudo.CheckPermissions(contractAddr, ctx); err != nil {
-				return events, data, err
-			}
-			cwMsg := contractExecuteMsg.ExecuteMsg.PegShift
-			err = messenger.Perp.PegShift(cwMsg, contractAddr, ctx)
-			return events, data, err
-		case contractExecuteMsg.ExecuteMsg.DepthShift != nil:
-			if err := messenger.Sudo.CheckPermissions(contractAddr, ctx); err != nil {
-				return events, data, err
-			}
-			cwMsg := contractExecuteMsg.ExecuteMsg.DepthShift
-			err = messenger.Perp.DepthShift(cwMsg, ctx)
-			return events, data, err
-
 		// Perp module | controller
 		case contractExecuteMsg.ExecuteMsg.CreateMarket != nil:
 			if err := messenger.Sudo.CheckPermissions(contractAddr, ctx); err != nil {

x/perp/v2/integration/action/dnr.go

@@ -236,8 +236,7 @@ func FundDnREpoch(amt sdk.Coins) action.Action {
 	return fundDnREpoch{amt}
 }
 
-type startNewDnRepochAction struct {
-}
+type startNewDnRepochAction struct{}
 
 func (s startNewDnRepochAction) Do(app *app.NibiruApp, ctx sdk.Context) (outCtx sdk.Context, err error, isMandatory bool) {
 	currentEpoch, err := app.PerpKeeperV2.DnREpoch.Get(ctx)

x/perp/v2/integration/action/market.go

@@ -140,7 +140,7 @@ type editPriceMultiplier struct {
 }
 
 func (e editPriceMultiplier) Do(app *app.NibiruApp, ctx sdk.Context) (sdk.Context, error, bool) {
-	err := app.PerpKeeperV2.EditPriceMultiplier(ctx, e.pair, e.newValue)
+	err := app.PerpKeeperV2.UnsafeShiftPegMultiplier(ctx, e.pair, e.newValue)
 	return ctx, err, true
 }
 
@@ -157,7 +157,7 @@ type editSwapInvariant struct {
 }
 
 func (e editSwapInvariant) Do(app *app.NibiruApp, ctx sdk.Context) (sdk.Context, error, bool) {
-	err := app.PerpKeeperV2.EditSwapInvariant(ctx, e.pair, e.newValue)
+	err := app.PerpKeeperV2.UnsafeShiftSwapInvariant(ctx, e.pair, e.newValue)
 	return ctx, err, true
 }
 

x/perp/v2/keeper/admin.go

@@ -174,3 +174,33 @@ func (k admin) UnsafeChangeCollateralDenom(
 	k.Collateral.Set(ctx, denom)
 	return nil
 }
+
+// ShiftPegMultiplier: Edit the peg multiplier of an amm pool after making
+// sure there's enough money in the perp EF fund to pay for the repeg. These
+// funds get send to the vault to pay for trader's new net margin.
+func (k admin) ShiftPegMultiplier(
+	ctx sdk.Context,
+	pair asset.Pair,
+	newPriceMultiplier sdk.Dec,
+	sender sdk.AccAddress,
+) error {
+	if err := k.SudoKeeper.CheckPermissions(sender, ctx); err != nil {
+		return err
+	}
+	return k.UnsafeShiftPegMultiplier(ctx, pair, newPriceMultiplier)
+}
+
+// ShiftSwapInvariant: Edit the peg multiplier of an amm pool after making
+// sure there's enough money in the perp EF fund to pay for the repeg. These
+// funds get send to the vault to pay for trader's new net margin.
+func (k admin) ShiftSwapInvariant(
+	ctx sdk.Context,
+	pair asset.Pair,
+	newSwapInvariant sdk.Dec,
+	sender sdk.AccAddress,
+) error {
+	if err := k.SudoKeeper.CheckPermissions(sender, ctx); err != nil {
+		return err
+	}
+	return k.UnsafeShiftSwapInvariant(ctx, pair, newSwapInvariant)
+}