@nktkas/hyperliquid 0.22.1 → 0.23.0

package/esm/src/clients/multiSign.js

@@ -1,4 +1,6 @@
-import { actionSorter, isAbstractEthersSigner, isAbstractEthersV5Signer, isAbstractViemWalletClient, isAbstractWindowEthereum, signL1Action, signUserSignedAction, userSignedActionEip712Types, } from "../signing.js";
+import { keccak_256 } from "@noble/hashes/sha3";
+import { etc, getPublicKey } from "@noble/secp256k1";
+import { actionSorter, isAbstractEthersSigner, isAbstractEthersV5Signer, isAbstractViemWalletClient, isAbstractWindowEthereum, isValidPrivateKey, signL1Action, signUserSignedAction, userSignedActionEip712Types, } from "../signing/mod.js";
 import { ExchangeClient, } from "./exchange.js";
 /**
  * Multi-signature exchange client for interacting with the Hyperliquid API.
@@ -15,14 +17,11 @@ export class MultiSignClient extends ExchangeClient {
      * @example
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
-     * import { privateKeyToAccount } from "viem/accounts";
      *
      * const multiSignAddress = "0x...";
      * const signers = [
-     *   privateKeyToAccount("0x..."), // first is leader
-     *   privateKeyToAccount("0x..."),
-     *   privateKeyToAccount("0x..."),
-     * ];
+     *   "0x...", // Private key; or any other wallet libraries
+     * ] as const;
      *
      * const transport = new hl.HttpTransport();
      * const multiSignClient = new hl.MultiSignClient({ transport, multiSignAddress, signers });
@@ -44,29 +43,28 @@ export class MultiSignClient extends ExchangeClient {
         });
     }
     /**
+     * Approve an agent to sign on behalf of the master account.
      * @param args - The parameters for the request.
      * @param signal - An optional abort signal
      * @returns Successful response without specific data.
-     * @throws {ApiRequestError} When the API returns an error response.
+     *
+     * @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#approve-an-api-wallet
      * @example
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
-     * import { privateKeyToAccount } from "viem/accounts";
      *
      * const multiSignAddress = "0x...";
      * const signers = [
-     *   privateKeyToAccount("0x..."), // first is leader
-     *   privateKeyToAccount("0x..."),
-     *   // ...
-     *   privateKeyToAccount("0x..."),
-     * ];
+     *   "0x...", // Private key; or any other wallet libraries
+     * ] as const;
      *
-     * const transport = new hl.HttpTransport(); // or WebSocketTransport
+     * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const multiSignClient = new hl.MultiSignClient({ transport, multiSignAddress, signers });
      *
-     * const data = await multiSignClient.approveAgent({ agentAddress: "0x...", agentName: "agentName" });
+     * await multiSignClient.approveAgent({ agentAddress: "0x...", agentName: "..." });
      * ```
      */
     async approveAgent(...[args, signal]) {
@@ -74,55 +72,52 @@ export class MultiSignClient extends ExchangeClient {
         const { ...actionArgs } = args;
         // Construct an action
         const nonce = await this.nonceManager();
-        const action = {
-            ...actionArgs,
-            agentName: args.agentName ?? "",
+        const action = actionSorter.approveAgent({
             type: "approveAgent",
             hyperliquidChain: this._getHyperliquidChain(),
             signatureChainId: await this._getSignatureChainId(),
             nonce,
-        };
+            ...actionArgs,
+        });
         // Sign the action
-        const sortedAction = actionSorter[action.type](action);
         const outerSigner = await this._getWalletAddress(this.signers[0]);
-        const signatures = await this._multiSignUserSignedAction(sortedAction, outerSigner);
-        if (sortedAction.agentName === "")
-            sortedAction.agentName = null;
+        const signatures = await this._multiSignUserSignedAction({ action, outerSigner });
+        if (action.agentName === "")
+            action.agentName = null;
         // Send a multi-sig action
         return super.multiSig({
             signatures,
             payload: {
                 multiSigUser: this.multiSignAddress,
                 outerSigner,
-                action: sortedAction,
+                action,
             },
             nonce,
         }, signal);
     }
     /**
+     * Approve a maximum fee rate for a builder.
      * @param args - The parameters for the request.
      * @param signal - An optional abort signal.
      * @returns Successful response without specific data.
-     * @throws {ApiRequestError} When the API returns an error response.
+     *
+     * @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#approve-a-builder-fee
      * @example
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
-     * import { privateKeyToAccount } from "viem/accounts";
      *
      * const multiSignAddress = "0x...";
      * const signers = [
-     *   privateKeyToAccount("0x..."), // first is leader
-     *   privateKeyToAccount("0x..."),
-     *   // ...
-     *   privateKeyToAccount("0x..."),
-     * ];
+     *   "0x...", // Private key; or any other wallet libraries
+     * ] as const;
      *
-     * const transport = new hl.HttpTransport(); // or WebSocketTransport
+     * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const multiSignClient = new hl.MultiSignClient({ transport, multiSignAddress, signers });
      *
-     * const data = await multiSignClient.approveBuilderFee({ maxFeeRate: "0.01%", builder: "0x..." });
+     * await multiSignClient.approveBuilderFee({ maxFeeRate: "0.01%", builder: "0x..." });
      * ```
      */
     async approveBuilderFee(...[args, signal]) {
@@ -130,68 +125,63 @@ export class MultiSignClient extends ExchangeClient {
         const { ...actionArgs } = args;
         // Construct an action
         const nonce = await this.nonceManager();
-        const action = {
-            ...actionArgs,
+        const action = actionSorter.approveBuilderFee({
             type: "approveBuilderFee",
             hyperliquidChain: this._getHyperliquidChain(),
             signatureChainId: await this._getSignatureChainId(),
             nonce,
-        };
+            ...actionArgs,
+        });
         // Sign the action
-        const sortedAction = actionSorter[action.type](action);
         const outerSigner = await this._getWalletAddress(this.signers[0]);
-        const signatures = await this._multiSignUserSignedAction(sortedAction, outerSigner);
+        const signatures = await this._multiSignUserSignedAction({ action, outerSigner });
         // Send a multi-sig action
         return super.multiSig({
             signatures,
             payload: {
                 multiSigUser: this.multiSignAddress,
                 outerSigner,
-                action: sortedAction,
+                action,
             },
             nonce,
         }, signal);
     }
     /**
+     * Modify multiple orders.
      * @param args - The parameters for the request.
      * @param signal - An optional abort signal.
      * @returns Successful variant of {@link OrderResponse} without error statuses.
-     * @throws {ApiRequestError} When the API returns an error response.
+     *
+     * @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#modify-multiple-orders
      * @example
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
-     * import { privateKeyToAccount } from "viem/accounts";
      *
      * const multiSignAddress = "0x...";
      * const signers = [
-     *   privateKeyToAccount("0x..."), // first is leader
-     *   privateKeyToAccount("0x..."),
-     *   // ...
-     *   privateKeyToAccount("0x..."),
-     * ];
+     *   "0x...", // Private key; or any other wallet libraries
+     * ] as const;
      *
-     * const transport = new hl.HttpTransport(); // or WebSocketTransport
+     * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const multiSignClient = new hl.MultiSignClient({ transport, multiSignAddress, signers });
      *
      * const data = await multiSignClient.batchModify({
-     *   modifies: [{
-     *     oid: 123,
-     *     order: {
-     *       a: 0, // Asset index
-     *       b: true, // Buy order
-     *       p: "31000", // New price
-     *       s: "0.2", // New size
-     *       r: false, // Not reduce-only
-     *       t: {
-     *         limit: {
-     *           tif: "Gtc", // Good-til-cancelled
-     *         },
+     *   modifies: [
+     *     {
+     *       oid: 123,
+     *       order: {
+     *         a: 0,
+     *         b: true,
+     *         p: "31000",
+     *         s: "0.2",
+     *         r: false,
+     *         t: { limit: { tif: "Gtc" } },
      *       },
-     *       c: "0x...", // Client Order ID (optional)
      *     },
-     *   }],
+     *   ],
      * });
      * ```
      */
@@ -200,27 +190,17 @@ export class MultiSignClient extends ExchangeClient {
         const { vaultAddress = this.defaultVaultAddress, expiresAfter = await this._getDefaultExpiresAfter(), ...actionArgs } = args;
         // Construct an action
         const nonce = await this.nonceManager();
-        const action = {
-            type: "batchModify",
-            ...actionArgs,
-        };
+        const action = actionSorter.batchModify({ type: "batchModify", ...actionArgs });
         // Send a multi-sig action
-        const sortedAction = actionSorter[action.type](action);
         const outerSigner = await this._getWalletAddress(this.signers[0]);
-        const signatures = await this._multiSignL1Action({
-            action: sortedAction,
-            nonce,
-            outerSigner,
-            vaultAddress,
-            expiresAfter,
-        });
+        const signatures = await this._multiSignL1Action({ action, nonce, outerSigner, vaultAddress, expiresAfter });
         // Send a multi-sig action
         return super.multiSig({
             signatures,
             payload: {
                 multiSigUser: this.multiSignAddress,
                 outerSigner,
-                action: sortedAction,
+                action,
             },
             nonce,
             vaultAddress,
@@ -228,33 +208,31 @@ export class MultiSignClient extends ExchangeClient {
         }, signal);
     }
     /**
+     * Cancel order(s).
      * @param args - The parameters for the request.
      * @param signal - An optional abort signal.
      * @returns Successful variant of {@link CancelResponse} without error statuses.
-     * @throws {ApiRequestError} When the API returns an error response.
+     *
+     * @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#cancel-order-s
      * @example
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
-     * import { privateKeyToAccount } from "viem/accounts";
      *
      * const multiSignAddress = "0x...";
      * const signers = [
-     *   privateKeyToAccount("0x..."), // first is leader
-     *   privateKeyToAccount("0x..."),
-     *   // ...
-     *   privateKeyToAccount("0x..."),
-     * ];
+     *   "0x...", // Private key; or any other wallet libraries
+     * ] as const;
      *
-     * const transport = new hl.HttpTransport(); // or WebSocketTransport
+     * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const multiSignClient = new hl.MultiSignClient({ transport, multiSignAddress, signers });
      *
      * const data = await multiSignClient.cancel({
-     *   cancels: [{
-     *     a: 0, // Asset index
-     *     o: 123, // Order ID
-     *   }],
+     *   cancels: [
+     *     { a: 0, o: 123 },
+     *   ],
      * });
      * ```
      */
@@ -263,27 +241,17 @@ export class MultiSignClient extends ExchangeClient {
         const { vaultAddress = this.defaultVaultAddress, expiresAfter = await this._getDefaultExpiresAfter(), ...actionArgs } = args;
         // Construct an action
         const nonce = await this.nonceManager();
-        const action = {
-            type: "cancel",
-            ...actionArgs,
-        };
+        const action = actionSorter.cancel({ type: "cancel", ...actionArgs });
         // Send a multi-sig action
-        const sortedAction = actionSorter[action.type](action);
         const outerSigner = await this._getWalletAddress(this.signers[0]);
-        const signatures = await this._multiSignL1Action({
-            action: sortedAction,
-            nonce,
-            outerSigner,
-            vaultAddress,
-            expiresAfter,
-        });
+        const signatures = await this._multiSignL1Action({ action, nonce, outerSigner, vaultAddress, expiresAfter });
         // Send a multi-sig action
         return super.multiSig({
             signatures,
             payload: {
                 multiSigUser: this.multiSignAddress,
                 outerSigner,
-                action: sortedAction,
+                action,
             },
             nonce,
             vaultAddress,
@@ -291,26 +259,25 @@ export class MultiSignClient extends ExchangeClient {
         }, signal);
     }
     /**
+     * Cancel order(s) by cloid.
      * @param args - The parameters for the request.
      * @param signal - An optional abort signal.
      * @returns Successful variant of {@link CancelResponse} without error statuses.
-     * @throws {ApiRequestError} When the API returns an error response.
+     *
+     * @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#cancel-order-s-by-cloid
      * @example
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
-     * import { privateKeyToAccount } from "viem/accounts";
      *
      * const multiSignAddress = "0x...";
      * const signers = [
-     *   privateKeyToAccount("0x..."), // first is leader
-     *   privateKeyToAccount("0x..."),
-     *   // ...
-     *   privateKeyToAccount("0x..."),
-     * ];
+     *   "0x...", // Private key; or any other wallet libraries
+     * ] as const;
      *
-     * const transport = new hl.HttpTransport(); // or WebSocketTransport
+     * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const multiSignClient = new hl.MultiSignClient({ transport, multiSignAddress, signers });
      *
      * const data = await multiSignClient.cancelByCloid({
@@ -325,27 +292,17 @@ export class MultiSignClient extends ExchangeClient {
         const { vaultAddress = this.defaultVaultAddress, expiresAfter = await this._getDefaultExpiresAfter(), ...actionArgs } = args;
         // Construct an action
         const nonce = await this.nonceManager();
-        const action = {
-            type: "cancelByCloid",
-            ...actionArgs,
-        };
+        const action = actionSorter.cancelByCloid({ type: "cancelByCloid", ...actionArgs });
         // Send a multi-sig action
-        const sortedAction = actionSorter[action.type](action);
         const outerSigner = await this._getWalletAddress(this.signers[0]);
-        const signatures = await this._multiSignL1Action({
-            action: sortedAction,
-            nonce,
-            outerSigner,
-            vaultAddress,
-            expiresAfter,
-        });
+        const signatures = await this._multiSignL1Action({ action, nonce, outerSigner, vaultAddress, expiresAfter });
         // Send a multi-sig action
         return super.multiSig({
             signatures,
             payload: {
                 multiSigUser: this.multiSignAddress,
                 outerSigner,
-                action: sortedAction,
+                action,
             },
             nonce,
             vaultAddress,
@@ -353,29 +310,28 @@ export class MultiSignClient extends ExchangeClient {
         }, 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.
      * @returns Successful response without specific data.
-     * @throws {ApiRequestError} When the API returns an error response.
+     *
+     * @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#deposit-into-staking
      * @example
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
-     * import { privateKeyToAccount } from "viem/accounts";
      *
      * const multiSignAddress = "0x...";
      * const signers = [
-     *   privateKeyToAccount("0x..."), // first is leader
-     *   privateKeyToAccount("0x..."),
-     *   // ...
-     *   privateKeyToAccount("0x..."),
-     * ];
+     *   "0x...", // Private key; or any other wallet libraries
+     * ] as const;
      *
-     * const transport = new hl.HttpTransport(); // or WebSocketTransport
+     * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const multiSignClient = new hl.MultiSignClient({ transport, multiSignAddress, signers });
      *
-     * const data = await multiSignClient.cDeposit({ wei: 1 * 1e8 });
+     * await multiSignClient.cDeposit({ wei: 1 * 1e8 });
      * ```
      */
     async cDeposit(...[args, signal]) {
@@ -383,155 +339,151 @@ export class MultiSignClient extends ExchangeClient {
         const { ...actionArgs } = args;
         // Construct an action
         const nonce = await this.nonceManager();
-        const action = {
-            ...actionArgs,
+        const action = actionSorter.cDeposit({
             type: "cDeposit",
             hyperliquidChain: this._getHyperliquidChain(),
             signatureChainId: await this._getSignatureChainId(),
             nonce,
-        };
+            ...actionArgs,
+        });
         // Sign the action
-        const sortedAction = actionSorter[action.type](action);
         const outerSigner = await this._getWalletAddress(this.signers[0]);
-        const signatures = await this._multiSignUserSignedAction(sortedAction, outerSigner);
+        const signatures = await this._multiSignUserSignedAction({ action, outerSigner });
         // Send a multi-sig action
         return super.multiSig({
             signatures,
             payload: {
                 multiSigUser: this.multiSignAddress,
                 outerSigner,
-                action: sortedAction,
+                action,
             },
             nonce,
         }, signal);
     }
     /**
+     * Claim rewards from referral program.
      * @param args - The parameters for the request.
      * @param signal - An optional abort signal.
      * @returns Successful response without specific data.
-     * @throws {ApiRequestError} When the API returns an error response.
      *
-     * @see null - no documentation
+     * @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";
-     * import { privateKeyToAccount } from "viem/accounts";
      *
      * const multiSignAddress = "0x...";
      * const signers = [
-     *   privateKeyToAccount("0x..."), // first is leader
-     *   privateKeyToAccount("0x..."),
-     *   // ...
-     *   privateKeyToAccount("0x..."),
-     * ];
+     *   "0x...", // Private key; or any other wallet libraries
+     * ] as const;
      *
-     * const transport = new hl.HttpTransport(); // or WebSocketTransport
+     * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const multiSignClient = new hl.MultiSignClient({ transport, multiSignAddress, signers });
      *
-     * const data = await multiSignClient.claimRewards();
+     * await multiSignClient.claimRewards();
      * ```
      */
     async claimRewards(...[signal]) {
         // Construct an action
         const nonce = await this.nonceManager();
-        const action = {
-            type: "claimRewards",
-        };
+        const action = actionSorter.claimRewards({ type: "claimRewards" });
         // Send a multi-sig action
-        const sortedAction = actionSorter[action.type](action);
         const outerSigner = await this._getWalletAddress(this.signers[0]);
-        const signatures = await this._multiSignL1Action({ action: sortedAction, nonce, outerSigner });
+        const signatures = await this._multiSignL1Action({ action, nonce, outerSigner });
         // Send a multi-sig action
         return super.multiSig({
             signatures,
             payload: {
                 multiSigUser: this.multiSignAddress,
                 outerSigner,
-                action: sortedAction,
+                action,
             },
             nonce,
         }, 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.
      * @returns Successful response without specific data.
-     * @throws {ApiRequestError} When the API returns an error response.
+     *
+     * @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/hypercore/multi-sig
      * @example
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
-     * import { privateKeyToAccount } from "viem/accounts";
      *
      * const multiSignAddress = "0x...";
      * const signers = [
-     *   privateKeyToAccount("0x..."), // first is leader
-     *   privateKeyToAccount("0x..."),
-     *   // ...
-     *   privateKeyToAccount("0x..."),
-     * ];
+     *   "0x...", // Private key; or any other wallet libraries
+     * ] as const;
      *
-     * const transport = new hl.HttpTransport(); // or WebSocketTransport
+     * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const multiSignClient = new hl.MultiSignClient({ transport, multiSignAddress, signers });
      *
-     * const data = await multiSignClient.convertToMultiSigUser({ // convert to normal user
-     *   authorizedUsers: [],
-     *   threshold: 0,
+     * // Convert to multi-sig user
+     * await multiSignClient.convertToMultiSigUser({
+     *   authorizedUsers: ["0x...", "0x...", "0x..."],
+     *   threshold: 2,
      * });
+     *
+     * // Convert to single-sig user
+     * await multiSignClient.convertToMultiSigUser(null);
      * ```
      */
     async convertToMultiSigUser(...[args, signal]) {
         // Destructure the parameters
-        const { ...actionArgs } = args;
+        const actionArgs = args;
         // Construct an action
         const nonce = await this.nonceManager();
-        const action = {
+        const action = actionSorter.convertToMultiSigUser({
             type: "convertToMultiSigUser",
             hyperliquidChain: this._getHyperliquidChain(),
             signatureChainId: await this._getSignatureChainId(),
             signers: JSON.stringify(actionArgs),
             nonce,
-        };
+        });
         // Sign the action
-        const sortedAction = actionSorter[action.type](action);
         const outerSigner = await this._getWalletAddress(this.signers[0]);
-        const signatures = await this._multiSignUserSignedAction(sortedAction, outerSigner);
+        const signatures = await this._multiSignUserSignedAction({ action, outerSigner });
         // Send a multi-sig action
         return super.multiSig({
             signatures,
             payload: {
                 multiSigUser: this.multiSignAddress,
                 outerSigner,
-                action: sortedAction,
+                action,
             },
             nonce,
         }, signal);
     }
     /**
+     * Create a sub-account.
      * @param args - The parameters for the request.
      * @param signal - An optional abort signal.
      * @returns Response for creating a sub-account.
-     * @throws {ApiRequestError} When the API returns an error response.
      *
-     * @see null - no documentation
+     * @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";
-     * import { privateKeyToAccount } from "viem/accounts";
      *
      * const multiSignAddress = "0x...";
      * const signers = [
-     *   privateKeyToAccount("0x..."), // first is leader
-     *   privateKeyToAccount("0x..."),
-     *   // ...
-     *   privateKeyToAccount("0x..."),
-     * ];
+     *   "0x...", // Private key; or any other wallet libraries
+     * ] as const;
      *
-     * const transport = new hl.HttpTransport(); // or WebSocketTransport
+     * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const multiSignClient = new hl.MultiSignClient({ transport, multiSignAddress, signers });
      *
-     * const data = await multiSignClient.createSubAccount({ name: "subAccountName" });
+     * const data = await multiSignClient.createSubAccount({ name: "..." });
      * ```
      */
     async createSubAccount(...[args, signal]) {
@@ -539,53 +491,44 @@ export class MultiSignClient extends ExchangeClient {
         const { ...actionArgs } = args;
         // Construct an action
         const nonce = await this.nonceManager();
-        const action = {
-            type: "createSubAccount",
-            ...actionArgs,
-        };
+        const action = actionSorter.createSubAccount({ type: "createSubAccount", ...actionArgs });
         // Send a multi-sig action
-        const sortedAction = actionSorter[action.type](action);
         const outerSigner = await this._getWalletAddress(this.signers[0]);
-        const signatures = await this._multiSignL1Action({ action: sortedAction, nonce, outerSigner });
+        const signatures = await this._multiSignL1Action({ action, nonce, outerSigner });
         // Send a multi-sig action
         return super.multiSig({
             signatures,
             payload: {
                 multiSigUser: this.multiSignAddress,
                 outerSigner,
-                action: sortedAction,
+                action,
             },
             nonce,
         }, signal);
     }
     /**
+     * Create a vault.
      * @param args - The parameters for the request.
      * @param signal - An optional abort signal.
      * @returns Response for creating a vault.
-     * @throws {ApiRequestError} When the API returns an error response.
      *
-     * @see null - no documentation
+     * @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";
-     * import { privateKeyToAccount } from "viem/accounts";
      *
      * const multiSignAddress = "0x...";
      * const signers = [
-     *   privateKeyToAccount("0x..."), // first is leader
-     *   privateKeyToAccount("0x..."),
-     *   // ...
-     *   privateKeyToAccount("0x..."),
-     * ];
+     *   "0x...", // Private key; or any other wallet libraries
+     * ] as const;
      *
-     * const transport = new hl.HttpTransport(); // or WebSocketTransport
+     * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const multiSignClient = new hl.MultiSignClient({ transport, multiSignAddress, signers });
      *
-     * const data = await multiSignClient.createVault({
-     *   name: "VaultName",
-     *   description: "Vault description",
-     *   initialUsd: 100 * 1e6,
-     * });
+     * const data = await multiSignClient.createVault({ name: "...", description: "...", initialUsd: 100 * 1e6 });
      * ```
      */
     async createVault(...[args, signal]) {
@@ -593,100 +536,165 @@ export class MultiSignClient extends ExchangeClient {
         const { ...actionArgs } = args;
         // Construct an action
         const nonce = await this.nonceManager();
-        const action = {
-            type: "createVault",
-            nonce,
-            ...actionArgs,
-        };
+        const action = actionSorter.createVault({ type: "createVault", nonce, ...actionArgs });
         // Send a multi-sig action
-        const sortedAction = actionSorter[action.type](action);
         const outerSigner = await this._getWalletAddress(this.signers[0]);
-        const signatures = await this._multiSignL1Action({ action: sortedAction, nonce, outerSigner });
+        const signatures = await this._multiSignL1Action({ action, nonce, outerSigner });
         // Send a multi-sig action
         return super.multiSig({
             signatures,
             payload: {
                 multiSigUser: this.multiSignAddress,
                 outerSigner,
-                action: sortedAction,
+                action,
             },
             nonce,
         }, signal);
     }
-    async cSignerAction(args, signal) {
+    /**
+     * Jail or unjail self as a validator signer.
+     * @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 multiSignAddress = "0x...";
+     * const signers = [
+     *   "0x...", // Private key; or any other wallet libraries
+     * ] as const;
+     *
+     * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
+     * const multiSignClient = new hl.MultiSignClient({ transport, multiSignAddress, signers });
+     *
+     * // Jail self
+     * await multiSignClient.cSignerAction({ jailSelf: null });
+     *
+     * // Unjail self
+     * await multiSignClient.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 = {
-            type: "CSignerAction",
-            ...actionArgs,
-        };
+        const action = actionSorter.CSignerAction({ type: "CSignerAction", ...actionArgs });
         // Send a multi-sig action
-        const sortedAction = actionSorter[action.type](action);
         const outerSigner = await this._getWalletAddress(this.signers[0]);
-        const signatures = await this._multiSignL1Action({ action: sortedAction, nonce, outerSigner, expiresAfter });
+        const signatures = await this._multiSignL1Action({ action, nonce, outerSigner, expiresAfter });
         // Send a multi-sig action
         return super.multiSig({
             signatures,
             payload: {
                 multiSigUser: this.multiSignAddress,
                 outerSigner,
-                action: sortedAction,
+                action,
             },
             nonce,
             expiresAfter,
         }, signal);
     }
-    async cValidatorAction(args, signal) {
+    /**
+     * Action related to validator management.
+     * @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.
+     *
+     * @example
+     * ```ts
+     * import * as hl from "@nktkas/hyperliquid";
+     *
+     * const multiSignAddress = "0x...";
+     * const signers = [
+     *   "0x...", // Private key; or any other wallet libraries
+     * ] as const;
+     *
+     * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
+     * const multiSignClient = new hl.MultiSignClient({ transport, multiSignAddress, signers });
+     *
+     * // Change validator profile
+     * await multiSignClient.cValidatorAction({
+     *   changeProfile: {
+     *     name: "...",
+     *     description: "...",
+     *     unjailed: true,
+     *   }
+     * });
+     *
+     * // Register a new validator
+     * await multiSignClient.cValidatorAction({
+     *   register: {
+     *     profile: {
+     *       node_ip: { Ip: "1.2.3.4" },
+     *       name: "...",
+     *       description: "...",
+     *       delegations_disabled: true,
+     *       commission_bps: 1,
+     *       signer: "0x...",
+     *     },
+     *     unjailed: false,
+     *     initial_wei: 1,
+     *   },
+     * });
+     *
+     * // Unregister a validator
+     * await multiSignClient.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 = {
-            type: "CValidatorAction",
-            ...actionArgs,
-        };
+        const action = actionSorter.CValidatorAction({ type: "CValidatorAction", ...actionArgs });
         // Send a multi-sig action
-        const sortedAction = actionSorter[action.type](action);
         const outerSigner = await this._getWalletAddress(this.signers[0]);
-        const signatures = await this._multiSignL1Action({ action: sortedAction, nonce, outerSigner, expiresAfter });
+        const signatures = await this._multiSignL1Action({ action, nonce, outerSigner, expiresAfter });
         // Send a multi-sig action
         return super.multiSig({
             signatures,
             payload: {
                 multiSigUser: this.multiSignAddress,
                 outerSigner,
-                action: sortedAction,
+                action,
             },
             nonce,
             expiresAfter,
         }, 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.
      * @returns Successful response without specific data.
-     * @throws {ApiRequestError} When the API returns an error response.
+     *
+     * @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#withdraw-from-staking
      * @example
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
-     * import { privateKeyToAccount } from "viem/accounts";
      *
      * const multiSignAddress = "0x...";
      * const signers = [
-     *   privateKeyToAccount("0x..."), // first is leader
-     *   privateKeyToAccount("0x..."),
-     *   // ...
-     *   privateKeyToAccount("0x..."),
-     * ];
+     *   "0x...", // Private key; or any other wallet libraries
+     * ] as const;
      *
-     * const transport = new hl.HttpTransport(); // or WebSocketTransport
+     * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const multiSignClient = new hl.MultiSignClient({ transport, multiSignAddress, signers });
      *
-     * const data = await multiSignClient.cWithdraw({ wei: 1 * 1e8 });
+     * await multiSignClient.cWithdraw({ wei: 1 * 1e8 });
      * ```
      */
     async cWithdraw(...[args, signal]) {
@@ -694,49 +702,47 @@ export class MultiSignClient extends ExchangeClient {
         const { ...actionArgs } = args;
         // Construct an action
         const nonce = await this.nonceManager();
-        const action = {
-            ...actionArgs,
+        const action = actionSorter.cWithdraw({
             type: "cWithdraw",
             hyperliquidChain: this._getHyperliquidChain(),
             signatureChainId: await this._getSignatureChainId(),
             nonce,
-        };
+            ...actionArgs,
+        });
         // Sign the action
-        const sortedAction = actionSorter[action.type](action);
         const outerSigner = await this._getWalletAddress(this.signers[0]);
-        const signatures = await this._multiSignUserSignedAction(sortedAction, outerSigner);
+        const signatures = await this._multiSignUserSignedAction({ action, outerSigner });
         // Send a multi-sig action
         return super.multiSig({
             signatures,
             payload: {
                 multiSigUser: this.multiSignAddress,
                 outerSigner,
-                action: sortedAction,
+                action,
             },
             nonce,
         }, signal);
     }
     /**
+     * Configure block type for EVM transactions.
      * @param args - The parameters for the request.
      * @param signal - An optional abort signal.
      * @returns Response for creating a sub-account.
-     * @throws {ApiRequestError} When the API returns an error response.
+     *
+     * @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
      * @example
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
-     * import { privateKeyToAccount } from "viem/accounts";
      *
      * const multiSignAddress = "0x...";
      * const signers = [
-     *   privateKeyToAccount("0x..."), // first is leader
-     *   privateKeyToAccount("0x..."),
-     *   // ...
-     *   privateKeyToAccount("0x..."),
-     * ];
+     *   "0x...", // Private key; or any other wallet libraries
+     * ] as const;
      *
-     * const transport = new hl.HttpTransport(); // or WebSocketTransport
+     * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const multiSignClient = new hl.MultiSignClient({ transport, multiSignAddress, signers });
      *
      * const data = await multiSignClient.evmUserModify({ usingBigBlocks: true });
@@ -747,62 +753,53 @@ export class MultiSignClient extends ExchangeClient {
         const { ...actionArgs } = args;
         // Construct an action
         const nonce = await this.nonceManager();
-        const action = {
-            type: "evmUserModify",
-            ...actionArgs,
-        };
+        const action = actionSorter.evmUserModify({ type: "evmUserModify", ...actionArgs });
         // Send a multi-sig action
-        const sortedAction = actionSorter[action.type](action);
         const outerSigner = await this._getWalletAddress(this.signers[0]);
-        const signatures = await this._multiSignL1Action({ action: sortedAction, nonce, outerSigner });
+        const signatures = await this._multiSignL1Action({ action, nonce, outerSigner });
         // Send a multi-sig action
         return super.multiSig({
             signatures,
             payload: {
                 multiSigUser: this.multiSignAddress,
                 outerSigner,
-                action: sortedAction,
+                action,
             },
             nonce,
         }, signal);
     }
     /**
+     * Modify an order.
      * @param args - The parameters for the request.
      * @param signal - An optional abort signal.
      * @returns Successful response without specific data.
-     * @throws {ApiRequestError} When the API returns an error response.
+     *
+     * @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#modify-an-order
      * @example
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
-     * import { privateKeyToAccount } from "viem/accounts";
      *
      * const multiSignAddress = "0x...";
      * const signers = [
-     *   privateKeyToAccount("0x..."), // first is leader
-     *   privateKeyToAccount("0x..."),
-     *   // ...
-     *   privateKeyToAccount("0x..."),
-     * ];
+     *   "0x...", // Private key; or any other wallet libraries
+     * ] as const;
      *
-     * const transport = new hl.HttpTransport(); // or WebSocketTransport
+     * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const multiSignClient = new hl.MultiSignClient({ transport, multiSignAddress, signers });
      *
-     * const data = await multiSignClient.modify({
+     * await multiSignClient.modify({
      *   oid: 123,
      *   order: {
-     *     a: 0, // Asset index
-     *     b: true, // Buy order
-     *     p: "31000", // New price
-     *     s: "0.2", // New size
-     *     r: false, // Not reduce-only
-     *     t: {
-     *       limit: {
-     *         tif: "Gtc", // Good-til-cancelled
-     *       },
-     *     },
-     *     c: "0x...", // Client Order ID (optional)
+     *     a: 0,
+     *     b: true,
+     *     p: "31000",
+     *     s: "0.2",
+     *     r: false,
+     *     t: { limit: { tif: "Gtc" } },
+     *     c: "0x...",
      *   },
      * });
      * ```
@@ -812,27 +809,17 @@ export class MultiSignClient extends ExchangeClient {
         const { vaultAddress = this.defaultVaultAddress, expiresAfter = await this._getDefaultExpiresAfter(), ...actionArgs } = args;
         // Construct an action
         const nonce = await this.nonceManager();
-        const action = {
-            type: "modify",
-            ...actionArgs,
-        };
+        const action = actionSorter.modify({ type: "modify", ...actionArgs });
         // Send a multi-sig action
-        const sortedAction = actionSorter[action.type](action);
         const outerSigner = await this._getWalletAddress(this.signers[0]);
-        const signatures = await this._multiSignL1Action({
-            action: sortedAction,
-            nonce,
-            outerSigner,
-            vaultAddress,
-            expiresAfter,
-        });
+        const signatures = await this._multiSignL1Action({ action, nonce, outerSigner, vaultAddress, expiresAfter });
         // Send a multi-sig action
         return super.multiSig({
             signatures,
             payload: {
                 multiSigUser: this.multiSignAddress,
                 outerSigner,
-                action: sortedAction,
+                action,
             },
             nonce,
             vaultAddress,
@@ -846,43 +833,40 @@ export class MultiSignClient extends ExchangeClient {
         throw new Error("Not implemented"); // FIXME
     }
     /**
+     * Place an order(s).
      * @param args - The parameters for the request.
      * @param signal - An optional abort signal.
      * @returns Successful variant of {@link OrderResponse} without error statuses.
-     * @throws {ApiRequestError} When the API returns an error response.
+     *
+     * @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#place-an-order
      * @example
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
-     * import { privateKeyToAccount } from "viem/accounts";
      *
      * const multiSignAddress = "0x...";
      * const signers = [
-     *   privateKeyToAccount("0x..."), // first is leader
-     *   privateKeyToAccount("0x..."),
-     *   // ...
-     *   privateKeyToAccount("0x..."),
-     * ];
+     *   "0x...", // Private key; or any other wallet libraries
+     * ] as const;
      *
-     * const transport = new hl.HttpTransport(); // or WebSocketTransport
+     * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const multiSignClient = new hl.MultiSignClient({ transport, multiSignAddress, signers });
      *
      * const data = await multiSignClient.order({
-     *   orders: [{
-     *     a: 0, // Asset index
-     *     b: true, // Buy order
-     *     p: "30000", // Price
-     *     s: "0.1", // Size
-     *     r: false, // Not reduce-only
-     *     t: {
-     *       limit: {
-     *         tif: "Gtc", // Good-til-cancelled
-     *       },
+     *   orders: [
+     *     {
+     *       a: 0,
+     *       b: true,
+     *       p: "30000",
+     *       s: "0.1",
+     *       r: false,
+     *       t: { limit: { tif: "Gtc" } },
+     *       c: "0x...",
      *     },
-     *     c: "0x...", // Client Order ID (optional)
-     *   }],
-     *   grouping: "na", // No grouping
+     *   ],
+     *   grouping: "na",
      * });
      * ```
      */
@@ -891,86 +875,103 @@ export class MultiSignClient extends ExchangeClient {
         const { vaultAddress = this.defaultVaultAddress, expiresAfter = await this._getDefaultExpiresAfter(), ...actionArgs } = args;
         // Construct an action
         const nonce = await this.nonceManager();
-        const action = {
-            type: "order",
-            ...actionArgs,
-        };
+        const action = actionSorter.order({ type: "order", ...actionArgs });
         // Send a multi-sig action
-        const sortedAction = actionSorter[action.type](action);
         const outerSigner = await this._getWalletAddress(this.signers[0]);
-        const signatures = await this._multiSignL1Action({
-            action: sortedAction,
-            nonce,
-            outerSigner,
-            vaultAddress,
-            expiresAfter,
-        });
+        const signatures = await this._multiSignL1Action({ action, nonce, outerSigner, vaultAddress, expiresAfter });
         // Send a multi-sig action
         return super.multiSig({
             signatures,
             payload: {
                 multiSigUser: this.multiSignAddress,
                 outerSigner,
-                action: sortedAction,
+                action,
             },
             nonce,
             vaultAddress,
             expiresAfter,
         }, signal);
     }
-    async perpDeploy(args, signal) {
+    /**
+     * Deploying HIP-3 assets.
+     * @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/deploying-hip-3-assets
+     * @example
+     * ```ts
+     * import * as hl from "@nktkas/hyperliquid";
+     *
+     * const multiSignAddress = "0x...";
+     * const signers = [
+     *   "0x...", // Private key; or any other wallet libraries
+     * ] as const;
+     *
+     * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
+     * const multiSignClient = new hl.MultiSignClient({ transport, multiSignAddress, signers });
+     *
+     * await multiSignClient.perpDeploy({
+     *   registerAsset: {
+     *     maxGas: 1000000,
+     *     assetRequest: {
+     *       coin: "USDC",
+     *       szDecimals: 8,
+     *       oraclePx: "1",
+     *       marginTableId: 1,
+     *       onlyIsolated: false,
+     *     },
+     *     dex: "test",
+     *   },
+     * });
+     * ```
+     */
+    async perpDeploy(...[args, signal]) {
         // Destructure the parameters
         const { ...actionArgs } = args;
         // Construct an action
         const nonce = await this.nonceManager();
-        const action = {
-            type: "perpDeploy",
-            ...actionArgs,
-        };
+        const action = actionSorter.perpDeploy({ type: "perpDeploy", ...actionArgs });
         // Send a multi-sig action
-        const sortedAction = actionSorter[action.type](action);
         const outerSigner = await this._getWalletAddress(this.signers[0]);
-        const signatures = await this._multiSignL1Action({ action: sortedAction, nonce, outerSigner });
+        const signatures = await this._multiSignL1Action({ action, nonce, outerSigner });
         // Send a multi-sig action
         return super.multiSig({
             signatures,
             payload: {
                 multiSigUser: this.multiSignAddress,
                 outerSigner,
-                action: sortedAction,
+                action,
             },
             nonce,
         }, signal);
     }
     /**
+     * Transfer funds between Spot account and Perp dex account.
      * @param args - The parameters for the request.
      * @param signal - An optional abort signal.
      * @returns Successful response without specific data.
-     * @throws {ApiRequestError} When the API returns an error response.
+     *
+     * @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
      * @example
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
-     * import { privateKeyToAccount } from "viem/accounts";
      *
      * const multiSignAddress = "0x...";
      * const signers = [
-     *   privateKeyToAccount("0x..."), // first is leader
-     *   privateKeyToAccount("0x..."),
-     *   // ...
-     *   privateKeyToAccount("0x..."),
-     * ];
+     *   "0x...", // Private key; or any other wallet libraries
+     * ] as const;
      *
-     * const transport = new hl.HttpTransport(); // or WebSocketTransport
+     * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const multiSignClient = new hl.MultiSignClient({ transport, multiSignAddress, signers });
      *
-     * const data = await multiSignClient.perpDexClassTransfer({
-     *   dex: "test",
-     *   token: "USDC",
-     *   amount: "1",
-     *   toPerp: true,
-     * });
+     * await multiSignClient.perpDexClassTransfer({ dex: "test", token: "USDC", amount: "1", toPerp: true });
      * ```
      */
     async perpDexClassTransfer(...[args, signal]) {
@@ -978,52 +979,50 @@ export class MultiSignClient extends ExchangeClient {
         const { ...actionArgs } = args;
         // Construct an action
         const nonce = await this.nonceManager();
-        const action = {
-            ...actionArgs,
+        const action = actionSorter.PerpDexClassTransfer({
             type: "PerpDexClassTransfer",
             hyperliquidChain: this._getHyperliquidChain(),
             signatureChainId: await this._getSignatureChainId(),
             nonce,
-        };
+            ...actionArgs,
+        });
         // Sign the action
-        const sortedAction = actionSorter[action.type](action);
         const outerSigner = await this._getWalletAddress(this.signers[0]);
-        const signatures = await this._multiSignUserSignedAction(sortedAction, outerSigner);
+        const signatures = await this._multiSignUserSignedAction({ action, outerSigner });
         // Send a multi-sig action
         return super.multiSig({
             signatures,
             payload: {
                 multiSigUser: this.multiSignAddress,
                 outerSigner,
-                action: sortedAction,
+                action,
             },
             nonce,
         }, signal);
     }
     /**
+     * Create a referral code.
      * @param args - The parameters for the request.
      * @param signal - An optional abort signal.
      * @returns Successful response without specific data.
-     * @throws {ApiRequestError} When the API returns an error response.
      *
-     * @see null - no documentation
+     * @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";
-     * import { privateKeyToAccount } from "viem/accounts";
      *
      * const multiSignAddress = "0x...";
      * const signers = [
-     *   privateKeyToAccount("0x..."), // first is leader
-     *   privateKeyToAccount("0x..."),
-     *   // ...
-     *   privateKeyToAccount("0x..."),
-     * ];
+     *   "0x...", // Private key; or any other wallet libraries
+     * ] as const;
      *
-     * const transport = new hl.HttpTransport(); // or WebSocketTransport
+     * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const multiSignClient = new hl.MultiSignClient({ transport, multiSignAddress, signers });
      *
-     * const data = await multiSignClient.registerReferrer({ code: "TEST" });
+     * await multiSignClient.registerReferrer({ code: "..." });
      * ```
      */
     async registerReferrer(...[args, signal]) {
@@ -1031,49 +1030,44 @@ export class MultiSignClient extends ExchangeClient {
         const { ...actionArgs } = args;
         // Construct an action
         const nonce = await this.nonceManager();
-        const action = {
-            type: "registerReferrer",
-            ...actionArgs,
-        };
+        const action = actionSorter.registerReferrer({ type: "registerReferrer", ...actionArgs });
         // Send a multi-sig action
-        const sortedAction = actionSorter[action.type](action);
         const outerSigner = await this._getWalletAddress(this.signers[0]);
-        const signatures = await this._multiSignL1Action({ action: sortedAction, nonce, outerSigner });
+        const signatures = await this._multiSignL1Action({ action, nonce, outerSigner });
         // Send a multi-sig action
         return super.multiSig({
             signatures,
             payload: {
                 multiSigUser: this.multiSignAddress,
                 outerSigner,
-                action: sortedAction,
+                action,
             },
             nonce,
         }, signal);
     }
     /**
+     * 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 error response.
+     *
+     * @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";
-     * import { privateKeyToAccount } from "viem/accounts";
      *
      * const multiSignAddress = "0x...";
      * const signers = [
-     *   privateKeyToAccount("0x..."), // first is leader
-     *   privateKeyToAccount("0x..."),
-     *   // ...
-     *   privateKeyToAccount("0x..."),
-     * ];
+     *   "0x...", // Private key; or any other wallet libraries
+     * ] as const;
      *
-     * const transport = new hl.HttpTransport(); // or WebSocketTransport
+     * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const multiSignClient = new hl.MultiSignClient({ transport, multiSignAddress, signers });
      *
-     * const data = await multiSignClient.reserveRequestWeight({ weight: 10 });
+     * await multiSignClient.reserveRequestWeight({ weight: 10 });
      * ```
      */
     async reserveRequestWeight(...[args, signal]) {
@@ -1081,21 +1075,17 @@ export class MultiSignClient extends ExchangeClient {
         const { expiresAfter = await this._getDefaultExpiresAfter(), ...actionArgs } = args;
         // Construct an action
         const nonce = await this.nonceManager();
-        const action = {
-            type: "reserveRequestWeight",
-            ...actionArgs,
-        };
+        const action = actionSorter.reserveRequestWeight({ type: "reserveRequestWeight", ...actionArgs });
         // Send a multi-sig action
-        const sortedAction = actionSorter[action.type](action);
         const outerSigner = await this._getWalletAddress(this.signers[0]);
-        const signatures = await this._multiSignL1Action({ action: sortedAction, nonce, outerSigner, expiresAfter });
+        const signatures = await this._multiSignL1Action({ action, nonce, outerSigner, expiresAfter });
         // Send a multi-sig action
         return super.multiSig({
             signatures,
             payload: {
                 multiSigUser: this.multiSignAddress,
                 outerSigner,
-                action: sortedAction,
+                action,
             },
             nonce,
             expiresAfter,
@@ -1108,27 +1098,17 @@ export class MultiSignClient extends ExchangeClient {
         const { vaultAddress = this.defaultVaultAddress, expiresAfter = await this._getDefaultExpiresAfter(), ...actionArgs } = args;
         // Construct an action
         const nonce = await this.nonceManager();
-        const action = {
-            type: "scheduleCancel",
-            ...actionArgs,
-        };
+        const action = actionSorter.scheduleCancel({ type: "scheduleCancel", ...actionArgs });
         // Send a multi-sig action
-        const sortedAction = actionSorter[action.type](action);
         const outerSigner = await this._getWalletAddress(this.signers[0]);
-        const signatures = await this._multiSignL1Action({
-            action: sortedAction,
-            nonce,
-            outerSigner,
-            vaultAddress,
-            expiresAfter,
-        });
+        const signatures = await this._multiSignL1Action({ action, nonce, outerSigner, vaultAddress, expiresAfter });
         // Send a multi-sig action
         return super.multiSig({
             signatures,
             payload: {
                 multiSigUser: this.multiSignAddress,
                 outerSigner,
-                action: sortedAction,
+                action,
             },
             nonce,
             vaultAddress,
@@ -1136,29 +1116,28 @@ export class MultiSignClient extends ExchangeClient {
         }, signal);
     }
     /**
+     * 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 error response.
      *
-     * @see null - no documentation
+     * @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";
-     * import { privateKeyToAccount } from "viem/accounts";
      *
      * const multiSignAddress = "0x...";
      * const signers = [
-     *   privateKeyToAccount("0x..."), // first is leader
-     *   privateKeyToAccount("0x..."),
-     *   // ...
-     *   privateKeyToAccount("0x..."),
-     * ];
+     *   "0x...", // Private key; or any other wallet libraries
+     * ] as const;
      *
-     * const transport = new hl.HttpTransport(); // or WebSocketTransport
+     * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const multiSignClient = new hl.MultiSignClient({ transport, multiSignAddress, signers });
      *
-     * const data = await multiSignClient.setDisplayName({ displayName: "My Name" });
+     * await multiSignClient.setDisplayName({ displayName: "..." });
      * ```
      */
     async setDisplayName(...[args, signal]) {
@@ -1166,49 +1145,44 @@ export class MultiSignClient extends ExchangeClient {
         const { ...actionArgs } = args;
         // Construct an action
         const nonce = await this.nonceManager();
-        const action = {
-            type: "setDisplayName",
-            ...actionArgs,
-        };
+        const action = actionSorter.setDisplayName({ type: "setDisplayName", ...actionArgs });
         // Send a multi-sig action
-        const sortedAction = actionSorter[action.type](action);
         const outerSigner = await this._getWalletAddress(this.signers[0]);
-        const signatures = await this._multiSignL1Action({ action: sortedAction, nonce, outerSigner });
+        const signatures = await this._multiSignL1Action({ action, nonce, outerSigner });
         // Send a multi-sig action
         return super.multiSig({
             signatures,
             payload: {
                 multiSigUser: this.multiSignAddress,
                 outerSigner,
-                action: sortedAction,
+                action,
             },
             nonce,
         }, signal);
     }
     /**
+     * Set a referral code.
      * @param args - The parameters for the request.
      * @param signal - An optional abort signal.
      * @returns Successful response without specific data.
-     * @throws {ApiRequestError} When the API returns an error response.
      *
-     * @see null - no documentation
+     * @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";
-     * import { privateKeyToAccount } from "viem/accounts";
      *
      * const multiSignAddress = "0x...";
      * const signers = [
-     *   privateKeyToAccount("0x..."), // first is leader
-     *   privateKeyToAccount("0x..."),
-     *   // ...
-     *   privateKeyToAccount("0x..."),
-     * ];
+     *   "0x...", // Private key; or any other wallet libraries
+     * ] as const;
      *
-     * const transport = new hl.HttpTransport(); // or WebSocketTransport
+     * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const multiSignClient = new hl.MultiSignClient({ transport, multiSignAddress, signers });
      *
-     * const data = await multiSignClient.setReferrer({ code: "TEST" });
+     * await multiSignClient.setReferrer({ code: "..." });
      * ```
      */
     async setReferrer(...[args, signal]) {
@@ -1216,73 +1190,99 @@ export class MultiSignClient extends ExchangeClient {
         const { ...actionArgs } = args;
         // Construct an action
         const nonce = await this.nonceManager();
-        const action = {
-            type: "setReferrer",
-            ...actionArgs,
-        };
+        const action = actionSorter.setReferrer({ type: "setReferrer", ...actionArgs });
         // Send a multi-sig action
-        const sortedAction = actionSorter[action.type](action);
         const outerSigner = await this._getWalletAddress(this.signers[0]);
-        const signatures = await this._multiSignL1Action({ action: sortedAction, nonce, outerSigner });
+        const signatures = await this._multiSignL1Action({ action, nonce, outerSigner });
         // Send a multi-sig action
         return super.multiSig({
             signatures,
             payload: {
                 multiSigUser: this.multiSignAddress,
                 outerSigner,
-                action: sortedAction,
+                action,
             },
             nonce,
         }, signal);
     }
-    async spotDeploy(args, signal) {
+    /**
+     * Deploying HIP-1 and HIP-2 assets.
+     * @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/deploying-hip-1-and-hip-2-assets
+     * @example
+     * ```ts
+     * import * as hl from "@nktkas/hyperliquid";
+     *
+     * const multiSignAddress = "0x...";
+     * const signers = [
+     *   "0x...", // Private key; or any other wallet libraries
+     * ] as const;
+     *
+     * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
+     * const multiSignClient = new hl.MultiSignClient({ transport, multiSignAddress, signers });
+     *
+     * await multiSignClient.spotDeploy({
+     *   registerToken2: {
+     *     spec: {
+     *       name: "USDC",
+     *       szDecimals: 8,
+     *       weiDecimals: 8,
+     *     },
+     *     maxGas: 1000000,
+     *     fullName: "USD Coin",
+     *   },
+     * });
+     * ```
+     */
+    async spotDeploy(...[args, signal]) {
         // Destructure the parameters
         const { ...actionArgs } = args;
         // Construct an action
         const nonce = await this.nonceManager();
-        const action = {
-            type: "spotDeploy",
-            ...actionArgs,
-        };
+        const action = actionSorter.spotDeploy({ type: "spotDeploy", ...actionArgs });
         // Send a multi-sig action
-        const sortedAction = actionSorter[action.type](action);
         const outerSigner = await this._getWalletAddress(this.signers[0]);
-        const signatures = await this._multiSignL1Action({ action: sortedAction, nonce, outerSigner });
+        const signatures = await this._multiSignL1Action({ action, nonce, outerSigner });
         // Send a multi-sig action
         return super.multiSig({
             signatures,
             payload: {
                 multiSigUser: this.multiSignAddress,
                 outerSigner,
-                action: sortedAction,
+                action,
             },
             nonce,
         }, signal);
     }
     /**
+     * Send spot assets to another address.
      * @param args - The parameters for the request.
      * @param signal - An optional abort signal.
      * @returns Successful response without specific data.
-     * @throws {ApiRequestError} When the API returns an error response.
+     *
+     * @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#core-spot-transfer
      * @example
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
-     * import { privateKeyToAccount } from "viem/accounts";
      *
      * const multiSignAddress = "0x...";
      * const signers = [
-     *   privateKeyToAccount("0x..."), // first is leader
-     *   privateKeyToAccount("0x..."),
-     *   // ...
-     *   privateKeyToAccount("0x..."),
-     * ];
+     *   "0x...", // Private key; or any other wallet libraries
+     * ] as const;
      *
-     * const transport = new hl.HttpTransport(); // or WebSocketTransport
+     * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const multiSignClient = new hl.MultiSignClient({ transport, multiSignAddress, signers });
      *
-     * const data = await multiSignClient.spotSend({
+     * await multiSignClient.spotSend({
      *   destination: "0x...",
      *   token: "USDC:0xeb62eee3685fc4c43992febcd9e75443",
      *   amount: "1",
@@ -1294,52 +1294,50 @@ export class MultiSignClient extends ExchangeClient {
         const { ...actionArgs } = args;
         // Construct an action
         const nonce = await this.nonceManager();
-        const action = {
-            ...actionArgs,
+        const action = actionSorter.spotSend({
             type: "spotSend",
             hyperliquidChain: this._getHyperliquidChain(),
             signatureChainId: await this._getSignatureChainId(),
             time: nonce,
-        };
+            ...actionArgs,
+        });
         // Sign the action
-        const sortedAction = actionSorter[action.type](action);
         const outerSigner = await this._getWalletAddress(this.signers[0]);
-        const signatures = await this._multiSignUserSignedAction(sortedAction, outerSigner);
+        const signatures = await this._multiSignUserSignedAction({ action, outerSigner });
         // Send a multi-sig action
         return super.multiSig({
             signatures,
             payload: {
                 multiSigUser: this.multiSignAddress,
                 outerSigner,
-                action: sortedAction,
+                action,
             },
             nonce,
         }, signal);
     }
     /**
+     * Opt Out of Spot Dusting.
      * @param args - The parameters for the request.
      * @param signal - An optional abort signal.
      * @returns Successful response without specific data.
-     * @throws {ApiRequestError} When the API returns an error response.
      *
-     * @see null - no documentation
+     * @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";
-     * import { privateKeyToAccount } from "viem/accounts";
      *
      * const multiSignAddress = "0x...";
      * const signers = [
-     *   privateKeyToAccount("0x..."), // first is leader
-     *   privateKeyToAccount("0x..."),
-     *   // ...
-     *   privateKeyToAccount("0x..."),
-     * ];
+     *   "0x...", // Private key; or any other wallet libraries
+     * ] as const;
      *
-     * const transport = new hl.HttpTransport(); // or WebSocketTransport
+     * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const multiSignClient = new hl.MultiSignClient({ transport, multiSignAddress, signers });
      *
-     * const data = await multiSignClient.spotUser({ toggleSpotDusting: { optOut: false } });
+     * await multiSignClient.spotUser({ toggleSpotDusting: { optOut: false } });
      * ```
      */
     async spotUser(...[args, signal]) {
@@ -1347,49 +1345,44 @@ export class MultiSignClient extends ExchangeClient {
         const { ...actionArgs } = args;
         // Construct an action
         const nonce = await this.nonceManager();
-        const action = {
-            type: "spotUser",
-            ...actionArgs,
-        };
+        const action = actionSorter.spotUser({ type: "spotUser", ...actionArgs });
         // Send a multi-sig action
-        const sortedAction = actionSorter[action.type](action);
         const outerSigner = await this._getWalletAddress(this.signers[0]);
-        const signatures = await this._multiSignL1Action({ action: sortedAction, nonce, outerSigner });
+        const signatures = await this._multiSignL1Action({ action, nonce, outerSigner });
         // Send a multi-sig action
         return super.multiSig({
             signatures,
             payload: {
                 multiSigUser: this.multiSignAddress,
                 outerSigner,
-                action: sortedAction,
+                action,
             },
             nonce,
         }, signal);
     }
     /**
+     * Transfer between sub-accounts (spot).
      * @param args - The parameters for the request.
      * @param signal - An optional abort signal.
      * @returns Successful response without specific data.
-     * @throws {ApiRequestError} When the API returns an error response.
      *
-     * @see null - no documentation
+     * @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";
-     * import { privateKeyToAccount } from "viem/accounts";
      *
      * const multiSignAddress = "0x...";
      * const signers = [
-     *   privateKeyToAccount("0x..."), // first is leader
-     *   privateKeyToAccount("0x..."),
-     *   // ...
-     *   privateKeyToAccount("0x..."),
-     * ];
+     *   "0x...", // Private key; or any other wallet libraries
+     * ] as const;
      *
-     * const transport = new hl.HttpTransport(); // or WebSocketTransport
+     * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const multiSignClient = new hl.MultiSignClient({ transport, multiSignAddress, signers });
      *
-     * const data = await multiSignClient.subAccountSpotTransfer({
+     * await multiSignClient.subAccountSpotTransfer({
      *   subAccountUser: "0x...",
      *   isDeposit: true,
      *   token: "USDC:0xeb62eee3685fc4c43992febcd9e75443",
@@ -1402,53 +1395,44 @@ export class MultiSignClient extends ExchangeClient {
         const { ...actionArgs } = args;
         // Construct an action
         const nonce = await this.nonceManager();
-        const action = {
-            type: "subAccountSpotTransfer",
-            ...actionArgs,
-        };
+        const action = actionSorter.subAccountSpotTransfer({ type: "subAccountSpotTransfer", ...actionArgs });
         // Send a multi-sig action
-        const sortedAction = actionSorter[action.type](action);
         const outerSigner = await this._getWalletAddress(this.signers[0]);
-        const signatures = await this._multiSignL1Action({ action: sortedAction, nonce, outerSigner });
+        const signatures = await this._multiSignL1Action({ action, nonce, outerSigner });
         // Send a multi-sig action
         return super.multiSig({
             signatures,
             payload: {
                 multiSigUser: this.multiSignAddress,
                 outerSigner,
-                action: sortedAction,
+                action,
             },
             nonce,
         }, signal);
     }
     /**
+     * Transfer between sub-accounts (perpetual).
      * @param args - The parameters for the request.
      * @param signal - An optional abort signal.
      * @returns Successful response without specific data.
-     * @throws {ApiRequestError} When the API returns an error response.
      *
-     * @see null - no documentation
+     * @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";
-     * import { privateKeyToAccount } from "viem/accounts";
      *
      * const multiSignAddress = "0x...";
      * const signers = [
-     *   privateKeyToAccount("0x..."), // first is leader
-     *   privateKeyToAccount("0x..."),
-     *   // ...
-     *   privateKeyToAccount("0x..."),
-     * ];
+     *   "0x...", // Private key; or any other wallet libraries
+     * ] as const;
      *
-     * const transport = new hl.HttpTransport(); // or WebSocketTransport
+     * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const multiSignClient = new hl.MultiSignClient({ transport, multiSignAddress, signers });
      *
-     * const data = await multiSignClient.subAccountTransfer({
-     *   subAccountUser: "0x...",
-     *   isDeposit: true,
-     *   usd: 1 * 1e6,
-     * });
+     * await multiSignClient.subAccountTransfer({ subAccountUser: "0x...", isDeposit: true, usd: 1 * 1e6 });
      * ```
      */
     async subAccountTransfer(...[args, signal]) {
@@ -1456,53 +1440,44 @@ export class MultiSignClient extends ExchangeClient {
         const { ...actionArgs } = args;
         // Construct an action
         const nonce = await this.nonceManager();
-        const action = {
-            type: "subAccountTransfer",
-            ...actionArgs,
-        };
+        const action = actionSorter.subAccountTransfer({ type: "subAccountTransfer", ...actionArgs });
         // Send a multi-sig action
-        const sortedAction = actionSorter[action.type](action);
         const outerSigner = await this._getWalletAddress(this.signers[0]);
-        const signatures = await this._multiSignL1Action({ action: sortedAction, nonce, outerSigner });
+        const signatures = await this._multiSignL1Action({ action, nonce, outerSigner });
         // Send a multi-sig action
         return super.multiSig({
             signatures,
             payload: {
                 multiSigUser: this.multiSignAddress,
                 outerSigner,
-                action: sortedAction,
+                action,
             },
             nonce,
         }, signal);
     }
     /**
+     * Delegate or undelegate native tokens to or from a validator.
      * @param args - The parameters for the request.
      * @param signal - An optional abort signal.
      * @returns Successful response without specific data.
-     * @throws {ApiRequestError} When the API returns an error response.
+     *
+     * @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#delegate-or-undelegate-stake-from-validator
      * @example
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
-     * import { privateKeyToAccount } from "viem/accounts";
      *
      * const multiSignAddress = "0x...";
      * const signers = [
-     *   privateKeyToAccount("0x..."), // first is leader
-     *   privateKeyToAccount("0x..."),
-     *   // ...
-     *   privateKeyToAccount("0x..."),
-     * ];
+     *   "0x...", // Private key; or any other wallet libraries
+     * ] as const;
      *
-     * const transport = new hl.HttpTransport(); // or WebSocketTransport
+     * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const multiSignClient = new hl.MultiSignClient({ transport, multiSignAddress, signers });
      *
-     * const data = await multiSignClient.tokenDelegate({
-     *   validator: "0x...",
-     *   isUndelegate: true,
-     *   wei: 1 * 1e8,
-     * });
+     * await multiSignClient.tokenDelegate({ validator: "0x...", isUndelegate: true, wei: 1 * 1e8 });
      * ```
      */
     async tokenDelegate(...[args, signal]) {
@@ -1510,55 +1485,50 @@ export class MultiSignClient extends ExchangeClient {
         const { ...actionArgs } = args;
         // Construct an action
         const nonce = await this.nonceManager();
-        const action = {
-            ...actionArgs,
+        const action = actionSorter.tokenDelegate({
             type: "tokenDelegate",
             hyperliquidChain: this._getHyperliquidChain(),
             signatureChainId: await this._getSignatureChainId(),
             nonce,
-        };
+            ...actionArgs,
+        });
         // Sign the action
-        const sortedAction = actionSorter[action.type](action);
         const outerSigner = await this._getWalletAddress(this.signers[0]);
-        const signatures = await this._multiSignUserSignedAction(sortedAction, outerSigner);
+        const signatures = await this._multiSignUserSignedAction({ action, outerSigner });
         // Send a multi-sig action
         return super.multiSig({
             signatures,
             payload: {
                 multiSigUser: this.multiSignAddress,
                 outerSigner,
-                action: sortedAction,
+                action,
             },
             nonce,
         }, signal);
     }
     /**
+     * Cancel a TWAP order.
      * @param args - The parameters for the request.
      * @param signal - An optional abort signal.
      * @returns Successful variant of {@link TwapCancelResponse} without error status.
-     * @throws {ApiRequestError} When the API returns an error response.
+     *
+     * @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#cancel-a-twap-order
      * @example
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
-     * import { privateKeyToAccount } from "viem/accounts";
      *
      * const multiSignAddress = "0x...";
      * const signers = [
-     *   privateKeyToAccount("0x..."), // first is leader
-     *   privateKeyToAccount("0x..."),
-     *   // ...
-     *   privateKeyToAccount("0x..."),
-     * ];
+     *   "0x...", // Private key; or any other wallet libraries
+     * ] as const;
      *
-     * const transport = new hl.HttpTransport(); // or WebSocketTransport
+     * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const multiSignClient = new hl.MultiSignClient({ transport, multiSignAddress, signers });
      *
-     * const data = await multiSignClient.twapCancel({
-     *   a: 0, // Asset index
-     *   t: 1, // TWAP ID
-     * });
+     * const data = await multiSignClient.twapCancel({ a: 0, t: 1 });
      * ```
      */
     async twapCancel(...[args, signal]) {
@@ -1566,27 +1536,17 @@ export class MultiSignClient extends ExchangeClient {
         const { vaultAddress = this.defaultVaultAddress, expiresAfter = await this._getDefaultExpiresAfter(), ...actionArgs } = args;
         // Construct an action
         const nonce = await this.nonceManager();
-        const action = {
-            type: "twapCancel",
-            ...actionArgs,
-        };
+        const action = actionSorter.twapCancel({ type: "twapCancel", ...actionArgs });
         // Send a multi-sig action
-        const sortedAction = actionSorter[action.type](action);
         const outerSigner = await this._getWalletAddress(this.signers[0]);
-        const signatures = await this._multiSignL1Action({
-            action: sortedAction,
-            nonce,
-            outerSigner,
-            vaultAddress,
-            expiresAfter,
-        });
+        const signatures = await this._multiSignL1Action({ action, nonce, outerSigner, vaultAddress, expiresAfter });
         // Send a multi-sig action
         return super.multiSig({
             signatures,
             payload: {
                 multiSigUser: this.multiSignAddress,
                 outerSigner,
-                action: sortedAction,
+                action,
             },
             nonce,
             vaultAddress,
@@ -1594,35 +1554,34 @@ export class MultiSignClient extends ExchangeClient {
         }, signal);
     }
     /**
+     * Place a TWAP order.
      * @param args - The parameters for the request.
      * @param signal - An optional abort signal.
      * @returns Successful variant of {@link TwapOrderResponse} without error status.
-     * @throws {ApiRequestError} When the API returns an error response.
+     *
+     * @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#place-a-twap-order
      * @example
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
-     * import { privateKeyToAccount } from "viem/accounts";
      *
      * const multiSignAddress = "0x...";
      * const signers = [
-     *   privateKeyToAccount("0x..."), // first is leader
-     *   privateKeyToAccount("0x..."),
-     *   // ...
-     *   privateKeyToAccount("0x..."),
-     * ];
+     *   "0x...", // Private key; or any other wallet libraries
+     * ] as const;
      *
-     * const transport = new hl.HttpTransport(); // or WebSocketTransport
+     * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const multiSignClient = new hl.MultiSignClient({ transport, multiSignAddress, signers });
      *
      * const data = await multiSignClient.twapOrder({
-     *   a: 0, // Asset index
-     *   b: true, // Buy order
-     *   s: "1", // Size
-     *   r: false, // Not reduce-only
-     *   m: 10, // Duration in minutes
-     *   t: true, // Randomize order timing
+     *   a: 0,
+     *   b: true,
+     *   s: "1",
+     *   r: false,
+     *   m: 10,
+     *   t: true,
      * });
      * ```
      */
@@ -1631,29 +1590,17 @@ export class MultiSignClient extends ExchangeClient {
         const { vaultAddress = this.defaultVaultAddress, expiresAfter = await this._getDefaultExpiresAfter(), ...actionArgs } = args;
         // Construct an action
         const nonce = await this.nonceManager();
-        const action = {
-            type: "twapOrder",
-            twap: {
-                ...actionArgs,
-            },
-        };
+        const action = actionSorter.twapOrder({ type: "twapOrder", twap: { ...actionArgs } });
         // Send a multi-sig action
-        const sortedAction = actionSorter[action.type](action);
         const outerSigner = await this._getWalletAddress(this.signers[0]);
-        const signatures = await this._multiSignL1Action({
-            action: sortedAction,
-            nonce,
-            outerSigner,
-            vaultAddress,
-            expiresAfter,
-        });
+        const signatures = await this._multiSignL1Action({ action, nonce, outerSigner, vaultAddress, expiresAfter });
         // Send a multi-sig action
         return super.multiSig({
             signatures,
             payload: {
                 multiSigUser: this.multiSignAddress,
                 outerSigner,
-                action: sortedAction,
+                action,
             },
             nonce,
             vaultAddress,
@@ -1661,33 +1608,28 @@ export class MultiSignClient extends ExchangeClient {
         }, signal);
     }
     /**
+     * Add or remove margin from isolated position.
      * @param args - The parameters for the request.
      * @param signal - An optional abort signal.
      * @returns Successful response without specific data.
-     * @throws {ApiRequestError} When the API returns an error response.
+     *
+     * @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#update-isolated-margin
      * @example
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
-     * import { privateKeyToAccount } from "viem/accounts";
      *
      * const multiSignAddress = "0x...";
      * const signers = [
-     *   privateKeyToAccount("0x..."), // first is leader
-     *   privateKeyToAccount("0x..."),
-     *   // ...
-     *   privateKeyToAccount("0x..."),
-     * ];
+     *   "0x...", // Private key; or any other wallet libraries
+     * ] as const;
      *
-     * const transport = new hl.HttpTransport(); // or WebSocketTransport
+     * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const multiSignClient = new hl.MultiSignClient({ transport, multiSignAddress, signers });
      *
-     * const data = await multiSignClient.updateIsolatedMargin({
-     *   asset: 0,
-     *   isBuy: true,
-     *   ntli: 1 * 1e6,
-     * });
+     * await multiSignClient.updateIsolatedMargin({ asset: 0, isBuy: true, ntli: 1 * 1e6 });
      * ```
      */
     async updateIsolatedMargin(...[args, signal]) {
@@ -1695,27 +1637,17 @@ export class MultiSignClient extends ExchangeClient {
         const { vaultAddress = this.defaultVaultAddress, expiresAfter = await this._getDefaultExpiresAfter(), ...actionArgs } = args;
         // Construct an action
         const nonce = await this.nonceManager();
-        const action = {
-            type: "updateIsolatedMargin",
-            ...actionArgs,
-        };
+        const action = actionSorter.updateIsolatedMargin({ type: "updateIsolatedMargin", ...actionArgs });
         // Send a multi-sig action
-        const sortedAction = actionSorter[action.type](action);
         const outerSigner = await this._getWalletAddress(this.signers[0]);
-        const signatures = await this._multiSignL1Action({
-            action: sortedAction,
-            nonce,
-            outerSigner,
-            vaultAddress,
-            expiresAfter,
-        });
+        const signatures = await this._multiSignL1Action({ action, nonce, outerSigner, vaultAddress, expiresAfter });
         // Send a multi-sig action
         return super.multiSig({
             signatures,
             payload: {
                 multiSigUser: this.multiSignAddress,
                 outerSigner,
-                action: sortedAction,
+                action,
             },
             nonce,
             vaultAddress,
@@ -1723,33 +1655,28 @@ export class MultiSignClient extends ExchangeClient {
         }, signal);
     }
     /**
+     * Update cross or isolated leverage on a coin.
      * @param args - The parameters for the request.
      * @param signal - An optional abort signal.
      * @returns Successful response without specific data.
-     * @throws {ApiRequestError} When the API returns an error response.
+     *
+     * @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#update-leverage
      * @example
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
-     * import { privateKeyToAccount } from "viem/accounts";
      *
      * const multiSignAddress = "0x...";
      * const signers = [
-     *   privateKeyToAccount("0x..."), // first is leader
-     *   privateKeyToAccount("0x..."),
-     *   // ...
-     *   privateKeyToAccount("0x..."),
-     * ];
+     *   "0x...", // Private key; or any other wallet libraries
+     * ] as const;
      *
-     * const transport = new hl.HttpTransport(); // or WebSocketTransport
+     * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const multiSignClient = new hl.MultiSignClient({ transport, multiSignAddress, signers });
      *
-     * const data = await multiSignClient.updateLeverage({
-     *   asset: 0,
-     *   isCross: true,
-     *   leverage: 5,
-     * });
+     * await multiSignClient.updateLeverage({ asset: 0, isCross: true, leverage: 5 });
      * ```
      */
     async updateLeverage(...[args, signal]) {
@@ -1757,27 +1684,17 @@ export class MultiSignClient extends ExchangeClient {
         const { vaultAddress = this.defaultVaultAddress, expiresAfter = await this._getDefaultExpiresAfter(), ...actionArgs } = args;
         // Construct an action
         const nonce = await this.nonceManager();
-        const action = {
-            type: "updateLeverage",
-            ...actionArgs,
-        };
+        const action = actionSorter.updateLeverage({ type: "updateLeverage", ...actionArgs });
         // Send a multi-sig action
-        const sortedAction = actionSorter[action.type](action);
         const outerSigner = await this._getWalletAddress(this.signers[0]);
-        const signatures = await this._multiSignL1Action({
-            action: sortedAction,
-            nonce,
-            outerSigner,
-            vaultAddress,
-            expiresAfter,
-        });
+        const signatures = await this._multiSignL1Action({ action, nonce, outerSigner, vaultAddress, expiresAfter });
         // Send a multi-sig action
         return super.multiSig({
             signatures,
             payload: {
                 multiSigUser: this.multiSignAddress,
                 outerSigner,
-                action: sortedAction,
+                action,
             },
             nonce,
             vaultAddress,
@@ -1785,29 +1702,28 @@ export class MultiSignClient extends ExchangeClient {
         }, signal);
     }
     /**
+     * Transfer funds between Spot account and Perp account.
      * @param args - The parameters for the request.
      * @param signal - An optional abort signal.
      * @returns Successful response without specific data.
-     * @throws {ApiRequestError} When the API returns an error response.
+     *
+     * @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
      * @example
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
-     * import { privateKeyToAccount } from "viem/accounts";
      *
      * const multiSignAddress = "0x...";
      * const signers = [
-     *   privateKeyToAccount("0x..."), // first is leader
-     *   privateKeyToAccount("0x..."),
-     *   // ...
-     *   privateKeyToAccount("0x..."),
-     * ];
+     *   "0x...", // Private key; or any other wallet libraries
+     * ] as const;
      *
-     * const transport = new hl.HttpTransport(); // or WebSocketTransport
+     * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const multiSignClient = new hl.MultiSignClient({ transport, multiSignAddress, signers });
      *
-     * const data = await multiSignClient.usdClassTransfer({ amount: "1", toPerp: true });
+     * await multiSignClient.usdClassTransfer({ amount: "1", toPerp: true });
      * ```
      */
     async usdClassTransfer(...[args, signal]) {
@@ -1815,52 +1731,50 @@ export class MultiSignClient extends ExchangeClient {
         const { ...actionArgs } = args;
         // Construct an action
         const nonce = await this.nonceManager();
-        const action = {
-            ...actionArgs,
+        const action = actionSorter.usdClassTransfer({
             type: "usdClassTransfer",
             hyperliquidChain: this._getHyperliquidChain(),
             signatureChainId: await this._getSignatureChainId(),
             nonce,
-        };
+            ...actionArgs,
+        });
         // Sign the action
-        const sortedAction = actionSorter[action.type](action);
         const outerSigner = await this._getWalletAddress(this.signers[0]);
-        const signatures = await this._multiSignUserSignedAction(sortedAction, outerSigner);
+        const signatures = await this._multiSignUserSignedAction({ action, outerSigner });
         // Send a multi-sig action
         return super.multiSig({
             signatures,
             payload: {
                 multiSigUser: this.multiSignAddress,
                 outerSigner,
-                action: sortedAction,
+                action,
             },
             nonce,
         }, signal);
     }
     /**
+     * Send usd to another address.
      * @param args - The parameters for the request.
      * @param signal - An optional abort signal.
      * @returns Successful response without specific data.
-     * @throws {ApiRequestError} When the API returns an error response.
+     *
+     * @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#core-usdc-transfer
      * @example
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
-     * import { privateKeyToAccount } from "viem/accounts";
      *
      * const multiSignAddress = "0x...";
      * const signers = [
-     *   privateKeyToAccount("0x..."), // first is leader
-     *   privateKeyToAccount("0x..."),
-     *   // ...
-     *   privateKeyToAccount("0x..."),
-     * ];
+     *   "0x...", // Private key; or any other wallet libraries
+     * ] as const;
      *
-     * const transport = new hl.HttpTransport(); // or WebSocketTransport
+     * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const multiSignClient = new hl.MultiSignClient({ transport, multiSignAddress, signers });
      *
-     * const data = await multiSignClient.usdSend({ destination: "0x...", amount: "1" });
+     * await multiSignClient.usdSend({ destination: "0x...", amount: "1" });
      * ```
      */
     async usdSend(...[args, signal]) {
@@ -1868,52 +1782,50 @@ export class MultiSignClient extends ExchangeClient {
         const { ...actionArgs } = args;
         // Construct an action
         const nonce = await this.nonceManager();
-        const action = {
-            ...actionArgs,
+        const action = actionSorter.usdSend({
             type: "usdSend",
             hyperliquidChain: this._getHyperliquidChain(),
             signatureChainId: await this._getSignatureChainId(),
             time: nonce,
-        };
+            ...actionArgs,
+        });
         // Sign the action
-        const sortedAction = actionSorter[action.type](action);
         const outerSigner = await this._getWalletAddress(this.signers[0]);
-        const signatures = await this._multiSignUserSignedAction(sortedAction, outerSigner);
+        const signatures = await this._multiSignUserSignedAction({ action, outerSigner });
         // Send a multi-sig action
         return super.multiSig({
             signatures,
             payload: {
                 multiSigUser: this.multiSignAddress,
                 outerSigner,
-                action: sortedAction,
+                action,
             },
             nonce,
         }, signal);
     }
     /**
+     * Distribute funds from a vault between followers.
      * @param args - The parameters for the request.
      * @param signal - An optional abort signal.
      * @returns Successful response without specific data.
-     * @throws {ApiRequestError} When the API returns an error response.
      *
-     * @see null - no documentation
+     * @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";
-     * import { privateKeyToAccount } from "viem/accounts";
      *
      * const multiSignAddress = "0x...";
      * const signers = [
-     *   privateKeyToAccount("0x..."), // first is leader
-     *   privateKeyToAccount("0x..."),
-     *   // ...
-     *   privateKeyToAccount("0x..."),
-     * ];
+     *   "0x...", // Private key; or any other wallet libraries
+     * ] as const;
      *
-     * const transport = new hl.HttpTransport(); // or WebSocketTransport
+     * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const multiSignClient = new hl.MultiSignClient({ transport, multiSignAddress, signers });
      *
-     * const data = await multiSignClient.vaultDistribute({ vaultAddress: "0x...", usd: 10 * 1e6 });
+     * await multiSignClient.vaultDistribute({ vaultAddress: "0x...", usd: 10 * 1e6 });
      * ```
      */
     async vaultDistribute(...[args, signal]) {
@@ -1921,49 +1833,44 @@ export class MultiSignClient extends ExchangeClient {
         const { ...actionArgs } = args;
         // Construct an action
         const nonce = await this.nonceManager();
-        const action = {
-            type: "vaultDistribute",
-            ...actionArgs,
-        };
+        const action = actionSorter.vaultDistribute({ type: "vaultDistribute", ...actionArgs });
         // Send a multi-sig action
-        const sortedAction = actionSorter[action.type](action);
         const outerSigner = await this._getWalletAddress(this.signers[0]);
-        const signatures = await this._multiSignL1Action({ action: sortedAction, nonce, outerSigner });
+        const signatures = await this._multiSignL1Action({ action, nonce, outerSigner });
         // Send a multi-sig action
         return super.multiSig({
             signatures,
             payload: {
                 multiSigUser: this.multiSignAddress,
                 outerSigner,
-                action: sortedAction,
+                action,
             },
             nonce,
         }, signal);
     }
     /**
+     * Modify a vault's configuration.
      * @param args - The parameters for the request.
      * @param signal - An optional abort signal.
      * @returns Successful response without specific data.
-     * @throws {ApiRequestError} When the API returns an error response.
      *
-     * @see null - no documentation
+     * @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";
-     * import { privateKeyToAccount } from "viem/accounts";
      *
      * const multiSignAddress = "0x...";
      * const signers = [
-     *   privateKeyToAccount("0x..."), // first is leader
-     *   privateKeyToAccount("0x..."),
-     *   // ...
-     *   privateKeyToAccount("0x..."),
-     * ];
+     *   "0x...", // Private key; or any other wallet libraries
+     * ] as const;
      *
-     * const transport = new hl.HttpTransport(); // or WebSocketTransport
+     * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const multiSignClient = new hl.MultiSignClient({ transport, multiSignAddress, signers });
      *
-     * const data = await multiSignClient.vaultModify({
+     * await multiSignClient.vaultModify({
      *   vaultAddress: "0x...",
      *   allowDeposits: true,
      *   alwaysCloseOnWithdraw: false,
@@ -1975,53 +1882,44 @@ export class MultiSignClient extends ExchangeClient {
         const { ...actionArgs } = args;
         // Construct an action
         const nonce = await this.nonceManager();
-        const action = {
-            type: "vaultModify",
-            ...actionArgs,
-        };
+        const action = actionSorter.vaultModify({ type: "vaultModify", ...actionArgs });
         // Send a multi-sig action
-        const sortedAction = actionSorter[action.type](action);
         const outerSigner = await this._getWalletAddress(this.signers[0]);
-        const signatures = await this._multiSignL1Action({ action: sortedAction, nonce, outerSigner });
+        const signatures = await this._multiSignL1Action({ action, nonce, outerSigner });
         // Send a multi-sig action
         return super.multiSig({
             signatures,
             payload: {
                 multiSigUser: this.multiSignAddress,
                 outerSigner,
-                action: sortedAction,
+                action,
             },
             nonce,
         }, signal);
     }
     /**
+     * Deposit or withdraw from a vault.
      * @param args - The parameters for the request.
      * @param signal - An optional abort signal.
      * @returns Successful response without specific data.
-     * @throws {ApiRequestError} When the API returns an error response.
+     *
+     * @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#deposit-or-withdraw-from-a-vault
      * @example
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
-     * import { privateKeyToAccount } from "viem/accounts";
      *
      * const multiSignAddress = "0x...";
      * const signers = [
-     *   privateKeyToAccount("0x..."), // first is leader
-     *   privateKeyToAccount("0x..."),
-     *   // ...
-     *   privateKeyToAccount("0x..."),
-     * ];
+     *   "0x...", // Private key; or any other wallet libraries
+     * ] as const;
      *
-     * const transport = new hl.HttpTransport(); // or WebSocketTransport
+     * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const multiSignClient = new hl.MultiSignClient({ transport, multiSignAddress, signers });
      *
-     * const data = await multiSignClient.vaultTransfer({
-     *   vaultAddress: "0x...",
-     *   isDeposit: true,
-     *   usd: 10 * 1e6,
-     * });
+     * await multiSignClient.vaultTransfer({ vaultAddress: "0x...", isDeposit: true, usd: 10 * 1e6 });
      * ```
      */
     async vaultTransfer(...[args, signal]) {
@@ -2029,50 +1927,45 @@ export class MultiSignClient extends ExchangeClient {
         const { expiresAfter = await this._getDefaultExpiresAfter(), ...actionArgs } = args;
         // Construct an action
         const nonce = await this.nonceManager();
-        const action = {
-            type: "vaultTransfer",
-            ...actionArgs,
-        };
+        const action = actionSorter.vaultTransfer({ type: "vaultTransfer", ...actionArgs });
         // Send a multi-sig action
-        const sortedAction = actionSorter[action.type](action);
         const outerSigner = await this._getWalletAddress(this.signers[0]);
-        const signatures = await this._multiSignL1Action({ action: sortedAction, nonce, outerSigner, expiresAfter });
+        const signatures = await this._multiSignL1Action({ action, nonce, outerSigner, expiresAfter });
         // Send a multi-sig action
         return super.multiSig({
             signatures,
             payload: {
                 multiSigUser: this.multiSignAddress,
                 outerSigner,
-                action: sortedAction,
+                action,
             },
             nonce,
             expiresAfter,
         }, signal);
     }
     /**
+     * Initiate a withdrawal request.
      * @param args - The parameters for the request.
      * @param signal - An optional abort signal.
      * @returns Successful response without specific data.
-     * @throws {ApiRequestError} When the API returns an error response.
+     *
+     * @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#initiate-a-withdrawal-request
      * @example
      * ```ts
      * import * as hl from "@nktkas/hyperliquid";
-     * import { privateKeyToAccount } from "viem/accounts";
      *
      * const multiSignAddress = "0x...";
      * const signers = [
-     *   privateKeyToAccount("0x..."), // first is leader
-     *   privateKeyToAccount("0x..."),
-     *   // ...
-     *   privateKeyToAccount("0x..."),
-     * ];
+     *   "0x...", // Private key; or any other wallet libraries
+     * ] as const;
      *
-     * const transport = new hl.HttpTransport(); // or WebSocketTransport
+     * const transport = new hl.HttpTransport(); // or `WebSocketTransport`
      * const multiSignClient = new hl.MultiSignClient({ transport, multiSignAddress, signers });
      *
-     * const data = await multiSignClient.withdraw3({ destination: "0x...", amount: "1" });
+     * await multiSignClient.withdraw3({ destination: "0x...", amount: "1" });
      * ```
      */
     async withdraw3(...[args, signal]) {
@@ -2080,31 +1973,33 @@ export class MultiSignClient extends ExchangeClient {
         const { ...actionArgs } = args;
         // Construct an action
         const nonce = await this.nonceManager();
-        const action = {
-            ...actionArgs,
+        const action = actionSorter.withdraw3({
             type: "withdraw3",
             hyperliquidChain: this._getHyperliquidChain(),
             signatureChainId: await this._getSignatureChainId(),
             time: nonce,
-        };
+            ...actionArgs,
+        });
         // Sign the action
-        const sortedAction = actionSorter[action.type](action);
         const outerSigner = await this._getWalletAddress(this.signers[0]);
-        const signatures = await this._multiSignUserSignedAction(sortedAction, outerSigner);
+        const signatures = await this._multiSignUserSignedAction({ action, outerSigner });
         // Send a multi-sig action
         return super.multiSig({
             signatures,
             payload: {
                 multiSigUser: this.multiSignAddress,
                 outerSigner,
-                action: sortedAction,
+                action,
             },
             nonce,
         }, signal);
     }
     /** Extracts the wallet address from different wallet types. */
     async _getWalletAddress(wallet) {
-        if (isAbstractViemWalletClient(wallet)) {
+        if (isValidPrivateKey(wallet)) {
+            return privateKeyToAddress(wallet);
+        }
+        else if (isAbstractViemWalletClient(wallet)) {
             return wallet.address;
         }
         else if (isAbstractEthersSigner(wallet) || isAbstractEthersV5Signer(wallet)) {
@@ -2136,7 +2031,8 @@ export class MultiSignClient extends ExchangeClient {
         }));
     }
     /** Signs user-signed action with all signers for multi-signature operations. */
-    _multiSignUserSignedAction(action, outerSigner) {
+    _multiSignUserSignedAction(args) {
+        const { action, outerSigner } = args;
         return Promise.all(this.signers.map((signer) => {
             const types = structuredClone(userSignedActionEip712Types[action.type]); // for safe mutation
             Object.values(types)[0].splice(// array mutation
@@ -2146,13 +2042,22 @@ export class MultiSignClient extends ExchangeClient {
             return signUserSignedAction({
                 wallet: signer,
                 action: {
-                    ...action,
                     payloadMultiSigUser: this.multiSignAddress,
                     outerSigner,
+                    ...action,
                 },
                 types,
-                chainId: parseInt(action.signatureChainId, 16),
             });
         }));
     }
 }
+/** Converts a private key to an Ethereum address. */
+function privateKeyToAddress(privateKey) {
+    const cleanPrivKey = privateKey.startsWith("0x") ? privateKey.slice(2) : privateKey;
+    const publicKey = getPublicKey(cleanPrivKey, false);
+    const publicKeyWithoutPrefix = publicKey.slice(1);
+    const hash = keccak_256(publicKeyWithoutPrefix);
+    const addressBytes = hash.slice(-20);
+    const address = etc.bytesToHex(addressBytes);
+    return `0x${address}`;
+}