@dydxprotocol/v4-client-js 0.38.4 → 0.38.6

package/src/clients/modules/post.ts

@@ -5,6 +5,7 @@ import {
   Registry,
 } from '@cosmjs/proto-signing';
 import {
+  Account,
   calculateFee,
   GasPrice,
   IndexedTx,
@@ -55,6 +56,8 @@ export class Post {
     private readonly chainId: string;
     public readonly get: Get;
 
+    private accountNumberCache: Map<string, Account> = new Map();
+
     constructor(
       get: Get,
       chainId: string,
@@ -78,10 +81,20 @@ export class Post {
       messaging: () => Promise<EncodeObject[]>,
       gasPrice: GasPrice = GAS_PRICE,
       memo?: string,
+      account?: () => Promise<Account>,
     ): Promise<StdFee> {
-      const msgs = await messaging();
-      const account = await this.get.getAccount(wallet.address!);
-      return this.simulateTransaction(wallet.pubKey!, account.sequence, msgs, gasPrice, memo);
+      const msgsPromise = messaging();
+      const accountPromise = account ? (await account()) : this.account(wallet.address!);
+      const msgsAndAccount = await Promise.all([msgsPromise, accountPromise]);
+      const msgs = msgsAndAccount[0];
+
+      return this.simulateTransaction(
+        wallet.pubKey!,
+        msgsAndAccount[1].sequence,
+        msgs,
+        gasPrice,
+        memo,
+      );
     }
 
     /**
@@ -98,9 +111,13 @@ export class Post {
       zeroFee: boolean,
       gasPrice: GasPrice = GAS_PRICE,
       memo?: string,
+      account?: () => Promise<Account>,
     ): Promise<Uint8Array> {
-      const msgs = await messaging();
-      return this.signTransaction(wallet, msgs, zeroFee, gasPrice, memo);
+      const msgsPromise = await messaging();
+      const accountPromise = account ? (await account()) : this.account(wallet.address!);
+      const msgsAndAccount = await Promise.all([msgsPromise, accountPromise]);
+      const msgs = msgsAndAccount[0];
+      return this.signTransaction(wallet, msgs, msgsAndAccount[1], zeroFee, gasPrice, memo);
     }
 
     /**
@@ -118,10 +135,16 @@ export class Post {
       gasPrice: GasPrice = GAS_PRICE,
       memo?: string,
       broadcastMode?: BroadcastMode,
+      account?: () => Promise<Account>,
     ): Promise<BroadcastTxAsyncResponse | BroadcastTxSyncResponse | IndexedTx> {
-      const msgs = await messaging();
+      const msgsPromise = messaging();
+      const accountPromise = account ? (await account()) : this.account(wallet.address!);
+      const msgsAndAccount = await Promise.all([msgsPromise, accountPromise]);
+      const msgs = msgsAndAccount[0];
+
       return this.signAndSendTransaction(
         wallet,
+        msgsAndAccount[1],
         msgs,
         zeroFee,
         gasPrice,
@@ -159,11 +182,11 @@ export class Post {
     private async signTransaction(
       wallet: LocalWallet,
       messages: EncodeObject[],
+      account: Account,
       zeroFee: boolean,
       gasPrice: GasPrice = GAS_PRICE,
       memo?: string,
     ): Promise<Uint8Array> {
-      const account = await this.get.getAccount(wallet.address!);
       // Simulate transaction if no fee is specified.
       const fee: StdFee = zeroFee ? {
         amount: [],
@@ -190,6 +213,23 @@ export class Post {
       );
     }
 
+    /**
+     * @description Retrieve an account structure for transactions.
+     * For short term orders, the sequence doesn't matter. Use cached if available.
+     * For long term and conditional orders, a round trip to validator must be made.
+     */
+    public async account(address: string, orderFlags?: OrderFlags): Promise<Account> {
+      if (orderFlags === OrderFlags.SHORT_TERM) {
+        if (this.accountNumberCache.has(address)) {
+          // For SHORT_TERM orders, the sequence doesn't matter
+          return this.accountNumberCache.get(address)!;
+        }
+      }
+      const account = await this.get.getAccount(address);
+      this.accountNumberCache.set(address, account);
+      return account;
+    }
+
     /**
      * @description Sign and send a message
      *
@@ -197,6 +237,7 @@ export class Post {
      */
     private async signAndSendTransaction(
       wallet: LocalWallet,
+      account: Account,
       messages: EncodeObject[],
       zeroFee: boolean,
       gasPrice: GasPrice = GAS_PRICE,
@@ -206,6 +247,7 @@ export class Post {
       const signedTransaction = await this.signTransaction(
         wallet,
         messages,
+        account,
         zeroFee,
         gasPrice,
         memo,
@@ -329,7 +371,16 @@ export class Post {
         );
         resolve([msg]);
       });
-      return this.send(subaccount.wallet, () => msgs, true, undefined, undefined, broadcastMode);
+      const account: Promise<Account> = this.account(subaccount.address, orderFlags);
+      return this.send(
+        subaccount.wallet,
+        () => msgs,
+        true,
+        undefined,
+        undefined,
+        broadcastMode,
+        () => account,
+      );
     }
 
     async placeOrderObject(
@@ -377,7 +428,13 @@ export class Post {
         );
         resolve([msg]);
       });
-      return this.send(subaccount.wallet, () => msgs, true, undefined, undefined, broadcastMode);
+      return this.send(
+        subaccount.wallet,
+        () => msgs,
+        true,
+        undefined,
+        undefined,
+        broadcastMode);
     }
 
     async cancelOrderObject(
@@ -415,7 +472,14 @@ export class Post {
         );
         resolve([msg]);
       });
-      return this.send(subaccount.wallet, () => msgs, false, undefined, undefined, broadcastMode);
+      return this.send(
+        subaccount.wallet,
+        () => msgs,
+        false,
+        undefined,
+        undefined,
+        broadcastMode,
+      );
     }
 
     async deposit(
@@ -433,7 +497,14 @@ export class Post {
         );
         resolve([msg]);
       });
-      return this.send(subaccount.wallet, () => msgs, false, undefined, undefined, broadcastMode);
+      return this.send(
+        subaccount.wallet,
+        () => msgs,
+        false,
+        undefined,
+        undefined,
+        broadcastMode,
+      );
     }
 
     async withdraw(
@@ -453,7 +524,14 @@ export class Post {
         );
         resolve([msg]);
       });
-      return this.send(subaccount.wallet, () => msgs, false, undefined, undefined, broadcastMode);
+      return this.send(
+        subaccount.wallet,
+        () => msgs,
+        false,
+        undefined,
+        undefined,
+        broadcastMode,
+      );
     }
 
     async sendToken(

package/src/clients/native.ts

@@ -13,7 +13,7 @@ import { UserError } from '../lib/errors';
 import { encodeJson } from '../lib/helpers';
 import { deriveHDKeyFromEthereumSignature } from '../lib/onboarding';
 import { NetworkOptimizer } from '../network_optimizer';
-import { CompositeClient } from './composite-client';
+import { CompositeClient, MarketInfo } from './composite-client';
 import {
   Network, OrderType, OrderSide, OrderTimeInForce, OrderExecution, IndexerConfig, ValidatorConfig,
 } from './constants';
@@ -224,6 +224,9 @@ export async function placeOrder(
     const reduceOnly = json.reduceOnly ?? false;
     const triggerPrice = json.triggerPrice;
 
+    const marketInfo = json.marketInfo as MarketInfo;
+    const currentHeight = json.currentHeight as number;
+
     const subaccount = new Subaccount(wallet, subaccountNumber);
     const tx = await client.placeOrder(
       subaccount,
@@ -239,6 +242,8 @@ export async function placeOrder(
       postOnly,
       reduceOnly,
       triggerPrice,
+      marketInfo,
+      currentHeight,
     );
     return encodeJson(tx);
   } catch (error) {
@@ -580,9 +585,13 @@ export async function simulateDeposit(
     );
     const msgs: EncodeObject[] = [msg];
     const encodeObjects: Promise<EncodeObject[]> = new Promise((resolve) => resolve(msgs));
-    const stdFee = await client.simulate(globalThis.wallet, () => {
-      return encodeObjects;
-    });
+
+    const stdFee = await client.simulate(
+      globalThis.wallet,
+      () => {
+        return encodeObjects;
+      },
+    );
     return JSON.stringify(stdFee);
   } catch (error) {
     return wrappedError(error);
@@ -619,9 +628,13 @@ export async function simulateWithdraw(
     );
     const msgs: EncodeObject[] = [msg];
     const encodeObjects: Promise<EncodeObject[]> = new Promise((resolve) => resolve(msgs));
-    const stdFee = await client.simulate(globalThis.wallet, () => {
-      return encodeObjects;
-    });
+
+    const stdFee = await client.simulate(
+      globalThis.wallet,
+      () => {
+        return encodeObjects;
+      },
+    );
     return encodeJson(stdFee);
   } catch (error) {
     return wrappedError(error);
@@ -662,6 +675,7 @@ export async function simulateTransferNativeToken(
     );
     const msgs: EncodeObject[] = [msg];
     const encodeObjects: Promise<EncodeObject[]> = new Promise((resolve) => resolve(msgs));
+
     const stdFee = await client.simulate(
       globalThis.wallet,
       () => {

package/src/network_optimizer.ts

@@ -69,8 +69,8 @@ export class NetworkOptimizer {
     }
     const maxHeight = Math.max(...responses.map(({ height }) => height));
     return responses
-    // Only consider nodes at `maxHeight`
-      .filter(({ height }) => height === maxHeight)
+    // Only consider nodes at `maxHeight` or `maxHeight - 1`
+      .filter(({ height }) => height === maxHeight || height === maxHeight - 1)
     // Return the endpoint with the fastest response time
       .sort((a, b) => a.time - b.time)[0]
       .endpoint;
@@ -105,8 +105,8 @@ export class NetworkOptimizer {
     }
     const maxHeight = Math.max(...responses.map(({ height }) => height));
     return responses
-    // Only consider nodes at `maxHeight`
-      .filter(({ height }) => height === maxHeight)
+    // Only consider nodes at `maxHeight` or `maxHeight - 1`
+      .filter(({ height }) => height === maxHeight || height === maxHeight - 1)
     // Return the endpoint with the fastest response time
       .sort((a, b) => a.time - b.time)[0]
       .endpoint;