@dydxprotocol/v4-client-js 2.2.0 → 2.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dydxprotocol/v4-client-js",
-  "version": "2.2.0",
+  "version": "2.3.1",
   "description": "General client library for the new dYdX system (v4 decentralized)",
   "main": "build/cjs/src/index.js",
   "module": "build/esm/src/index.js",
@@ -25,7 +25,7 @@
     "coverage": "npm run test -- --coverage",
     "fix": "npm run lint -- --fix",
     "lint": "eslint --ext .ts,.js .",
-    "prepublishOnly": "npm run compile",
+    "prepublishOnly": "npm run build",
     "release": "semantic-release",
     "start": "node build/src/index.js",
     "test": "NODE_ENV=test jest --testPathIgnorePatterns=__tests__/modules/client/*",

package/src/clients/composite-client.ts

@@ -104,6 +104,12 @@ export type CancelRawOrderPayload = {
   goodTilBlockTime?: number;
 };
 
+export type TransferToSubaccountPayload = {
+  sourceSubaccountNumber: number;
+  recipientSubaccountNumber: number;
+  transferAmount: string;
+};
+
 export class CompositeClient {
   public readonly network: Network;
   public gasDenom: SelectedGasDenom = SelectedGasDenom.USDC;
@@ -1108,71 +1114,11 @@ export class CompositeClient {
     return Buffer.from(signature).toString('base64');
   }
 
-  async transferToSubaccountAndPlaceStatefulOrder(
-    sourceSubaccount: SubaccountInfo,
-    recipientSubaccountNumber: number,
-    transferAmount: string,
-    placeOrderPayload: Omit<PlaceOrderPayload, 'subaccountNumber'>,
-    memo?: string,
-    broadcastMode?: BroadcastMode,
-  ): Promise<BroadcastTxAsyncResponse | BroadcastTxSyncResponse | IndexedTx> {
-    const orderFlags = calculateOrderFlags(placeOrderPayload.type, placeOrderPayload.timeInForce);
-    if (orderFlags === OrderFlags.SHORT_TERM) {
-      throw new Error('SHORT_TERM orders cannot be batched with transfers');
-    }
-
-    const recipientSubaccount = new SubaccountInfo(
-      sourceSubaccount.wallet,
-      recipientSubaccountNumber,
-    );
-
-    const account: Promise<Account> = this.validatorClient.post.account(
-      recipientSubaccount.address,
-      orderFlags,
-    );
-
-    return this.send(
-      sourceSubaccount.wallet,
-      async () => {
-        const transferMsg = this.transferToSubaccountMessage(
-          sourceSubaccount,
-          recipientSubaccount.address,
-          recipientSubaccountNumber,
-          transferAmount,
-        );
-
-        const placeOrderMsg = await this.placeOrderMessage(
-          recipientSubaccount,
-          placeOrderPayload.marketId,
-          placeOrderPayload.type,
-          placeOrderPayload.side,
-          placeOrderPayload.price,
-          placeOrderPayload.size,
-          placeOrderPayload.clientId,
-          placeOrderPayload.timeInForce,
-          placeOrderPayload.goodTilTimeInSeconds,
-          placeOrderPayload.execution,
-          placeOrderPayload.postOnly,
-          placeOrderPayload.reduceOnly,
-          placeOrderPayload.triggerPrice,
-          placeOrderPayload.marketInfo,
-          placeOrderPayload.currentHeight,
-          placeOrderPayload.goodTilBlock,
-        );
-
-        return [transferMsg, placeOrderMsg];
-      },
-      true,
-      undefined,
-      memo,
-      broadcastMode ?? Method.BroadcastTxCommit,
-      () => account,
-    );
-  }
-
-  async bulkCancelAndPlaceStatefulOrders(
+  async bulkCancelAndTransferAndPlaceStatefulOrders(
     subaccount: SubaccountInfo,
+    // these are executed in this order, all in one block, and all succeed or all fail
     cancelOrderPayloads: CancelRawOrderPayload[],
+    transferToSubaccountPayload: TransferToSubaccountPayload | undefined,
     placeOrderPayloads: PlaceOrderPayload[],
     memo?: string,
     broadcastMode?: BroadcastMode,
@@ -1196,52 +1142,74 @@ export class CompositeClient {
       undefined,
     );
 
-    return this.send(
-      subaccount.wallet,
-      async () => {
-        const cancelMsgPromises = cancelOrderPayloads.map(async (cancelPayload) => {
-          const cancelSubaccount = new SubaccountInfo(
-            subaccount.wallet,
-            cancelPayload.subaccountNumber,
-          );
-          return this.validatorClient.post.cancelOrderMsg(
-            cancelSubaccount.address,
-            cancelSubaccount.subaccountNumber,
-            cancelPayload.clientId,
-            cancelPayload.orderFlags,
-            cancelPayload.clobPairId,
-            cancelPayload.goodTilBlock,
-            cancelPayload.goodTilBlockTime,
-          );
-        });
+    const msgs: Promise<EncodeObject[]> = (async () => {
+      const cancelMsgPromises = cancelOrderPayloads.map(async (cancelPayload) => {
+        const cancelSubaccount = new SubaccountInfo(
+          subaccount.wallet,
+          cancelPayload.subaccountNumber,
+        );
+        return this.validatorClient.post.cancelOrderMsg(
+          cancelSubaccount.address,
+          cancelSubaccount.subaccountNumber,
+          cancelPayload.clientId,
+          cancelPayload.orderFlags,
+          cancelPayload.clobPairId,
+          cancelPayload.goodTilBlock,
+          cancelPayload.goodTilBlockTime,
+        );
+      });
+
+      const transferMsg = (() => {
+        if (transferToSubaccountPayload == null) {
+          return undefined;
+        }
+        const transferSubaccount = new SubaccountInfo(
+          subaccount.wallet,
+          transferToSubaccountPayload?.sourceSubaccountNumber,
+        );
+        return this.transferToSubaccountMessage(
+          transferSubaccount,
+          transferSubaccount.address,
+          transferToSubaccountPayload.recipientSubaccountNumber,
+          transferToSubaccountPayload.transferAmount,
+        );
+      })();
 
-        const placeOrderMsgPromises = placeOrderPayloads.map((placePayload) => {
-          const placeSubaccount = new SubaccountInfo(
-            subaccount.wallet,
-            placePayload.subaccountNumber,
-          );
-          return this.placeOrderMessage(
-            placeSubaccount,
-            placePayload.marketId,
-            placePayload.type,
-            placePayload.side,
-            placePayload.price,
-            placePayload.size,
-            placePayload.clientId,
-            placePayload.timeInForce,
-            placePayload.goodTilTimeInSeconds,
-            placePayload.execution,
-            placePayload.postOnly,
-            placePayload.reduceOnly,
-            placePayload.triggerPrice,
-            placePayload.marketInfo,
-            placePayload.currentHeight,
-            placePayload.goodTilBlock,
-          );
-        });
+      const placeOrderMsgPromises = placeOrderPayloads.map((placePayload) => {
+        const placeSubaccount = new SubaccountInfo(
+          subaccount.wallet,
+          placePayload.subaccountNumber,
+        );
+        return this.placeOrderMessage(
+          placeSubaccount,
+          placePayload.marketId,
+          placePayload.type,
+          placePayload.side,
+          placePayload.price,
+          placePayload.size,
+          placePayload.clientId,
+          placePayload.timeInForce,
+          placePayload.goodTilTimeInSeconds,
+          placePayload.execution,
+          placePayload.postOnly,
+          placePayload.reduceOnly,
+          placePayload.triggerPrice,
+          placePayload.marketInfo,
+          placePayload.currentHeight,
+          placePayload.goodTilBlock,
+        );
+      });
+
+      return Promise.all([
+        ...cancelMsgPromises,
+        ...(transferMsg != null ? [transferMsg] : []),
+        ...placeOrderMsgPromises,
+      ]);
+    })();
 
-        return Promise.all([...cancelMsgPromises, ...placeOrderMsgPromises]);
-      },
+    return this.send(
+      subaccount.wallet,
+      () => msgs,
       true,
       undefined,
       memo,