@zoguxprotocol/client-js 0.2.9 → 0.2.11

package/examples/account_endpoints.ts

@@ -2,9 +2,9 @@
  * Simple JS example demostrating accessing subaccount data with Indexer REST endpoints
  */
 
+import { ZOGUX_TEST_ADDRESS } from './constants';
 import { Network } from '../src/clients/constants';
 import { IndexerClient } from '../src/clients/indexer-client';
-import { ZOGUX_TEST_ADDRESS } from './constants';
 
 async function test(): Promise<void> {
   const client = new IndexerClient(Network.testnet().indexerConfig);

package/examples/batch_cancel_orders_example.ts

@@ -1,12 +1,12 @@
 import _ from 'lodash';
 
 import { BECH32_PREFIX, Order_TimeInForce } from '../src';
+import { ZOGUX_TEST_MNEMONIC, MAX_CLIENT_ID } from './constants';
 import { CompositeClient, OrderBatchWithMarketId } from '../src/clients/composite-client';
 import { Network, OrderSide } from '../src/clients/constants';
 import LocalWallet from '../src/clients/modules/local-wallet';
 import { SubaccountInfo } from '../src/clients/subaccount';
 import { randomInt, sleep } from '../src/lib/utils';
-import { ZOGUX_TEST_MNEMONIC, MAX_CLIENT_ID } from './constants';
 
 type OrderInfo = {
   marketId: string;

package/examples/composite_example.ts

@@ -1,4 +1,6 @@
 import { BECH32_PREFIX } from '../src';
+import { ZOGUX_TEST_MNEMONIC, MAX_CLIENT_ID } from './constants';
+import ordersParams from './human_readable_orders.json';
 import { CompositeClient } from '../src/clients/composite-client';
 import {
   Network,
@@ -10,8 +12,6 @@ import {
 import LocalWallet from '../src/clients/modules/local-wallet';
 import { SubaccountInfo } from '../src/clients/subaccount';
 import { randomInt } from '../src/lib/utils';
-import { ZOGUX_TEST_MNEMONIC, MAX_CLIENT_ID } from './constants';
-import ordersParams from './human_readable_orders.json';
 
 async function sleep(ms: number): Promise<void> {
   return new Promise((resolve) => setTimeout(resolve, ms));

package/examples/faucet_endpoint.ts

@@ -2,9 +2,9 @@
  * Simple JS example demostrating filling subaccount with Faucet API
  */
 
+import { ZOGUX_TEST_ADDRESS } from './constants';
 import { FaucetApiHost } from '../src/clients/constants';
 import { FaucetClient } from '../src/clients/faucet-client';
-import { ZOGUX_TEST_ADDRESS } from './constants';
 
 async function test(): Promise<void> {
   const client = new FaucetClient(FaucetApiHost.TESTNET);

package/examples/gov_add_new_market.ts

@@ -2,10 +2,10 @@ import { PerpetualMarketType } from '@zoguxprotocol/proto/src/codegen/zogux/perp
 import Long from 'long';
 
 import { GovAddNewMarketParams, LocalWallet, ProposalStatus } from '../src';
+import { ZOGUX_LOCAL_MNEMONIC } from './constants';
 import { CompositeClient } from '../src/clients/composite-client';
 import { BECH32_PREFIX, Network } from '../src/clients/constants';
 import { getGovAddNewMarketSummary, getGovAddNewMarketTitle, sleep } from '../src/lib/utils';
-import { ZOGUX_LOCAL_MNEMONIC } from './constants';
 
 const INITIAL_DEPOSIT_AMOUNT = 10_000_000_000_000; // 10,000 whole native tokens.
 const MOCK_DATA: GovAddNewMarketParams = {

package/examples/long_term_order_cancel_example.ts

@@ -1,4 +1,5 @@
 import { BECH32_PREFIX, OrderFlags } from '../src';
+import { ZOGUX_TEST_MNEMONIC, MAX_CLIENT_ID } from './constants';
 import { CompositeClient } from '../src/clients/composite-client';
 import {
   Network,
@@ -10,7 +11,6 @@ import {
 import LocalWallet from '../src/clients/modules/local-wallet';
 import { SubaccountInfo } from '../src/clients/subaccount';
 import { randomInt } from '../src/lib/utils';
-import { ZOGUX_TEST_MNEMONIC, MAX_CLIENT_ID } from './constants';
 
 async function sleep(ms: number): Promise<void> {
   return new Promise((resolve) => setTimeout(resolve, ms));

package/examples/native_examples.ts

@@ -1,3 +1,4 @@
+import { ZOGUX_TEST_ADDRESS, ZOGUX_TEST_MNEMONIC } from './constants';
 import { Network } from '../src/clients/constants';
 import { UserError } from '../src/clients/lib/errors';
 import {
@@ -19,7 +20,6 @@ import {
   depositToMegavault,
   withdrawFromMegavault,
 } from '../src/clients/native';
-import { ZOGUX_TEST_ADDRESS, ZOGUX_TEST_MNEMONIC } from './constants';
 
 async function test(): Promise<void> {
   try {

package/examples/noble_example.ts

@@ -2,13 +2,13 @@ import { EncodeObject } from '@cosmjs/proto-signing';
 import Long from 'long';
 
 import { SubaccountInfo } from '../src';
+import { ZOGUX_TEST_MNEMONIC } from './constants';
 import { Network } from '../src/clients/constants';
 import LocalWallet from '../src/clients/modules/local-wallet';
 import { NobleClient } from '../src/clients/noble-client';
 import { ValidatorClient } from '../src/clients/validator-client';
 import { BECH32_PREFIX, NOBLE_BECH32_PREFIX } from '../src/lib/constants';
 import { sleep } from '../src/lib/utils';
-import { ZOGUX_TEST_MNEMONIC } from './constants';
 
 async function test(): Promise<void> {
   const zoguxClient = await ValidatorClient.connect(Network.testnet().validatorConfig);

package/examples/permissioned_keys_example.ts

@@ -1,6 +1,7 @@
 import Long from 'long';
 
 import { BECH32_PREFIX } from '../src';
+import { ZOGUX_TEST_MNEMONIC, ZOGUX_TEST_MNEMONIC_2 } from './constants';
 import { CompositeClient } from '../src/clients/composite-client';
 import {
   Network,
@@ -17,7 +18,6 @@ import {
   getAuthorizeNewTradingKeyArguments,
   getAuthorizedTradingKeysMetadata,
 } from '../src/lib/trading-key-utils';
-import { ZOGUX_TEST_MNEMONIC, ZOGUX_TEST_MNEMONIC_2 } from './constants';
 
 async function test(): Promise<void> {
   const wallet1 = await LocalWallet.fromMnemonic(ZOGUX_TEST_MNEMONIC, BECH32_PREFIX);

package/examples/short_term_order_cancel_example.ts

@@ -1,10 +1,10 @@
 import { BECH32_PREFIX, OrderFlags, Order_TimeInForce } from '../src';
+import { ZOGUX_TEST_MNEMONIC, MAX_CLIENT_ID } from './constants';
 import { CompositeClient } from '../src/clients/composite-client';
 import { Network, OrderSide } from '../src/clients/constants';
 import LocalWallet from '../src/clients/modules/local-wallet';
 import { SubaccountInfo } from '../src/clients/subaccount';
 import { randomInt, sleep } from '../src/lib/utils';
-import { ZOGUX_TEST_MNEMONIC, MAX_CLIENT_ID } from './constants';
 
 async function test(): Promise<void> {
   const wallet = await LocalWallet.fromMnemonic(ZOGUX_TEST_MNEMONIC, BECH32_PREFIX);

package/examples/short_term_order_composite_example.ts

@@ -1,13 +1,13 @@
 import { Order_TimeInForce } from '@zoguxprotocol/proto/src/codegen/zogux/clob/order';
 
 import { BECH32_PREFIX } from '../src';
+import { ZOGUX_TEST_MNEMONIC } from './constants';
+import ordersParams from './human_readable_short_term_orders.json';
 import { CompositeClient } from '../src/clients/composite-client';
 import { Network, OrderExecution, OrderSide } from '../src/clients/constants';
 import LocalWallet from '../src/clients/modules/local-wallet';
 import { SubaccountInfo } from '../src/clients/subaccount';
 import { randomInt } from '../src/lib/utils';
-import { ZOGUX_TEST_MNEMONIC } from './constants';
-import ordersParams from './human_readable_short_term_orders.json';
 
 async function sleep(ms: number): Promise<void> {
   return new Promise((resolve) => setTimeout(resolve, ms));

package/examples/test.ts

@@ -1,4 +1,6 @@
 import { BECH32_PREFIX } from '../src';
+import { ZOGUX_TEST_MNEMONIC, MAX_CLIENT_ID } from './constants';
+import ordersParams from './human_readable_orders.json';
 import { CompositeClient } from '../src/clients/composite-client';
 import {
   Network,
@@ -10,8 +12,6 @@ import {
 import LocalWallet from '../src/clients/modules/local-wallet';
 import { SubaccountInfo } from '../src/clients/subaccount';
 import { randomInt } from '../src/lib/utils';
-import { ZOGUX_TEST_MNEMONIC, MAX_CLIENT_ID } from './constants';
-import ordersParams from './human_readable_orders.json';
 
 async function sleep(ms: number): Promise<void> {
   return new Promise((resolve) => setTimeout(resolve, ms));

package/examples/transfer_example_deposit.ts

@@ -1,11 +1,11 @@
 import Long from 'long';
 
 import { BECH32_PREFIX } from '../src';
+import { ZOGUX_TEST_MNEMONIC } from './constants';
 import { Network } from '../src/clients/constants';
 import LocalWallet from '../src/clients/modules/local-wallet';
 import { SubaccountInfo } from '../src/clients/subaccount';
 import { ValidatorClient } from '../src/clients/validator-client';
-import { ZOGUX_TEST_MNEMONIC } from './constants';
 
 async function test(): Promise<void> {
   const wallet = await LocalWallet.fromMnemonic(ZOGUX_TEST_MNEMONIC, BECH32_PREFIX);

package/examples/transfer_example_send.ts

@@ -4,11 +4,11 @@ import Long from 'long';
 
 import { TEST_RECIPIENT_ADDRESS } from '../__tests__/helpers/constants';
 import { BECH32_PREFIX } from '../src';
+import { ZOGUX_TEST_MNEMONIC } from './constants';
 import { Network } from '../src/clients/constants';
 import LocalWallet from '../src/clients/modules/local-wallet';
 import { SubaccountInfo } from '../src/clients/subaccount';
 import { ValidatorClient } from '../src/clients/validator-client';
-import { ZOGUX_TEST_MNEMONIC } from './constants';
 
 async function test(): Promise<void> {
   const wallet = await LocalWallet.fromMnemonic(ZOGUX_TEST_MNEMONIC, BECH32_PREFIX);

package/examples/transfer_example_subaccount_transfer.ts

@@ -1,11 +1,11 @@
 import Long from 'long';
 
 import { BECH32_PREFIX } from '../src';
+import { ZOGUX_TEST_MNEMONIC } from './constants';
 import { Network } from '../src/clients/constants';
 import LocalWallet from '../src/clients/modules/local-wallet';
 import { SubaccountInfo } from '../src/clients/subaccount';
 import { ValidatorClient } from '../src/clients/validator-client';
-import { ZOGUX_TEST_MNEMONIC } from './constants';
 
 async function test(): Promise<void> {
   const wallet = await LocalWallet.fromMnemonic(ZOGUX_TEST_MNEMONIC, BECH32_PREFIX);

package/examples/transfer_example_withdraw.ts

@@ -1,11 +1,11 @@
 import Long from 'long';
 
 import { BECH32_PREFIX } from '../src';
+import { ZOGUX_TEST_MNEMONIC } from './constants';
 import { Network } from '../src/clients/constants';
 import LocalWallet from '../src/clients/modules/local-wallet';
 import { SubaccountInfo } from '../src/clients/subaccount';
 import { ValidatorClient } from '../src/clients/validator-client';
-import { ZOGUX_TEST_MNEMONIC } from './constants';
 
 // TODO: Test after testnet deploy latest transfer contracts.
 

package/examples/transfer_example_withdraw_other.ts

@@ -4,11 +4,11 @@ import Long from 'long';
 
 import { TEST_RECIPIENT_ADDRESS } from '../__tests__/helpers/constants';
 import { BECH32_PREFIX } from '../src';
+import { ZOGUX_TEST_MNEMONIC } from './constants';
 import { Network } from '../src/clients/constants';
 import LocalWallet from '../src/clients/modules/local-wallet';
 import { SubaccountInfo } from '../src/clients/subaccount';
 import { ValidatorClient } from '../src/clients/validator-client';
-import { ZOGUX_TEST_MNEMONIC } from './constants';
 
 async function test(): Promise<void> {
   const wallet = await LocalWallet.fromMnemonic(ZOGUX_TEST_MNEMONIC, BECH32_PREFIX);

package/examples/validator_get_example.ts

@@ -1,6 +1,6 @@
+import { ZOGUX_TEST_ADDRESS } from './constants';
 import { Network } from '../src/clients/constants';
 import { ValidatorClient } from '../src/clients/validator-client';
-import { ZOGUX_TEST_ADDRESS } from './constants';
 
 async function test(): Promise<void> {
   const client = await ValidatorClient.connect(Network.testnet().validatorConfig);

package/examples/validator_post_example.ts

@@ -2,14 +2,14 @@ import Long from 'long';
 import protobuf from 'protobufjs';
 
 import { BECH32_PREFIX } from '../src';
+import { ZOGUX_TEST_MNEMONIC, defaultOrder } from './constants';
+import ordersParams from './raw_orders.json';
 import { Network } from '../src/clients/constants';
 import LocalWallet from '../src/clients/modules/local-wallet';
 import { SubaccountInfo } from '../src/clients/subaccount';
 import { IPlaceOrder } from '../src/clients/types';
 import { ValidatorClient } from '../src/clients/validator-client';
 import { randomInt } from '../src/lib/utils';
-import { ZOGUX_TEST_MNEMONIC, defaultOrder } from './constants';
-import ordersParams from './raw_orders.json';
 
 // Required for encoding and decoding queries that are of type Long.
 // Must be done once but since the individal modules should be usable

package/examples/wallet_address.ts

@@ -1,6 +1,6 @@
 import { BECH32_PREFIX } from '../src';
-import LocalWallet from '../src/clients/modules/local-wallet';
 import { ZOGUX_TEST_ADDRESS, ZOGUX_TEST_MNEMONIC } from './constants';
+import LocalWallet from '../src/clients/modules/local-wallet';
 
 async function test(): Promise<void> {
   const wallet = await LocalWallet.fromMnemonic(ZOGUX_TEST_MNEMONIC, BECH32_PREFIX);

package/examples/websocket_example.ts

@@ -1,10 +1,10 @@
+import { ZOGUX_TEST_ADDRESS } from './constants';
 import { Network } from '../src/clients/constants';
 import {
   CandlesResolution,
   IncomingMessageTypes,
   SocketClient,
 } from '../src/clients/socket-client';
-import { ZOGUX_TEST_ADDRESS } from './constants';
 
 function test(): void {
   const mySocket = new SocketClient(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zoguxprotocol/client-js",
-  "version": "0.2.9",
+  "version": "0.2.11",
   "description": "General client library for the new Zogux system (v4 decentralized)",
   "main": "build/cjs/src/index.js",
   "module": "build/esm/src/index.js",
@@ -55,7 +55,7 @@
     "@osmonauts/lcd": "^0.6.0",
     "@scure/bip32": "^1.1.5",
     "@scure/bip39": "^1.1.1",
-    "@zoguxprotocol/proto": "0.1.7",
+    "@zoguxprotocol/proto": "0.1.8",
     "axios": "1.1.3",
     "bech32": "^1.1.4",
     "bignumber.js": "^9.1.1",

package/src/clients/constants.ts

@@ -110,6 +110,15 @@ export const TYPE_URL_MSG_WITHDRAW_FROM_SPOT = '/zogux.sending.MsgWithdrawFromSp
 // x/affiliates
 export const TYPE_URL_MSG_REGISTER_AFFILIATE = '/zogux.affiliates.MsgRegisterAffiliate';
 
+// x/bridge
+export const TYPE_URL_MSG_REQUEST_WITHDRAWAL = '/zogux.bridge.MsgRequestWithdrawal';
+export const TYPE_URL_MSG_SUBMIT_WITHDRAWAL_SIGNATURE = '/zogux.bridge.MsgSubmitWithdrawalSignature';
+export const TYPE_URL_MSG_MARK_WITHDRAWAL_SUBMITTED = '/zogux.bridge.MsgMarkWithdrawalSubmitted';
+export const TYPE_URL_MSG_CONFIRM_WITHDRAWAL = '/zogux.bridge.MsgConfirmWithdrawal';
+/** @deprecated Use MsgConfirmWithdrawal instead. */
+export const TYPE_URL_MSG_COMPLETE_WITHDRAWAL = '/zogux.bridge.MsgCompleteWithdrawal';
+export const TYPE_URL_MSG_CANCEL_WITHDRAWAL = '/zogux.bridge.MsgCancelWithdrawal';
+
 // x/vault
 export const TYPE_URL_MSG_DEPOSIT_TO_MEGAVAULT = '/zogux.vault.MsgDepositToMegavault';
 export const TYPE_URL_MSG_WITHDRAW_FROM_MEGAVAULT = '/zogux.vault.MsgWithdrawFromMegavault';

package/src/clients/lib/axios/axiosRequest.ts

@@ -1,8 +1,8 @@
 import axios, { AxiosRequestConfig } from 'axios';
 
-import { Data } from '../../types';
 import { AxiosServerError, AxiosError } from './errors';
 import { RequestMethod } from './types';
+import { Data } from '../../types';
 
 export interface Response {
   status: number;

package/src/clients/lib/registry.ts

@@ -2,6 +2,14 @@ import { GeneratedType, Registry } from '@cosmjs/proto-signing';
 import { defaultRegistryTypes } from '@cosmjs/stargate';
 import { MsgAddAuthenticator, MsgRemoveAuthenticator } from '@zoguxprotocol/proto/src/codegen/zogux/accountplus/tx';
 import { MsgRegisterAffiliate } from '@zoguxprotocol/proto/src/codegen/zogux/affiliates/tx';
+import {
+  MsgRequestWithdrawal,
+  MsgSubmitWithdrawalSignature,
+  MsgMarkWithdrawalSubmitted,
+  MsgConfirmWithdrawal,
+  MsgCompleteWithdrawal,
+  MsgCancelWithdrawal,
+} from '@zoguxprotocol/proto/src/codegen/zogux/bridge/tss';
 import {
   MsgPlaceOrder,
   MsgCancelOrder,
@@ -50,6 +58,12 @@ import {
   TYPE_URL_MSG_CREATE_MARKET_PERMISSIONLESS,
   TYPE_URL_MSG_ADD_AUTHENTICATOR,
   TYPE_URL_MSG_REMOVE_AUTHENTICATOR,
+  TYPE_URL_MSG_REQUEST_WITHDRAWAL,
+  TYPE_URL_MSG_SUBMIT_WITHDRAWAL_SIGNATURE,
+  TYPE_URL_MSG_MARK_WITHDRAWAL_SUBMITTED,
+  TYPE_URL_MSG_CONFIRM_WITHDRAWAL,
+  TYPE_URL_MSG_COMPLETE_WITHDRAWAL,
+  TYPE_URL_MSG_CANCEL_WITHDRAWAL,
 } from '../constants';
 import { MsgCreateTransfer } from '../types';
 
@@ -92,6 +106,13 @@ export function generateRegistry(): Registry {
     // affiliates
     [TYPE_URL_MSG_REGISTER_AFFILIATE, MsgRegisterAffiliate as GeneratedType],
 
+    // bridge (withdrawal)
+    [TYPE_URL_MSG_REQUEST_WITHDRAWAL, MsgRequestWithdrawal as GeneratedType],
+    [TYPE_URL_MSG_SUBMIT_WITHDRAWAL_SIGNATURE, MsgSubmitWithdrawalSignature as GeneratedType],
+    [TYPE_URL_MSG_MARK_WITHDRAWAL_SUBMITTED, MsgMarkWithdrawalSubmitted as GeneratedType],
+    [TYPE_URL_MSG_CONFIRM_WITHDRAWAL, MsgConfirmWithdrawal as GeneratedType],
+    [TYPE_URL_MSG_COMPLETE_WITHDRAWAL, MsgCompleteWithdrawal as GeneratedType],
+    [TYPE_URL_MSG_CANCEL_WITHDRAWAL, MsgCancelWithdrawal as GeneratedType],
 
     // authentication
     [TYPE_URL_MSG_ADD_AUTHENTICATOR, MsgAddAuthenticator as GeneratedType],

package/src/clients/modules/account.ts

@@ -87,6 +87,11 @@ export default class AccountClient extends RestClient {
     });
   }
 
+  async getSpotBalances(address: string, subaccountNumber: number): Promise<Data> {
+    const uri = '/v4/spotAssetPositions/balances';
+    return this.get(uri, { address, subaccountNumber });
+  }
+
   // ------ Transfers ------ //
 
   async getTransfersBetween(
@@ -257,6 +262,113 @@ export default class AccountClient extends RestClient {
     });
   }
 
+  // ------ Spot Fills ------ //
+
+  async getSubaccountSpotFills(
+    address: string,
+    subaccountNumber: number,
+    market?: string | null,
+    limit?: number | null,
+    createdBeforeOrAtHeight?: number | null,
+    createdBeforeOrAt?: string | null,
+    page?: number | null,
+  ): Promise<Data> {
+    const uri = '/v4/spotFills';
+    return this.get(uri, {
+      address,
+      subaccountNumber,
+      market,
+      limit,
+      createdBeforeOrAtHeight,
+      createdBeforeOrAt,
+      page,
+    });
+  }
+
+  async getParentSubaccountNumberSpotFills(
+    address: string,
+    parentSubaccountNumber: number,
+    limit?: number | null,
+    page?: number | null,
+  ): Promise<Data> {
+    const uri = '/v4/spotFills/parentSubaccount';
+    return this.get(uri, {
+      address,
+      parentSubaccountNumber,
+      limit,
+      page,
+    });
+  }
+
+  // ------ Spot Orders ------ //
+
+  async getSubaccountSpotOrders(
+    address: string,
+    subaccountNumber: number,
+    limit?: number | null,
+    ticker?: string | null,
+    side?: OrderSide | null,
+    type?: OrderType | null,
+    status?: OrderStatus | null,
+    goodTilBlockBeforeOrAt?: number | null,
+    goodTilBlockAfter?: number | null,
+    goodTilBlockTimeBeforeOrAt?: string | null,
+    goodTilBlockTimeAfter?: string | null,
+    returnLatestOrders?: boolean | null,
+  ): Promise<Data> {
+    const uri = '/v4/spotOrders';
+    return this.get(uri, {
+      address,
+      subaccountNumber,
+      limit,
+      ticker,
+      side,
+      type,
+      status,
+      goodTilBlockBeforeOrAt,
+      goodTilBlockAfter,
+      goodTilBlockTimeBeforeOrAt,
+      goodTilBlockTimeAfter,
+      returnLatestOrders,
+    });
+  }
+
+  async getParentSubaccountNumberSpotOrders(
+    address: string,
+    parentSubaccountNumber: number,
+    limit?: number | null,
+    ticker?: string | null,
+    side?: OrderSide | null,
+    type?: OrderType | null,
+    status?: OrderStatus | null,
+    goodTilBlockBeforeOrAt?: number | null,
+    goodTilBlockAfter?: number | null,
+    goodTilBlockTimeBeforeOrAt?: string | null,
+    goodTilBlockTimeAfter?: string | null,
+    returnLatestOrders?: boolean | null,
+  ): Promise<Data> {
+    const uri = '/v4/spotOrders/parentSubaccountNumber';
+    return this.get(uri, {
+      address,
+      parentSubaccountNumber,
+      limit,
+      ticker,
+      side,
+      type,
+      status,
+      goodTilBlockBeforeOrAt,
+      goodTilBlockAfter,
+      goodTilBlockTimeBeforeOrAt,
+      goodTilBlockTimeAfter,
+      returnLatestOrders,
+    });
+  }
+
+  async getSpotOrder(orderId: string): Promise<Data> {
+    const uri = `/v4/spotOrders/${orderId}`;
+    return this.get(uri);
+  }
+
   // ------ Pnl ------ //
 
   async getSubaccountHistoricalPNLs(

package/src/clients/modules/composer.ts

@@ -1,5 +1,6 @@
 /* eslint-disable comma-dangle */
 /* eslint-disable @typescript-eslint/quotes */
+import { fromBase64 } from '@cosmjs/encoding';
 import { EncodeObject, Registry } from '@cosmjs/proto-signing';
 import { MsgWithdrawDelegatorReward } from '@zoguxprotocol/proto/src/codegen/cosmos/distribution/v1beta1/tx';
 import { MsgSubmitProposal } from '@zoguxprotocol/proto/src/codegen/cosmos/gov/v1/tx';
@@ -30,6 +31,7 @@ import { Any } from 'cosmjs-types/google/protobuf/any';
 import Long from 'long';
 import protobuf from 'protobufjs';
 
+import { bigIntToBytes } from '../../lib/helpers';
 import {
   GOV_MODULE_ADDRESS,
   DELAYMSG_MODULE_ADDRESS,
@@ -55,6 +57,11 @@ import {
   TYPE_URL_MSG_WITHDRAW_DELEGATOR_REWARD,
   TYPE_URL_BATCH_CANCEL,
   TYPE_URL_MSG_REGISTER_AFFILIATE,
+  TYPE_URL_MSG_REQUEST_WITHDRAWAL,
+  TYPE_URL_MSG_SUBMIT_WITHDRAWAL_SIGNATURE,
+  TYPE_URL_MSG_MARK_WITHDRAWAL_SUBMITTED,
+  TYPE_URL_MSG_CONFIRM_WITHDRAWAL,
+  TYPE_URL_MSG_CANCEL_WITHDRAWAL,
   TYPE_URL_MSG_DEPOSIT_TO_MEGAVAULT,
   TYPE_URL_MSG_WITHDRAW_FROM_MEGAVAULT,
   TYPE_URL_MSG_CREATE_MARKET_PERMISSIONLESS,
@@ -421,6 +428,69 @@ export class Composer {
     return { typeUrl: TYPE_URL_MSG_WITHDRAW_FROM_SPOT, value: { sender, recipient, assetId, quantums } };
   }
 
+  // ------------ x/bridge ------------
+  public composeMsgRequestWithdrawal(
+    fromAddress: string,
+    toAddress: string,
+    amount: string,
+    chainId: number | Long,
+    denom: string,
+    nonce: number | Long,
+  ): EncodeObject {
+    const chainIdLong = typeof chainId === 'number' ? Long.fromNumber(chainId) : chainId;
+    const nonceLong = typeof nonce === 'number' ? Long.fromNumber(nonce) : nonce;
+    return {
+      typeUrl: TYPE_URL_MSG_REQUEST_WITHDRAWAL,
+      value: { fromAddress, toAddress, amount, chainId: chainIdLong, denom, nonce: nonceLong },
+    };
+  }
+
+  public composeMsgSubmitWithdrawalSignature(
+    validator: string,
+    withdrawalId: string,
+    signature: Uint8Array | string,
+  ): EncodeObject {
+    const signatureBytes =
+      typeof signature === 'string' ? fromBase64(signature) : signature;
+    return {
+      typeUrl: TYPE_URL_MSG_SUBMIT_WITHDRAWAL_SIGNATURE,
+      value: { validator, withdrawalId, signature: signatureBytes },
+    };
+  }
+
+  public composeMsgMarkWithdrawalSubmitted(
+    signer: string,
+    withdrawalId: string,
+    evmTxHash: string,
+  ): EncodeObject {
+    return {
+      typeUrl: TYPE_URL_MSG_MARK_WITHDRAWAL_SUBMITTED,
+      value: { signer, withdrawalId, evmTxHash },
+    };
+  }
+
+  public composeMsgConfirmWithdrawal(
+    signer: string,
+    withdrawalId: string,
+    evmTxHash: string,
+  ): EncodeObject {
+    return {
+      typeUrl: TYPE_URL_MSG_CONFIRM_WITHDRAWAL,
+      value: { signer, withdrawalId, evmTxHash },
+    };
+  }
+
+  public composeMsgCancelWithdrawal(
+    authority: string,
+    withdrawalId: string,
+    reason: string,
+  ): EncodeObject {
+    return {
+      typeUrl: TYPE_URL_MSG_CANCEL_WITHDRAWAL,
+      value: { authority, withdrawalId, reason },
+    };
+  }
+
   // ------------ x/bank ------------
   public composeMsgSendToken(
     address: string,
@@ -576,17 +646,21 @@ export class Composer {
   public composeMsgWithdrawFromMegavault(
     address: string,
     subaccountNumber: number,
-    shares: Uint8Array,
-    minQuoteQuantums: Uint8Array,
+    shares: string | Uint8Array,
+    minQuoteQuantums: string | Uint8Array,
   ): EncodeObject {
     const subaccountId: SubaccountId = {
       owner: address,
       number: subaccountNumber,
     };
 
+    const sharesBytes = typeof shares === 'string' ? bigIntToBytes(BigInt(shares)) : shares;
+    const minQuoteQuantumsBytes =
+      typeof minQuoteQuantums === 'string' ? bigIntToBytes(BigInt(minQuoteQuantums)) : minQuoteQuantums;
+
     const msg: MsgWithdrawFromMegavault = {
-      minQuoteQuantums,
-      shares: { numShares: shares },
+      minQuoteQuantums: minQuoteQuantumsBytes,
+      shares: { numShares: sharesBytes },
       subaccountId,
     };
 

package/src/clients/modules/get.ts

@@ -19,7 +19,6 @@ import protobuf from 'protobufjs';
 
 import { bigIntToBytes } from '../../lib/helpers';
 import { PAGE_REQUEST } from '../constants';
-import { UnexpectedClientError } from '../lib/errors';
 import {
   AffiliateModule,
   BridgeModule,
@@ -38,6 +37,7 @@ import {
   VaultModule,
 } from './proto-includes';
 import { TendermintClient } from './tendermintClient';
+import { UnexpectedClientError } from '../lib/errors';
 
 // Required for encoding and decoding queries that are of type Long.
 // Must be done once but since the individal modules should be usable without