@nktkas/hyperliquid 0.16.0 → 0.17.1

package/script/src/clients/wallet.js

@@ -12,7 +12,6 @@
     exports.WalletClient = exports.ApiRequestError = void 0;
     const base_js_1 = require("../base.js");
     const signing_js_1 = require("../signing.js");
-    // ——————————————— Errors ———————————————
     /** Error thrown when the API returns an error response. */
     class ApiRequestError extends base_js_1.HyperliquidError {
         constructor(response) {
@@ -52,24 +51,38 @@
         }
     }
     exports.ApiRequestError = ApiRequestError;
-    // ——————————————— 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.
-     */
-    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.
+     */
+    class WalletClient {
         /**
          * Initialises a new instance.
          * @param args - The parameters for the client.
@@ -155,43 +168,20 @@
                 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 ?? (async () => {
-                // Trying to get chain id of the wallet
-                if ((0, signing_js_1.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 ((0, signing_js_1.isAbstractEthersSigner)(this.wallet) || (0, signing_js_1.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 ((0, signing_js_1.isAbstractWindowEthereum)(this.wallet)) {
-                    const [chainId] = await this.wallet.request({ method: "eth_chainId", params: [] });
-                    return chainId;
-                }
-                // Trying to guess chain id based on isTestnet
-                return this.isTestnet ? "0x66eee" : "0xa4b1";
-            });
+            this.signatureChainId = args.signatureChainId ?? this._guessSignatureChainId;
+            this.nonceManager = args.nonceManager ?? new NonceManager().getNonce;
         }
-        // ——————————————— Exchange API ———————————————
         /**
          * Approve an agent to sign on behalf of the master or sub-accounts.
          * @param args - The parameters for the request.
@@ -209,10 +199,7 @@
          * const transport = new hl.HttpTransport(); // or WebSocketTransport
          * const client = new hl.WalletClient({ wallet, transport });
          *
-         * const result = await client.approveAgent({
-         *   agentAddress: "0x...",
-         *   agentName: "agentName",
-         * });
+         * const result = await client.approveAgent({ agentAddress: "0x...", agentName: "agentName" });
          * ```
          */
         async approveAgent(args, signal) {
@@ -224,7 +211,7 @@
                 signatureChainId: typeof this.signatureChainId === "string"
                     ? this.signatureChainId
                     : await this.signatureChainId(),
-                nonce: args.nonce ?? this._nonce,
+                nonce: await this.nonceManager(),
             };
             // Sign the action
             const signature = await (0, signing_js_1.signUserSignedAction)({
@@ -264,10 +251,7 @@
          * const transport = new hl.HttpTransport(); // or WebSocketTransport
          * const client = new hl.WalletClient({ wallet, transport });
          *
-         * const result = await client.approveBuilderFee({
-         *   maxFeeRate: "0.01%",
-         *   builder: "0x...",
-         * });
+         * const result = await client.approveBuilderFee({ maxFeeRate: "0.01%", builder: "0x..." });
          * ```
          */
         async approveBuilderFee(args, signal) {
@@ -279,7 +263,7 @@
                 signatureChainId: typeof this.signatureChainId === "string"
                     ? this.signatureChainId
                     : await this.signatureChainId(),
-                nonce: args.nonce ?? this._nonce,
+                nonce: await this.nonceManager(),
             };
             // Sign the action
             const signature = await (0, signing_js_1.signUserSignedAction)({
@@ -321,7 +305,7 @@
          *
          * const result = await client.batchModify({
          *   modifies: [{
-         *     oid: 123, // Order ID
+         *     oid: 123,
          *     order: {
          *       a: 0, // Asset index
          *       b: true, // Buy order
@@ -341,8 +325,9 @@
          */
         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) => {
@@ -417,8 +402,9 @@
          */
         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) => ({
@@ -441,6 +427,57 @@
             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..." },
+         *   ],
+         * });
+         * ```
+         */
+        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 (0, signing_js_1.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.
@@ -470,7 +507,7 @@
                 signatureChainId: typeof this.signatureChainId === "string"
                     ? this.signatureChainId
                     : await this.signatureChainId(),
-                nonce: args.nonce ?? this._nonce,
+                nonce: await this.nonceManager(),
             };
             // Sign the action
             const signature = await (0, signing_js_1.signUserSignedAction)({
@@ -512,10 +549,9 @@
          * 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 (0, signing_js_1.signL1Action)({
@@ -532,13 +568,13 @@
             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";
@@ -548,24 +584,15 @@
          * 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 (0, signing_js_1.signL1Action)({
@@ -573,74 +600,22 @@
                 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: typeof this.signatureChainId === "string"
-                    ? this.signatureChainId
-                    : await this.signatureChainId(),
-                nonce: args.nonce ?? this._nonce,
-            };
-            // Sign the action
-            const signature = await (0, signing_js_1.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";
@@ -650,16 +625,22 @@
          * 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 (0, signing_js_1.signL1Action)({
@@ -676,13 +657,13 @@
             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";
@@ -692,39 +673,48 @@
          * 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 (0, signing_js_1.signL1Action)({
+            const signature = await (0, signing_js_1.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";
@@ -734,23 +724,15 @@
          * 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 (0, signing_js_1.signL1Action)({
@@ -784,7 +766,7 @@
          * const client = new hl.WalletClient({ wallet, transport });
          *
          * const result = await client.modify({
-         *   oid: 123, // Order ID
+         *   oid: 123,
          *   order: {
          *     a: 0, // Asset index
          *     b: true, // Buy order
@@ -803,8 +785,9 @@
          */
         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,
@@ -884,8 +867,9 @@
          */
         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) => {
@@ -939,6 +923,47 @@
             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 (0, signing_js_1.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.
@@ -961,8 +986,9 @@
          */
         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,
@@ -1005,12 +1031,11 @@
          * ```
          */
         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 (0, signing_js_1.signL1Action)({
@@ -1047,12 +1072,11 @@
          * ```
          */
         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 (0, signing_js_1.signL1Action)({
@@ -1086,7 +1110,6 @@
          * const transport = new hl.HttpTransport(); // or WebSocketTransport
          * const client = new hl.WalletClient({ wallet, transport });
          *
-         * // Unknown what the successful response will be
          * const result = await client.spotDeploy({
          *   registerToken2: {
          *     spec: {
@@ -1101,48 +1124,47 @@
          * ```
          */
         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,
                     },
                 };
             }
@@ -1150,11 +1172,11 @@
                 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,
                     },
                 };
             }
@@ -1179,7 +1201,7 @@
          * @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#l1-spot-transfer
+         * @see https://hyperliquid.gitbook.io/hyperliquid-docs/for-developers/api/exchange-endpoint#core-spot-transfer
          * @example
          * ```ts
          * import * as hl from "@nktkas/hyperliquid";
@@ -1205,7 +1227,7 @@
                 signatureChainId: typeof this.signatureChainId === "string"
                     ? this.signatureChainId
                     : await this.signatureChainId(),
-                time: args.time ?? this._nonce,
+                time: await this.nonceManager(),
             };
             // Sign the action
             const signature = await (0, signing_js_1.signUserSignedAction)({
@@ -1246,19 +1268,16 @@
          * const transport = new hl.HttpTransport(); // or WebSocketTransport
          * const client = new hl.WalletClient({ wallet, transport });
          *
-         * const result = await client.spotUser({
-         *   toggleSpotDusting: { optOut: false },
-         * });
+         * const result = await client.spotUser({ toggleSpotDusting: { optOut: false } });
          * ```
          */
         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
@@ -1301,15 +1320,14 @@
          * ```
          */
         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 (0, signing_js_1.signL1Action)({
@@ -1350,14 +1368,13 @@
          * ```
          */
         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 (0, signing_js_1.signL1Action)({
@@ -1406,7 +1423,7 @@
                 signatureChainId: typeof this.signatureChainId === "string"
                     ? this.signatureChainId
                     : await this.signatureChainId(),
-                nonce: args.nonce ?? this._nonce,
+                nonce: await this.nonceManager(),
             };
             // Sign the action
             const signature = await (0, signing_js_1.signUserSignedAction)({
@@ -1455,8 +1472,9 @@
          */
         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,
@@ -1506,8 +1524,9 @@
          */
         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: {
@@ -1551,17 +1570,14 @@
          * const transport = new hl.HttpTransport(); // or WebSocketTransport
          * const client = new hl.WalletClient({ wallet, transport });
          *
-         * const result = await client.updateIsolatedMargin({
-         *   asset: 0,
-         *   isBuy: true, // Add to long position
-         *   ntli: 1, // Add 1 USD margin (integer only)
-         * });
+         * const result = await client.updateIsolatedMargin({ asset: 0, isBuy: true, ntli: 1 * 1e6 });
          * ```
          */
         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,
@@ -1600,17 +1616,14 @@
          * const transport = new hl.HttpTransport(); // or WebSocketTransport
          * const client = new hl.WalletClient({ wallet, transport });
          *
-         * const result = await client.updateLeverage({
-         *   asset: 0,
-         *   isCross: true,
-         *   leverage: 5,
-         * });
+         * const result = await client.updateLeverage({ asset: 0, isCross: true, leverage: 5 });
          * ```
          */
         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,
@@ -1649,10 +1662,7 @@
          * const transport = new hl.HttpTransport(); // or WebSocketTransport
          * const client = new hl.WalletClient({ wallet, transport });
          *
-         * const result = await client.usdClassTransfer({
-         *   amount: "1",
-         *   toPerp: true, // Transfer from Spot to Perp
-         * });
+         * const result = await client.usdClassTransfer({ amount: "1", toPerp: true });
          * ```
          */
         async usdClassTransfer(args, signal) {
@@ -1664,7 +1674,7 @@
                 signatureChainId: typeof this.signatureChainId === "string"
                     ? this.signatureChainId
                     : await this.signatureChainId(),
-                nonce: args.nonce ?? this._nonce,
+                nonce: await this.nonceManager(),
             };
             // Sign the action
             const signature = await (0, signing_js_1.signUserSignedAction)({
@@ -1694,7 +1704,7 @@
          * @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#l1-usdc-transfer
+         * @see https://hyperliquid.gitbook.io/hyperliquid-docs/for-developers/api/exchange-endpoint#core-usdc-transfer
          * @example
          * ```ts
          * import * as hl from "@nktkas/hyperliquid";
@@ -1704,10 +1714,7 @@
          * const transport = new hl.HttpTransport(); // or WebSocketTransport
          * const client = new hl.WalletClient({ wallet, transport });
          *
-         * const result = await client.usdSend({
-         *   destination: "0x...",
-         *   amount: "1",
-         * });
+         * const result = await client.usdSend({ destination: "0x...", amount: "1" });
          * ```
          */
         async usdSend(args, signal) {
@@ -1719,7 +1726,7 @@
                 signatureChainId: typeof this.signatureChainId === "string"
                     ? this.signatureChainId
                     : await this.signatureChainId(),
-                time: args.time ?? this._nonce,
+                time: await this.nonceManager(),
             };
             // Sign the action
             const signature = await (0, signing_js_1.signUserSignedAction)({
@@ -1759,20 +1766,16 @@
          * const transport = new hl.HttpTransport(); // or WebSocketTransport
          * const client = new hl.WalletClient({ wallet, transport });
          *
-         * const result = await client.vaultDistribute({
-         *   vaultAddress: "0x...",
-         *   usd: 10 * 1e6,
-         * });
+         * const result = await client.vaultDistribute({ vaultAddress: "0x...", usd: 10 * 1e6 });
          * ```
          */
         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 (0, signing_js_1.signL1Action)({
@@ -1813,14 +1816,13 @@
          * ```
          */
         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 (0, signing_js_1.signL1Action)({
@@ -1861,14 +1863,13 @@
          * ```
          */
         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 (0, signing_js_1.signL1Action)({
@@ -1901,10 +1902,7 @@
          * const transport = new hl.HttpTransport(); // or WebSocketTransport
          * const client = new hl.WalletClient({ wallet, transport });
          *
-         * const result = await client.withdraw3({
-         *   destination: "0x...",
-         *   amount: "1",
-         * });
+         * const result = await client.withdraw3({ destination: "0x...", amount: "1" });
          * ```
          */
         async withdraw3(args, signal) {
@@ -1916,7 +1914,7 @@
                 signatureChainId: typeof this.signatureChainId === "string"
                     ? this.signatureChainId
                     : await this.signatureChainId(),
-                time: args.time ?? this._nonce,
+                time: await this.nonceManager(),
             };
             // Sign the action
             const signature = await (0, signing_js_1.signUserSignedAction)({
@@ -1939,7 +1937,6 @@
             this._validateResponse(response);
             return response;
         }
-        // ——————————————— Private methods ———————————————
         /** Formats a decimal number as a string, removing trailing zeros. */
         _formatDecimal(numStr) {
             if (!numStr.includes("."))
@@ -1948,6 +1945,31 @@
             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 ((0, signing_js_1.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 ((0, signing_js_1.isAbstractEthersSigner)(this.wallet) || (0, signing_js_1.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 ((0, signing_js_1.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") {