@nightlylabs/dex-sdk 0.0.24 → 0.0.25

package/dist/index.cjs

@@ -50,12 +50,15 @@ __export(index_exports, {
   getRandomId: () => getRandomId,
   getTopicFromCommand: () => getTopicFromCommand,
   getTopicFromMessage: () => getTopicFromMessage,
+  nowInMiliseconds: () => nowInMiliseconds,
+  parseEntryFunctionAbi: () => parseEntryFunctionAbi,
   sleep: () => sleep,
   toSystemValue: () => toSystemValue
 });
 module.exports = __toCommonJS(index_exports);
 
 // src/client.ts
+var import_ts_sdk2 = require("@aptos-labs/ts-sdk");
 var import_surf = require("@thalalabs/surf");
 var import_isomorphic_ws = __toESM(require("isomorphic-ws"), 1);
 var import_uuid = require("uuid");
@@ -513,6 +516,7 @@ var GLOBAL_DENOMINATOR = 1e8;
 // src/utils.ts
 var import_decimal = require("decimal.js");
 var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+var nowInMiliseconds = () => Date.now();
 var toSystemValue = (value) => {
   return new import_decimal.Decimal(value).mul(new import_decimal.Decimal(GLOBAL_DENOMINATOR)).toString();
 };
@@ -580,6 +584,184 @@ var getTopicFromMessage = (data) => {
   }
 };
 
+// src/sequenceNumberManager.ts
+var AccountSequenceNumber = class {
+  /**
+   * Creates an instance of AccountSequenceNumber.
+   *
+   * @param aptos - The Aptos client instance
+   * @param account - The account associated with transactions
+   * @param options - Configuration options
+   */
+  constructor(aptos, account, options = {}) {
+    // Sequence number on chain
+    this.lastCommittedNumber = null;
+    // Local sequence number (next to be used)
+    this.currentNumber = null;
+    // Use a proper mutex implementation instead of a boolean flag
+    this.isLocked = false;
+    this.lockQueue = [];
+    this._aptos = aptos;
+    this.account = account;
+    this.maxWaitTime = options.maxWaitTime ?? 1e4;
+    this.maximumInFlight = options.maximumInFlight ?? 100;
+    this.sleepTime = options.sleepTime ?? 10;
+    this.warningTime = options.warningTime ?? 3e4;
+  }
+  /**
+   * Acquires the lock for synchronized access.
+   */
+  async acquireLock() {
+    if (!this.isLocked) {
+      this.isLocked = true;
+      return;
+    }
+    return new Promise((resolve) => {
+      this.lockQueue.push(resolve);
+    });
+  }
+  /**
+   * Releases the lock and processes the next queued operation if any.
+   */
+  releaseLock() {
+    if (this.lockQueue.length > 0) {
+      const nextResolve = this.lockQueue.shift();
+      if (nextResolve) {
+        nextResolve();
+      }
+    } else {
+      this.isLocked = false;
+    }
+  }
+  /**
+   * Returns the next available sequence number for this account.
+   *
+   * @returns The next available sequence number or null if an error occurs
+   */
+  async nextSequenceNumber() {
+    await this.acquireLock();
+    try {
+      if (this.lastCommittedNumber === null || this.currentNumber === null) {
+        await this.initialize();
+      }
+      if (this.currentNumber - this.lastCommittedNumber >= this.maximumInFlight) {
+        await this.waitForCommit();
+      }
+      const nextNumber = this.currentNumber;
+      this.currentNumber = this.currentNumber + BigInt(1);
+      return nextNumber;
+    } catch (e) {
+      console.error("Error getting next sequence number:", e);
+      return null;
+    } finally {
+      this.releaseLock();
+    }
+  }
+  /**
+   * Waits for pending transactions to be committed.
+   */
+  async waitForCommit() {
+    await this.update();
+    const startTime = nowInMiliseconds();
+    while (this.currentNumber - this.lastCommittedNumber >= this.maximumInFlight) {
+      const elapsed = nowInMiliseconds() - startTime;
+      if (elapsed > this.maxWaitTime) {
+        console.warn(
+          `Waited over ${this.maxWaitTime / 1e3} seconds for a transaction to commit, re-syncing ${this.account.accountAddress.toString()}`
+        );
+        await this.initialize();
+        break;
+      }
+      if (elapsed > this.warningTime && elapsed % 5e3 < this.sleepTime) {
+        console.warn(
+          `Still waiting for transactions to commit after ${elapsed / 1e3} seconds for account ${this.account.accountAddress.toString()}`
+        );
+      }
+      await sleep(this.sleepTime);
+      await this.update();
+    }
+  }
+  /**
+   * Initializes this account with the sequence number on chain.
+   */
+  async initialize() {
+    const sequenceNumber = await this.getSequenceNumber();
+    this.currentNumber = sequenceNumber;
+    this.lastCommittedNumber = sequenceNumber;
+  }
+  /**
+   * Updates this account's sequence number with the one on-chain.
+   *
+   * @returns The on-chain sequence number for this account.
+   */
+  async update() {
+    const sequenceNumber = await this.getSequenceNumber();
+    this.lastCommittedNumber = sequenceNumber;
+    return this.lastCommittedNumber;
+  }
+  /**
+   * Synchronizes the local sequence number with the sequence number on-chain.
+   * This method waits until all submitted transactions have been committed.
+   */
+  async synchronize() {
+    if (this.lastCommittedNumber === this.currentNumber) return;
+    await this.acquireLock();
+    try {
+      await this.update();
+      const startTime = nowInMiliseconds();
+      while (this.lastCommittedNumber !== this.currentNumber) {
+        const elapsed = nowInMiliseconds() - startTime;
+        if (elapsed > this.maxWaitTime) {
+          console.warn(
+            `Waited over ${this.maxWaitTime / 1e3} seconds for all transactions to commit, re-syncing ${this.account.accountAddress.toString()}`
+          );
+          await this.initialize();
+          break;
+        }
+        await sleep(this.sleepTime);
+        await this.update();
+      }
+    } catch (e) {
+      console.error("Error synchronizing account sequence number:", e);
+    } finally {
+      this.releaseLock();
+    }
+  }
+  /**
+   * Gets the current sequence number from the blockchain.
+   *
+   * @returns The current sequence number
+   * @throws If unable to retrieve the account information
+   */
+  async getSequenceNumber() {
+    try {
+      const accInfo = await this._aptos.getAccountInfo({
+        accountAddress: this.account.accountAddress
+      });
+      return BigInt(accInfo.sequence_number);
+    } catch (error) {
+      console.error(
+        `Failed to get sequence number for ${this.account.accountAddress.toString()}:`,
+        error
+      );
+      throw error;
+    }
+  }
+  /**
+   * Returns information about the current state.
+   * Useful for debugging and monitoring.
+   */
+  getStatus() {
+    return {
+      pendingTransactions: this.currentNumber !== null && this.lastCommittedNumber !== null ? this.currentNumber - this.lastCommittedNumber : BigInt(0),
+      currentNumber: this.currentNumber,
+      lastCommittedNumber: this.lastCommittedNumber,
+      isLocked: this.isLocked,
+      queuedOperations: this.lockQueue.length
+    };
+  }
+};
+
 // src/client.ts
 var getRandomId = () => (0, import_uuid.v4)();
 var Client = class _Client {
@@ -753,6 +935,7 @@ var Client = class _Client {
     this._apiKey = apiKey || generateApiKey();
     this._subscriptions = /* @__PURE__ */ new Map();
     this._serverUrl = url;
+    this._sequenceNumberManager = new AccountSequenceNumber(this._aptos, this._apiKey);
     this._ws = ws;
     if (this._ws) {
       this._ws.onmessage = async (msg) => {
@@ -823,12 +1006,11 @@ var Client = class _Client {
   async setApiKey(apiKey) {
     this._apiKey = apiKey;
     this._apiKeySequenceNumber = await this.fetchApiKeySequenceNumber();
+    this._sequenceNumberManager = new AccountSequenceNumber(this._aptos, this._apiKey);
+    await this._sequenceNumberManager.initialize();
   }
   getApiKeySequenceNumber() {
-    return this._apiKeySequenceNumber;
-  }
-  incrementSequenceNumber() {
-    this._apiKeySequenceNumber++;
+    return this._sequenceNumberManager.getSequenceNumber();
   }
   async fetchApiKeySequenceNumber() {
     const accInfo = await this._aptos.getAccountInfo({
@@ -960,7 +1142,7 @@ var Client = class _Client {
     return await this.submitSponsoredTransaction(tx, signature);
   }
   async placePerpLimitOrder(params) {
-    console.log("start", (/* @__PURE__ */ new Date()).getMilliseconds());
+    console.log("start");
     const payload = (0, import_surf.createEntryPayload)(placePerpLimitOrder_default, {
       function: "place_perp_limit_order",
       functionArguments: [
@@ -973,22 +1155,35 @@ var Client = class _Client {
       ],
       typeArguments: []
     });
-    console.log("payload", (/* @__PURE__ */ new Date()).getMilliseconds());
+    console.log("get sequence number");
+    const sequenceNumber = await this.getApiKeySequenceNumber();
+    console.log("sequence number", sequenceNumber);
     const tx = await this._aptos.transaction.build.simple({
       sender: this._apiKey.accountAddress,
-      data: payload,
+      data: {
+        ...payload,
+        abi: parseEntryFunctionAbi({
+          moduleAbi: placePerpLimitOrder_default,
+          functionName: "place_perp_limit_order",
+          moduleAddress: "0x88dd5fbd381db9ad1566c8bbaec39a3d98906b3983a74bcafba70a09ae8f58f6",
+          moduleName: "place_perp_limit_order"
+        })
+      },
       withFeePayer: true,
       options: {
-        accountSequenceNumber: this.getApiKeySequenceNumber()
+        accountSequenceNumber: sequenceNumber,
+        // Now + 10 sec
+        expireTimestamp: Date.now() + 10 * 1e3,
+        gasUnitPrice: 100,
+        maxGasAmount: 1e4
       }
     });
-    this.incrementSequenceNumber();
-    console.log("tx", (/* @__PURE__ */ new Date()).getMilliseconds());
+    console.log("after build");
     const signature = this._aptos.sign({
       signer: this._apiKey,
       transaction: tx
     });
-    console.log("signature", (/* @__PURE__ */ new Date()).getMilliseconds());
+    console.log("after sign");
     return await this.submitSponsoredTransaction(tx, signature);
   }
   async placePerpMarketOrder(params) {
@@ -1006,12 +1201,8 @@ var Client = class _Client {
     const tx = await this._aptos.transaction.build.simple({
       sender: this._apiKey.accountAddress,
       data: payload,
-      withFeePayer: true,
-      options: {
-        accountSequenceNumber: this.getApiKeySequenceNumber()
-      }
+      withFeePayer: true
     });
-    this.incrementSequenceNumber();
     const signature = this._aptos.sign({
       signer: this._apiKey,
       transaction: tx
@@ -1161,6 +1352,30 @@ var Client = class _Client {
   }
 };
 var client_default = Client;
+function parseEntryFunctionAbi(args) {
+  const { moduleAbi, moduleAddress, moduleName, functionName } = args;
+  const functionAbi = moduleAbi.exposed_functions.find((func) => func.name === functionName);
+  if (!functionAbi) {
+    throw new Error(
+      `Could not find entry function ABI for '${moduleAddress}::${moduleName}::${functionName}'`
+    );
+  }
+  if (!functionAbi.is_entry) {
+    throw new Error(
+      `'${moduleAddress}::${moduleName}::${functionName}' is not an entry function`
+    );
+  }
+  const numSigners = (0, import_ts_sdk2.findFirstNonSignerArg)(functionAbi);
+  const params = [];
+  for (let i = numSigners; i < functionAbi.params.length; i += 1) {
+    params.push((0, import_ts_sdk2.parseTypeTag)(functionAbi.params[i], { allowGenerics: true }));
+  }
+  return {
+    signers: numSigners,
+    typeParameters: functionAbi.generic_type_params,
+    parameters: params
+  };
+}
 
 // src/testFaucet.ts
 var import_surf2 = require("@thalalabs/surf");
@@ -1519,6 +1734,8 @@ var TestFaucet = class _TestFaucet extends client_default {
   getRandomId,
   getTopicFromCommand,
   getTopicFromMessage,
+  nowInMiliseconds,
+  parseEntryFunctionAbi,
   sleep,
   toSystemValue
 });

package/dist/index.d.cts

@@ -1,5 +1,5 @@
 import * as _aptos_labs_ts_sdk from '@aptos-labs/ts-sdk';
-import { Aptos, Account, AccountAuthenticator, SimpleTransaction } from '@aptos-labs/ts-sdk';
+import { Account, Aptos, AccountAuthenticator, SimpleTransaction, MoveModule, EntryFunctionABI } from '@aptos-labs/ts-sdk';
 import * as _thalalabs_surf_build_types_core from '@thalalabs/surf/build/types/core';
 import * as _thalalabs_surf from '@thalalabs/surf';
 import WebSocket from 'isomorphic-ws';
@@ -589,6 +589,87 @@ declare enum Network {
     Devnet = "Devnet"
 }
 
+/**
+ * Manages sequence numbers for Aptos blockchain transactions.
+ * Ensures proper transaction ordering and handles synchronization with the blockchain.
+ */
+declare class AccountSequenceNumber {
+    private _aptos;
+    readonly account: Account;
+    private lastCommittedNumber;
+    private currentNumber;
+    private isLocked;
+    private lockQueue;
+    private readonly maxWaitTime;
+    private readonly maximumInFlight;
+    private readonly sleepTime;
+    private readonly warningTime;
+    /**
+     * Creates an instance of AccountSequenceNumber.
+     *
+     * @param aptos - The Aptos client instance
+     * @param account - The account associated with transactions
+     * @param options - Configuration options
+     */
+    constructor(aptos: Aptos, account: Account, options?: {
+        maxWaitTime?: number;
+        maximumInFlight?: number;
+        sleepTime?: number;
+        warningTime?: number;
+    });
+    /**
+     * Acquires the lock for synchronized access.
+     */
+    private acquireLock;
+    /**
+     * Releases the lock and processes the next queued operation if any.
+     */
+    private releaseLock;
+    /**
+     * Returns the next available sequence number for this account.
+     *
+     * @returns The next available sequence number or null if an error occurs
+     */
+    nextSequenceNumber(): Promise<bigint | null>;
+    /**
+     * Waits for pending transactions to be committed.
+     */
+    private waitForCommit;
+    /**
+     * Initializes this account with the sequence number on chain.
+     */
+    initialize(): Promise<void>;
+    /**
+     * Updates this account's sequence number with the one on-chain.
+     *
+     * @returns The on-chain sequence number for this account.
+     */
+    update(): Promise<bigint>;
+    /**
+     * Synchronizes the local sequence number with the sequence number on-chain.
+     * This method waits until all submitted transactions have been committed.
+     */
+    synchronize(): Promise<void>;
+    /**
+     * Gets the current sequence number from the blockchain.
+     *
+     * @returns The current sequence number
+     * @throws If unable to retrieve the account information
+     */
+    getSequenceNumber(): Promise<bigint>;
+    /**
+     * Returns information about the current state.
+     * Useful for debugging and monitoring.
+     */
+    getStatus(): {
+        pendingTransactions: bigint;
+        currentNumber: bigint | null;
+        lastCommittedNumber: bigint | null;
+        isLocked: boolean;
+        queuedOperations: number;
+    };
+}
+
 declare const getRandomId: () => string;
 declare class Client {
     _aptos: Aptos;
@@ -598,6 +679,7 @@ declare class Client {
     _ws: WebSocket | undefined;
     _serverUrl: string;
     _subscriptions: Map<string, (data: WsMessage) => void>;
+    _sequenceNumberManager: AccountSequenceNumber;
     timeout: number;
     static init(connection: Aptos, apiKey?: Account, url?: string, enableWs?: boolean): Promise<Client>;
     constructor(connection: Aptos, url: string, ws?: WebSocket, apiKey?: Account);
@@ -605,8 +687,7 @@ declare class Client {
     sendWsMessage(message: WsCommand): Promise<WsMessage>;
     static create(connection: Aptos, apiKey?: Account, url?: string, enableWs?: boolean): Promise<Client>;
     setApiKey(apiKey: Account): Promise<void>;
-    getApiKeySequenceNumber(): number;
-    incrementSequenceNumber(): void;
+    getApiKeySequenceNumber(): Promise<bigint>;
     fetchApiKeySequenceNumber(): Promise<number>;
     createUser(params: CreateUserParams): Promise<{
         tx: _aptos_labs_ts_sdk.MultiAgentTransaction;
@@ -742,6 +823,13 @@ type WsPerpMarketUpdates = Extract<WsMessage, {
     type: 'OrderbookUpdate' | 'TradesUpdate';
 }>;
 
+declare function parseEntryFunctionAbi(args: {
+    moduleAbi: MoveModule;
+    moduleAddress: string;
+    moduleName: string;
+    functionName: string;
+}): EntryFunctionABI;
+
 declare const ExchangeProxies: {
     [key in Network]: string[];
 };
@@ -758,9 +846,10 @@ declare class TestFaucet extends Client {
 }
 
 declare const sleep: (ms: number) => Promise<unknown>;
+declare const nowInMiliseconds: () => number;
 declare const toSystemValue: (value: string | number) => string;
 declare const generateApiKey: () => _aptos_labs_ts_sdk.Ed25519Account;
 declare const getTopicFromCommand: (data: WsCommand) => string;
 declare const getTopicFromMessage: (data: WsMessage) => string;
 
-export { type AddApiKey, type AddApiKeyParams, type Address, AdminEndpoints, type BalanceChange, BaseEndpoints, type Borrow, type BorrowLending, type CancelAllPerpOrdersParams, type CancelPerpOrdersParams, type CanceledPerpOrders, type ChartCandle, ChartInterval, Client, type Content, type CreateUserParams, type Deposit, type DepositToVaultParams, type DepositTokenParams, EndpointsV1, type ErrorResponse, type ExchangeConfig, ExchangeProxies, type Fees, type FundingCheckpoint, type FundingRate, GLOBAL_DENOMINATOR, type GetBorrowLendingDataResponse, type GetChartCandlesInRangeRequest, type GetChartCandlesInRangeResponse, type GetPerpMarketsDataRequest, type GetPerpMarketsDataResponse, type GetPerpOrderBookDataRequest, type GetPerpOrderBookDataResponse, type GetPerpRecentTradesRequest, type GetPerpRecentTradesResponse, type GetPerpUserFillsRequest, type GetPerpUserFillsResponse, type GetPerpUserOrdersRequest, type GetPerpUserOrdersResponse, type GetPerpetualMarketsConfigResponse, type GetPriceIndexesResponse, type GetTokensConfigResponse, type GetUserDataRequest, type GetUserDataResponse, type GetUsersByAddressRequest, type GetUsersByAddressResponse, type IGetChartCandlesInRange, type Lend, type LendTokenParams, type MarginStep, Network, type OracleUpdate, type OracleUpdates, type Order, type OrderFills, OrderSide, OrderStatus, OrderType, type OrderbookUpdate, type PaginationCursor, type PerpFill, type PerpMarketData, type PerpOrder, type PerpOrderBookData, type PerpPosition, type PerpTrade, type PerpetualMarketConfigEntry, PerpetualMarketStatus, type PlacePerpLimitOrder, type PlacePerpLimitOrderParams, type PlacePerpMarketOrder, type PlacePerpMarketOrderParams, type PriceIndex, type RedeemTokenParams, type Referral, type RemoveApiKey, type RemoveApiKeyParams, type RepayBorrow, type SetAlias, type SetAliasNameParams, type SetAutolend, type SetAutolendParams, Status, type StatusResponse, type SubmitSponsoredTransactionRequest, type SubmitSponsoredTransactionResponse, TestFaucet, type TimeResponse, type TokenConfigEntry, type Topic, type Trade, TradeRole, type TradesUpdate, type User, UserStatus, type UtilizationCurve, type VaultInvestment, type Withdraw, type WithdrawFromVaultParams, type WithdrawLend, type WsCommand, type WsFill, type WsMessage, type WsOracleUpdates, type WsPerpMarketUpdates, type WsUserUpdates, generateApiKey, getRandomId, getTopicFromCommand, getTopicFromMessage, sleep, toSystemValue };
+export { type AddApiKey, type AddApiKeyParams, type Address, AdminEndpoints, type BalanceChange, BaseEndpoints, type Borrow, type BorrowLending, type CancelAllPerpOrdersParams, type CancelPerpOrdersParams, type CanceledPerpOrders, type ChartCandle, ChartInterval, Client, type Content, type CreateUserParams, type Deposit, type DepositToVaultParams, type DepositTokenParams, EndpointsV1, type ErrorResponse, type ExchangeConfig, ExchangeProxies, type Fees, type FundingCheckpoint, type FundingRate, GLOBAL_DENOMINATOR, type GetBorrowLendingDataResponse, type GetChartCandlesInRangeRequest, type GetChartCandlesInRangeResponse, type GetPerpMarketsDataRequest, type GetPerpMarketsDataResponse, type GetPerpOrderBookDataRequest, type GetPerpOrderBookDataResponse, type GetPerpRecentTradesRequest, type GetPerpRecentTradesResponse, type GetPerpUserFillsRequest, type GetPerpUserFillsResponse, type GetPerpUserOrdersRequest, type GetPerpUserOrdersResponse, type GetPerpetualMarketsConfigResponse, type GetPriceIndexesResponse, type GetTokensConfigResponse, type GetUserDataRequest, type GetUserDataResponse, type GetUsersByAddressRequest, type GetUsersByAddressResponse, type IGetChartCandlesInRange, type Lend, type LendTokenParams, type MarginStep, Network, type OracleUpdate, type OracleUpdates, type Order, type OrderFills, OrderSide, OrderStatus, OrderType, type OrderbookUpdate, type PaginationCursor, type PerpFill, type PerpMarketData, type PerpOrder, type PerpOrderBookData, type PerpPosition, type PerpTrade, type PerpetualMarketConfigEntry, PerpetualMarketStatus, type PlacePerpLimitOrder, type PlacePerpLimitOrderParams, type PlacePerpMarketOrder, type PlacePerpMarketOrderParams, type PriceIndex, type RedeemTokenParams, type Referral, type RemoveApiKey, type RemoveApiKeyParams, type RepayBorrow, type SetAlias, type SetAliasNameParams, type SetAutolend, type SetAutolendParams, Status, type StatusResponse, type SubmitSponsoredTransactionRequest, type SubmitSponsoredTransactionResponse, TestFaucet, type TimeResponse, type TokenConfigEntry, type Topic, type Trade, TradeRole, type TradesUpdate, type User, UserStatus, type UtilizationCurve, type VaultInvestment, type Withdraw, type WithdrawFromVaultParams, type WithdrawLend, type WsCommand, type WsFill, type WsMessage, type WsOracleUpdates, type WsPerpMarketUpdates, type WsUserUpdates, generateApiKey, getRandomId, getTopicFromCommand, getTopicFromMessage, nowInMiliseconds, parseEntryFunctionAbi, sleep, toSystemValue };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as _aptos_labs_ts_sdk from '@aptos-labs/ts-sdk';
-import { Aptos, Account, AccountAuthenticator, SimpleTransaction } from '@aptos-labs/ts-sdk';
+import { Account, Aptos, AccountAuthenticator, SimpleTransaction, MoveModule, EntryFunctionABI } from '@aptos-labs/ts-sdk';
 import * as _thalalabs_surf_build_types_core from '@thalalabs/surf/build/types/core';
 import * as _thalalabs_surf from '@thalalabs/surf';
 import WebSocket from 'isomorphic-ws';
@@ -589,6 +589,87 @@ declare enum Network {
     Devnet = "Devnet"
 }
 
+/**
+ * Manages sequence numbers for Aptos blockchain transactions.
+ * Ensures proper transaction ordering and handles synchronization with the blockchain.
+ */
+declare class AccountSequenceNumber {
+    private _aptos;
+    readonly account: Account;
+    private lastCommittedNumber;
+    private currentNumber;
+    private isLocked;
+    private lockQueue;
+    private readonly maxWaitTime;
+    private readonly maximumInFlight;
+    private readonly sleepTime;
+    private readonly warningTime;
+    /**
+     * Creates an instance of AccountSequenceNumber.
+     *
+     * @param aptos - The Aptos client instance
+     * @param account - The account associated with transactions
+     * @param options - Configuration options
+     */
+    constructor(aptos: Aptos, account: Account, options?: {
+        maxWaitTime?: number;
+        maximumInFlight?: number;
+        sleepTime?: number;
+        warningTime?: number;
+    });
+    /**
+     * Acquires the lock for synchronized access.
+     */
+    private acquireLock;
+    /**
+     * Releases the lock and processes the next queued operation if any.
+     */
+    private releaseLock;
+    /**
+     * Returns the next available sequence number for this account.
+     *
+     * @returns The next available sequence number or null if an error occurs
+     */
+    nextSequenceNumber(): Promise<bigint | null>;
+    /**
+     * Waits for pending transactions to be committed.
+     */
+    private waitForCommit;
+    /**
+     * Initializes this account with the sequence number on chain.
+     */
+    initialize(): Promise<void>;
+    /**
+     * Updates this account's sequence number with the one on-chain.
+     *
+     * @returns The on-chain sequence number for this account.
+     */
+    update(): Promise<bigint>;
+    /**
+     * Synchronizes the local sequence number with the sequence number on-chain.
+     * This method waits until all submitted transactions have been committed.
+     */
+    synchronize(): Promise<void>;
+    /**
+     * Gets the current sequence number from the blockchain.
+     *
+     * @returns The current sequence number
+     * @throws If unable to retrieve the account information
+     */
+    getSequenceNumber(): Promise<bigint>;
+    /**
+     * Returns information about the current state.
+     * Useful for debugging and monitoring.
+     */
+    getStatus(): {
+        pendingTransactions: bigint;
+        currentNumber: bigint | null;
+        lastCommittedNumber: bigint | null;
+        isLocked: boolean;
+        queuedOperations: number;
+    };
+}
+
 declare const getRandomId: () => string;
 declare class Client {
     _aptos: Aptos;
@@ -598,6 +679,7 @@ declare class Client {
     _ws: WebSocket | undefined;
     _serverUrl: string;
     _subscriptions: Map<string, (data: WsMessage) => void>;
+    _sequenceNumberManager: AccountSequenceNumber;
     timeout: number;
     static init(connection: Aptos, apiKey?: Account, url?: string, enableWs?: boolean): Promise<Client>;
     constructor(connection: Aptos, url: string, ws?: WebSocket, apiKey?: Account);
@@ -605,8 +687,7 @@ declare class Client {
     sendWsMessage(message: WsCommand): Promise<WsMessage>;
     static create(connection: Aptos, apiKey?: Account, url?: string, enableWs?: boolean): Promise<Client>;
     setApiKey(apiKey: Account): Promise<void>;
-    getApiKeySequenceNumber(): number;
-    incrementSequenceNumber(): void;
+    getApiKeySequenceNumber(): Promise<bigint>;
     fetchApiKeySequenceNumber(): Promise<number>;
     createUser(params: CreateUserParams): Promise<{
         tx: _aptos_labs_ts_sdk.MultiAgentTransaction;
@@ -742,6 +823,13 @@ type WsPerpMarketUpdates = Extract<WsMessage, {
     type: 'OrderbookUpdate' | 'TradesUpdate';
 }>;
 
+declare function parseEntryFunctionAbi(args: {
+    moduleAbi: MoveModule;
+    moduleAddress: string;
+    moduleName: string;
+    functionName: string;
+}): EntryFunctionABI;
+
 declare const ExchangeProxies: {
     [key in Network]: string[];
 };
@@ -758,9 +846,10 @@ declare class TestFaucet extends Client {
 }
 
 declare const sleep: (ms: number) => Promise<unknown>;
+declare const nowInMiliseconds: () => number;
 declare const toSystemValue: (value: string | number) => string;
 declare const generateApiKey: () => _aptos_labs_ts_sdk.Ed25519Account;
 declare const getTopicFromCommand: (data: WsCommand) => string;
 declare const getTopicFromMessage: (data: WsMessage) => string;
 
-export { type AddApiKey, type AddApiKeyParams, type Address, AdminEndpoints, type BalanceChange, BaseEndpoints, type Borrow, type BorrowLending, type CancelAllPerpOrdersParams, type CancelPerpOrdersParams, type CanceledPerpOrders, type ChartCandle, ChartInterval, Client, type Content, type CreateUserParams, type Deposit, type DepositToVaultParams, type DepositTokenParams, EndpointsV1, type ErrorResponse, type ExchangeConfig, ExchangeProxies, type Fees, type FundingCheckpoint, type FundingRate, GLOBAL_DENOMINATOR, type GetBorrowLendingDataResponse, type GetChartCandlesInRangeRequest, type GetChartCandlesInRangeResponse, type GetPerpMarketsDataRequest, type GetPerpMarketsDataResponse, type GetPerpOrderBookDataRequest, type GetPerpOrderBookDataResponse, type GetPerpRecentTradesRequest, type GetPerpRecentTradesResponse, type GetPerpUserFillsRequest, type GetPerpUserFillsResponse, type GetPerpUserOrdersRequest, type GetPerpUserOrdersResponse, type GetPerpetualMarketsConfigResponse, type GetPriceIndexesResponse, type GetTokensConfigResponse, type GetUserDataRequest, type GetUserDataResponse, type GetUsersByAddressRequest, type GetUsersByAddressResponse, type IGetChartCandlesInRange, type Lend, type LendTokenParams, type MarginStep, Network, type OracleUpdate, type OracleUpdates, type Order, type OrderFills, OrderSide, OrderStatus, OrderType, type OrderbookUpdate, type PaginationCursor, type PerpFill, type PerpMarketData, type PerpOrder, type PerpOrderBookData, type PerpPosition, type PerpTrade, type PerpetualMarketConfigEntry, PerpetualMarketStatus, type PlacePerpLimitOrder, type PlacePerpLimitOrderParams, type PlacePerpMarketOrder, type PlacePerpMarketOrderParams, type PriceIndex, type RedeemTokenParams, type Referral, type RemoveApiKey, type RemoveApiKeyParams, type RepayBorrow, type SetAlias, type SetAliasNameParams, type SetAutolend, type SetAutolendParams, Status, type StatusResponse, type SubmitSponsoredTransactionRequest, type SubmitSponsoredTransactionResponse, TestFaucet, type TimeResponse, type TokenConfigEntry, type Topic, type Trade, TradeRole, type TradesUpdate, type User, UserStatus, type UtilizationCurve, type VaultInvestment, type Withdraw, type WithdrawFromVaultParams, type WithdrawLend, type WsCommand, type WsFill, type WsMessage, type WsOracleUpdates, type WsPerpMarketUpdates, type WsUserUpdates, generateApiKey, getRandomId, getTopicFromCommand, getTopicFromMessage, sleep, toSystemValue };
+export { type AddApiKey, type AddApiKeyParams, type Address, AdminEndpoints, type BalanceChange, BaseEndpoints, type Borrow, type BorrowLending, type CancelAllPerpOrdersParams, type CancelPerpOrdersParams, type CanceledPerpOrders, type ChartCandle, ChartInterval, Client, type Content, type CreateUserParams, type Deposit, type DepositToVaultParams, type DepositTokenParams, EndpointsV1, type ErrorResponse, type ExchangeConfig, ExchangeProxies, type Fees, type FundingCheckpoint, type FundingRate, GLOBAL_DENOMINATOR, type GetBorrowLendingDataResponse, type GetChartCandlesInRangeRequest, type GetChartCandlesInRangeResponse, type GetPerpMarketsDataRequest, type GetPerpMarketsDataResponse, type GetPerpOrderBookDataRequest, type GetPerpOrderBookDataResponse, type GetPerpRecentTradesRequest, type GetPerpRecentTradesResponse, type GetPerpUserFillsRequest, type GetPerpUserFillsResponse, type GetPerpUserOrdersRequest, type GetPerpUserOrdersResponse, type GetPerpetualMarketsConfigResponse, type GetPriceIndexesResponse, type GetTokensConfigResponse, type GetUserDataRequest, type GetUserDataResponse, type GetUsersByAddressRequest, type GetUsersByAddressResponse, type IGetChartCandlesInRange, type Lend, type LendTokenParams, type MarginStep, Network, type OracleUpdate, type OracleUpdates, type Order, type OrderFills, OrderSide, OrderStatus, OrderType, type OrderbookUpdate, type PaginationCursor, type PerpFill, type PerpMarketData, type PerpOrder, type PerpOrderBookData, type PerpPosition, type PerpTrade, type PerpetualMarketConfigEntry, PerpetualMarketStatus, type PlacePerpLimitOrder, type PlacePerpLimitOrderParams, type PlacePerpMarketOrder, type PlacePerpMarketOrderParams, type PriceIndex, type RedeemTokenParams, type Referral, type RemoveApiKey, type RemoveApiKeyParams, type RepayBorrow, type SetAlias, type SetAliasNameParams, type SetAutolend, type SetAutolendParams, Status, type StatusResponse, type SubmitSponsoredTransactionRequest, type SubmitSponsoredTransactionResponse, TestFaucet, type TimeResponse, type TokenConfigEntry, type Topic, type Trade, TradeRole, type TradesUpdate, type User, UserStatus, type UtilizationCurve, type VaultInvestment, type Withdraw, type WithdrawFromVaultParams, type WithdrawLend, type WsCommand, type WsFill, type WsMessage, type WsOracleUpdates, type WsPerpMarketUpdates, type WsUserUpdates, generateApiKey, getRandomId, getTopicFromCommand, getTopicFromMessage, nowInMiliseconds, parseEntryFunctionAbi, sleep, toSystemValue };

package/dist/index.js

@@ -1,4 +1,8 @@
 // src/client.ts
+import {
+  findFirstNonSignerArg,
+  parseTypeTag
+} from "@aptos-labs/ts-sdk";
 import { createEntryPayload, createSurfClient } from "@thalalabs/surf";
 import WebSocket from "isomorphic-ws";
 import { v4 as uuidv4 } from "uuid";
@@ -456,6 +460,7 @@ var GLOBAL_DENOMINATOR = 1e8;
 // src/utils.ts
 import { Decimal } from "decimal.js";
 var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+var nowInMiliseconds = () => Date.now();
 var toSystemValue = (value) => {
   return new Decimal(value).mul(new Decimal(GLOBAL_DENOMINATOR)).toString();
 };
@@ -523,6 +528,184 @@ var getTopicFromMessage = (data) => {
   }
 };
 
+// src/sequenceNumberManager.ts
+var AccountSequenceNumber = class {
+  /**
+   * Creates an instance of AccountSequenceNumber.
+   *
+   * @param aptos - The Aptos client instance
+   * @param account - The account associated with transactions
+   * @param options - Configuration options
+   */
+  constructor(aptos, account, options = {}) {
+    // Sequence number on chain
+    this.lastCommittedNumber = null;
+    // Local sequence number (next to be used)
+    this.currentNumber = null;
+    // Use a proper mutex implementation instead of a boolean flag
+    this.isLocked = false;
+    this.lockQueue = [];
+    this._aptos = aptos;
+    this.account = account;
+    this.maxWaitTime = options.maxWaitTime ?? 1e4;
+    this.maximumInFlight = options.maximumInFlight ?? 100;
+    this.sleepTime = options.sleepTime ?? 10;
+    this.warningTime = options.warningTime ?? 3e4;
+  }
+  /**
+   * Acquires the lock for synchronized access.
+   */
+  async acquireLock() {
+    if (!this.isLocked) {
+      this.isLocked = true;
+      return;
+    }
+    return new Promise((resolve) => {
+      this.lockQueue.push(resolve);
+    });
+  }
+  /**
+   * Releases the lock and processes the next queued operation if any.
+   */
+  releaseLock() {
+    if (this.lockQueue.length > 0) {
+      const nextResolve = this.lockQueue.shift();
+      if (nextResolve) {
+        nextResolve();
+      }
+    } else {
+      this.isLocked = false;
+    }
+  }
+  /**
+   * Returns the next available sequence number for this account.
+   *
+   * @returns The next available sequence number or null if an error occurs
+   */
+  async nextSequenceNumber() {
+    await this.acquireLock();
+    try {
+      if (this.lastCommittedNumber === null || this.currentNumber === null) {
+        await this.initialize();
+      }
+      if (this.currentNumber - this.lastCommittedNumber >= this.maximumInFlight) {
+        await this.waitForCommit();
+      }
+      const nextNumber = this.currentNumber;
+      this.currentNumber = this.currentNumber + BigInt(1);
+      return nextNumber;
+    } catch (e) {
+      console.error("Error getting next sequence number:", e);
+      return null;
+    } finally {
+      this.releaseLock();
+    }
+  }
+  /**
+   * Waits for pending transactions to be committed.
+   */
+  async waitForCommit() {
+    await this.update();
+    const startTime = nowInMiliseconds();
+    while (this.currentNumber - this.lastCommittedNumber >= this.maximumInFlight) {
+      const elapsed = nowInMiliseconds() - startTime;
+      if (elapsed > this.maxWaitTime) {
+        console.warn(
+          `Waited over ${this.maxWaitTime / 1e3} seconds for a transaction to commit, re-syncing ${this.account.accountAddress.toString()}`
+        );
+        await this.initialize();
+        break;
+      }
+      if (elapsed > this.warningTime && elapsed % 5e3 < this.sleepTime) {
+        console.warn(
+          `Still waiting for transactions to commit after ${elapsed / 1e3} seconds for account ${this.account.accountAddress.toString()}`
+        );
+      }
+      await sleep(this.sleepTime);
+      await this.update();
+    }
+  }
+  /**
+   * Initializes this account with the sequence number on chain.
+   */
+  async initialize() {
+    const sequenceNumber = await this.getSequenceNumber();
+    this.currentNumber = sequenceNumber;
+    this.lastCommittedNumber = sequenceNumber;
+  }
+  /**
+   * Updates this account's sequence number with the one on-chain.
+   *
+   * @returns The on-chain sequence number for this account.
+   */
+  async update() {
+    const sequenceNumber = await this.getSequenceNumber();
+    this.lastCommittedNumber = sequenceNumber;
+    return this.lastCommittedNumber;
+  }
+  /**
+   * Synchronizes the local sequence number with the sequence number on-chain.
+   * This method waits until all submitted transactions have been committed.
+   */
+  async synchronize() {
+    if (this.lastCommittedNumber === this.currentNumber) return;
+    await this.acquireLock();
+    try {
+      await this.update();
+      const startTime = nowInMiliseconds();
+      while (this.lastCommittedNumber !== this.currentNumber) {
+        const elapsed = nowInMiliseconds() - startTime;
+        if (elapsed > this.maxWaitTime) {
+          console.warn(
+            `Waited over ${this.maxWaitTime / 1e3} seconds for all transactions to commit, re-syncing ${this.account.accountAddress.toString()}`
+          );
+          await this.initialize();
+          break;
+        }
+        await sleep(this.sleepTime);
+        await this.update();
+      }
+    } catch (e) {
+      console.error("Error synchronizing account sequence number:", e);
+    } finally {
+      this.releaseLock();
+    }
+  }
+  /**
+   * Gets the current sequence number from the blockchain.
+   *
+   * @returns The current sequence number
+   * @throws If unable to retrieve the account information
+   */
+  async getSequenceNumber() {
+    try {
+      const accInfo = await this._aptos.getAccountInfo({
+        accountAddress: this.account.accountAddress
+      });
+      return BigInt(accInfo.sequence_number);
+    } catch (error) {
+      console.error(
+        `Failed to get sequence number for ${this.account.accountAddress.toString()}:`,
+        error
+      );
+      throw error;
+    }
+  }
+  /**
+   * Returns information about the current state.
+   * Useful for debugging and monitoring.
+   */
+  getStatus() {
+    return {
+      pendingTransactions: this.currentNumber !== null && this.lastCommittedNumber !== null ? this.currentNumber - this.lastCommittedNumber : BigInt(0),
+      currentNumber: this.currentNumber,
+      lastCommittedNumber: this.lastCommittedNumber,
+      isLocked: this.isLocked,
+      queuedOperations: this.lockQueue.length
+    };
+  }
+};
+
 // src/client.ts
 var getRandomId = () => uuidv4();
 var Client = class _Client {
@@ -696,6 +879,7 @@ var Client = class _Client {
     this._apiKey = apiKey || generateApiKey();
     this._subscriptions = /* @__PURE__ */ new Map();
     this._serverUrl = url;
+    this._sequenceNumberManager = new AccountSequenceNumber(this._aptos, this._apiKey);
     this._ws = ws;
     if (this._ws) {
       this._ws.onmessage = async (msg) => {
@@ -766,12 +950,11 @@ var Client = class _Client {
   async setApiKey(apiKey) {
     this._apiKey = apiKey;
     this._apiKeySequenceNumber = await this.fetchApiKeySequenceNumber();
+    this._sequenceNumberManager = new AccountSequenceNumber(this._aptos, this._apiKey);
+    await this._sequenceNumberManager.initialize();
   }
   getApiKeySequenceNumber() {
-    return this._apiKeySequenceNumber;
-  }
-  incrementSequenceNumber() {
-    this._apiKeySequenceNumber++;
+    return this._sequenceNumberManager.getSequenceNumber();
   }
   async fetchApiKeySequenceNumber() {
     const accInfo = await this._aptos.getAccountInfo({
@@ -903,7 +1086,7 @@ var Client = class _Client {
     return await this.submitSponsoredTransaction(tx, signature);
   }
   async placePerpLimitOrder(params) {
-    console.log("start", (/* @__PURE__ */ new Date()).getMilliseconds());
+    console.log("start");
     const payload = createEntryPayload(placePerpLimitOrder_default, {
       function: "place_perp_limit_order",
       functionArguments: [
@@ -916,22 +1099,35 @@ var Client = class _Client {
       ],
       typeArguments: []
     });
-    console.log("payload", (/* @__PURE__ */ new Date()).getMilliseconds());
+    console.log("get sequence number");
+    const sequenceNumber = await this.getApiKeySequenceNumber();
+    console.log("sequence number", sequenceNumber);
     const tx = await this._aptos.transaction.build.simple({
       sender: this._apiKey.accountAddress,
-      data: payload,
+      data: {
+        ...payload,
+        abi: parseEntryFunctionAbi({
+          moduleAbi: placePerpLimitOrder_default,
+          functionName: "place_perp_limit_order",
+          moduleAddress: "0x88dd5fbd381db9ad1566c8bbaec39a3d98906b3983a74bcafba70a09ae8f58f6",
+          moduleName: "place_perp_limit_order"
+        })
+      },
       withFeePayer: true,
       options: {
-        accountSequenceNumber: this.getApiKeySequenceNumber()
+        accountSequenceNumber: sequenceNumber,
+        // Now + 10 sec
+        expireTimestamp: Date.now() + 10 * 1e3,
+        gasUnitPrice: 100,
+        maxGasAmount: 1e4
       }
     });
-    this.incrementSequenceNumber();
-    console.log("tx", (/* @__PURE__ */ new Date()).getMilliseconds());
+    console.log("after build");
     const signature = this._aptos.sign({
       signer: this._apiKey,
       transaction: tx
     });
-    console.log("signature", (/* @__PURE__ */ new Date()).getMilliseconds());
+    console.log("after sign");
     return await this.submitSponsoredTransaction(tx, signature);
   }
   async placePerpMarketOrder(params) {
@@ -949,12 +1145,8 @@ var Client = class _Client {
     const tx = await this._aptos.transaction.build.simple({
       sender: this._apiKey.accountAddress,
       data: payload,
-      withFeePayer: true,
-      options: {
-        accountSequenceNumber: this.getApiKeySequenceNumber()
-      }
+      withFeePayer: true
     });
-    this.incrementSequenceNumber();
     const signature = this._aptos.sign({
       signer: this._apiKey,
       transaction: tx
@@ -1104,6 +1296,30 @@ var Client = class _Client {
   }
 };
 var client_default = Client;
+function parseEntryFunctionAbi(args) {
+  const { moduleAbi, moduleAddress, moduleName, functionName } = args;
+  const functionAbi = moduleAbi.exposed_functions.find((func) => func.name === functionName);
+  if (!functionAbi) {
+    throw new Error(
+      `Could not find entry function ABI for '${moduleAddress}::${moduleName}::${functionName}'`
+    );
+  }
+  if (!functionAbi.is_entry) {
+    throw new Error(
+      `'${moduleAddress}::${moduleName}::${functionName}' is not an entry function`
+    );
+  }
+  const numSigners = findFirstNonSignerArg(functionAbi);
+  const params = [];
+  for (let i = numSigners; i < functionAbi.params.length; i += 1) {
+    params.push(parseTypeTag(functionAbi.params[i], { allowGenerics: true }));
+  }
+  return {
+    signers: numSigners,
+    typeParameters: functionAbi.generic_type_params,
+    parameters: params
+  };
+}
 
 // src/testFaucet.ts
 import { createEntryPayload as createEntryPayload2 } from "@thalalabs/surf";
@@ -1461,6 +1677,8 @@ export {
   getRandomId,
   getTopicFromCommand,
   getTopicFromMessage,
+  nowInMiliseconds,
+  parseEntryFunctionAbi,
   sleep,
   toSystemValue
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nightlylabs/dex-sdk",
-  "version": "0.0.24",
+  "version": "0.0.25",
   "type": "module",
   "exports": {
     ".": {
@@ -38,7 +38,7 @@
   "license": "ISC",
   "packageManager": "pnpm@9.3.0+sha512.ee7b93e0c2bd11409c6424f92b866f31d3ea1bef5fbe47d3c7500cdc3c9668833d2e55681ad66df5b640c61fa9dc25d546efa54d76d7f8bf54b13614ac293631",
   "dependencies": {
-    "@aptos-labs/ts-sdk": "^1.33.2",
+    "@aptos-labs/ts-sdk": "^1.35.0",
     "@thalalabs/surf": "^1.8.1",
     "decimal.js": "^10.5.0",
     "isomorphic-ws": "^5.0.0",