From b4175f1eacffe99ab0294d35296c7e6fa5fdcc0f Mon Sep 17 00:00:00 2001
From: Jonathan Gimeno <jgimeno@gmail.com>
Date: Tue, 2 Jan 2024 15:08:04 +0100
Subject: [PATCH] feat(perp): move close market from Wasm Binding to
 MsgCloseMarket as part of #1642 (#1749)

* remove mentions of bindings for closing the market.

* create new message for Closing a Market

* temp commit

* add permissions to call the CloseMarket

* make lint

* it fails when closing market with other user

* update changelog
---
 CHANGELOG.md                               |   2 +
 proto/nibiru/perp/v2/tx.proto              |  20 +
 wasmbinding/bindings/msg.go                |   7 -
 wasmbinding/exec_perp.go                   |  21 -
 wasmbinding/exec_perp_test.go              |  31 --
 wasmbinding/exec_test.go                   |  44 --
 wasmbinding/message_plugin.go              |   9 -
 x/perp/v2/integration/action/settlement.go |  18 +-
 x/perp/v2/keeper/clearing_house_test.go    |   5 +-
 x/perp/v2/keeper/hooks_test.go             |  11 +-
 x/perp/v2/keeper/msg_server.go             |   7 +
 x/perp/v2/keeper/msg_server_test.go        |   5 +-
 x/perp/v2/keeper/settlement_test.go        |  13 +-
 x/perp/v2/keeper/sudo.go                   |  13 +-
 x/perp/v2/keeper/sudo_test.go              |  36 +-
 x/perp/v2/types/msgs.go                    |  22 +
 x/perp/v2/types/tx.pb.go                   | 589 +++++++++++++++++----
 17 files changed, 608 insertions(+), 245 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d526c8e9..7dcee358d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -68,6 +68,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * [#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
+* [#1749](https://github.com/NibiruChain/nibiru/pull/1749) - feat(perp): move close market from Wasm Binding to MsgCloseMarket
+
 
 ### Non-breaking/Compatible Improvements
 
diff --git a/proto/nibiru/perp/v2/tx.proto b/proto/nibiru/perp/v2/tx.proto
index faae01c34..4a8e22893 100644
--- a/proto/nibiru/perp/v2/tx.proto
+++ b/proto/nibiru/perp/v2/tx.proto
@@ -54,8 +54,13 @@ service Msg {
   // account. [SUDO] Only callable by sudoers.
   rpc WithdrawFromPerpFund(MsgWithdrawFromPerpFund)
       returns (MsgWithdrawFromPerpFundResponse) {}
+
+  // CloseMarket: gRPC tx msg for closing a market.
+  // [Admin] Only callable by sudoers.
+  rpc CloseMarket(MsgCloseMarket) returns (MsgCloseMarketResponse) {}
 }
 
+
 // -------------------------- Settle Position --------------------------
 
 /* MsgSettlePosition: Msg to remove margin. */
@@ -451,3 +456,18 @@ message MsgWithdrawFromPerpFund {
 }
 
 message MsgWithdrawFromPerpFundResponse {}
+
+// -------------------------- CloseMarket --------------------------
+
+// CloseMarket: gRPC tx msg for closing a market.
+// Admin-only.
+message MsgCloseMarket {
+  string sender = 1;
+  string pair = 2 [
+    (gogoproto.customtype) =
+        "github.com/NibiruChain/nibiru/x/common/asset.Pair",
+    (gogoproto.nullable) = false
+  ];
+}
+
+message MsgCloseMarketResponse {}
diff --git a/wasmbinding/bindings/msg.go b/wasmbinding/bindings/msg.go
index 40f20cfc8..bbef598d1 100644
--- a/wasmbinding/bindings/msg.go
+++ b/wasmbinding/bindings/msg.go
@@ -14,8 +14,6 @@ import (
 type NibiruMsg struct {
 	// bindings-perp ExecuteMsg enum types
 	// MultiLiquidate        *MultiLiquidate        `json:"multi_liquidate,omitempty"` // TODO
-	SetMarketEnabled *SetMarketEnabled `json:"set_market_enabled,omitempty"`
-
 	EditOracleParams *EditOracleParams `json:"edit_oracle_params,omitempty"`
 
 	// Short for "no operation". A wasm binding payload that does nothing.
@@ -35,11 +33,6 @@ type EditOracleParams struct {
 	ValidatorFeeRatio  *sdk.Dec     `json:"validator_fee_ratio,omitempty"`
 }
 
-type SetMarketEnabled struct {
-	Pair    string `json:"pair"`
-	Enabled bool   `json:"enabled"`
-}
-
 type MarketParams struct {
 	Pair    string
 	Enabled bool `json:"enabled,omitempty"`
diff --git a/wasmbinding/exec_perp.go b/wasmbinding/exec_perp.go
index 5f5aca1b0..da485fda1 100644
--- a/wasmbinding/exec_perp.go
+++ b/wasmbinding/exec_perp.go
@@ -1,11 +1,6 @@
 package wasmbinding
 
 import (
-	wasmvmtypes "github.com/CosmWasm/wasmvm/types"
-	sdk "github.com/cosmos/cosmos-sdk/types"
-
-	"github.com/NibiruChain/nibiru/wasmbinding/bindings"
-	"github.com/NibiruChain/nibiru/x/common/asset"
 	perpv2keeper "github.com/NibiruChain/nibiru/x/perp/v2/keeper"
 	perpv2types "github.com/NibiruChain/nibiru/x/perp/v2/types"
 )
@@ -17,19 +12,3 @@ type ExecutorPerp struct {
 func (exec *ExecutorPerp) MsgServer() perpv2types.MsgServer {
 	return perpv2keeper.NewMsgServerImpl(exec.PerpV2)
 }
-
-// TODO: rename to CloseMarket
-func (exec *ExecutorPerp) SetMarketEnabled(
-	cwMsg *bindings.SetMarketEnabled, 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.Sudo().CloseMarket(ctx, pair)
-}
diff --git a/wasmbinding/exec_perp_test.go b/wasmbinding/exec_perp_test.go
index d1f373225..5848cde59 100644
--- a/wasmbinding/exec_perp_test.go
+++ b/wasmbinding/exec_perp_test.go
@@ -11,7 +11,6 @@ import (
 
 	"github.com/NibiruChain/nibiru/app"
 	"github.com/NibiruChain/nibiru/wasmbinding"
-	"github.com/NibiruChain/nibiru/wasmbinding/bindings"
 	"github.com/NibiruChain/nibiru/wasmbinding/wasmbin"
 	"github.com/NibiruChain/nibiru/x/common/asset"
 	"github.com/NibiruChain/nibiru/x/common/denoms"
@@ -130,33 +129,3 @@ func (s *TestSuitePerpExecutor) OnSetupEnd() {
 	s.contractPerp = ContractMap[wasmbin.WasmKeyPerpBinding]
 	s.ratesMap = SetExchangeRates(&s.Suite, s.nibiru, s.ctx)
 }
-
-func (s *TestSuitePerpExecutor) DoSetMarketEnabledTest(
-	pair asset.Pair, enabled bool,
-) error {
-	cwMsg := &bindings.SetMarketEnabled{
-		Pair:    pair.String(),
-		Enabled: enabled,
-	}
-	err := s.exec.SetMarketEnabled(cwMsg, s.ctx)
-	if err != nil {
-		return err
-	}
-
-	market, err := s.nibiru.PerpKeeperV2.GetMarket(s.ctx, pair)
-	s.NoError(err)
-	s.Equal(enabled, market.Enabled)
-	return err
-}
-
-func (s *TestSuitePerpExecutor) TestSadPaths_InvalidPair() {
-	sadPair := asset.Pair("ftt:ust:doge")
-	pair := sadPair
-
-	for _, err := range []error{
-		s.DoSetMarketEnabledTest(pair, true),
-		s.DoSetMarketEnabledTest(pair, false),
-	} {
-		s.Error(err)
-	}
-}
diff --git a/wasmbinding/exec_test.go b/wasmbinding/exec_test.go
index 019a7aa21..cecf66007 100644
--- a/wasmbinding/exec_test.go
+++ b/wasmbinding/exec_test.go
@@ -16,7 +16,6 @@ import (
 	"github.com/NibiruChain/nibiru/x/common/asset"
 	"github.com/NibiruChain/nibiru/x/common/denoms"
 	"github.com/NibiruChain/nibiru/x/common/testutil"
-	"github.com/NibiruChain/nibiru/x/common/testutil/genesis"
 	"github.com/NibiruChain/nibiru/x/common/testutil/testapp"
 	"github.com/NibiruChain/nibiru/x/oracle/types"
 	perpv2types "github.com/NibiruChain/nibiru/x/perp/v2/types"
@@ -312,46 +311,3 @@ func (s *TestSuiteExecutor) TestNoOp() {
 	contractRespBz, err := s.ExecuteAgainstContract(contract, execMsg)
 	s.NoErrorf(err, "contractRespBz: %s", contractRespBz)
 }
-
-func (s *TestSuiteExecutor) TestSetMarketEnabled() {
-	// admin := s.contractDeployer.String()
-	perpv2Genesis := genesis.PerpV2Genesis()
-	contract := s.contractController
-	var execMsg bindings.NibiruMsg
-
-	for testIdx, market := range perpv2Genesis.Markets {
-		execMsg = bindings.NibiruMsg{
-			SetMarketEnabled: &bindings.SetMarketEnabled{
-				Pair:    market.Pair.String(),
-				Enabled: !market.Enabled,
-			},
-		}
-
-		s.T().Logf("Execute - happy %v: market: %s", testIdx, market.Pair)
-		s.keeper.SetSudoContracts(
-			[]string{contract.String()}, s.ctx,
-		)
-		contractRespBz, err := s.ExecuteAgainstContract(contract, execMsg)
-		s.NoErrorf(err, "contractRespBz: %s", contractRespBz)
-
-		marketAfter, err := s.nibiru.PerpKeeperV2.GetMarket(s.ctx, market.Pair)
-		s.NoError(err)
-		s.Equal(!market.Enabled, marketAfter.Enabled)
-	}
-
-	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")
-}
diff --git a/wasmbinding/message_plugin.go b/wasmbinding/message_plugin.go
index 2bf63e8f0..05e9c1162 100644
--- a/wasmbinding/message_plugin.go
+++ b/wasmbinding/message_plugin.go
@@ -62,15 +62,6 @@ func (messenger *CustomMessenger) DispatchMsg(
 		}
 
 		switch {
-		// Perp module | controller
-		case contractExecuteMsg.ExecuteMsg.SetMarketEnabled != nil:
-			if err := messenger.Sudo.CheckPermissions(contractAddr, ctx); err != nil {
-				return events, data, err
-			}
-			cwMsg := contractExecuteMsg.ExecuteMsg.SetMarketEnabled
-			err = messenger.Perp.SetMarketEnabled(cwMsg, ctx)
-			return events, data, err
-
 		// Oracle module
 		case contractExecuteMsg.ExecuteMsg.EditOracleParams != nil:
 			if err := messenger.Sudo.CheckPermissions(contractAddr, ctx); err != nil {
diff --git a/x/perp/v2/integration/action/settlement.go b/x/perp/v2/integration/action/settlement.go
index 1719d581a..712ce2a87 100644
--- a/x/perp/v2/integration/action/settlement.go
+++ b/x/perp/v2/integration/action/settlement.go
@@ -13,11 +13,12 @@ import (
 
 // closeMarket
 type closeMarket struct {
-	pair asset.Pair
+	pair   asset.Pair
+	sender sdk.AccAddress
 }
 
 func (c closeMarket) Do(app *app.NibiruApp, ctx sdk.Context) (sdk.Context, error) {
-	err := app.PerpKeeperV2.Sudo().CloseMarket(ctx, c.pair)
+	err := app.PerpKeeperV2.Sudo().CloseMarket(ctx, c.pair, c.sender)
 	if err != nil {
 		return ctx, err
 	}
@@ -25,17 +26,18 @@ func (c closeMarket) Do(app *app.NibiruApp, ctx sdk.Context) (sdk.Context, error
 	return ctx, nil
 }
 
-func CloseMarket(pair asset.Pair) action.Action {
-	return closeMarket{pair: pair}
+func CloseMarket(pair asset.Pair, adminAccount sdk.AccAddress) action.Action {
+	return closeMarket{pair: pair, sender: adminAccount}
 }
 
 // closeMarketShouldFail
 type closeMarketShouldFail struct {
-	pair asset.Pair
+	pair   asset.Pair
+	sender sdk.AccAddress
 }
 
 func (c closeMarketShouldFail) Do(app *app.NibiruApp, ctx sdk.Context) (sdk.Context, error) {
-	err := app.PerpKeeperV2.Sudo().CloseMarket(ctx, c.pair)
+	err := app.PerpKeeperV2.Sudo().CloseMarket(ctx, c.pair, c.sender)
 	if err == nil {
 		return ctx, err
 	}
@@ -43,8 +45,8 @@ func (c closeMarketShouldFail) Do(app *app.NibiruApp, ctx sdk.Context) (sdk.Cont
 	return ctx, nil
 }
 
-func CloseMarketShouldFail(pair asset.Pair) action.Action {
-	return closeMarketShouldFail{pair: pair}
+func CloseMarketShouldFail(pair asset.Pair, adminAccount sdk.AccAddress) action.Action {
+	return closeMarketShouldFail{pair: pair, sender: adminAccount}
 }
 
 // settlePosition
diff --git a/x/perp/v2/keeper/clearing_house_test.go b/x/perp/v2/keeper/clearing_house_test.go
index a8f4c8021..834970762 100644
--- a/x/perp/v2/keeper/clearing_house_test.go
+++ b/x/perp/v2/keeper/clearing_house_test.go
@@ -29,6 +29,9 @@ func TestMarketOrder(t *testing.T) {
 	pairBtcNusd := asset.Registry.Pair(denoms.BTC, denoms.NUSD)
 	startBlockTime := time.Now()
 
+	adminUser, err := sdk.AccAddressFromBech32(testutil.ADDR_SUDO_ROOT)
+	require.NoError(t, err)
+
 	tc := TestCases{
 		TC("open big short position and then close after reducing swap invariant").
 			Given(
@@ -885,7 +888,7 @@ func TestMarketOrder(t *testing.T) {
 				SetBlockTime(startBlockTime),
 				SetBlockNumber(1),
 				FundAccount(alice, sdk.NewCoins(sdk.NewCoin(types.TestingCollateralDenomNUSD, sdk.NewInt(47_714_285_715)))),
-				CloseMarket(pairBtcNusd),
+				CloseMarket(pairBtcNusd, adminUser),
 			).
 			When(
 				MarketOrderFails(alice, pairBtcNusd, types.Direction_SHORT, sdk.NewInt(47_619_047_619), sdk.OneDec(), sdk.ZeroDec(),
diff --git a/x/perp/v2/keeper/hooks_test.go b/x/perp/v2/keeper/hooks_test.go
index 24d4c996a..6a7bcde5f 100644
--- a/x/perp/v2/keeper/hooks_test.go
+++ b/x/perp/v2/keeper/hooks_test.go
@@ -4,6 +4,10 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/require"
+
+	"github.com/NibiruChain/nibiru/x/common/testutil"
+
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	"github.com/NibiruChain/nibiru/x/common/asset"
@@ -21,6 +25,9 @@ func TestAfterEpochEnd(t *testing.T) {
 	pairBtcUsdc := asset.Registry.Pair(denoms.BTC, denoms.USDC)
 	startTime := time.Now()
 
+	adminUser, err := sdk.AccAddressFromBech32(testutil.ADDR_SUDO_ROOT)
+	require.NoError(t, err)
+
 	tc := TestCases{
 		TC("index > mark").
 			Given(
@@ -122,7 +129,7 @@ func TestAfterEpochEnd(t *testing.T) {
 		TC("market closed").
 			Given(
 				CreateCustomMarket(pairBtcUsdc, WithEnabled(true)),
-				CloseMarket(pairBtcUsdc),
+				CloseMarket(pairBtcUsdc, adminUser),
 				SetBlockTime(startTime),
 				StartEpoch(epochtypes.ThirtyMinuteEpochID),
 				InsertOraclePriceSnapshot(pairBtcUsd, startTime.Add(15*time.Minute), sdk.NewDec(2)),
@@ -137,7 +144,7 @@ func TestAfterEpochEnd(t *testing.T) {
 		TC("not correct epoch id").
 			Given(
 				CreateCustomMarket(pairBtcUsdc, WithEnabled(true)),
-				CloseMarket(pairBtcUsdc),
+				CloseMarket(pairBtcUsdc, adminUser),
 				SetBlockTime(startTime),
 				StartEpoch(epochtypes.DayEpochID),
 				InsertOraclePriceSnapshot(pairBtcUsd, startTime.Add(15*time.Minute), sdk.NewDec(2)),
diff --git a/x/perp/v2/keeper/msg_server.go b/x/perp/v2/keeper/msg_server.go
index 6db05ede6..38586f68b 100644
--- a/x/perp/v2/keeper/msg_server.go
+++ b/x/perp/v2/keeper/msg_server.go
@@ -232,3 +232,10 @@ func (m msgServer) WithdrawFromPerpFund(
 		ctx, msg.Amount, sender, toAddr, msg.Denom,
 	)
 }
+
+// CloseMarket closes a market.
+func (m msgServer) CloseMarket(ctx context.Context, msg *types.MsgCloseMarket) (*types.MsgCloseMarketResponse, error) {
+	sender, _ := sdk.AccAddressFromBech32(msg.Sender)
+	err := m.k.Sudo().CloseMarket(sdk.UnwrapSDKContext(ctx), msg.Pair, sender)
+	return &types.MsgCloseMarketResponse{}, err
+}
diff --git a/x/perp/v2/keeper/msg_server_test.go b/x/perp/v2/keeper/msg_server_test.go
index 736206169..ea7269dd2 100644
--- a/x/perp/v2/keeper/msg_server_test.go
+++ b/x/perp/v2/keeper/msg_server_test.go
@@ -408,6 +408,9 @@ func TestMsgServerSettlePosition(t *testing.T) {
 	pair := asset.Registry.Pair(denoms.BTC, denoms.NUSD)
 	alice := testutil.AccAddress()
 
+	adminUser, err := sdk.AccAddressFromBech32(testutil.ADDR_SUDO_ROOT)
+	require.NoError(t, err)
+
 	tests := TestCases{
 		TC("Settleposition").
 			Given(
@@ -415,7 +418,7 @@ func TestMsgServerSettlePosition(t *testing.T) {
 				FundAccount(alice, sdk.NewCoins(sdk.NewInt64Coin(types.TestingCollateralDenomNUSD, 100))),
 				MarketOrder(alice, pair, types.Direction_LONG, sdk.OneInt(), sdk.OneDec(), sdk.ZeroDec()),
 				MoveToNextBlock(),
-				CloseMarket(pair),
+				CloseMarket(pair, adminUser),
 			).
 			When(
 				MsgServerSettlePosition(alice, pair, 1),
diff --git a/x/perp/v2/keeper/settlement_test.go b/x/perp/v2/keeper/settlement_test.go
index c1368f986..d80faaa0d 100644
--- a/x/perp/v2/keeper/settlement_test.go
+++ b/x/perp/v2/keeper/settlement_test.go
@@ -4,6 +4,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/require"
+
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	"github.com/NibiruChain/nibiru/x/common/asset"
@@ -23,6 +25,9 @@ func TestSettlePosition(t *testing.T) {
 	alice := testutil.AccAddress()
 	bob := testutil.AccAddress()
 
+	adminUser, err := sdk.AccAddressFromBech32(testutil.ADDR_SUDO_ROOT)
+	require.NoError(t, err)
+
 	tc := TestCases{
 		TC("Happy path").When(
 			CreateCustomMarket(
@@ -43,7 +48,7 @@ func TestSettlePosition(t *testing.T) {
 				sdk.ZeroDec(),
 			),
 		).When(
-			CloseMarket(pairBtcUsdc),
+			CloseMarket(pairBtcUsdc, adminUser),
 			SettlePosition(pairBtcUsdc, 1, alice),
 		).Then(
 			PositionShouldNotExist(alice, pairBtcUsdc, 1),
@@ -84,7 +89,7 @@ func TestSettlePosition(t *testing.T) {
 			// Her Realized Pnl is -101.01010101 and her margin is 100, so -1.01010101 is bad debt
 			// Bob's Realized Pnl is 1010, so he has 1010 more than his margin
 
-			CloseMarket(pairBtcUsdc),
+			CloseMarket(pairBtcUsdc, adminUser),
 			SettlePosition(
 				pairBtcUsdc,
 				1,
@@ -160,7 +165,7 @@ func TestSettlePosition(t *testing.T) {
 				sdk.ZeroDec(),
 			),
 		).When(
-			CloseMarket(pairBtcUsdc),
+			CloseMarket(pairBtcUsdc, adminUser),
 			CreateCustomMarket(
 				pairBtcUsdc,
 				WithPricePeg(sdk.OneDec()),
@@ -206,7 +211,7 @@ func TestSettlePosition(t *testing.T) {
 				sdk.ZeroDec(),
 			),
 		).When(
-			CloseMarket(pairBtcUsdc),
+			CloseMarket(pairBtcUsdc, adminUser),
 			CreateCustomMarket(
 				pairBtcUsdc,
 				WithPricePeg(sdk.OneDec()),
diff --git a/x/perp/v2/keeper/sudo.go b/x/perp/v2/keeper/sudo.go
index 0da898072..bd3636fcf 100644
--- a/x/perp/v2/keeper/sudo.go
+++ b/x/perp/v2/keeper/sudo.go
@@ -129,7 +129,10 @@ func (k sudoExtension) CreateMarket(
 // CloseMarket closes the market. From now on, no new position can be opened on
 // this market or closed. Only the open positions can be settled by calling
 // SettlePosition.
-func (k sudoExtension) CloseMarket(ctx sdk.Context, pair asset.Pair) (err error) {
+func (k sudoExtension) CloseMarket(ctx sdk.Context, pair asset.Pair, sender sdk.AccAddress) (err error) {
+	if err := k.SudoKeeper.CheckPermissions(sender, ctx); err != nil {
+		return err
+	}
 	market, err := k.GetMarket(ctx, pair)
 	if err != nil {
 		return err
@@ -157,7 +160,7 @@ func (k sudoExtension) CloseMarket(ctx sdk.Context, pair asset.Pair) (err error)
 	return nil
 }
 
-// ChangeCollateralDenom: Updates the collateral denom. A denom is valid if it is
+// ChangeCollateralDenom Updates the collateral denom. A denom is valid if it is
 // possible to make an sdk.Coin using it. [SUDO] Only callable by sudoers.
 func (k sudoExtension) ChangeCollateralDenom(
 	ctx sdk.Context,
@@ -170,7 +173,7 @@ func (k sudoExtension) ChangeCollateralDenom(
 	return k.UnsafeChangeCollateralDenom(ctx, denom)
 }
 
-// UnsafeChangeCollateralDenom: Used in the genesis to set the collateral
+// UnsafeChangeCollateralDenom Used in the genesis to set the collateral
 // without requiring an explicit call from sudoers.
 func (k sudoExtension) UnsafeChangeCollateralDenom(
 	ctx sdk.Context,
@@ -183,7 +186,7 @@ func (k sudoExtension) UnsafeChangeCollateralDenom(
 	return nil
 }
 
-// ShiftPegMultiplier: Edit the peg multiplier of an amm pool after making sure
+// ShiftPegMultiplier Edit the peg multiplier of an amm pool after making sure
 // there's enough money in the perp fund to pay for the repeg. These funds get
 // send to the vault to pay for trader's new net margin.
 func (k sudoExtension) ShiftPegMultiplier(
@@ -229,7 +232,7 @@ func (k sudoExtension) ShiftPegMultiplier(
 	})
 }
 
-// ShiftSwapInvariant: Edit the swap invariant (liquidity depth) of an amm pool,
+// ShiftSwapInvariant Edit the swap invariant (liquidity depth) of an amm pool,
 // ensuring that there's enough money in the perp  fund to pay for the operation.
 // These funds get send to the vault to pay for trader's new net margin.
 func (k sudoExtension) ShiftSwapInvariant(
diff --git a/x/perp/v2/keeper/sudo_test.go b/x/perp/v2/keeper/sudo_test.go
index 9fdd4db63..6752e016c 100644
--- a/x/perp/v2/keeper/sudo_test.go
+++ b/x/perp/v2/keeper/sudo_test.go
@@ -93,9 +93,12 @@ func TestCreateMarket(t *testing.T) {
 	app, ctx := testapp.NewNibiruTestAppAndContext()
 	admin := app.PerpKeeperV2.Sudo()
 
+	adminUser, err := sdk.AccAddressFromBech32(testutil.ADDR_SUDO_ROOT)
+	require.NoError(t, err)
+
 	// Error because of invalid market
 	market := perptypes.DefaultMarket(pair).WithMaintenanceMarginRatio(sdk.NewDec(2))
-	err := admin.CreateMarket(ctx, keeper.ArgsCreateMarket{
+	err = admin.CreateMarket(ctx, keeper.ArgsCreateMarket{
 		Pair:            pair,
 		PriceMultiplier: amm.PriceMultiplier,
 		SqrtDepth:       amm.SqrtDepth,
@@ -152,7 +155,7 @@ func TestCreateMarket(t *testing.T) {
 	require.ErrorContains(t, err, "already exists")
 
 	// Close the market to test that we can create it again but with an increased version
-	err = admin.CloseMarket(ctx, pair)
+	err = admin.CloseMarket(ctx, pair, adminUser)
 	require.NoError(t, err)
 
 	err = admin.CreateMarket(ctx, keeper.ArgsCreateMarket{
@@ -181,6 +184,9 @@ func TestCloseMarket(t *testing.T) {
 	startTime := time.Now()
 	alice := testutil.AccAddress()
 
+	adminAccount, err := sdk.AccAddressFromBech32(testutil.ADDR_SUDO_ROOT)
+	require.NoError(t, err)
+
 	tc := TestCases{
 		TC("market can be disabled").
 			Given(
@@ -192,7 +198,7 @@ func TestCloseMarket(t *testing.T) {
 				),
 			).
 			When(
-				CloseMarket(pairBtcUsdc),
+				CloseMarket(pairBtcUsdc, adminAccount),
 			).
 			Then(
 				MarketShouldBeEqual(
@@ -214,7 +220,7 @@ func TestCloseMarket(t *testing.T) {
 				FundAccount(alice, sdk.NewCoins(sdk.NewCoin(perptypes.TestingCollateralDenomNUSD, sdk.NewInt(1e6)))),
 			).
 			When(
-				CloseMarket(pairBtcUsdc),
+				CloseMarket(pairBtcUsdc, adminAccount),
 			).
 			Then(
 				MarketOrderFails(
@@ -246,9 +252,9 @@ func TestCloseMarket(t *testing.T) {
 				sdk.ZeroDec(),
 			),
 		).When(
-			CloseMarket(pairBtcUsdc),
-			CloseMarketShouldFail(pairBtcUsdc),
-			CloseMarketShouldFail("random:pair"),
+			CloseMarket(pairBtcUsdc, adminAccount),
+			CloseMarketShouldFail(pairBtcUsdc, adminAccount),
+			CloseMarketShouldFail("random:pair", adminAccount),
 		).Then(
 			ClosePositionFails(alice, pairBtcUsdc, perptypes.ErrMarketNotEnabled),
 		),
@@ -271,11 +277,25 @@ func TestCloseMarket(t *testing.T) {
 				sdk.ZeroDec(),
 			),
 		).When(
-			CloseMarket(pairBtcUsdc),
+			CloseMarket(pairBtcUsdc, adminAccount),
 			AMMShouldBeEqual(pairBtcUsdc, AMM_SettlementPriceShoulBeEqual(sdk.MustNewDecFromStr("1.099800000000000000"))),
 		).Then(
 			PartialCloseFails(alice, pairBtcUsdc, sdk.NewDec(5_000), perptypes.ErrMarketNotEnabled),
 		),
+		TC("it fails when a non-admin tries to close a market").
+			Given(
+				CreateCustomMarket(pairBtcUsdc, WithEnabled(true)),
+				SetBlockTime(startTime),
+			).
+			When(
+				CloseMarketShouldFail(pairBtcUsdc, alice),
+			).
+			Then(
+				MarketShouldBeEqual(
+					pairBtcUsdc,
+					Market_EnableShouldBeEqualTo(true),
+				),
+			),
 	}
 
 	NewTestSuite(t).WithTestCases(tc...).Run()
diff --git a/x/perp/v2/types/msgs.go b/x/perp/v2/types/msgs.go
index d8173d516..c58d88218 100644
--- a/x/perp/v2/types/msgs.go
+++ b/x/perp/v2/types/msgs.go
@@ -409,6 +409,28 @@ func (m MsgShiftSwapInvariant) GetSignBytes() []byte {
 	return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&m))
 }
 
+// ------------------------ MsgCloseMarket ------------------------
+
+func (m MsgCloseMarket) ValidateBasic() error {
+	if _, err := sdk.AccAddressFromBech32(m.Sender); err != nil {
+		return sdkerrors.Wrapf(errors.ErrInvalidAddress, "invalid sender address (%s)", err)
+	}
+
+	if err := m.Pair.Validate(); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (m MsgCloseMarket) GetSigners() []sdk.AccAddress {
+	signer, err := sdk.AccAddressFromBech32(m.Sender)
+	if err != nil {
+		panic(err)
+	}
+
+	return []sdk.AccAddress{signer}
+}
+
 // ------------------------ MsgWithdrawFromPerpFund ------------------------
 
 func (m MsgWithdrawFromPerpFund) ValidateBasic() error {
diff --git a/x/perp/v2/types/tx.pb.go b/x/perp/v2/types/tx.pb.go
index 9b488a81b..1a57294d4 100644
--- a/x/perp/v2/types/tx.pb.go
+++ b/x/perp/v2/types/tx.pb.go
@@ -1467,6 +1467,89 @@ func (m *MsgWithdrawFromPerpFundResponse) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_MsgWithdrawFromPerpFundResponse proto.InternalMessageInfo
 
+// CloseMarket: gRPC tx msg for closing a market.
+// Admin-only.
+type MsgCloseMarket struct {
+	Sender string                                            `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty"`
+	Pair   github_com_NibiruChain_nibiru_x_common_asset.Pair `protobuf:"bytes,2,opt,name=pair,proto3,customtype=github.com/NibiruChain/nibiru/x/common/asset.Pair" json:"pair"`
+}
+
+func (m *MsgCloseMarket) Reset()         { *m = MsgCloseMarket{} }
+func (m *MsgCloseMarket) String() string { return proto.CompactTextString(m) }
+func (*MsgCloseMarket) ProtoMessage()    {}
+func (*MsgCloseMarket) Descriptor() ([]byte, []int) {
+	return fileDescriptor_b95cda40bf0a0f91, []int{27}
+}
+func (m *MsgCloseMarket) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *MsgCloseMarket) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_MsgCloseMarket.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *MsgCloseMarket) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgCloseMarket.Merge(m, src)
+}
+func (m *MsgCloseMarket) XXX_Size() int {
+	return m.Size()
+}
+func (m *MsgCloseMarket) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgCloseMarket.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MsgCloseMarket proto.InternalMessageInfo
+
+func (m *MsgCloseMarket) GetSender() string {
+	if m != nil {
+		return m.Sender
+	}
+	return ""
+}
+
+type MsgCloseMarketResponse struct {
+}
+
+func (m *MsgCloseMarketResponse) Reset()         { *m = MsgCloseMarketResponse{} }
+func (m *MsgCloseMarketResponse) String() string { return proto.CompactTextString(m) }
+func (*MsgCloseMarketResponse) ProtoMessage()    {}
+func (*MsgCloseMarketResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_b95cda40bf0a0f91, []int{28}
+}
+func (m *MsgCloseMarketResponse) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *MsgCloseMarketResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_MsgCloseMarketResponse.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *MsgCloseMarketResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgCloseMarketResponse.Merge(m, src)
+}
+func (m *MsgCloseMarketResponse) XXX_Size() int {
+	return m.Size()
+}
+func (m *MsgCloseMarketResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgCloseMarketResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MsgCloseMarketResponse proto.InternalMessageInfo
+
 func init() {
 	proto.RegisterType((*MsgSettlePosition)(nil), "nibiru.perp.v2.MsgSettlePosition")
 	proto.RegisterType((*MsgRemoveMargin)(nil), "nibiru.perp.v2.MsgRemoveMargin")
@@ -1497,115 +1580,120 @@ func init() {
 	proto.RegisterType((*MsgShiftSwapInvariantResponse)(nil), "nibiru.perp.v2.MsgShiftSwapInvariantResponse")
 	proto.RegisterType((*MsgWithdrawFromPerpFund)(nil), "nibiru.perp.v2.MsgWithdrawFromPerpFund")
 	proto.RegisterType((*MsgWithdrawFromPerpFundResponse)(nil), "nibiru.perp.v2.MsgWithdrawFromPerpFundResponse")
+	proto.RegisterType((*MsgCloseMarket)(nil), "nibiru.perp.v2.MsgCloseMarket")
+	proto.RegisterType((*MsgCloseMarketResponse)(nil), "nibiru.perp.v2.MsgCloseMarketResponse")
 }
 
 func init() { proto.RegisterFile("nibiru/perp/v2/tx.proto", fileDescriptor_b95cda40bf0a0f91) }
 
 var fileDescriptor_b95cda40bf0a0f91 = []byte{
-	// 1648 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x59, 0x5f, 0x6f, 0x1b, 0xc5,
-	0x16, 0xf7, 0xc6, 0x8e, 0x93, 0x9c, 0xa4, 0xf9, 0xb3, 0x4d, 0x13, 0xd7, 0xb7, 0xd7, 0x49, 0x57,
-	0xf7, 0xf6, 0xe6, 0x3e, 0xc4, 0x6e, 0x03, 0x12, 0x02, 0x09, 0x50, 0xfe, 0x34, 0xa8, 0xa8, 0x6e,
-	0xdd, 0x4d, 0xd5, 0xa2, 0x52, 0xb4, 0x9d, 0x78, 0x27, 0x9b, 0x55, 0xd7, 0x33, 0xee, 0xce, 0xd8,
-	0x4e, 0xca, 0x1b, 0x9f, 0x80, 0x07, 0x1e, 0x90, 0x90, 0x78, 0x43, 0x42, 0x3c, 0x20, 0xf5, 0x01,
-	0x78, 0xe1, 0x03, 0xf4, 0xb1, 0x8f, 0x08, 0xa1, 0x82, 0x9a, 0x17, 0x5e, 0xa9, 0xf8, 0x00, 0x68,
-	0xf6, 0x9f, 0x77, 0xdd, 0xb1, 0xe3, 0x98, 0x34, 0x12, 0x88, 0xa7, 0x64, 0x76, 0xce, 0xf9, 0x9d,
-	0xf3, 0x3b, 0xe7, 0xcc, 0x9c, 0x99, 0x31, 0xcc, 0x13, 0x7b, 0xdb, 0x76, 0x1b, 0xa5, 0x3a, 0x76,
-	0xeb, 0xa5, 0xe6, 0x4a, 0x89, 0xef, 0x15, 0xeb, 0x2e, 0xe5, 0x54, 0x9d, 0xf4, 0x27, 0x8a, 0x62,
-	0xa2, 0xd8, 0x5c, 0xc9, 0x9f, 0xb3, 0x28, 0xb5, 0x1c, 0x5c, 0x42, 0x75, 0xbb, 0x84, 0x08, 0xa1,
-	0x1c, 0x71, 0x9b, 0x12, 0xe6, 0x4b, 0xe7, 0x0b, 0x55, 0xca, 0x6a, 0x94, 0x95, 0xb6, 0x11, 0xc3,
-	0xa5, 0xe6, 0xa5, 0x6d, 0xcc, 0xd1, 0xa5, 0x52, 0x95, 0xda, 0x24, 0x98, 0x9f, 0xb5, 0xa8, 0x45,
-	0xbd, 0x7f, 0x4b, 0xe2, 0xbf, 0xe0, 0x6b, 0xbe, 0xc3, 0x38, 0xe3, 0x88, 0x63, 0x7f, 0x4e, 0xfb,
-	0x44, 0x81, 0x99, 0x32, 0xb3, 0xb6, 0x30, 0xe7, 0x0e, 0xae, 0x50, 0x66, 0x0b, 0x73, 0xea, 0x1c,
-	0x64, 0x19, 0x26, 0x26, 0x76, 0x73, 0xca, 0xa2, 0xb2, 0x34, 0xa6, 0x07, 0x23, 0xb5, 0x0c, 0x99,
-	0x3a, 0xb2, 0xdd, 0xdc, 0x90, 0xf8, 0xba, 0xf6, 0xfa, 0xe3, 0xa7, 0x0b, 0xa9, 0x1f, 0x9f, 0x2e,
-	0x5c, 0xb2, 0x6c, 0xbe, 0xdb, 0xd8, 0x2e, 0x56, 0x69, 0xad, 0x74, 0xcd, 0x33, 0xb5, 0xbe, 0x8b,
-	0x6c, 0x52, 0x0a, 0xcc, 0xee, 0x95, 0xaa, 0xb4, 0x56, 0xa3, 0xa4, 0x84, 0x18, 0xc3, 0xbc, 0x58,
-	0x41, 0xb6, 0xab, 0x7b, 0x30, 0x6a, 0x0e, 0x46, 0x9a, 0xd8, 0x65, 0x36, 0x25, 0xb9, 0xf4, 0xa2,
-	0xb2, 0x94, 0xd1, 0xc3, 0xa1, 0xf6, 0x48, 0x81, 0xa9, 0x32, 0xb3, 0x74, 0x5c, 0xa3, 0x4d, 0x5c,
-	0x46, 0xae, 0x65, 0x9f, 0x98, 0x53, 0xaf, 0x41, 0xb6, 0xe6, 0x19, 0xf4, 0x7c, 0x1a, 0x5f, 0x39,
-	0x5b, 0xf4, 0x83, 0x5e, 0x14, 0x41, 0x2f, 0x06, 0x41, 0x2f, 0xae, 0x53, 0x9b, 0xac, 0x65, 0x84,
-	0x2d, 0x3d, 0x10, 0xd7, 0x7e, 0x55, 0x60, 0xbe, 0xc3, 0x67, 0x1d, 0xb3, 0x3a, 0x25, 0x0c, 0xab,
-	0x6f, 0x01, 0xf8, 0x52, 0x06, 0x6d, 0x70, 0xcf, 0xff, 0x3e, 0x80, 0xc7, 0x7c, 0x95, 0xeb, 0x0d,
-	0xae, 0xde, 0x86, 0xa9, 0x9d, 0x06, 0x31, 0x6d, 0x62, 0x19, 0x75, 0xb4, 0x5f, 0xc3, 0x84, 0x07,
-	0x74, 0x8b, 0x01, 0xdd, 0x0b, 0x31, 0xba, 0x41, 0x91, 0xf8, 0x7f, 0x96, 0x99, 0x79, 0xbf, 0xc4,
-	0xf7, 0xeb, 0x98, 0x15, 0x37, 0x70, 0x55, 0x9f, 0x0c, 0x60, 0x2a, 0x3e, 0x8a, 0xfa, 0x2a, 0x8c,
-	0xd6, 0x83, 0xac, 0x07, 0x7c, 0x73, 0xc5, 0x64, 0x49, 0x16, 0xc3, 0xaa, 0xd0, 0x23, 0x49, 0xed,
-	0x6b, 0x05, 0x26, 0xca, 0xcc, 0x5a, 0x35, 0xcd, 0xbf, 0x48, 0x6e, 0xbe, 0x50, 0x60, 0x36, 0xee,
-	0x70, 0x94, 0x18, 0x49, 0x60, 0x95, 0x63, 0x0f, 0xec, 0x50, 0xdf, 0x81, 0xfd, 0xdd, 0x5f, 0x8e,
-	0xe5, 0x86, 0xc3, 0xed, 0xab, 0xf6, 0x83, 0x86, 0x6d, 0x22, 0x8e, 0xbb, 0x46, 0xf7, 0x06, 0x4c,
-	0x38, 0x81, 0x90, 0xd8, 0x24, 0x72, 0x43, 0x8b, 0xe9, 0xa5, 0xf1, 0x95, 0xe5, 0x4e, 0x3b, 0x2f,
-	0x00, 0x16, 0xaf, 0xb6, 0xb5, 0xf4, 0x04, 0x44, 0x9e, 0xc3, 0x78, 0x6c, 0x32, 0xca, 0x9f, 0x72,
-	0x3c, 0xf9, 0x9b, 0x83, 0x2c, 0x77, 0x91, 0x20, 0x32, 0xe4, 0x13, 0xf1, 0x47, 0xda, 0xb7, 0x69,
-	0x38, 0xfb, 0x82, 0x97, 0x51, 0x8e, 0x50, 0x07, 0x4d, 0xc5, 0xa3, 0xf9, 0xe6, 0xa1, 0x34, 0x43,
-	0x80, 0x04, 0xdd, 0xe0, 0x5b, 0x07, 0xed, 0x6f, 0x86, 0xe0, 0xb4, 0x44, 0x4a, 0xec, 0x50, 0xac,
-	0x51, 0xad, 0x62, 0xc6, 0xbc, 0x10, 0x8c, 0xea, 0xe1, 0x50, 0x9d, 0x85, 0x61, 0xec, 0xba, 0x34,
-	0x64, 0xe2, 0x0f, 0xd4, 0x4d, 0x98, 0x0c, 0x71, 0xa9, 0x6b, 0xec, 0x60, 0xdc, 0x5f, 0xa1, 0x2a,
-	0xfa, 0xa9, 0xb6, 0xda, 0x26, 0xc6, 0xea, 0xdb, 0x30, 0x2e, 0x68, 0x19, 0x78, 0xc7, 0x03, 0xc9,
-	0xf4, 0x07, 0x32, 0x26, 0x74, 0x2e, 0xef, 0x08, 0x80, 0x76, 0xa4, 0x87, 0xe3, 0x91, 0x8e, 0x12,
-	0x9a, 0x3d, 0x96, 0x84, 0x6a, 0xdf, 0xa5, 0x61, 0x52, 0xc4, 0x1d, 0xb9, 0xf7, 0x31, 0xbf, 0xee,
-	0x0a, 0x0b, 0x27, 0xb4, 0x15, 0x2c, 0x43, 0x86, 0xd9, 0xa6, 0x1f, 0xdf, 0xc9, 0x95, 0xb3, 0x9d,
-	0xc5, 0xb0, 0x61, 0xbb, 0xb8, 0xea, 0xa5, 0xd2, 0x13, 0x53, 0xef, 0x82, 0xfa, 0xa0, 0x41, 0x39,
-	0x36, 0x3c, 0x20, 0x03, 0xd5, 0x68, 0x83, 0x70, 0x2f, 0xae, 0x47, 0x5b, 0xea, 0x57, 0x08, 0xd7,
-	0xa7, 0x3d, 0xa4, 0x55, 0x01, 0xb4, 0xea, 0xe1, 0xa8, 0xef, 0xc2, 0xa8, 0x83, 0x9b, 0xd8, 0x45,
-	0x16, 0xf6, 0xe3, 0x7d, 0xe4, 0xed, 0x23, 0xd2, 0x57, 0x31, 0xcc, 0x8b, 0xfc, 0x26, 0x1c, 0x35,
-	0x1c, 0xbb, 0x66, 0xf3, 0x20, 0x69, 0x47, 0x75, 0x77, 0x56, 0xc0, 0xc5, 0xbc, 0xbd, 0x2a, 0xb0,
-	0xb4, 0x83, 0x61, 0x98, 0x4b, 0x66, 0x2e, 0x2a, 0xfa, 0xf8, 0xd6, 0xa5, 0xf4, 0xbb, 0x75, 0xa9,
-	0xbb, 0x90, 0xc3, 0x7b, 0xd5, 0x5d, 0x44, 0x2c, 0x6c, 0x1a, 0x84, 0x8a, 0x6f, 0xc8, 0x31, 0x9a,
-	0xc8, 0x69, 0xe0, 0x01, 0x7b, 0xd5, 0x5c, 0x84, 0x77, 0x2d, 0x80, 0xbb, 0x25, 0xd0, 0xd4, 0x1d,
-	0x98, 0x6f, 0x5b, 0x0a, 0xed, 0x1b, 0xcc, 0x7e, 0xe8, 0x57, 0xc3, 0xd1, 0x0d, 0x9d, 0x89, 0xe0,
-	0x42, 0x5e, 0x5b, 0xf6, 0x43, 0x69, 0x6f, 0xc8, 0x1c, 0x4b, 0x6f, 0xb8, 0x01, 0x13, 0x2e, 0x46,
-	0x8e, 0xfd, 0x50, 0xf8, 0x4f, 0x9c, 0x01, 0x4b, 0x66, 0x3c, 0xc4, 0xa8, 0x10, 0x47, 0xbd, 0x07,
-	0xb3, 0x0d, 0x12, 0x07, 0x35, 0xd0, 0x0e, 0xc7, 0xee, 0x00, 0x25, 0x23, 0xa0, 0xd5, 0x36, 0x56,
-	0x85, 0x38, 0xab, 0x02, 0x49, 0xbd, 0x05, 0x53, 0xc1, 0x11, 0x86, 0x53, 0xa3, 0x89, 0x1a, 0x0e,
-	0xcf, 0x8d, 0x0c, 0x04, 0x7e, 0xca, 0x87, 0xb9, 0x49, 0x6f, 0x09, 0x10, 0xf5, 0x7d, 0x98, 0x89,
-	0x72, 0x18, 0x96, 0x4d, 0x6e, 0x74, 0x20, 0xe4, 0xe9, 0x10, 0x28, 0xac, 0x17, 0x6d, 0x1f, 0xa6,
-	0xcb, 0xcc, 0x5a, 0x77, 0x28, 0x3b, 0xe9, 0xc3, 0xad, 0xf6, 0x3c, 0x0d, 0xb9, 0x4e, 0xdb, 0xd1,
-	0x12, 0xeb, 0xb5, 0x58, 0x94, 0x93, 0x5a, 0x2c, 0x43, 0x2f, 0x79, 0xb1, 0xa4, 0x5f, 0xca, 0x62,
-	0xc9, 0xfc, 0xf9, 0xc5, 0xf2, 0x1e, 0x4c, 0xb7, 0x4b, 0x39, 0xde, 0x26, 0x8f, 0xee, 0x6c, 0x58,
-	0xcb, 0x37, 0xfd, 0x83, 0xcc, 0xf7, 0xfe, 0xbd, 0xa5, 0x82, 0x5c, 0x6e, 0x23, 0xc7, 0xcb, 0xfd,
-	0x49, 0x35, 0xc4, 0x35, 0xd1, 0x10, 0x07, 0xde, 0x02, 0x3d, 0x5d, 0xed, 0xb7, 0xb4, 0x77, 0x85,
-	0x89, 0xbb, 0xff, 0x4f, 0xc9, 0xfe, 0xcd, 0x4b, 0xf6, 0x23, 0xc5, 0xdb, 0xa7, 0x36, 0x28, 0x41,
-	0x1c, 0xdf, 0xa4, 0x97, 0xab, 0x94, 0xed, 0x33, 0x8e, 0x6b, 0x9b, 0x0d, 0x62, 0x76, 0xad, 0xdd,
-	0x6b, 0x30, 0x6a, 0x0a, 0x85, 0xf6, 0xed, 0xa6, 0xc7, 0xe1, 0x74, 0x5e, 0x78, 0xf8, 0xfc, 0xe9,
-	0xc2, 0xd4, 0x3e, 0xaa, 0x39, 0x6f, 0x68, 0xa1, 0xa2, 0xa6, 0x47, 0x18, 0x9a, 0x06, 0x8b, 0xdd,
-	0x7c, 0x08, 0x0b, 0x50, 0xbb, 0xee, 0xef, 0xa7, 0x5e, 0x22, 0xd7, 0xa9, 0xe3, 0x20, 0x8e, 0x5d,
-	0xe4, 0x6c, 0x60, 0x42, 0x6b, 0x5d, 0xfd, 0xfc, 0x17, 0x8c, 0x11, 0xdc, 0x32, 0x4c, 0x21, 0x14,
-	0x9c, 0xd4, 0x47, 0x09, 0x6e, 0x79, 0x4a, 0x81, 0x51, 0x29, 0x60, 0x64, 0xf4, 0x53, 0xff, 0x52,
-	0xbf, 0xea, 0x38, 0xb4, 0x8a, 0x38, 0xbe, 0x5c, 0xa7, 0xd5, 0x5d, 0x1d, 0x6f, 0x23, 0x8e, 0x59,
-	0x57, 0xa3, 0x18, 0x46, 0x5c, 0x5f, 0x24, 0xb8, 0x91, 0xf5, 0x88, 0xcd, 0x45, 0x11, 0x9b, 0xaf,
-	0x7e, 0x5e, 0x58, 0xea, 0x23, 0x7b, 0x42, 0x81, 0xe9, 0x21, 0xb6, 0xf6, 0xb9, 0x02, 0x0b, 0x5d,
-	0x5c, 0x8b, 0x16, 0xed, 0x87, 0x70, 0x9a, 0x53, 0x8e, 0x1c, 0x03, 0x8b, 0x59, 0x23, 0x74, 0x4b,
-	0x39, 0x7e, 0xb7, 0x66, 0x3c, 0x3b, 0x71, 0x27, 0xb4, 0x2b, 0x5e, 0xe8, 0x6e, 0xdb, 0x7c, 0xd7,
-	0x74, 0x51, 0xab, 0xaf, 0xd0, 0xcd, 0x41, 0xd6, 0xf3, 0xd4, 0x8f, 0x5c, 0x46, 0x0f, 0x46, 0xda,
-	0x67, 0x3e, 0x57, 0x19, 0x56, 0xc4, 0x75, 0x0f, 0x66, 0x5a, 0xc1, 0x3c, 0x79, 0x99, 0x4c, 0xa7,
-	0x23, 0x2b, 0x21, 0xd1, 0x27, 0x0a, 0x9c, 0x29, 0x33, 0x6b, 0x6b, 0xd7, 0xde, 0xe1, 0x15, 0xec,
-	0xdf, 0x42, 0xeb, 0x8e, 0x7d, 0x72, 0x97, 0xa1, 0x0a, 0x4c, 0x88, 0x32, 0xaf, 0x63, 0xcb, 0xa8,
-	0x89, 0x83, 0xd9, 0x60, 0xdb, 0x18, 0x10, 0xdc, 0x0a, 0xdc, 0xd7, 0x16, 0xe0, 0xdf, 0x52, 0x46,
-	0xd1, 0xc2, 0xf8, 0x29, 0xc6, 0x79, 0xab, 0x85, 0xea, 0x57, 0x48, 0x13, 0xb9, 0x36, 0x22, 0xfc,
-	0xa4, 0x38, 0xdf, 0x05, 0x55, 0x70, 0x66, 0x2d, 0x54, 0x37, 0xec, 0xd0, 0xf8, 0x00, 0xcc, 0xbd,
-	0x1b, 0x1d, 0xc1, 0xad, 0x04, 0x89, 0x38, 0xff, 0xc4, 0x44, 0xc4, 0xff, 0x4b, 0x25, 0x51, 0xdd,
-	0x9b, 0x2e, 0xad, 0x55, 0xb0, 0x5b, 0xef, 0xb9, 0x6b, 0x6e, 0x42, 0x36, 0xb8, 0x78, 0x0e, 0x0d,
-	0xe4, 0x66, 0xa0, 0xad, 0xce, 0xc2, 0xb0, 0xbf, 0xa3, 0xa5, 0xfd, 0xb7, 0x07, 0x6f, 0xa0, 0xce,
-	0xc3, 0x08, 0xa7, 0x06, 0x32, 0x4d, 0xd7, 0x6f, 0x38, 0x7a, 0x96, 0xd3, 0x55, 0xd3, 0x74, 0xb5,
-	0xf3, 0x89, 0xb5, 0x13, 0xf7, 0x34, 0x64, 0xb3, 0xf2, 0x68, 0x1c, 0xd2, 0x65, 0x66, 0xa9, 0x77,
-	0x60, 0x22, 0xf1, 0xe6, 0xba, 0x20, 0x79, 0x64, 0x89, 0x0b, 0xe4, 0xff, 0x77, 0x88, 0x40, 0x14,
-	0xaf, 0x94, 0x7a, 0x03, 0xc6, 0xda, 0x0f, 0x86, 0xe7, 0x24, 0x7a, 0xd1, 0x6c, 0xfe, 0x3f, 0xbd,
-	0x66, 0x63, 0x90, 0xf7, 0x60, 0xb2, 0xe3, 0xa9, 0xec, 0xfc, 0xa1, 0xaf, 0x42, 0xf9, 0xff, 0xf7,
-	0xfd, 0x70, 0xa4, 0xa5, 0xd4, 0xdb, 0x30, 0x1e, 0x7f, 0xdc, 0x28, 0xc8, 0x74, 0xdb, 0xf3, 0xf9,
-	0x0b, 0xbd, 0xe7, 0x63, 0xc0, 0x1f, 0xc0, 0xa9, 0xe4, 0xb5, 0x64, 0x51, 0xa2, 0x9a, 0x90, 0xc8,
-	0x2f, 0x1d, 0x26, 0x11, 0x83, 0xbf, 0x03, 0x13, 0x89, 0x43, 0xa8, 0x2c, 0x91, 0x71, 0x01, 0x69,
-	0x22, 0x65, 0xe7, 0x40, 0x2d, 0xa5, 0x1a, 0x30, 0xd9, 0xf1, 0x7b, 0x81, 0x2c, 0xea, 0x49, 0x91,
-	0x23, 0x39, 0xdf, 0x80, 0x33, 0xf2, 0xe3, 0x88, 0x0c, 0x44, 0x2a, 0x99, 0xbf, 0xd8, 0xaf, 0x64,
-	0xd2, 0xac, 0xfc, 0x74, 0x21, 0xf5, 0x5d, 0x26, 0x29, 0x35, 0xdb, 0xfb, 0x80, 0x91, 0x52, 0x5d,
-	0x98, 0x95, 0x1e, 0x2f, 0x64, 0x19, 0x91, 0x09, 0xe6, 0x4b, 0x7d, 0x0a, 0x26, 0x6d, 0x4a, 0xfb,
-	0xb2, 0xcc, 0xa6, 0x4c, 0x50, 0x6a, 0xb3, 0x57, 0x77, 0xd6, 0x52, 0xaa, 0x03, 0xaa, 0xa4, 0x43,
-	0xfe, 0x57, 0x56, 0x3a, 0x2f, 0x88, 0xe5, 0x97, 0xfb, 0x12, 0x93, 0x58, 0x4b, 0xf6, 0xa6, 0xae,
-	0xd6, 0x12, 0x62, 0xdd, 0xad, 0xc9, 0x7b, 0x41, 0x22, 0x9e, 0x89, 0x4e, 0xd0, 0x2b, 0x9e, 0x71,
-	0xc1, 0x9e, 0xf1, 0x94, 0xed, 0xd8, 0x5a, 0x6a, 0xed, 0x9d, 0xc7, 0xcf, 0x0a, 0xca, 0x93, 0x67,
-	0x05, 0xe5, 0x97, 0x67, 0x05, 0xe5, 0xe3, 0x83, 0x42, 0xea, 0xc9, 0x41, 0x21, 0xf5, 0xc3, 0x41,
-	0x21, 0x75, 0x67, 0xf9, 0xb0, 0x9e, 0x1a, 0xfd, 0x0c, 0x29, 0x5a, 0xcb, 0x76, 0xd6, 0xfb, 0x29,
-	0xf0, 0x95, 0x3f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xb3, 0x7a, 0xd3, 0x25, 0xa5, 0x1c, 0x00, 0x00,
+	// 1686 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x59, 0x4b, 0x6f, 0x1b, 0x47,
+	0x12, 0xe6, 0x88, 0x14, 0x25, 0x95, 0x64, 0x3d, 0xc6, 0xb2, 0x44, 0x73, 0xbd, 0x94, 0x3c, 0xd8,
+	0xf5, 0x6a, 0x0f, 0x22, 0x6d, 0xed, 0x02, 0x8b, 0x5d, 0x60, 0x77, 0xa1, 0x87, 0x15, 0x38, 0x30,
+	0x6d, 0x7a, 0x64, 0xd8, 0x81, 0xe3, 0x60, 0xdc, 0xe2, 0xb4, 0x46, 0x03, 0x0f, 0xbb, 0xe9, 0x99,
+	0x26, 0x29, 0x39, 0xb7, 0x1c, 0x73, 0xca, 0x21, 0x87, 0x00, 0x01, 0x72, 0x0b, 0x10, 0xe4, 0x10,
+	0x20, 0x87, 0x24, 0x97, 0xfc, 0x00, 0x1f, 0x7d, 0x0c, 0x82, 0xc0, 0x09, 0xac, 0x4b, 0xae, 0x31,
+	0xf2, 0x03, 0x82, 0xee, 0x79, 0x70, 0x86, 0x6e, 0x52, 0x14, 0x23, 0x13, 0x48, 0x90, 0x93, 0xd4,
+	0xd3, 0xd5, 0x5f, 0xd5, 0x57, 0x55, 0xdd, 0x55, 0xdd, 0x84, 0x45, 0x62, 0xef, 0xda, 0x6e, 0xa3,
+	0x54, 0xc7, 0x6e, 0xbd, 0xd4, 0x5c, 0x2b, 0xb1, 0x83, 0x62, 0xdd, 0xa5, 0x8c, 0xaa, 0xd3, 0xfe,
+	0x44, 0x91, 0x4f, 0x14, 0x9b, 0x6b, 0xf9, 0x0b, 0x16, 0xa5, 0x96, 0x83, 0x4b, 0xa8, 0x6e, 0x97,
+	0x10, 0x21, 0x94, 0x21, 0x66, 0x53, 0xe2, 0xf9, 0xd2, 0xf9, 0x42, 0x95, 0x7a, 0x35, 0xea, 0x95,
+	0x76, 0x91, 0x87, 0x4b, 0xcd, 0x2b, 0xbb, 0x98, 0xa1, 0x2b, 0xa5, 0x2a, 0xb5, 0x49, 0x30, 0x3f,
+	0x6f, 0x51, 0x8b, 0x8a, 0x7f, 0x4b, 0xfc, 0xbf, 0xe0, 0x6b, 0xbe, 0x43, 0xb9, 0xc7, 0x10, 0xc3,
+	0xfe, 0x9c, 0xf6, 0xbe, 0x02, 0x73, 0x65, 0xcf, 0xda, 0xc1, 0x8c, 0x39, 0xb8, 0x42, 0x3d, 0x9b,
+	0xab, 0x53, 0x17, 0x20, 0xeb, 0x61, 0x62, 0x62, 0x37, 0xa7, 0x2c, 0x2b, 0x2b, 0x13, 0x7a, 0x30,
+	0x52, 0xcb, 0x90, 0xa9, 0x23, 0xdb, 0xcd, 0x8d, 0xf0, 0xaf, 0x1b, 0xff, 0x7e, 0xf2, 0x6c, 0x29,
+	0xf5, 0xed, 0xb3, 0xa5, 0x2b, 0x96, 0xcd, 0xf6, 0x1b, 0xbb, 0xc5, 0x2a, 0xad, 0x95, 0x6e, 0x08,
+	0x55, 0x9b, 0xfb, 0xc8, 0x26, 0xa5, 0x40, 0xed, 0x41, 0xa9, 0x4a, 0x6b, 0x35, 0x4a, 0x4a, 0xc8,
+	0xf3, 0x30, 0x2b, 0x56, 0x90, 0xed, 0xea, 0x02, 0x46, 0xcd, 0xc1, 0x58, 0x13, 0xbb, 0x9e, 0x4d,
+	0x49, 0x2e, 0xbd, 0xac, 0xac, 0x64, 0xf4, 0x70, 0xa8, 0x7d, 0xae, 0xc0, 0x4c, 0xd9, 0xb3, 0x74,
+	0x5c, 0xa3, 0x4d, 0x5c, 0x46, 0xae, 0x65, 0x0f, 0xcd, 0xa8, 0x7f, 0x41, 0xb6, 0x26, 0x14, 0x0a,
+	0x9b, 0x26, 0xd7, 0xce, 0x17, 0x7d, 0xa7, 0x17, 0xb9, 0xd3, 0x8b, 0x81, 0xd3, 0x8b, 0x9b, 0xd4,
+	0x26, 0x1b, 0x19, 0xae, 0x4b, 0x0f, 0xc4, 0xb5, 0x1f, 0x15, 0x58, 0xec, 0xb0, 0x59, 0xc7, 0x5e,
+	0x9d, 0x12, 0x0f, 0xab, 0xff, 0x03, 0xf0, 0xa5, 0x0c, 0xda, 0x60, 0xc2, 0xfe, 0x3e, 0x80, 0x27,
+	0xfc, 0x25, 0x37, 0x1b, 0x4c, 0xbd, 0x0b, 0x33, 0x7b, 0x0d, 0x62, 0xda, 0xc4, 0x32, 0xea, 0xe8,
+	0xb0, 0x86, 0x09, 0x0b, 0xe8, 0x16, 0x03, 0xba, 0x97, 0x62, 0x74, 0x83, 0x24, 0xf1, 0xff, 0xac,
+	0x7a, 0xe6, 0xc3, 0x12, 0x3b, 0xac, 0x63, 0xaf, 0xb8, 0x85, 0xab, 0xfa, 0x74, 0x00, 0x53, 0xf1,
+	0x51, 0xd4, 0x7f, 0xc2, 0x78, 0x3d, 0x88, 0x7a, 0xc0, 0x37, 0x57, 0x4c, 0xa6, 0x64, 0x31, 0xcc,
+	0x0a, 0x3d, 0x92, 0xd4, 0x3e, 0x53, 0x60, 0xaa, 0xec, 0x59, 0xeb, 0xa6, 0xf9, 0x1b, 0x89, 0xcd,
+	0xc7, 0x0a, 0xcc, 0xc7, 0x0d, 0x8e, 0x02, 0x23, 0x71, 0xac, 0x72, 0xea, 0x8e, 0x1d, 0xe9, 0xdb,
+	0xb1, 0x3f, 0xfb, 0xdb, 0xb1, 0xdc, 0x70, 0x98, 0x7d, 0xdd, 0x7e, 0xd4, 0xb0, 0x4d, 0xc4, 0x70,
+	0x57, 0xef, 0xde, 0x82, 0x29, 0x27, 0x10, 0xe2, 0x87, 0x44, 0x6e, 0x64, 0x39, 0xbd, 0x32, 0xb9,
+	0xb6, 0xda, 0xa9, 0xe7, 0x25, 0xc0, 0xe2, 0xf5, 0xf6, 0x2a, 0x3d, 0x01, 0x91, 0x67, 0x30, 0x19,
+	0x9b, 0x8c, 0xe2, 0xa7, 0x9c, 0x4e, 0xfc, 0x16, 0x20, 0xcb, 0x5c, 0xc4, 0x89, 0x8c, 0xf8, 0x44,
+	0xfc, 0x91, 0xf6, 0x65, 0x1a, 0xce, 0xbf, 0x64, 0x65, 0x14, 0x23, 0xd4, 0x41, 0x53, 0x11, 0x34,
+	0xff, 0x7b, 0x2c, 0xcd, 0x10, 0x20, 0x41, 0x37, 0xf8, 0xd6, 0x41, 0xfb, 0x8b, 0x11, 0x38, 0x2b,
+	0x91, 0xe2, 0x27, 0x94, 0xd7, 0xa8, 0x56, 0xb1, 0xe7, 0x09, 0x17, 0x8c, 0xeb, 0xe1, 0x50, 0x9d,
+	0x87, 0x51, 0xec, 0xba, 0x34, 0x64, 0xe2, 0x0f, 0xd4, 0x6d, 0x98, 0x0e, 0x71, 0xa9, 0x6b, 0xec,
+	0x61, 0xdc, 0x5f, 0xa2, 0x2a, 0xfa, 0x99, 0xf6, 0xb2, 0x6d, 0x8c, 0xd5, 0xff, 0xc3, 0x24, 0xa7,
+	0x65, 0xe0, 0x3d, 0x01, 0x92, 0xe9, 0x0f, 0x64, 0x82, 0xaf, 0xb9, 0xba, 0xc7, 0x01, 0xda, 0x9e,
+	0x1e, 0x8d, 0x7b, 0x3a, 0x0a, 0x68, 0xf6, 0x54, 0x02, 0xaa, 0x7d, 0x95, 0x86, 0x69, 0xee, 0x77,
+	0xe4, 0x3e, 0xc4, 0xec, 0xa6, 0xcb, 0x35, 0x0c, 0xe9, 0x28, 0x58, 0x85, 0x8c, 0x67, 0x9b, 0xbe,
+	0x7f, 0xa7, 0xd7, 0xce, 0x77, 0x26, 0xc3, 0x96, 0xed, 0xe2, 0xaa, 0x08, 0xa5, 0x10, 0x53, 0xef,
+	0x83, 0xfa, 0xa8, 0x41, 0x19, 0x36, 0x04, 0x90, 0x81, 0x6a, 0xb4, 0x41, 0x98, 0xf0, 0xeb, 0xc9,
+	0xb6, 0xfa, 0x35, 0xc2, 0xf4, 0x59, 0x81, 0xb4, 0xce, 0x81, 0xd6, 0x05, 0x8e, 0xfa, 0x3a, 0x8c,
+	0x3b, 0xb8, 0x89, 0x5d, 0x64, 0x61, 0xdf, 0xdf, 0x27, 0x3e, 0x3e, 0xa2, 0xf5, 0x2a, 0x86, 0x45,
+	0x1e, 0xdf, 0x84, 0xa1, 0x86, 0x63, 0xd7, 0x6c, 0x16, 0x04, 0xed, 0xa4, 0xe6, 0xce, 0x73, 0xb8,
+	0x98, 0xb5, 0xd7, 0x39, 0x96, 0x76, 0x34, 0x0a, 0x0b, 0xc9, 0xc8, 0x45, 0x49, 0x1f, 0x3f, 0xba,
+	0x94, 0x7e, 0x8f, 0x2e, 0x75, 0x1f, 0x72, 0xf8, 0xa0, 0xba, 0x8f, 0x88, 0x85, 0x4d, 0x83, 0x50,
+	0xfe, 0x0d, 0x39, 0x46, 0x13, 0x39, 0x0d, 0x3c, 0x60, 0xad, 0x5a, 0x88, 0xf0, 0x6e, 0x04, 0x70,
+	0x77, 0x38, 0x9a, 0xba, 0x07, 0x8b, 0x6d, 0x4d, 0xa1, 0x7e, 0xc3, 0xb3, 0x1f, 0xfb, 0xd9, 0x70,
+	0x72, 0x45, 0xe7, 0x22, 0xb8, 0x90, 0xd7, 0x8e, 0xfd, 0x58, 0x5a, 0x1b, 0x32, 0xa7, 0x52, 0x1b,
+	0x6e, 0xc1, 0x94, 0x8b, 0x91, 0x63, 0x3f, 0xe6, 0xf6, 0x13, 0x67, 0xc0, 0x94, 0x99, 0x0c, 0x31,
+	0x2a, 0xc4, 0x51, 0x1f, 0xc0, 0x7c, 0x83, 0xc4, 0x41, 0x0d, 0xb4, 0xc7, 0xb0, 0x3b, 0x40, 0xca,
+	0x70, 0x68, 0xb5, 0x8d, 0x55, 0x21, 0xce, 0x3a, 0x47, 0x52, 0xef, 0xc0, 0x4c, 0xd0, 0xc2, 0x30,
+	0x6a, 0x34, 0x51, 0xc3, 0x61, 0xb9, 0xb1, 0x81, 0xc0, 0xcf, 0xf8, 0x30, 0xb7, 0xe9, 0x1d, 0x0e,
+	0xa2, 0xbe, 0x09, 0x73, 0x51, 0x0c, 0xc3, 0xb4, 0xc9, 0x8d, 0x0f, 0x84, 0x3c, 0x1b, 0x02, 0x85,
+	0xf9, 0xa2, 0x1d, 0xc2, 0x6c, 0xd9, 0xb3, 0x36, 0x1d, 0xea, 0x0d, 0xbb, 0xb9, 0xd5, 0x5e, 0xa4,
+	0x21, 0xd7, 0xa9, 0x3b, 0xda, 0x62, 0xbd, 0x36, 0x8b, 0x32, 0xac, 0xcd, 0x32, 0xf2, 0x8a, 0x37,
+	0x4b, 0xfa, 0x95, 0x6c, 0x96, 0xcc, 0xaf, 0xdf, 0x2c, 0x6f, 0xc0, 0x6c, 0x3b, 0x95, 0xe3, 0x65,
+	0xf2, 0xe4, 0xc6, 0x86, 0xb9, 0x7c, 0xdb, 0x6f, 0x64, 0xbe, 0xf6, 0xef, 0x2d, 0x15, 0xe4, 0x32,
+	0x1b, 0x39, 0x22, 0xf6, 0xc3, 0x2a, 0x88, 0x1b, 0xbc, 0x20, 0x0e, 0x7c, 0x04, 0x8a, 0xb5, 0xda,
+	0x4f, 0x69, 0x71, 0x85, 0x89, 0x9b, 0xff, 0x47, 0xca, 0xfe, 0xce, 0x53, 0xf6, 0x1d, 0x45, 0x9c,
+	0x53, 0x5b, 0x94, 0x20, 0x86, 0x6f, 0xd3, 0xab, 0x55, 0xea, 0x1d, 0x7a, 0x0c, 0xd7, 0xb6, 0x1b,
+	0xc4, 0xec, 0x9a, 0xbb, 0x37, 0x60, 0xdc, 0xe4, 0x0b, 0xda, 0xb7, 0x9b, 0x1e, 0xcd, 0xe9, 0x22,
+	0xb7, 0xf0, 0xc5, 0xb3, 0xa5, 0x99, 0x43, 0x54, 0x73, 0xfe, 0xa3, 0x85, 0x0b, 0x35, 0x3d, 0xc2,
+	0xd0, 0x34, 0x58, 0xee, 0x66, 0x43, 0x98, 0x80, 0xda, 0x4d, 0xff, 0x3c, 0x15, 0x81, 0xdc, 0xa4,
+	0x8e, 0x83, 0x18, 0x76, 0x91, 0xb3, 0x85, 0x09, 0xad, 0x75, 0xb5, 0xf3, 0x4f, 0x30, 0x41, 0x70,
+	0xcb, 0x30, 0xb9, 0x50, 0xd0, 0xa9, 0x8f, 0x13, 0xdc, 0x12, 0x8b, 0x02, 0xa5, 0x52, 0xc0, 0x48,
+	0xe9, 0x07, 0xfe, 0xa5, 0x7e, 0xdd, 0x71, 0x68, 0x15, 0x31, 0x7c, 0xb5, 0x4e, 0xab, 0xfb, 0x3a,
+	0xde, 0x45, 0x0c, 0x7b, 0x5d, 0x95, 0x62, 0x18, 0x73, 0x7d, 0x91, 0xe0, 0x46, 0xd6, 0xc3, 0x37,
+	0x97, 0xb9, 0x6f, 0x3e, 0xfd, 0x7e, 0x69, 0xa5, 0x8f, 0xe8, 0xf1, 0x05, 0x9e, 0x1e, 0x62, 0x6b,
+	0x1f, 0x29, 0xb0, 0xd4, 0xc5, 0xb4, 0x68, 0xd3, 0xbe, 0x0d, 0x67, 0x19, 0x65, 0xc8, 0x31, 0x30,
+	0x9f, 0x35, 0x42, 0xb3, 0x94, 0xd3, 0x37, 0x6b, 0x4e, 0xe8, 0x89, 0x1b, 0xa1, 0x5d, 0x13, 0xae,
+	0xbb, 0x6b, 0xb3, 0x7d, 0xd3, 0x45, 0xad, 0xbe, 0x5c, 0xb7, 0x00, 0x59, 0x61, 0xa9, 0xef, 0xb9,
+	0x8c, 0x1e, 0x8c, 0xb4, 0x0f, 0x7d, 0xae, 0x32, 0xac, 0x88, 0xeb, 0x01, 0xcc, 0xb5, 0x82, 0x79,
+	0xf2, 0x2a, 0x99, 0xce, 0x46, 0x5a, 0x42, 0xa2, 0x4f, 0x15, 0x38, 0x57, 0xf6, 0xac, 0x9d, 0x7d,
+	0x7b, 0x8f, 0x55, 0xb0, 0x7f, 0x0b, 0xad, 0x3b, 0xf6, 0xf0, 0x2e, 0x43, 0x15, 0x98, 0xe2, 0x69,
+	0x5e, 0xc7, 0x96, 0x51, 0xe3, 0x8d, 0xd9, 0x60, 0xc7, 0x18, 0x10, 0xdc, 0x0a, 0xcc, 0xd7, 0x96,
+	0xe0, 0xcf, 0x52, 0x46, 0xd1, 0xc6, 0xf8, 0x2e, 0xc6, 0x79, 0xa7, 0x85, 0xea, 0xd7, 0x48, 0x13,
+	0xb9, 0x36, 0x22, 0x6c, 0x58, 0x9c, 0xef, 0x83, 0xca, 0x39, 0x7b, 0x2d, 0x54, 0x37, 0xec, 0x50,
+	0xf9, 0x00, 0xcc, 0xc5, 0x8d, 0x8e, 0xe0, 0x56, 0x82, 0x44, 0x9c, 0x7f, 0x62, 0x22, 0xe2, 0xff,
+	0x89, 0x92, 0xc8, 0xee, 0x6d, 0x97, 0xd6, 0x2a, 0xd8, 0xad, 0xf7, 0x3c, 0x35, 0xb7, 0x21, 0x1b,
+	0x5c, 0x3c, 0x47, 0x06, 0x32, 0x33, 0x58, 0xad, 0xce, 0xc3, 0xa8, 0x7f, 0xa2, 0xa5, 0xfd, 0xb7,
+	0x07, 0x31, 0x50, 0x17, 0x61, 0x8c, 0x51, 0x03, 0x99, 0xa6, 0xeb, 0x17, 0x1c, 0x3d, 0xcb, 0xe8,
+	0xba, 0x69, 0xba, 0xda, 0xc5, 0xc4, 0xde, 0x89, 0x5b, 0x1a, 0xb1, 0x69, 0x89, 0x6b, 0xbc, 0x28,
+	0xf8, 0xfe, 0x8d, 0x70, 0x58, 0x5d, 0x72, 0x4e, 0xdc, 0x42, 0x63, 0x8a, 0x43, 0x93, 0xd6, 0xde,
+	0x9d, 0x82, 0x74, 0xd9, 0xb3, 0xd4, 0x7b, 0x30, 0x95, 0x78, 0x06, 0x5e, 0x92, 0xbc, 0xfb, 0xc4,
+	0x05, 0xf2, 0x7f, 0x3b, 0x46, 0x20, 0x22, 0x9d, 0x52, 0x6f, 0xc1, 0x44, 0xfb, 0x0d, 0xf3, 0x82,
+	0x64, 0x5d, 0x34, 0x9b, 0xff, 0x4b, 0xaf, 0xd9, 0x18, 0xe4, 0x03, 0x98, 0xee, 0x78, 0xbd, 0xbb,
+	0x78, 0xec, 0x43, 0x55, 0xfe, 0xef, 0x7d, 0xbf, 0x65, 0x69, 0x29, 0xf5, 0x2e, 0x4c, 0xc6, 0xdf,
+	0x5b, 0x0a, 0xb2, 0xb5, 0xed, 0xf9, 0xfc, 0xa5, 0xde, 0xf3, 0x31, 0xe0, 0xb7, 0xe0, 0x4c, 0xf2,
+	0xa6, 0xb4, 0x2c, 0x59, 0x9a, 0x90, 0xc8, 0xaf, 0x1c, 0x27, 0x11, 0x83, 0xbf, 0x07, 0x53, 0x89,
+	0xbe, 0x58, 0x16, 0xc8, 0xb8, 0x80, 0x34, 0x90, 0xb2, 0xd6, 0x54, 0x4b, 0xa9, 0x06, 0x4c, 0x77,
+	0xfc, 0x84, 0x21, 0xf3, 0x7a, 0x52, 0xe4, 0x44, 0xc6, 0x37, 0xe0, 0x9c, 0xbc, 0x43, 0x92, 0x81,
+	0x48, 0x25, 0xf3, 0x97, 0xfb, 0x95, 0x4c, 0xaa, 0x95, 0x37, 0x3c, 0x52, 0xdb, 0x65, 0x92, 0x52,
+	0xb5, 0xbd, 0x7b, 0x9e, 0x94, 0xea, 0xc2, 0xbc, 0xb4, 0xe3, 0x91, 0x45, 0x44, 0x26, 0x98, 0x2f,
+	0xf5, 0x29, 0x98, 0xd4, 0x29, 0x6d, 0x15, 0x64, 0x3a, 0x65, 0x82, 0x52, 0x9d, 0xbd, 0x1a, 0x06,
+	0x2d, 0xa5, 0x3a, 0xa0, 0x4a, 0x8a, 0xf6, 0x5f, 0x65, 0xa9, 0xf3, 0x92, 0x58, 0x7e, 0xb5, 0x2f,
+	0x31, 0x89, 0xb6, 0x64, 0xb9, 0xec, 0xaa, 0x2d, 0x21, 0xd6, 0x5d, 0x9b, 0xbc, 0x3c, 0x25, 0xfc,
+	0x99, 0x28, 0x4e, 0xbd, 0xfc, 0x19, 0x17, 0xec, 0xe9, 0x4f, 0x69, 0x11, 0x11, 0x47, 0x53, 0xbc,
+	0x86, 0x14, 0xba, 0x6d, 0x30, 0x7f, 0x5e, 0x7a, 0x34, 0x49, 0x4a, 0x81, 0x96, 0xda, 0x78, 0xed,
+	0xc9, 0xf3, 0x82, 0xf2, 0xf4, 0x79, 0x41, 0xf9, 0xe1, 0x79, 0x41, 0x79, 0xef, 0xa8, 0x90, 0x7a,
+	0x7a, 0x54, 0x48, 0x7d, 0x73, 0x54, 0x48, 0xdd, 0x5b, 0x3d, 0xae, 0xf2, 0x44, 0x3f, 0xb9, 0xf2,
+	0x32, 0xba, 0x9b, 0x15, 0x3f, 0x7b, 0xfe, 0xe3, 0x97, 0x00, 0x00, 0x00, 0xff, 0xff, 0x86, 0x40,
+	0x26, 0x57, 0x91, 0x1d, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1642,6 +1730,9 @@ type MsgClient interface {
 	// WithdrawFromPerpFund: gRPC tx msg to withdraw from the perp fund module
 	// account. [SUDO] Only callable by sudoers.
 	WithdrawFromPerpFund(ctx context.Context, in *MsgWithdrawFromPerpFund, opts ...grpc.CallOption) (*MsgWithdrawFromPerpFundResponse, error)
+	// CloseMarket: gRPC tx msg for closing a market.
+	// [Admin] Only callable by sudoers.
+	CloseMarket(ctx context.Context, in *MsgCloseMarket, opts ...grpc.CallOption) (*MsgCloseMarketResponse, error)
 }
 
 type msgClient struct {
@@ -1778,6 +1869,15 @@ func (c *msgClient) WithdrawFromPerpFund(ctx context.Context, in *MsgWithdrawFro
 	return out, nil
 }
 
+func (c *msgClient) CloseMarket(ctx context.Context, in *MsgCloseMarket, opts ...grpc.CallOption) (*MsgCloseMarketResponse, error) {
+	out := new(MsgCloseMarketResponse)
+	err := c.cc.Invoke(ctx, "/nibiru.perp.v2.Msg/CloseMarket", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // MsgServer is the server API for Msg service.
 type MsgServer interface {
 	RemoveMargin(context.Context, *MsgRemoveMargin) (*MsgRemoveMarginResponse, error)
@@ -1802,6 +1902,9 @@ type MsgServer interface {
 	// WithdrawFromPerpFund: gRPC tx msg to withdraw from the perp fund module
 	// account. [SUDO] Only callable by sudoers.
 	WithdrawFromPerpFund(context.Context, *MsgWithdrawFromPerpFund) (*MsgWithdrawFromPerpFundResponse, error)
+	// CloseMarket: gRPC tx msg for closing a market.
+	// [Admin] Only callable by sudoers.
+	CloseMarket(context.Context, *MsgCloseMarket) (*MsgCloseMarketResponse, error)
 }
 
 // UnimplementedMsgServer can be embedded to have forward compatible implementations.
@@ -1850,6 +1953,9 @@ func (*UnimplementedMsgServer) ShiftSwapInvariant(ctx context.Context, req *MsgS
 func (*UnimplementedMsgServer) WithdrawFromPerpFund(ctx context.Context, req *MsgWithdrawFromPerpFund) (*MsgWithdrawFromPerpFundResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method WithdrawFromPerpFund not implemented")
 }
+func (*UnimplementedMsgServer) CloseMarket(ctx context.Context, req *MsgCloseMarket) (*MsgCloseMarketResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method CloseMarket not implemented")
+}
 
 func RegisterMsgServer(s grpc1.Server, srv MsgServer) {
 	s.RegisterService(&_Msg_serviceDesc, srv)
@@ -2107,6 +2213,24 @@ func _Msg_WithdrawFromPerpFund_Handler(srv interface{}, ctx context.Context, dec
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Msg_CloseMarket_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(MsgCloseMarket)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(MsgServer).CloseMarket(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/nibiru.perp.v2.Msg/CloseMarket",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(MsgServer).CloseMarket(ctx, req.(*MsgCloseMarket))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 var _Msg_serviceDesc = grpc.ServiceDesc{
 	ServiceName: "nibiru.perp.v2.Msg",
 	HandlerType: (*MsgServer)(nil),
@@ -2167,6 +2291,10 @@ var _Msg_serviceDesc = grpc.ServiceDesc{
 			MethodName: "WithdrawFromPerpFund",
 			Handler:    _Msg_WithdrawFromPerpFund_Handler,
 		},
+		{
+			MethodName: "CloseMarket",
+			Handler:    _Msg_CloseMarket_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "nibiru/perp/v2/tx.proto",
@@ -3547,6 +3675,69 @@ func (m *MsgWithdrawFromPerpFundResponse) MarshalToSizedBuffer(dAtA []byte) (int
 	return len(dAtA) - i, nil
 }
 
+func (m *MsgCloseMarket) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *MsgCloseMarket) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *MsgCloseMarket) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	{
+		size := m.Pair.Size()
+		i -= size
+		if _, err := m.Pair.MarshalTo(dAtA[i:]); err != nil {
+			return 0, err
+		}
+		i = encodeVarintTx(dAtA, i, uint64(size))
+	}
+	i--
+	dAtA[i] = 0x12
+	if len(m.Sender) > 0 {
+		i -= len(m.Sender)
+		copy(dAtA[i:], m.Sender)
+		i = encodeVarintTx(dAtA, i, uint64(len(m.Sender)))
+		i--
+		dAtA[i] = 0xa
+	}
+	return len(dAtA) - i, nil
+}
+
+func (m *MsgCloseMarketResponse) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *MsgCloseMarketResponse) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *MsgCloseMarketResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	return len(dAtA) - i, nil
+}
+
 func encodeVarintTx(dAtA []byte, offset int, v uint64) int {
 	offset -= sovTx(v)
 	base := offset
@@ -4045,6 +4236,30 @@ func (m *MsgWithdrawFromPerpFundResponse) Size() (n int) {
 	return n
 }
 
+func (m *MsgCloseMarket) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	l = len(m.Sender)
+	if l > 0 {
+		n += 1 + l + sovTx(uint64(l))
+	}
+	l = m.Pair.Size()
+	n += 1 + l + sovTx(uint64(l))
+	return n
+}
+
+func (m *MsgCloseMarketResponse) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	return n
+}
+
 func sovTx(x uint64) (n int) {
 	return (math_bits.Len64(x|1) + 6) / 7
 }
@@ -7981,6 +8196,172 @@ func (m *MsgWithdrawFromPerpFundResponse) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
+func (m *MsgCloseMarket) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowTx
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: MsgCloseMarket: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: MsgCloseMarket: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Sender", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTx
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthTx
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthTx
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Sender = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 2:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Pair", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTx
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthTx
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthTx
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if err := m.Pair.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipTx(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthTx
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
+func (m *MsgCloseMarketResponse) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowTx
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: MsgCloseMarketResponse: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: MsgCloseMarketResponse: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		default:
+			iNdEx = preIndex
+			skippy, err := skipTx(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthTx
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
 func skipTx(dAtA []byte) (n int, err error) {
 	l := len(dAtA)
 	iNdEx := 0