@dydxprotocol/v4-client-js 1.0.8 → 1.0.10

package/src/clients/native.ts

@@ -1029,10 +1029,7 @@ export async function sendNobleIBC(squidPayload: string): Promise<String> {
       );
     }
 
-    const decode = (str: string): string => Buffer.from(str, 'base64').toString('binary');
-    const decoded = decode(squidPayload);
-
-    const json = JSON.parse(decoded);
+    const json = JSON.parse(squidPayload);
 
     const ibcMsg: EncodeObject = {
       typeUrl: json.msgTypeUrl, // '/ibc.applications.transfer.v1.MsgTransfer',
@@ -1055,3 +1052,76 @@ export async function sendNobleIBC(squidPayload: string): Promise<String> {
     return wrappedError(error);
   }
 }
+
+export async function withdrawToNobleIBC(payload: string): Promise<String> {
+  try {
+    const client = globalThis.client;
+    if (client === undefined) {
+      throw new UserError('client is not connected. Call connectClient() first');
+    }
+    const wallet = globalThis.wallet;
+    if (wallet === undefined) {
+      throw new UserError('wallet is not set. Call connectWallet() first');
+    }
+    const json = JSON.parse(payload);
+
+    const { subaccountNumber, amount, ibcPayload } = json ?? {};
+    const parsedIbcPayload = JSON.parse(ibcPayload);
+
+    const msg = client.withdrawFromSubaccountMessage(
+      new SubaccountInfo(wallet, subaccountNumber),
+      parseFloat(amount).toFixed(client.validatorClient.config.denoms.USDC_DECIMALS),
+    );
+    const ibcMsg: EncodeObject = {
+      typeUrl: parsedIbcPayload.msgTypeUrl,
+      value: parsedIbcPayload.msg,
+    };
+
+    const tx = await client.send(
+      wallet,
+      () => Promise.resolve([msg, ibcMsg]),
+      false,
+    );
+
+    return encodeJson({
+      txHash: `0x${Buffer.from(tx?.hash).toString('hex')}`,
+    });
+  } catch (error) {
+    return wrappedError(error);
+  }
+}
+
+export async function cctpWithdraw(squidPayload: string): Promise<String> {
+  try {
+    const client = globalThis.nobleClient;
+    if (client === undefined || !client.isConnected) {
+      throw new UserError(
+        'client is not connected.',
+      );
+    }
+
+    const json = JSON.parse(squidPayload);
+
+    const ibcMsg = {
+      typeUrl: json.typeUrl, // '/circle.cctp.v1.MsgDepositForBurn',
+      value: json.value,
+    };
+    const fee = await client.simulateTransaction([ibcMsg]);
+
+    // take out fee from amount before sweeping
+    const amount = parseInt(ibcMsg.value.amount, 10) -
+      Math.floor(parseInt(fee.amount[0].amount, 10) * GAS_MULTIPLIER);
+
+    if (amount <= 0) {
+      throw new Error('noble balance does not cover fees');
+    }
+
+    ibcMsg.value.amount = amount.toString();
+
+    const tx = await client.send([ibcMsg]);
+
+    return encodeJson(tx);
+  } catch (error) {
+    return wrappedError(error);
+  }
+}

package/src/clients/noble-client.ts

@@ -9,6 +9,7 @@ import {
 } from '@cosmjs/stargate';
 
 import { GAS_MULTIPLIER } from './constants';
+import { MsgDepositForBurn } from './lib/cctpProto';
 import LocalWallet from './modules/local-wallet';
 
 export class NobleClient {
@@ -24,9 +25,7 @@ export class NobleClient {
     return Boolean(this.stargateClient);
   }
 
-  async connect(
-    wallet: LocalWallet,
-  ): Promise<void> {
+  async connect(wallet: LocalWallet): Promise<void> {
     if (wallet?.offlineSigner === undefined) {
       throw new Error('Wallet signer not found');
     }
@@ -34,7 +33,12 @@ export class NobleClient {
     this.stargateClient = await SigningStargateClient.connectWithSigner(
       this.restEndpoint,
       wallet.offlineSigner,
-      { registry: new Registry(defaultRegistryTypes) },
+      {
+        registry: new Registry([
+          ['/circle.cctp.v1.MsgDepositForBurn', MsgDepositForBurn],
+          ...defaultRegistryTypes,
+        ]),
+      },
     );
   }
 

package/src/index.ts

@@ -16,3 +16,4 @@ export { FaucetClient } from './clients/faucet-client';
 export { SocketClient } from './clients/socket-client';
 export { NetworkOptimizer } from './network_optimizer';
 export { encodeJson } from './lib/helpers';
+export { SubaccountInfo } from './clients/subaccount';