@nktkas/hyperliquid 0.23.0 → 0.24.0

package/esm/src/clients/exchange.js

@@ -1,6 +1,6 @@
 import { HyperliquidError } from "../base.js";
-import { actionSorter, isAbstractEthersSigner, isAbstractEthersV5Signer, isAbstractViemWalletClient, isAbstractWindowEthereum, signL1Action, signMultiSigAction, signUserSignedAction, userSignedActionEip712Types, } from "../signing/mod.js";
-/** Error thrown when the API returns an error response. */
+import { actionSorter, getWalletChainId, signL1Action, signMultiSigAction, signUserSignedAction, userSignedActionEip712Types, } from "../signing/mod.js";
+/** Custom error class for API request errors. */
 export class ApiRequestError extends HyperliquidError {
     response;
     constructor(response) {
@@ -114,15 +114,6 @@ export class ExchangeClient {
      * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const exchClient = new hl.ExchangeClient({ wallet, transport });
      * ```
-     *
-     * @example External wallet (e.g. MetaMask) via [`window.ethereum`](https://eips.ethereum.org/EIPS/eip-1193)
-     * ```ts
-     * import * as hl from "@nktkas/hyperliquid";
-     *
-     * const ethereum = (window as any).ethereum;
-     * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
-     * const exchClient = new hl.ExchangeClient({ wallet: ethereum, transport });
-     * ```
      */
     constructor(args) {
         this.transport = args.transport;
@@ -130,13 +121,13 @@ export class ExchangeClient {
         this.isTestnet = args.isTestnet ?? false;
         this.defaultVaultAddress = args.defaultVaultAddress;
         this.defaultExpiresAfter = args.defaultExpiresAfter;
-        this.signatureChainId = args.signatureChainId ?? this._guessSignatureChainId;
+        this.signatureChainId = args.signatureChainId ?? (() => getWalletChainId(this.wallet));
         this.nonceManager = args.nonceManager ?? new NonceManager().getNonce;
     }
     /**
      * Approve an agent to sign on behalf of the master account.
-     * @param args - The parameters for the request.
-     * @param signal - An optional abort signal
+     * @param params - Action-specific parameters.
+     * @param opts - Request execution options.
      * @returns Successful response without specific data.
      *
      * @throws {ApiRequestError} When the API returns an unsuccessful response.
@@ -147,42 +138,27 @@ export class ExchangeClient {
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
      *
-     * const privateKey = "0x..."; // or `viem`, `ethers`
+     * const privateKey = "0x..."; // `viem`, `ethers`, or private key directly`
      * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const exchClient = new hl.ExchangeClient({ wallet: privateKey, transport });
      *
      * await exchClient.approveAgent({ agentAddress: "0x...", agentName: "..." });
      * ```
      */
-    async approveAgent(args, signal) {
-        // Destructure the parameters
-        const { ...actionArgs } = args;
-        // Construct an action
-        const nonce = await this.nonceManager();
+    async approveAgent(params, opts) {
         const action = actionSorter.approveAgent({
             type: "approveAgent",
             hyperliquidChain: this._getHyperliquidChain(),
             signatureChainId: await this._getSignatureChainId(),
-            nonce,
-            ...actionArgs,
-        });
-        // Sign the action
-        const signature = await signUserSignedAction({
-            wallet: this.wallet,
-            action,
-            types: userSignedActionEip712Types[action.type],
+            nonce: await this.nonceManager(),
+            ...params,
         });
-        if (action.agentName === "")
-            action.agentName = null;
-        // Send a request
-        const response = await this.transport.request("exchange", { action, signature, nonce }, signal);
-        this._validateResponse(response);
-        return response;
+        return await this._executeUserSignedAction({ action }, opts?.signal);
     }
     /**
      * Approve a maximum fee rate for a builder.
-     * @param args - The parameters for the request.
-     * @param signal - An optional abort signal.
+     * @param params - Action-specific parameters.
+     * @param opts - Request execution options.
      * @returns Successful response without specific data.
      *
      * @throws {ApiRequestError} When the API returns an unsuccessful response.
@@ -193,40 +169,27 @@ export class ExchangeClient {
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
      *
-     * const privateKey = "0x..."; // or `viem`, `ethers`
+     * const privateKey = "0x..."; // `viem`, `ethers`, or private key directly`
      * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const exchClient = new hl.ExchangeClient({ wallet: privateKey, transport });
      *
      * await exchClient.approveBuilderFee({ maxFeeRate: "0.01%", builder: "0x..." });
      * ```
      */
-    async approveBuilderFee(args, signal) {
-        // Destructure the parameters
-        const { ...actionArgs } = args;
-        // Construct an action
-        const nonce = await this.nonceManager();
+    async approveBuilderFee(params, opts) {
         const action = actionSorter.approveBuilderFee({
             type: "approveBuilderFee",
             hyperliquidChain: this._getHyperliquidChain(),
             signatureChainId: await this._getSignatureChainId(),
-            nonce,
-            ...actionArgs,
-        });
-        // Sign the action
-        const signature = await signUserSignedAction({
-            wallet: this.wallet,
-            action,
-            types: userSignedActionEip712Types[action.type],
+            nonce: await this.nonceManager(),
+            ...params,
         });
-        // Send a request
-        const response = await this.transport.request("exchange", { action, signature, nonce }, signal);
-        this._validateResponse(response);
-        return response;
+        return await this._executeUserSignedAction({ action }, opts?.signal);
     }
     /**
      * Modify multiple orders.
-     * @param args - The parameters for the request.
-     * @param signal - An optional abort signal.
+     * @param params - Action-specific parameters.
+     * @param opts - Request execution options.
      * @returns Successful variant of {@link OrderResponse} without error statuses.
      *
      * @throws {ApiRequestError} When the API returns an unsuccessful response.
@@ -237,7 +200,7 @@ export class ExchangeClient {
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
      *
-     * const privateKey = "0x..."; // or `viem`, `ethers`
+     * const privateKey = "0x..."; // `viem`, `ethers`, or private key directly`
      * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const exchClient = new hl.ExchangeClient({ wallet: privateKey, transport });
      *
@@ -258,30 +221,19 @@ export class ExchangeClient {
      * });
      * ```
      */
-    async batchModify(args, signal) {
-        // Destructure the parameters
-        const { vaultAddress = this.defaultVaultAddress, expiresAfter = await this._getDefaultExpiresAfter(), ...actionArgs } = args;
-        // Construct an action
-        const nonce = await this.nonceManager();
-        const action = actionSorter.batchModify({ type: "batchModify", ...actionArgs });
-        // Sign the action
-        const signature = await signL1Action({
-            wallet: this.wallet,
-            action,
-            nonce,
-            isTestnet: this.isTestnet,
-            vaultAddress,
-            expiresAfter,
+    async batchModify(params, opts) {
+        const action = actionSorter.batchModify({
+            type: "batchModify",
+            ...params,
         });
-        // Send a request
-        const response = await this.transport.request("exchange", { action, signature, nonce, vaultAddress, expiresAfter }, signal);
-        this._validateResponse(response);
-        return response;
+        const vaultAddress = opts?.vaultAddress ?? this.defaultVaultAddress;
+        const expiresAfter = opts?.expiresAfter ?? await this._getDefaultExpiresAfter();
+        return await this._executeL1Action({ action, vaultAddress, expiresAfter }, opts?.signal);
     }
     /**
      * Cancel order(s).
-     * @param args - The parameters for the request.
-     * @param signal - An optional abort signal.
+     * @param params - Action-specific parameters.
+     * @param opts - Request execution options.
      * @returns Successful variant of {@link CancelResponse} without error statuses.
      *
      * @throws {ApiRequestError} When the API returns an unsuccessful response.
@@ -292,7 +244,7 @@ export class ExchangeClient {
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
      *
-     * const privateKey = "0x..."; // or `viem`, `ethers`
+     * const privateKey = "0x..."; // `viem`, `ethers`, or private key directly`
      * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const exchClient = new hl.ExchangeClient({ wallet: privateKey, transport });
      *
@@ -303,30 +255,19 @@ export class ExchangeClient {
      * });
      * ```
      */
-    async cancel(args, signal) {
-        // Destructure the parameters
-        const { vaultAddress = this.defaultVaultAddress, expiresAfter = await this._getDefaultExpiresAfter(), ...actionArgs } = args;
-        // Construct an action
-        const nonce = await this.nonceManager();
-        const action = actionSorter.cancel({ type: "cancel", ...actionArgs });
-        // Sign the action
-        const signature = await signL1Action({
-            wallet: this.wallet,
-            action,
-            nonce,
-            isTestnet: this.isTestnet,
-            vaultAddress,
-            expiresAfter,
+    async cancel(params, opts) {
+        const action = actionSorter.cancel({
+            type: "cancel",
+            ...params,
         });
-        // Send a request
-        const response = await this.transport.request("exchange", { action, signature, nonce, vaultAddress, expiresAfter }, signal);
-        this._validateResponse(response);
-        return response;
+        const vaultAddress = opts?.vaultAddress ?? this.defaultVaultAddress;
+        const expiresAfter = opts?.expiresAfter ?? await this._getDefaultExpiresAfter();
+        return await this._executeL1Action({ action, vaultAddress, expiresAfter }, opts?.signal);
     }
     /**
      * Cancel order(s) by cloid.
-     * @param args - The parameters for the request.
-     * @param signal - An optional abort signal.
+     * @param params - Action-specific parameters.
+     * @param opts - Request execution options.
      * @returns Successful variant of {@link CancelResponse} without error statuses.
      *
      * @throws {ApiRequestError} When the API returns an unsuccessful response.
@@ -337,7 +278,7 @@ export class ExchangeClient {
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
      *
-     * const privateKey = "0x..."; // or `viem`, `ethers`
+     * const privateKey = "0x..."; // `viem`, `ethers`, or private key directly`
      * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const exchClient = new hl.ExchangeClient({ wallet: privateKey, transport });
      *
@@ -348,30 +289,19 @@ export class ExchangeClient {
      * });
      * ```
      */
-    async cancelByCloid(args, signal) {
-        // Destructure the parameters
-        const { vaultAddress = this.defaultVaultAddress, expiresAfter = await this._getDefaultExpiresAfter(), ...actionArgs } = args;
-        // Construct an action
-        const nonce = await this.nonceManager();
-        const action = actionSorter.cancelByCloid({ type: "cancelByCloid", ...actionArgs });
-        // Sign the action
-        const signature = await signL1Action({
-            wallet: this.wallet,
-            action,
-            nonce,
-            isTestnet: this.isTestnet,
-            vaultAddress,
-            expiresAfter,
+    async cancelByCloid(params, opts) {
+        const action = actionSorter.cancelByCloid({
+            type: "cancelByCloid",
+            ...params,
         });
-        // Send a request
-        const response = await this.transport.request("exchange", { action, signature, nonce, vaultAddress, expiresAfter }, signal);
-        this._validateResponse(response);
-        return response;
+        const vaultAddress = opts?.vaultAddress ?? this.defaultVaultAddress;
+        const expiresAfter = opts?.expiresAfter ?? await this._getDefaultExpiresAfter();
+        return await this._executeL1Action({ action, vaultAddress, expiresAfter }, opts?.signal);
     }
     /**
      * Transfer native token from the user's spot account into staking for delegating to validators.
-     * @param args - The parameters for the request.
-     * @param signal - An optional abort signal.
+     * @param params - Action-specific parameters.
+     * @param opts - Request execution options.
      * @returns Successful response without specific data.
      *
      * @throws {ApiRequestError} When the API returns an unsuccessful response.
@@ -382,40 +312,26 @@ export class ExchangeClient {
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
      *
-     * const privateKey = "0x..."; // or `viem`, `ethers`
+     * const privateKey = "0x..."; // `viem`, `ethers`, or private key directly`
      * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const exchClient = new hl.ExchangeClient({ wallet: privateKey, transport });
      *
      * await exchClient.cDeposit({ wei: 1 * 1e8 });
      * ```
      */
-    async cDeposit(args, signal) {
-        // Destructure the parameters
-        const { ...actionArgs } = args;
-        // Construct an action
-        const nonce = await this.nonceManager();
+    async cDeposit(params, opts) {
         const action = actionSorter.cDeposit({
             type: "cDeposit",
             hyperliquidChain: this._getHyperliquidChain(),
             signatureChainId: await this._getSignatureChainId(),
-            nonce,
-            ...actionArgs,
-        });
-        // Sign the action
-        const signature = await signUserSignedAction({
-            wallet: this.wallet,
-            action,
-            types: userSignedActionEip712Types[action.type],
+            nonce: await this.nonceManager(),
+            ...params,
         });
-        // Send a request
-        const response = await this.transport.request("exchange", { action, signature, nonce }, signal);
-        this._validateResponse(response);
-        return response;
+        return await this._executeUserSignedAction({ action }, opts?.signal);
     }
     /**
      * Claim rewards from referral program.
-     * @param args - The parameters for the request.
-     * @param signal - An optional abort signal.
+     * @param opts - Request execution options.
      * @returns Successful response without specific data.
      *
      * @throws {ApiRequestError} When the API returns an unsuccessful response.
@@ -426,33 +342,24 @@ export class ExchangeClient {
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
      *
-     * const privateKey = "0x..."; // or `viem`, `ethers`
+     * const privateKey = "0x..."; // `viem`, `ethers`, or private key directly`
      * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const exchClient = new hl.ExchangeClient({ wallet: privateKey, transport });
      *
      * await exchClient.claimRewards();
      * ```
      */
-    async claimRewards(signal) {
-        // Construct an action
-        const nonce = await this.nonceManager();
-        const action = actionSorter.claimRewards({ type: "claimRewards" });
-        // Sign the action
-        const signature = await signL1Action({
-            wallet: this.wallet,
-            action,
-            nonce,
-            isTestnet: this.isTestnet,
+    async claimRewards(opts) {
+        const action = actionSorter.claimRewards({
+            type: "claimRewards",
         });
-        // Send a request
-        const response = await this.transport.request("exchange", { action, signature, nonce }, signal);
-        this._validateResponse(response);
-        return response;
+        const expiresAfter = opts?.expiresAfter ?? await this._getDefaultExpiresAfter();
+        return await this._executeL1Action({ action, expiresAfter }, opts?.signal);
     }
     /**
      * Convert a single-signature account to a multi-signature account or vice versa.
-     * @param args - The parameters for the request.
-     * @param signal - An optional abort signal.
+     * @param params - Action-specific parameters.
+     * @param opts - Request execution options.
      * @returns Successful response without specific data.
      *
      * @throws {ApiRequestError} When the API returns an unsuccessful response.
@@ -463,47 +370,36 @@ export class ExchangeClient {
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
      *
-     * const privateKey = "0x..."; // or `viem`, `ethers`
+     * const privateKey = "0x..."; // `viem`, `ethers`, or private key directly`
      * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const exchClient = new hl.ExchangeClient({ wallet: privateKey, transport });
      *
      * // Convert to multi-sig user
      * await exchClient.convertToMultiSigUser({
-     *   authorizedUsers: ["0x...", "0x...", "0x..."],
-     *   threshold: 2,
+     *   signers: {
+     *     authorizedUsers: ["0x...", "0x...", "0x..."],
+     *     threshold: 2,
+     *   },
      * });
      *
      * // Convert to single-sig user
-     * await exchClient.convertToMultiSigUser(null);
+     * await exchClient.convertToMultiSigUser({ signers: null });
      * ```
      */
-    async convertToMultiSigUser(args, signal) {
-        // Destructure the parameters
-        const actionArgs = args;
-        // Construct an action
-        const nonce = await this.nonceManager();
+    async convertToMultiSigUser(params, opts) {
         const action = actionSorter.convertToMultiSigUser({
             type: "convertToMultiSigUser",
             hyperliquidChain: this._getHyperliquidChain(),
             signatureChainId: await this._getSignatureChainId(),
-            signers: JSON.stringify(actionArgs),
-            nonce,
-        });
-        // Sign the action
-        const signature = await signUserSignedAction({
-            wallet: this.wallet,
-            action,
-            types: userSignedActionEip712Types[action.type],
+            nonce: await this.nonceManager(),
+            ...params,
         });
-        // Send a request
-        const response = await this.transport.request("exchange", { action, signature, nonce }, signal);
-        this._validateResponse(response);
-        return response;
+        return await this._executeUserSignedAction({ action }, opts?.signal);
     }
     /**
      * Create a sub-account.
-     * @param args - The parameters for the request.
-     * @param signal - An optional abort signal.
+     * @param params - Action-specific parameters.
+     * @param opts - Request execution options.
      * @returns Response for creating a sub-account.
      *
      * @throws {ApiRequestError} When the API returns an unsuccessful response.
@@ -514,35 +410,25 @@ export class ExchangeClient {
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
      *
-     * const privateKey = "0x..."; // or `viem`, `ethers`
+     * const privateKey = "0x..."; // `viem`, `ethers`, or private key directly`
      * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const exchClient = new hl.ExchangeClient({ wallet: privateKey, transport });
      *
      * const data = await exchClient.createSubAccount({ name: "..." });
      * ```
      */
-    async createSubAccount(args, signal) {
-        // Destructure the parameters
-        const { ...actionArgs } = args;
-        // Construct an action
-        const nonce = await this.nonceManager();
-        const action = actionSorter.createSubAccount({ type: "createSubAccount", ...actionArgs });
-        // Sign the action
-        const signature = await signL1Action({
-            wallet: this.wallet,
-            action,
-            nonce,
-            isTestnet: this.isTestnet,
+    async createSubAccount(params, opts) {
+        const action = actionSorter.createSubAccount({
+            type: "createSubAccount",
+            ...params,
         });
-        // Send a request
-        const response = await this.transport.request("exchange", { action, signature, nonce }, signal);
-        this._validateResponse(response);
-        return response;
+        const expiresAfter = opts?.expiresAfter ?? await this._getDefaultExpiresAfter();
+        return await this._executeL1Action({ action, expiresAfter }, opts?.signal);
     }
     /**
      * Create a vault.
-     * @param args - The parameters for the request.
-     * @param signal - An optional abort signal.
+     * @param params - Action-specific parameters.
+     * @param opts - Request execution options.
      * @returns Response for creating a vault.
      *
      * @throws {ApiRequestError} When the API returns an unsuccessful response.
@@ -553,35 +439,30 @@ export class ExchangeClient {
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
      *
-     * const privateKey = "0x..."; // or `viem`, `ethers`
+     * const privateKey = "0x..."; // `viem`, `ethers`, or private key directly`
      * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const exchClient = new hl.ExchangeClient({ wallet: privateKey, transport });
      *
-     * const data = await exchClient.createVault({ name: "...", description: "...", initialUsd: 100 * 1e6 });
+     * const data = await exchClient.createVault({
+     *   name: "...",
+     *   description: "...",
+     *   initialUsd: 100 * 1e6,
+     *   nonce: Date.now(),
+     * });
      * ```
      */
-    async createVault(args, signal) {
-        // Destructure the parameters
-        const { ...actionArgs } = args;
-        // Construct an action
-        const nonce = await this.nonceManager();
-        const action = actionSorter.createVault({ type: "createVault", nonce, ...actionArgs });
-        // Sign the action
-        const signature = await signL1Action({
-            wallet: this.wallet,
-            action,
-            nonce,
-            isTestnet: this.isTestnet,
+    async createVault(params, opts) {
+        const action = actionSorter.createVault({
+            type: "createVault",
+            ...params,
         });
-        // Send a request
-        const response = await this.transport.request("exchange", { action, signature, nonce }, signal);
-        this._validateResponse(response);
-        return response;
+        const expiresAfter = opts?.expiresAfter ?? await this._getDefaultExpiresAfter();
+        return await this._executeL1Action({ action, expiresAfter }, opts?.signal);
     }
     /**
      * Jail or unjail self as a validator signer.
-     * @param args - The parameters for the request.
-     * @param signal - An optional abort signal.
+     * @param params - Action-specific parameters.
+     * @param opts - Request execution options.
      * @returns Successful response without specific data.
      *
      * @throws {ApiRequestError} When the API returns an unsuccessful response.
@@ -592,7 +473,7 @@ export class ExchangeClient {
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
      *
-     * const privateKey = "0x..."; // or `viem`, `ethers`
+     * const privateKey = "0x..."; // `viem`, `ethers`, or private key directly`
      * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const exchClient = new hl.ExchangeClient({ wallet: privateKey, transport });
      *
@@ -603,29 +484,18 @@ export class ExchangeClient {
      * await exchClient.cSignerAction({ unjailSelf: null });
      * ```
      */
-    async cSignerAction(args, signal) {
-        // Destructure the parameters
-        const { expiresAfter = await this._getDefaultExpiresAfter(), ...actionArgs } = args;
-        // Construct an action
-        const nonce = await this.nonceManager();
-        const action = actionSorter.CSignerAction({ type: "CSignerAction", ...actionArgs });
-        // Sign the action
-        const signature = await signL1Action({
-            wallet: this.wallet,
-            action,
-            nonce,
-            isTestnet: this.isTestnet,
-            expiresAfter,
+    async cSignerAction(params, opts) {
+        const action = actionSorter.CSignerAction({
+            type: "CSignerAction",
+            ...params,
         });
-        // Send a request
-        const response = await this.transport.request("exchange", { action, signature, nonce, expiresAfter }, signal);
-        this._validateResponse(response);
-        return response;
+        const expiresAfter = opts?.expiresAfter ?? await this._getDefaultExpiresAfter();
+        return await this._executeL1Action({ action, expiresAfter }, opts?.signal);
     }
     /**
      * Action related to validator management.
-     * @param args - The parameters for the request.
-     * @param signal - An optional abort signal.
+     * @param params - Action-specific parameters.
+     * @param opts - Request execution options.
      * @returns Successful response without specific data.
      *
      * @throws {ApiRequestError} When the API returns an unsuccessful response.
@@ -636,17 +506,21 @@ export class ExchangeClient {
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
      *
-     * const privateKey = "0x..."; // or `viem`, `ethers`
+     * const privateKey = "0x..."; // `viem`, `ethers`, or private key directly`
      * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const exchClient = new hl.ExchangeClient({ wallet: privateKey, transport });
      *
      * // Change validator profile
      * await exchClient.cValidatorAction({
      *   changeProfile: {
+     *     node_ip: { Ip: "1.2.3.4" },
      *     name: "...",
      *     description: "...",
      *     unjailed: true,
-     *   }
+     *     disable_delegations: false,
+     *     commission_bps: null,
+     *     signer: null,
+     *   },
      * });
      *
      * // Register a new validator
@@ -669,29 +543,18 @@ export class ExchangeClient {
      * await exchClient.cValidatorAction({ unregister: null });
      * ```
      */
-    async cValidatorAction(args, signal) {
-        // Destructure the parameters
-        const { expiresAfter = await this._getDefaultExpiresAfter(), ...actionArgs } = args;
-        // Construct an action
-        const nonce = await this.nonceManager();
-        const action = actionSorter.CValidatorAction({ type: "CValidatorAction", ...actionArgs });
-        // Sign the action
-        const signature = await signL1Action({
-            wallet: this.wallet,
-            action,
-            nonce,
-            isTestnet: this.isTestnet,
-            expiresAfter,
+    async cValidatorAction(params, opts) {
+        const action = actionSorter.CValidatorAction({
+            type: "CValidatorAction",
+            ...params,
         });
-        // Send a request
-        const response = await this.transport.request("exchange", { action, signature, nonce, expiresAfter }, signal);
-        this._validateResponse(response);
-        return response;
+        const expiresAfter = opts?.expiresAfter ?? await this._getDefaultExpiresAfter();
+        return await this._executeL1Action({ action, expiresAfter }, opts?.signal);
     }
     /**
      * Transfer native token from staking into the user's spot account.
-     * @param args - The parameters for the request.
-     * @param signal - An optional abort signal.
+     * @param params - Action-specific parameters.
+     * @param opts - Request execution options.
      * @returns Successful response without specific data.
      *
      * @throws {ApiRequestError} When the API returns an unsuccessful response.
@@ -702,79 +565,56 @@ export class ExchangeClient {
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
      *
-     * const privateKey = "0x..."; // or `viem`, `ethers`
+     * const privateKey = "0x..."; // `viem`, `ethers`, or private key directly`
      * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const exchClient = new hl.ExchangeClient({ wallet: privateKey, transport });
      *
      * await exchClient.cWithdraw({ wei: 1 * 1e8 });
      * ```
      */
-    async cWithdraw(args, signal) {
-        // Destructure the parameters
-        const { ...actionArgs } = args;
-        // Construct an action
-        const nonce = await this.nonceManager();
+    async cWithdraw(params, opts) {
         const action = actionSorter.cWithdraw({
             type: "cWithdraw",
             hyperliquidChain: this._getHyperliquidChain(),
             signatureChainId: await this._getSignatureChainId(),
-            nonce,
-            ...actionArgs,
-        });
-        // Sign the action
-        const signature = await signUserSignedAction({
-            wallet: this.wallet,
-            action,
-            types: userSignedActionEip712Types[action.type],
+            nonce: await this.nonceManager(),
+            ...params,
         });
-        // Send a request
-        const response = await this.transport.request("exchange", { action, signature, nonce }, signal);
-        this._validateResponse(response);
-        return response;
+        return await this._executeUserSignedAction({ action }, opts?.signal);
     }
     /**
      * Configure block type for EVM transactions.
-     * @param args - The parameters for the request.
-     * @param signal - An optional abort signal.
+     * @param params - Action-specific parameters.
+     * @param opts - Request execution options.
      * @returns Response for creating a sub-account.
      *
      * @throws {ApiRequestError} When the API returns an unsuccessful response.
      * @throws {TransportError} When the transport layer throws an error.
      *
-     * @see https://hyperliquid.gitbook.io/hyperliquid-docs/for-developers/evm/dual-block-architecture
+     * @see https://hyperliquid.gitbook.io/hyperliquid-docs/for-developers/hyperevm/dual-block-architecture
      * @example
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
      *
-     * const privateKey = "0x..."; // or `viem`, `ethers`
+     * const privateKey = "0x..."; // `viem`, `ethers`, or private key directly`
      * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const exchClient = new hl.ExchangeClient({ wallet: privateKey, transport });
      *
      * const data = await exchClient.evmUserModify({ usingBigBlocks: true });
      * ```
      */
-    async evmUserModify(args, signal) {
-        // Destructure the parameters
-        const { ...actionArgs } = args;
-        // Construct an action
-        const nonce = await this.nonceManager();
-        const action = actionSorter.evmUserModify({ type: "evmUserModify", ...actionArgs });
-        // Sign the action
-        const signature = await signL1Action({
-            wallet: this.wallet,
-            action,
-            nonce,
-            isTestnet: this.isTestnet,
+    async evmUserModify(params, opts) {
+        const action = actionSorter.evmUserModify({
+            type: "evmUserModify",
+            ...params,
         });
-        // Send a request
-        const response = await this.transport.request("exchange", { action, signature, nonce }, signal);
-        this._validateResponse(response);
-        return response;
+        const expiresAfter = opts?.expiresAfter ?? await this._getDefaultExpiresAfter();
+        return await this._executeL1Action({ action, expiresAfter }, opts?.signal);
     }
     /**
      * Modify an order.
-     * @param args - The parameters for the request.
-     * @param signal - An optional abort signal.
+     * @param params - Action-specific parameters.
+     * @param opts - Request execution options.
      * @returns Successful response without specific data.
      *
      * @throws {ApiRequestError} When the API returns an unsuccessful response.
@@ -785,7 +625,7 @@ export class ExchangeClient {
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
      *
-     * const privateKey = "0x..."; // or `viem`, `ethers`
+     * const privateKey = "0x..."; // `viem`, `ethers`, or private key directly`
      * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const exchClient = new hl.ExchangeClient({ wallet: privateKey, transport });
      *
@@ -803,30 +643,19 @@ export class ExchangeClient {
      * });
      * ```
      */
-    async modify(args, signal) {
-        // Destructure the parameters
-        const { vaultAddress = this.defaultVaultAddress, expiresAfter = await this._getDefaultExpiresAfter(), ...actionArgs } = args;
-        // Construct an action
-        const nonce = await this.nonceManager();
-        const action = actionSorter.modify({ type: "modify", ...actionArgs });
-        // Sign the action
-        const signature = await signL1Action({
-            wallet: this.wallet,
-            action,
-            nonce,
-            isTestnet: this.isTestnet,
-            vaultAddress,
-            expiresAfter,
+    async modify(params, opts) {
+        const action = actionSorter.modify({
+            type: "modify",
+            ...params,
         });
-        // Send a request
-        const response = await this.transport.request("exchange", { action, signature, nonce, vaultAddress, expiresAfter }, signal);
-        this._validateResponse(response);
-        return response;
+        const vaultAddress = opts?.vaultAddress ?? this.defaultVaultAddress;
+        const expiresAfter = opts?.expiresAfter ?? await this._getDefaultExpiresAfter();
+        return await this._executeL1Action({ action, vaultAddress, expiresAfter }, opts?.signal);
     }
     /**
      * A multi-signature request.
-     * @param args - The parameters for the request.
-     * @param signal - An optional abort signal.
+     * @param params - Action-specific parameters.
+     * @param opts - Request execution options.
      * @returns Any successful response.
      *
      * @throws {ApiRequestError} When the API returns an unsuccessful response.
@@ -846,20 +675,36 @@ export class ExchangeClient {
      * const exchClient = new hl.ExchangeClient({ wallet, transport });
      *
      * const nonce = Date.now();
-     * const action = {
+     * const action = actionSorter.scheduleCancel({
      *   type: "scheduleCancel",
      *   time: Date.now() + 10000,
-     * } as const;
-     *
-     * // Create the required number of signatures
-     * const signature = await signL1Action({
-     *   wallet,
-     *   action: [multiSigUser.toLowerCase(), wallet.address.toLowerCase(), actionSorter[action.type](action)],
-     *   nonce,
      * });
      *
+     * // Create the required number of signatures
+     * const signatures = await Promise.all(["0x...", "0x..."].map(async (signerPrivKey) => {
+     *   return await signL1Action({
+     *     wallet: signerPrivKey as `0x${string}`,
+     *     action: [multiSigUser.toLowerCase(), wallet.address.toLowerCase(), action],
+     *     nonce,
+     *   });
+     * }));
+     *
+     * // or user-signed action
+     * // const signatures = await Promise.all(["0x...", "0x..."].map(async (signerPrivKey) => {
+     * //   return await signUserSignedAction({
+     * //     wallet: signerPrivKey as `0x${string}`,
+     * //     action: {
+     * //       ...action,
+     * //       payloadMultiSigUser: multiSigUser,
+     * //       outerSigner: wallet.address,
+     * //     },
+     * //     types: userSignedActionEip712Types[action.type],
+     * //   });
+     * // }));
+     *
+     * // Then use signatures in the `multiSig` action
      * const data = await exchClient.multiSig({
-     *   signatures: [signature],
+     *   signatures,
      *   payload: {
      *     multiSigUser,
      *     outerSigner: wallet.address,
@@ -869,36 +714,21 @@ export class ExchangeClient {
      * });
      * ```
      */
-    async multiSig(args, signal) {
-        // Destructure the parameters
-        const { vaultAddress = this.defaultVaultAddress, expiresAfter = await this._getDefaultExpiresAfter(), nonce, ...actionArgs } = args;
-        // Construct an action
+    async multiSig(params_and_nonce, opts) {
+        const { nonce, ...params } = params_and_nonce;
         const action = actionSorter.multiSig({
             type: "multiSig",
             signatureChainId: await this._getSignatureChainId(),
-            ...actionArgs,
-        });
-        // Sign the action
-        // deno-lint-ignore no-explicit-any
-        const actionWithoutType = structuredClone(action);
-        delete actionWithoutType.type;
-        const signature = await signMultiSigAction({
-            wallet: this.wallet,
-            action: actionWithoutType,
-            nonce,
-            isTestnet: this.isTestnet,
-            vaultAddress,
-            expiresAfter,
+            ...params,
         });
-        // Send a request
-        const response = await this.transport.request("exchange", { action, signature, nonce, vaultAddress, expiresAfter }, signal);
-        this._validateResponse(response);
-        return response;
+        const vaultAddress = opts?.vaultAddress ?? this.defaultVaultAddress;
+        const expiresAfter = opts?.expiresAfter ?? await this._getDefaultExpiresAfter();
+        return await this._executeMultiSigAction({ action, vaultAddress, expiresAfter, nonce }, opts?.signal);
     }
     /**
      * Place an order(s).
-     * @param args - The parameters for the request.
-     * @param signal - An optional abort signal.
+     * @param params - Action-specific parameters.
+     * @param opts - Request execution options.
      * @returns Successful variant of {@link OrderResponse} without error statuses.
      *
      * @throws {ApiRequestError} When the API returns an unsuccessful response.
@@ -909,7 +739,7 @@ export class ExchangeClient {
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
      *
-     * const privateKey = "0x..."; // or `viem`, `ethers`
+     * const privateKey = "0x..."; // `viem`, `ethers`, or private key directly`
      * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const exchClient = new hl.ExchangeClient({ wallet: privateKey, transport });
      *
@@ -929,30 +759,19 @@ export class ExchangeClient {
      * });
      * ```
      */
-    async order(args, signal) {
-        // Destructure the parameters
-        const { vaultAddress = this.defaultVaultAddress, expiresAfter = await this._getDefaultExpiresAfter(), ...actionArgs } = args;
-        // Construct an action
-        const nonce = await this.nonceManager();
-        const action = actionSorter.order({ type: "order", ...actionArgs });
-        // Sign the action
-        const signature = await signL1Action({
-            wallet: this.wallet,
-            action,
-            nonce,
-            isTestnet: this.isTestnet,
-            vaultAddress,
-            expiresAfter,
+    async order(params, opts) {
+        const action = actionSorter.order({
+            type: "order",
+            ...params,
         });
-        // Send a request
-        const response = await this.transport.request("exchange", { action, signature, nonce, vaultAddress, expiresAfter }, signal);
-        this._validateResponse(response);
-        return response;
+        const vaultAddress = opts?.vaultAddress ?? this.defaultVaultAddress;
+        const expiresAfter = opts?.expiresAfter ?? await this._getDefaultExpiresAfter();
+        return await this._executeL1Action({ action, vaultAddress, expiresAfter }, opts?.signal);
     }
     /**
      * Deploying HIP-3 assets.
-     * @param args - The parameters for the request.
-     * @param signal - An optional abort signal.
+     * @param params - Action-specific parameters.
+     * @param opts - Request execution options.
      * @returns Successful response without specific data.
      *
      * @throws {ApiRequestError} When the API returns an unsuccessful response.
@@ -963,7 +782,7 @@ export class ExchangeClient {
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
      *
-     * const privateKey = "0x..."; // or `viem`, `ethers`
+     * const privateKey = "0x..."; // `viem`, `ethers`, or private key directly`
      * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const exchClient = new hl.ExchangeClient({ wallet: privateKey, transport });
      *
@@ -978,120 +797,93 @@ export class ExchangeClient {
      *       onlyIsolated: false,
      *     },
      *     dex: "test",
+     *     schema: null,
      *   },
      * });
      * ```
      */
-    async perpDeploy(args, signal) {
-        // Destructure the parameters
-        const { ...actionArgs } = args;
-        // Construct an action
-        const nonce = await this.nonceManager();
-        const action = actionSorter.perpDeploy({ type: "perpDeploy", ...actionArgs });
-        // Sign the action
-        const signature = await signL1Action({
-            wallet: this.wallet,
-            action,
-            nonce,
-            isTestnet: this.isTestnet,
+    async perpDeploy(params, opts) {
+        const action = actionSorter.perpDeploy({
+            type: "perpDeploy",
+            ...params,
         });
-        // Send a request
-        const response = await this.transport.request("exchange", { action, signature, nonce }, signal);
-        this._validateResponse(response);
-        return response;
+        const expiresAfter = opts?.expiresAfter ?? await this._getDefaultExpiresAfter();
+        return await this._executeL1Action({ action, expiresAfter }, opts?.signal);
     }
     /**
-     * Transfer funds between Spot account and Perp dex account.
-     * @param args - The parameters for the request.
-     * @param signal - An optional abort signal.
+     * Create a referral code.
+     * @param params - Action-specific parameters.
+     * @param opts - Request execution options.
      * @returns Successful response without specific data.
      *
      * @throws {ApiRequestError} When the API returns an unsuccessful response.
      * @throws {TransportError} When the transport layer throws an error.
      *
-     * @see https://hyperliquid.gitbook.io/hyperliquid-docs/for-developers/api/exchange-endpoint#transfer-from-spot-account-to-perp-account-and-vice-versa
+     * @see null
      * @example
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
      *
-     * const privateKey = "0x..."; // or `viem`, `ethers`
+     * const privateKey = "0x..."; // `viem`, `ethers`, or private key directly`
      * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const exchClient = new hl.ExchangeClient({ wallet: privateKey, transport });
      *
-     * await exchClient.perpDexClassTransfer({ dex: "test", token: "USDC", amount: "1", toPerp: true });
+     * await exchClient.registerReferrer({ code: "..." });
      * ```
      */
-    async perpDexClassTransfer(args, signal) {
-        // Destructure the parameters
-        const { ...actionArgs } = args;
-        // Construct an action
-        const nonce = await this.nonceManager();
-        const action = actionSorter.PerpDexClassTransfer({
-            type: "PerpDexClassTransfer",
-            hyperliquidChain: this._getHyperliquidChain(),
-            signatureChainId: await this._getSignatureChainId(),
-            nonce,
-            ...actionArgs,
-        });
-        // Sign the action
-        const signature = await signUserSignedAction({
-            wallet: this.wallet,
-            action,
-            types: userSignedActionEip712Types[action.type],
+    async registerReferrer(params, opts) {
+        const action = actionSorter.registerReferrer({
+            type: "registerReferrer",
+            ...params,
         });
-        // Send a request
-        const response = await this.transport.request("exchange", { action, signature, nonce }, signal);
-        this._validateResponse(response);
-        return response;
+        const expiresAfter = opts?.expiresAfter ?? await this._getDefaultExpiresAfter();
+        return await this._executeL1Action({ action, expiresAfter }, opts?.signal);
     }
     /**
-     * Transfer collateral tokens between different perp dexes for the same user.
-     * @param args - The parameters for the request.
-     * @param signal - An optional abort signal.
+     * Reserve additional rate-limited actions for a fee.
+     * @param params - Action-specific parameters.
+     * @param opts - Request execution options.
      * @returns Successful response without specific data.
      *
      * @throws {ApiRequestError} When the API returns an unsuccessful response.
      * @throws {TransportError} When the transport layer throws an error.
      *
-     * @see https://hyperliquid.gitbook.io/hyperliquid-docs/for-developers/api/exchange-endpoint#transfer-from-perp-account-to-perp-account-for-builder-deployed-dex
+     * @see https://hyperliquid.gitbook.io/hyperliquid-docs/for-developers/api/exchange-endpoint#reserve-additional-actions
      * @example
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
      *
-     * const privateKey = "0x..."; // or `viem`, `ethers`
+     * const privateKey = "0x..."; // `viem`, `ethers`, or private key directly`
      * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const exchClient = new hl.ExchangeClient({ wallet: privateKey, transport });
      *
-     * await exchClient.perpDexTransfer({ sourceDex: "", destinationDex: "test", amount: "1" });
+     * await exchClient.reserveRequestWeight({ weight: 10 });
      * ```
      */
-    async perpDexTransfer(args, signal) {
-        // Destructure the parameters
-        const { ...actionArgs } = args;
-        // Construct an action
-        const nonce = await this.nonceManager();
-        const action = actionSorter.PerpDexTransfer({
-            type: "PerpDexTransfer",
-            hyperliquidChain: this._getHyperliquidChain(),
-            signatureChainId: await this._getSignatureChainId(),
-            nonce,
-            ...actionArgs,
+    async reserveRequestWeight(params, opts) {
+        const action = actionSorter.reserveRequestWeight({
+            type: "reserveRequestWeight",
+            ...params,
         });
-        // Sign the action
-        const signature = await signUserSignedAction({
-            wallet: this.wallet,
-            action,
-            types: userSignedActionEip712Types[action.type],
+        const expiresAfter = opts?.expiresAfter ?? await this._getDefaultExpiresAfter();
+        return await this._executeL1Action({ action, expiresAfter }, opts?.signal);
+    }
+    async scheduleCancel(params_or_opts, maybeOpts) {
+        const isFirstArgParams = params_or_opts && "time" in params_or_opts;
+        const params = isFirstArgParams ? params_or_opts : {};
+        const opts = isFirstArgParams ? maybeOpts : params_or_opts;
+        const action = actionSorter.scheduleCancel({
+            type: "scheduleCancel",
+            ...params,
         });
-        // Send a request
-        const response = await this.transport.request("exchange", { action, signature, nonce }, signal);
-        this._validateResponse(response);
-        return response;
+        const vaultAddress = opts?.vaultAddress ?? this.defaultVaultAddress;
+        const expiresAfter = opts?.expiresAfter ?? await this._getDefaultExpiresAfter();
+        return await this._executeL1Action({ action, vaultAddress, expiresAfter }, opts?.signal);
     }
     /**
-     * Create a referral code.
-     * @param args - The parameters for the request.
-     * @param signal - An optional abort signal.
+     * Set the display name in the leaderboard.
+     * @param params - Action-specific parameters.
+     * @param opts - Request execution options.
      * @returns Successful response without specific data.
      *
      * @throws {ApiRequestError} When the API returns an unsuccessful response.
@@ -1102,136 +894,25 @@ export class ExchangeClient {
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
      *
-     * const privateKey = "0x..."; // or `viem`, `ethers`
+     * const privateKey = "0x..."; // `viem`, `ethers`, or private key directly`
      * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const exchClient = new hl.ExchangeClient({ wallet: privateKey, transport });
      *
-     * await exchClient.registerReferrer({ code: "..." });
+     * await exchClient.setDisplayName({ displayName: "..." });
      * ```
      */
-    async registerReferrer(args, signal) {
-        // Destructure the parameters
-        const { ...actionArgs } = args;
-        // Construct an action
-        const nonce = await this.nonceManager();
-        const action = actionSorter.registerReferrer({ type: "registerReferrer", ...actionArgs });
-        // Sign the action
-        const signature = await signL1Action({
-            wallet: this.wallet,
-            action,
-            nonce,
-            isTestnet: this.isTestnet,
+    async setDisplayName(params, opts) {
+        const action = actionSorter.setDisplayName({
+            type: "setDisplayName",
+            ...params,
         });
-        // Send a request
-        const response = await this.transport.request("exchange", { action, signature, nonce }, signal);
-        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 without specific data.
-     *
-     * @throws {ApiRequestError} When the API returns an unsuccessful response.
-     * @throws {TransportError} When the transport layer throws an error.
-     *
-     * @see https://hyperliquid.gitbook.io/hyperliquid-docs/for-developers/api/exchange-endpoint#reserve-additional-actions
-     * @example
-     * ```ts
-     * import * as hl from "@nktkas/hyperliquid";
-     *
-     * const privateKey = "0x..."; // or `viem`, `ethers`
-     * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
-     * const exchClient = new hl.ExchangeClient({ wallet: privateKey, transport });
-     *
-     * await exchClient.reserveRequestWeight({ weight: 10 });
-     * ```
-     */
-    async reserveRequestWeight(args, signal) {
-        // Destructure the parameters
-        const { expiresAfter = await this._getDefaultExpiresAfter(), ...actionArgs } = args;
-        // Construct an action
-        const nonce = await this.nonceManager();
-        const action = actionSorter.reserveRequestWeight({ type: "reserveRequestWeight", ...actionArgs });
-        // Sign the action
-        const signature = await signL1Action({
-            wallet: this.wallet,
-            action,
-            nonce,
-            isTestnet: this.isTestnet,
-            expiresAfter,
-        });
-        // Send a request
-        const response = await this.transport.request("exchange", { action, signature, nonce, expiresAfter }, signal);
-        this._validateResponse(response);
-        return response;
-    }
-    async scheduleCancel(args_or_signal, maybeSignal) {
-        const args = args_or_signal instanceof AbortSignal ? {} : args_or_signal ?? {};
-        const signal = args_or_signal instanceof AbortSignal ? args_or_signal : maybeSignal;
-        // Destructure the parameters
-        const { vaultAddress = this.defaultVaultAddress, expiresAfter = await this._getDefaultExpiresAfter(), ...actionArgs } = args;
-        // Construct an action
-        const nonce = await this.nonceManager();
-        const action = actionSorter.scheduleCancel({ type: "scheduleCancel", ...actionArgs });
-        // Sign the action
-        const signature = await signL1Action({
-            wallet: this.wallet,
-            action,
-            nonce,
-            isTestnet: this.isTestnet,
-            vaultAddress,
-            expiresAfter,
-        });
-        // Send a request
-        const response = await this.transport.request("exchange", { action, signature, nonce, vaultAddress, expiresAfter }, signal);
-        this._validateResponse(response);
-        return response;
-    }
-    /**
-     * Set the display name in the leaderboard.
-     * @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 unsuccessful response.
-     * @throws {TransportError} When the transport layer throws an error.
-     *
-     * @see null
-     * @example
-     * ```ts
-     * import * as hl from "@nktkas/hyperliquid";
-     *
-     * const privateKey = "0x..."; // or `viem`, `ethers`
-     * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
-     * const exchClient = new hl.ExchangeClient({ wallet: privateKey, transport });
-     *
-     * await exchClient.setDisplayName({ displayName: "..." });
-     * ```
-     */
-    async setDisplayName(args, signal) {
-        // Destructure the parameters
-        const { ...actionArgs } = args;
-        // Construct an action
-        const nonce = await this.nonceManager();
-        const action = actionSorter.setDisplayName({ type: "setDisplayName", ...actionArgs });
-        // Sign the action
-        const signature = await signL1Action({
-            wallet: this.wallet,
-            action,
-            nonce,
-            isTestnet: this.isTestnet,
-        });
-        // Send a request
-        const response = await this.transport.request("exchange", { action, signature, nonce }, signal);
-        this._validateResponse(response);
-        return response;
+        const expiresAfter = opts?.expiresAfter ?? await this._getDefaultExpiresAfter();
+        return await this._executeL1Action({ action, expiresAfter }, opts?.signal);
     }
     /**
      * Set a referral code.
-     * @param args - The parameters for the request.
-     * @param signal - An optional abort signal.
+     * @param params - Action-specific parameters.
+     * @param opts - Request execution options.
      * @returns Successful response without specific data.
      *
      * @throws {ApiRequestError} When the API returns an unsuccessful response.
@@ -1242,35 +923,25 @@ export class ExchangeClient {
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
      *
-     * const privateKey = "0x..."; // or `viem`, `ethers`
+     * const privateKey = "0x..."; // `viem`, `ethers`, or private key directly`
      * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const exchClient = new hl.ExchangeClient({ wallet: privateKey, transport });
      *
      * await exchClient.setReferrer({ code: "..." });
      * ```
      */
-    async setReferrer(args, signal) {
-        // Destructure the parameters
-        const { ...actionArgs } = args;
-        // Construct an action
-        const nonce = await this.nonceManager();
-        const action = actionSorter.setReferrer({ type: "setReferrer", ...actionArgs });
-        // Sign the action
-        const signature = await signL1Action({
-            wallet: this.wallet,
-            action,
-            nonce,
-            isTestnet: this.isTestnet,
+    async setReferrer(params, opts) {
+        const action = actionSorter.setReferrer({
+            type: "setReferrer",
+            ...params,
         });
-        // Send a request
-        const response = await this.transport.request("exchange", { action, signature, nonce }, signal);
-        this._validateResponse(response);
-        return response;
+        const expiresAfter = opts?.expiresAfter ?? await this._getDefaultExpiresAfter();
+        return await this._executeL1Action({ action, expiresAfter }, opts?.signal);
     }
     /**
      * Deploying HIP-1 and HIP-2 assets.
-     * @param args - The parameters for the request.
-     * @param signal - An optional abort signal.
+     * @param params - Action-specific parameters.
+     * @param opts - Request execution options.
      * @returns Successful response without specific data.
      *
      * @throws {ApiRequestError} When the API returns an unsuccessful response.
@@ -1281,7 +952,7 @@ export class ExchangeClient {
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
      *
-     * const privateKey = "0x..."; // or `viem`, `ethers`
+     * const privateKey = "0x..."; // `viem`, `ethers`, or private key directly`
      * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const exchClient = new hl.ExchangeClient({ wallet: privateKey, transport });
      *
@@ -1298,28 +969,18 @@ export class ExchangeClient {
      * });
      * ```
      */
-    async spotDeploy(args, signal) {
-        // Destructure the parameters
-        const { ...actionArgs } = args;
-        // Construct an action
-        const nonce = await this.nonceManager();
-        const action = actionSorter.spotDeploy({ type: "spotDeploy", ...actionArgs });
-        // Sign the action
-        const signature = await signL1Action({
-            wallet: this.wallet,
-            action,
-            nonce,
-            isTestnet: this.isTestnet,
+    async spotDeploy(params, opts) {
+        const action = actionSorter.spotDeploy({
+            type: "spotDeploy",
+            ...params,
         });
-        // Send a request
-        const response = await this.transport.request("exchange", { action, signature, nonce }, signal);
-        this._validateResponse(response);
-        return response;
+        const expiresAfter = opts?.expiresAfter ?? await this._getDefaultExpiresAfter();
+        return await this._executeL1Action({ action, expiresAfter }, opts?.signal);
     }
     /**
      * Send spot assets to another address.
-     * @param args - The parameters for the request.
-     * @param signal - An optional abort signal.
+     * @param params - Action-specific parameters.
+     * @param opts - Request execution options.
      * @returns Successful response without specific data.
      *
      * @throws {ApiRequestError} When the API returns an unsuccessful response.
@@ -1330,7 +991,7 @@ export class ExchangeClient {
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
      *
-     * const privateKey = "0x..."; // or `viem`, `ethers`
+     * const privateKey = "0x..."; // `viem`, `ethers`, or private key directly`
      * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const exchClient = new hl.ExchangeClient({ wallet: privateKey, transport });
      *
@@ -1341,33 +1002,20 @@ export class ExchangeClient {
      * });
      * ```
      */
-    async spotSend(args, signal) {
-        // Destructure the parameters
-        const { ...actionArgs } = args;
-        // Construct an action
-        const nonce = await this.nonceManager();
+    async spotSend(params, opts) {
         const action = actionSorter.spotSend({
             type: "spotSend",
             hyperliquidChain: this._getHyperliquidChain(),
             signatureChainId: await this._getSignatureChainId(),
-            time: nonce,
-            ...actionArgs,
-        });
-        // Sign the action
-        const signature = await signUserSignedAction({
-            wallet: this.wallet,
-            action,
-            types: userSignedActionEip712Types[action.type],
+            time: await this.nonceManager(),
+            ...params,
         });
-        // Send a request
-        const response = await this.transport.request("exchange", { action, signature, nonce }, signal);
-        this._validateResponse(response);
-        return response;
+        return await this._executeUserSignedAction({ action }, opts?.signal);
     }
     /**
      * Opt Out of Spot Dusting.
-     * @param args - The parameters for the request.
-     * @param signal - An optional abort signal.
+     * @param params - Action-specific parameters.
+     * @param opts - Request execution options.
      * @returns Successful response without specific data.
      *
      * @throws {ApiRequestError} When the API returns an unsuccessful response.
@@ -1378,35 +1026,54 @@ export class ExchangeClient {
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
      *
-     * const privateKey = "0x..."; // or `viem`, `ethers`
+     * const privateKey = "0x..."; // `viem`, `ethers`, or private key directly`
      * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const exchClient = new hl.ExchangeClient({ wallet: privateKey, transport });
      *
      * await exchClient.spotUser({ toggleSpotDusting: { optOut: false } });
      * ```
      */
-    async spotUser(args, signal) {
-        // Destructure the parameters
-        const { ...actionArgs } = args;
-        // Construct an action
-        const nonce = await this.nonceManager();
-        const action = actionSorter.spotUser({ type: "spotUser", ...actionArgs });
-        // Sign the action
-        const signature = await signL1Action({
-            wallet: this.wallet,
-            action,
-            nonce,
-            isTestnet: this.isTestnet,
+    async spotUser(params, opts) {
+        const action = actionSorter.spotUser({
+            type: "spotUser",
+            ...params,
         });
-        // Send a request
-        const response = await this.transport.request("exchange", { action, signature, nonce }, signal);
-        this._validateResponse(response);
-        return response;
+        const expiresAfter = opts?.expiresAfter ?? await this._getDefaultExpiresAfter();
+        return await this._executeL1Action({ action, expiresAfter }, opts?.signal);
+    }
+    /**
+     * Modify a sub-account's.
+     * @param params - Action-specific parameters.
+     * @param opts - Request execution options.
+     * @returns Successful response without specific data.
+     *
+     * @throws {ApiRequestError} When the API returns an unsuccessful response.
+     * @throws {TransportError} When the transport layer throws an error.
+     *
+     * @see null
+     * @example
+     * ```ts
+     * import * as hl from "@nktkas/hyperliquid";
+     *
+     * const privateKey = "0x..."; // `viem`, `ethers`, or private key directly`
+     * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
+     * const exchClient = new hl.ExchangeClient({ wallet: privateKey, transport });
+     *
+     * await exchClient.subAccountModify({ subAccountUser: "0x...", name: "..."  });
+     * ```
+     */
+    async subAccountModify(params, opts) {
+        const action = actionSorter.subAccountModify({
+            type: "subAccountModify",
+            ...params,
+        });
+        const expiresAfter = opts?.expiresAfter ?? await this._getDefaultExpiresAfter();
+        return await this._executeL1Action({ action, expiresAfter }, opts?.signal);
     }
     /**
      * Transfer between sub-accounts (spot).
-     * @param args - The parameters for the request.
-     * @param signal - An optional abort signal.
+     * @param params - Action-specific parameters.
+     * @param opts - Request execution options.
      * @returns Successful response without specific data.
      *
      * @throws {ApiRequestError} When the API returns an unsuccessful response.
@@ -1417,7 +1084,7 @@ export class ExchangeClient {
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
      *
-     * const privateKey = "0x..."; // or `viem`, `ethers`
+     * const privateKey = "0x..."; // `viem`, `ethers`, or private key directly`
      * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const exchClient = new hl.ExchangeClient({ wallet: privateKey, transport });
      *
@@ -1429,28 +1096,18 @@ export class ExchangeClient {
      * });
      * ```
      */
-    async subAccountSpotTransfer(args, signal) {
-        // Destructure the parameters
-        const { ...actionArgs } = args;
-        // Construct an action
-        const nonce = await this.nonceManager();
-        const action = actionSorter.subAccountSpotTransfer({ type: "subAccountSpotTransfer", ...actionArgs });
-        // Sign the action
-        const signature = await signL1Action({
-            wallet: this.wallet,
-            action,
-            nonce,
-            isTestnet: this.isTestnet,
+    async subAccountSpotTransfer(params, opts) {
+        const action = actionSorter.subAccountSpotTransfer({
+            type: "subAccountSpotTransfer",
+            ...params,
         });
-        // Send a request
-        const response = await this.transport.request("exchange", { action, signature, nonce }, signal);
-        this._validateResponse(response);
-        return response;
+        const expiresAfter = opts?.expiresAfter ?? await this._getDefaultExpiresAfter();
+        return await this._executeL1Action({ action, expiresAfter }, opts?.signal);
     }
     /**
      * Transfer between sub-accounts (perpetual).
-     * @param args - The parameters for the request.
-     * @param signal - An optional abort signal.
+     * @param params - Action-specific parameters.
+     * @param opts - Request execution options.
      * @returns Successful response without specific data.
      *
      * @throws {ApiRequestError} When the API returns an unsuccessful response.
@@ -1461,35 +1118,25 @@ export class ExchangeClient {
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
      *
-     * const privateKey = "0x..."; // or `viem`, `ethers`
+     * const privateKey = "0x..."; // `viem`, `ethers`, or private key directly`
      * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const exchClient = new hl.ExchangeClient({ wallet: privateKey, transport });
      *
      * await exchClient.subAccountTransfer({ subAccountUser: "0x...", isDeposit: true, usd: 1 * 1e6 });
      * ```
      */
-    async subAccountTransfer(args, signal) {
-        // Destructure the parameters
-        const { ...actionArgs } = args;
-        // Construct an action
-        const nonce = await this.nonceManager();
-        const action = actionSorter.subAccountTransfer({ type: "subAccountTransfer", ...actionArgs });
-        // Sign the action
-        const signature = await signL1Action({
-            wallet: this.wallet,
-            action,
-            nonce,
-            isTestnet: this.isTestnet,
+    async subAccountTransfer(params, opts) {
+        const action = actionSorter.subAccountTransfer({
+            type: "subAccountTransfer",
+            ...params,
         });
-        // Send a request
-        const response = await this.transport.request("exchange", { action, signature, nonce }, signal);
-        this._validateResponse(response);
-        return response;
+        const expiresAfter = opts?.expiresAfter ?? await this._getDefaultExpiresAfter();
+        return await this._executeL1Action({ action, expiresAfter }, opts?.signal);
     }
     /**
      * Delegate or undelegate native tokens to or from a validator.
-     * @param args - The parameters for the request.
-     * @param signal - An optional abort signal.
+     * @param params - Action-specific parameters.
+     * @param opts - Request execution options.
      * @returns Successful response without specific data.
      *
      * @throws {ApiRequestError} When the API returns an unsuccessful response.
@@ -1500,40 +1147,27 @@ export class ExchangeClient {
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
      *
-     * const privateKey = "0x..."; // or `viem`, `ethers`
+     * const privateKey = "0x..."; // `viem`, `ethers`, or private key directly`
      * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const exchClient = new hl.ExchangeClient({ wallet: privateKey, transport });
      *
      * await exchClient.tokenDelegate({ validator: "0x...", isUndelegate: true, wei: 1 * 1e8 });
      * ```
      */
-    async tokenDelegate(args, signal) {
-        // Destructure the parameters
-        const { ...actionArgs } = args;
-        // Construct an action
-        const nonce = await this.nonceManager();
+    async tokenDelegate(params, opts) {
         const action = actionSorter.tokenDelegate({
             type: "tokenDelegate",
             hyperliquidChain: this._getHyperliquidChain(),
             signatureChainId: await this._getSignatureChainId(),
-            nonce,
-            ...actionArgs,
-        });
-        // Sign the action
-        const signature = await signUserSignedAction({
-            wallet: this.wallet,
-            action,
-            types: userSignedActionEip712Types[action.type],
+            nonce: await this.nonceManager(),
+            ...params,
         });
-        // Send a request
-        const response = await this.transport.request("exchange", { action, signature, nonce }, signal);
-        this._validateResponse(response);
-        return response;
+        return await this._executeUserSignedAction({ action }, opts?.signal);
     }
     /**
      * Cancel a TWAP order.
-     * @param args - The parameters for the request.
-     * @param signal - An optional abort signal.
+     * @param params - Action-specific parameters.
+     * @param opts - Request execution options.
      * @returns Successful variant of {@link TwapCancelResponse} without error status.
      *
      * @throws {ApiRequestError} When the API returns an unsuccessful response.
@@ -1544,37 +1178,26 @@ export class ExchangeClient {
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
      *
-     * const privateKey = "0x..."; // or `viem`, `ethers`
+     * const privateKey = "0x..."; // `viem`, `ethers`, or private key directly`
      * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const exchClient = new hl.ExchangeClient({ wallet: privateKey, transport });
      *
      * const data = await exchClient.twapCancel({ a: 0, t: 1 });
      * ```
      */
-    async twapCancel(args, signal) {
-        // Destructure the parameters
-        const { vaultAddress = this.defaultVaultAddress, expiresAfter = await this._getDefaultExpiresAfter(), ...actionArgs } = args;
-        // Construct an action
-        const nonce = await this.nonceManager();
-        const action = actionSorter.twapCancel({ type: "twapCancel", ...actionArgs });
-        // Sign the action
-        const signature = await signL1Action({
-            wallet: this.wallet,
-            action,
-            nonce,
-            isTestnet: this.isTestnet,
-            vaultAddress,
-            expiresAfter,
+    async twapCancel(params, opts) {
+        const action = actionSorter.twapCancel({
+            type: "twapCancel",
+            ...params,
         });
-        // Send a request
-        const response = await this.transport.request("exchange", { action, signature, nonce, vaultAddress, expiresAfter }, signal);
-        this._validateResponse(response);
-        return response;
+        const vaultAddress = opts?.vaultAddress ?? this.defaultVaultAddress;
+        const expiresAfter = opts?.expiresAfter ?? await this._getDefaultExpiresAfter();
+        return await this._executeL1Action({ action, vaultAddress, expiresAfter }, opts?.signal);
     }
     /**
      * Place a TWAP order.
-     * @param args - The parameters for the request.
-     * @param signal - An optional abort signal.
+     * @param params - Action-specific parameters.
+     * @param opts - Request execution options.
      * @returns Successful variant of {@link TwapOrderResponse} without error status.
      *
      * @throws {ApiRequestError} When the API returns an unsuccessful response.
@@ -1585,44 +1208,35 @@ export class ExchangeClient {
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
      *
-     * const privateKey = "0x..."; // or `viem`, `ethers`
+     * const privateKey = "0x..."; // `viem`, `ethers`, or private key directly`
      * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const exchClient = new hl.ExchangeClient({ wallet: privateKey, transport });
      *
      * const data = await exchClient.twapOrder({
-     *   a: 0,
-     *   b: true,
-     *   s: "1",
-     *   r: false,
-     *   m: 10,
-     *   t: true,
+     *   twap: {
+     *     a: 0,
+     *     b: true,
+     *     s: "1",
+     *     r: false,
+     *     m: 10,
+     *     t: true,
+     *   },
      * });
      * ```
      */
-    async twapOrder(args, signal) {
-        // Destructure the parameters
-        const { vaultAddress = this.defaultVaultAddress, expiresAfter = await this._getDefaultExpiresAfter(), ...actionArgs } = args;
-        // Construct an action
-        const nonce = await this.nonceManager();
-        const action = actionSorter.twapOrder({ type: "twapOrder", twap: { ...actionArgs } });
-        // Sign the action
-        const signature = await signL1Action({
-            wallet: this.wallet,
-            action,
-            nonce,
-            isTestnet: this.isTestnet,
-            vaultAddress,
-            expiresAfter,
+    async twapOrder(params, opts) {
+        const action = actionSorter.twapOrder({
+            type: "twapOrder",
+            ...params,
         });
-        // Send a request
-        const response = await this.transport.request("exchange", { action, signature, nonce, vaultAddress, expiresAfter }, signal);
-        this._validateResponse(response);
-        return response;
+        const vaultAddress = opts?.vaultAddress ?? this.defaultVaultAddress;
+        const expiresAfter = opts?.expiresAfter ?? await this._getDefaultExpiresAfter();
+        return await this._executeL1Action({ action, vaultAddress, expiresAfter }, opts?.signal);
     }
     /**
      * Add or remove margin from isolated position.
-     * @param args - The parameters for the request.
-     * @param signal - An optional abort signal.
+     * @param params - Action-specific parameters.
+     * @param opts - Request execution options.
      * @returns Successful response without specific data.
      *
      * @throws {ApiRequestError} When the API returns an unsuccessful response.
@@ -1633,37 +1247,26 @@ export class ExchangeClient {
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
      *
-     * const privateKey = "0x..."; // or `viem`, `ethers`
+     * const privateKey = "0x..."; // `viem`, `ethers`, or private key directly`
      * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const exchClient = new hl.ExchangeClient({ wallet: privateKey, transport });
      *
      * await exchClient.updateIsolatedMargin({ asset: 0, isBuy: true, ntli: 1 * 1e6 });
      * ```
      */
-    async updateIsolatedMargin(args, signal) {
-        // Destructure the parameters
-        const { vaultAddress = this.defaultVaultAddress, expiresAfter = await this._getDefaultExpiresAfter(), ...actionArgs } = args;
-        // Construct an action
-        const nonce = await this.nonceManager();
-        const action = actionSorter.updateIsolatedMargin({ type: "updateIsolatedMargin", ...actionArgs });
-        // Sign the action
-        const signature = await signL1Action({
-            wallet: this.wallet,
-            action,
-            nonce,
-            isTestnet: this.isTestnet,
-            vaultAddress,
-            expiresAfter,
+    async updateIsolatedMargin(params, opts) {
+        const action = actionSorter.updateIsolatedMargin({
+            type: "updateIsolatedMargin",
+            ...params,
         });
-        // Send a request
-        const response = await this.transport.request("exchange", { action, signature, nonce, vaultAddress, expiresAfter }, signal);
-        this._validateResponse(response);
-        return response;
+        const vaultAddress = opts?.vaultAddress ?? this.defaultVaultAddress;
+        const expiresAfter = opts?.expiresAfter ?? await this._getDefaultExpiresAfter();
+        return await this._executeL1Action({ action, vaultAddress, expiresAfter }, opts?.signal);
     }
     /**
      * Update cross or isolated leverage on a coin.
-     * @param args - The parameters for the request.
-     * @param signal - An optional abort signal.
+     * @param params - Action-specific parameters.
+     * @param opts - Request execution options.
      * @returns Successful response without specific data.
      *
      * @throws {ApiRequestError} When the API returns an unsuccessful response.
@@ -1674,37 +1277,26 @@ export class ExchangeClient {
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
      *
-     * const privateKey = "0x..."; // or `viem`, `ethers`
+     * const privateKey = "0x..."; // `viem`, `ethers`, or private key directly`
      * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const exchClient = new hl.ExchangeClient({ wallet: privateKey, transport });
      *
      * await exchClient.updateLeverage({ asset: 0, isCross: true, leverage: 5 });
      * ```
      */
-    async updateLeverage(args, signal) {
-        // Destructure the parameters
-        const { vaultAddress = this.defaultVaultAddress, expiresAfter = await this._getDefaultExpiresAfter(), ...actionArgs } = args;
-        // Construct an action
-        const nonce = await this.nonceManager();
-        const action = actionSorter.updateLeverage({ type: "updateLeverage", ...actionArgs });
-        // Sign the action
-        const signature = await signL1Action({
-            wallet: this.wallet,
-            action,
-            nonce,
-            isTestnet: this.isTestnet,
-            vaultAddress,
-            expiresAfter,
+    async updateLeverage(params, opts) {
+        const action = actionSorter.updateLeverage({
+            type: "updateLeverage",
+            ...params,
         });
-        // Send a request
-        const response = await this.transport.request("exchange", { action, signature, nonce, vaultAddress, expiresAfter }, signal);
-        this._validateResponse(response);
-        return response;
+        const vaultAddress = opts?.vaultAddress ?? this.defaultVaultAddress;
+        const expiresAfter = opts?.expiresAfter ?? await this._getDefaultExpiresAfter();
+        return await this._executeL1Action({ action, vaultAddress, expiresAfter }, opts?.signal);
     }
     /**
      * Transfer funds between Spot account and Perp account.
-     * @param args - The parameters for the request.
-     * @param signal - An optional abort signal.
+     * @param params - Action-specific parameters.
+     * @param opts - Request execution options.
      * @returns Successful response without specific data.
      *
      * @throws {ApiRequestError} When the API returns an unsuccessful response.
@@ -1715,40 +1307,27 @@ export class ExchangeClient {
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
      *
-     * const privateKey = "0x..."; // or `viem`, `ethers`
+     * const privateKey = "0x..."; // `viem`, `ethers`, or private key directly`
      * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const exchClient = new hl.ExchangeClient({ wallet: privateKey, transport });
      *
      * await exchClient.usdClassTransfer({ amount: "1", toPerp: true });
      * ```
      */
-    async usdClassTransfer(args, signal) {
-        // Destructure the parameters
-        const { ...actionArgs } = args;
-        // Construct an action
-        const nonce = await this.nonceManager();
+    async usdClassTransfer(params, opts) {
         const action = actionSorter.usdClassTransfer({
             type: "usdClassTransfer",
             hyperliquidChain: this._getHyperliquidChain(),
             signatureChainId: await this._getSignatureChainId(),
-            nonce,
-            ...actionArgs,
+            nonce: await this.nonceManager(),
+            ...params,
         });
-        // Sign the action
-        const signature = await signUserSignedAction({
-            wallet: this.wallet,
-            action,
-            types: userSignedActionEip712Types[action.type],
-        });
-        // Send a request
-        const response = await this.transport.request("exchange", { action, signature, nonce }, signal);
-        this._validateResponse(response);
-        return response;
+        return await this._executeUserSignedAction({ action }, opts?.signal);
     }
     /**
      * Send usd to another address.
-     * @param args - The parameters for the request.
-     * @param signal - An optional abort signal.
+     * @param params - Action-specific parameters.
+     * @param opts - Request execution options.
      * @returns Successful response without specific data.
      *
      * @throws {ApiRequestError} When the API returns an unsuccessful response.
@@ -1759,40 +1338,27 @@ export class ExchangeClient {
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
      *
-     * const privateKey = "0x..."; // or `viem`, `ethers`
+     * const privateKey = "0x..."; // `viem`, `ethers`, or private key directly`
      * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const exchClient = new hl.ExchangeClient({ wallet: privateKey, transport });
      *
      * await exchClient.usdSend({ destination: "0x...", amount: "1" });
      * ```
      */
-    async usdSend(args, signal) {
-        // Destructure the parameters
-        const { ...actionArgs } = args;
-        // Construct an action
-        const nonce = await this.nonceManager();
+    async usdSend(params, opts) {
         const action = actionSorter.usdSend({
             type: "usdSend",
             hyperliquidChain: this._getHyperliquidChain(),
             signatureChainId: await this._getSignatureChainId(),
-            time: nonce,
-            ...actionArgs,
-        });
-        // Sign the action
-        const signature = await signUserSignedAction({
-            wallet: this.wallet,
-            action,
-            types: userSignedActionEip712Types[action.type],
+            time: await this.nonceManager(),
+            ...params,
         });
-        // Send a request
-        const response = await this.transport.request("exchange", { action, signature, nonce }, signal);
-        this._validateResponse(response);
-        return response;
+        return await this._executeUserSignedAction({ action }, opts?.signal);
     }
     /**
      * Distribute funds from a vault between followers.
-     * @param args - The parameters for the request.
-     * @param signal - An optional abort signal.
+     * @param params - Action-specific parameters.
+     * @param opts - Request execution options.
      * @returns Successful response without specific data.
      *
      * @throws {ApiRequestError} When the API returns an unsuccessful response.
@@ -1803,35 +1369,25 @@ export class ExchangeClient {
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
      *
-     * const privateKey = "0x..."; // or `viem`, `ethers`
+     * const privateKey = "0x..."; // `viem`, `ethers`, or private key directly`
      * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const exchClient = new hl.ExchangeClient({ wallet: privateKey, transport });
      *
      * await exchClient.vaultDistribute({ vaultAddress: "0x...", usd: 10 * 1e6 });
      * ```
      */
-    async vaultDistribute(args, signal) {
-        // Destructure the parameters
-        const { ...actionArgs } = args;
-        // Construct an action
-        const nonce = await this.nonceManager();
-        const action = actionSorter.vaultDistribute({ type: "vaultDistribute", ...actionArgs });
-        // Sign the action
-        const signature = await signL1Action({
-            wallet: this.wallet,
-            action,
-            nonce,
-            isTestnet: this.isTestnet,
+    async vaultDistribute(params, opts) {
+        const action = actionSorter.vaultDistribute({
+            type: "vaultDistribute",
+            ...params,
         });
-        // Send a request
-        const response = await this.transport.request("exchange", { action, signature, nonce }, signal);
-        this._validateResponse(response);
-        return response;
+        const expiresAfter = opts?.expiresAfter ?? await this._getDefaultExpiresAfter();
+        return await this._executeL1Action({ action, expiresAfter }, opts?.signal);
     }
     /**
      * Modify a vault's configuration.
-     * @param args - The parameters for the request.
-     * @param signal - An optional abort signal.
+     * @param params - Action-specific parameters.
+     * @param opts - Request execution options.
      * @returns Successful response without specific data.
      *
      * @throws {ApiRequestError} When the API returns an unsuccessful response.
@@ -1842,7 +1398,7 @@ export class ExchangeClient {
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
      *
-     * const privateKey = "0x..."; // or `viem`, `ethers`
+     * const privateKey = "0x..."; // `viem`, `ethers`, or private key directly`
      * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const exchClient = new hl.ExchangeClient({ wallet: privateKey, transport });
      *
@@ -1853,28 +1409,18 @@ export class ExchangeClient {
      * });
      * ```
      */
-    async vaultModify(args, signal) {
-        // Destructure the parameters
-        const { ...actionArgs } = args;
-        // Construct an action
-        const nonce = await this.nonceManager();
-        const action = actionSorter.vaultModify({ type: "vaultModify", ...actionArgs });
-        // Sign the action
-        const signature = await signL1Action({
-            wallet: this.wallet,
-            action,
-            nonce,
-            isTestnet: this.isTestnet,
+    async vaultModify(params, opts) {
+        const action = actionSorter.vaultModify({
+            type: "vaultModify",
+            ...params,
         });
-        // Send a request
-        const response = await this.transport.request("exchange", { action, signature, nonce }, signal);
-        this._validateResponse(response);
-        return response;
+        const expiresAfter = opts?.expiresAfter ?? await this._getDefaultExpiresAfter();
+        return await this._executeL1Action({ action, expiresAfter }, opts?.signal);
     }
     /**
      * Deposit or withdraw from a vault.
-     * @param args - The parameters for the request.
-     * @param signal - An optional abort signal.
+     * @param params - Action-specific parameters.
+     * @param opts - Request execution options.
      * @returns Successful response without specific data.
      *
      * @throws {ApiRequestError} When the API returns an unsuccessful response.
@@ -1885,36 +1431,25 @@ export class ExchangeClient {
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
      *
-     * const privateKey = "0x..."; // or `viem`, `ethers`
+     * const privateKey = "0x..."; // `viem`, `ethers`, or private key directly`
      * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const exchClient = new hl.ExchangeClient({ wallet: privateKey, transport });
      *
      * await exchClient.vaultTransfer({ vaultAddress: "0x...", isDeposit: true, usd: 10 * 1e6 });
      * ```
      */
-    async vaultTransfer(args, signal) {
-        // Destructure the parameters
-        const { expiresAfter = await this._getDefaultExpiresAfter(), ...actionArgs } = args;
-        // Construct an action
-        const nonce = await this.nonceManager();
-        const action = actionSorter.vaultTransfer({ type: "vaultTransfer", ...actionArgs });
-        // Sign the action
-        const signature = await signL1Action({
-            wallet: this.wallet,
-            action,
-            nonce,
-            isTestnet: this.isTestnet,
-            expiresAfter,
+    async vaultTransfer(params, opts) {
+        const action = actionSorter.vaultTransfer({
+            type: "vaultTransfer",
+            ...params,
         });
-        // Send a request
-        const response = await this.transport.request("exchange", { action, signature, nonce, expiresAfter }, signal);
-        this._validateResponse(response);
-        return response;
+        const expiresAfter = opts?.expiresAfter ?? await this._getDefaultExpiresAfter();
+        return await this._executeL1Action({ action, expiresAfter }, opts?.signal);
     }
     /**
      * Initiate a withdrawal request.
-     * @param args - The parameters for the request.
-     * @param signal - An optional abort signal.
+     * @param params - Action-specific parameters.
+     * @param opts - Request execution options.
      * @returns Successful response without specific data.
      *
      * @throws {ApiRequestError} When the API returns an unsuccessful response.
@@ -1925,26 +1460,44 @@ export class ExchangeClient {
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
      *
-     * const privateKey = "0x..."; // or `viem`, `ethers`
+     * const privateKey = "0x..."; // `viem`, `ethers`, or private key directly`
      * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const exchClient = new hl.ExchangeClient({ wallet: privateKey, transport });
      *
      * await exchClient.withdraw3({ destination: "0x...", amount: "1" });
      * ```
      */
-    async withdraw3(args, signal) {
-        // Destructure the parameters
-        const { ...actionArgs } = args;
-        // Construct an action
-        const nonce = await this.nonceManager();
+    async withdraw3(params, opts) {
         const action = actionSorter.withdraw3({
             type: "withdraw3",
             hyperliquidChain: this._getHyperliquidChain(),
             signatureChainId: await this._getSignatureChainId(),
-            time: nonce,
-            ...actionArgs,
+            time: await this.nonceManager(),
+            ...params,
         });
-        // Sign the action
+        return await this._executeUserSignedAction({ action }, opts?.signal);
+    }
+    async _executeL1Action(request, signal) {
+        const { action, vaultAddress, expiresAfter } = request;
+        // Sign an L1 action
+        const nonce = await this.nonceManager();
+        const signature = await signL1Action({
+            wallet: this.wallet,
+            action,
+            nonce,
+            isTestnet: this.isTestnet,
+            vaultAddress,
+            expiresAfter,
+        });
+        // Send a request
+        const response = await this.transport.request("exchange", { action, signature, nonce, vaultAddress, expiresAfter }, signal);
+        this._validateResponse(response);
+        return response;
+    }
+    async _executeUserSignedAction(request, signal) {
+        const { action } = request;
+        // Sign a user-signed action
+        const nonce = "nonce" in action ? action.nonce : action.time;
         const signature = await signUserSignedAction({
             wallet: this.wallet,
             action,
@@ -1955,46 +1508,33 @@ export class ExchangeClient {
         this._validateResponse(response);
         return response;
     }
-    /** 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";
+    async _executeMultiSigAction(request, signal) {
+        const { action, nonce, vaultAddress, expiresAfter } = request;
+        // Sign a multi-signature action
+        const signature = await signMultiSigAction({
+            wallet: this.wallet,
+            action,
+            nonce,
+            isTestnet: this.isTestnet,
+            vaultAddress,
+            expiresAfter,
+        });
+        // Send a request
+        const response = await this.transport.request("exchange", { action, signature, nonce, vaultAddress, expiresAfter }, signal);
+        this._validateResponse(response);
+        return response;
     }
-    /** Get the default expiration time for an action. */
     async _getDefaultExpiresAfter() {
         return typeof this.defaultExpiresAfter === "number"
             ? this.defaultExpiresAfter
             : await this.defaultExpiresAfter?.();
     }
-    /** Get the signature chain ID for the wallet. */
     async _getSignatureChainId() {
         return typeof this.signatureChainId === "string" ? this.signatureChainId : await this.signatureChainId();
     }
-    /** Get the Hyperliquid chain based on the isTestnet flag. */
     _getHyperliquidChain() {
         return this.isTestnet ? "Testnet" : "Mainnet";
     }
-    /** Validate a response from the API. */
     _validateResponse(response) {
         if (response.status === "err") {
             throw new ApiRequestError(response);