@injectivelabs/sdk-ts 1.19.5 → 1.19.7

package/dist/esm/{MsgSetDenomMetadata-_b5Klju5.js → MsgSetDenomMetadata-BKIPNfgv.js}

@@ -1,18 +1,20 @@
-import { Ht as concatUint8Arrays, Vt as binaryToBase64, Wt as fromUtf8, Zt as uint8ArrayToBase64, et as numberToCosmosSdkDecString, ht as messageHash, nn as bigIntToString, pn as safeBigIntStringify, pt as domainHash, qt as hexToUint8Array, zt as base64ToUint8Array } from "./utils-XYJbh13N.js";
+import { Ht as concatUint8Arrays, Jt as stringToUint8Array, Qt as uint8ArrayToHex, Vt as binaryToBase64, Wt as fromUtf8, Xt as toUtf8, Zt as uint8ArrayToBase64, et as numberToCosmosSdkDecString, ht as messageHash, m as getEthereumAddress, nn as bigIntToString, pn as safeBigIntStringify, pt as domainHash, qt as hexToUint8Array, zt as base64ToUint8Array } from "./utils-XYJbh13N.js";
 import { t as _defineProperty } from "./defineProperty-HO0rQlTT.js";
-import { I as Address, j as createAny } from "./accounts-B_eo5rUB.js";
-import { n as prepareSignBytes, t as MsgBase } from "./MsgBase-De14KlFJ.js";
+import { I as Address, j as createAny } from "./accounts-C3KF9pTp.js";
+import { a as objectKeysToEip712Types, n as prepareSignBytes, o as patchOrderTypesWithExpirationBlock, t as MsgBase } from "./MsgBase-CpH99FqH.js";
 import { t as ChainGrpcExchangeApi } from "./ChainGrpcExchangeApi-BApB4VXN.js";
-import { a as dataToExecData$1, i as ExecArgBase } from "./ExecArgNeptuneWithdraw-DRCUYj-r.js";
+import { a as dataToExecData$1, i as ExecArgBase } from "./ExecArgNeptuneWithdraw-mI_hNm4-.js";
 import { keccak256 } from "viem";
 import { BigNumber, DEFAULT_BRIDGE_FEE_AMOUNT, DEFAULT_BRIDGE_FEE_DENOM, toBigNumber, toChainFormat, toPascalCase } from "@injectivelabs/utils";
 import { GeneralException } from "@injectivelabs/exceptions";
 import * as GoogleProtobufAnyPbPb from "@injectivelabs/core-proto-ts-v2/generated/google/protobuf/any_pb";
 import * as CosmosBaseV1Beta1CoinPb from "@injectivelabs/core-proto-ts-v2/generated/cosmos/base/v1beta1/coin_pb";
 import * as InjectiveExchangeV1Beta1TxPb from "@injectivelabs/core-proto-ts-v2/generated/injective/exchange/v1beta1/tx_pb";
-import * as InjectiveExchangeV1Beta1ExchangePb from "@injectivelabs/core-proto-ts-v2/generated/injective/exchange/v1beta1/exchange_pb";
 import * as InjectiveExchangeV2TxPb from "@injectivelabs/core-proto-ts-v2/generated/injective/exchange/v2/tx_pb";
+import * as InjectiveExchangeV1Beta1ExchangePb from "@injectivelabs/core-proto-ts-v2/generated/injective/exchange/v1beta1/exchange_pb";
+import * as InjectiveExchangeV2OrderPb from "@injectivelabs/core-proto-ts-v2/generated/injective/exchange/v2/order_pb";
 import * as InjectiveOracleV1Beta1OraclePb from "@injectivelabs/core-proto-ts-v2/generated/injective/oracle/v1beta1/oracle_pb";
+import * as InjectiveExchangeV2MarketPb from "@injectivelabs/core-proto-ts-v2/generated/injective/exchange/v2/market_pb";
 import { getNetworkEndpoints } from "@injectivelabs/networks";
 import * as CosmosGovV1GovPb from "@injectivelabs/core-proto-ts-v2/generated/cosmos/gov/v1/gov_pb";
 import * as CosmwasmWasmV1TypesPb from "@injectivelabs/core-proto-ts-v2/generated/cosmwasm/wasm/v1/types_pb";
@@ -161,6 +163,171 @@ var MsgWithdraw = class MsgWithdraw extends MsgBase {
 	}
 };
 
+//#endregion
+//#region src/core/modules/exchange/msgs/MsgDepositV2.ts
+/**
+* @category Messages
+*/
+var MsgDepositV2 = class MsgDepositV2 extends MsgBase {
+	static fromJSON(params) {
+		return new MsgDepositV2(params);
+	}
+	toProto() {
+		const { params } = this;
+		const amountCoin = CosmosBaseV1Beta1CoinPb.Coin.create({
+			denom: params.amount.denom,
+			amount: params.amount.amount
+		});
+		return InjectiveExchangeV2TxPb.MsgDeposit.create({
+			sender: params.injectiveAddress,
+			subaccountId: params.subaccountId,
+			amount: amountCoin
+		});
+	}
+	toData() {
+		const proto = this.toProto();
+		return {
+			"@type": "/injective.exchange.v2.MsgDeposit",
+			...proto
+		};
+	}
+	toAmino() {
+		const proto = this.toProto();
+		return {
+			type: "exchange/MsgDeposit",
+			value: {
+				sender: proto.sender,
+				subaccount_id: proto.subaccountId,
+				amount: proto.amount
+			}
+		};
+	}
+	toWeb3Gw() {
+		const { value } = this.toAmino();
+		return {
+			"@type": "/injective.exchange.v2.MsgDeposit",
+			...value
+		};
+	}
+	toDirectSign() {
+		return {
+			type: "/injective.exchange.v2.MsgDeposit",
+			message: this.toProto()
+		};
+	}
+	toBinary() {
+		return InjectiveExchangeV2TxPb.MsgDeposit.toBinary(this.toProto());
+	}
+};
+
+//#endregion
+//#region src/core/modules/exchange/msgs/MsgSignDataV2.ts
+/**
+* @category Messages
+*/
+var MsgSignDataV2 = class MsgSignDataV2 extends MsgBase {
+	static fromJSON(params) {
+		return new MsgSignDataV2(params);
+	}
+	toProto() {
+		const { params } = this;
+		return InjectiveExchangeV2TxPb.MsgSignData.create({
+			signer: hexToUint8Array(getEthereumAddress(params.sender)),
+			data: stringToUint8Array(toUtf8(params.data))
+		});
+	}
+	toData() {
+		const proto = this.toProto();
+		return {
+			"@type": "/injective.exchange.v2.MsgSignData",
+			...proto
+		};
+	}
+	toAmino() {
+		const proto = this.toProto();
+		return {
+			type: "sign/MsgSignData",
+			value: {
+				signer: uint8ArrayToHex(proto.signer),
+				data: toUtf8(proto.data)
+			}
+		};
+	}
+	toWeb3Gw() {
+		const { value } = this.toAmino();
+		return {
+			"@type": "/injective.exchange.v2.MsgSignData",
+			...value
+		};
+	}
+	toDirectSign() {
+		return {
+			type: "/injective.exchange.v2.MsgSignData",
+			message: this.toProto()
+		};
+	}
+	toBinary() {
+		return InjectiveExchangeV2TxPb.MsgSignData.toBinary(this.toProto());
+	}
+};
+
+//#endregion
+//#region src/core/modules/exchange/msgs/MsgWithdrawV2.ts
+/**
+* @category Messages
+*/
+var MsgWithdrawV2 = class MsgWithdrawV2 extends MsgBase {
+	static fromJSON(params) {
+		return new MsgWithdrawV2(params);
+	}
+	toProto() {
+		const { params } = this;
+		const amountCoin = CosmosBaseV1Beta1CoinPb.Coin.create({
+			denom: params.amount.denom,
+			amount: params.amount.amount
+		});
+		return InjectiveExchangeV2TxPb.MsgWithdraw.create({
+			sender: params.injectiveAddress,
+			subaccountId: params.subaccountId,
+			amount: amountCoin
+		});
+	}
+	toData() {
+		const proto = this.toProto();
+		return {
+			"@type": "/injective.exchange.v2.MsgWithdraw",
+			...proto
+		};
+	}
+	toAmino() {
+		const proto = this.toProto();
+		return {
+			type: "exchange/MsgWithdraw",
+			value: {
+				sender: proto.sender,
+				subaccount_id: proto.subaccountId,
+				amount: proto.amount
+			}
+		};
+	}
+	toWeb3Gw() {
+		const { value } = this.toAmino();
+		return {
+			"@type": "/injective.exchange.v2.MsgWithdraw",
+			...value
+		};
+	}
+	toDirectSign() {
+		return {
+			type: "/injective.exchange.v2.MsgWithdraw",
+			message: this.toProto()
+		};
+	}
+	toBinary() {
+		return InjectiveExchangeV2TxPb.MsgWithdraw.toBinary(this.toProto());
+	}
+};
+
 //#endregion
 //#region src/core/modules/exchange/msgs/MsgRewardsOptOut.ts
 /**
@@ -262,6 +429,50 @@ var MsgCancelSpotOrder = class MsgCancelSpotOrder extends MsgBase {
 	}
 };
 
+//#endregion
+//#region src/core/modules/exchange/msgs/MsgRewardsOptOutV2.ts
+/**
+* @category Messages
+*/
+var MsgRewardsOptOutV2 = class MsgRewardsOptOutV2 extends MsgBase {
+	static fromJSON(params) {
+		return new MsgRewardsOptOutV2(params);
+	}
+	toProto() {
+		const { params } = this;
+		return InjectiveExchangeV2TxPb.MsgRewardsOptOut.create({ sender: params.sender });
+	}
+	toData() {
+		const proto = this.toProto();
+		return {
+			"@type": "/injective.exchange.v2.MsgRewardsOptOut",
+			...proto
+		};
+	}
+	toAmino() {
+		return {
+			type: "exchange/MsgRewardsOptOut",
+			value: { sender: this.toProto().sender }
+		};
+	}
+	toWeb3Gw() {
+		const { value } = this.toAmino();
+		return {
+			"@type": "/injective.exchange.v2.MsgRewardsOptOut",
+			...value
+		};
+	}
+	toDirectSign() {
+		return {
+			type: "/injective.exchange.v2.MsgRewardsOptOut",
+			message: this.toProto()
+		};
+	}
+	toBinary() {
+		return InjectiveExchangeV2TxPb.MsgRewardsOptOut.toBinary(this.toProto());
+	}
+};
+
 //#endregion
 //#region src/core/modules/exchange/msgs/MsgExternalTransfer.ts
 /**
@@ -323,7 +534,7 @@ var MsgExternalTransfer = class MsgExternalTransfer extends MsgBase {
 
 //#endregion
 //#region src/core/modules/exchange/msgs/MsgBatchUpdateOrders.ts
-const createSpotOrder = (args) => {
+const createSpotOrder$1 = (args) => {
 	const orderInfo = InjectiveExchangeV1Beta1ExchangePb.OrderInfo.create({
 		subaccountId: args.subaccountId,
 		feeRecipient: args.feeRecipient,
@@ -338,7 +549,7 @@ const createSpotOrder = (args) => {
 		triggerPrice: args.triggerPrice
 	});
 };
-const createDerivativeOrder = (args) => {
+const createDerivativeOrder$1 = (args) => {
 	const orderInfo = InjectiveExchangeV1Beta1ExchangePb.OrderInfo.create({
 		subaccountId: args.subaccountId,
 		feeRecipient: args.feeRecipient,
@@ -354,7 +565,7 @@ const createDerivativeOrder = (args) => {
 		triggerPrice: args.triggerPrice
 	});
 };
-const createBinaryOptionOrder = (args) => {
+const createBinaryOptionOrder$1 = (args) => {
 	const orderInfo = InjectiveExchangeV1Beta1ExchangePb.OrderInfo.create({
 		subaccountId: args.subaccountId,
 		feeRecipient: args.feeRecipient,
@@ -370,7 +581,7 @@ const createBinaryOptionOrder = (args) => {
 		triggerPrice: args.triggerPrice
 	});
 };
-const createMsgAndCancelOrders = (params) => {
+const createMsgAndCancelOrders$1 = (params) => {
 	const hasCancelAll = params.spotMarketIdsToCancelAll && params.spotMarketIdsToCancelAll.length > 0 || params.derivativeMarketIdsToCancelAll && params.derivativeMarketIdsToCancelAll.length > 0 || params.binaryOptionsMarketIdsToCancelAll && params.binaryOptionsMarketIdsToCancelAll.length > 0;
 	const message = InjectiveExchangeV1Beta1TxPb.MsgBatchUpdateOrders.create({
 		sender: params.injectiveAddress,
@@ -414,7 +625,7 @@ var MsgBatchUpdateOrders = class MsgBatchUpdateOrders extends MsgBase {
 	}
 	toProto() {
 		const { params } = this;
-		const message = createMsgAndCancelOrders(params);
+		const message = createMsgAndCancelOrders$1(params);
 		if (params.spotOrdersToCreate) message.spotOrdersToCreate = params.spotOrdersToCreate.map((args) => {
 			const paramsFromArgs = {
 				...args,
@@ -422,7 +633,7 @@ var MsgBatchUpdateOrders = class MsgBatchUpdateOrders extends MsgBase {
 				triggerPrice: toChainFormat(args.triggerPrice || 0).toFixed(),
 				quantity: toChainFormat(args.quantity).toFixed()
 			};
-			return createSpotOrder({
+			return createSpotOrder$1({
 				...args,
 				...paramsFromArgs,
 				subaccountId: params.subaccountId
@@ -436,7 +647,7 @@ var MsgBatchUpdateOrders = class MsgBatchUpdateOrders extends MsgBase {
 				triggerPrice: toChainFormat(args.triggerPrice || 0).toFixed(),
 				quantity: toChainFormat(args.quantity).toFixed()
 			};
-			return createDerivativeOrder({
+			return createDerivativeOrder$1({
 				...args,
 				...paramsFromArgs,
 				subaccountId: params.subaccountId
@@ -450,7 +661,7 @@ var MsgBatchUpdateOrders = class MsgBatchUpdateOrders extends MsgBase {
 				triggerPrice: toChainFormat(args.triggerPrice || 0).toFixed(),
 				quantity: toChainFormat(args.quantity).toFixed()
 			};
-			return createBinaryOptionOrder({
+			return createBinaryOptionOrder$1({
 				...args,
 				...paramsFromArgs,
 				subaccountId: params.subaccountId
@@ -467,7 +678,7 @@ var MsgBatchUpdateOrders = class MsgBatchUpdateOrders extends MsgBase {
 	}
 	toAmino() {
 		const { params } = this;
-		const message = createMsgAndCancelOrders(params);
+		const message = createMsgAndCancelOrders$1(params);
 		if (params.spotOrdersToCreate) message.spotOrdersToCreate = params.spotOrdersToCreate.map((args) => {
 			const paramsFromArgs = {
 				...args,
@@ -475,7 +686,7 @@ var MsgBatchUpdateOrders = class MsgBatchUpdateOrders extends MsgBase {
 				triggerPrice: args.triggerPrice || "0",
 				quantity: args.quantity
 			};
-			return createSpotOrder({
+			return createSpotOrder$1({
 				...args,
 				...paramsFromArgs,
 				subaccountId: params.subaccountId
@@ -489,7 +700,7 @@ var MsgBatchUpdateOrders = class MsgBatchUpdateOrders extends MsgBase {
 				triggerPrice: args.triggerPrice || "0",
 				quantity: args.quantity
 			};
-			return createDerivativeOrder({
+			return createDerivativeOrder$1({
 				...args,
 				...paramsFromArgs,
 				subaccountId: params.subaccountId
@@ -503,7 +714,7 @@ var MsgBatchUpdateOrders = class MsgBatchUpdateOrders extends MsgBase {
 				triggerPrice: args.triggerPrice || "0",
 				quantity: args.quantity
 			};
-			return createBinaryOptionOrder({
+			return createBinaryOptionOrder$1({
 				...args,
 				...paramsFromArgs,
 				subaccountId: params.subaccountId
@@ -572,7 +783,7 @@ var MsgBatchUpdateOrders = class MsgBatchUpdateOrders extends MsgBase {
 
 //#endregion
 //#region src/core/modules/exchange/msgs/MsgLiquidatePosition.ts
-const createMessage$6 = (params) => {
+const createMessage$12 = (params) => {
 	const message = InjectiveExchangeV1Beta1TxPb.MsgLiquidatePosition.create({
 		sender: params.injectiveAddress,
 		subaccountId: params.subaccountId,
@@ -605,7 +816,7 @@ var MsgLiquidatePosition = class MsgLiquidatePosition extends MsgBase {
 	}
 	toProto() {
 		const { params: initialParams } = this;
-		return createMessage$6({
+		return createMessage$12({
 			...initialParams,
 			order: initialParams.order ? {
 				...initialParams.order,
@@ -706,6 +917,65 @@ var MsgLiquidatePosition = class MsgLiquidatePosition extends MsgBase {
 	}
 };
 
+//#endregion
+//#region src/core/modules/exchange/msgs/MsgCancelSpotOrderV2.ts
+/**
+* @category Messages
+* No toEip712/toEip712V2 override needed — spot cancel has no order_mask field, so base-class defaults (toAmino/toWeb3Gw) are correct.
+*/
+var MsgCancelSpotOrderV2 = class MsgCancelSpotOrderV2 extends MsgBase {
+	static fromJSON(params) {
+		return new MsgCancelSpotOrderV2(params);
+	}
+	toProto() {
+		const { params } = this;
+		if (!params.orderHash && !params.cid) throw new GeneralException(/* @__PURE__ */ new Error("either orderHash or cid must be provided"));
+		return InjectiveExchangeV2TxPb.MsgCancelSpotOrder.create({
+			sender: params.injectiveAddress,
+			marketId: params.marketId,
+			subaccountId: params.subaccountId,
+			orderHash: params.orderHash || "",
+			cid: params.cid || ""
+		});
+	}
+	toData() {
+		const proto = this.toProto();
+		return {
+			"@type": "/injective.exchange.v2.MsgCancelSpotOrder",
+			...proto
+		};
+	}
+	toAmino() {
+		const proto = this.toProto();
+		return {
+			type: "exchange/MsgCancelSpotOrder",
+			value: {
+				sender: proto.sender,
+				market_id: proto.marketId,
+				subaccount_id: proto.subaccountId,
+				order_hash: proto.orderHash,
+				cid: proto.cid
+			}
+		};
+	}
+	toWeb3Gw() {
+		const { value } = this.toAmino();
+		return {
+			"@type": "/injective.exchange.v2.MsgCancelSpotOrder",
+			...value
+		};
+	}
+	toDirectSign() {
+		return {
+			type: "/injective.exchange.v2.MsgCancelSpotOrder",
+			message: this.toProto()
+		};
+	}
+	toBinary() {
+		return InjectiveExchangeV2TxPb.MsgCancelSpotOrder.toBinary(this.toProto());
+	}
+};
+
 //#endregion
 //#region src/core/modules/exchange/msgs/MsgReclaimLockedFunds.ts
 /**
@@ -763,7 +1033,7 @@ var MsgReclaimLockedFunds = class MsgReclaimLockedFunds extends MsgBase {
 
 //#endregion
 //#region src/core/modules/exchange/msgs/MsgUpdateSpotMarketV2.ts
-const createMessage$5 = (params) => {
+const createMessage$11 = (params) => {
 	return InjectiveExchangeV2TxPb.MsgUpdateSpotMarket.create({
 		admin: params.admin,
 		marketId: params.marketId,
@@ -782,7 +1052,7 @@ var MsgUpdateSpotMarketV2 = class MsgUpdateSpotMarketV2 extends MsgBase {
 	}
 	toProto() {
 		const { params: initialParams } = this;
-		return createMessage$5({
+		return createMessage$11({
 			...initialParams,
 			newMinNotional: toChainFormat(initialParams.newMinNotional || "0").toFixed(),
 			newMinQuantityTickSize: toChainFormat(initialParams.newMinQuantityTickSize || "0").toFixed(),
@@ -848,39 +1118,1875 @@ var MsgUpdateSpotMarketV2 = class MsgUpdateSpotMarketV2 extends MsgBase {
 };
 
 //#endregion
-//#region src/core/modules/exchange/msgs/MsgCancelPostOnlyModeV2.ts
-const createMessage$4 = (params) => {
-	return InjectiveExchangeV2TxPb.MsgCancelPostOnlyMode.create({ sender: params.sender });
-};
+//#region src/core/modules/exchange/msgs/MsgExternalTransferV2.ts
 /**
 * @category Messages
 */
-var MsgCancelPostOnlyModeV2 = class MsgCancelPostOnlyModeV2 extends MsgBase {
+var MsgExternalTransferV2 = class MsgExternalTransferV2 extends MsgBase {
 	static fromJSON(params) {
-		return new MsgCancelPostOnlyModeV2(params);
+		return new MsgExternalTransferV2(params);
 	}
 	toProto() {
-		const { params: initialParams } = this;
-		return createMessage$4({ ...initialParams });
+		const { params } = this;
+		const amountCoin = CosmosBaseV1Beta1CoinPb.Coin.create({
+			denom: params.amount.denom,
+			amount: params.amount.amount
+		});
+		return InjectiveExchangeV2TxPb.MsgExternalTransfer.create({
+			sender: params.injectiveAddress,
+			sourceSubaccountId: params.srcSubaccountId,
+			destinationSubaccountId: params.dstSubaccountId,
+			amount: amountCoin
+		});
 	}
 	toData() {
 		const proto = this.toProto();
 		return {
-			"@type": "/injective.exchange.v2.MsgCancelPostOnlyMode",
+			"@type": "/injective.exchange.v2.MsgExternalTransfer",
 			...proto
 		};
 	}
 	toAmino() {
-		const { params } = this;
+		const proto = this.toProto();
 		return {
-			type: "exchange/MsgCancelPostOnlyMode",
-			value: { sender: createMessage$4(params).sender }
-		};
-	}
+			type: "exchange/MsgExternalTransfer",
+			value: {
+				sender: proto.sender,
+				source_subaccount_id: proto.sourceSubaccountId,
+				destination_subaccount_id: proto.destinationSubaccountId,
+				amount: proto.amount
+			}
+		};
+	}
+	toWeb3Gw() {
+		const { value } = this.toAmino();
+		return {
+			"@type": "/injective.exchange.v2.MsgExternalTransfer",
+			...value
+		};
+	}
+	toDirectSign() {
+		return {
+			type: "/injective.exchange.v2.MsgExternalTransfer",
+			message: this.toProto()
+		};
+	}
+	toBinary() {
+		return InjectiveExchangeV2TxPb.MsgExternalTransfer.toBinary(this.toProto());
+	}
+};
+
+//#endregion
+//#region src/core/modules/exchange/msgs/MsgBatchUpdateOrdersV2.ts
+const createSpotOrder = (args) => {
+	const orderInfo = InjectiveExchangeV2OrderPb.OrderInfo.create({
+		subaccountId: args.subaccountId,
+		feeRecipient: args.feeRecipient,
+		price: args.price,
+		quantity: args.quantity,
+		cid: args.cid
+	});
+	return InjectiveExchangeV2OrderPb.SpotOrder.create({
+		marketId: args.marketId,
+		orderType: args.orderType,
+		orderInfo,
+		triggerPrice: args.triggerPrice,
+		expirationBlock: args.expirationBlock ? BigInt(args.expirationBlock) : BigInt(0)
+	});
+};
+const createDerivativeOrder = (args) => {
+	const orderInfo = InjectiveExchangeV2OrderPb.OrderInfo.create({
+		subaccountId: args.subaccountId,
+		feeRecipient: args.feeRecipient,
+		price: args.price,
+		quantity: args.quantity,
+		cid: args.cid
+	});
+	return InjectiveExchangeV2OrderPb.DerivativeOrder.create({
+		marketId: args.marketId,
+		orderType: args.orderType,
+		orderInfo,
+		margin: args.margin,
+		triggerPrice: args.triggerPrice,
+		expirationBlock: args.expirationBlock ? BigInt(args.expirationBlock) : BigInt(0)
+	});
+};
+const createBinaryOptionOrder = (args) => {
+	const orderInfo = InjectiveExchangeV2OrderPb.OrderInfo.create({
+		subaccountId: args.subaccountId,
+		feeRecipient: args.feeRecipient,
+		price: args.price,
+		quantity: args.quantity,
+		cid: args.cid
+	});
+	return InjectiveExchangeV2OrderPb.DerivativeOrder.create({
+		marketId: args.marketId,
+		orderType: args.orderType,
+		orderInfo,
+		margin: args.margin,
+		triggerPrice: args.triggerPrice,
+		expirationBlock: args.expirationBlock ? BigInt(args.expirationBlock) : BigInt(0)
+	});
+};
+const buildSpotOrders = (orders, subaccountId, fmt, fmtOpt) => orders.map((args) => createSpotOrder({
+	...args,
+	price: fmt(args.price),
+	triggerPrice: fmtOpt(args.triggerPrice),
+	quantity: fmt(args.quantity),
+	subaccountId
+}));
+const buildDerivativeOrders = (orders, subaccountId, fmt, fmtOpt) => orders.map((args) => createDerivativeOrder({
+	...args,
+	price: fmt(args.price),
+	margin: fmt(args.margin),
+	triggerPrice: fmtOpt(args.triggerPrice),
+	quantity: fmt(args.quantity),
+	subaccountId
+}));
+const buildBinaryOptionOrders = (orders, subaccountId, fmt, fmtOpt) => orders.map((args) => createBinaryOptionOrder({
+	...args,
+	price: fmt(args.price),
+	margin: fmt(args.margin),
+	triggerPrice: fmtOpt(args.triggerPrice),
+	quantity: fmt(args.quantity),
+	subaccountId
+}));
+const createMsgAndCancelOrders = (params) => {
+	const hasCancelAll = params.spotMarketIdsToCancelAll && params.spotMarketIdsToCancelAll.length > 0 || params.derivativeMarketIdsToCancelAll && params.derivativeMarketIdsToCancelAll.length > 0 || params.binaryOptionsMarketIdsToCancelAll && params.binaryOptionsMarketIdsToCancelAll.length > 0;
+	const message = InjectiveExchangeV2TxPb.MsgBatchUpdateOrders.create({
+		sender: params.injectiveAddress,
+		...hasCancelAll && { subaccountId: params.subaccountId }
+	});
+	if (params.spotMarketIdsToCancelAll && params.spotMarketIdsToCancelAll.length > 0) message.spotMarketIdsToCancelAll = params.spotMarketIdsToCancelAll;
+	if (params.derivativeMarketIdsToCancelAll && params.derivativeMarketIdsToCancelAll.length > 0) message.derivativeMarketIdsToCancelAll = params.derivativeMarketIdsToCancelAll;
+	if (params.binaryOptionsMarketIdsToCancelAll && params.binaryOptionsMarketIdsToCancelAll.length > 0) message.binaryOptionsMarketIdsToCancelAll = params.binaryOptionsMarketIdsToCancelAll;
+	if (params.spotOrdersToCancel) message.spotOrdersToCancel = params.spotOrdersToCancel.map(({ marketId, subaccountId, orderHash, cid }) => {
+		return InjectiveExchangeV2TxPb.OrderData.create({
+			marketId,
+			subaccountId,
+			orderHash,
+			cid
+		});
+	});
+	if (params.derivativeOrdersToCancel) message.derivativeOrdersToCancel = params.derivativeOrdersToCancel.map(({ marketId, subaccountId, orderHash, cid }) => {
+		return InjectiveExchangeV2TxPb.OrderData.create({
+			marketId,
+			subaccountId,
+			orderHash,
+			cid
+		});
+	});
+	if (params.binaryOptionsOrdersToCancel) message.binaryOptionsOrdersToCancel = params.binaryOptionsOrdersToCancel.map(({ marketId, subaccountId, orderHash, cid }) => {
+		return InjectiveExchangeV2TxPb.OrderData.create({
+			marketId,
+			subaccountId,
+			orderHash,
+			cid
+		});
+	});
+	return message;
+};
+/**
+* @category Messages
+*/
+var MsgBatchUpdateOrdersV2 = class MsgBatchUpdateOrdersV2 extends MsgBase {
+	static fromJSON(params) {
+		return new MsgBatchUpdateOrdersV2(params);
+	}
+	toProto() {
+		const { params } = this;
+		const message = createMsgAndCancelOrders(params);
+		const fmt = (v) => toChainFormat(v).toFixed();
+		const fmtOpt = (v) => toChainFormat(v || 0).toFixed();
+		if (params.spotOrdersToCreate) message.spotOrdersToCreate = buildSpotOrders(params.spotOrdersToCreate, params.subaccountId, fmt, fmtOpt);
+		if (params.derivativeOrdersToCreate) message.derivativeOrdersToCreate = buildDerivativeOrders(params.derivativeOrdersToCreate, params.subaccountId, fmt, fmtOpt);
+		if (params.binaryOptionsOrdersToCreate) message.binaryOptionsOrdersToCreate = buildBinaryOptionOrders(params.binaryOptionsOrdersToCreate, params.subaccountId, fmt, fmtOpt);
+		if (params.spotMarketOrdersToCreate) message.spotMarketOrdersToCreate = buildSpotOrders(params.spotMarketOrdersToCreate, params.subaccountId, fmt, fmtOpt);
+		if (params.derivativeMarketOrdersToCreate) message.derivativeMarketOrdersToCreate = buildDerivativeOrders(params.derivativeMarketOrdersToCreate, params.subaccountId, fmt, fmtOpt);
+		if (params.binaryOptionsMarketOrdersToCreate) message.binaryOptionsMarketOrdersToCreate = buildBinaryOptionOrders(params.binaryOptionsMarketOrdersToCreate, params.subaccountId, fmt, fmtOpt);
+		return message;
+	}
+	toData() {
+		const proto = this.toProto();
+		return {
+			"@type": "/injective.exchange.v2.MsgBatchUpdateOrders",
+			...proto
+		};
+	}
+	toAmino() {
+		const { params } = this;
+		const message = createMsgAndCancelOrders(params);
+		const fmt = (v) => v;
+		const fmtOpt = (v) => v || "0";
+		if (params.spotOrdersToCreate) message.spotOrdersToCreate = buildSpotOrders(params.spotOrdersToCreate, params.subaccountId, fmt, fmtOpt);
+		if (params.derivativeOrdersToCreate) message.derivativeOrdersToCreate = buildDerivativeOrders(params.derivativeOrdersToCreate, params.subaccountId, fmt, fmtOpt);
+		if (params.binaryOptionsOrdersToCreate) message.binaryOptionsOrdersToCreate = buildBinaryOptionOrders(params.binaryOptionsOrdersToCreate, params.subaccountId, fmt, fmtOpt);
+		if (params.spotMarketOrdersToCreate) message.spotMarketOrdersToCreate = buildSpotOrders(params.spotMarketOrdersToCreate, params.subaccountId, fmt, fmtOpt);
+		if (params.derivativeMarketOrdersToCreate) message.derivativeMarketOrdersToCreate = buildDerivativeOrders(params.derivativeMarketOrdersToCreate, params.subaccountId, fmt, fmtOpt);
+		if (params.binaryOptionsMarketOrdersToCreate) message.binaryOptionsMarketOrdersToCreate = buildBinaryOptionOrders(params.binaryOptionsMarketOrdersToCreate, params.subaccountId, fmt, fmtOpt);
+		const orderInfoToSnakeCase = (orderInfo) => ({
+			subaccount_id: orderInfo.subaccountId,
+			fee_recipient: orderInfo.feeRecipient,
+			price: orderInfo.price,
+			quantity: orderInfo.quantity,
+			cid: orderInfo.cid
+		});
+		const spotOrderToSnakeCase = (order) => ({
+			market_id: order.marketId,
+			order_type: order.orderType,
+			order_info: orderInfoToSnakeCase(order.orderInfo),
+			trigger_price: order.triggerPrice,
+			expiration_block: String(order.expirationBlock)
+		});
+		const derivativeOrderToSnakeCase = (order) => ({
+			market_id: order.marketId,
+			order_type: order.orderType,
+			order_info: orderInfoToSnakeCase(order.orderInfo),
+			margin: order.margin,
+			trigger_price: order.triggerPrice,
+			expiration_block: String(order.expirationBlock)
+		});
+		const orderDataToSnakeCase = (orderData) => ({
+			market_id: orderData.marketId,
+			subaccount_id: orderData.subaccountId,
+			order_hash: orderData.orderHash,
+			cid: orderData.cid
+		});
+		return {
+			type: "exchange/MsgBatchUpdateOrders",
+			value: {
+				sender: message.sender,
+				subaccount_id: message.subaccountId,
+				spot_market_ids_to_cancel_all: message.spotMarketIdsToCancelAll,
+				derivative_market_ids_to_cancel_all: message.derivativeMarketIdsToCancelAll,
+				spot_orders_to_cancel: message.spotOrdersToCancel.map(orderDataToSnakeCase),
+				derivative_orders_to_cancel: message.derivativeOrdersToCancel.map(orderDataToSnakeCase),
+				spot_orders_to_create: message.spotOrdersToCreate.map(spotOrderToSnakeCase),
+				derivative_orders_to_create: message.derivativeOrdersToCreate.map(derivativeOrderToSnakeCase),
+				binary_options_orders_to_cancel: message.binaryOptionsOrdersToCancel.map(orderDataToSnakeCase),
+				binary_options_market_ids_to_cancel_all: message.binaryOptionsMarketIdsToCancelAll,
+				binary_options_orders_to_create: message.binaryOptionsOrdersToCreate.map(derivativeOrderToSnakeCase),
+				spot_market_orders_to_create: message.spotMarketOrdersToCreate.map(spotOrderToSnakeCase),
+				derivative_market_orders_to_create: message.derivativeMarketOrdersToCreate.map(derivativeOrderToSnakeCase),
+				binary_options_market_orders_to_create: message.binaryOptionsMarketOrdersToCreate.map(derivativeOrderToSnakeCase)
+			}
+		};
+	}
+	toWeb3Gw() {
+		const { value } = this.toAmino();
+		return {
+			"@type": "/injective.exchange.v2.MsgBatchUpdateOrders",
+			...value
+		};
+	}
+	toEip712() {
+		var _msgValue$spot_market, _msgValue$derivative_, _msgValue$spot_orders, _msgValue$derivative_2, _msgValue$binary_opti, _msgValue$binary_opti2;
+		const { params } = this;
+		const { value, type } = this.toAmino();
+		const spotOrderToEip712 = (order, args) => ({
+			market_id: order.market_id,
+			order_info: {
+				subaccount_id: order.order_info.subaccount_id,
+				fee_recipient: order.order_info.fee_recipient,
+				price: toChainFormat(args.price).toFixed(),
+				quantity: toChainFormat(args.quantity).toFixed(),
+				cid: order.order_info.cid
+			},
+			order_type: order.order_type,
+			trigger_price: toChainFormat(args.triggerPrice || "0").toFixed()
+		});
+		const derivativeOrderToEip712 = (order, args) => ({
+			market_id: order.market_id,
+			order_info: {
+				subaccount_id: order.order_info.subaccount_id,
+				fee_recipient: order.order_info.fee_recipient,
+				price: toChainFormat(args.price).toFixed(),
+				quantity: toChainFormat(args.quantity).toFixed(),
+				cid: order.order_info.cid
+			},
+			order_type: order.order_type,
+			margin: toChainFormat(args.margin).toFixed(),
+			trigger_price: toChainFormat(args.triggerPrice || "0").toFixed()
+		});
+		const msgValue = value;
+		const hasCancelAll = params.spotMarketIdsToCancelAll && params.spotMarketIdsToCancelAll.length > 0 || params.derivativeMarketIdsToCancelAll && params.derivativeMarketIdsToCancelAll.length > 0 || params.binaryOptionsMarketIdsToCancelAll && params.binaryOptionsMarketIdsToCancelAll.length > 0;
+		const result = { sender: msgValue.sender };
+		if (hasCancelAll) result.subaccount_id = msgValue.subaccount_id;
+		if (((_msgValue$spot_market = msgValue.spot_market_ids_to_cancel_all) === null || _msgValue$spot_market === void 0 ? void 0 : _msgValue$spot_market.length) > 0) result.spot_market_ids_to_cancel_all = msgValue.spot_market_ids_to_cancel_all;
+		if (((_msgValue$derivative_ = msgValue.derivative_market_ids_to_cancel_all) === null || _msgValue$derivative_ === void 0 ? void 0 : _msgValue$derivative_.length) > 0) result.derivative_market_ids_to_cancel_all = msgValue.derivative_market_ids_to_cancel_all;
+		if (((_msgValue$spot_orders = msgValue.spot_orders_to_cancel) === null || _msgValue$spot_orders === void 0 ? void 0 : _msgValue$spot_orders.length) > 0) result.spot_orders_to_cancel = msgValue.spot_orders_to_cancel;
+		if (((_msgValue$derivative_2 = msgValue.derivative_orders_to_cancel) === null || _msgValue$derivative_2 === void 0 ? void 0 : _msgValue$derivative_2.length) > 0) result.derivative_orders_to_cancel = msgValue.derivative_orders_to_cancel;
+		if (params.spotOrdersToCreate && params.spotOrdersToCreate.length > 0) result.spot_orders_to_create = params.spotOrdersToCreate.map((args, i) => spotOrderToEip712(msgValue.spot_orders_to_create[i], args));
+		if (params.derivativeOrdersToCreate && params.derivativeOrdersToCreate.length > 0) result.derivative_orders_to_create = params.derivativeOrdersToCreate.map((args, i) => derivativeOrderToEip712(msgValue.derivative_orders_to_create[i], args));
+		if (((_msgValue$binary_opti = msgValue.binary_options_orders_to_cancel) === null || _msgValue$binary_opti === void 0 ? void 0 : _msgValue$binary_opti.length) > 0) result.binary_options_orders_to_cancel = msgValue.binary_options_orders_to_cancel;
+		if (((_msgValue$binary_opti2 = msgValue.binary_options_market_ids_to_cancel_all) === null || _msgValue$binary_opti2 === void 0 ? void 0 : _msgValue$binary_opti2.length) > 0) result.binary_options_market_ids_to_cancel_all = msgValue.binary_options_market_ids_to_cancel_all;
+		if (params.binaryOptionsOrdersToCreate && params.binaryOptionsOrdersToCreate.length > 0) result.binary_options_orders_to_create = params.binaryOptionsOrdersToCreate.map((args, i) => derivativeOrderToEip712(msgValue.binary_options_orders_to_create[i], args));
+		if (params.spotMarketOrdersToCreate && params.spotMarketOrdersToCreate.length > 0) result.spot_market_orders_to_create = params.spotMarketOrdersToCreate.map((args, i) => spotOrderToEip712(msgValue.spot_market_orders_to_create[i], args));
+		if (params.derivativeMarketOrdersToCreate && params.derivativeMarketOrdersToCreate.length > 0) result.derivative_market_orders_to_create = params.derivativeMarketOrdersToCreate.map((args, i) => derivativeOrderToEip712(msgValue.derivative_market_orders_to_create[i], args));
+		if (params.binaryOptionsMarketOrdersToCreate && params.binaryOptionsMarketOrdersToCreate.length > 0) result.binary_options_market_orders_to_create = params.binaryOptionsMarketOrdersToCreate.map((args, i) => derivativeOrderToEip712(msgValue.binary_options_market_orders_to_create[i], args));
+		return {
+			type,
+			value: result
+		};
+	}
+	toEip712Types() {
+		const eip712 = this.toEip712();
+		return patchOrderTypesWithExpirationBlock(objectKeysToEip712Types({
+			object: eip712.value,
+			messageType: eip712.type
+		}), [
+			"TypeSpotOrdersToCreate",
+			"TypeDerivativeOrdersToCreate",
+			"TypeBinaryOptionsOrdersToCreate",
+			"TypeSpotMarketOrdersToCreate",
+			"TypeDerivativeMarketOrdersToCreate",
+			"TypeBinaryOptionsMarketOrdersToCreate"
+		]);
+	}
+	toEip712V2() {
+		var _web3gw$spot_market_i, _web3gw$derivative_ma, _web3gw$spot_orders_t, _web3gw$derivative_or, _web3gw$binary_option, _web3gw$binary_option2;
+		const { params } = this;
+		const web3gw = this.toWeb3Gw();
+		const formatSpotOrderEip712 = (order, args) => ({
+			market_id: order.market_id,
+			order_info: {
+				subaccount_id: order.order_info.subaccount_id,
+				fee_recipient: order.order_info.fee_recipient,
+				price: numberToCosmosSdkDecString(args.price),
+				quantity: numberToCosmosSdkDecString(args.quantity),
+				cid: order.order_info.cid
+			},
+			order_type: InjectiveExchangeV2OrderPb.OrderType[args.orderType],
+			trigger_price: numberToCosmosSdkDecString(args.triggerPrice || "0"),
+			expiration_block: args.expirationBlock || "0"
+		});
+		const formatDerivativeOrderEip712 = (order, args) => ({
+			market_id: order.market_id,
+			order_info: {
+				subaccount_id: order.order_info.subaccount_id,
+				fee_recipient: order.order_info.fee_recipient,
+				price: numberToCosmosSdkDecString(args.price),
+				quantity: numberToCosmosSdkDecString(args.quantity),
+				cid: order.order_info.cid
+			},
+			order_type: InjectiveExchangeV2OrderPb.OrderType[args.orderType],
+			margin: numberToCosmosSdkDecString(args.margin),
+			trigger_price: numberToCosmosSdkDecString(args.triggerPrice || "0"),
+			expiration_block: args.expirationBlock || "0"
+		});
+		return {
+			"@type": "/injective.exchange.v2.MsgBatchUpdateOrders",
+			sender: web3gw.sender,
+			subaccount_id: web3gw.subaccount_id,
+			spot_market_ids_to_cancel_all: (_web3gw$spot_market_i = web3gw.spot_market_ids_to_cancel_all) !== null && _web3gw$spot_market_i !== void 0 ? _web3gw$spot_market_i : [],
+			derivative_market_ids_to_cancel_all: (_web3gw$derivative_ma = web3gw.derivative_market_ids_to_cancel_all) !== null && _web3gw$derivative_ma !== void 0 ? _web3gw$derivative_ma : [],
+			spot_orders_to_cancel: (_web3gw$spot_orders_t = web3gw.spot_orders_to_cancel) !== null && _web3gw$spot_orders_t !== void 0 ? _web3gw$spot_orders_t : [],
+			derivative_orders_to_cancel: (_web3gw$derivative_or = web3gw.derivative_orders_to_cancel) !== null && _web3gw$derivative_or !== void 0 ? _web3gw$derivative_or : [],
+			spot_orders_to_create: params.spotOrdersToCreate && params.spotOrdersToCreate.length > 0 ? params.spotOrdersToCreate.map((args, i) => formatSpotOrderEip712(web3gw.spot_orders_to_create[i], args)) : [],
+			derivative_orders_to_create: params.derivativeOrdersToCreate && params.derivativeOrdersToCreate.length > 0 ? params.derivativeOrdersToCreate.map((args, i) => formatDerivativeOrderEip712(web3gw.derivative_orders_to_create[i], args)) : [],
+			binary_options_orders_to_cancel: (_web3gw$binary_option = web3gw.binary_options_orders_to_cancel) !== null && _web3gw$binary_option !== void 0 ? _web3gw$binary_option : [],
+			binary_options_market_ids_to_cancel_all: (_web3gw$binary_option2 = web3gw.binary_options_market_ids_to_cancel_all) !== null && _web3gw$binary_option2 !== void 0 ? _web3gw$binary_option2 : [],
+			binary_options_orders_to_create: params.binaryOptionsOrdersToCreate && params.binaryOptionsOrdersToCreate.length > 0 ? params.binaryOptionsOrdersToCreate.map((args, i) => formatDerivativeOrderEip712(web3gw.binary_options_orders_to_create[i], args)) : [],
+			spot_market_orders_to_create: params.spotMarketOrdersToCreate && params.spotMarketOrdersToCreate.length > 0 ? params.spotMarketOrdersToCreate.map((args, i) => formatSpotOrderEip712(web3gw.spot_market_orders_to_create[i], args)) : [],
+			derivative_market_orders_to_create: params.derivativeMarketOrdersToCreate && params.derivativeMarketOrdersToCreate.length > 0 ? params.derivativeMarketOrdersToCreate.map((args, i) => formatDerivativeOrderEip712(web3gw.derivative_market_orders_to_create[i], args)) : [],
+			binary_options_market_orders_to_create: params.binaryOptionsMarketOrdersToCreate && params.binaryOptionsMarketOrdersToCreate.length > 0 ? params.binaryOptionsMarketOrdersToCreate.map((args, i) => formatDerivativeOrderEip712(web3gw.binary_options_market_orders_to_create[i], args)) : []
+		};
+	}
+	toDirectSign() {
+		return {
+			type: "/injective.exchange.v2.MsgBatchUpdateOrders",
+			message: this.toProto()
+		};
+	}
+	toBinary() {
+		return InjectiveExchangeV2TxPb.MsgBatchUpdateOrders.toBinary(this.toProto());
+	}
+};
+
+//#endregion
+//#region src/core/modules/exchange/msgs/MsgLiquidatePositionV2.ts
+const createMessage$10 = (params) => {
+	const message = InjectiveExchangeV2TxPb.MsgLiquidatePosition.create({
+		sender: params.injectiveAddress,
+		subaccountId: params.subaccountId,
+		marketId: params.marketId
+	});
+	if (params.order) {
+		const orderInfo = InjectiveExchangeV2OrderPb.OrderInfo.create({
+			subaccountId: params.order.subaccountId,
+			feeRecipient: params.order.feeRecipient,
+			price: params.order.price,
+			quantity: params.order.quantity,
+			cid: params.order.cid || ""
+		});
+		message.order = InjectiveExchangeV2OrderPb.DerivativeOrder.create({
+			marketId: params.order.marketId,
+			margin: params.order.margin,
+			orderInfo,
+			orderType: params.order.orderType,
+			triggerPrice: params.order.triggerPrice || "0",
+			expirationBlock: params.order.expirationBlock ? BigInt(params.order.expirationBlock) : BigInt(0)
+		});
+	}
+	return message;
+};
+/**
+* @category Messages
+*/
+var MsgLiquidatePositionV2 = class MsgLiquidatePositionV2 extends MsgBase {
+	static fromJSON(params) {
+		return new MsgLiquidatePositionV2(params);
+	}
+	toProto() {
+		const { params: initialParams } = this;
+		return createMessage$10({
+			...initialParams,
+			order: initialParams.order ? {
+				...initialParams.order,
+				price: toChainFormat(initialParams.order.price).toFixed(),
+				margin: toChainFormat(initialParams.order.margin).toFixed(),
+				triggerPrice: toChainFormat(initialParams.order.triggerPrice || 0).toFixed(),
+				quantity: toChainFormat(initialParams.order.quantity).toFixed()
+			} : void 0
+		});
+	}
+	toData() {
+		const proto = this.toProto();
+		return {
+			"@type": "/injective.exchange.v2.MsgLiquidatePosition",
+			...proto
+		};
+	}
+	toAmino() {
+		const { params } = this;
+		return {
+			type: "exchange/MsgLiquidatePosition",
+			value: {
+				sender: params.injectiveAddress,
+				subaccount_id: params.subaccountId,
+				market_id: params.marketId,
+				order: params.order ? {
+					market_id: params.order.marketId,
+					order_info: {
+						subaccount_id: params.order.subaccountId,
+						fee_recipient: params.order.feeRecipient,
+						price: params.order.price,
+						quantity: params.order.quantity,
+						cid: params.order.cid || ""
+					},
+					order_type: params.order.orderType,
+					margin: params.order.margin,
+					trigger_price: params.order.triggerPrice || "0",
+					expiration_block: params.order.expirationBlock || "0"
+				} : void 0
+			}
+		};
+	}
+	toWeb3Gw() {
+		const { value } = this.toAmino();
+		return {
+			"@type": "/injective.exchange.v2.MsgLiquidatePosition",
+			...value
+		};
+	}
+	toEip712V2() {
+		const { params } = this;
+		const web3gw = this.toWeb3Gw();
+		const order = web3gw.order;
+		return {
+			...web3gw,
+			order: params.order ? {
+				...order,
+				order_info: {
+					...order === null || order === void 0 ? void 0 : order.order_info,
+					price: numberToCosmosSdkDecString(params.order.price),
+					quantity: numberToCosmosSdkDecString(params.order.quantity)
+				},
+				margin: numberToCosmosSdkDecString(params.order.margin),
+				trigger_price: numberToCosmosSdkDecString(params.order.triggerPrice || "0"),
+				order_type: InjectiveExchangeV2OrderPb.OrderType[params.order.orderType]
+			} : null
+		};
+	}
+	toEip712() {
+		const { params } = this;
+		const { value, type } = this.toAmino();
+		const { expiration_block: _eb, ...orderWithoutExpiration } = value.order || {};
+		return {
+			type,
+			value: {
+				...value,
+				order: params.order ? {
+					...orderWithoutExpiration,
+					order_info: {
+						...orderWithoutExpiration === null || orderWithoutExpiration === void 0 ? void 0 : orderWithoutExpiration.order_info,
+						price: toChainFormat(params.order.price).toFixed(),
+						quantity: toChainFormat(params.order.quantity).toFixed()
+					},
+					margin: toChainFormat(params.order.margin).toFixed(),
+					trigger_price: toChainFormat(params.order.triggerPrice || "0").toFixed()
+				} : void 0
+			}
+		};
+	}
+	toEip712Types() {
+		const eip712 = this.toEip712();
+		return patchOrderTypesWithExpirationBlock(objectKeysToEip712Types({
+			object: eip712.value,
+			messageType: eip712.type
+		}), ["TypeOrder"]);
+	}
+	toDirectSign() {
+		return {
+			type: "/injective.exchange.v2.MsgLiquidatePosition",
+			message: this.toProto()
+		};
+	}
+	toBinary() {
+		return InjectiveExchangeV2TxPb.MsgLiquidatePosition.toBinary(this.toProto());
+	}
+};
+
+//#endregion
+//#region src/core/modules/exchange/msgs/MsgCancelPostOnlyModeV2.ts
+const createMessage$9 = (params) => {
+	return InjectiveExchangeV2TxPb.MsgCancelPostOnlyMode.create({ sender: params.sender });
+};
+/**
+* @category Messages
+*/
+var MsgCancelPostOnlyModeV2 = class MsgCancelPostOnlyModeV2 extends MsgBase {
+	static fromJSON(params) {
+		return new MsgCancelPostOnlyModeV2(params);
+	}
+	toProto() {
+		const { params: initialParams } = this;
+		return createMessage$9({ ...initialParams });
+	}
+	toData() {
+		const proto = this.toProto();
+		return {
+			"@type": "/injective.exchange.v2.MsgCancelPostOnlyMode",
+			...proto
+		};
+	}
+	toAmino() {
+		const { params } = this;
+		return {
+			type: "exchange/MsgCancelPostOnlyMode",
+			value: { sender: createMessage$9(params).sender }
+		};
+	}
+	toWeb3Gw() {
+		const { value } = this.toAmino();
+		return {
+			"@type": "/injective.exchange.v2.MsgCancelPostOnlyMode",
+			...value
+		};
+	}
+	toEip712() {
+		const { type, value } = this.toAmino();
+		return {
+			type,
+			value: { ...value }
+		};
+	}
+	toEip712V2() {
+		return { ...this.toWeb3Gw() };
+	}
+	toDirectSign() {
+		return {
+			type: "/injective.exchange.v2.MsgCancelPostOnlyMode",
+			message: this.toProto()
+		};
+	}
+	toBinary() {
+		return InjectiveExchangeV2TxPb.MsgCancelPostOnlyMode.toBinary(this.toProto());
+	}
+};
+
+//#endregion
+//#region src/core/modules/exchange/msgs/MsgCreateSpotLimitOrder.ts
+const createLimitOrder$5 = (params) => {
+	const orderInfo = InjectiveExchangeV1Beta1ExchangePb.OrderInfo.create({
+		subaccountId: params.subaccountId,
+		feeRecipient: params.feeRecipient,
+		price: params.price,
+		quantity: params.quantity,
+		cid: params.cid || ""
+	});
+	const spotOrder = InjectiveExchangeV1Beta1ExchangePb.SpotOrder.create({
+		marketId: params.marketId,
+		orderInfo,
+		orderType: params.orderType,
+		triggerPrice: params.triggerPrice || "0"
+	});
+	return InjectiveExchangeV1Beta1TxPb.MsgCreateSpotLimitOrder.create({
+		sender: params.injectiveAddress,
+		order: spotOrder
+	});
+};
+/**
+* @category Messages
+*/
+var MsgCreateSpotLimitOrder = class MsgCreateSpotLimitOrder extends MsgBase {
+	static fromJSON(params) {
+		return new MsgCreateSpotLimitOrder(params);
+	}
+	toProto() {
+		const { params: initialParams } = this;
+		return createLimitOrder$5({
+			...initialParams,
+			price: toChainFormat(initialParams.price).toFixed(),
+			triggerPrice: toChainFormat(initialParams.triggerPrice || 0).toFixed(),
+			quantity: toChainFormat(initialParams.quantity).toFixed()
+		});
+	}
+	toData() {
+		const proto = this.toProto();
+		return {
+			"@type": "/injective.exchange.v1beta1.MsgCreateSpotLimitOrder",
+			...proto
+		};
+	}
+	toAmino() {
+		const { params } = this;
+		return {
+			type: "exchange/MsgCreateSpotLimitOrder",
+			value: {
+				sender: params.injectiveAddress,
+				order: {
+					market_id: params.marketId,
+					order_info: {
+						subaccount_id: params.subaccountId,
+						fee_recipient: params.feeRecipient,
+						price: params.price,
+						quantity: params.quantity,
+						cid: params.cid || ""
+					},
+					order_type: params.orderType,
+					trigger_price: params.triggerPrice || "0"
+				}
+			}
+		};
+	}
+	toWeb3Gw() {
+		const { value } = this.toAmino();
+		return {
+			"@type": "/injective.exchange.v1beta1.MsgCreateSpotLimitOrder",
+			...value
+		};
+	}
+	toEip712V2() {
+		const { params } = this;
+		const web3gw = this.toWeb3Gw();
+		const order = web3gw.order;
+		return {
+			...web3gw,
+			order: {
+				...order,
+				order_info: {
+					...order.order_info,
+					price: numberToCosmosSdkDecString(params.price),
+					quantity: numberToCosmosSdkDecString(params.quantity)
+				},
+				trigger_price: numberToCosmosSdkDecString(params.triggerPrice || "0"),
+				order_type: InjectiveExchangeV1Beta1ExchangePb.OrderType[params.orderType]
+			}
+		};
+	}
+	toEip712() {
+		var _value$order;
+		const { params } = this;
+		const { value, type } = this.toAmino();
+		return {
+			type,
+			value: {
+				...value,
+				order: {
+					...value.order,
+					order_info: {
+						...(_value$order = value.order) === null || _value$order === void 0 ? void 0 : _value$order.order_info,
+						price: toChainFormat(params.price).toFixed(),
+						quantity: toChainFormat(params.quantity).toFixed()
+					},
+					trigger_price: toChainFormat(params.triggerPrice || "0").toFixed()
+				}
+			}
+		};
+	}
+	toDirectSign() {
+		return {
+			type: "/injective.exchange.v1beta1.MsgCreateSpotLimitOrder",
+			message: this.toProto()
+		};
+	}
+	toBinary() {
+		return InjectiveExchangeV1Beta1TxPb.MsgCreateSpotLimitOrder.toBinary(this.toProto());
+	}
+};
+
+//#endregion
+//#region src/core/modules/exchange/msgs/MsgAuthorizeStakeGrants.ts
+/**
+* @category Messages
+*/
+var MsgAuthorizeStakeGrants = class MsgAuthorizeStakeGrants extends MsgBase {
+	static fromJSON(params) {
+		return new MsgAuthorizeStakeGrants(params);
+	}
+	toProto() {
+		const { params } = this;
+		return InjectiveExchangeV1Beta1TxPb.MsgAuthorizeStakeGrants.create({
+			sender: params.injectiveAddress,
+			grants: [{
+				grantee: params.grantee,
+				amount: params.amount
+			}]
+		});
+	}
+	toData() {
+		const proto = this.toProto();
+		return {
+			"@type": "/injective.exchange.v1beta1.MsgAuthorizeStakeGrants",
+			...proto
+		};
+	}
+	toAmino() {
+		const proto = this.toProto();
+		return {
+			type: "exchange/MsgAuthorizeStakeGrants",
+			value: {
+				sender: proto.sender,
+				grants: proto.grants
+			}
+		};
+	}
+	toWeb3Gw() {
+		const { value } = this.toAmino();
+		return {
+			"@type": "/injective.exchange.v1beta1.MsgAuthorizeStakeGrants",
+			...value
+		};
+	}
+	toDirectSign() {
+		return {
+			type: "/injective.exchange.v1beta1.MsgAuthorizeStakeGrants",
+			message: this.toProto()
+		};
+	}
+	toBinary() {
+		return InjectiveExchangeV1Beta1TxPb.MsgAuthorizeStakeGrants.toBinary(this.toProto());
+	}
+};
+
+//#endregion
+//#region src/core/modules/exchange/msgs/MsgReclaimLockedFundsV2.ts
+/**
+* @category Messages
+*/
+var MsgReclaimLockedFundsV2 = class MsgReclaimLockedFundsV2 extends MsgBase {
+	static fromJSON(params) {
+		return new MsgReclaimLockedFundsV2(params);
+	}
+	toProto() {
+		const { params } = this;
+		return InjectiveExchangeV2TxPb.MsgReclaimLockedFunds.create({
+			sender: params.sender,
+			lockedAccountPubKey: base64ToUint8Array(params.lockedAccountPubKey),
+			signature: params.signature
+		});
+	}
+	toData() {
+		const proto = this.toProto();
+		return {
+			"@type": "/injective.exchange.v2.MsgReclaimLockedFunds",
+			...proto
+		};
+	}
+	toAmino() {
+		const proto = this.toProto();
+		return {
+			type: "exchange/MsgReclaimLockedFunds",
+			value: {
+				sender: proto.sender,
+				lockedAccountPubKey: uint8ArrayToBase64(proto.lockedAccountPubKey),
+				signature: uint8ArrayToBase64(proto.signature)
+			}
+		};
+	}
+	toWeb3Gw() {
+		throw new GeneralException(/* @__PURE__ */ new Error("EIP712 is not supported for MsgReclaimLockedFunds."));
+	}
+	toEip712() {
+		throw new GeneralException(/* @__PURE__ */ new Error("EIP712 is not supported for MsgReclaimLockedFunds."));
+	}
+	toEip712V2() {
+		throw new GeneralException(/* @__PURE__ */ new Error("EIP712 is not supported for MsgReclaimLockedFunds."));
+	}
+	toDirectSign() {
+		return {
+			type: "/injective.exchange.v2.MsgReclaimLockedFunds",
+			message: this.toProto()
+		};
+	}
+	toBinary() {
+		return InjectiveExchangeV2TxPb.MsgReclaimLockedFunds.toBinary(this.toProto());
+	}
+};
+
+//#endregion
+//#region src/core/modules/exchange/msgs/MsgBatchCancelSpotOrders.ts
+/**
+* @category Messages
+*/
+var MsgBatchCancelSpotOrders = class MsgBatchCancelSpotOrders extends MsgBase {
+	static fromJSON(params) {
+		return new MsgBatchCancelSpotOrders(params);
+	}
+	toProto() {
+		const { params } = this;
+		const orderDataList = params.orders.map((order) => {
+			return InjectiveExchangeV1Beta1TxPb.OrderData.create({
+				marketId: order.marketId,
+				subaccountId: order.subaccountId,
+				orderHash: order.orderHash || "",
+				orderMask: order.orderMask || InjectiveExchangeV1Beta1ExchangePb.OrderMask.ANY,
+				cid: order.cid || ""
+			});
+		});
+		return InjectiveExchangeV1Beta1TxPb.MsgBatchCancelSpotOrders.create({
+			sender: params.injectiveAddress,
+			data: orderDataList
+		});
+	}
+	toData() {
+		const proto = this.toProto();
+		return {
+			"@type": "/injective.exchange.v1beta1.MsgBatchCancelSpotOrders",
+			...proto
+		};
+	}
+	toAmino() {
+		const proto = this.toProto();
+		return {
+			type: "exchange/MsgBatchCancelSpotOrders",
+			value: {
+				sender: proto.sender,
+				data: proto.data.map((orderData) => ({
+					market_id: orderData.marketId,
+					subaccount_id: orderData.subaccountId,
+					order_hash: orderData.orderHash,
+					order_mask: orderData.orderMask,
+					cid: orderData.cid
+				}))
+			}
+		};
+	}
+	toWeb3Gw() {
+		const { value } = this.toAmino();
+		return {
+			"@type": "/injective.exchange.v1beta1.MsgBatchCancelSpotOrders",
+			...value
+		};
+	}
+	toDirectSign() {
+		return {
+			type: "/injective.exchange.v1beta1.MsgBatchCancelSpotOrders",
+			message: this.toProto()
+		};
+	}
+	toBinary() {
+		return InjectiveExchangeV1Beta1TxPb.MsgBatchCancelSpotOrders.toBinary(this.toProto());
+	}
+};
+
+//#endregion
+//#region src/core/modules/exchange/msgs/MsgCancelDerivativeOrder.ts
+var MsgCancelDerivativeOrder = class MsgCancelDerivativeOrder extends MsgBase {
+	static fromJSON(params) {
+		return new MsgCancelDerivativeOrder(params);
+	}
+	toProto() {
+		const { params } = this;
+		return InjectiveExchangeV1Beta1TxPb.MsgCancelDerivativeOrder.create({
+			sender: params.injectiveAddress,
+			marketId: params.marketId,
+			subaccountId: params.subaccountId,
+			orderHash: params.orderHash || "",
+			orderMask: params.orderMask || InjectiveExchangeV1Beta1ExchangePb.OrderMask.ANY,
+			cid: params.cid || ""
+		});
+	}
+	toData() {
+		const proto = this.toProto();
+		return {
+			"@type": "/injective.exchange.v1beta1.MsgCancelDerivativeOrder",
+			...proto
+		};
+	}
+	toAmino() {
+		const proto = this.toProto();
+		return {
+			type: "exchange/MsgCancelDerivativeOrder",
+			value: {
+				sender: proto.sender,
+				market_id: proto.marketId,
+				subaccount_id: proto.subaccountId,
+				order_hash: proto.orderHash,
+				order_mask: proto.orderMask,
+				cid: proto.cid
+			}
+		};
+	}
+	toWeb3Gw() {
+		const { value } = this.toAmino();
+		return {
+			"@type": "/injective.exchange.v1beta1.MsgCancelDerivativeOrder",
+			...value
+		};
+	}
+	toDirectSign() {
+		return {
+			type: "/injective.exchange.v1beta1.MsgCancelDerivativeOrder",
+			message: this.toProto()
+		};
+	}
+	toBinary() {
+		return InjectiveExchangeV1Beta1TxPb.MsgCancelDerivativeOrder.toBinary(this.toProto());
+	}
+};
+
+//#endregion
+//#region src/core/modules/exchange/msgs/MsgCreateSpotMarketOrder.ts
+const createMarketOrder$5 = (params) => {
+	const orderInfo = InjectiveExchangeV1Beta1ExchangePb.OrderInfo.create({
+		subaccountId: params.subaccountId,
+		feeRecipient: params.feeRecipient,
+		price: params.price,
+		quantity: params.quantity,
+		cid: params.cid || ""
+	});
+	const spotOrder = InjectiveExchangeV1Beta1ExchangePb.SpotOrder.create({
+		marketId: params.marketId,
+		orderInfo,
+		orderType: params.orderType,
+		triggerPrice: params.triggerPrice || "0"
+	});
+	return InjectiveExchangeV1Beta1TxPb.MsgCreateSpotMarketOrder.create({
+		sender: params.injectiveAddress,
+		order: spotOrder
+	});
+};
+/**
+* @category Messages
+*/
+var MsgCreateSpotMarketOrder = class MsgCreateSpotMarketOrder extends MsgBase {
+	static fromJSON(params) {
+		return new MsgCreateSpotMarketOrder(params);
+	}
+	toProto() {
+		const { params: initialParams } = this;
+		return createMarketOrder$5({
+			...initialParams,
+			price: toChainFormat(initialParams.price).toFixed(),
+			triggerPrice: toChainFormat(initialParams.triggerPrice || 0).toFixed(),
+			quantity: toChainFormat(initialParams.quantity).toFixed()
+		});
+	}
+	toData() {
+		const proto = this.toProto();
+		return {
+			"@type": "/injective.exchange.v1beta1.MsgCreateSpotMarketOrder",
+			...proto
+		};
+	}
+	toAmino() {
+		const { params } = this;
+		return {
+			type: "exchange/MsgCreateSpotMarketOrder",
+			value: {
+				sender: params.injectiveAddress,
+				order: {
+					market_id: params.marketId,
+					order_info: {
+						subaccount_id: params.subaccountId,
+						fee_recipient: params.feeRecipient,
+						price: params.price,
+						quantity: params.quantity,
+						cid: params.cid || ""
+					},
+					order_type: params.orderType,
+					trigger_price: params.triggerPrice || "0"
+				}
+			}
+		};
+	}
+	toWeb3Gw() {
+		const { value } = this.toAmino();
+		return {
+			"@type": "/injective.exchange.v1beta1.MsgCreateSpotMarketOrder",
+			...value
+		};
+	}
+	toEip712V2() {
+		const { params } = this;
+		const web3gw = this.toWeb3Gw();
+		const order = web3gw.order;
+		return {
+			...web3gw,
+			order: {
+				...order,
+				order_info: {
+					...order.order_info,
+					price: numberToCosmosSdkDecString(params.price),
+					quantity: numberToCosmosSdkDecString(params.quantity)
+				},
+				trigger_price: numberToCosmosSdkDecString(params.triggerPrice || "0"),
+				order_type: InjectiveExchangeV1Beta1ExchangePb.OrderType[params.orderType]
+			}
+		};
+	}
+	toEip712() {
+		var _value$order;
+		const { params } = this;
+		const { value, type } = this.toAmino();
+		return {
+			type,
+			value: {
+				...value,
+				order: {
+					...value.order,
+					order_info: {
+						...(_value$order = value.order) === null || _value$order === void 0 ? void 0 : _value$order.order_info,
+						price: toChainFormat(params.price).toFixed(),
+						quantity: toChainFormat(params.quantity).toFixed()
+					},
+					trigger_price: toChainFormat(params.triggerPrice || "0").toFixed()
+				}
+			}
+		};
+	}
+	toDirectSign() {
+		return {
+			type: "/injective.exchange.v1beta1.MsgCreateSpotMarketOrder",
+			message: this.toProto()
+		};
+	}
+	toBinary() {
+		return InjectiveExchangeV1Beta1TxPb.MsgCreateSpotMarketOrder.toBinary(this.toProto());
+	}
+};
+
+//#endregion
+//#region src/core/modules/exchange/msgs/MsgAuthorizeStakeGrantsV2.ts
+/**
+* @category Messages
+*/
+var MsgAuthorizeStakeGrantsV2 = class MsgAuthorizeStakeGrantsV2 extends MsgBase {
+	static fromJSON(params) {
+		return new MsgAuthorizeStakeGrantsV2(params);
+	}
+	toProto() {
+		const { params } = this;
+		return InjectiveExchangeV2TxPb.MsgAuthorizeStakeGrants.create({
+			sender: params.injectiveAddress,
+			grants: params.grants.map(({ grantee, amount }) => ({
+				grantee,
+				amount
+			}))
+		});
+	}
+	toData() {
+		const proto = this.toProto();
+		return {
+			"@type": "/injective.exchange.v2.MsgAuthorizeStakeGrants",
+			...proto
+		};
+	}
+	toAmino() {
+		const proto = this.toProto();
+		return {
+			type: "exchange/MsgAuthorizeStakeGrants",
+			value: {
+				sender: proto.sender,
+				grants: proto.grants
+			}
+		};
+	}
+	toWeb3Gw() {
+		const { value } = this.toAmino();
+		return {
+			"@type": "/injective.exchange.v2.MsgAuthorizeStakeGrants",
+			...value
+		};
+	}
+	toDirectSign() {
+		return {
+			type: "/injective.exchange.v2.MsgAuthorizeStakeGrants",
+			message: this.toProto()
+		};
+	}
+	toBinary() {
+		return InjectiveExchangeV2TxPb.MsgAuthorizeStakeGrants.toBinary(this.toProto());
+	}
+};
+
+//#endregion
+//#region src/core/modules/exchange/msgs/MsgCreateSpotLimitOrderV2.ts
+const createLimitOrder$4 = (params) => {
+	const orderInfo = InjectiveExchangeV2OrderPb.OrderInfo.create({
+		subaccountId: params.subaccountId,
+		feeRecipient: params.feeRecipient,
+		price: params.price,
+		quantity: params.quantity,
+		cid: params.cid || ""
+	});
+	const spotOrder = InjectiveExchangeV2OrderPb.SpotOrder.create({
+		marketId: params.marketId,
+		orderInfo,
+		orderType: params.orderType,
+		triggerPrice: params.triggerPrice || "0",
+		expirationBlock: params.expirationBlock ? BigInt(params.expirationBlock) : BigInt(0)
+	});
+	return InjectiveExchangeV2TxPb.MsgCreateSpotLimitOrder.create({
+		sender: params.injectiveAddress,
+		order: spotOrder
+	});
+};
+/**
+* @category Messages
+*/
+var MsgCreateSpotLimitOrderV2 = class MsgCreateSpotLimitOrderV2 extends MsgBase {
+	static fromJSON(params) {
+		return new MsgCreateSpotLimitOrderV2(params);
+	}
+	toProto() {
+		const { params: initialParams } = this;
+		return createLimitOrder$4({
+			...initialParams,
+			price: toChainFormat(initialParams.price).toFixed(),
+			triggerPrice: toChainFormat(initialParams.triggerPrice || 0).toFixed(),
+			quantity: toChainFormat(initialParams.quantity).toFixed()
+		});
+	}
+	toData() {
+		const proto = this.toProto();
+		return {
+			"@type": "/injective.exchange.v2.MsgCreateSpotLimitOrder",
+			...proto
+		};
+	}
+	toAmino() {
+		const { params } = this;
+		return {
+			type: "exchange/MsgCreateSpotLimitOrder",
+			value: {
+				sender: params.injectiveAddress,
+				order: {
+					market_id: params.marketId,
+					order_info: {
+						subaccount_id: params.subaccountId,
+						fee_recipient: params.feeRecipient,
+						price: params.price,
+						quantity: params.quantity,
+						cid: params.cid || ""
+					},
+					order_type: params.orderType,
+					trigger_price: params.triggerPrice || "0",
+					expiration_block: params.expirationBlock || "0"
+				}
+			}
+		};
+	}
+	toWeb3Gw() {
+		const { value } = this.toAmino();
+		return {
+			"@type": "/injective.exchange.v2.MsgCreateSpotLimitOrder",
+			...value
+		};
+	}
+	toEip712V2() {
+		const { params } = this;
+		const web3gw = this.toWeb3Gw();
+		const order = web3gw.order;
+		return {
+			...web3gw,
+			order: {
+				...order,
+				order_info: {
+					...order.order_info,
+					price: numberToCosmosSdkDecString(params.price),
+					quantity: numberToCosmosSdkDecString(params.quantity)
+				},
+				trigger_price: numberToCosmosSdkDecString(params.triggerPrice || "0"),
+				order_type: InjectiveExchangeV2OrderPb.OrderType[params.orderType]
+			}
+		};
+	}
+	toEip712() {
+		const { params } = this;
+		const { value, type } = this.toAmino();
+		const { expiration_block: _eb, ...orderWithoutExpiration } = value.order || {};
+		return {
+			type,
+			value: {
+				...value,
+				order: {
+					...orderWithoutExpiration,
+					order_info: {
+						...orderWithoutExpiration === null || orderWithoutExpiration === void 0 ? void 0 : orderWithoutExpiration.order_info,
+						price: toChainFormat(params.price).toFixed(),
+						quantity: toChainFormat(params.quantity).toFixed()
+					},
+					trigger_price: toChainFormat(params.triggerPrice || "0").toFixed()
+				}
+			}
+		};
+	}
+	toDirectSign() {
+		return {
+			type: "/injective.exchange.v2.MsgCreateSpotLimitOrder",
+			message: this.toProto()
+		};
+	}
+	toBinary() {
+		return InjectiveExchangeV2TxPb.MsgCreateSpotLimitOrder.toBinary(this.toProto());
+	}
+};
+
+//#endregion
+//#region src/core/modules/exchange/msgs/MsgInstantSpotMarketLaunch.ts
+const createMessage$8 = (params) => {
+	return InjectiveExchangeV1Beta1TxPb.MsgInstantSpotMarketLaunch.create({
+		sender: params.proposer,
+		ticker: params.market.ticker,
+		baseDenom: params.market.baseDenom,
+		quoteDenom: params.market.quoteDenom,
+		minPriceTickSize: params.market.minPriceTickSize,
+		minQuantityTickSize: params.market.minQuantityTickSize,
+		minNotional: params.market.minNotional,
+		baseDecimals: Number(params.market.baseDecimals),
+		quoteDecimals: Number(params.market.quoteDecimals)
+	});
+};
+/**
+* @category Messages
+*/
+var MsgInstantSpotMarketLaunch = class MsgInstantSpotMarketLaunch extends MsgBase {
+	static fromJSON(params) {
+		return new MsgInstantSpotMarketLaunch(params);
+	}
+	toProto() {
+		const { params: initialParams } = this;
+		return createMessage$8({
+			...initialParams,
+			market: {
+				...initialParams.market,
+				minPriceTickSize: toChainFormat(initialParams.market.minPriceTickSize).toFixed(),
+				minQuantityTickSize: toChainFormat(initialParams.market.minQuantityTickSize).toFixed(),
+				minNotional: toChainFormat(initialParams.market.minNotional).toFixed()
+			}
+		});
+	}
+	toData() {
+		const proto = this.toProto();
+		return {
+			"@type": "/injective.exchange.v1beta1.MsgInstantSpotMarketLaunch",
+			...proto
+		};
+	}
+	toAmino() {
+		const { params } = this;
+		return {
+			type: "exchange/MsgInstantSpotMarketLaunch",
+			value: {
+				sender: params.proposer,
+				ticker: params.market.ticker,
+				base_denom: params.market.baseDenom,
+				quote_denom: params.market.quoteDenom,
+				min_price_tick_size: params.market.minPriceTickSize,
+				min_quantity_tick_size: params.market.minQuantityTickSize,
+				min_notional: params.market.minNotional,
+				base_decimals: params.market.baseDecimals,
+				quote_decimals: params.market.quoteDecimals
+			}
+		};
+	}
+	toWeb3Gw() {
+		const { value } = this.toAmino();
+		return {
+			"@type": "/injective.exchange.v1beta1.MsgInstantSpotMarketLaunch",
+			...value
+		};
+	}
+	toEip712() {
+		const { type, value } = this.toAmino();
+		return {
+			type,
+			value: {
+				...value,
+				min_price_tick_size: toChainFormat(value.min_price_tick_size).toFixed(),
+				min_quantity_tick_size: toChainFormat(value.min_quantity_tick_size).toFixed(),
+				min_notional: toChainFormat(value.min_notional).toFixed()
+			}
+		};
+	}
+	toEip712V2() {
+		const { params } = this;
+		return {
+			...this.toWeb3Gw(),
+			min_price_tick_size: numberToCosmosSdkDecString(params.market.minPriceTickSize),
+			min_quantity_tick_size: numberToCosmosSdkDecString(params.market.minQuantityTickSize),
+			min_notional: numberToCosmosSdkDecString(params.market.minNotional)
+		};
+	}
+	toDirectSign() {
+		return {
+			type: "/injective.exchange.v1beta1.MsgInstantSpotMarketLaunch",
+			message: this.toProto()
+		};
+	}
+	toBinary() {
+		return InjectiveExchangeV1Beta1TxPb.MsgInstantSpotMarketLaunch.toBinary(this.toProto());
+	}
+};
+
+//#endregion
+//#region src/core/modules/exchange/msgs/MsgCancelDerivativeOrderV2.ts
+/**
+* @category Messages
+*/
+var MsgCancelDerivativeOrderV2 = class MsgCancelDerivativeOrderV2 extends MsgBase {
+	static fromJSON(params) {
+		return new MsgCancelDerivativeOrderV2(params);
+	}
+	toProto() {
+		const { params } = this;
+		return InjectiveExchangeV2TxPb.MsgCancelDerivativeOrder.create({
+			sender: params.injectiveAddress,
+			marketId: params.marketId,
+			subaccountId: params.subaccountId,
+			orderHash: params.orderHash || "",
+			orderMask: params.orderMask || InjectiveExchangeV2OrderPb.OrderMask.ANY,
+			cid: params.cid || ""
+		});
+	}
+	toData() {
+		const proto = this.toProto();
+		return {
+			"@type": "/injective.exchange.v2.MsgCancelDerivativeOrder",
+			...proto
+		};
+	}
+	toAmino() {
+		const proto = this.toProto();
+		return {
+			type: "exchange/MsgCancelDerivativeOrder",
+			value: {
+				sender: proto.sender,
+				market_id: proto.marketId,
+				subaccount_id: proto.subaccountId,
+				order_hash: proto.orderHash,
+				order_mask: proto.orderMask,
+				cid: proto.cid
+			}
+		};
+	}
+	toWeb3Gw() {
+		const { value } = this.toAmino();
+		return {
+			"@type": "/injective.exchange.v2.MsgCancelDerivativeOrder",
+			...value
+		};
+	}
+	toDirectSign() {
+		return {
+			type: "/injective.exchange.v2.MsgCancelDerivativeOrder",
+			message: this.toProto()
+		};
+	}
+	toBinary() {
+		return InjectiveExchangeV2TxPb.MsgCancelDerivativeOrder.toBinary(this.toProto());
+	}
+};
+
+//#endregion
+//#region src/core/modules/exchange/msgs/MsgBatchCancelSpotOrdersV2.ts
+/**
+* @category Messages
+*/
+var MsgBatchCancelSpotOrdersV2 = class MsgBatchCancelSpotOrdersV2 extends MsgBase {
+	static fromJSON(params) {
+		return new MsgBatchCancelSpotOrdersV2(params);
+	}
+	toProto() {
+		const { params } = this;
+		const orderDataList = params.orders.map((order) => {
+			return InjectiveExchangeV2TxPb.OrderData.create({
+				marketId: order.marketId,
+				subaccountId: order.subaccountId,
+				orderHash: order.orderHash || "",
+				orderMask: order.orderMask || InjectiveExchangeV2OrderPb.OrderMask.ANY,
+				cid: order.cid || ""
+			});
+		});
+		return InjectiveExchangeV2TxPb.MsgBatchCancelSpotOrders.create({
+			sender: params.injectiveAddress,
+			data: orderDataList
+		});
+	}
+	toData() {
+		const proto = this.toProto();
+		return {
+			"@type": "/injective.exchange.v2.MsgBatchCancelSpotOrders",
+			...proto
+		};
+	}
+	toAmino() {
+		const proto = this.toProto();
+		return {
+			type: "exchange/MsgBatchCancelSpotOrders",
+			value: {
+				sender: proto.sender,
+				data: proto.data.map((orderData) => ({
+					market_id: orderData.marketId,
+					subaccount_id: orderData.subaccountId,
+					order_hash: orderData.orderHash,
+					order_mask: orderData.orderMask,
+					cid: orderData.cid
+				}))
+			}
+		};
+	}
+	toWeb3Gw() {
+		const { value } = this.toAmino();
+		return {
+			"@type": "/injective.exchange.v2.MsgBatchCancelSpotOrders",
+			...value
+		};
+	}
+	toDirectSign() {
+		return {
+			type: "/injective.exchange.v2.MsgBatchCancelSpotOrders",
+			message: this.toProto()
+		};
+	}
+	toBinary() {
+		return InjectiveExchangeV2TxPb.MsgBatchCancelSpotOrders.toBinary(this.toProto());
+	}
+};
+
+//#endregion
+//#region src/core/modules/exchange/msgs/MsgCreateSpotMarketOrderV2.ts
+const createMarketOrder$4 = (params) => {
+	const orderInfo = InjectiveExchangeV2OrderPb.OrderInfo.create({
+		subaccountId: params.subaccountId,
+		feeRecipient: params.feeRecipient,
+		price: params.price,
+		quantity: params.quantity,
+		cid: params.cid || ""
+	});
+	const spotOrder = InjectiveExchangeV2OrderPb.SpotOrder.create({
+		marketId: params.marketId,
+		orderInfo,
+		orderType: params.orderType,
+		triggerPrice: params.triggerPrice || "0",
+		expirationBlock: params.expirationBlock ? BigInt(params.expirationBlock) : BigInt(0)
+	});
+	return InjectiveExchangeV2TxPb.MsgCreateSpotMarketOrder.create({
+		sender: params.injectiveAddress,
+		order: spotOrder
+	});
+};
+/**
+* @category Messages
+*/
+var MsgCreateSpotMarketOrderV2 = class MsgCreateSpotMarketOrderV2 extends MsgBase {
+	static fromJSON(params) {
+		return new MsgCreateSpotMarketOrderV2(params);
+	}
+	toProto() {
+		const { params: initialParams } = this;
+		return createMarketOrder$4({
+			...initialParams,
+			price: toChainFormat(initialParams.price).toFixed(),
+			triggerPrice: toChainFormat(initialParams.triggerPrice || 0).toFixed(),
+			quantity: toChainFormat(initialParams.quantity).toFixed()
+		});
+	}
+	toData() {
+		const proto = this.toProto();
+		return {
+			"@type": "/injective.exchange.v2.MsgCreateSpotMarketOrder",
+			...proto
+		};
+	}
+	toAmino() {
+		const { params } = this;
+		return {
+			type: "exchange/MsgCreateSpotMarketOrder",
+			value: {
+				sender: params.injectiveAddress,
+				order: {
+					market_id: params.marketId,
+					order_info: {
+						subaccount_id: params.subaccountId,
+						fee_recipient: params.feeRecipient,
+						price: params.price,
+						quantity: params.quantity,
+						cid: params.cid || ""
+					},
+					order_type: params.orderType,
+					trigger_price: params.triggerPrice || "0",
+					expiration_block: params.expirationBlock || "0"
+				}
+			}
+		};
+	}
+	toWeb3Gw() {
+		const { value } = this.toAmino();
+		return {
+			"@type": "/injective.exchange.v2.MsgCreateSpotMarketOrder",
+			...value
+		};
+	}
+	toEip712V2() {
+		const { params } = this;
+		const web3gw = this.toWeb3Gw();
+		const order = web3gw.order;
+		return {
+			...web3gw,
+			order: {
+				...order,
+				order_info: {
+					...order.order_info,
+					price: numberToCosmosSdkDecString(params.price),
+					quantity: numberToCosmosSdkDecString(params.quantity)
+				},
+				trigger_price: numberToCosmosSdkDecString(params.triggerPrice || "0"),
+				order_type: InjectiveExchangeV2OrderPb.OrderType[params.orderType]
+			}
+		};
+	}
+	toEip712() {
+		const { params } = this;
+		const { value, type } = this.toAmino();
+		const { expiration_block: _eb, ...orderWithoutExpiration } = value.order || {};
+		return {
+			type,
+			value: {
+				...value,
+				order: {
+					...orderWithoutExpiration,
+					order_info: {
+						...orderWithoutExpiration === null || orderWithoutExpiration === void 0 ? void 0 : orderWithoutExpiration.order_info,
+						price: toChainFormat(params.price).toFixed(),
+						quantity: toChainFormat(params.quantity).toFixed()
+					},
+					trigger_price: toChainFormat(params.triggerPrice || "0").toFixed()
+				}
+			}
+		};
+	}
+	toDirectSign() {
+		return {
+			type: "/injective.exchange.v2.MsgCreateSpotMarketOrder",
+			message: this.toProto()
+		};
+	}
+	toBinary() {
+		return InjectiveExchangeV2TxPb.MsgCreateSpotMarketOrder.toBinary(this.toProto());
+	}
+};
+
+//#endregion
+//#region src/core/modules/exchange/msgs/MsgUpdateDerivativeMarketV2.ts
+const createMessage$7 = (params) => {
+	return InjectiveExchangeV2TxPb.MsgUpdateDerivativeMarket.create({
+		admin: params.admin,
+		marketId: params.marketId,
+		newTicker: params.newTicker || "",
+		newMinNotional: params.newMinNotional || "0",
+		newMinPriceTickSize: params.newMinPriceTickSize || "0",
+		newMinQuantityTickSize: params.newMinQuantityTickSize || "0",
+		newInitialMarginRatio: params.newInitialMarginRatio || "0",
+		newMaintenanceMarginRatio: params.newMaintenanceMarginRatio || "0",
+		newReduceMarginRatio: params.newReduceMarginRatio || "0"
+	});
+};
+/**
+* @category Messages
+*/
+var MsgUpdateDerivativeMarketV2 = class MsgUpdateDerivativeMarketV2 extends MsgBase {
+	static fromJSON(params) {
+		return new MsgUpdateDerivativeMarketV2(params);
+	}
+	toProto() {
+		const { params: initialParams } = this;
+		return createMessage$7({
+			...initialParams,
+			newMinNotional: toChainFormat(initialParams.newMinNotional || "0").toFixed(),
+			newMinQuantityTickSize: toChainFormat(initialParams.newMinQuantityTickSize || "0").toFixed(),
+			newMinPriceTickSize: toChainFormat(initialParams.newMinPriceTickSize || "0").toFixed(),
+			newInitialMarginRatio: toChainFormat(initialParams.newInitialMarginRatio || "0").toFixed(),
+			newMaintenanceMarginRatio: toChainFormat(initialParams.newMaintenanceMarginRatio || "0").toFixed(),
+			newReduceMarginRatio: toChainFormat(initialParams.newReduceMarginRatio || "0").toFixed()
+		});
+	}
+	toData() {
+		const proto = this.toProto();
+		return {
+			"@type": "/injective.exchange.v2.MsgUpdateDerivativeMarket",
+			...proto
+		};
+	}
+	toAmino() {
+		const { params } = this;
+		return {
+			type: "exchange/MsgUpdateDerivativeMarket",
+			value: {
+				admin: params.admin,
+				market_id: params.marketId,
+				new_ticker: params.newTicker || "",
+				new_min_notional: params.newMinNotional,
+				new_min_price_tick_size: params.newMinPriceTickSize,
+				new_min_quantity_tick_size: params.newMinQuantityTickSize,
+				new_initial_margin_ratio: params.newInitialMarginRatio,
+				new_maintenance_margin_ratio: params.newMaintenanceMarginRatio,
+				new_reduce_margin_ratio: params.newReduceMarginRatio
+			}
+		};
+	}
+	toWeb3Gw() {
+		const { value } = this.toAmino();
+		return {
+			"@type": "/injective.exchange.v2.MsgUpdateDerivativeMarket",
+			...value
+		};
+	}
+	toEip712() {
+		const { type, value } = this.toAmino();
+		return {
+			type,
+			value: { ...value }
+		};
+	}
+	toEip712V2() {
+		const { params } = this;
+		return {
+			"@type": "/injective.exchange.v2.MsgUpdateDerivativeMarket",
+			admin: params.admin,
+			market_id: params.marketId,
+			new_ticker: params.newTicker || "",
+			new_min_price_tick_size: numberToCosmosSdkDecString(params.newMinPriceTickSize || "0"),
+			new_min_quantity_tick_size: numberToCosmosSdkDecString(params.newMinQuantityTickSize || "0"),
+			new_min_notional: numberToCosmosSdkDecString(params.newMinNotional || "0"),
+			new_initial_margin_ratio: numberToCosmosSdkDecString(params.newInitialMarginRatio || "0"),
+			new_maintenance_margin_ratio: numberToCosmosSdkDecString(params.newMaintenanceMarginRatio || "0"),
+			new_reduce_margin_ratio: numberToCosmosSdkDecString(params.newReduceMarginRatio || "0"),
+			new_open_notional_cap: {}
+		};
+	}
+	toDirectSign() {
+		return {
+			type: "/injective.exchange.v2.MsgUpdateDerivativeMarket",
+			message: this.toProto()
+		};
+	}
+	toBinary() {
+		return InjectiveExchangeV2TxPb.MsgUpdateDerivativeMarket.toBinary(this.toProto());
+	}
+};
+
+//#endregion
+//#region src/core/modules/exchange/msgs/MsgCancelBinaryOptionsOrder.ts
+/**
+* @category Messages
+*/
+var MsgCancelBinaryOptionsOrder = class MsgCancelBinaryOptionsOrder extends MsgBase {
+	static fromJSON(params) {
+		return new MsgCancelBinaryOptionsOrder(params);
+	}
+	toProto() {
+		const { params } = this;
+		return InjectiveExchangeV1Beta1TxPb.MsgCancelBinaryOptionsOrder.create({
+			sender: params.injectiveAddress,
+			marketId: params.marketId,
+			subaccountId: params.subaccountId,
+			orderHash: params.orderHash || "",
+			orderMask: InjectiveExchangeV1Beta1ExchangePb.OrderMask.ANY,
+			cid: params.cid || ""
+		});
+	}
+	toData() {
+		const proto = this.toProto();
+		return {
+			"@type": "/injective.exchange.v1beta1.MsgCancelBinaryOptionsOrder",
+			...proto
+		};
+	}
+	toAmino() {
+		const proto = this.toProto();
+		return {
+			type: "exchange/MsgCancelBinaryOptionsOrder",
+			value: {
+				sender: proto.sender,
+				market_id: proto.marketId,
+				subaccount_id: proto.subaccountId,
+				order_hash: proto.orderHash,
+				order_mask: proto.orderMask,
+				cid: proto.cid
+			}
+		};
+	}
+	toWeb3Gw() {
+		const { value } = this.toAmino();
+		return {
+			"@type": "/injective.exchange.v1beta1.MsgCancelBinaryOptionsOrder",
+			...value
+		};
+	}
+	toDirectSign() {
+		return {
+			type: "/injective.exchange.v1beta1.MsgCancelBinaryOptionsOrder",
+			message: this.toProto()
+		};
+	}
+	toBinary() {
+		return InjectiveExchangeV1Beta1TxPb.MsgCancelBinaryOptionsOrder.toBinary(this.toProto());
+	}
+};
+
+//#endregion
+//#region src/core/modules/exchange/msgs/MsgIncreasePositionMarginV2.ts
+const createMessage$6 = (params) => {
+	return InjectiveExchangeV2TxPb.MsgIncreasePositionMargin.create({
+		sender: params.injectiveAddress,
+		sourceSubaccountId: params.srcSubaccountId,
+		destinationSubaccountId: params.dstSubaccountId,
+		marketId: params.marketId,
+		amount: params.amount
+	});
+};
+/**
+* @category Messages
+*/
+var MsgIncreasePositionMarginV2 = class MsgIncreasePositionMarginV2 extends MsgBase {
+	static fromJSON(params) {
+		return new MsgIncreasePositionMarginV2(params);
+	}
+	toProto() {
+		const { params: initialParams } = this;
+		return createMessage$6({
+			...initialParams,
+			amount: toChainFormat(initialParams.amount).toFixed()
+		});
+	}
+	toData() {
+		const proto = this.toProto();
+		return {
+			"@type": "/injective.exchange.v2.MsgIncreasePositionMargin",
+			...proto
+		};
+	}
+	toAmino() {
+		const { params } = this;
+		return {
+			type: "exchange/MsgIncreasePositionMargin",
+			value: {
+				sender: params.injectiveAddress,
+				source_subaccount_id: params.srcSubaccountId,
+				destination_subaccount_id: params.dstSubaccountId,
+				market_id: params.marketId,
+				amount: params.amount
+			}
+		};
+	}
+	toWeb3Gw() {
+		const { value } = this.toAmino();
+		return {
+			"@type": "/injective.exchange.v2.MsgIncreasePositionMargin",
+			...value
+		};
+	}
+	toEip712() {
+		const { type, value } = this.toAmino();
+		return {
+			type,
+			value: {
+				...value,
+				amount: toChainFormat(value.amount).toFixed()
+			}
+		};
+	}
+	toEip712V2() {
+		const { params } = this;
+		return {
+			...this.toWeb3Gw(),
+			amount: numberToCosmosSdkDecString(params.amount)
+		};
+	}
+	toDirectSign() {
+		return {
+			type: "/injective.exchange.v2.MsgIncreasePositionMargin",
+			message: this.toProto()
+		};
+	}
+	toBinary() {
+		return InjectiveExchangeV2TxPb.MsgIncreasePositionMargin.toBinary(this.toProto());
+	}
+};
+
+//#endregion
+//#region src/core/modules/exchange/msgs/MsgDecreasePositionMarginV2.ts
+const createMessage$5 = (params) => {
+	return InjectiveExchangeV2TxPb.MsgDecreasePositionMargin.create({
+		sender: params.injectiveAddress,
+		sourceSubaccountId: params.srcSubaccountId,
+		destinationSubaccountId: params.dstSubaccountId,
+		marketId: params.marketId,
+		amount: params.amount
+	});
+};
+/**
+* @category Messages
+*/
+var MsgDecreasePositionMarginV2 = class MsgDecreasePositionMarginV2 extends MsgBase {
+	static fromJSON(params) {
+		return new MsgDecreasePositionMarginV2(params);
+	}
+	toProto() {
+		const { params: initialParams } = this;
+		return createMessage$5({
+			...initialParams,
+			amount: toChainFormat(initialParams.amount).toFixed()
+		});
+	}
+	toData() {
+		const proto = this.toProto();
+		return {
+			"@type": "/injective.exchange.v2.MsgDecreasePositionMargin",
+			...proto
+		};
+	}
+	toAmino() {
+		const { params } = this;
+		return {
+			type: "exchange/MsgDecreasePositionMargin",
+			value: {
+				sender: params.injectiveAddress,
+				source_subaccount_id: params.srcSubaccountId,
+				destination_subaccount_id: params.dstSubaccountId,
+				market_id: params.marketId,
+				amount: params.amount
+			}
+		};
+	}
 	toWeb3Gw() {
 		const { value } = this.toAmino();
 		return {
-			"@type": "/injective.exchange.v2.MsgCancelPostOnlyMode",
+			"@type": "/injective.exchange.v2.MsgDecreasePositionMargin",
 			...value
 		};
 	}
@@ -888,26 +2994,130 @@ var MsgCancelPostOnlyModeV2 = class MsgCancelPostOnlyModeV2 extends MsgBase {
 		const { type, value } = this.toAmino();
 		return {
 			type,
-			value: { ...value }
+			value: {
+				...value,
+				amount: toChainFormat(value.amount).toFixed()
+			}
 		};
 	}
 	toEip712V2() {
-		return { ...this.toWeb3Gw() };
+		const { params } = this;
+		return {
+			...this.toWeb3Gw(),
+			amount: numberToCosmosSdkDecString(params.amount)
+		};
 	}
 	toDirectSign() {
 		return {
-			type: "/injective.exchange.v2.MsgCancelPostOnlyMode",
+			type: "/injective.exchange.v2.MsgDecreasePositionMargin",
 			message: this.toProto()
 		};
 	}
 	toBinary() {
-		return InjectiveExchangeV2TxPb.MsgCancelPostOnlyMode.toBinary(this.toProto());
+		return InjectiveExchangeV2TxPb.MsgDecreasePositionMargin.toBinary(this.toProto());
 	}
 };
 
 //#endregion
-//#region src/core/modules/exchange/msgs/MsgCreateSpotLimitOrder.ts
-const createLimitOrder$2 = (params) => {
+//#region src/core/modules/exchange/msgs/MsgInstantSpotMarketLaunchV2.ts
+const createMessage$4 = (params) => {
+	return InjectiveExchangeV2TxPb.MsgInstantSpotMarketLaunch.create({
+		sender: params.proposer,
+		ticker: params.market.ticker,
+		baseDenom: params.market.baseDenom,
+		quoteDenom: params.market.quoteDenom,
+		minPriceTickSize: params.market.minPriceTickSize,
+		minQuantityTickSize: params.market.minQuantityTickSize,
+		minNotional: params.market.minNotional,
+		baseDecimals: Number(params.market.baseDecimals),
+		quoteDecimals: Number(params.market.quoteDecimals)
+	});
+};
+/**
+* @category Messages
+*/
+var MsgInstantSpotMarketLaunchV2 = class MsgInstantSpotMarketLaunchV2 extends MsgBase {
+	static fromJSON(params) {
+		return new MsgInstantSpotMarketLaunchV2(params);
+	}
+	toProto() {
+		const { params: initialParams } = this;
+		return createMessage$4({
+			...initialParams,
+			market: {
+				...initialParams.market,
+				minPriceTickSize: toChainFormat(initialParams.market.minPriceTickSize).toFixed(),
+				minQuantityTickSize: toChainFormat(initialParams.market.minQuantityTickSize).toFixed(),
+				minNotional: toChainFormat(initialParams.market.minNotional).toFixed()
+			}
+		});
+	}
+	toData() {
+		const proto = this.toProto();
+		return {
+			"@type": "/injective.exchange.v2.MsgInstantSpotMarketLaunch",
+			...proto
+		};
+	}
+	toAmino() {
+		const { params } = this;
+		return {
+			type: "exchange/MsgInstantSpotMarketLaunch",
+			value: {
+				sender: params.proposer,
+				ticker: params.market.ticker,
+				base_denom: params.market.baseDenom,
+				quote_denom: params.market.quoteDenom,
+				min_price_tick_size: params.market.minPriceTickSize,
+				min_quantity_tick_size: params.market.minQuantityTickSize,
+				min_notional: params.market.minNotional,
+				base_decimals: params.market.baseDecimals,
+				quote_decimals: params.market.quoteDecimals
+			}
+		};
+	}
+	toWeb3Gw() {
+		const { value } = this.toAmino();
+		return {
+			"@type": "/injective.exchange.v2.MsgInstantSpotMarketLaunch",
+			...value
+		};
+	}
+	toEip712() {
+		const { type, value } = this.toAmino();
+		return {
+			type,
+			value: {
+				...value,
+				min_price_tick_size: toChainFormat(value.min_price_tick_size).toFixed(),
+				min_quantity_tick_size: toChainFormat(value.min_quantity_tick_size).toFixed(),
+				min_notional: toChainFormat(value.min_notional).toFixed()
+			}
+		};
+	}
+	toEip712V2() {
+		const { params } = this;
+		return {
+			...this.toWeb3Gw(),
+			min_price_tick_size: numberToCosmosSdkDecString(params.market.minPriceTickSize),
+			min_quantity_tick_size: numberToCosmosSdkDecString(params.market.minQuantityTickSize),
+			min_notional: numberToCosmosSdkDecString(params.market.minNotional)
+		};
+	}
+	toDirectSign() {
+		return {
+			type: "/injective.exchange.v2.MsgInstantSpotMarketLaunch",
+			message: this.toProto()
+		};
+	}
+	toBinary() {
+		return InjectiveExchangeV2TxPb.MsgInstantSpotMarketLaunch.toBinary(this.toProto());
+	}
+};
+
+//#endregion
+//#region src/core/modules/exchange/msgs/MsgCreateDerivativeLimitOrder.ts
+const createLimitOrder$3 = (params) => {
 	const orderInfo = InjectiveExchangeV1Beta1ExchangePb.OrderInfo.create({
 		subaccountId: params.subaccountId,
 		feeRecipient: params.feeRecipient,
@@ -915,29 +3125,31 @@ const createLimitOrder$2 = (params) => {
 		quantity: params.quantity,
 		cid: params.cid || ""
 	});
-	const spotOrder = InjectiveExchangeV1Beta1ExchangePb.SpotOrder.create({
+	const derivativeOrder = InjectiveExchangeV1Beta1ExchangePb.DerivativeOrder.create({
 		marketId: params.marketId,
 		orderInfo,
 		orderType: params.orderType,
+		margin: params.margin,
 		triggerPrice: params.triggerPrice || "0"
 	});
-	return InjectiveExchangeV1Beta1TxPb.MsgCreateSpotLimitOrder.create({
+	return InjectiveExchangeV1Beta1TxPb.MsgCreateDerivativeLimitOrder.create({
 		sender: params.injectiveAddress,
-		order: spotOrder
+		order: derivativeOrder
 	});
 };
 /**
 * @category Messages
 */
-var MsgCreateSpotLimitOrder = class MsgCreateSpotLimitOrder extends MsgBase {
+var MsgCreateDerivativeLimitOrder = class MsgCreateDerivativeLimitOrder extends MsgBase {
 	static fromJSON(params) {
-		return new MsgCreateSpotLimitOrder(params);
+		return new MsgCreateDerivativeLimitOrder(params);
 	}
 	toProto() {
 		const { params: initialParams } = this;
-		return createLimitOrder$2({
+		return createLimitOrder$3({
 			...initialParams,
 			price: toChainFormat(initialParams.price).toFixed(),
+			margin: toChainFormat(initialParams.margin).toFixed(),
 			triggerPrice: toChainFormat(initialParams.triggerPrice || 0).toFixed(),
 			quantity: toChainFormat(initialParams.quantity).toFixed()
 		});
@@ -945,14 +3157,14 @@ var MsgCreateSpotLimitOrder = class MsgCreateSpotLimitOrder extends MsgBase {
 	toData() {
 		const proto = this.toProto();
 		return {
-			"@type": "/injective.exchange.v1beta1.MsgCreateSpotLimitOrder",
+			"@type": "/injective.exchange.v1beta1.MsgCreateDerivativeLimitOrder",
 			...proto
 		};
 	}
 	toAmino() {
 		const { params } = this;
 		return {
-			type: "exchange/MsgCreateSpotLimitOrder",
+			type: "exchange/MsgCreateDerivativeLimitOrder",
 			value: {
 				sender: params.injectiveAddress,
 				order: {
@@ -965,6 +3177,7 @@ var MsgCreateSpotLimitOrder = class MsgCreateSpotLimitOrder extends MsgBase {
 						cid: params.cid || ""
 					},
 					order_type: params.orderType,
+					margin: params.margin,
 					trigger_price: params.triggerPrice || "0"
 				}
 			}
@@ -973,7 +3186,7 @@ var MsgCreateSpotLimitOrder = class MsgCreateSpotLimitOrder extends MsgBase {
 	toWeb3Gw() {
 		const { value } = this.toAmino();
 		return {
-			"@type": "/injective.exchange.v1beta1.MsgCreateSpotLimitOrder",
+			"@type": "/injective.exchange.v1beta1.MsgCreateDerivativeLimitOrder",
 			...value
 		};
 	}
@@ -990,6 +3203,7 @@ var MsgCreateSpotLimitOrder = class MsgCreateSpotLimitOrder extends MsgBase {
 					price: numberToCosmosSdkDecString(params.price),
 					quantity: numberToCosmosSdkDecString(params.quantity)
 				},
+				margin: numberToCosmosSdkDecString(params.margin),
 				trigger_price: numberToCosmosSdkDecString(params.triggerPrice || "0"),
 				order_type: InjectiveExchangeV1Beta1ExchangePb.OrderType[params.orderType]
 			}
@@ -1010,6 +3224,7 @@ var MsgCreateSpotLimitOrder = class MsgCreateSpotLimitOrder extends MsgBase {
 						price: toChainFormat(params.price).toFixed(),
 						quantity: toChainFormat(params.quantity).toFixed()
 					},
+					margin: toChainFormat(params.margin).toFixed(),
 					trigger_price: toChainFormat(params.triggerPrice || "0").toFixed()
 				}
 			}
@@ -1017,77 +3232,82 @@ var MsgCreateSpotLimitOrder = class MsgCreateSpotLimitOrder extends MsgBase {
 	}
 	toDirectSign() {
 		return {
-			type: "/injective.exchange.v1beta1.MsgCreateSpotLimitOrder",
+			type: "/injective.exchange.v1beta1.MsgCreateDerivativeLimitOrder",
 			message: this.toProto()
 		};
 	}
 	toBinary() {
-		return InjectiveExchangeV1Beta1TxPb.MsgCreateSpotLimitOrder.toBinary(this.toProto());
+		return InjectiveExchangeV1Beta1TxPb.MsgCreateDerivativeLimitOrder.toBinary(this.toProto());
 	}
 };
 
 //#endregion
-//#region src/core/modules/exchange/msgs/MsgAuthorizeStakeGrants.ts
+//#region src/core/modules/exchange/msgs/MsgCancelBinaryOptionsOrderV2.ts
 /**
 * @category Messages
 */
-var MsgAuthorizeStakeGrants = class MsgAuthorizeStakeGrants extends MsgBase {
+var MsgCancelBinaryOptionsOrderV2 = class MsgCancelBinaryOptionsOrderV2 extends MsgBase {
 	static fromJSON(params) {
-		return new MsgAuthorizeStakeGrants(params);
+		return new MsgCancelBinaryOptionsOrderV2(params);
 	}
 	toProto() {
 		const { params } = this;
-		return InjectiveExchangeV1Beta1TxPb.MsgAuthorizeStakeGrants.create({
+		return InjectiveExchangeV2TxPb.MsgCancelBinaryOptionsOrder.create({
 			sender: params.injectiveAddress,
-			grants: [{
-				grantee: params.grantee,
-				amount: params.amount
-			}]
+			marketId: params.marketId,
+			subaccountId: params.subaccountId,
+			orderHash: params.orderHash || "",
+			orderMask: params.orderMask || InjectiveExchangeV2OrderPb.OrderMask.ANY,
+			cid: params.cid || ""
 		});
 	}
 	toData() {
 		const proto = this.toProto();
 		return {
-			"@type": "/injective.exchange.v1beta1.MsgAuthorizeStakeGrants",
+			"@type": "/injective.exchange.v2.MsgCancelBinaryOptionsOrder",
 			...proto
 		};
 	}
 	toAmino() {
 		const proto = this.toProto();
 		return {
-			type: "exchange/MsgAuthorizeStakeGrants",
+			type: "exchange/MsgCancelBinaryOptionsOrder",
 			value: {
 				sender: proto.sender,
-				grants: proto.grants
+				market_id: proto.marketId,
+				subaccount_id: proto.subaccountId,
+				order_hash: proto.orderHash,
+				order_mask: proto.orderMask,
+				cid: proto.cid
 			}
 		};
 	}
 	toWeb3Gw() {
 		const { value } = this.toAmino();
 		return {
-			"@type": "/injective.exchange.v1beta1.MsgAuthorizeStakeGrants",
+			"@type": "/injective.exchange.v2.MsgCancelBinaryOptionsOrder",
 			...value
 		};
 	}
 	toDirectSign() {
 		return {
-			type: "/injective.exchange.v1beta1.MsgAuthorizeStakeGrants",
+			type: "/injective.exchange.v2.MsgCancelBinaryOptionsOrder",
 			message: this.toProto()
 		};
 	}
 	toBinary() {
-		return InjectiveExchangeV1Beta1TxPb.MsgAuthorizeStakeGrants.toBinary(this.toProto());
+		return InjectiveExchangeV2TxPb.MsgCancelBinaryOptionsOrder.toBinary(this.toProto());
 	}
 };
 
 //#endregion
-//#region src/core/modules/exchange/msgs/MsgBatchCancelSpotOrders.ts
+//#region src/core/modules/exchange/msgs/MsgBatchCancelDerivativeOrders.ts
 /**
 * @category Messages
 */
-var MsgBatchCancelSpotOrders = class MsgBatchCancelSpotOrders extends MsgBase {
+var MsgBatchCancelDerivativeOrders = class MsgBatchCancelDerivativeOrders extends MsgBase {
 	static fromJSON(params) {
-		return new MsgBatchCancelSpotOrders(params);
+		return new MsgBatchCancelDerivativeOrders(params);
 	}
 	toProto() {
 		const { params } = this;
@@ -1100,7 +3320,7 @@ var MsgBatchCancelSpotOrders = class MsgBatchCancelSpotOrders extends MsgBase {
 				cid: order.cid || ""
 			});
 		});
-		return InjectiveExchangeV1Beta1TxPb.MsgBatchCancelSpotOrders.create({
+		return InjectiveExchangeV1Beta1TxPb.MsgBatchCancelDerivativeOrders.create({
 			sender: params.injectiveAddress,
 			data: orderDataList
 		});
@@ -1108,14 +3328,14 @@ var MsgBatchCancelSpotOrders = class MsgBatchCancelSpotOrders extends MsgBase {
 	toData() {
 		const proto = this.toProto();
 		return {
-			"@type": "/injective.exchange.v1beta1.MsgBatchCancelSpotOrders",
+			"@type": "/injective.exchange.v1beta1.MsgBatchCancelDerivativeOrders",
 			...proto
 		};
 	}
 	toAmino() {
 		const proto = this.toProto();
 		return {
-			type: "exchange/MsgBatchCancelSpotOrders",
+			type: "exchange/MsgBatchCancelDerivativeOrders",
 			value: {
 				sender: proto.sender,
 				data: proto.data.map((orderData) => ({
@@ -1131,80 +3351,24 @@ var MsgBatchCancelSpotOrders = class MsgBatchCancelSpotOrders extends MsgBase {
 	toWeb3Gw() {
 		const { value } = this.toAmino();
 		return {
-			"@type": "/injective.exchange.v1beta1.MsgBatchCancelSpotOrders",
-			...value
-		};
-	}
-	toDirectSign() {
-		return {
-			type: "/injective.exchange.v1beta1.MsgBatchCancelSpotOrders",
-			message: this.toProto()
-		};
-	}
-	toBinary() {
-		return InjectiveExchangeV1Beta1TxPb.MsgBatchCancelSpotOrders.toBinary(this.toProto());
-	}
-};
-
-//#endregion
-//#region src/core/modules/exchange/msgs/MsgCancelDerivativeOrder.ts
-var MsgCancelDerivativeOrder = class MsgCancelDerivativeOrder extends MsgBase {
-	static fromJSON(params) {
-		return new MsgCancelDerivativeOrder(params);
-	}
-	toProto() {
-		const { params } = this;
-		return InjectiveExchangeV1Beta1TxPb.MsgCancelDerivativeOrder.create({
-			sender: params.injectiveAddress,
-			marketId: params.marketId,
-			subaccountId: params.subaccountId,
-			orderHash: params.orderHash || "",
-			orderMask: params.orderMask || InjectiveExchangeV1Beta1ExchangePb.OrderMask.ANY,
-			cid: params.cid || ""
-		});
-	}
-	toData() {
-		const proto = this.toProto();
-		return {
-			"@type": "/injective.exchange.v1beta1.MsgCancelDerivativeOrder",
-			...proto
-		};
-	}
-	toAmino() {
-		const proto = this.toProto();
-		return {
-			type: "exchange/MsgCancelDerivativeOrder",
-			value: {
-				sender: proto.sender,
-				market_id: proto.marketId,
-				subaccount_id: proto.subaccountId,
-				order_hash: proto.orderHash,
-				order_mask: proto.orderMask,
-				cid: proto.cid
-			}
-		};
-	}
-	toWeb3Gw() {
-		const { value } = this.toAmino();
-		return {
-			"@type": "/injective.exchange.v1beta1.MsgCancelDerivativeOrder",
+			"@type": "/injective.exchange.v1beta1.MsgBatchCancelDerivativeOrders",
 			...value
 		};
 	}
 	toDirectSign() {
 		return {
-			type: "/injective.exchange.v1beta1.MsgCancelDerivativeOrder",
+			type: "/injective.exchange.v1beta1.MsgBatchCancelDerivativeOrders",
 			message: this.toProto()
 		};
 	}
 	toBinary() {
-		return InjectiveExchangeV1Beta1TxPb.MsgCancelDerivativeOrder.toBinary(this.toProto());
+		return InjectiveExchangeV1Beta1TxPb.MsgBatchCancelDerivativeOrders.toBinary(this.toProto());
 	}
 };
 
 //#endregion
-//#region src/core/modules/exchange/msgs/MsgCreateSpotMarketOrder.ts
-const createMarketOrder$2 = (params) => {
+//#region src/core/modules/exchange/msgs/MsgCreateDerivativeMarketOrder.ts
+const createMarketOrder$3 = (params) => {
 	const orderInfo = InjectiveExchangeV1Beta1ExchangePb.OrderInfo.create({
 		subaccountId: params.subaccountId,
 		feeRecipient: params.feeRecipient,
@@ -1212,29 +3376,31 @@ const createMarketOrder$2 = (params) => {
 		quantity: params.quantity,
 		cid: params.cid || ""
 	});
-	const spotOrder = InjectiveExchangeV1Beta1ExchangePb.SpotOrder.create({
+	const derivativeOrder = InjectiveExchangeV1Beta1ExchangePb.DerivativeOrder.create({
 		marketId: params.marketId,
 		orderInfo,
 		orderType: params.orderType,
+		margin: params.margin,
 		triggerPrice: params.triggerPrice || "0"
 	});
-	return InjectiveExchangeV1Beta1TxPb.MsgCreateSpotMarketOrder.create({
+	return InjectiveExchangeV1Beta1TxPb.MsgCreateDerivativeMarketOrder.create({
 		sender: params.injectiveAddress,
-		order: spotOrder
+		order: derivativeOrder
 	});
 };
 /**
 * @category Messages
 */
-var MsgCreateSpotMarketOrder = class MsgCreateSpotMarketOrder extends MsgBase {
+var MsgCreateDerivativeMarketOrder = class MsgCreateDerivativeMarketOrder extends MsgBase {
 	static fromJSON(params) {
-		return new MsgCreateSpotMarketOrder(params);
+		return new MsgCreateDerivativeMarketOrder(params);
 	}
 	toProto() {
 		const { params: initialParams } = this;
-		return createMarketOrder$2({
+		return createMarketOrder$3({
 			...initialParams,
 			price: toChainFormat(initialParams.price).toFixed(),
+			margin: toChainFormat(initialParams.margin).toFixed(),
 			triggerPrice: toChainFormat(initialParams.triggerPrice || 0).toFixed(),
 			quantity: toChainFormat(initialParams.quantity).toFixed()
 		});
@@ -1242,14 +3408,14 @@ var MsgCreateSpotMarketOrder = class MsgCreateSpotMarketOrder extends MsgBase {
 	toData() {
 		const proto = this.toProto();
 		return {
-			"@type": "/injective.exchange.v1beta1.MsgCreateSpotMarketOrder",
+			"@type": "/injective.exchange.v1beta1.MsgCreateDerivativeMarketOrder",
 			...proto
 		};
 	}
 	toAmino() {
 		const { params } = this;
 		return {
-			type: "exchange/MsgCreateSpotMarketOrder",
+			type: "exchange/MsgCreateDerivativeMarketOrder",
 			value: {
 				sender: params.injectiveAddress,
 				order: {
@@ -1262,6 +3428,7 @@ var MsgCreateSpotMarketOrder = class MsgCreateSpotMarketOrder extends MsgBase {
 						cid: params.cid || ""
 					},
 					order_type: params.orderType,
+					margin: params.margin,
 					trigger_price: params.triggerPrice || "0"
 				}
 			}
@@ -1270,7 +3437,7 @@ var MsgCreateSpotMarketOrder = class MsgCreateSpotMarketOrder extends MsgBase {
 	toWeb3Gw() {
 		const { value } = this.toAmino();
 		return {
-			"@type": "/injective.exchange.v1beta1.MsgCreateSpotMarketOrder",
+			"@type": "/injective.exchange.v1beta1.MsgCreateDerivativeMarketOrder",
 			...value
 		};
 	}
@@ -1287,6 +3454,7 @@ var MsgCreateSpotMarketOrder = class MsgCreateSpotMarketOrder extends MsgBase {
 					price: numberToCosmosSdkDecString(params.price),
 					quantity: numberToCosmosSdkDecString(params.quantity)
 				},
+				margin: numberToCosmosSdkDecString(params.margin),
 				trigger_price: numberToCosmosSdkDecString(params.triggerPrice || "0"),
 				order_type: InjectiveExchangeV1Beta1ExchangePb.OrderType[params.orderType]
 			}
@@ -1307,6 +3475,7 @@ var MsgCreateSpotMarketOrder = class MsgCreateSpotMarketOrder extends MsgBase {
 						price: toChainFormat(params.price).toFixed(),
 						quantity: toChainFormat(params.quantity).toFixed()
 					},
+					margin: toChainFormat(params.margin).toFixed(),
 					trigger_price: toChainFormat(params.triggerPrice || "0").toFixed()
 				}
 			}
@@ -1314,288 +3483,354 @@ var MsgCreateSpotMarketOrder = class MsgCreateSpotMarketOrder extends MsgBase {
 	}
 	toDirectSign() {
 		return {
-			type: "/injective.exchange.v1beta1.MsgCreateSpotMarketOrder",
+			type: "/injective.exchange.v1beta1.MsgCreateDerivativeMarketOrder",
 			message: this.toProto()
 		};
 	}
 	toBinary() {
-		return InjectiveExchangeV1Beta1TxPb.MsgCreateSpotMarketOrder.toBinary(this.toProto());
+		return InjectiveExchangeV1Beta1TxPb.MsgCreateDerivativeMarketOrder.toBinary(this.toProto());
 	}
 };
 
 //#endregion
-//#region src/core/modules/exchange/msgs/MsgInstantSpotMarketLaunch.ts
-const createMessage$3 = (params) => {
-	return InjectiveExchangeV1Beta1TxPb.MsgInstantSpotMarketLaunch.create({
-		sender: params.proposer,
-		ticker: params.market.ticker,
-		baseDenom: params.market.baseDenom,
-		quoteDenom: params.market.quoteDenom,
-		minPriceTickSize: params.market.minPriceTickSize,
-		minQuantityTickSize: params.market.minQuantityTickSize,
-		minNotional: params.market.minNotional,
-		baseDecimals: Number(params.market.baseDecimals),
-		quoteDecimals: Number(params.market.quoteDecimals)
+//#region src/core/modules/exchange/msgs/MsgCreateDerivativeLimitOrderV2.ts
+const createLimitOrder$2 = (params) => {
+	const orderInfo = InjectiveExchangeV2OrderPb.OrderInfo.create({
+		subaccountId: params.subaccountId,
+		feeRecipient: params.feeRecipient,
+		price: params.price,
+		quantity: params.quantity,
+		cid: params.cid || ""
+	});
+	const derivativeOrder = InjectiveExchangeV2OrderPb.DerivativeOrder.create({
+		marketId: params.marketId,
+		orderInfo,
+		orderType: params.orderType,
+		margin: params.margin,
+		triggerPrice: params.triggerPrice || "0",
+		expirationBlock: params.expirationBlock ? BigInt(params.expirationBlock) : BigInt(0)
+	});
+	return InjectiveExchangeV2TxPb.MsgCreateDerivativeLimitOrder.create({
+		sender: params.injectiveAddress,
+		order: derivativeOrder
 	});
 };
 /**
 * @category Messages
 */
-var MsgInstantSpotMarketLaunch = class MsgInstantSpotMarketLaunch extends MsgBase {
+var MsgCreateDerivativeLimitOrderV2 = class MsgCreateDerivativeLimitOrderV2 extends MsgBase {
 	static fromJSON(params) {
-		return new MsgInstantSpotMarketLaunch(params);
+		return new MsgCreateDerivativeLimitOrderV2(params);
 	}
 	toProto() {
 		const { params: initialParams } = this;
-		return createMessage$3({
+		return createLimitOrder$2({
 			...initialParams,
-			market: {
-				...initialParams.market,
-				minPriceTickSize: toChainFormat(initialParams.market.minPriceTickSize).toFixed(),
-				minQuantityTickSize: toChainFormat(initialParams.market.minQuantityTickSize).toFixed(),
-				minNotional: toChainFormat(initialParams.market.minNotional).toFixed()
-			}
+			price: toChainFormat(initialParams.price).toFixed(),
+			margin: toChainFormat(initialParams.margin).toFixed(),
+			triggerPrice: toChainFormat(initialParams.triggerPrice || 0).toFixed(),
+			quantity: toChainFormat(initialParams.quantity).toFixed()
 		});
 	}
 	toData() {
 		const proto = this.toProto();
 		return {
-			"@type": "/injective.exchange.v1beta1.MsgInstantSpotMarketLaunch",
+			"@type": "/injective.exchange.v2.MsgCreateDerivativeLimitOrder",
 			...proto
 		};
 	}
 	toAmino() {
 		const { params } = this;
 		return {
-			type: "exchange/MsgInstantSpotMarketLaunch",
+			type: "exchange/MsgCreateDerivativeLimitOrder",
 			value: {
-				sender: params.proposer,
-				ticker: params.market.ticker,
-				base_denom: params.market.baseDenom,
-				quote_denom: params.market.quoteDenom,
-				min_price_tick_size: params.market.minPriceTickSize,
-				min_quantity_tick_size: params.market.minQuantityTickSize,
-				min_notional: params.market.minNotional,
-				base_decimals: params.market.baseDecimals,
-				quote_decimals: params.market.quoteDecimals
+				sender: params.injectiveAddress,
+				order: {
+					market_id: params.marketId,
+					order_info: {
+						subaccount_id: params.subaccountId,
+						fee_recipient: params.feeRecipient,
+						price: params.price,
+						quantity: params.quantity,
+						cid: params.cid || ""
+					},
+					order_type: params.orderType,
+					margin: params.margin,
+					trigger_price: params.triggerPrice || "0",
+					expiration_block: params.expirationBlock || "0"
+				}
 			}
 		};
 	}
 	toWeb3Gw() {
 		const { value } = this.toAmino();
 		return {
-			"@type": "/injective.exchange.v1beta1.MsgInstantSpotMarketLaunch",
+			"@type": "/injective.exchange.v2.MsgCreateDerivativeLimitOrder",
 			...value
 		};
 	}
-	toEip712() {
-		const { type, value } = this.toAmino();
+	toEip712V2() {
+		const { params } = this;
+		const web3gw = this.toWeb3Gw();
+		const order = web3gw.order;
 		return {
-			type,
-			value: {
-				...value,
-				min_price_tick_size: toChainFormat(value.min_price_tick_size).toFixed(),
-				min_quantity_tick_size: toChainFormat(value.min_quantity_tick_size).toFixed(),
-				min_notional: toChainFormat(value.min_notional).toFixed()
+			...web3gw,
+			order: {
+				...order,
+				order_info: {
+					...order.order_info,
+					price: numberToCosmosSdkDecString(params.price),
+					quantity: numberToCosmosSdkDecString(params.quantity)
+				},
+				margin: numberToCosmosSdkDecString(params.margin),
+				trigger_price: numberToCosmosSdkDecString(params.triggerPrice || "0"),
+				order_type: InjectiveExchangeV2OrderPb.OrderType[params.orderType]
 			}
 		};
 	}
-	toEip712V2() {
+	toEip712() {
 		const { params } = this;
+		const { value, type } = this.toAmino();
+		const { expiration_block: _eb, ...orderWithoutExpiration } = value.order || {};
 		return {
-			...this.toWeb3Gw(),
-			min_price_tick_size: numberToCosmosSdkDecString(params.market.minPriceTickSize),
-			min_quantity_tick_size: numberToCosmosSdkDecString(params.market.minQuantityTickSize),
-			min_notional: numberToCosmosSdkDecString(params.market.minNotional)
+			type,
+			value: {
+				...value,
+				order: {
+					...orderWithoutExpiration,
+					order_info: {
+						...orderWithoutExpiration === null || orderWithoutExpiration === void 0 ? void 0 : orderWithoutExpiration.order_info,
+						price: toChainFormat(params.price).toFixed(),
+						quantity: toChainFormat(params.quantity).toFixed()
+					},
+					margin: toChainFormat(params.margin).toFixed(),
+					trigger_price: toChainFormat(params.triggerPrice || "0").toFixed()
+				}
+			}
 		};
 	}
 	toDirectSign() {
 		return {
-			type: "/injective.exchange.v1beta1.MsgInstantSpotMarketLaunch",
+			type: "/injective.exchange.v2.MsgCreateDerivativeLimitOrder",
 			message: this.toProto()
 		};
 	}
 	toBinary() {
-		return InjectiveExchangeV1Beta1TxPb.MsgInstantSpotMarketLaunch.toBinary(this.toProto());
+		return InjectiveExchangeV2TxPb.MsgCreateDerivativeLimitOrder.toBinary(this.toProto());
 	}
 };
 
 //#endregion
-//#region src/core/modules/exchange/msgs/MsgUpdateDerivativeMarketV2.ts
-const createMessage$2 = (params) => {
-	return InjectiveExchangeV2TxPb.MsgUpdateDerivativeMarket.create({
-		admin: params.admin,
+//#region src/core/modules/exchange/msgs/MsgCreateBinaryOptionsLimitOrder.ts
+const createLimitOrder$1 = (params) => {
+	const orderInfo = InjectiveExchangeV1Beta1ExchangePb.OrderInfo.create({
+		subaccountId: params.subaccountId,
+		feeRecipient: params.feeRecipient,
+		price: params.price,
+		quantity: params.quantity,
+		cid: params.cid || ""
+	});
+	const derivativeOrder = InjectiveExchangeV1Beta1ExchangePb.DerivativeOrder.create({
 		marketId: params.marketId,
-		newTicker: params.newTicker || "",
-		newMinNotional: params.newMinNotional || "0",
-		newMinPriceTickSize: params.newMinPriceTickSize || "0",
-		newMinQuantityTickSize: params.newMinQuantityTickSize || "0",
-		newInitialMarginRatio: params.newInitialMarginRatio || "0",
-		newMaintenanceMarginRatio: params.newMaintenanceMarginRatio || "0",
-		newReduceMarginRatio: params.newReduceMarginRatio || "0"
+		orderInfo,
+		orderType: params.orderType,
+		margin: params.margin,
+		triggerPrice: params.triggerPrice || "0"
+	});
+	return InjectiveExchangeV1Beta1TxPb.MsgCreateBinaryOptionsLimitOrder.create({
+		sender: params.injectiveAddress,
+		order: derivativeOrder
 	});
 };
 /**
 * @category Messages
 */
-var MsgUpdateDerivativeMarketV2 = class MsgUpdateDerivativeMarketV2 extends MsgBase {
+var MsgCreateBinaryOptionsLimitOrder = class MsgCreateBinaryOptionsLimitOrder extends MsgBase {
 	static fromJSON(params) {
-		return new MsgUpdateDerivativeMarketV2(params);
+		return new MsgCreateBinaryOptionsLimitOrder(params);
 	}
 	toProto() {
 		const { params: initialParams } = this;
-		return createMessage$2({
+		return createLimitOrder$1({
 			...initialParams,
-			newMinNotional: toChainFormat(initialParams.newMinNotional || "0").toFixed(),
-			newMinQuantityTickSize: toChainFormat(initialParams.newMinQuantityTickSize || "0").toFixed(),
-			newMinPriceTickSize: toChainFormat(initialParams.newMinPriceTickSize || "0").toFixed(),
-			newInitialMarginRatio: toChainFormat(initialParams.newInitialMarginRatio || "0").toFixed(),
-			newMaintenanceMarginRatio: toChainFormat(initialParams.newMaintenanceMarginRatio || "0").toFixed(),
-			newReduceMarginRatio: toChainFormat(initialParams.newReduceMarginRatio || "0").toFixed()
+			price: toChainFormat(initialParams.price).toFixed(),
+			margin: toChainFormat(initialParams.margin).toFixed(),
+			triggerPrice: toChainFormat(initialParams.triggerPrice || 0).toFixed(),
+			quantity: toChainFormat(initialParams.quantity).toFixed()
 		});
 	}
 	toData() {
 		const proto = this.toProto();
 		return {
-			"@type": "/injective.exchange.v2.MsgUpdateDerivativeMarket",
+			"@type": "/injective.exchange.v1beta1.MsgCreateBinaryOptionsLimitOrder",
 			...proto
 		};
 	}
 	toAmino() {
 		const { params } = this;
 		return {
-			type: "exchange/MsgUpdateDerivativeMarket",
+			type: "exchange/MsgCreateBinaryOptionsLimitOrder",
 			value: {
-				admin: params.admin,
-				market_id: params.marketId,
-				new_ticker: params.newTicker || "",
-				new_min_notional: params.newMinNotional,
-				new_min_price_tick_size: params.newMinPriceTickSize,
-				new_min_quantity_tick_size: params.newMinQuantityTickSize,
-				new_initial_margin_ratio: params.newInitialMarginRatio,
-				new_maintenance_margin_ratio: params.newMaintenanceMarginRatio,
-				new_reduce_margin_ratio: params.newReduceMarginRatio
+				sender: params.injectiveAddress,
+				order: {
+					market_id: params.marketId,
+					order_info: {
+						subaccount_id: params.subaccountId,
+						fee_recipient: params.feeRecipient,
+						price: params.price,
+						quantity: params.quantity,
+						cid: params.cid || ""
+					},
+					order_type: params.orderType,
+					margin: params.margin,
+					trigger_price: params.triggerPrice || "0"
+				}
 			}
 		};
 	}
 	toWeb3Gw() {
 		const { value } = this.toAmino();
 		return {
-			"@type": "/injective.exchange.v2.MsgUpdateDerivativeMarket",
+			"@type": "/injective.exchange.v1beta1.MsgCreateBinaryOptionsLimitOrder",
 			...value
 		};
 	}
-	toEip712() {
-		const { type, value } = this.toAmino();
+	toEip712V2() {
+		const { params } = this;
+		const web3gw = this.toWeb3Gw();
+		const order = web3gw.order;
 		return {
-			type,
-			value: { ...value }
+			...web3gw,
+			order: {
+				...order,
+				order_info: {
+					...order.order_info,
+					price: numberToCosmosSdkDecString(params.price),
+					quantity: numberToCosmosSdkDecString(params.quantity)
+				},
+				margin: numberToCosmosSdkDecString(params.margin),
+				trigger_price: numberToCosmosSdkDecString(params.triggerPrice || "0"),
+				order_type: InjectiveExchangeV1Beta1ExchangePb.OrderType[params.orderType]
+			}
 		};
 	}
-	toEip712V2() {
+	toEip712() {
+		var _value$order;
 		const { params } = this;
+		const { value, type } = this.toAmino();
 		return {
-			"@type": "/injective.exchange.v2.MsgUpdateDerivativeMarket",
-			admin: params.admin,
-			market_id: params.marketId,
-			new_ticker: params.newTicker || "",
-			new_min_price_tick_size: numberToCosmosSdkDecString(params.newMinPriceTickSize || "0"),
-			new_min_quantity_tick_size: numberToCosmosSdkDecString(params.newMinQuantityTickSize || "0"),
-			new_min_notional: numberToCosmosSdkDecString(params.newMinNotional || "0"),
-			new_initial_margin_ratio: numberToCosmosSdkDecString(params.newInitialMarginRatio || "0"),
-			new_maintenance_margin_ratio: numberToCosmosSdkDecString(params.newMaintenanceMarginRatio || "0"),
-			new_reduce_margin_ratio: numberToCosmosSdkDecString(params.newReduceMarginRatio || "0"),
-			new_open_notional_cap: {}
+			type,
+			value: {
+				...value,
+				order: {
+					...value.order,
+					order_info: {
+						...(_value$order = value.order) === null || _value$order === void 0 ? void 0 : _value$order.order_info,
+						price: toChainFormat(params.price).toFixed(),
+						quantity: toChainFormat(params.quantity).toFixed()
+					},
+					margin: toChainFormat(params.margin).toFixed(),
+					trigger_price: toChainFormat(params.triggerPrice || "0").toFixed()
+				}
+			}
 		};
 	}
 	toDirectSign() {
 		return {
-			type: "/injective.exchange.v2.MsgUpdateDerivativeMarket",
+			type: "/injective.exchange.v1beta1.MsgCreateBinaryOptionsLimitOrder",
 			message: this.toProto()
 		};
 	}
 	toBinary() {
-		return InjectiveExchangeV2TxPb.MsgUpdateDerivativeMarket.toBinary(this.toProto());
+		return InjectiveExchangeV1Beta1TxPb.MsgCreateBinaryOptionsLimitOrder.toBinary(this.toProto());
 	}
 };
 
 //#endregion
-//#region src/core/modules/exchange/msgs/MsgCancelBinaryOptionsOrder.ts
+//#region src/core/modules/exchange/msgs/MsgBatchCancelDerivativeOrdersV2.ts
 /**
 * @category Messages
 */
-var MsgCancelBinaryOptionsOrder = class MsgCancelBinaryOptionsOrder extends MsgBase {
+var MsgBatchCancelDerivativeOrdersV2 = class MsgBatchCancelDerivativeOrdersV2 extends MsgBase {
 	static fromJSON(params) {
-		return new MsgCancelBinaryOptionsOrder(params);
+		return new MsgBatchCancelDerivativeOrdersV2(params);
 	}
 	toProto() {
 		const { params } = this;
-		return InjectiveExchangeV1Beta1TxPb.MsgCancelBinaryOptionsOrder.create({
+		const orderDataList = params.orders.map((order) => {
+			return InjectiveExchangeV2TxPb.OrderData.create({
+				marketId: order.marketId,
+				subaccountId: order.subaccountId,
+				orderHash: order.orderHash || "",
+				orderMask: order.orderMask || InjectiveExchangeV2OrderPb.OrderMask.ANY,
+				cid: order.cid || ""
+			});
+		});
+		return InjectiveExchangeV2TxPb.MsgBatchCancelDerivativeOrders.create({
 			sender: params.injectiveAddress,
-			marketId: params.marketId,
-			subaccountId: params.subaccountId,
-			orderHash: params.orderHash || "",
-			orderMask: InjectiveExchangeV1Beta1ExchangePb.OrderMask.ANY,
-			cid: params.cid || ""
+			data: orderDataList
 		});
 	}
 	toData() {
 		const proto = this.toProto();
 		return {
-			"@type": "/injective.exchange.v1beta1.MsgCancelBinaryOptionsOrder",
+			"@type": "/injective.exchange.v2.MsgBatchCancelDerivativeOrders",
 			...proto
 		};
 	}
 	toAmino() {
 		const proto = this.toProto();
 		return {
-			type: "exchange/MsgCancelBinaryOptionsOrder",
+			type: "exchange/MsgBatchCancelDerivativeOrders",
 			value: {
 				sender: proto.sender,
-				market_id: proto.marketId,
-				subaccount_id: proto.subaccountId,
-				order_hash: proto.orderHash,
-				order_mask: proto.orderMask,
-				cid: proto.cid
+				data: proto.data.map((orderData) => ({
+					market_id: orderData.marketId,
+					subaccount_id: orderData.subaccountId,
+					order_hash: orderData.orderHash,
+					order_mask: orderData.orderMask,
+					cid: orderData.cid
+				}))
 			}
 		};
 	}
 	toWeb3Gw() {
 		const { value } = this.toAmino();
 		return {
-			"@type": "/injective.exchange.v1beta1.MsgCancelBinaryOptionsOrder",
+			"@type": "/injective.exchange.v2.MsgBatchCancelDerivativeOrders",
 			...value
 		};
 	}
 	toDirectSign() {
 		return {
-			type: "/injective.exchange.v1beta1.MsgCancelBinaryOptionsOrder",
+			type: "/injective.exchange.v2.MsgBatchCancelDerivativeOrders",
 			message: this.toProto()
 		};
 	}
 	toBinary() {
-		return InjectiveExchangeV1Beta1TxPb.MsgCancelBinaryOptionsOrder.toBinary(this.toProto());
+		return InjectiveExchangeV2TxPb.MsgBatchCancelDerivativeOrders.toBinary(this.toProto());
 	}
 };
 
 //#endregion
-//#region src/core/modules/exchange/msgs/MsgCreateDerivativeLimitOrder.ts
-const createLimitOrder$1 = (params) => {
-	const orderInfo = InjectiveExchangeV1Beta1ExchangePb.OrderInfo.create({
+//#region src/core/modules/exchange/msgs/MsgCreateDerivativeMarketOrderV2.ts
+const createMarketOrder$2 = (params) => {
+	const orderInfo = InjectiveExchangeV2OrderPb.OrderInfo.create({
 		subaccountId: params.subaccountId,
 		feeRecipient: params.feeRecipient,
 		price: params.price,
 		quantity: params.quantity,
 		cid: params.cid || ""
 	});
-	const derivativeOrder = InjectiveExchangeV1Beta1ExchangePb.DerivativeOrder.create({
+	const derivativeOrder = InjectiveExchangeV2OrderPb.DerivativeOrder.create({
 		marketId: params.marketId,
 		orderInfo,
 		orderType: params.orderType,
 		margin: params.margin,
-		triggerPrice: params.triggerPrice || "0"
+		triggerPrice: params.triggerPrice || "0",
+		expirationBlock: params.expirationBlock ? BigInt(params.expirationBlock) : BigInt(0)
 	});
-	return InjectiveExchangeV1Beta1TxPb.MsgCreateDerivativeLimitOrder.create({
+	return InjectiveExchangeV2TxPb.MsgCreateDerivativeMarketOrder.create({
 		sender: params.injectiveAddress,
 		order: derivativeOrder
 	});
@@ -1603,13 +3838,13 @@ const createLimitOrder$1 = (params) => {
 /**
 * @category Messages
 */
-var MsgCreateDerivativeLimitOrder = class MsgCreateDerivativeLimitOrder extends MsgBase {
+var MsgCreateDerivativeMarketOrderV2 = class MsgCreateDerivativeMarketOrderV2 extends MsgBase {
 	static fromJSON(params) {
-		return new MsgCreateDerivativeLimitOrder(params);
+		return new MsgCreateDerivativeMarketOrderV2(params);
 	}
 	toProto() {
 		const { params: initialParams } = this;
-		return createLimitOrder$1({
+		return createMarketOrder$2({
 			...initialParams,
 			price: toChainFormat(initialParams.price).toFixed(),
 			margin: toChainFormat(initialParams.margin).toFixed(),
@@ -1620,14 +3855,14 @@ var MsgCreateDerivativeLimitOrder = class MsgCreateDerivativeLimitOrder extends
 	toData() {
 		const proto = this.toProto();
 		return {
-			"@type": "/injective.exchange.v1beta1.MsgCreateDerivativeLimitOrder",
+			"@type": "/injective.exchange.v2.MsgCreateDerivativeMarketOrder",
 			...proto
 		};
 	}
 	toAmino() {
 		const { params } = this;
 		return {
-			type: "exchange/MsgCreateDerivativeLimitOrder",
+			type: "exchange/MsgCreateDerivativeMarketOrder",
 			value: {
 				sender: params.injectiveAddress,
 				order: {
@@ -1641,7 +3876,8 @@ var MsgCreateDerivativeLimitOrder = class MsgCreateDerivativeLimitOrder extends
 					},
 					order_type: params.orderType,
 					margin: params.margin,
-					trigger_price: params.triggerPrice || "0"
+					trigger_price: params.triggerPrice || "0",
+					expiration_block: params.expirationBlock || "0"
 				}
 			}
 		};
@@ -1649,7 +3885,7 @@ var MsgCreateDerivativeLimitOrder = class MsgCreateDerivativeLimitOrder extends
 	toWeb3Gw() {
 		const { value } = this.toAmino();
 		return {
-			"@type": "/injective.exchange.v1beta1.MsgCreateDerivativeLimitOrder",
+			"@type": "/injective.exchange.v2.MsgCreateDerivativeMarketOrder",
 			...value
 		};
 	}
@@ -1668,22 +3904,22 @@ var MsgCreateDerivativeLimitOrder = class MsgCreateDerivativeLimitOrder extends
 				},
 				margin: numberToCosmosSdkDecString(params.margin),
 				trigger_price: numberToCosmosSdkDecString(params.triggerPrice || "0"),
-				order_type: InjectiveExchangeV1Beta1ExchangePb.OrderType[params.orderType]
+				order_type: InjectiveExchangeV2OrderPb.OrderType[params.orderType]
 			}
 		};
 	}
 	toEip712() {
-		var _value$order;
 		const { params } = this;
 		const { value, type } = this.toAmino();
+		const { expiration_block: _eb, ...orderWithoutExpiration } = value.order || {};
 		return {
 			type,
 			value: {
 				...value,
 				order: {
-					...value.order,
+					...orderWithoutExpiration,
 					order_info: {
-						...(_value$order = value.order) === null || _value$order === void 0 ? void 0 : _value$order.order_info,
+						...orderWithoutExpiration === null || orderWithoutExpiration === void 0 ? void 0 : orderWithoutExpiration.order_info,
 						price: toChainFormat(params.price).toFixed(),
 						quantity: toChainFormat(params.quantity).toFixed()
 					},
@@ -1695,23 +3931,106 @@ var MsgCreateDerivativeLimitOrder = class MsgCreateDerivativeLimitOrder extends
 	}
 	toDirectSign() {
 		return {
-			type: "/injective.exchange.v1beta1.MsgCreateDerivativeLimitOrder",
+			type: "/injective.exchange.v2.MsgCreateDerivativeMarketOrder",
 			message: this.toProto()
 		};
 	}
 	toBinary() {
-		return InjectiveExchangeV1Beta1TxPb.MsgCreateDerivativeLimitOrder.toBinary(this.toProto());
+		return InjectiveExchangeV2TxPb.MsgCreateDerivativeMarketOrder.toBinary(this.toProto());
 	}
 };
 
 //#endregion
-//#region src/core/modules/exchange/msgs/MsgBatchCancelDerivativeOrders.ts
+//#region src/core/modules/exchange/msgs/MsgAdminUpdateBinaryOptionsMarket.ts
+const createMessage$3 = (params) => {
+	return InjectiveExchangeV1Beta1TxPb.MsgAdminUpdateBinaryOptionsMarket.create({
+		sender: params.sender,
+		marketId: params.marketId,
+		settlementPrice: params.settlementPrice,
+		expirationTimestamp: BigInt(params.expirationTimestamp),
+		settlementTimestamp: BigInt(params.settlementTimestamp),
+		status: params.status
+	});
+};
 /**
 * @category Messages
 */
-var MsgBatchCancelDerivativeOrders = class MsgBatchCancelDerivativeOrders extends MsgBase {
+var MsgAdminUpdateBinaryOptionsMarket = class MsgAdminUpdateBinaryOptionsMarket extends MsgBase {
 	static fromJSON(params) {
-		return new MsgBatchCancelDerivativeOrders(params);
+		return new MsgAdminUpdateBinaryOptionsMarket(params);
+	}
+	toProto() {
+		const { params: initialParams } = this;
+		return createMessage$3({
+			...initialParams,
+			settlementPrice: toChainFormat(initialParams.settlementPrice).toFixed()
+		});
+	}
+	toData() {
+		const proto = this.toProto();
+		return {
+			"@type": "/injective.exchange.v1beta1.MsgAdminUpdateBinaryOptionsMarket",
+			...proto
+		};
+	}
+	toAmino() {
+		const { params } = this;
+		return {
+			type: "exchange/MsgAdminUpdateBinaryOptionsMarket",
+			value: {
+				sender: params.sender,
+				market_id: params.marketId,
+				settlement_price: params.settlementPrice,
+				expiration_timestamp: params.expirationTimestamp,
+				settlement_timestamp: params.settlementTimestamp,
+				status: params.status
+			}
+		};
+	}
+	toWeb3Gw() {
+		const { value } = this.toAmino();
+		return {
+			"@type": "/injective.exchange.v1beta1.MsgAdminUpdateBinaryOptionsMarket",
+			...value
+		};
+	}
+	toEip712() {
+		const { type, value } = this.toAmino();
+		return {
+			type,
+			value: {
+				...value,
+				settlement_price: toChainFormat(value.settlement_price).toFixed()
+			}
+		};
+	}
+	toEip712V2() {
+		const { params } = this;
+		return {
+			...this.toWeb3Gw(),
+			settlement_price: numberToCosmosSdkDecString(params.settlementPrice),
+			status: InjectiveExchangeV1Beta1ExchangePb.MarketStatus[params.status]
+		};
+	}
+	toDirectSign() {
+		return {
+			type: "/injective.exchange.v1beta1.MsgAdminUpdateBinaryOptionsMarket",
+			message: this.toProto()
+		};
+	}
+	toBinary() {
+		return InjectiveExchangeV1Beta1TxPb.MsgAdminUpdateBinaryOptionsMarket.toBinary(this.toProto());
+	}
+};
+
+//#endregion
+//#region src/core/modules/exchange/msgs/MsgBatchCancelBinaryOptionsOrders.ts
+/**
+* @category Messages
+*/
+var MsgBatchCancelBinaryOptionsOrders = class MsgBatchCancelBinaryOptionsOrders extends MsgBase {
+	static fromJSON(params) {
+		return new MsgBatchCancelBinaryOptionsOrders(params);
 	}
 	toProto() {
 		const { params } = this;
@@ -1720,11 +4039,11 @@ var MsgBatchCancelDerivativeOrders = class MsgBatchCancelDerivativeOrders extend
 				marketId: order.marketId,
 				subaccountId: order.subaccountId,
 				orderHash: order.orderHash || "",
-				orderMask: order.orderMask || InjectiveExchangeV1Beta1ExchangePb.OrderMask.ANY,
+				orderMask: InjectiveExchangeV1Beta1ExchangePb.OrderMask.ANY,
 				cid: order.cid || ""
 			});
 		});
-		return InjectiveExchangeV1Beta1TxPb.MsgBatchCancelDerivativeOrders.create({
+		return InjectiveExchangeV1Beta1TxPb.MsgBatchCancelBinaryOptionsOrders.create({
 			sender: params.injectiveAddress,
 			data: orderDataList
 		});
@@ -1732,22 +4051,22 @@ var MsgBatchCancelDerivativeOrders = class MsgBatchCancelDerivativeOrders extend
 	toData() {
 		const proto = this.toProto();
 		return {
-			"@type": "/injective.exchange.v1beta1.MsgBatchCancelDerivativeOrders",
+			"@type": "/injective.exchange.v1beta1.MsgBatchCancelBinaryOptionsOrders",
 			...proto
 		};
 	}
 	toAmino() {
-		const proto = this.toProto();
+		const { params } = this;
 		return {
-			type: "exchange/MsgBatchCancelDerivativeOrders",
+			type: "exchange/MsgBatchCancelBinaryOptionsOrders",
 			value: {
-				sender: proto.sender,
-				data: proto.data.map((orderData) => ({
-					market_id: orderData.marketId,
-					subaccount_id: orderData.subaccountId,
-					order_hash: orderData.orderHash,
-					order_mask: orderData.orderMask,
-					cid: orderData.cid
+				sender: params.injectiveAddress,
+				data: params.orders.map((order) => ({
+					market_id: order.marketId,
+					subaccount_id: order.subaccountId,
+					order_hash: order.orderHash,
+					order_mask: order.orderMask,
+					cid: order.cid
 				}))
 			}
 		};
@@ -1755,23 +4074,23 @@ var MsgBatchCancelDerivativeOrders = class MsgBatchCancelDerivativeOrders extend
 	toWeb3Gw() {
 		const { value } = this.toAmino();
 		return {
-			"@type": "/injective.exchange.v1beta1.MsgBatchCancelDerivativeOrders",
+			"@type": "/injective.exchange.v1beta1.MsgBatchCancelBinaryOptionsOrders",
 			...value
 		};
 	}
 	toDirectSign() {
 		return {
-			type: "/injective.exchange.v1beta1.MsgBatchCancelDerivativeOrders",
+			type: "/injective.exchange.v1beta1.MsgBatchCancelBinaryOptionsOrders",
 			message: this.toProto()
 		};
 	}
 	toBinary() {
-		return InjectiveExchangeV1Beta1TxPb.MsgBatchCancelDerivativeOrders.toBinary(this.toProto());
+		return InjectiveExchangeV1Beta1TxPb.MsgBatchCancelBinaryOptionsOrders.toBinary(this.toProto());
 	}
 };
 
 //#endregion
-//#region src/core/modules/exchange/msgs/MsgCreateDerivativeMarketOrder.ts
+//#region src/core/modules/exchange/msgs/MsgCreateBinaryOptionsMarketOrder.ts
 const createMarketOrder$1 = (params) => {
 	const orderInfo = InjectiveExchangeV1Beta1ExchangePb.OrderInfo.create({
 		subaccountId: params.subaccountId,
@@ -1787,7 +4106,7 @@ const createMarketOrder$1 = (params) => {
 		margin: params.margin,
 		triggerPrice: params.triggerPrice || "0"
 	});
-	return InjectiveExchangeV1Beta1TxPb.MsgCreateDerivativeMarketOrder.create({
+	return InjectiveExchangeV1Beta1TxPb.MsgCreateBinaryOptionsMarketOrder.create({
 		sender: params.injectiveAddress,
 		order: derivativeOrder
 	});
@@ -1795,9 +4114,9 @@ const createMarketOrder$1 = (params) => {
 /**
 * @category Messages
 */
-var MsgCreateDerivativeMarketOrder = class MsgCreateDerivativeMarketOrder extends MsgBase {
+var MsgCreateBinaryOptionsMarketOrder = class MsgCreateBinaryOptionsMarketOrder extends MsgBase {
 	static fromJSON(params) {
-		return new MsgCreateDerivativeMarketOrder(params);
+		return new MsgCreateBinaryOptionsMarketOrder(params);
 	}
 	toProto() {
 		const { params: initialParams } = this;
@@ -1812,14 +4131,14 @@ var MsgCreateDerivativeMarketOrder = class MsgCreateDerivativeMarketOrder extend
 	toData() {
 		const proto = this.toProto();
 		return {
-			"@type": "/injective.exchange.v1beta1.MsgCreateDerivativeMarketOrder",
+			"@type": "/injective.exchange.v1beta1.MsgCreateBinaryOptionsMarketOrder",
 			...proto
 		};
 	}
 	toAmino() {
 		const { params } = this;
 		return {
-			type: "exchange/MsgCreateDerivativeMarketOrder",
+			type: "exchange/MsgCreateBinaryOptionsMarketOrder",
 			value: {
 				sender: params.injectiveAddress,
 				order: {
@@ -1841,7 +4160,7 @@ var MsgCreateDerivativeMarketOrder = class MsgCreateDerivativeMarketOrder extend
 	toWeb3Gw() {
 		const { value } = this.toAmino();
 		return {
-			"@type": "/injective.exchange.v1beta1.MsgCreateDerivativeMarketOrder",
+			"@type": "/injective.exchange.v1beta1.MsgCreateBinaryOptionsMarketOrder",
 			...value
 		};
 	}
@@ -1887,33 +4206,86 @@ var MsgCreateDerivativeMarketOrder = class MsgCreateDerivativeMarketOrder extend
 	}
 	toDirectSign() {
 		return {
-			type: "/injective.exchange.v1beta1.MsgCreateDerivativeMarketOrder",
+			type: "/injective.exchange.v1beta1.MsgCreateBinaryOptionsMarketOrder",
 			message: this.toProto()
 		};
 	}
 	toBinary() {
-		return InjectiveExchangeV1Beta1TxPb.MsgCreateDerivativeMarketOrder.toBinary(this.toProto());
+		return InjectiveExchangeV1Beta1TxPb.MsgCreateBinaryOptionsMarketOrder.toBinary(this.toProto());
 	}
 };
 
 //#endregion
-//#region src/core/modules/exchange/msgs/MsgCreateBinaryOptionsLimitOrder.ts
+//#region src/core/modules/exchange/msgs/MsgSetDelegationTransferReceivers.ts
+/**
+* @deprecated no longer supported on chain
+* @category Messages
+*/
+var MsgSetDelegationTransferReceivers = class MsgSetDelegationTransferReceivers extends MsgBase {
+	static fromJSON(params) {
+		return new MsgSetDelegationTransferReceivers(params);
+	}
+	toProto() {
+		const { params } = this;
+		return {
+			sender: params.sender,
+			receivers: params.receivers
+		};
+	}
+	toData() {
+		const proto = this.toProto();
+		return {
+			"@type": "/injective.exchange.v2.MsgSetDelegationTransferReceivers",
+			...proto
+		};
+	}
+	toAmino() {
+		const proto = this.toProto();
+		return {
+			type: "exchange/MsgSetDelegationTransferReceivers",
+			value: {
+				sender: proto.sender,
+				receivers: proto.receivers
+			}
+		};
+	}
+	toWeb3Gw() {
+		const { value } = this.toAmino();
+		return {
+			"@type": "/injective.exchange.v2.MsgSetDelegationTransferReceivers",
+			...value
+		};
+	}
+	toDirectSign() {
+		return {
+			type: "/injective.exchange.v2.MsgSetDelegationTransferReceivers",
+			message: this.toProto()
+		};
+	}
+	toBinary() {
+		return new Uint8Array(0);
+	}
+};
+
+//#endregion
+//#region src/core/modules/exchange/msgs/MsgCreateBinaryOptionsLimitOrderV2.ts
 const createLimitOrder = (params) => {
-	const orderInfo = InjectiveExchangeV1Beta1ExchangePb.OrderInfo.create({
+	const orderInfo = InjectiveExchangeV2OrderPb.OrderInfo.create({
 		subaccountId: params.subaccountId,
 		feeRecipient: params.feeRecipient,
 		price: params.price,
 		quantity: params.quantity,
 		cid: params.cid || ""
 	});
-	const derivativeOrder = InjectiveExchangeV1Beta1ExchangePb.DerivativeOrder.create({
+	const derivativeOrder = InjectiveExchangeV2OrderPb.DerivativeOrder.create({
 		marketId: params.marketId,
 		orderInfo,
 		orderType: params.orderType,
 		margin: params.margin,
-		triggerPrice: params.triggerPrice || "0"
+		triggerPrice: params.triggerPrice || "0",
+		expirationBlock: params.expirationBlock ? BigInt(params.expirationBlock) : BigInt(0)
 	});
-	return InjectiveExchangeV1Beta1TxPb.MsgCreateBinaryOptionsLimitOrder.create({
+	return InjectiveExchangeV2TxPb.MsgCreateBinaryOptionsLimitOrder.create({
 		sender: params.injectiveAddress,
 		order: derivativeOrder
 	});
@@ -1921,9 +4293,9 @@ const createLimitOrder = (params) => {
 /**
 * @category Messages
 */
-var MsgCreateBinaryOptionsLimitOrder = class MsgCreateBinaryOptionsLimitOrder extends MsgBase {
+var MsgCreateBinaryOptionsLimitOrderV2 = class MsgCreateBinaryOptionsLimitOrderV2 extends MsgBase {
 	static fromJSON(params) {
-		return new MsgCreateBinaryOptionsLimitOrder(params);
+		return new MsgCreateBinaryOptionsLimitOrderV2(params);
 	}
 	toProto() {
 		const { params: initialParams } = this;
@@ -1938,7 +4310,7 @@ var MsgCreateBinaryOptionsLimitOrder = class MsgCreateBinaryOptionsLimitOrder ex
 	toData() {
 		const proto = this.toProto();
 		return {
-			"@type": "/injective.exchange.v1beta1.MsgCreateBinaryOptionsLimitOrder",
+			"@type": "/injective.exchange.v2.MsgCreateBinaryOptionsLimitOrder",
 			...proto
 		};
 	}
@@ -1959,7 +4331,8 @@ var MsgCreateBinaryOptionsLimitOrder = class MsgCreateBinaryOptionsLimitOrder ex
 					},
 					order_type: params.orderType,
 					margin: params.margin,
-					trigger_price: params.triggerPrice || "0"
+					trigger_price: params.triggerPrice || "0",
+					expiration_block: params.expirationBlock || "0"
 				}
 			}
 		};
@@ -1967,7 +4340,7 @@ var MsgCreateBinaryOptionsLimitOrder = class MsgCreateBinaryOptionsLimitOrder ex
 	toWeb3Gw() {
 		const { value } = this.toAmino();
 		return {
-			"@type": "/injective.exchange.v1beta1.MsgCreateBinaryOptionsLimitOrder",
+			"@type": "/injective.exchange.v2.MsgCreateBinaryOptionsLimitOrder",
 			...value
 		};
 	}
@@ -1986,22 +4359,22 @@ var MsgCreateBinaryOptionsLimitOrder = class MsgCreateBinaryOptionsLimitOrder ex
 				},
 				margin: numberToCosmosSdkDecString(params.margin),
 				trigger_price: numberToCosmosSdkDecString(params.triggerPrice || "0"),
-				order_type: InjectiveExchangeV1Beta1ExchangePb.OrderType[params.orderType]
+				order_type: InjectiveExchangeV2OrderPb.OrderType[params.orderType]
 			}
 		};
 	}
 	toEip712() {
-		var _value$order;
 		const { params } = this;
 		const { value, type } = this.toAmino();
+		const { expiration_block: _eb, ...orderWithoutExpiration } = value.order || {};
 		return {
 			type,
 			value: {
 				...value,
 				order: {
-					...value.order,
+					...orderWithoutExpiration,
 					order_info: {
-						...(_value$order = value.order) === null || _value$order === void 0 ? void 0 : _value$order.order_info,
+						...orderWithoutExpiration === null || orderWithoutExpiration === void 0 ? void 0 : orderWithoutExpiration.order_info,
 						price: toChainFormat(params.price).toFixed(),
 						quantity: toChainFormat(params.quantity).toFixed()
 					},
@@ -2013,19 +4386,135 @@ var MsgCreateBinaryOptionsLimitOrder = class MsgCreateBinaryOptionsLimitOrder ex
 	}
 	toDirectSign() {
 		return {
-			type: "/injective.exchange.v1beta1.MsgCreateBinaryOptionsLimitOrder",
+			type: "/injective.exchange.v2.MsgCreateBinaryOptionsLimitOrder",
 			message: this.toProto()
 		};
 	}
 	toBinary() {
-		return InjectiveExchangeV1Beta1TxPb.MsgCreateBinaryOptionsLimitOrder.toBinary(this.toProto());
+		return InjectiveExchangeV2TxPb.MsgCreateBinaryOptionsLimitOrder.toBinary(this.toProto());
 	}
 };
 
 //#endregion
-//#region src/core/modules/exchange/msgs/MsgAdminUpdateBinaryOptionsMarket.ts
+//#region src/core/modules/exchange/msgs/MsgInstantBinaryOptionsMarketLaunch.ts
+const createMessage$2 = (params) => {
+	return InjectiveExchangeV1Beta1TxPb.MsgInstantBinaryOptionsMarketLaunch.create({
+		sender: params.proposer,
+		ticker: params.market.ticker,
+		oracleSymbol: params.market.oracleSymbol,
+		oracleProvider: params.market.oracleProvider,
+		oracleType: params.market.oracleType,
+		oracleScaleFactor: params.market.oracleScaleFactor,
+		makerFeeRate: params.market.makerFeeRate,
+		takerFeeRate: params.market.takerFeeRate,
+		expirationTimestamp: BigInt(params.market.expirationTimestamp),
+		settlementTimestamp: BigInt(params.market.settlementTimestamp),
+		admin: params.market.admin,
+		quoteDenom: params.market.quoteDenom,
+		minPriceTickSize: params.market.minPriceTickSize,
+		minQuantityTickSize: params.market.minQuantityTickSize,
+		minNotional: params.market.minNotional
+	});
+};
+/**
+* @category Messages
+*/
+var MsgInstantBinaryOptionsMarketLaunch = class MsgInstantBinaryOptionsMarketLaunch extends MsgBase {
+	static fromJSON(params) {
+		return new MsgInstantBinaryOptionsMarketLaunch(params);
+	}
+	toProto() {
+		const { params: initialParams } = this;
+		return createMessage$2({
+			...initialParams,
+			market: {
+				...initialParams.market,
+				minPriceTickSize: toChainFormat(initialParams.market.minPriceTickSize).toFixed(),
+				makerFeeRate: toChainFormat(initialParams.market.makerFeeRate).toFixed(),
+				takerFeeRate: toChainFormat(initialParams.market.takerFeeRate).toFixed(),
+				minQuantityTickSize: toChainFormat(initialParams.market.minQuantityTickSize).toFixed(),
+				minNotional: toChainFormat(initialParams.market.minNotional).toFixed()
+			}
+		});
+	}
+	toData() {
+		const proto = this.toProto();
+		return {
+			"@type": "/injective.exchange.v1beta1.MsgInstantBinaryOptionsMarketLaunch",
+			...proto
+		};
+	}
+	toAmino() {
+		const { params } = this;
+		return {
+			type: "exchange/MsgInstantBinaryOptionsMarketLaunch",
+			value: {
+				sender: params.proposer,
+				ticker: params.market.ticker,
+				oracle_symbol: params.market.oracleSymbol,
+				oracle_provider: params.market.oracleProvider,
+				oracle_type: params.market.oracleType,
+				oracle_scale_factor: params.market.oracleScaleFactor,
+				maker_fee_rate: params.market.makerFeeRate,
+				taker_fee_rate: params.market.takerFeeRate,
+				expiration_timestamp: params.market.expirationTimestamp.toString(),
+				settlement_timestamp: params.market.settlementTimestamp.toString(),
+				admin: params.market.admin,
+				quote_denom: params.market.quoteDenom,
+				min_price_tick_size: params.market.minPriceTickSize,
+				min_quantity_tick_size: params.market.minQuantityTickSize,
+				min_notional: params.market.minNotional
+			}
+		};
+	}
+	toWeb3Gw() {
+		const { value } = this.toAmino();
+		return {
+			"@type": "/injective.exchange.v1beta1.MsgInstantBinaryOptionsMarketLaunch",
+			...value
+		};
+	}
+	toEip712() {
+		const { type, value } = this.toAmino();
+		return {
+			type,
+			value: {
+				...value,
+				min_price_tick_size: toChainFormat(value.min_price_tick_size).toFixed(),
+				min_quantity_tick_size: toChainFormat(value.min_quantity_tick_size).toFixed(),
+				min_notional: toChainFormat(value.min_notional).toFixed(),
+				taker_fee_rate: toChainFormat(value.taker_fee_rate).toFixed(),
+				maker_fee_rate: toChainFormat(value.maker_fee_rate).toFixed()
+			}
+		};
+	}
+	toEip712V2() {
+		const { params } = this;
+		return {
+			...this.toWeb3Gw(),
+			min_price_tick_size: numberToCosmosSdkDecString(params.market.minPriceTickSize),
+			min_quantity_tick_size: numberToCosmosSdkDecString(params.market.minQuantityTickSize),
+			min_notional: numberToCosmosSdkDecString(params.market.minNotional),
+			taker_fee_rate: numberToCosmosSdkDecString(params.market.takerFeeRate),
+			maker_fee_rate: numberToCosmosSdkDecString(params.market.makerFeeRate),
+			oracle_type: InjectiveOracleV1Beta1OraclePb.OracleType[params.market.oracleType]
+		};
+	}
+	toDirectSign() {
+		return {
+			type: "/injective.exchange.v1beta1.MsgInstantBinaryOptionsMarketLaunch",
+			message: this.toProto()
+		};
+	}
+	toBinary() {
+		return InjectiveExchangeV1Beta1TxPb.MsgInstantBinaryOptionsMarketLaunch.toBinary(this.toProto());
+	}
+};
+
+//#endregion
+//#region src/core/modules/exchange/msgs/MsgAdminUpdateBinaryOptionsMarketV2.ts
 const createMessage$1 = (params) => {
-	return InjectiveExchangeV1Beta1TxPb.MsgAdminUpdateBinaryOptionsMarket.create({
+	return InjectiveExchangeV2TxPb.MsgAdminUpdateBinaryOptionsMarket.create({
 		sender: params.sender,
 		marketId: params.marketId,
 		settlementPrice: params.settlementPrice,
@@ -2037,9 +4526,9 @@ const createMessage$1 = (params) => {
 /**
 * @category Messages
 */
-var MsgAdminUpdateBinaryOptionsMarket = class MsgAdminUpdateBinaryOptionsMarket extends MsgBase {
+var MsgAdminUpdateBinaryOptionsMarketV2 = class MsgAdminUpdateBinaryOptionsMarketV2 extends MsgBase {
 	static fromJSON(params) {
-		return new MsgAdminUpdateBinaryOptionsMarket(params);
+		return new MsgAdminUpdateBinaryOptionsMarketV2(params);
 	}
 	toProto() {
 		const { params: initialParams } = this;
@@ -2051,7 +4540,7 @@ var MsgAdminUpdateBinaryOptionsMarket = class MsgAdminUpdateBinaryOptionsMarket
 	toData() {
 		const proto = this.toProto();
 		return {
-			"@type": "/injective.exchange.v1beta1.MsgAdminUpdateBinaryOptionsMarket",
+			"@type": "/injective.exchange.v2.MsgAdminUpdateBinaryOptionsMarket",
 			...proto
 		};
 	}
@@ -2072,60 +4561,53 @@ var MsgAdminUpdateBinaryOptionsMarket = class MsgAdminUpdateBinaryOptionsMarket
 	toWeb3Gw() {
 		const { value } = this.toAmino();
 		return {
-			"@type": "/injective.exchange.v1beta1.MsgAdminUpdateBinaryOptionsMarket",
+			"@type": "/injective.exchange.v2.MsgAdminUpdateBinaryOptionsMarket",
 			...value
 		};
 	}
 	toEip712() {
-		const { type, value } = this.toAmino();
-		return {
-			type,
-			value: {
-				...value,
-				settlement_price: toChainFormat(value.settlement_price).toFixed()
-			}
-		};
+		throw new GeneralException(/* @__PURE__ */ new Error("EIP712 v1 is not supported for MsgAdminUpdateBinaryOptionsMarket, use toEip712V2 instead."));
 	}
 	toEip712V2() {
 		const { params } = this;
 		return {
 			...this.toWeb3Gw(),
 			settlement_price: numberToCosmosSdkDecString(params.settlementPrice),
-			status: InjectiveExchangeV1Beta1ExchangePb.MarketStatus[params.status]
+			status: InjectiveExchangeV2MarketPb.MarketStatus[params.status]
 		};
 	}
 	toDirectSign() {
 		return {
-			type: "/injective.exchange.v1beta1.MsgAdminUpdateBinaryOptionsMarket",
+			type: "/injective.exchange.v2.MsgAdminUpdateBinaryOptionsMarket",
 			message: this.toProto()
 		};
 	}
 	toBinary() {
-		return InjectiveExchangeV1Beta1TxPb.MsgAdminUpdateBinaryOptionsMarket.toBinary(this.toProto());
+		return InjectiveExchangeV2TxPb.MsgAdminUpdateBinaryOptionsMarket.toBinary(this.toProto());
 	}
 };
 
 //#endregion
-//#region src/core/modules/exchange/msgs/MsgBatchCancelBinaryOptionsOrders.ts
+//#region src/core/modules/exchange/msgs/MsgBatchCancelBinaryOptionsOrdersV2.ts
 /**
 * @category Messages
 */
-var MsgBatchCancelBinaryOptionsOrders = class MsgBatchCancelBinaryOptionsOrders extends MsgBase {
+var MsgBatchCancelBinaryOptionsOrdersV2 = class MsgBatchCancelBinaryOptionsOrdersV2 extends MsgBase {
 	static fromJSON(params) {
-		return new MsgBatchCancelBinaryOptionsOrders(params);
+		return new MsgBatchCancelBinaryOptionsOrdersV2(params);
 	}
 	toProto() {
 		const { params } = this;
 		const orderDataList = params.orders.map((order) => {
-			return InjectiveExchangeV1Beta1TxPb.OrderData.create({
+			return InjectiveExchangeV2TxPb.OrderData.create({
 				marketId: order.marketId,
 				subaccountId: order.subaccountId,
 				orderHash: order.orderHash || "",
-				orderMask: InjectiveExchangeV1Beta1ExchangePb.OrderMask.ANY,
+				orderMask: order.orderMask || InjectiveExchangeV2OrderPb.OrderMask.ANY,
 				cid: order.cid || ""
 			});
 		});
-		return InjectiveExchangeV1Beta1TxPb.MsgBatchCancelBinaryOptionsOrders.create({
+		return InjectiveExchangeV2TxPb.MsgBatchCancelBinaryOptionsOrders.create({
 			sender: params.injectiveAddress,
 			data: orderDataList
 		});
@@ -2133,22 +4615,22 @@ var MsgBatchCancelBinaryOptionsOrders = class MsgBatchCancelBinaryOptionsOrders
 	toData() {
 		const proto = this.toProto();
 		return {
-			"@type": "/injective.exchange.v1beta1.MsgBatchCancelBinaryOptionsOrders",
+			"@type": "/injective.exchange.v2.MsgBatchCancelBinaryOptionsOrders",
 			...proto
 		};
 	}
 	toAmino() {
-		const { params } = this;
+		const proto = this.toProto();
 		return {
 			type: "exchange/MsgBatchCancelBinaryOptionsOrders",
 			value: {
-				sender: params.injectiveAddress,
-				data: params.orders.map((order) => ({
-					market_id: order.marketId,
-					subaccount_id: order.subaccountId,
-					order_hash: order.orderHash,
-					order_mask: order.orderMask,
-					cid: order.cid
+				sender: proto.sender,
+				data: proto.data.map((orderData) => ({
+					market_id: orderData.marketId,
+					subaccount_id: orderData.subaccountId,
+					order_hash: orderData.orderHash,
+					order_mask: orderData.orderMask,
+					cid: orderData.cid
 				}))
 			}
 		};
@@ -2156,39 +4638,40 @@ var MsgBatchCancelBinaryOptionsOrders = class MsgBatchCancelBinaryOptionsOrders
 	toWeb3Gw() {
 		const { value } = this.toAmino();
 		return {
-			"@type": "/injective.exchange.v1beta1.MsgBatchCancelBinaryOptionsOrders",
+			"@type": "/injective.exchange.v2.MsgBatchCancelBinaryOptionsOrders",
 			...value
 		};
 	}
 	toDirectSign() {
 		return {
-			type: "/injective.exchange.v1beta1.MsgBatchCancelBinaryOptionsOrders",
+			type: "/injective.exchange.v2.MsgBatchCancelBinaryOptionsOrders",
 			message: this.toProto()
 		};
 	}
 	toBinary() {
-		return InjectiveExchangeV1Beta1TxPb.MsgBatchCancelBinaryOptionsOrders.toBinary(this.toProto());
+		return InjectiveExchangeV2TxPb.MsgBatchCancelBinaryOptionsOrders.toBinary(this.toProto());
 	}
 };
 
 //#endregion
-//#region src/core/modules/exchange/msgs/MsgCreateBinaryOptionsMarketOrder.ts
+//#region src/core/modules/exchange/msgs/MsgCreateBinaryOptionsMarketOrderV2.ts
 const createMarketOrder = (params) => {
-	const orderInfo = InjectiveExchangeV1Beta1ExchangePb.OrderInfo.create({
+	const orderInfo = InjectiveExchangeV2OrderPb.OrderInfo.create({
 		subaccountId: params.subaccountId,
 		feeRecipient: params.feeRecipient,
 		price: params.price,
 		quantity: params.quantity,
 		cid: params.cid || ""
 	});
-	const derivativeOrder = InjectiveExchangeV1Beta1ExchangePb.DerivativeOrder.create({
+	const derivativeOrder = InjectiveExchangeV2OrderPb.DerivativeOrder.create({
 		marketId: params.marketId,
 		orderInfo,
 		orderType: params.orderType,
 		margin: params.margin,
-		triggerPrice: params.triggerPrice || "0"
+		triggerPrice: params.triggerPrice || "0",
+		expirationBlock: params.expirationBlock ? BigInt(params.expirationBlock) : BigInt(0)
 	});
-	return InjectiveExchangeV1Beta1TxPb.MsgCreateBinaryOptionsMarketOrder.create({
+	return InjectiveExchangeV2TxPb.MsgCreateBinaryOptionsMarketOrder.create({
 		sender: params.injectiveAddress,
 		order: derivativeOrder
 	});
@@ -2196,9 +4679,9 @@ const createMarketOrder = (params) => {
 /**
 * @category Messages
 */
-var MsgCreateBinaryOptionsMarketOrder = class MsgCreateBinaryOptionsMarketOrder extends MsgBase {
+var MsgCreateBinaryOptionsMarketOrderV2 = class MsgCreateBinaryOptionsMarketOrderV2 extends MsgBase {
 	static fromJSON(params) {
-		return new MsgCreateBinaryOptionsMarketOrder(params);
+		return new MsgCreateBinaryOptionsMarketOrderV2(params);
 	}
 	toProto() {
 		const { params: initialParams } = this;
@@ -2213,7 +4696,7 @@ var MsgCreateBinaryOptionsMarketOrder = class MsgCreateBinaryOptionsMarketOrder
 	toData() {
 		const proto = this.toProto();
 		return {
-			"@type": "/injective.exchange.v1beta1.MsgCreateBinaryOptionsMarketOrder",
+			"@type": "/injective.exchange.v2.MsgCreateBinaryOptionsMarketOrder",
 			...proto
 		};
 	}
@@ -2234,7 +4717,8 @@ var MsgCreateBinaryOptionsMarketOrder = class MsgCreateBinaryOptionsMarketOrder
 					},
 					order_type: params.orderType,
 					margin: params.margin,
-					trigger_price: params.triggerPrice || "0"
+					trigger_price: params.triggerPrice || "0",
+					expiration_block: params.expirationBlock || "0"
 				}
 			}
 		};
@@ -2242,7 +4726,7 @@ var MsgCreateBinaryOptionsMarketOrder = class MsgCreateBinaryOptionsMarketOrder
 	toWeb3Gw() {
 		const { value } = this.toAmino();
 		return {
-			"@type": "/injective.exchange.v1beta1.MsgCreateBinaryOptionsMarketOrder",
+			"@type": "/injective.exchange.v2.MsgCreateBinaryOptionsMarketOrder",
 			...value
 		};
 	}
@@ -2261,22 +4745,22 @@ var MsgCreateBinaryOptionsMarketOrder = class MsgCreateBinaryOptionsMarketOrder
 				},
 				margin: numberToCosmosSdkDecString(params.margin),
 				trigger_price: numberToCosmosSdkDecString(params.triggerPrice || "0"),
-				order_type: InjectiveExchangeV1Beta1ExchangePb.OrderType[params.orderType]
+				order_type: InjectiveExchangeV2OrderPb.OrderType[params.orderType]
 			}
 		};
 	}
 	toEip712() {
-		var _value$order;
 		const { params } = this;
 		const { value, type } = this.toAmino();
+		const { expiration_block: _eb, ...orderWithoutExpiration } = value.order || {};
 		return {
 			type,
 			value: {
 				...value,
 				order: {
-					...value.order,
+					...orderWithoutExpiration,
 					order_info: {
-						...(_value$order = value.order) === null || _value$order === void 0 ? void 0 : _value$order.order_info,
+						...orderWithoutExpiration === null || orderWithoutExpiration === void 0 ? void 0 : orderWithoutExpiration.order_info,
 						price: toChainFormat(params.price).toFixed(),
 						quantity: toChainFormat(params.quantity).toFixed()
 					},
@@ -2288,71 +4772,19 @@ var MsgCreateBinaryOptionsMarketOrder = class MsgCreateBinaryOptionsMarketOrder
 	}
 	toDirectSign() {
 		return {
-			type: "/injective.exchange.v1beta1.MsgCreateBinaryOptionsMarketOrder",
-			message: this.toProto()
-		};
-	}
-	toBinary() {
-		return InjectiveExchangeV1Beta1TxPb.MsgCreateBinaryOptionsMarketOrder.toBinary(this.toProto());
-	}
-};
-
-//#endregion
-//#region src/core/modules/exchange/msgs/MsgSetDelegationTransferReceivers.ts
-/**
-* @deprecated no longer supported on chain
-* @category Messages
-*/
-var MsgSetDelegationTransferReceivers = class MsgSetDelegationTransferReceivers extends MsgBase {
-	static fromJSON(params) {
-		return new MsgSetDelegationTransferReceivers(params);
-	}
-	toProto() {
-		const { params } = this;
-		return {
-			sender: params.sender,
-			receivers: params.receivers
-		};
-	}
-	toData() {
-		const proto = this.toProto();
-		return {
-			"@type": "/injective.exchange.v2.MsgSetDelegationTransferReceivers",
-			...proto
-		};
-	}
-	toAmino() {
-		const proto = this.toProto();
-		return {
-			type: "exchange/MsgSetDelegationTransferReceivers",
-			value: {
-				sender: proto.sender,
-				receivers: proto.receivers
-			}
-		};
-	}
-	toWeb3Gw() {
-		const { value } = this.toAmino();
-		return {
-			"@type": "/injective.exchange.v2.MsgSetDelegationTransferReceivers",
-			...value
-		};
-	}
-	toDirectSign() {
-		return {
-			type: "/injective.exchange.v2.MsgSetDelegationTransferReceivers",
+			type: "/injective.exchange.v2.MsgCreateBinaryOptionsMarketOrder",
 			message: this.toProto()
 		};
 	}
 	toBinary() {
-		return new Uint8Array(0);
+		return InjectiveExchangeV2TxPb.MsgCreateBinaryOptionsMarketOrder.toBinary(this.toProto());
 	}
 };
 
 //#endregion
-//#region src/core/modules/exchange/msgs/MsgInstantBinaryOptionsMarketLaunch.ts
+//#region src/core/modules/exchange/msgs/MsgInstantBinaryOptionsMarketLaunchV2.ts
 const createMessage = (params) => {
-	return InjectiveExchangeV1Beta1TxPb.MsgInstantBinaryOptionsMarketLaunch.create({
+	return InjectiveExchangeV2TxPb.MsgInstantBinaryOptionsMarketLaunch.create({
 		sender: params.proposer,
 		ticker: params.market.ticker,
 		oracleSymbol: params.market.oracleSymbol,
@@ -2373,9 +4805,9 @@ const createMessage = (params) => {
 /**
 * @category Messages
 */
-var MsgInstantBinaryOptionsMarketLaunch = class MsgInstantBinaryOptionsMarketLaunch extends MsgBase {
+var MsgInstantBinaryOptionsMarketLaunchV2 = class MsgInstantBinaryOptionsMarketLaunchV2 extends MsgBase {
 	static fromJSON(params) {
-		return new MsgInstantBinaryOptionsMarketLaunch(params);
+		return new MsgInstantBinaryOptionsMarketLaunchV2(params);
 	}
 	toProto() {
 		const { params: initialParams } = this;
@@ -2394,7 +4826,7 @@ var MsgInstantBinaryOptionsMarketLaunch = class MsgInstantBinaryOptionsMarketLau
 	toData() {
 		const proto = this.toProto();
 		return {
-			"@type": "/injective.exchange.v1beta1.MsgInstantBinaryOptionsMarketLaunch",
+			"@type": "/injective.exchange.v2.MsgInstantBinaryOptionsMarketLaunch",
 			...proto
 		};
 	}
@@ -2424,23 +4856,12 @@ var MsgInstantBinaryOptionsMarketLaunch = class MsgInstantBinaryOptionsMarketLau
 	toWeb3Gw() {
 		const { value } = this.toAmino();
 		return {
-			"@type": "/injective.exchange.v1beta1.MsgInstantBinaryOptionsMarketLaunch",
+			"@type": "/injective.exchange.v2.MsgInstantBinaryOptionsMarketLaunch",
 			...value
 		};
 	}
 	toEip712() {
-		const { type, value } = this.toAmino();
-		return {
-			type,
-			value: {
-				...value,
-				min_price_tick_size: toChainFormat(value.min_price_tick_size).toFixed(),
-				min_quantity_tick_size: toChainFormat(value.min_quantity_tick_size).toFixed(),
-				min_notional: toChainFormat(value.min_notional).toFixed(),
-				taker_fee_rate: toChainFormat(value.taker_fee_rate).toFixed(),
-				maker_fee_rate: toChainFormat(value.maker_fee_rate).toFixed()
-			}
-		};
+		throw new GeneralException(/* @__PURE__ */ new Error("EIP712 v1 is not supported for MsgInstantBinaryOptionsMarketLaunch, use toEip712V2 instead."));
 	}
 	toEip712V2() {
 		const { params } = this;
@@ -2451,17 +4872,18 @@ var MsgInstantBinaryOptionsMarketLaunch = class MsgInstantBinaryOptionsMarketLau
 			min_notional: numberToCosmosSdkDecString(params.market.minNotional),
 			taker_fee_rate: numberToCosmosSdkDecString(params.market.takerFeeRate),
 			maker_fee_rate: numberToCosmosSdkDecString(params.market.makerFeeRate),
-			oracle_type: InjectiveOracleV1Beta1OraclePb.OracleType[params.market.oracleType]
+			oracle_type: InjectiveOracleV1Beta1OraclePb.OracleType[params.market.oracleType],
+			open_notional_cap: {}
 		};
 	}
 	toDirectSign() {
 		return {
-			type: "/injective.exchange.v1beta1.MsgInstantBinaryOptionsMarketLaunch",
+			type: "/injective.exchange.v2.MsgInstantBinaryOptionsMarketLaunch",
 			message: this.toProto()
 		};
 	}
 	toBinary() {
-		return InjectiveExchangeV1Beta1TxPb.MsgInstantBinaryOptionsMarketLaunch.toBinary(this.toProto());
+		return InjectiveExchangeV2TxPb.MsgInstantBinaryOptionsMarketLaunch.toBinary(this.toProto());
 	}
 };
 
@@ -4526,7 +6948,7 @@ var MsgMigrateContract = class MsgMigrateContract extends MsgBase {
 				sender: proto.sender,
 				contract: proto.contract,
 				code_id: proto.codeId.toString(),
-				msg: params.msg
+				msg: safeBigIntStringify(params.msg)
 			}
 		};
 	}
@@ -4663,6 +7085,7 @@ var MsgInstantiateContract = class MsgInstantiateContract extends MsgBase {
 	}
 	toAmino() {
 		const proto = this.toProto();
+		const { params } = this;
 		return {
 			type: "wasm/MsgInstantiateContract",
 			value: {
@@ -4670,7 +7093,7 @@ var MsgInstantiateContract = class MsgInstantiateContract extends MsgBase {
 				admin: proto.admin,
 				code_id: proto.codeId.toString(),
 				label: proto.label,
-				msg: proto.msg,
+				msg: safeBigIntStringify(params.msg),
 				funds: proto.funds
 			}
 		};
@@ -8000,4 +10423,4 @@ var MsgSetDenomMetadata = class MsgSetDenomMetadata extends MsgBase {
 };
 
 //#endregion
-export { ExecArgIncreaseAllowance as $, MsgExternalTransfer as $t, MsgCreateRateLimit as A, OrderHashManager as At, MsgExec as B, MsgCancelBinaryOptionsOrder as Bt, MsgEditValidator as C, MsgSubmitProposalPerpetualMarketLaunch as Ct, MsgRelayProviderPrices as D, MsgSubmitTextProposal as Dt, MsgBid as E, MsgSubmitGenericProposal as Et, MsgGrantWithAuthorization as F, MsgAdminUpdateBinaryOptionsMarket as Ft, ExecPrivilegedArgVaultSubscribe as G, MsgBatchCancelSpotOrders as Gt, ExecPrivilegedArgOffChainVaultSubscribe as H, MsgInstantSpotMarketLaunch as Ht, MsgRevoke as I, MsgCreateBinaryOptionsLimitOrder as It, ExecArgCreatePerpGridStrategy as J, MsgCancelPostOnlyModeV2 as Jt, ExecPrivilegedArgVaultRedeem as K, MsgAuthorizeStakeGrants as Kt, MsgGrant as L, MsgCreateDerivativeMarketOrder as Lt, ContractExecutionCompatAuthorization as M, MsgSetDelegationTransferReceivers as Mt, ContractExecutionAuthorization as N, MsgCreateBinaryOptionsMarketOrder as Nt, MsgRemoveRateLimit as O, MsgDeposit as Ot, GenericAuthorization as P, MsgBatchCancelBinaryOptionsOrders as Pt, ExecArgRemoveGridStrategy as Q, MsgBatchUpdateOrders as Qt, getGenericAuthorizationFromMessageType as R, MsgBatchCancelDerivativeOrders as Rt, MsgBeginRedelegate as S, MsgSubmitProposalSpotMarketParamUpdate as St, MsgDelegate as T, MsgSubmitProposalSpotMarketLaunch as Tt, ExecPrivilegedArgOffChainVaultRedeem as U, MsgCreateSpotMarketOrder as Ut, GrantAuthorizationType as V, MsgUpdateDerivativeMarketV2 as Vt, ExecArgCW20AdapterRedeemAndTransfer as W, MsgCancelDerivativeOrder as Wt, StrategyType as X, MsgReclaimLockedFunds as Xt, ExitType as Y, MsgUpdateSpotMarketV2 as Yt, MsgPrivilegedExecuteContract as Z, MsgLiquidatePosition as Zt, MsgRevokeAllowance as _, MsgSend as _t, MsgBurn as a, ExecArgDepositTokens as at, MsgTransferDelegation as b, MsgSubmitProposalExpiryFuturesMarketLaunch as bt, MsgFundCommunityPool as c, ExecArgCW20Transfer as ct, MsgCreateNamespace as d, MsgMigrateContract as dt, MsgCancelSpotOrder as en, ExecArgUpdateGridConfig as et, MsgUpdateParams as f, MsgExecuteContract as ft, MsgUnderwrite as g, MsgMultiSend as gt, MsgRequestRedemption as h, MsgStoreCode as ht, MsgMint as i, ExecArgSwapMinOutput as it, MsgSendToEth as j, MsgInstantBinaryOptionsMarketLaunch as jt, MsgUpdateRateLimit as k, MsgVote as kt, MsgUpdateActorRoles as l, ExecArgCreateRound as lt, MsgCreateInsuranceFund as m, MsgUpdateAdmin as mt, MsgCreateDenom as n, MsgWithdraw as nn, ExecArgSwapExactOutput as nt, MsgWithdrawValidatorCommission as o, MsgInstantiateContract as ot, MsgClaimVoucher as p, ExecArgCW20Send as pt, ExecArgCreateSpotGridStrategy as q, MsgCreateSpotLimitOrder as qt, MsgChangeAdmin as r, MsgDeposit$1 as rn, ExecArgCreateCampaign as rt, MsgWithdrawDelegatorReward as s, ExecArgFundCampaign as st, MsgSetDenomMetadata as t, MsgRewardsOptOut as tn, ExecArgInitiateTransfer as tt, MsgUpdateNamespace as u, ExecArgSubmitVaa as ut, MsgGrantAllowance as v, MsgTransfer as vt, MsgUndelegate as w, MsgGrantProviderPrivilegeProposal as wt, MsgCreateValidator as x, MsgSubmitProposalPerpetualMarketLaunchV2 as xt, MsgCancelUnbondingDelegation as y, ProposalDecomposer as yt, msgsOrMsgExecMsgs as z, MsgCreateDerivativeLimitOrder as zt };
+export { ExecArgIncreaseAllowance as $, MsgUpdateDerivativeMarketV2 as $t, MsgCreateRateLimit as A, OrderHashManager as At, MsgExec as B, MsgAdminUpdateBinaryOptionsMarket as Bt, MsgEditValidator as C, MsgCancelSpotOrder as Cn, MsgSubmitProposalPerpetualMarketLaunch as Ct, MsgRelayProviderPrices as D, MsgDepositV2 as Dn, MsgSubmitTextProposal as Dt, MsgBid as E, MsgSignDataV2 as En, MsgSubmitGenericProposal as Et, MsgGrantWithAuthorization as F, MsgInstantBinaryOptionsMarketLaunch as Ft, ExecPrivilegedArgVaultSubscribe as G, MsgCreateDerivativeMarketOrder as Gt, ExecPrivilegedArgOffChainVaultSubscribe as H, MsgBatchCancelDerivativeOrdersV2 as Ht, MsgRevoke as I, MsgCreateBinaryOptionsLimitOrderV2 as It, ExecArgCreatePerpGridStrategy as J, MsgCreateDerivativeLimitOrder as Jt, ExecPrivilegedArgVaultRedeem as K, MsgBatchCancelDerivativeOrders as Kt, MsgGrant as L, MsgSetDelegationTransferReceivers as Lt, ContractExecutionCompatAuthorization as M, MsgCreateBinaryOptionsMarketOrderV2 as Mt, ContractExecutionAuthorization as N, MsgBatchCancelBinaryOptionsOrdersV2 as Nt, MsgRemoveRateLimit as O, MsgWithdraw as On, MsgDeposit as Ot, GenericAuthorization as P, MsgAdminUpdateBinaryOptionsMarketV2 as Pt, ExecArgRemoveGridStrategy as Q, MsgCancelBinaryOptionsOrder as Qt, getGenericAuthorizationFromMessageType as R, MsgCreateBinaryOptionsMarketOrder as Rt, MsgBeginRedelegate as S, MsgRewardsOptOutV2 as Sn, MsgSubmitProposalSpotMarketParamUpdate as St, MsgDelegate as T, MsgWithdrawV2 as Tn, MsgSubmitProposalSpotMarketLaunch as Tt, ExecPrivilegedArgOffChainVaultRedeem as U, MsgCreateBinaryOptionsLimitOrder as Ut, GrantAuthorizationType as V, MsgCreateDerivativeMarketOrderV2 as Vt, ExecArgCW20AdapterRedeemAndTransfer as W, MsgCreateDerivativeLimitOrderV2 as Wt, StrategyType as X, MsgDecreasePositionMarginV2 as Xt, ExitType as Y, MsgInstantSpotMarketLaunchV2 as Yt, MsgPrivilegedExecuteContract as Z, MsgIncreasePositionMarginV2 as Zt, MsgRevokeAllowance as _, MsgReclaimLockedFunds as _n, MsgSend as _t, MsgBurn as a, MsgAuthorizeStakeGrantsV2 as an, ExecArgDepositTokens as at, MsgTransferDelegation as b, MsgBatchUpdateOrders as bn, MsgSubmitProposalExpiryFuturesMarketLaunch as bt, MsgFundCommunityPool as c, MsgBatchCancelSpotOrders as cn, ExecArgCW20Transfer as ct, MsgCreateNamespace as d, MsgCreateSpotLimitOrder as dn, MsgMigrateContract as dt, MsgCreateSpotMarketOrderV2 as en, ExecArgUpdateGridConfig as et, MsgUpdateParams as f, MsgCancelPostOnlyModeV2 as fn, MsgExecuteContract as ft, MsgUnderwrite as g, MsgUpdateSpotMarketV2 as gn, MsgMultiSend as gt, MsgRequestRedemption as h, MsgExternalTransferV2 as hn, MsgStoreCode as ht, MsgMint as i, MsgCreateSpotLimitOrderV2 as in, ExecArgSwapMinOutput as it, MsgSendToEth as j, MsgInstantBinaryOptionsMarketLaunchV2 as jt, MsgUpdateRateLimit as k, MsgDeposit$1 as kn, MsgVote as kt, MsgUpdateActorRoles as l, MsgReclaimLockedFundsV2 as ln, ExecArgCreateRound as lt, MsgCreateInsuranceFund as m, MsgBatchUpdateOrdersV2 as mn, MsgUpdateAdmin as mt, MsgCreateDenom as n, MsgCancelDerivativeOrderV2 as nn, ExecArgSwapExactOutput as nt, MsgWithdrawValidatorCommission as o, MsgCreateSpotMarketOrder as on, MsgInstantiateContract as ot, MsgClaimVoucher as p, MsgLiquidatePositionV2 as pn, ExecArgCW20Send as pt, ExecArgCreateSpotGridStrategy as q, MsgCancelBinaryOptionsOrderV2 as qt, MsgChangeAdmin as r, MsgInstantSpotMarketLaunch as rn, ExecArgCreateCampaign as rt, MsgWithdrawDelegatorReward as s, MsgCancelDerivativeOrder as sn, ExecArgFundCampaign as st, MsgSetDenomMetadata as t, MsgBatchCancelSpotOrdersV2 as tn, ExecArgInitiateTransfer as tt, MsgUpdateNamespace as u, MsgAuthorizeStakeGrants as un, ExecArgSubmitVaa as ut, MsgGrantAllowance as v, MsgCancelSpotOrderV2 as vn, MsgTransfer as vt, MsgUndelegate as w, MsgRewardsOptOut as wn, MsgGrantProviderPrivilegeProposal as wt, MsgCreateValidator as x, MsgExternalTransfer as xn, MsgSubmitProposalPerpetualMarketLaunchV2 as xt, MsgCancelUnbondingDelegation as y, MsgLiquidatePosition as yn, ProposalDecomposer as yt, msgsOrMsgExecMsgs as z, MsgBatchCancelBinaryOptionsOrders as zt };