@nktkas/hyperliquid 0.21.0 → 0.22.0

package/esm/src/clients/exchange.js

@@ -1,35 +1,35 @@
 import { HyperliquidError } from "../base.js";
-import { isAbstractEthersSigner, isAbstractEthersV5Signer, isAbstractExtendedViemWalletClient, isAbstractViemWalletClient, isAbstractWindowEthereum, signL1Action, signMultiSigAction, signUserSignedAction, } from "../signing.js";
+import { actionSorter, isAbstractEthersSigner, isAbstractEthersV5Signer, isAbstractViemWalletClient, isAbstractWindowEthereum, signL1Action, signMultiSigAction, signUserSignedAction, userSignedActionEip712Types, } from "../signing.js";
 /** Error thrown when the API returns an error response. */
 export class ApiRequestError extends HyperliquidError {
     response;
     constructor(response) {
-        let message = "Cannot process API request";
+        let message;
         if (response.status === "err") {
-            // For ErrorResponse
-            message += `: ${response.response}`;
+            // ErrorResponse
+            message = response.response;
         }
         else {
             if ("statuses" in response.response.data) {
-                // For OrderResponse, CancelResponse
+                // OrderResponse | CancelResponse
                 const errors = response.response.data.statuses.reduce((acc, status, index) => {
                     if (typeof status === "object" && "error" in status) {
-                        acc.push(`Order ${index} failed: ${status.error}`);
+                        acc.push(`Order ${index}: ${status.error}`);
                     }
                     return acc;
                 }, []);
                 if (errors.length > 0) {
-                    message += `: ${errors.join(", ")}`;
+                    message = errors.join(", ");
                 }
             }
             else {
-                // For TwapOrderResponse, TwapCancelResponse
+                // TwapOrderResponse | TwapCancelResponse
                 if (typeof response.response.data.status === "object" && "error" in response.response.data.status) {
-                    message += `: ${response.response.data.status.error}`;
+                    message = response.response.data.status.error;
                 }
             }
         }
-        super(message);
+        super(message || "An unknown error occurred while processing an API request. See `response` for more details.");
         this.response = response;
         this.name = "ApiRequestError";
     }
@@ -56,7 +56,7 @@ class NonceManager {
 /**
  * Exchange client for interacting with the Hyperliquid API.
  * @typeParam T The transport used to connect to the Hyperliquid API.
- * @typeParam W The WalletClient/Account ([viem](https://viem.sh/docs/clients/wallet)) or Signer ([ethers.js](https://docs.ethers.io/v6/api/providers/#Signer)) used for signing transactions.
+ * @typeParam W The wallet used for signing transactions.
  */
 export class ExchangeClient {
     transport;
@@ -138,37 +138,33 @@ export class ExchangeClient {
      * const transport = new hl.HttpTransport(); // or WebSocketTransport
      * const exchClient = new hl.ExchangeClient({ wallet, transport });
      *
-     * const result = await client.approveAgent({ agentAddress: "0x...", agentName: "agentName" });
+     * const data = await exchClient.approveAgent({ agentAddress: "0x...", agentName: "agentName" });
      * ```
      */
     async approveAgent(args, signal) {
+        // Destructure the parameters
+        const { ...actionArgs } = args;
         // Construct an action
+        const nonce = await this.nonceManager();
         const action = {
-            ...args,
+            ...actionArgs,
             agentName: args.agentName ?? "",
             type: "approveAgent",
             hyperliquidChain: this._getHyperliquidChain(),
             signatureChainId: await this._getSignatureChainId(),
-            nonce: await this.nonceManager(),
+            nonce,
         };
         // Sign the action
         const signature = await signUserSignedAction({
             wallet: this.wallet,
             action,
-            types: {
-                "HyperliquidTransaction:ApproveAgent": [
-                    { name: "hyperliquidChain", type: "string" },
-                    { name: "agentAddress", type: "address" },
-                    { name: "agentName", type: "string" },
-                    { name: "nonce", type: "uint64" },
-                ],
-            },
+            types: userSignedActionEip712Types[action.type],
             chainId: parseInt(action.signatureChainId, 16),
         });
         if (action.agentName === "")
             delete action.agentName;
         // Send a request
-        return await this._request({ action, signature, nonce: action.nonce }, signal);
+        return await this._request({ action, signature, nonce }, signal);
     }
     /**
      * Approve a maximum fee rate for a builder.
@@ -187,34 +183,30 @@ export class ExchangeClient {
      * const transport = new hl.HttpTransport(); // or WebSocketTransport
      * const exchClient = new hl.ExchangeClient({ wallet, transport });
      *
-     * const result = await client.approveBuilderFee({ maxFeeRate: "0.01%", builder: "0x..." });
+     * const data = 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();
         const action = {
-            ...args,
+            ...actionArgs,
             type: "approveBuilderFee",
             hyperliquidChain: this._getHyperliquidChain(),
             signatureChainId: await this._getSignatureChainId(),
-            nonce: await this.nonceManager(),
+            nonce,
         };
         // Sign the action
         const signature = await signUserSignedAction({
             wallet: this.wallet,
             action,
-            types: {
-                "HyperliquidTransaction:ApproveBuilderFee": [
-                    { name: "hyperliquidChain", type: "string" },
-                    { name: "maxFeeRate", type: "string" },
-                    { name: "builder", type: "address" },
-                    { name: "nonce", type: "uint64" },
-                ],
-            },
+            types: userSignedActionEip712Types[action.type],
             chainId: parseInt(action.signatureChainId, 16),
         });
         // Send a request
-        return await this._request({ action, signature, nonce: action.nonce }, signal);
+        return await this._request({ action, signature, nonce }, signal);
     }
     /**
      * Modify multiple orders.
@@ -233,7 +225,7 @@ export class ExchangeClient {
      * const transport = new hl.HttpTransport(); // or WebSocketTransport
      * const exchClient = new hl.ExchangeClient({ wallet, transport });
      *
-     * const result = await client.batchModify({
+     * const data = await exchClient.batchModify({
      *   modifies: [{
      *     oid: 123,
      *     order: {
@@ -247,7 +239,7 @@ export class ExchangeClient {
      *           tif: "Gtc", // Good-til-cancelled
      *         },
      *       },
-     *       c: "0x...", // Optional: Client Order ID
+     *       c: "0x...", // Client Order ID (optional)
      *     },
      *   }],
      * });
@@ -260,40 +252,12 @@ export class ExchangeClient {
         const nonce = await this.nonceManager();
         const action = {
             type: "batchModify",
-            modifies: actionArgs.modifies.map((modify) => {
-                const sortedModify = {
-                    oid: modify.oid,
-                    order: {
-                        a: modify.order.a,
-                        b: modify.order.b,
-                        p: this._formatDecimal(modify.order.p),
-                        s: this._formatDecimal(modify.order.s),
-                        r: modify.order.r,
-                        t: "limit" in modify.order.t
-                            ? {
-                                limit: {
-                                    tif: modify.order.t.limit.tif,
-                                },
-                            }
-                            : {
-                                trigger: {
-                                    isMarket: modify.order.t.trigger.isMarket,
-                                    triggerPx: this._formatDecimal(modify.order.t.trigger.triggerPx),
-                                    tpsl: modify.order.t.trigger.tpsl,
-                                },
-                            },
-                        c: modify.order.c,
-                    },
-                };
-                if (sortedModify.order.c === undefined)
-                    delete sortedModify.order.c;
-                return sortedModify;
-            }),
+            ...actionArgs,
         };
         // Sign the action
         const signature = await signL1Action({
             wallet: this.wallet,
-            action,
+            action: actionSorter[action.type](action),
             nonce,
             isTestnet: this.isTestnet,
             vaultAddress,
@@ -319,7 +283,7 @@ export class ExchangeClient {
      * const transport = new hl.HttpTransport(); // or WebSocketTransport
      * const exchClient = new hl.ExchangeClient({ wallet, transport });
      *
-     * const result = await client.cancel({
+     * const data = await exchClient.cancel({
      *   cancels: [{
      *     a: 0, // Asset index
      *     o: 123, // Order ID
@@ -334,15 +298,12 @@ export class ExchangeClient {
         const nonce = await this.nonceManager();
         const action = {
             type: "cancel",
-            cancels: actionArgs.cancels.map((cancel) => ({
-                a: cancel.a,
-                o: cancel.o,
-            })),
+            ...actionArgs,
         };
         // Sign the action
         const signature = await signL1Action({
             wallet: this.wallet,
-            action,
+            action: actionSorter[action.type](action),
             nonce,
             isTestnet: this.isTestnet,
             vaultAddress,
@@ -368,7 +329,7 @@ export class ExchangeClient {
      * const transport = new hl.HttpTransport(); // or WebSocketTransport
      * const exchClient = new hl.ExchangeClient({ wallet, transport });
      *
-     * const result = await client.cancelByCloid({
+     * const data = await exchClient.cancelByCloid({
      *   cancels: [
      *     { asset: 0, cloid: "0x..." },
      *   ],
@@ -382,15 +343,12 @@ export class ExchangeClient {
         const nonce = await this.nonceManager();
         const action = {
             type: "cancelByCloid",
-            cancels: actionArgs.cancels.map((cancel) => ({
-                asset: cancel.asset,
-                cloid: cancel.cloid,
-            })),
+            ...actionArgs,
         };
         // Sign the action
         const signature = await signL1Action({
             wallet: this.wallet,
-            action,
+            action: actionSorter[action.type](action),
             nonce,
             isTestnet: this.isTestnet,
             vaultAddress,
@@ -416,33 +374,30 @@ export class ExchangeClient {
      * const transport = new hl.HttpTransport(); // or WebSocketTransport
      * const exchClient = new hl.ExchangeClient({ wallet, transport });
      *
-     * const result = await client.cDeposit({ wei: 1 * 1e8 });
+     * const data = await exchClient.cDeposit({ wei: 1 * 1e8 });
      * ```
      */
     async cDeposit(args, signal) {
+        // Destructure the parameters
+        const { ...actionArgs } = args;
         // Construct an action
+        const nonce = await this.nonceManager();
         const action = {
-            ...args,
+            ...actionArgs,
             type: "cDeposit",
             hyperliquidChain: this._getHyperliquidChain(),
             signatureChainId: await this._getSignatureChainId(),
-            nonce: await this.nonceManager(),
+            nonce,
         };
         // Sign the action
         const signature = await signUserSignedAction({
             wallet: this.wallet,
             action,
-            types: {
-                "HyperliquidTransaction:CDeposit": [
-                    { name: "hyperliquidChain", type: "string" },
-                    { name: "wei", type: "uint64" },
-                    { name: "nonce", type: "uint64" },
-                ],
-            },
+            types: userSignedActionEip712Types[action.type],
             chainId: parseInt(action.signatureChainId, 16),
         });
         // Send a request
-        return await this._request({ action, signature, nonce: action.nonce }, signal);
+        return await this._request({ action, signature, nonce }, signal);
     }
     /**
      * Claim rewards from referral program.
@@ -461,17 +416,19 @@ export class ExchangeClient {
      * const transport = new hl.HttpTransport(); // or WebSocketTransport
      * const exchClient = new hl.ExchangeClient({ wallet, transport });
      *
-     * const result = await client.claimRewards();
+     * const data = await exchClient.claimRewards();
      * ```
      */
     async claimRewards(signal) {
         // Construct an action
         const nonce = await this.nonceManager();
-        const action = { type: "claimRewards" };
+        const action = {
+            type: "claimRewards",
+        };
         // Sign the action
         const signature = await signL1Action({
             wallet: this.wallet,
-            action,
+            action: actionSorter[action.type](action),
             nonce,
             isTestnet: this.isTestnet,
         });
@@ -479,7 +436,7 @@ export class ExchangeClient {
         return await this._request({ action, signature, nonce }, signal);
     }
     /**
-     * Convert a single-signature account to a multi-signature account.
+     * 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.
      * @returns Successful response without specific data.
@@ -495,36 +452,33 @@ export class ExchangeClient {
      * const transport = new hl.HttpTransport(); // or WebSocketTransport
      * const exchClient = new hl.ExchangeClient({ wallet, transport });
      *
-     * const result = await client.convertToMultiSigUser({
-     *   authorizedUsers: ["0x...", "0x..."],
+     * const data = await exchClient.convertToMultiSigUser({ // convert to multi-sig user
+     *   authorizedUsers: ["0x...", "0x...", "0x..."],
      *   threshold: 2,
      * });
      * ```
      */
     async convertToMultiSigUser(args, signal) {
+        // Destructure the parameters
+        const { ...actionArgs } = args;
         // Construct an action
+        const nonce = await this.nonceManager();
         const action = {
             type: "convertToMultiSigUser",
             hyperliquidChain: this._getHyperliquidChain(),
             signatureChainId: await this._getSignatureChainId(),
-            signers: JSON.stringify(args),
-            nonce: await this.nonceManager(),
+            signers: JSON.stringify(actionArgs),
+            nonce,
         };
         // Sign the action
         const signature = await signUserSignedAction({
             wallet: this.wallet,
             action,
-            types: {
-                "HyperliquidTransaction:ConvertToMultiSigUser": [
-                    { name: "hyperliquidChain", type: "string" },
-                    { name: "signers", type: "string" },
-                    { name: "nonce", type: "uint64" },
-                ],
-            },
+            types: userSignedActionEip712Types[action.type],
             chainId: parseInt(action.signatureChainId, 16),
         });
         // Send a request
-        return await this._request({ action, signature, nonce: action.nonce }, signal);
+        return await this._request({ action, signature, nonce }, signal);
     }
     /**
      * Create a sub-account.
@@ -543,20 +497,22 @@ export class ExchangeClient {
      * const transport = new hl.HttpTransport(); // or WebSocketTransport
      * const exchClient = new hl.ExchangeClient({ wallet, transport });
      *
-     * const result = await client.createSubAccount({ name: "subAccountName" });
+     * const data = await exchClient.createSubAccount({ name: "subAccountName" });
      * ```
      */
     async createSubAccount(args, signal) {
+        // Destructure the parameters
+        const { ...actionArgs } = args;
         // Construct an action
         const nonce = await this.nonceManager();
         const action = {
             type: "createSubAccount",
-            name: args.name,
+            ...actionArgs,
         };
         // Sign the action
         const signature = await signL1Action({
             wallet: this.wallet,
-            action,
+            action: actionSorter[action.type](action),
             nonce,
             isTestnet: this.isTestnet,
         });
@@ -580,27 +536,27 @@ export class ExchangeClient {
      * const transport = new hl.HttpTransport(); // or WebSocketTransport
      * const exchClient = new hl.ExchangeClient({ wallet, transport });
      *
-     * const result = await client.createVault({
+     * const data = await exchClient.createVault({
      *   name: "VaultName",
-     *   description: "This is an example of a vault description",
+     *   description: "Vault description",
      *   initialUsd: 100 * 1e6,
      * });
      * ```
      */
     async createVault(args, signal) {
+        // Destructure the parameters
+        const { ...actionArgs } = args;
         // Construct an action
         const nonce = await this.nonceManager();
         const action = {
             type: "createVault",
-            name: args.name,
-            description: args.description,
-            initialUsd: args.initialUsd,
             nonce,
+            ...actionArgs,
         };
         // Sign the action
         const signature = await signL1Action({
             wallet: this.wallet,
-            action,
+            action: actionSorter[action.type](action),
             nonce,
             isTestnet: this.isTestnet,
         });
@@ -619,7 +575,7 @@ export class ExchangeClient {
         // Sign the action
         const signature = await signL1Action({
             wallet: this.wallet,
-            action,
+            action: actionSorter[action.type](action),
             nonce,
             isTestnet: this.isTestnet,
             expiresAfter,
@@ -632,48 +588,14 @@ export class ExchangeClient {
         const { expiresAfter = await this._getDefaultExpiresAfter(), ...actionArgs } = args;
         // Construct an action
         const nonce = await this.nonceManager();
-        let action;
-        if ("changeProfile" in actionArgs) {
-            action = {
-                type: "CValidatorAction",
-                changeProfile: {
-                    node_ip: actionArgs.changeProfile.node_ip ?? null,
-                    name: actionArgs.changeProfile.name ?? null,
-                    description: actionArgs.changeProfile.description ?? null,
-                    unjailed: actionArgs.changeProfile.unjailed,
-                    disable_delegations: actionArgs.changeProfile.disable_delegations ?? null,
-                    commission_bps: actionArgs.changeProfile.commission_bps ?? null,
-                    signer: actionArgs.changeProfile.signer?.toLowerCase() ?? null,
-                },
-            };
-        }
-        else if ("register" in actionArgs) {
-            action = {
-                type: "CValidatorAction",
-                register: {
-                    profile: {
-                        node_ip: { Ip: actionArgs.register.profile.node_ip.Ip },
-                        name: actionArgs.register.profile.name,
-                        description: actionArgs.register.profile.description,
-                        delegations_disabled: actionArgs.register.profile.delegations_disabled,
-                        commission_bps: actionArgs.register.profile.commission_bps,
-                        signer: actionArgs.register.profile.signer?.toLowerCase(),
-                    },
-                    unjailed: actionArgs.register.unjailed,
-                    initial_wei: actionArgs.register.initial_wei,
-                },
-            };
-        }
-        else {
-            action = {
-                type: "CValidatorAction",
-                unregister: actionArgs.unregister,
-            };
-        }
+        const action = {
+            type: "CValidatorAction",
+            ...actionArgs,
+        };
         // Sign the action
         const signature = await signL1Action({
             wallet: this.wallet,
-            action,
+            action: actionSorter[action.type](action),
             nonce,
             isTestnet: this.isTestnet,
             expiresAfter,
@@ -698,33 +620,30 @@ export class ExchangeClient {
      * const transport = new hl.HttpTransport(); // or WebSocketTransport
      * const exchClient = new hl.ExchangeClient({ wallet, transport });
      *
-     * const result = await client.cWithdraw({ wei: 1 * 1e8 });
+     * const data = await exchClient.cWithdraw({ wei: 1 * 1e8 });
      * ```
      */
     async cWithdraw(args, signal) {
+        // Destructure the parameters
+        const { ...actionArgs } = args;
         // Construct an action
+        const nonce = await this.nonceManager();
         const action = {
-            ...args,
+            ...actionArgs,
             type: "cWithdraw",
             hyperliquidChain: this._getHyperliquidChain(),
             signatureChainId: await this._getSignatureChainId(),
-            nonce: await this.nonceManager(),
+            nonce,
         };
         // Sign the action
         const signature = await signUserSignedAction({
             wallet: this.wallet,
             action,
-            types: {
-                "HyperliquidTransaction:CWithdraw": [
-                    { name: "hyperliquidChain", type: "string" },
-                    { name: "wei", type: "uint64" },
-                    { name: "nonce", type: "uint64" },
-                ],
-            },
+            types: userSignedActionEip712Types[action.type],
             chainId: parseInt(action.signatureChainId, 16),
         });
         // Send a request
-        return await this._request({ action, signature, nonce: action.nonce }, signal);
+        return await this._request({ action, signature, nonce }, signal);
     }
     /**
      * Configure block type for EVM transactions.
@@ -743,20 +662,22 @@ export class ExchangeClient {
      * const transport = new hl.HttpTransport(); // or WebSocketTransport
      * const exchClient = new hl.ExchangeClient({ wallet, transport });
      *
-     * const result = await client.evmUserModify({ usingBigBlocks: true });
+     * 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 = {
             type: "evmUserModify",
-            usingBigBlocks: args.usingBigBlocks,
+            ...actionArgs,
         };
         // Sign the action
         const signature = await signL1Action({
             wallet: this.wallet,
-            action,
+            action: actionSorter[action.type](action),
             nonce,
             isTestnet: this.isTestnet,
         });
@@ -780,7 +701,7 @@ export class ExchangeClient {
      * const transport = new hl.HttpTransport(); // or WebSocketTransport
      * const exchClient = new hl.ExchangeClient({ wallet, transport });
      *
-     * const result = await client.modify({
+     * const data = await exchClient.modify({
      *   oid: 123,
      *   order: {
      *     a: 0, // Asset index
@@ -793,7 +714,7 @@ export class ExchangeClient {
      *         tif: "Gtc", // Good-til-cancelled
      *       },
      *     },
-     *     c: "0x...", // Optional: Client Order ID
+     *     c: "0x...", // Client Order ID (optional)
      *   },
      * });
      * ```
@@ -805,35 +726,12 @@ export class ExchangeClient {
         const nonce = await this.nonceManager();
         const action = {
             type: "modify",
-            oid: actionArgs.oid,
-            order: {
-                a: actionArgs.order.a,
-                b: actionArgs.order.b,
-                p: this._formatDecimal(actionArgs.order.p),
-                s: this._formatDecimal(actionArgs.order.s),
-                r: actionArgs.order.r,
-                t: "limit" in actionArgs.order.t
-                    ? {
-                        limit: {
-                            tif: actionArgs.order.t.limit.tif,
-                        },
-                    }
-                    : {
-                        trigger: {
-                            isMarket: actionArgs.order.t.trigger.isMarket,
-                            triggerPx: this._formatDecimal(actionArgs.order.t.trigger.triggerPx),
-                            tpsl: actionArgs.order.t.trigger.tpsl,
-                        },
-                    },
-                c: actionArgs.order.c,
-            },
+            ...actionArgs,
         };
-        if (action.order.c === undefined)
-            delete action.order.c;
         // Sign the action
         const signature = await signL1Action({
             wallet: this.wallet,
-            action,
+            action: actionSorter[action.type](action),
             nonce,
             isTestnet: this.isTestnet,
             vaultAddress,
@@ -871,7 +769,7 @@ export class ExchangeClient {
      *   isTestnet: true,
      * });
      *
-     * const result = await client.multiSig({
+     * const data = await exchClient.multiSig({
      *   signatures: [signature],
      *   payload: {
      *     multiSigUser,
@@ -881,29 +779,18 @@ export class ExchangeClient {
      *   nonce,
      * });
      * ```
-     * @unstable May not behave as expected and the interface may change in the future.
      */
     async multiSig(args, signal) {
         // Destructure the parameters
         const { vaultAddress = this.defaultVaultAddress, expiresAfter = await this._getDefaultExpiresAfter(), nonce, ...actionArgs } = args;
         // Construct an action
-        const hyperliquidChain = this._getHyperliquidChain();
         const action = {
             type: "multiSig",
             signatureChainId: await this._getSignatureChainId(),
-            signatures: actionArgs.signatures.map((signature) => ({
-                r: signature.r.replace(/^0x0+/, "0x").toLowerCase(),
-                s: signature.s.replace(/^0x0+/, "0x").toLowerCase(),
-                v: signature.v,
-            })),
-            payload: {
-                multiSigUser: actionArgs.payload.multiSigUser.toLowerCase(),
-                outerSigner: actionArgs.payload.outerSigner.toLowerCase(),
-                action: actionArgs.payload.action,
-            },
+            ...actionArgs,
         };
         // Sign the action
-        const actionForMultiSig = structuredClone(action);
+        const actionForMultiSig = actionSorter[action.type](action);
         delete actionForMultiSig.type;
         const signature = await signMultiSigAction({
             wallet: this.wallet,
@@ -911,7 +798,7 @@ export class ExchangeClient {
             nonce,
             vaultAddress,
             expiresAfter,
-            hyperliquidChain,
+            hyperliquidChain: this._getHyperliquidChain(),
             signatureChainId: action.signatureChainId,
         });
         // Send a request
@@ -934,7 +821,7 @@ export class ExchangeClient {
      * const transport = new hl.HttpTransport(); // or WebSocketTransport
      * const exchClient = new hl.ExchangeClient({ wallet, transport });
      *
-     * const result = await client.order({
+     * const data = await exchClient.order({
      *   orders: [{
      *     a: 0, // Asset index
      *     b: true, // Buy order
@@ -946,7 +833,7 @@ export class ExchangeClient {
      *         tif: "Gtc", // Good-til-cancelled
      *       },
      *     },
-     *     c: "0x...", // Optional: Client Order ID
+     *     c: "0x...", // Client Order ID (optional)
      *   }],
      *   grouping: "na", // No grouping
      * });
@@ -959,46 +846,12 @@ export class ExchangeClient {
         const nonce = await this.nonceManager();
         const action = {
             type: "order",
-            orders: actionArgs.orders.map((order) => {
-                const sortedOrder = {
-                    a: order.a,
-                    b: order.b,
-                    p: this._formatDecimal(order.p),
-                    s: this._formatDecimal(order.s),
-                    r: order.r,
-                    t: "limit" in order.t
-                        ? {
-                            limit: {
-                                tif: order.t.limit.tif,
-                            },
-                        }
-                        : {
-                            trigger: {
-                                isMarket: order.t.trigger.isMarket,
-                                triggerPx: this._formatDecimal(order.t.trigger.triggerPx),
-                                tpsl: order.t.trigger.tpsl,
-                            },
-                        },
-                    c: order.c,
-                };
-                if (order.c === undefined)
-                    delete sortedOrder.c;
-                return sortedOrder;
-            }),
-            grouping: actionArgs.grouping,
-            builder: actionArgs.builder
-                ? {
-                    b: actionArgs.builder.b.toLowerCase(),
-                    f: actionArgs.builder.f,
-                }
-                : actionArgs.builder,
+            ...actionArgs,
         };
-        if (action.builder === undefined)
-            delete action.builder;
         // Sign the action
         const signature = await signL1Action({
             wallet: this.wallet,
-            action,
+            action: actionSorter[action.type](action),
             nonce,
             isTestnet: this.isTestnet,
             vaultAddress,
@@ -1008,47 +861,18 @@ export class ExchangeClient {
         return await this._request({ action, signature, nonce, vaultAddress, expiresAfter }, signal);
     }
     async perpDeploy(args, signal) {
+        // Destructure the parameters
+        const { ...actionArgs } = args;
         // Construct an action
         const nonce = await this.nonceManager();
-        let action;
-        if ("registerAsset" in args) {
-            action = {
-                type: "perpDeploy",
-                registerAsset: {
-                    maxGas: args.registerAsset.maxGas ?? null,
-                    assetRequest: {
-                        coin: args.registerAsset.assetRequest.coin,
-                        szDecimals: args.registerAsset.assetRequest.szDecimals,
-                        oraclePx: args.registerAsset.assetRequest.oraclePx,
-                        marginTableId: args.registerAsset.assetRequest.marginTableId,
-                        onlyIsolated: args.registerAsset.assetRequest.onlyIsolated,
-                    },
-                    dex: args.registerAsset.dex,
-                    schema: args.registerAsset.schema
-                        ? {
-                            fullName: args.registerAsset.schema.fullName,
-                            collateralToken: args.registerAsset.schema.collateralToken,
-                            oracleUpdater: args.registerAsset.schema.oracleUpdater?.toLowerCase() ??
-                                null,
-                        }
-                        : null,
-                },
-            };
-        }
-        else {
-            action = {
-                type: "perpDeploy",
-                setOracle: {
-                    dex: args.setOracle.dex,
-                    oraclePxs: args.setOracle.oraclePxs,
-                    markPxs: args.setOracle.markPxs,
-                },
-            };
-        }
+        const action = {
+            type: "perpDeploy",
+            ...actionArgs,
+        };
         // Sign the action
         const signature = await signL1Action({
             wallet: this.wallet,
-            action,
+            action: actionSorter[action.type](action),
             nonce,
             isTestnet: this.isTestnet,
         });
@@ -1072,7 +896,7 @@ export class ExchangeClient {
      * const transport = new hl.HttpTransport(); // or WebSocketTransport
      * const exchClient = new hl.ExchangeClient({ wallet, transport });
      *
-     * const result = await client.perpDexClassTransfer({
+     * const data = await exchClient.perpDexClassTransfer({
      *   dex: "test",
      *   token: "USDC",
      *   amount: "1",
@@ -1081,32 +905,26 @@ export class ExchangeClient {
      * ```
      */
     async perpDexClassTransfer(args, signal) {
+        // Destructure the parameters
+        const { ...actionArgs } = args;
         // Construct an action
+        const nonce = await this.nonceManager();
         const action = {
-            ...args,
+            ...actionArgs,
             type: "PerpDexClassTransfer",
             hyperliquidChain: this._getHyperliquidChain(),
             signatureChainId: await this._getSignatureChainId(),
-            nonce: await this.nonceManager(),
+            nonce,
         };
         // Sign the action
         const signature = await signUserSignedAction({
             wallet: this.wallet,
             action,
-            types: {
-                "HyperliquidTransaction:PerpDexClassTransfer": [
-                    { name: "hyperliquidChain", type: "string" },
-                    { name: "dex", type: "string" },
-                    { name: "token", type: "string" },
-                    { name: "amount", type: "string" },
-                    { name: "toPerp", type: "bool" },
-                    { name: "nonce", type: "uint64" },
-                ],
-            },
+            types: userSignedActionEip712Types[action.type],
             chainId: parseInt(action.signatureChainId, 16),
         });
         // Send a request
-        return await this._request({ action, signature, nonce: action.nonce }, signal);
+        return await this._request({ action, signature, nonce }, signal);
     }
     /**
      * Create a referral code.
@@ -1125,20 +943,22 @@ export class ExchangeClient {
      * const transport = new hl.HttpTransport(); // or WebSocketTransport
      * const exchClient = new hl.ExchangeClient({ wallet, transport });
      *
-     * const result = await client.registerReferrer({ code: "TEST" });
+     * const data = await exchClient.registerReferrer({ code: "TEST" });
      * ```
      */
     async registerReferrer(args, signal) {
+        // Destructure the parameters
+        const { ...actionArgs } = args;
         // Construct an action
         const nonce = await this.nonceManager();
         const action = {
             type: "registerReferrer",
-            code: args.code,
+            ...actionArgs,
         };
         // Sign the action
         const signature = await signL1Action({
             wallet: this.wallet,
-            action,
+            action: actionSorter[action.type](action),
             nonce,
             isTestnet: this.isTestnet,
         });
@@ -1162,7 +982,7 @@ export class ExchangeClient {
      * const transport = new hl.HttpTransport(); // or WebSocketTransport
      * const exchClient = new hl.ExchangeClient({ wallet, transport });
      *
-     * const result = await client.reserveRequestWeight({ weight: 10 });
+     * const data = await exchClient.reserveRequestWeight({ weight: 10 });
      * ```
      */
     async reserveRequestWeight(args, signal) {
@@ -1172,12 +992,12 @@ export class ExchangeClient {
         const nonce = await this.nonceManager();
         const action = {
             type: "reserveRequestWeight",
-            weight: actionArgs.weight,
+            ...actionArgs,
         };
         // Sign the action
         const signature = await signL1Action({
             wallet: this.wallet,
-            action,
+            action: actionSorter[action.type](action),
             nonce,
             isTestnet: this.isTestnet,
             expiresAfter,
@@ -1194,14 +1014,12 @@ export class ExchangeClient {
         const nonce = await this.nonceManager();
         const action = {
             type: "scheduleCancel",
-            time: actionArgs.time,
+            ...actionArgs,
         };
-        if (action.time === undefined)
-            delete action.time;
         // Sign the action
         const signature = await signL1Action({
             wallet: this.wallet,
-            action,
+            action: actionSorter[action.type](action),
             nonce,
             isTestnet: this.isTestnet,
             vaultAddress,
@@ -1227,20 +1045,22 @@ export class ExchangeClient {
      * const transport = new hl.HttpTransport(); // or WebSocketTransport
      * const exchClient = new hl.ExchangeClient({ wallet, transport });
      *
-     * const result = await client.setDisplayName({ displayName: "My Name" });
+     * const data = await exchClient.setDisplayName({ displayName: "My Name" });
      * ```
      */
     async setDisplayName(args, signal) {
+        // Destructure the parameters
+        const { ...actionArgs } = args;
         // Construct an action
         const nonce = await this.nonceManager();
         const action = {
             type: "setDisplayName",
-            displayName: args.displayName,
+            ...actionArgs,
         };
         // Sign the action
         const signature = await signL1Action({
             wallet: this.wallet,
-            action,
+            action: actionSorter[action.type](action),
             nonce,
             isTestnet: this.isTestnet,
         });
@@ -1264,20 +1084,22 @@ export class ExchangeClient {
      * const transport = new hl.HttpTransport(); // or WebSocketTransport
      * const exchClient = new hl.ExchangeClient({ wallet, transport });
      *
-     * const result = await client.setReferrer({ code: "TEST" });
+     * const data = await exchClient.setReferrer({ code: "TEST" });
      * ```
      */
     async setReferrer(args, signal) {
+        // Destructure the parameters
+        const { ...actionArgs } = args;
         // Construct an action
         const nonce = await this.nonceManager();
         const action = {
             type: "setReferrer",
-            code: args.code,
+            ...actionArgs,
         };
         // Sign the action
         const signature = await signL1Action({
             wallet: this.wallet,
-            action,
+            action: actionSorter[action.type](action),
             nonce,
             isTestnet: this.isTestnet,
         });
@@ -1285,89 +1107,18 @@ export class ExchangeClient {
         return await this._request({ action, signature, nonce }, signal);
     }
     async spotDeploy(args, signal) {
+        // Destructure the parameters
+        const { ...actionArgs } = args;
         // Construct an action
         const nonce = await this.nonceManager();
-        let action;
-        if ("registerToken2" in args) {
-            action = {
-                type: "spotDeploy",
-                registerToken2: {
-                    spec: {
-                        name: args.registerToken2.spec.name,
-                        szDecimals: args.registerToken2.spec.szDecimals,
-                        weiDecimals: args.registerToken2.spec.weiDecimals,
-                    },
-                    maxGas: args.registerToken2.maxGas,
-                    fullName: args.registerToken2.fullName,
-                },
-            };
-            if (action.registerToken2.fullName === undefined) {
-                delete action.registerToken2.fullName;
-            }
-        }
-        else if ("userGenesis" in args) {
-            action = {
-                type: "spotDeploy",
-                userGenesis: {
-                    token: args.userGenesis.token,
-                    userAndWei: args.userGenesis.userAndWei,
-                    existingTokenAndWei: args.userGenesis.existingTokenAndWei,
-                    blacklistUsers: args.userGenesis.blacklistUsers,
-                },
-            };
-            if (action.userGenesis.blacklistUsers === undefined) {
-                delete action.userGenesis.blacklistUsers;
-            }
-        }
-        else if ("genesis" in args) {
-            action = {
-                type: "spotDeploy",
-                genesis: {
-                    token: args.genesis.token,
-                    maxSupply: args.genesis.maxSupply,
-                    noHyperliquidity: args.genesis.noHyperliquidity,
-                },
-            };
-            if (action.genesis.noHyperliquidity === undefined) {
-                delete action.genesis.noHyperliquidity;
-            }
-        }
-        else if ("registerSpot" in args) {
-            action = {
-                type: "spotDeploy",
-                registerSpot: {
-                    tokens: args.registerSpot.tokens,
-                },
-            };
-        }
-        else if ("registerHyperliquidity" in args) {
-            action = {
-                type: "spotDeploy",
-                registerHyperliquidity: {
-                    spot: args.registerHyperliquidity.spot,
-                    startPx: args.registerHyperliquidity.startPx,
-                    orderSz: args.registerHyperliquidity.orderSz,
-                    nOrders: args.registerHyperliquidity.nOrders,
-                    nSeededLevels: args.registerHyperliquidity.nSeededLevels,
-                },
-            };
-            if (action.registerHyperliquidity.nSeededLevels === undefined) {
-                delete action.registerHyperliquidity.nSeededLevels;
-            }
-        }
-        else {
-            action = {
-                type: "spotDeploy",
-                setDeployerTradingFeeShare: {
-                    token: args.setDeployerTradingFeeShare.token,
-                    share: args.setDeployerTradingFeeShare.share,
-                },
-            };
-        }
+        const action = {
+            type: "spotDeploy",
+            ...actionArgs,
+        };
         // Sign the action
         const signature = await signL1Action({
             wallet: this.wallet,
-            action,
+            action: actionSorter[action.type](action),
             nonce,
             isTestnet: this.isTestnet,
         });
@@ -1391,7 +1142,7 @@ export class ExchangeClient {
      * const transport = new hl.HttpTransport(); // or WebSocketTransport
      * const exchClient = new hl.ExchangeClient({ wallet, transport });
      *
-     * const result = await client.spotSend({
+     * const data = await exchClient.spotSend({
      *   destination: "0x...",
      *   token: "USDC:0xeb62eee3685fc4c43992febcd9e75443",
      *   amount: "1",
@@ -1399,31 +1150,26 @@ export class ExchangeClient {
      * ```
      */
     async spotSend(args, signal) {
+        // Destructure the parameters
+        const { ...actionArgs } = args;
         // Construct an action
+        const nonce = await this.nonceManager();
         const action = {
-            ...args,
+            ...actionArgs,
             type: "spotSend",
             hyperliquidChain: this._getHyperliquidChain(),
             signatureChainId: await this._getSignatureChainId(),
-            time: await this.nonceManager(),
+            time: nonce,
         };
         // Sign the action
         const signature = await signUserSignedAction({
             wallet: this.wallet,
             action,
-            types: {
-                "HyperliquidTransaction:SpotSend": [
-                    { name: "hyperliquidChain", type: "string" },
-                    { name: "destination", type: "string" },
-                    { name: "token", type: "string" },
-                    { name: "amount", type: "string" },
-                    { name: "time", type: "uint64" },
-                ],
-            },
+            types: userSignedActionEip712Types[action.type],
             chainId: parseInt(action.signatureChainId, 16),
         });
         // Send a request
-        return await this._request({ action, signature, nonce: action.time }, signal);
+        return await this._request({ action, signature, nonce }, signal);
     }
     /**
      * Opt Out of Spot Dusting.
@@ -1442,22 +1188,22 @@ export class ExchangeClient {
      * const transport = new hl.HttpTransport(); // or WebSocketTransport
      * const exchClient = new hl.ExchangeClient({ wallet, transport });
      *
-     * const result = await client.spotUser({ toggleSpotDusting: { optOut: false } });
+     * const data = 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 = {
             type: "spotUser",
-            toggleSpotDusting: {
-                optOut: args.toggleSpotDusting.optOut,
-            },
+            ...actionArgs,
         };
         // Sign the action
         const signature = await signL1Action({
             wallet: this.wallet,
-            action,
+            action: actionSorter[action.type](action),
             nonce,
             isTestnet: this.isTestnet,
         });
@@ -1481,7 +1227,7 @@ export class ExchangeClient {
      * const transport = new hl.HttpTransport(); // or WebSocketTransport
      * const exchClient = new hl.ExchangeClient({ wallet, transport });
      *
-     * const result = await client.subAccountSpotTransfer({
+     * const data = await exchClient.subAccountSpotTransfer({
      *   subAccountUser: "0x...",
      *   isDeposit: true,
      *   token: "USDC:0xeb62eee3685fc4c43992febcd9e75443",
@@ -1490,19 +1236,18 @@ export class ExchangeClient {
      * ```
      */
     async subAccountSpotTransfer(args, signal) {
+        // Destructure the parameters
+        const { ...actionArgs } = args;
         // Construct an action
         const nonce = await this.nonceManager();
         const action = {
             type: "subAccountSpotTransfer",
-            subAccountUser: args.subAccountUser,
-            isDeposit: args.isDeposit,
-            token: args.token,
-            amount: args.amount,
+            ...actionArgs,
         };
         // Sign the action
         const signature = await signL1Action({
             wallet: this.wallet,
-            action,
+            action: actionSorter[action.type](action),
             nonce,
             isTestnet: this.isTestnet,
         });
@@ -1526,7 +1271,7 @@ export class ExchangeClient {
      * const transport = new hl.HttpTransport(); // or WebSocketTransport
      * const exchClient = new hl.ExchangeClient({ wallet, transport });
      *
-     * const result = await client.subAccountTransfer({
+     * const data = await exchClient.subAccountTransfer({
      *   subAccountUser: "0x...",
      *   isDeposit: true,
      *   usd: 1 * 1e6,
@@ -1534,18 +1279,18 @@ export class ExchangeClient {
      * ```
      */
     async subAccountTransfer(args, signal) {
+        // Destructure the parameters
+        const { ...actionArgs } = args;
         // Construct an action
         const nonce = await this.nonceManager();
         const action = {
             type: "subAccountTransfer",
-            subAccountUser: args.subAccountUser,
-            isDeposit: args.isDeposit,
-            usd: args.usd,
+            ...actionArgs,
         };
         // Sign the action
         const signature = await signL1Action({
             wallet: this.wallet,
-            action,
+            action: actionSorter[action.type](action),
             nonce,
             isTestnet: this.isTestnet,
         });
@@ -1569,7 +1314,7 @@ export class ExchangeClient {
      * const transport = new hl.HttpTransport(); // or WebSocketTransport
      * const exchClient = new hl.ExchangeClient({ wallet, transport });
      *
-     * const result = await client.tokenDelegate({
+     * const data = await exchClient.tokenDelegate({
      *   validator: "0x...",
      *   isUndelegate: true,
      *   wei: 1 * 1e8,
@@ -1577,31 +1322,26 @@ export class ExchangeClient {
      * ```
      */
     async tokenDelegate(args, signal) {
+        // Destructure the parameters
+        const { ...actionArgs } = args;
         // Construct an action
+        const nonce = await this.nonceManager();
         const action = {
-            ...args,
+            ...actionArgs,
             type: "tokenDelegate",
             hyperliquidChain: this._getHyperliquidChain(),
             signatureChainId: await this._getSignatureChainId(),
-            nonce: await this.nonceManager(),
+            nonce,
         };
         // Sign the action
         const signature = await signUserSignedAction({
             wallet: this.wallet,
             action,
-            types: {
-                "HyperliquidTransaction:TokenDelegate": [
-                    { name: "hyperliquidChain", type: "string" },
-                    { name: "validator", type: "address" },
-                    { name: "wei", type: "uint64" },
-                    { name: "isUndelegate", type: "bool" },
-                    { name: "nonce", type: "uint64" },
-                ],
-            },
+            types: userSignedActionEip712Types[action.type],
             chainId: parseInt(action.signatureChainId, 16),
         });
         // Send a request
-        return await this._request({ action, signature, nonce: action.nonce }, signal);
+        return await this._request({ action, signature, nonce }, signal);
     }
     /**
      * Cancel a TWAP order.
@@ -1620,7 +1360,7 @@ export class ExchangeClient {
      * const transport = new hl.HttpTransport(); // or WebSocketTransport
      * const exchClient = new hl.ExchangeClient({ wallet, transport });
      *
-     * const result = await client.twapCancel({
+     * const data = await exchClient.twapCancel({
      *   a: 0, // Asset index
      *   t: 1, // TWAP ID
      * });
@@ -1633,13 +1373,12 @@ export class ExchangeClient {
         const nonce = await this.nonceManager();
         const action = {
             type: "twapCancel",
-            a: actionArgs.a,
-            t: actionArgs.t,
+            ...actionArgs,
         };
         // Sign the action
         const signature = await signL1Action({
             wallet: this.wallet,
-            action,
+            action: actionSorter[action.type](action),
             nonce,
             isTestnet: this.isTestnet,
             vaultAddress,
@@ -1665,7 +1404,7 @@ export class ExchangeClient {
      * const transport = new hl.HttpTransport(); // or WebSocketTransport
      * const exchClient = new hl.ExchangeClient({ wallet, transport });
      *
-     * const result = await client.twapOrder({
+     * const data = await exchClient.twapOrder({
      *   a: 0, // Asset index
      *   b: true, // Buy order
      *   s: "1", // Size
@@ -1683,18 +1422,13 @@ export class ExchangeClient {
         const action = {
             type: "twapOrder",
             twap: {
-                a: actionArgs.a,
-                b: actionArgs.b,
-                s: this._formatDecimal(actionArgs.s),
-                r: actionArgs.r,
-                m: actionArgs.m,
-                t: actionArgs.t,
+                ...actionArgs,
             },
         };
         // Sign the action
         const signature = await signL1Action({
             wallet: this.wallet,
-            action,
+            action: actionSorter[action.type](action),
             nonce,
             isTestnet: this.isTestnet,
             vaultAddress,
@@ -1720,7 +1454,11 @@ export class ExchangeClient {
      * const transport = new hl.HttpTransport(); // or WebSocketTransport
      * const exchClient = new hl.ExchangeClient({ wallet, transport });
      *
-     * const result = await client.updateIsolatedMargin({ asset: 0, isBuy: true, ntli: 1 * 1e6 });
+     * const data = await exchClient.updateIsolatedMargin({
+     *   asset: 0,
+     *   isBuy: true,
+     *   ntli: 1 * 1e6,
+     * });
      * ```
      */
     async updateIsolatedMargin(args, signal) {
@@ -1730,14 +1468,12 @@ export class ExchangeClient {
         const nonce = await this.nonceManager();
         const action = {
             type: "updateIsolatedMargin",
-            asset: actionArgs.asset,
-            isBuy: actionArgs.isBuy,
-            ntli: actionArgs.ntli,
+            ...actionArgs,
         };
         // Sign the action
         const signature = await signL1Action({
             wallet: this.wallet,
-            action,
+            action: actionSorter[action.type](action),
             nonce,
             isTestnet: this.isTestnet,
             vaultAddress,
@@ -1763,7 +1499,11 @@ export class ExchangeClient {
      * const transport = new hl.HttpTransport(); // or WebSocketTransport
      * const exchClient = new hl.ExchangeClient({ wallet, transport });
      *
-     * const result = await client.updateLeverage({ asset: 0, isCross: true, leverage: 5 });
+     * const data = await exchClient.updateLeverage({
+     *   asset: 0,
+     *   isCross: true,
+     *   leverage: 5,
+     * });
      * ```
      */
     async updateLeverage(args, signal) {
@@ -1773,14 +1513,12 @@ export class ExchangeClient {
         const nonce = await this.nonceManager();
         const action = {
             type: "updateLeverage",
-            asset: actionArgs.asset,
-            isCross: actionArgs.isCross,
-            leverage: actionArgs.leverage,
+            ...actionArgs,
         };
         // Sign the action
         const signature = await signL1Action({
             wallet: this.wallet,
-            action,
+            action: actionSorter[action.type](action),
             nonce,
             isTestnet: this.isTestnet,
             vaultAddress,
@@ -1806,34 +1544,30 @@ export class ExchangeClient {
      * const transport = new hl.HttpTransport(); // or WebSocketTransport
      * const exchClient = new hl.ExchangeClient({ wallet, transport });
      *
-     * const result = await client.usdClassTransfer({ amount: "1", toPerp: true });
+     * const data = 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();
         const action = {
-            ...args,
+            ...actionArgs,
             type: "usdClassTransfer",
             hyperliquidChain: this._getHyperliquidChain(),
             signatureChainId: await this._getSignatureChainId(),
-            nonce: await this.nonceManager(),
+            nonce,
         };
         // Sign the action
         const signature = await signUserSignedAction({
             wallet: this.wallet,
             action,
-            types: {
-                "HyperliquidTransaction:UsdClassTransfer": [
-                    { name: "hyperliquidChain", type: "string" },
-                    { name: "amount", type: "string" },
-                    { name: "toPerp", type: "bool" },
-                    { name: "nonce", type: "uint64" },
-                ],
-            },
+            types: userSignedActionEip712Types[action.type],
             chainId: parseInt(action.signatureChainId, 16),
         });
         // Send a request
-        return await this._request({ action, signature, nonce: action.nonce }, signal);
+        return await this._request({ action, signature, nonce }, signal);
     }
     /**
      * Send usd to another address.
@@ -1852,34 +1586,30 @@ export class ExchangeClient {
      * const transport = new hl.HttpTransport(); // or WebSocketTransport
      * const exchClient = new hl.ExchangeClient({ wallet, transport });
      *
-     * const result = await client.usdSend({ destination: "0x...", amount: "1" });
+     * const data = 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();
         const action = {
-            ...args,
+            ...actionArgs,
             type: "usdSend",
             hyperliquidChain: this._getHyperliquidChain(),
             signatureChainId: await this._getSignatureChainId(),
-            time: await this.nonceManager(),
+            time: nonce,
         };
         // Sign the action
         const signature = await signUserSignedAction({
             wallet: this.wallet,
             action,
-            types: {
-                "HyperliquidTransaction:UsdSend": [
-                    { name: "hyperliquidChain", type: "string" },
-                    { name: "destination", type: "string" },
-                    { name: "amount", type: "string" },
-                    { name: "time", type: "uint64" },
-                ],
-            },
+            types: userSignedActionEip712Types[action.type],
             chainId: parseInt(action.signatureChainId, 16),
         });
         // Send a request
-        return await this._request({ action, signature, nonce: action.time }, signal);
+        return await this._request({ action, signature, nonce }, signal);
     }
     /**
      * Distribute funds from a vault between followers.
@@ -1898,21 +1628,22 @@ export class ExchangeClient {
      * const transport = new hl.HttpTransport(); // or WebSocketTransport
      * const exchClient = new hl.ExchangeClient({ wallet, transport });
      *
-     * const result = await client.vaultDistribute({ vaultAddress: "0x...", usd: 10 * 1e6 });
+     * const data = 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 = {
             type: "vaultDistribute",
-            vaultAddress: args.vaultAddress,
-            usd: args.usd,
+            ...actionArgs,
         };
         // Sign the action
         const signature = await signL1Action({
             wallet: this.wallet,
-            action,
+            action: actionSorter[action.type](action),
             nonce,
             isTestnet: this.isTestnet,
         });
@@ -1936,7 +1667,7 @@ export class ExchangeClient {
      * const transport = new hl.HttpTransport(); // or WebSocketTransport
      * const exchClient = new hl.ExchangeClient({ wallet, transport });
      *
-     * const result = await client.vaultModify({
+     * const data = await exchClient.vaultModify({
      *   vaultAddress: "0x...",
      *   allowDeposits: true,
      *   alwaysCloseOnWithdraw: false,
@@ -1944,18 +1675,18 @@ export class ExchangeClient {
      * ```
      */
     async vaultModify(args, signal) {
+        // Destructure the parameters
+        const { ...actionArgs } = args;
         // Construct an action
         const nonce = await this.nonceManager();
         const action = {
             type: "vaultModify",
-            vaultAddress: args.vaultAddress,
-            allowDeposits: args.allowDeposits,
-            alwaysCloseOnWithdraw: args.alwaysCloseOnWithdraw,
+            ...actionArgs,
         };
         // Sign the action
         const signature = await signL1Action({
             wallet: this.wallet,
-            action,
+            action: actionSorter[action.type](action),
             nonce,
             isTestnet: this.isTestnet,
         });
@@ -1979,7 +1710,7 @@ export class ExchangeClient {
      * const transport = new hl.HttpTransport(); // or WebSocketTransport
      * const exchClient = new hl.ExchangeClient({ wallet, transport });
      *
-     * const result = await client.vaultTransfer({
+     * const data = await exchClient.vaultTransfer({
      *   vaultAddress: "0x...",
      *   isDeposit: true,
      *   usd: 10 * 1e6,
@@ -1993,14 +1724,12 @@ export class ExchangeClient {
         const nonce = await this.nonceManager();
         const action = {
             type: "vaultTransfer",
-            vaultAddress: actionArgs.vaultAddress,
-            isDeposit: actionArgs.isDeposit,
-            usd: actionArgs.usd,
+            ...actionArgs,
         };
         // Sign the action
         const signature = await signL1Action({
             wallet: this.wallet,
-            action,
+            action: actionSorter[action.type](action),
             nonce,
             isTestnet: this.isTestnet,
             expiresAfter,
@@ -2025,34 +1754,30 @@ export class ExchangeClient {
      * const transport = new hl.HttpTransport(); // or WebSocketTransport
      * const exchClient = new hl.ExchangeClient({ wallet, transport });
      *
-     * const result = await client.withdraw3({ destination: "0x...", amount: "1" });
+     * const data = 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();
         const action = {
-            ...args,
+            ...actionArgs,
             type: "withdraw3",
             hyperliquidChain: this._getHyperliquidChain(),
             signatureChainId: await this._getSignatureChainId(),
-            time: await this.nonceManager(),
+            time: nonce,
         };
         // Sign the action
         const signature = await signUserSignedAction({
             wallet: this.wallet,
             action,
-            types: {
-                "HyperliquidTransaction:Withdraw": [
-                    { name: "hyperliquidChain", type: "string" },
-                    { name: "destination", type: "string" },
-                    { name: "amount", type: "string" },
-                    { name: "time", type: "uint64" },
-                ],
-            },
+            types: userSignedActionEip712Types[action.type],
             chainId: parseInt(action.signatureChainId, 16),
         });
         // Send a request
-        return await this._request({ action, signature, nonce: action.time }, signal);
+        return await this._request({ action, signature, nonce }, signal);
     }
     /** Send an API request and validate the response. */
     async _request(payload, signal) {
@@ -2060,18 +1785,10 @@ export class ExchangeClient {
         this._validateResponse(response);
         return response;
     }
-    /** Formats a decimal number as a string, removing trailing zeros. */
-    _formatDecimal(numStr) {
-        if (!numStr.includes("."))
-            return numStr;
-        const [intPart, fracPart] = numStr.split(".");
-        const newFrac = fracPart.replace(/0+$/, "");
-        return newFrac ? `${intPart}.${newFrac}` : intPart;
-    }
     /** Guesses the chain ID based on the wallet type or the isTestnet flag. */
     async _guessSignatureChainId() {
         // Trying to get chain ID of the wallet
-        if (isAbstractViemWalletClient(this.wallet) || isAbstractExtendedViemWalletClient(this.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)}`;