@zoguxprotocol/client-js 0.2.8 → 0.2.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zoguxprotocol/client-js",
-  "version": "0.2.8",
+  "version": "0.2.10",
   "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/faucet-client.ts

@@ -10,7 +10,6 @@ export class FaucetClient extends RestClient {
   public async fill(
     address: string,
     subaccountNumber: number,
-    amount: number,
     headers?: {},
   ): Promise<Response> {
     const uri = '/faucet/tokens';
@@ -21,7 +20,6 @@ export class FaucetClient extends RestClient {
       {
         address,
         subaccountNumber,
-        amount,
       },
       headers,
     );

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/composer.ts

@@ -24,6 +24,7 @@ import {
   MsgDepositToMegavault,
   MsgWithdrawFromMegavault,
 } from '@zoguxprotocol/proto/src/codegen/zogux/vault/tx';
+import { fromBase64, toBase64 } from '@cosmjs/encoding';
 import { MsgSend } from 'cosmjs-types/cosmos/bank/v1beta1/tx';
 import { Coin } from 'cosmjs-types/cosmos/base/v1beta1/coin';
 import { Any } from 'cosmjs-types/google/protobuf/any';
@@ -55,6 +56,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,
@@ -62,6 +68,7 @@ import {
   TYPE_URL_MSG_REMOVE_AUTHENTICATOR,
   AuthenticatorType,
 } from '../constants';
+import { bigIntToBytes } from '../../lib/helpers';
 import { DenomConfig, ITwapParameters, IBuilderCodeParameters } from '../types';
 import {
   OrderId,
@@ -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/post.ts

@@ -1070,6 +1070,173 @@ export class Post {
     return this.composer.composeMsgWithdrawFromMegavault(...args);
   }
 
+  // ------------ x/bridge ------------
+  requestWithdrawalMsg(
+    fromAddress: string,
+    toAddress: string,
+    amount: string,
+    chainId: number,
+    denom: string,
+    nonce: number,
+  ): EncodeObject {
+    return this.composer.composeMsgRequestWithdrawal(
+      fromAddress,
+      toAddress,
+      amount,
+      chainId,
+      denom,
+      nonce,
+    );
+  }
+
+  async requestWithdrawal(
+    subaccount: SubaccountInfo,
+    fromAddress: string,
+    toAddress: string,
+    amount: string,
+    chainId: number,
+    denom: string,
+    nonce: number,
+    broadcastMode?: BroadcastMode,
+  ): Promise<BroadcastTxAsyncResponse | BroadcastTxSyncResponse | IndexedTx> {
+    const msg = this.requestWithdrawalMsg(
+      fromAddress,
+      toAddress,
+      amount,
+      chainId,
+      denom,
+      nonce,
+    );
+    return this.send(
+      subaccount,
+      () => Promise.resolve([msg]),
+      false,
+      undefined,
+      undefined,
+      broadcastMode,
+    );
+  }
+
+  submitWithdrawalSignatureMsg(
+    validator: string,
+    withdrawalId: string,
+    signature: Uint8Array | string,
+  ): EncodeObject {
+    return this.composer.composeMsgSubmitWithdrawalSignature(
+      validator,
+      withdrawalId,
+      signature,
+    );
+  }
+
+  async submitWithdrawalSignature(
+    subaccount: SubaccountInfo,
+    validator: string,
+    withdrawalId: string,
+    signature: Uint8Array | string,
+    broadcastMode?: BroadcastMode,
+  ): Promise<BroadcastTxAsyncResponse | BroadcastTxSyncResponse | IndexedTx> {
+    const msg = this.submitWithdrawalSignatureMsg(validator, withdrawalId, signature);
+    return this.send(
+      subaccount,
+      () => Promise.resolve([msg]),
+      false,
+      undefined,
+      undefined,
+      broadcastMode,
+    );
+  }
+
+  markWithdrawalSubmittedMsg(
+    signer: string,
+    withdrawalId: string,
+    evmTxHash: string,
+  ): EncodeObject {
+    return this.composer.composeMsgMarkWithdrawalSubmitted(
+      signer,
+      withdrawalId,
+      evmTxHash,
+    );
+  }
+
+  async markWithdrawalSubmitted(
+    subaccount: SubaccountInfo,
+    signer: string,
+    withdrawalId: string,
+    evmTxHash: string,
+    broadcastMode?: BroadcastMode,
+  ): Promise<BroadcastTxAsyncResponse | BroadcastTxSyncResponse | IndexedTx> {
+    const msg = this.markWithdrawalSubmittedMsg(signer, withdrawalId, evmTxHash);
+    return this.send(
+      subaccount,
+      () => Promise.resolve([msg]),
+      false,
+      undefined,
+      undefined,
+      broadcastMode,
+    );
+  }
+
+  confirmWithdrawalMsg(
+    signer: string,
+    withdrawalId: string,
+    evmTxHash: string,
+  ): EncodeObject {
+    return this.composer.composeMsgConfirmWithdrawal(
+      signer,
+      withdrawalId,
+      evmTxHash,
+    );
+  }
+
+  async confirmWithdrawal(
+    subaccount: SubaccountInfo,
+    signer: string,
+    withdrawalId: string,
+    evmTxHash: string,
+    broadcastMode?: BroadcastMode,
+  ): Promise<BroadcastTxAsyncResponse | BroadcastTxSyncResponse | IndexedTx> {
+    const msg = this.confirmWithdrawalMsg(signer, withdrawalId, evmTxHash);
+    return this.send(
+      subaccount,
+      () => Promise.resolve([msg]),
+      false,
+      undefined,
+      undefined,
+      broadcastMode,
+    );
+  }
+
+  cancelWithdrawalMsg(
+    authority: string,
+    withdrawalId: string,
+    reason: string,
+  ): EncodeObject {
+    return this.composer.composeMsgCancelWithdrawal(
+      authority,
+      withdrawalId,
+      reason,
+    );
+  }
+
+  async cancelWithdrawal(
+    subaccount: SubaccountInfo,
+    authority: string,
+    withdrawalId: string,
+    reason: string,
+    broadcastMode?: BroadcastMode,
+  ): Promise<BroadcastTxAsyncResponse | BroadcastTxSyncResponse | IndexedTx> {
+    const msg = this.cancelWithdrawalMsg(authority, withdrawalId, reason);
+    return this.send(
+      subaccount,
+      () => Promise.resolve([msg]),
+      false,
+      undefined,
+      undefined,
+      broadcastMode,
+    );
+  }
+
   async registerAffiliate(
     subaccount: SubaccountInfo,
     affiliate: string,

package/tsconfig.base.json

@@ -1,6 +1,10 @@
 {
   "extends": "./node_modules/@dydxprotocol/node-service-base-dev/tsconfig.json",
-  "exclude": ["src/codegen/**/*.ts", "__native__/*.js", "__native__/__ios__/*.js"],
+  "exclude": [
+    "src/codegen/**/*.ts",
+    "__native__/*.js",
+    "__native__/__ios__/*.js"
+  ],
   "include": [
     "__tests__",
     "examples",
@@ -10,6 +14,7 @@
   ],
   "compilerOptions": {
     "noFallthroughCasesInSwitch": false,
-    "target": "ES2019"
+    "target": "ES2019",
+    "skipLibCheck": true
   }
 }