@nktkas/hyperliquid 0.15.4 → 0.17.0

package/esm/src/clients/wallet.js

@@ -1,5 +1,5 @@
 import { HyperliquidError } from "../base.js";
-import { signL1Action, signUserSignedAction, } from "../signing.js";
+import { isAbstractEthersSigner, isAbstractEthersV5Signer, isAbstractViemWalletClient, isAbstractWindowEthereum, signL1Action, signUserSignedAction, } from "../signing.js";
 // ——————————————— Errors ———————————————
 /** Error thrown when the API returns an error response. */
 export class ApiRequestError extends HyperliquidError {
@@ -40,23 +40,38 @@ export class ApiRequestError extends HyperliquidError {
     }
 }
 // ——————————————— Client ———————————————
-/**
- * Wallet client for interacting with the Hyperliquid API.
- * @typeParam T The transport used to connect to the Hyperliquid API.
- * @typeParam W The WalletClient/Account ([viem](https://viem.sh/docs/clients/wallet)) or Signer ([ethers.js](https://docs.ethers.io/v6/api/providers/#Signer)) used for signing transactions.
- */
-export class WalletClient {
-    /** Gets the next nonce for signing transactions. */
-    get _nonce() {
+/** Nonce manager for generating unique nonces for signing transactions. */
+class NonceManager {
+    constructor() {
+        /** The last nonce used for signing transactions. */
+        Object.defineProperty(this, "lastNonce", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 0
+        });
+    }
+    /**
+     * Gets the next nonce for signing transactions.
+     * @returns The next nonce.
+     */
+    getNonce() {
         let nonce = Date.now();
-        if (nonce <= this._lastNonce) {
-            nonce = ++this._lastNonce;
+        if (nonce <= this.lastNonce) {
+            nonce = ++this.lastNonce;
         }
         else {
-            this._lastNonce = nonce;
+            this.lastNonce = nonce;
         }
         return nonce;
     }
+}
+/**
+ * Wallet client for interacting with the Hyperliquid API.
+ * @typeParam T The transport used to connect to the Hyperliquid API.
+ * @typeParam W The WalletClient/Account ([viem](https://viem.sh/docs/clients/wallet)) or Signer ([ethers.js](https://docs.ethers.io/v6/api/providers/#Signer)) used for signing transactions.
+ */
+export class WalletClient {
     /**
      * Initialises a new instance.
      * @param args - The parameters for the client.
@@ -142,18 +157,19 @@ export class WalletClient {
             writable: true,
             value: void 0
         });
-        /** The last nonce used for signing transactions. */
-        Object.defineProperty(this, "_lastNonce", {
+        /** Function to get the next nonce for signing transactions. */
+        Object.defineProperty(this, "nonceManager", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: 0
+            value: void 0
         });
         this.transport = args.transport;
         this.wallet = args.wallet;
         this.isTestnet = args.isTestnet ?? false;
         this.defaultVaultAddress = args.defaultVaultAddress;
-        this.signatureChainId = args.signatureChainId ?? (this.isTestnet ? "0x66eee" : "0xa4b1");
+        this.signatureChainId = args.signatureChainId ?? this._guessSignatureChainId;
+        this.nonceManager = args.nonceManager ?? new NonceManager().getNonce;
     }
     // ——————————————— Exchange API ———————————————
     /**
@@ -185,8 +201,10 @@ export class WalletClient {
             ...args,
             type: "approveAgent",
             hyperliquidChain: this.isTestnet ? "Testnet" : "Mainnet",
-            signatureChainId: this.signatureChainId,
-            nonce: args.nonce ?? this._nonce,
+            signatureChainId: typeof this.signatureChainId === "string"
+                ? this.signatureChainId
+                : await this.signatureChainId(),
+            nonce: await this.nonceManager(),
         };
         // Sign the action
         const signature = await signUserSignedAction({
@@ -238,8 +256,10 @@ export class WalletClient {
             ...args,
             type: "approveBuilderFee",
             hyperliquidChain: this.isTestnet ? "Testnet" : "Mainnet",
-            signatureChainId: this.signatureChainId,
-            nonce: args.nonce ?? this._nonce,
+            signatureChainId: typeof this.signatureChainId === "string"
+                ? this.signatureChainId
+                : await this.signatureChainId(),
+            nonce: await this.nonceManager(),
         };
         // Sign the action
         const signature = await signUserSignedAction({
@@ -301,8 +321,9 @@ export class WalletClient {
      */
     async batchModify(args, signal) {
         // Destructure the parameters
-        const { vaultAddress = this.defaultVaultAddress, nonce = this._nonce, ...actionArgs } = args;
+        const { vaultAddress = this.defaultVaultAddress, ...actionArgs } = args;
         // Construct an action
+        const nonce = await this.nonceManager();
         const action = {
             type: "batchModify",
             modifies: actionArgs.modifies.map((modify) => {
@@ -377,8 +398,9 @@ export class WalletClient {
      */
     async cancel(args, signal) {
         // Destructure the parameters
-        const { vaultAddress = this.defaultVaultAddress, nonce = this._nonce, ...actionArgs } = args;
+        const { vaultAddress = this.defaultVaultAddress, ...actionArgs } = args;
         // Construct an action
+        const nonce = await this.nonceManager();
         const action = {
             type: "cancel",
             cancels: actionArgs.cancels.map((cancel) => ({
@@ -401,6 +423,58 @@ export class WalletClient {
         this._validateResponse(response);
         return response;
     }
+    /**
+     * Cancel order(s) by cloid.
+     * @param args - The parameters for the request.
+     * @param signal - An optional abort signal.
+     * @returns Successful variant of {@link CancelResponse} without error statuses.
+     * @throws {ApiRequestError} When the API returns an error response.
+     *
+     * @see https://hyperliquid.gitbook.io/hyperliquid-docs/for-developers/api/exchange-endpoint#cancel-order-s-by-cloid
+     * @example
+     * ```ts
+     * import * as hl from "@nktkas/hyperliquid";
+     * import { privateKeyToAccount } from "viem/accounts";
+     *
+     * const wallet = privateKeyToAccount("0x...");
+     * const transport = new hl.HttpTransport(); // or WebSocketTransport
+     * const client = new hl.WalletClient({ wallet, transport });
+     *
+     * const result = await client.cancelByCloid({
+     *   cancels: [{
+     *     asset: 0,
+     *     cloid: "0x...", // Client Order ID
+     *   }],
+     * });
+     * ```
+     */
+    async cancelByCloid(args, signal) {
+        // Destructure the parameters
+        const { vaultAddress = this.defaultVaultAddress, ...actionArgs } = args;
+        // Construct an action
+        const nonce = await this.nonceManager();
+        const action = {
+            type: "cancelByCloid",
+            cancels: actionArgs.cancels.map((cancel) => ({
+                asset: cancel.asset,
+                cloid: cancel.cloid,
+            })),
+        };
+        // Sign the action
+        const signature = await signL1Action({
+            wallet: this.wallet,
+            action,
+            nonce,
+            isTestnet: this.isTestnet,
+            vaultAddress,
+        });
+        // Send a request
+        const request = { action, signature, nonce, vaultAddress };
+        const response = await this.transport.request("exchange", request, signal);
+        // Validate a response
+        this._validateResponse(response);
+        return response;
+    }
     /**
      * Deposit into staking balance.
      * @param args - The parameters for the request.
@@ -427,8 +501,10 @@ export class WalletClient {
             ...args,
             type: "cDeposit",
             hyperliquidChain: this.isTestnet ? "Testnet" : "Mainnet",
-            signatureChainId: this.signatureChainId,
-            nonce: args.nonce ?? this._nonce,
+            signatureChainId: typeof this.signatureChainId === "string"
+                ? this.signatureChainId
+                : await this.signatureChainId(),
+            nonce: await this.nonceManager(),
         };
         // Sign the action
         const signature = await signUserSignedAction({
@@ -470,10 +546,9 @@ export class WalletClient {
      * const result = await client.claimRewards();
      * ```
      */
-    async claimRewards(args = {}, signal) {
-        // Destructure the parameters
-        const { nonce = this._nonce, } = args;
+    async claimRewards(signal) {
         // Construct an action
+        const nonce = await this.nonceManager();
         const sortedAction = { type: "claimRewards" };
         // Sign the action
         const signature = await signL1Action({
@@ -490,13 +565,13 @@ export class WalletClient {
         return response;
     }
     /**
-     * Cancel order(s) by cloid.
+     * Create a sub-account.
      * @param args - The parameters for the request.
      * @param signal - An optional abort signal.
-     * @returns Successful variant of {@link CancelResponse} without error statuses.
+     * @returns Response for creating a sub-account.
      * @throws {ApiRequestError} When the API returns an error response.
      *
-     * @see https://hyperliquid.gitbook.io/hyperliquid-docs/for-developers/api/exchange-endpoint#cancel-order-s-by-cloid
+     * @see null - no documentation
      * @example
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
@@ -506,24 +581,15 @@ export class WalletClient {
      * const transport = new hl.HttpTransport(); // or WebSocketTransport
      * const client = new hl.WalletClient({ wallet, transport });
      *
-     * const result = await client.cancelByCloid({
-     *   cancels: [{
-     *     asset: 0,
-     *     cloid: "0x...", // Client Order ID
-     *   }],
-     * });
+     * const result = await client.createSubAccount({ name: "subAccountName" });
      * ```
      */
-    async cancelByCloid(args, signal) {
-        // Destructure the parameters
-        const { vaultAddress = this.defaultVaultAddress, nonce = this._nonce, ...actionArgs } = args;
+    async createSubAccount(args, signal) {
         // Construct an action
+        const nonce = await this.nonceManager();
         const action = {
-            type: "cancelByCloid",
-            cancels: actionArgs.cancels.map((cancel) => ({
-                asset: cancel.asset,
-                cloid: cancel.cloid,
-            })),
+            type: "createSubAccount",
+            name: args.name,
         };
         // Sign the action
         const signature = await signL1Action({
@@ -531,72 +597,22 @@ export class WalletClient {
             action,
             nonce,
             isTestnet: this.isTestnet,
-            vaultAddress,
         });
         // Send a request
-        const request = { action, signature, nonce, vaultAddress };
-        const response = await this.transport.request("exchange", request, signal);
-        // Validate a response
-        this._validateResponse(response);
-        return response;
-    }
-    /**
-     * Withdraw from staking balance.
-     * @param args - The parameters for the request.
-     * @param signal - An optional abort signal.
-     * @returns Successful response without specific data.
-     * @throws {ApiRequestError} When the API returns an error response.
-     *
-     * @see https://hyperliquid.gitbook.io/hyperliquid-docs/for-developers/api/exchange-endpoint#withdraw-from-staking
-     * @example
-     * ```ts
-     * import * as hl from "@nktkas/hyperliquid";
-     * import { privateKeyToAccount } from "viem/accounts";
-     *
-     * const wallet = privateKeyToAccount("0x...");
-     * const transport = new hl.HttpTransport(); // or WebSocketTransport
-     * const client = new hl.WalletClient({ wallet, transport });
-     *
-     * const result = await client.cWithdraw({ wei: 1 * 1e8 });
-     * ```
-     */
-    async cWithdraw(args, signal) {
-        // Construct an action
-        const action = {
-            ...args,
-            type: "cWithdraw",
-            hyperliquidChain: this.isTestnet ? "Testnet" : "Mainnet",
-            signatureChainId: this.signatureChainId,
-            nonce: args.nonce ?? this._nonce,
-        };
-        // Sign the action
-        const signature = await signUserSignedAction({
-            wallet: this.wallet,
-            action,
-            types: {
-                "HyperliquidTransaction:CWithdraw": [
-                    { name: "hyperliquidChain", type: "string" },
-                    { name: "wei", type: "uint64" },
-                    { name: "nonce", type: "uint64" },
-                ],
-            },
-            chainId: parseInt(action.signatureChainId, 16),
-        });
-        // Send a request
-        const request = { action, signature, nonce: action.nonce };
+        const request = { action, signature, nonce };
         const response = await this.transport.request("exchange", request, signal);
         // Validate a response
         this._validateResponse(response);
         return response;
     }
     /**
-     * Configure block type for EVM transactions.
+     * Create a vault.
      * @param args - The parameters for the request.
      * @param signal - An optional abort signal.
-     * @returns Response for creating a sub-account.
+     * @returns Response for creating a vault.
      * @throws {ApiRequestError} When the API returns an error response.
      *
-     * @see https://hyperliquid.gitbook.io/hyperliquid-docs/for-developers/evm/dual-block-architecture
+     * @see null - no documentation
      * @example
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
@@ -606,16 +622,22 @@ export class WalletClient {
      * const transport = new hl.HttpTransport(); // or WebSocketTransport
      * const client = new hl.WalletClient({ wallet, transport });
      *
-     * const result = await client.evmUserModify({ usingBigBlocks: true });
+     * const result = await client.createVault({
+     *   name: "VaultName",
+     *   description: "This is an example of a vault description",
+     *   initialUsd: 100 * 1e6,
+     * });
      * ```
      */
-    async evmUserModify(args, signal) {
-        // Destructure the parameters
-        const { nonce = this._nonce, ...actionArgs } = args;
+    async createVault(args, signal) {
         // Construct an action
+        const nonce = await this.nonceManager();
         const action = {
-            type: "evmUserModify",
-            usingBigBlocks: actionArgs.usingBigBlocks,
+            type: "createVault",
+            name: args.name,
+            description: args.description,
+            initialUsd: args.initialUsd,
+            nonce,
         };
         // Sign the action
         const signature = await signL1Action({
@@ -632,13 +654,13 @@ export class WalletClient {
         return response;
     }
     /**
-     * Create a sub-account.
+     * Withdraw from staking balance.
      * @param args - The parameters for the request.
      * @param signal - An optional abort signal.
-     * @returns Response for creating a sub-account.
+     * @returns Successful response without specific data.
      * @throws {ApiRequestError} When the API returns an error response.
      *
-     * @see null - no documentation
+     * @see https://hyperliquid.gitbook.io/hyperliquid-docs/for-developers/api/exchange-endpoint#withdraw-from-staking
      * @example
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
@@ -648,39 +670,48 @@ export class WalletClient {
      * const transport = new hl.HttpTransport(); // or WebSocketTransport
      * const client = new hl.WalletClient({ wallet, transport });
      *
-     * const result = await client.createSubAccount({ name: "subAccountName" });
+     * const result = await client.cWithdraw({ wei: 1 * 1e8 });
      * ```
      */
-    async createSubAccount(args, signal) {
-        // Destructure the parameters
-        const { nonce = this._nonce, ...actionArgs } = args;
+    async cWithdraw(args, signal) {
         // Construct an action
         const action = {
-            type: "createSubAccount",
-            name: actionArgs.name,
+            ...args,
+            type: "cWithdraw",
+            hyperliquidChain: this.isTestnet ? "Testnet" : "Mainnet",
+            signatureChainId: typeof this.signatureChainId === "string"
+                ? this.signatureChainId
+                : await this.signatureChainId(),
+            nonce: await this.nonceManager(),
         };
         // Sign the action
-        const signature = await signL1Action({
+        const signature = await signUserSignedAction({
             wallet: this.wallet,
             action,
-            nonce,
-            isTestnet: this.isTestnet,
+            types: {
+                "HyperliquidTransaction:CWithdraw": [
+                    { name: "hyperliquidChain", type: "string" },
+                    { name: "wei", type: "uint64" },
+                    { name: "nonce", type: "uint64" },
+                ],
+            },
+            chainId: parseInt(action.signatureChainId, 16),
         });
         // Send a request
-        const request = { action, signature, nonce };
+        const request = { action, signature, nonce: action.nonce };
         const response = await this.transport.request("exchange", request, signal);
         // Validate a response
         this._validateResponse(response);
         return response;
     }
     /**
-     * Create a vault.
+     * Configure block type for EVM transactions.
      * @param args - The parameters for the request.
      * @param signal - An optional abort signal.
-     * @returns Response for creating a vault.
+     * @returns Response for creating a sub-account.
      * @throws {ApiRequestError} When the API returns an error response.
      *
-     * @see null - no documentation
+     * @see https://hyperliquid.gitbook.io/hyperliquid-docs/for-developers/evm/dual-block-architecture
      * @example
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
@@ -690,23 +721,15 @@ export class WalletClient {
      * const transport = new hl.HttpTransport(); // or WebSocketTransport
      * const client = new hl.WalletClient({ wallet, transport });
      *
-     * const result = await client.createVault({
-     *   name: "VaultName",
-     *   description: "This is an example of a vault description",
-     *   initialUsd: 100 * 1e6,
-     * });
+     * const result = await client.evmUserModify({ usingBigBlocks: true });
      * ```
      */
-    async createVault(args, signal) {
-        // Destructure the parameters
-        const { nonce = this._nonce, ...actionArgs } = args;
+    async evmUserModify(args, signal) {
         // Construct an action
+        const nonce = await this.nonceManager();
         const action = {
-            type: "createVault",
-            name: actionArgs.name,
-            description: actionArgs.description,
-            initialUsd: actionArgs.initialUsd,
-            nonce,
+            type: "evmUserModify",
+            usingBigBlocks: args.usingBigBlocks,
         };
         // Sign the action
         const signature = await signL1Action({
@@ -759,8 +782,9 @@ export class WalletClient {
      */
     async modify(args, signal) {
         // Destructure the parameters
-        const { vaultAddress = this.defaultVaultAddress, nonce = this._nonce, ...actionArgs } = args;
+        const { vaultAddress = this.defaultVaultAddress, ...actionArgs } = args;
         // Construct an action
+        const nonce = await this.nonceManager();
         const action = {
             type: "modify",
             oid: actionArgs.oid,
@@ -840,8 +864,9 @@ export class WalletClient {
      */
     async order(args, signal) {
         // Destructure the parameters
-        const { vaultAddress = this.defaultVaultAddress, nonce = this._nonce, ...actionArgs } = args;
+        const { vaultAddress = this.defaultVaultAddress, ...actionArgs } = args;
         // Construct an action
+        const nonce = await this.nonceManager();
         const action = {
             type: "order",
             orders: actionArgs.orders.map((order) => {
@@ -895,6 +920,47 @@ export class WalletClient {
         this._validateResponse(response);
         return response;
     }
+    /**
+     * Reserve additional rate-limited actions for a fee.
+     * @param args - The parameters for the request.
+     * @param signal - An optional abort signal.
+     * @returns Successful response indicating the weight reservation.
+     * @throws {ApiRequestError} When the API returns an error response.
+     *
+     * @see https://hyperliquid.gitbook.io/hyperliquid-docs/for-developers/api/exchange-endpoint#reserve-additional-actions
+     * @example
+     * ```ts
+     * import * as hl from "@nktkas/hyperliquid";
+     * import { privateKeyToAccount } from "viem/accounts";
+     *
+     * const wallet = privateKeyToAccount("0x...");
+     * const transport = new hl.HttpTransport(); // or WebSocketTransport
+     * const client = new hl.WalletClient({ wallet, transport });
+     *
+     * const result = await client.reserveRequestWeight({ weight: 10 });
+     * ```
+     */
+    async reserveRequestWeight(args, signal) {
+        // Construct an action
+        const nonce = await this.nonceManager();
+        const action = {
+            type: "reserveRequestWeight",
+            weight: args.weight,
+        };
+        // Sign the action
+        const signature = await signL1Action({
+            wallet: this.wallet,
+            action,
+            nonce,
+            isTestnet: this.isTestnet,
+        });
+        // Send a request
+        const request = { action, signature, nonce };
+        const response = await this.transport.request("exchange", request, signal);
+        // Validate a response
+        this._validateResponse(response);
+        return response;
+    }
     /**
      * Schedule a time to cancel all open orders.
      * @param args - The parameters for the request.
@@ -917,8 +983,9 @@ export class WalletClient {
      */
     async scheduleCancel(args = {}, signal) {
         // Destructure the parameters
-        const { vaultAddress = this.defaultVaultAddress, nonce = this._nonce, ...actionArgs } = args;
+        const { vaultAddress = this.defaultVaultAddress, ...actionArgs } = args;
         // Construct an action
+        const nonce = await this.nonceManager();
         const action = {
             type: "scheduleCancel",
             time: actionArgs.time,
@@ -961,12 +1028,11 @@ export class WalletClient {
      * ```
      */
     async setDisplayName(args, signal) {
-        // Destructure the parameters
-        const { nonce = this._nonce, ...actionArgs } = args;
         // Construct an action
+        const nonce = await this.nonceManager();
         const action = {
             type: "setDisplayName",
-            displayName: actionArgs.displayName,
+            displayName: args.displayName,
         };
         // Sign the action
         const signature = await signL1Action({
@@ -1003,12 +1069,11 @@ export class WalletClient {
      * ```
      */
     async setReferrer(args, signal) {
-        // Destructure the parameters
-        const { nonce = this._nonce, ...actionArgs } = args;
         // Construct an action
+        const nonce = await this.nonceManager();
         const action = {
             type: "setReferrer",
-            code: actionArgs.code,
+            code: args.code,
         };
         // Sign the action
         const signature = await signL1Action({
@@ -1057,48 +1122,47 @@ export class WalletClient {
      * ```
      */
     async spotDeploy(args, signal) {
-        // Destructure the parameters
-        const { nonce = this._nonce, ...actionArgs } = args;
         // Construct an action
+        const nonce = await this.nonceManager();
         let action;
-        if ("registerToken2" in actionArgs) {
+        if ("registerToken2" in args) {
             action = {
                 type: "spotDeploy",
                 registerToken2: {
                     spec: {
-                        name: actionArgs.registerToken2.spec.name,
-                        szDecimals: actionArgs.registerToken2.spec.szDecimals,
-                        weiDecimals: actionArgs.registerToken2.spec.weiDecimals,
+                        name: args.registerToken2.spec.name,
+                        szDecimals: args.registerToken2.spec.szDecimals,
+                        weiDecimals: args.registerToken2.spec.weiDecimals,
                     },
-                    maxGas: actionArgs.registerToken2.maxGas,
-                    fullName: actionArgs.registerToken2.fullName,
+                    maxGas: args.registerToken2.maxGas,
+                    fullName: args.registerToken2.fullName,
                 },
             };
         }
-        else if ("userGenesis" in actionArgs) {
+        else if ("userGenesis" in args) {
             action = {
                 type: "spotDeploy",
                 userGenesis: {
-                    token: actionArgs.userGenesis.token,
-                    userAndWei: actionArgs.userGenesis.userAndWei,
-                    existingTokenAndWei: actionArgs.userGenesis.existingTokenAndWei,
+                    token: args.userGenesis.token,
+                    userAndWei: args.userGenesis.userAndWei,
+                    existingTokenAndWei: args.userGenesis.existingTokenAndWei,
                 },
             };
         }
-        else if ("genesis" in actionArgs) {
+        else if ("genesis" in args) {
             action = {
                 type: "spotDeploy",
                 genesis: {
-                    token: actionArgs.genesis.token,
-                    maxSupply: actionArgs.genesis.maxSupply,
+                    token: args.genesis.token,
+                    maxSupply: args.genesis.maxSupply,
                 },
             };
         }
-        else if ("registerSpot" in actionArgs) {
+        else if ("registerSpot" in args) {
             action = {
                 type: "spotDeploy",
                 registerSpot: {
-                    tokens: actionArgs.registerSpot.tokens,
+                    tokens: args.registerSpot.tokens,
                 },
             };
         }
@@ -1106,11 +1170,11 @@ export class WalletClient {
             action = {
                 type: "spotDeploy",
                 registerHyperliquidity: {
-                    spot: actionArgs.registerHyperliquidity.spot,
-                    startPx: actionArgs.registerHyperliquidity.startPx,
-                    orderSz: actionArgs.registerHyperliquidity.orderSz,
-                    nOrders: actionArgs.registerHyperliquidity.nOrders,
-                    nSeededLevels: actionArgs.registerHyperliquidity.nSeededLevels,
+                    spot: args.registerHyperliquidity.spot,
+                    startPx: args.registerHyperliquidity.startPx,
+                    orderSz: args.registerHyperliquidity.orderSz,
+                    nOrders: args.registerHyperliquidity.nOrders,
+                    nSeededLevels: args.registerHyperliquidity.nSeededLevels,
                 },
             };
         }
@@ -1158,8 +1222,10 @@ export class WalletClient {
             ...args,
             type: "spotSend",
             hyperliquidChain: this.isTestnet ? "Testnet" : "Mainnet",
-            signatureChainId: this.signatureChainId,
-            time: args.time ?? this._nonce,
+            signatureChainId: typeof this.signatureChainId === "string"
+                ? this.signatureChainId
+                : await this.signatureChainId(),
+            time: await this.nonceManager(),
         };
         // Sign the action
         const signature = await signUserSignedAction({
@@ -1206,13 +1272,12 @@ export class WalletClient {
      * ```
      */
     async spotUser(args, signal) {
-        // Destructure the parameters
-        const { nonce = this._nonce, ...actionArgs } = args;
         // Construct an action
+        const nonce = await this.nonceManager();
         const action = {
             type: "spotUser",
             toggleSpotDusting: {
-                optOut: actionArgs.toggleSpotDusting.optOut,
+                optOut: args.toggleSpotDusting.optOut,
             },
         };
         // Sign the action
@@ -1255,15 +1320,14 @@ export class WalletClient {
      * ```
      */
     async subAccountSpotTransfer(args, signal) {
-        // Destructure the parameters
-        const { nonce = this._nonce, ...actionArgs } = args;
         // Construct an action
+        const nonce = await this.nonceManager();
         const action = {
             type: "subAccountSpotTransfer",
-            subAccountUser: actionArgs.subAccountUser,
-            isDeposit: actionArgs.isDeposit,
-            token: actionArgs.token,
-            amount: actionArgs.amount,
+            subAccountUser: args.subAccountUser,
+            isDeposit: args.isDeposit,
+            token: args.token,
+            amount: args.amount,
         };
         // Sign the action
         const signature = await signL1Action({
@@ -1304,14 +1368,13 @@ export class WalletClient {
      * ```
      */
     async subAccountTransfer(args, signal) {
-        // Destructure the parameters
-        const { nonce = this._nonce, ...actionArgs } = args;
         // Construct an action
+        const nonce = await this.nonceManager();
         const action = {
             type: "subAccountTransfer",
-            subAccountUser: actionArgs.subAccountUser,
-            isDeposit: actionArgs.isDeposit,
-            usd: actionArgs.usd,
+            subAccountUser: args.subAccountUser,
+            isDeposit: args.isDeposit,
+            usd: args.usd,
         };
         // Sign the action
         const signature = await signL1Action({
@@ -1357,8 +1420,10 @@ export class WalletClient {
             ...args,
             type: "tokenDelegate",
             hyperliquidChain: this.isTestnet ? "Testnet" : "Mainnet",
-            signatureChainId: this.signatureChainId,
-            nonce: args.nonce ?? this._nonce,
+            signatureChainId: typeof this.signatureChainId === "string"
+                ? this.signatureChainId
+                : await this.signatureChainId(),
+            nonce: await this.nonceManager(),
         };
         // Sign the action
         const signature = await signUserSignedAction({
@@ -1407,8 +1472,9 @@ export class WalletClient {
      */
     async twapCancel(args, signal) {
         // Destructure the parameters
-        const { vaultAddress = this.defaultVaultAddress, nonce = this._nonce, ...actionArgs } = args;
+        const { vaultAddress = this.defaultVaultAddress, ...actionArgs } = args;
         // Construct an action
+        const nonce = await this.nonceManager();
         const action = {
             type: "twapCancel",
             a: actionArgs.a,
@@ -1458,8 +1524,9 @@ export class WalletClient {
      */
     async twapOrder(args, signal) {
         // Destructure the parameters
-        const { vaultAddress = this.defaultVaultAddress, nonce = this._nonce, ...actionArgs } = args;
+        const { vaultAddress = this.defaultVaultAddress, ...actionArgs } = args;
         // Construct an action
+        const nonce = await this.nonceManager();
         const action = {
             type: "twapOrder",
             twap: {
@@ -1512,8 +1579,9 @@ export class WalletClient {
      */
     async updateIsolatedMargin(args, signal) {
         // Destructure the parameters
-        const { vaultAddress = this.defaultVaultAddress, nonce = this._nonce, ...actionArgs } = args;
+        const { vaultAddress = this.defaultVaultAddress, ...actionArgs } = args;
         // Construct an action
+        const nonce = await this.nonceManager();
         const action = {
             type: "updateIsolatedMargin",
             asset: actionArgs.asset,
@@ -1561,8 +1629,9 @@ export class WalletClient {
      */
     async updateLeverage(args, signal) {
         // Destructure the parameters
-        const { vaultAddress = this.defaultVaultAddress, nonce = this._nonce, ...actionArgs } = args;
+        const { vaultAddress = this.defaultVaultAddress, ...actionArgs } = args;
         // Construct an action
+        const nonce = await this.nonceManager();
         const action = {
             type: "updateLeverage",
             asset: actionArgs.asset,
@@ -1613,8 +1682,10 @@ export class WalletClient {
             ...args,
             type: "usdClassTransfer",
             hyperliquidChain: this.isTestnet ? "Testnet" : "Mainnet",
-            signatureChainId: this.signatureChainId,
-            nonce: args.nonce ?? this._nonce,
+            signatureChainId: typeof this.signatureChainId === "string"
+                ? this.signatureChainId
+                : await this.signatureChainId(),
+            nonce: await this.nonceManager(),
         };
         // Sign the action
         const signature = await signUserSignedAction({
@@ -1666,8 +1737,10 @@ export class WalletClient {
             ...args,
             type: "usdSend",
             hyperliquidChain: this.isTestnet ? "Testnet" : "Mainnet",
-            signatureChainId: this.signatureChainId,
-            time: args.time ?? this._nonce,
+            signatureChainId: typeof this.signatureChainId === "string"
+                ? this.signatureChainId
+                : await this.signatureChainId(),
+            time: await this.nonceManager(),
         };
         // Sign the action
         const signature = await signUserSignedAction({
@@ -1714,13 +1787,12 @@ export class WalletClient {
      * ```
      */
     async vaultDistribute(args, signal) {
-        // Destructure the parameters
-        const { nonce = this._nonce, ...actionArgs } = args;
         // Construct an action
+        const nonce = await this.nonceManager();
         const action = {
             type: "vaultDistribute",
-            vaultAddress: actionArgs.vaultAddress,
-            usd: actionArgs.usd,
+            vaultAddress: args.vaultAddress,
+            usd: args.usd,
         };
         // Sign the action
         const signature = await signL1Action({
@@ -1761,14 +1833,13 @@ export class WalletClient {
      * ```
      */
     async vaultModify(args, signal) {
-        // Destructure the parameters
-        const { nonce = this._nonce, ...actionArgs } = args;
         // Construct an action
+        const nonce = await this.nonceManager();
         const action = {
             type: "vaultModify",
-            vaultAddress: actionArgs.vaultAddress,
-            allowDeposits: actionArgs.allowDeposits,
-            alwaysCloseOnWithdraw: actionArgs.alwaysCloseOnWithdraw,
+            vaultAddress: args.vaultAddress,
+            allowDeposits: args.allowDeposits,
+            alwaysCloseOnWithdraw: args.alwaysCloseOnWithdraw,
         };
         // Sign the action
         const signature = await signL1Action({
@@ -1809,14 +1880,13 @@ export class WalletClient {
      * ```
      */
     async vaultTransfer(args, signal) {
-        // Destructure the parameters
-        const { nonce = this._nonce, ...actionArgs } = args;
         // Construct an action
+        const nonce = await this.nonceManager();
         const action = {
             type: "vaultTransfer",
-            vaultAddress: actionArgs.vaultAddress,
-            isDeposit: actionArgs.isDeposit,
-            usd: actionArgs.usd,
+            vaultAddress: args.vaultAddress,
+            isDeposit: args.isDeposit,
+            usd: args.usd,
         };
         // Sign the action
         const signature = await signL1Action({
@@ -1861,8 +1931,10 @@ export class WalletClient {
             ...args,
             type: "withdraw3",
             hyperliquidChain: this.isTestnet ? "Testnet" : "Mainnet",
-            signatureChainId: this.signatureChainId,
-            time: args.time ?? this._nonce,
+            signatureChainId: typeof this.signatureChainId === "string"
+                ? this.signatureChainId
+                : await this.signatureChainId(),
+            time: await this.nonceManager(),
         };
         // Sign the action
         const signature = await signUserSignedAction({
@@ -1894,6 +1966,31 @@ export class WalletClient {
         const newFrac = fracPart.replace(/0+$/, "");
         return newFrac ? `${intPart}.${newFrac}` : intPart;
     }
+    /** Guesses the chain ID based on the wallet type or the isTestnet flag. */
+    async _guessSignatureChainId() {
+        // Trying to get chain ID of the wallet
+        if (isAbstractViemWalletClient(this.wallet)) {
+            if ("getChainId" in this.wallet && typeof this.wallet.getChainId === "function") {
+                const chainId = await this.wallet.getChainId();
+                return `0x${chainId.toString(16)}`;
+            }
+        }
+        else if (isAbstractEthersSigner(this.wallet) || isAbstractEthersV5Signer(this.wallet)) {
+            if ("provider" in this.wallet &&
+                typeof this.wallet.provider === "object" && this.wallet.provider !== null &&
+                "getNetwork" in this.wallet.provider &&
+                typeof this.wallet.provider.getNetwork === "function") {
+                const network = await this.wallet.provider.getNetwork();
+                return `0x${network.chainId.toString(16)}`;
+            }
+        }
+        else if (isAbstractWindowEthereum(this.wallet)) {
+            const [chainId] = await this.wallet.request({ method: "eth_chainId", params: [] });
+            return chainId;
+        }
+        // Attempt to guess chain ID based on isTestnet
+        return this.isTestnet ? "0x66eee" : "0xa4b1";
+    }
     /** Validate a response from the API. */
     _validateResponse(response) {
         if (response.status === "err") {