feat(perp): MsgWithdrawFromPerpFund sudo call as part of #1642 (#1734)

* feat(perp): MsgDonateToPerpFund

* changelog

* linter

* test assertiong

* test(perp-cli_test): Grab module acc addr programatically

* consistent naming with #1752

CHANGELOG.md

@@ -66,6 +66,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * [#1573](https://github.com/NibiruChain/nibiru/pull/1573) - feat(perp): Close markets and compute settlement price
 * [#1705](https://github.com/NibiruChain/nibiru/pull/1705) - feat(perp): Add oracle pair to market object
 * [#1718](https://github.com/NibiruChain/nibiru/pull/1718) - fix: fees does not require additional funds
+* [#1734](https://github.com/NibiruChain/nibiru/pull/1734) - feat(perp): MsgDonateToPerpFund sudo call as part of #1642
 * [#1755](https://github.com/NibiruChain/nibiru/pull/1755) - feat(oracle): Add more events on validator's performance
 
 ### Non-breaking/Compatible Improvements
@@ -85,9 +86,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Dependencies
 
-- Bump `github.com/prometheus/client_golang` from 1.17.0 to 1.18.0 ([#1750](https://github.com/NibiruChain/nibiru/pull/1750))
+* Bump `github.com/prometheus/client_golang` from 1.17.0 to 1.18.0 ([#1750](https://github.com/NibiruChain/nibiru/pull/1750))
 * Bump `google.golang.org/protobuf` from 1.31.0 to 1.32.0 ([#1756](https://github.com/NibiruChain/nibiru/pull/1756))
-
 * Bump `google.golang.org/grpc` from 1.59.0 to 1.60.0 ([#1720](https://github.com/NibiruChain/nibiru/pull/1720))
 * Bump `golang.org/x/crypto` from 0.15.0 to 0.17.0 ([#1724](https://github.com/NibiruChain/nibiru/pull/1724))
 * Bump `github.com/holiman/uint256` from 1.2.3 to 1.2.4 ([#1730](https://github.com/NibiruChain/nibiru/pull/1730))

app/keepers.go

@@ -805,7 +805,7 @@ func ModuleAccPerms() map[string][]string {
 
 		perptypes.ModuleName:                 {},
 		perptypes.VaultModuleAccount:         {},
-		perptypes.PerpEFModuleAccount:        {},
+		perptypes.PerpFundModuleAccount:      {},
 		perptypes.FeePoolModuleAccount:       {},
 		perptypes.DNRAllocationModuleAccount: {},
 		perptypes.DNREscrowModuleAccount:     {},

proto/nibiru/perp/v2/tx.proto

@@ -30,7 +30,7 @@ service Msg {
       returns (MsgDonateToEcosystemFundResponse) {}
 
   // ChangeCollateralDenom: Updates the collateral denom. A denom is valid if it
-  // is possible to make an sdk.Coin using it. [Admin] Only callable by sudoers.
+  // is possible to make an sdk.Coin using it. [SUDO] Only callable by sudoers.
   rpc ChangeCollateralDenom(MsgChangeCollateralDenom)
       returns (MsgChangeCollateralDenomResponse) {}
 
@@ -41,14 +41,19 @@ service Msg {
       returns (MsgWithdrawEpochRebatesResponse) {}
 
   // ShiftPegMultiplier: gRPC tx msg for changing a market's peg multiplier.
-  // [Admin] Only callable by sudoers.
+  // [SUDO] Only callable by sudoers.
   rpc ShiftPegMultiplier(MsgShiftPegMultiplier)
       returns (MsgShiftPegMultiplierResponse) {}
 
   // ShiftSwapInvariant: gRPC tx msg for changing a market's swap invariant.
-  // [Admin] Only callable by sudoers.
+  // [SUDO] Only callable by sudoers.
   rpc ShiftSwapInvariant(MsgShiftSwapInvariant)
       returns (MsgShiftSwapInvariantResponse) {}
+
+  // WithdrawFromPerpFund: gRPC tx msg to withdraw from the perp fund module
+  // account. [SUDO] Only callable by sudoers.
+  rpc WithdrawFromPerpFund(MsgWithdrawFromPerpFund)
+      returns (MsgWithdrawFromPerpFundResponse) {}
 }
 
 // -------------------------- Settle Position --------------------------
@@ -353,7 +358,7 @@ message MsgDonateToEcosystemFundResponse {}
 // -----------------------  MsgChangeCollateralDenom -----------------------
 
 // MsgChangeCollateralDenom: Changes the collateral denom for the module.
-// [Admin] Only callable by sudoers.
+// [SUDO] Only callable by sudoers.
 message MsgChangeCollateralDenom {
   string sender = 1;
   string new_denom = 2;
@@ -394,8 +399,8 @@ message MsgWithdrawEpochRebatesResponse {
 
 // -------------------------- ShiftPegMultiplier --------------------------
 
-// ShiftPegMultiplier: gRPC tx msg for changing the peg multiplier.
-// Admin-only.
+// MsgShiftPegMultiplier: gRPC tx msg for changing the peg multiplier.
+// [SUDO] Only callable sudoers.
 message MsgShiftPegMultiplier {
   string sender = 1;
   string pair = 2 [
@@ -413,8 +418,8 @@ message MsgShiftPegMultiplierResponse {}
 
 // -------------------------- ShiftSwapInvariant --------------------------
 
-// ShiftSwapInvariant: gRPC tx msg for changing the swap invariant.
-// Admin-only.
+// MsgShiftSwapInvariant: gRPC tx msg for changing the swap invariant.
+// [SUDO] Only callable sudoers.
 message MsgShiftSwapInvariant {
   string sender = 1;
   string pair = 2 [
@@ -429,3 +434,20 @@ message MsgShiftSwapInvariant {
 }
 
 message MsgShiftSwapInvariantResponse {}
+
+// -------------------------- WithdrawFromPerpFund --------------------------
+
+// MsgWithdrawFromPerpFund: gRPC tx msg for changing the swap invariant.
+// [SUDO] Only callable sudoers.
+message MsgWithdrawFromPerpFund {
+  string sender = 1;
+  string amount = 2 [
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+    (gogoproto.nullable) = false
+  ];
+  // Optional denom in case withdrawing assets aside from NUSD.
+  string denom = 3;
+  string to_addr = 4;
+}
+
+message MsgWithdrawFromPerpFundResponse {}

wasmbinding/bindings/msg.go

@@ -14,22 +14,15 @@ import (
 type NibiruMsg struct {
 	// bindings-perp ExecuteMsg enum types
 	// MultiLiquidate        *MultiLiquidate        `json:"multi_liquidate,omitempty"` // TODO
-	DonateToInsuranceFund *DonateToInsuranceFund `json:"donate_to_insurance_fund,omitempty"` // TODO
-	InsuranceFundWithdraw *InsuranceFundWithdraw `json:"insurance_fund_withdraw,omitempty"`
-	SetMarketEnabled      *SetMarketEnabled      `json:"set_market_enabled,omitempty"`
-	CreateMarket          *CreateMarket          `json:"create_market,omitempty"`
+	SetMarketEnabled *SetMarketEnabled `json:"set_market_enabled,omitempty"`
+	CreateMarket     *CreateMarket     `json:"create_market,omitempty"`
 
 	EditOracleParams *EditOracleParams `json:"edit_oracle_params,omitempty"`
 
 	// Short for "no operation". A wasm binding payload that does nothing.
 	NoOp *NoOp `json:"no_op,omitempty"`
 }
 
-type DonateToInsuranceFund struct {
-	Sender   string   `json:"sender"`
-	Donation sdk.Coin `json:"donation"`
-}
-
 type EditOracleParams struct {
 	VotePeriod         *sdkmath.Int `json:"vote_period,omitempty"`
 	VoteThreshold      *sdk.Dec     `json:"vote_threshold,omitempty"`
@@ -43,11 +36,6 @@ type EditOracleParams struct {
 	ValidatorFeeRatio  *sdk.Dec     `json:"validator_fee_ratio,omitempty"`
 }
 
-type InsuranceFundWithdraw struct {
-	Amount sdkmath.Int `json:"amount"`
-	To     string      `json:"to"`
-}
-
 type SetMarketEnabled struct {
 	Pair    string `json:"pair"`
 	Enabled bool   `json:"enabled"`

wasmbinding/exec_perp.go

@@ -20,25 +20,6 @@ func (exec *ExecutorPerp) MsgServer() perpv2types.MsgServer {
 	return perpv2keeper.NewMsgServerImpl(exec.PerpV2)
 }
 
-func (exec *ExecutorPerp) InsuranceFundWithdraw(
-	cwMsg *bindings.InsuranceFundWithdraw, ctx sdk.Context,
-) (err error) {
-	if cwMsg == nil {
-		return wasmvmtypes.InvalidRequest{Err: "null msg"}
-	}
-
-	to, err := sdk.AccAddressFromBech32(cwMsg.To)
-	if err != nil {
-		return err
-	}
-
-	return exec.PerpV2.Admin.WithdrawFromInsuranceFund(
-		ctx,
-		cwMsg.Amount,
-		to,
-	)
-}
-
 // TODO: rename to CloseMarket
 func (exec *ExecutorPerp) SetMarketEnabled(
 	cwMsg *bindings.SetMarketEnabled, ctx sdk.Context,
@@ -52,7 +33,7 @@ func (exec *ExecutorPerp) SetMarketEnabled(
 		return err
 	}
 
-	return exec.PerpV2.Admin.CloseMarket(ctx, pair)
+	return exec.PerpV2.Sudo().CloseMarket(ctx, pair)
 }
 
 func (exec *ExecutorPerp) CreateMarket(
@@ -90,7 +71,7 @@ func (exec *ExecutorPerp) CreateMarket(
 		}
 	}
 
-	return exec.PerpV2.Admin.CreateMarket(ctx, perpv2keeper.ArgsCreateMarket{
+	return exec.PerpV2.Sudo().CreateMarket(ctx, perpv2keeper.ArgsCreateMarket{
 		Pair:            pair,
 		PriceMultiplier: cwMsg.PegMult,
 		SqrtDepth:       cwMsg.SqrtDepth,

wasmbinding/exec_perp_test.go

@@ -134,33 +134,13 @@ func (s *TestSuitePerpExecutor) OnSetupEnd() {
 // Happy path coverage
 func (s *TestSuitePerpExecutor) TestPerpExecutorHappy() {
 	for _, err := range []error{
-		s.DoInsuranceFundWithdrawTest(sdk.NewInt(69), s.contractDeployer),
 		s.DoCreateMarketTest(asset.MustNewPair("ufoo:ubar")),
 		s.DoCreateMarketTestWithParams(asset.MustNewPair("ufoo2:ubar")),
 	} {
 		s.NoError(err)
 	}
 }
 
-func (s *TestSuitePerpExecutor) DoInsuranceFundWithdrawTest(
-	amt sdkmath.Int, to sdk.AccAddress,
-) error {
-	cwMsg := &bindings.InsuranceFundWithdraw{
-		Amount: amt,
-		To:     to.String(),
-	}
-
-	err := testapp.FundModuleAccount(
-		s.nibiru.BankKeeper,
-		s.ctx,
-		perpv2types.PerpEFModuleAccount,
-		sdk.NewCoins(sdk.NewCoin(perpv2types.TestingCollateralDenomNUSD, sdk.NewInt(420))),
-	)
-	s.NoError(err)
-
-	return s.exec.InsuranceFundWithdraw(cwMsg, s.ctx)
-}
-
 func (s *TestSuitePerpExecutor) DoCreateMarketTest(pair asset.Pair) error {
 	cwMsg := &bindings.CreateMarket{
 		Pair:         pair.String(),
@@ -197,11 +177,6 @@ func (s *TestSuitePerpExecutor) DoCreateMarketTestWithParams(pair asset.Pair) er
 	return s.exec.CreateMarket(cwMsg, s.ctx)
 }
 
-func (s *TestSuitePerpExecutor) TestSadPaths_Nil() {
-	err := s.exec.InsuranceFundWithdraw(nil, s.ctx)
-	s.Error(err)
-}
-
 func (s *TestSuitePerpExecutor) DoSetMarketEnabledTest(
 	pair asset.Pair, enabled bool,
 ) error {
@@ -220,13 +195,6 @@ func (s *TestSuitePerpExecutor) DoSetMarketEnabledTest(
 	return err
 }
 
-func (s *TestSuitePerpExecutor) TestSadPath_InsuranceFundWithdraw() {
-	fundsToWithdraw := sdk.NewCoin(perpv2types.TestingCollateralDenomNUSD, sdk.NewInt(69_000))
-
-	err := s.DoInsuranceFundWithdrawTest(fundsToWithdraw.Amount, s.contractDeployer)
-	s.Error(err)
-}
-
 func (s *TestSuitePerpExecutor) TestSadPaths_InvalidPair() {
 	sadPair := asset.Pair("ftt:ust:doge")
 	pair := sadPair

wasmbinding/exec_test.go

@@ -313,55 +313,6 @@ func (s *TestSuiteExecutor) TestNoOp() {
 	s.NoErrorf(err, "contractRespBz: %s", contractRespBz)
 }
 
-func (s *TestSuiteExecutor) TestInsuranceFundWithdraw() {
-	admin := s.contractDeployer.String()
-	amtToWithdraw := sdk.NewInt(69)
-	execMsg := bindings.NibiruMsg{
-		InsuranceFundWithdraw: &bindings.InsuranceFundWithdraw{
-			Amount: amtToWithdraw,
-			To:     admin,
-		},
-	}
-
-	s.T().Log("Executing should fail since the IF doesn't have funds")
-	contract := s.contractController
-	s.keeper.SetSudoContracts(
-		[]string{contract.String()}, s.ctx,
-	)
-	contractRespBz, err := s.ExecuteAgainstContract(contract, execMsg)
-	s.Errorf(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 should work when the IF has funds")
-	err = testapp.FundModuleAccount(
-		s.nibiru.BankKeeper,
-		s.ctx,
-		perpv2types.PerpEFModuleAccount,
-		sdk.NewCoins(sdk.NewCoin(perpv2types.TestingCollateralDenomNUSD, sdk.NewInt(420))),
-	)
-	s.NoError(err)
-	s.keeper.SetSudoContracts(
-		[]string{contract.String()}, s.ctx,
-	)
-	contractRespBz, err = s.ExecuteAgainstContract(contract, execMsg)
-	s.NoErrorf(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) TestSetMarketEnabled() {
 	// admin := s.contractDeployer.String()
 	perpv2Genesis := genesis.PerpV2Genesis()

wasmbinding/message_plugin.go

@@ -71,13 +71,6 @@ func (messenger *CustomMessenger) DispatchMsg(
 			err = messenger.Perp.CreateMarket(cwMsg, ctx)
 			return events, data, err
 
-		case contractExecuteMsg.ExecuteMsg.InsuranceFundWithdraw != nil:
-			if err := messenger.Sudo.CheckPermissions(contractAddr, ctx); err != nil {
-				return events, data, err
-			}
-			cwMsg := contractExecuteMsg.ExecuteMsg.InsuranceFundWithdraw
-			err = messenger.Perp.InsuranceFundWithdraw(cwMsg, ctx)
-			return events, data, err
 		case contractExecuteMsg.ExecuteMsg.SetMarketEnabled != nil:
 			if err := messenger.Sudo.CheckPermissions(contractAddr, ctx); err != nil {
 				return events, data, err

x/oracle/keeper/hooks.go

@@ -57,7 +57,7 @@ func (h Hooks) AfterEpochEnd(ctx sdk.Context, epochIdentifier string, _ uint64)
 		}
 
 		if !totalRemainder.IsZero() {
-			err = h.bankKeeper.SendCoinsFromModuleToModule(ctx, perptypes.FeePoolModuleAccount, perptypes.PerpEFModuleAccount, totalRemainder)
+			err = h.bankKeeper.SendCoinsFromModuleToModule(ctx, perptypes.FeePoolModuleAccount, perptypes.PerpFundModuleAccount, totalRemainder)
 			if err != nil {
 				h.k.Logger(ctx).Error("Failed to send coins to perp ef module", "err", err)
 			}

x/oracle/keeper/hooks_test.go

@@ -73,7 +73,7 @@ func TestHooks_AfterEpochEnd(t *testing.T) {
 			balances := app.BankKeeper.GetAllBalances(ctx, account.GetAddress())
 			assert.Equal(t, tt.expectedOracleBalances, balances)
 
-			account = app.AccountKeeper.GetModuleAccount(ctx, perptypes.PerpEFModuleAccount)
+			account = app.AccountKeeper.GetModuleAccount(ctx, perptypes.PerpFundModuleAccount)
 			balances = app.BankKeeper.GetAllBalances(ctx, account.GetAddress())
 			assert.Equal(t, tt.expectedEFBalances, balances)
 		})

x/perp/v2/client/cli/cli_test.go

@@ -8,6 +8,7 @@ import (
 
 	abcitypes "github.com/cometbft/cometbft/abci/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	bankcli "github.com/cosmos/cosmos-sdk/x/bank/client/cli"
 	"github.com/stretchr/testify/suite"
 
@@ -714,16 +715,21 @@ func (s *IntegrationTestSuite) TestDonateToEcosystemFund() {
 
 	s.NoError(s.network.WaitForNextBlock())
 	resp := new(sdk.Coin)
-	moduleAccountAddrPerpEF := "nibi1trh2mamq64u4g042zfeevvjk4cukrthvppfnc7"
+
+	moduleAccPerpFund := authtypes.NewModuleAddress(
+		types.PerpFundModuleAccount).String()
 	s.NoError(
 		testutilcli.ExecQuery(
 			s.network.Validators[0].ClientCtx,
 			bankcli.GetBalancesCmd(),
-			[]string{moduleAccountAddrPerpEF, "--denom", types.TestingCollateralDenomNUSD},
+			[]string{moduleAccPerpFund, "--denom", types.TestingCollateralDenomNUSD},
 			resp,
 		),
 	)
-	s.Require().EqualValues(sdk.NewInt64Coin(types.TestingCollateralDenomNUSD, 100), *resp)
+	s.Require().EqualValues(
+		sdk.NewInt64Coin(types.TestingCollateralDenomNUSD, 100).String(),
+		resp.String(),
+	)
 }
 
 func (s *IntegrationTestSuite) TestQueryModuleAccount() {