@nktkas/hyperliquid 0.23.1 → 0.24.1

package/script/src/signing/_signTypedData/mod.js

@@ -1,29 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isValidPrivateKey = exports.isAbstractWindowEthereum = exports.isAbstractViemWalletClient = exports.isAbstractEthersV5Signer = exports.isAbstractEthersSigner = void 0;
 exports.signTypedData = signTypedData;
+exports.getWalletChainId = getWalletChainId;
+exports.getWalletAddress = getWalletAddress;
 const ethers_js_1 = require("./ethers.js");
-Object.defineProperty(exports, "isAbstractEthersSigner", { enumerable: true, get: function () { return ethers_js_1.isAbstractEthersSigner; } });
-Object.defineProperty(exports, "isAbstractEthersV5Signer", { enumerable: true, get: function () { return ethers_js_1.isAbstractEthersV5Signer; } });
 const private_key_js_1 = require("./private_key.js");
-Object.defineProperty(exports, "isValidPrivateKey", { enumerable: true, get: function () { return private_key_js_1.isValidPrivateKey; } });
 const viem_js_1 = require("./viem.js");
-Object.defineProperty(exports, "isAbstractViemWalletClient", { enumerable: true, get: function () { return viem_js_1.isAbstractViemWalletClient; } });
-const window_js_1 = require("./window.js");
-Object.defineProperty(exports, "isAbstractWindowEthereum", { enumerable: true, get: function () { return window_js_1.isAbstractWindowEthereum; } });
 async function signTypedData(args) {
     const { wallet, domain, types, primaryType, message } = args;
     let signature;
-    if ((0, private_key_js_1.isValidPrivateKey)(wallet)) {
-        signature = await (0, private_key_js_1.signTypedData)({
-            privateKey: wallet,
-            domain,
-            types,
-            primaryType,
-            message,
-        });
-    }
-    else if ((0, viem_js_1.isAbstractViemWalletClient)(wallet)) {
+    if ((0, viem_js_1.isAbstractViemWallet)(wallet)) {
         signature = await wallet.signTypedData({
             domain,
             types: {
@@ -39,20 +25,14 @@ async function signTypedData(args) {
             message,
         });
     }
-    else if ((0, ethers_js_1.isAbstractEthersSigner)(wallet)) {
+    else if ((0, ethers_js_1.isAbstractEthersV6Signer)(wallet)) {
         signature = await wallet.signTypedData(domain, types, message);
     }
     else if ((0, ethers_js_1.isAbstractEthersV5Signer)(wallet)) {
         signature = await wallet._signTypedData(domain, types, message);
     }
-    else if ((0, window_js_1.isAbstractWindowEthereum)(wallet)) {
-        signature = await (0, window_js_1.signTypedDataWithWindowEthereum)({
-            ethereum: wallet,
-            domain,
-            types,
-            primaryType,
-            message,
-        });
+    else if ((0, private_key_js_1.isValidPrivateKey)(wallet)) {
+        signature = await (0, private_key_js_1.signTypedData)({ privateKey: wallet, domain, types, primaryType, message });
     }
     else {
         throw new Error("Unsupported wallet for signing typed data");
@@ -65,3 +45,48 @@ function splitSignature(signature) {
     const v = parseInt(signature.slice(130, 132), 16);
     return { r, s, v };
 }
+/** Get the chain ID of the wallet. */
+async function getWalletChainId(wallet) {
+    if ((0, viem_js_1.isAbstractViemWallet)(wallet)) {
+        if ("getChainId" in wallet && wallet.getChainId) {
+            const chainId = await wallet.getChainId();
+            return `0x${chainId.toString(16)}`;
+        }
+        else {
+            return "0x1";
+        }
+    }
+    else if ((0, ethers_js_1.isAbstractEthersV6Signer)(wallet) || (0, ethers_js_1.isAbstractEthersV5Signer)(wallet)) {
+        if ("provider" in wallet && wallet.provider) {
+            const network = await wallet.provider.getNetwork();
+            return `0x${network.chainId.toString(16)}`;
+        }
+        else {
+            return "0x1";
+        }
+    }
+    else {
+        return "0x1";
+    }
+}
+/** Get the wallet address from various wallet types. */
+async function getWalletAddress(wallet) {
+    if ((0, viem_js_1.isAbstractViemWallet)(wallet)) {
+        if ("address" in wallet && wallet.address) {
+            return wallet.address;
+        }
+        else if ("getAddresses" in wallet && wallet.getAddresses) {
+            const addresses = await wallet.getAddresses();
+            return addresses[0];
+        }
+    }
+    else if ((0, ethers_js_1.isAbstractEthersV6Signer)(wallet) || (0, ethers_js_1.isAbstractEthersV5Signer)(wallet)) {
+        if ("getAddress" in wallet && wallet.getAddress) {
+            return await wallet.getAddress();
+        }
+    }
+    else if ((0, private_key_js_1.isValidPrivateKey)(wallet)) {
+        return (0, private_key_js_1.privateKeyToAddress)(wallet);
+    }
+    throw new Error("Unsupported wallet for getting address");
+}

package/script/src/signing/_signTypedData/private_key.d.ts

@@ -1,4 +1,3 @@
-type Hex = `0x${string}`;
 interface Types {
     [type: string]: {
         name: string;
@@ -8,9 +7,9 @@ interface Types {
 interface Domain extends Record<string, unknown> {
     name?: string;
     version?: string;
-    chainId?: number | string | bigint | Hex;
-    verifyingContract?: Hex;
-    salt?: Hex;
+    chainId?: number | string | bigint | `0x${string}`;
+    verifyingContract?: `0x${string}`;
+    salt?: `0x${string}`;
 }
 /** Signs typed data with a private key. */
 export declare function signTypedData(args: {
@@ -19,8 +18,10 @@ export declare function signTypedData(args: {
     types: Types;
     primaryType: string;
     message: Record<string, unknown>;
-}): Promise<Hex>;
+}): Promise<`0x${string}`>;
 /** Validates if a string is a valid secp256k1 private key. */
 export declare function isValidPrivateKey(privateKey: unknown): privateKey is string;
+/** Converts a private key to an Ethereum address. */
+export declare function privateKeyToAddress(privateKey: string): `0x${string}`;
 export {};
 //# sourceMappingURL=private_key.d.ts.map

package/script/src/signing/_signTypedData/private_key.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"private_key.d.ts","sourceRoot":"","sources":["../../../../src/src/signing/_signTypedData/private_key.ts"],"names":[],"mappings":"AAGA,KAAK,GAAG,GAAG,KAAK,MAAM,EAAE,CAAC;AAEzB,UAAU,KAAK;IACX,CAAC,IAAI,EAAE,MAAM,GAAG;QACZ,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;KAChB,EAAE,CAAC;CACP;AAED,UAAU,MAAO,SAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAC5C,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;IACzC,iBAAiB,CAAC,EAAE,GAAG,CAAC;IACxB,IAAI,CAAC,EAAE,GAAG,CAAC;CACd;AAED,2CAA2C;AAC3C,wBAAsB,aAAa,CAAC,IAAI,EAAE;IACtC,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,KAAK,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACpC,GAAG,OAAO,CAAC,GAAG,CAAC,CAkBf;AAuJD,8DAA8D;AAC9D,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,OAAO,GAAG,UAAU,IAAI,MAAM,CAG3E"}
+{"version":3,"file":"private_key.d.ts","sourceRoot":"","sources":["../../../../src/src/signing/_signTypedData/private_key.ts"],"names":[],"mappings":"AAGA,UAAU,KAAK;IACX,CAAC,IAAI,EAAE,MAAM,GAAG;QACZ,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;KAChB,EAAE,CAAC;CACP;AAED,UAAU,MAAO,SAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAC5C,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,KAAK,MAAM,EAAE,CAAC;IACnD,iBAAiB,CAAC,EAAE,KAAK,MAAM,EAAE,CAAC;IAClC,IAAI,CAAC,EAAE,KAAK,MAAM,EAAE,CAAC;CACxB;AAED,2CAA2C;AAC3C,wBAAsB,aAAa,CAAC,IAAI,EAAE;IACtC,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,KAAK,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACpC,GAAG,OAAO,CAAC,KAAK,MAAM,EAAE,CAAC,CAkBzB;AAsKD,8DAA8D;AAC9D,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,OAAO,GAAG,UAAU,IAAI,MAAM,CAG3E;AAED,qDAAqD;AACrD,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,KAAK,MAAM,EAAE,CAYrE"}

package/script/src/signing/_signTypedData/private_key.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.signTypedData = signTypedData;
 exports.isValidPrivateKey = isValidPrivateKey;
+exports.privateKeyToAddress = privateKeyToAddress;
 const sha3_1 = require("@noble/hashes/sha3");
 const secp256k1_1 = require("@noble/secp256k1");
 /** Signs typed data with a private key. */
@@ -51,20 +52,27 @@ function encodeType(primaryType, types) {
     const deps = findTypeDependencies(primaryType, types);
     const sortedDeps = [primaryType, ...deps.filter((d) => d !== primaryType).sort()];
     return sortedDeps
-        .map((type) => `${type}(${types[type].map((field) => `${field.type} ${field.name}`).join(",")})`)
+        .map((type) => `${type}(${types[type].map((field) => `${resolveTypeAlias(field.type)} ${field.name}`).join(",")})`)
         .join("");
 }
-function findTypeDependencies(primaryType, types, found = new Set()) {
-    if (found.has(primaryType) || !types[primaryType])
+function resolveTypeAlias(type) {
+    if (type === "uint")
+        return "uint256";
+    if (type === "int")
+        return "int256";
+    return type;
+}
+function findTypeDependencies(primaryType, types, _found = new Set()) {
+    if (_found.has(primaryType) || !types[primaryType])
         return [];
-    found.add(primaryType);
+    _found.add(primaryType);
     for (const field of types[primaryType]) {
-        const baseType = field.type.replace(/\[\d*\]$/, "");
+        const baseType = field.type.replace(/\[.*?\]/g, "");
         if (types[baseType]) {
-            findTypeDependencies(baseType, types, found);
+            findTypeDependencies(baseType, types, _found);
         }
     }
-    return Array.from(found);
+    return Array.from(_found);
 }
 function encodeValue(type, value, types) {
     const arrayMatch = type.match(/^(.*)\[(\d*)\]$/);
@@ -72,10 +80,10 @@ function encodeValue(type, value, types) {
         // Extract type info: base type and optional length
         const [, baseType, len] = arrayMatch;
         if (!Array.isArray(value)) {
-            throw new Error(`Expected array for ${type}, got ${typeof value}`);
+            throw new Error(`Expected array for ${type}. Received: ${typeof value}`);
         }
         if (len && value.length !== +len) {
-            throw new Error(`Invalid length for ${type}: expected ${len}, got ${value.length}`);
+            throw new Error(`Invalid length for ${type}: expected ${len}. Received: ${value.length}`);
         }
         // Encode each element in the array and hash them together
         const encodedElements = value.map((v) => encodeValue(baseType, v, types));
@@ -91,8 +99,9 @@ function encodeValue(type, value, types) {
     }
     if (type === "address") {
         const bytes = secp256k1_1.etc.hexToBytes(cleanHex(value));
-        if (bytes.length !== 20)
-            throw new Error("address must be 20 bytes");
+        if (bytes.length !== 20) {
+            throw new Error(`Address must be 20 bytes.`);
+        }
         const padded = new Uint8Array(32);
         padded.set(bytes, 12);
         return padded;
@@ -100,9 +109,10 @@ function encodeValue(type, value, types) {
     if (type.startsWith("uint") || type.startsWith("int")) {
         // Extract type info: uint/int and bit size
         const isUint = type.startsWith("uint");
-        const bits = parseInt(type.slice(isUint ? 4 : 3) || "256");
+        const bitsStr = type.slice(isUint ? 4 : 3);
+        const bits = parseInt(bitsStr || "256");
         if (bits > 256 || bits % 8 !== 0) {
-            throw new Error(`Unsupported bit size for ${type}: ${bits}`);
+            throw new Error(`Invalid ${isUint ? "uint" : "int"} size: ${bitsStr}. Must be 8-256 in steps of 8`);
         }
         // Apply Two's complement for specified bit size
         const bigIntValue = BigInt(value);
@@ -124,18 +134,20 @@ function encodeValue(type, value, types) {
     if (bytesMatch) {
         // Extract type info: bytes size
         const size = parseInt(bytesMatch[1]);
-        if (size === 0 || size > 32)
-            throw new Error(`Unsupported bytes size: ${size}`);
+        if (size === 0 || size > 32) {
+            throw new Error(`bytesN size must be 1-32. Received: ${size}`);
+        }
         // Convert hex to bytes
         const bytes = secp256k1_1.etc.hexToBytes(cleanHex(value));
-        if (bytes.length !== size)
-            throw new Error(`Invalid length for ${type}: expected ${size}, got ${bytes.length}`);
+        if (bytes.length !== size) {
+            throw new Error(`${type} requires exactly ${size} bytes. Received: ${bytes.length} from '${value}'`);
+        }
         // Pad to 32 bytes
         const padded = new Uint8Array(32);
         padded.set(bytes, 0);
         return padded;
     }
-    throw new Error(`Unsupported type: ${type}`);
+    throw new Error(`Unsupported type: '${type}'.`);
 }
 function cleanHex(hex) {
     return hex.startsWith("0x") ? hex.slice(2) : hex;
@@ -146,3 +158,13 @@ function isValidPrivateKey(privateKey) {
         return false;
     return secp256k1_1.utils.isValidPrivateKey(cleanHex(privateKey));
 }
+/** Converts a private key to an Ethereum address. */
+function privateKeyToAddress(privateKey) {
+    const cleanPrivKey = cleanHex(privateKey);
+    const publicKey = (0, secp256k1_1.getPublicKey)(cleanPrivKey, false);
+    const publicKeyWithoutPrefix = publicKey.slice(1);
+    const hash = (0, sha3_1.keccak_256)(publicKeyWithoutPrefix);
+    const addressBytes = hash.slice(-20);
+    const address = secp256k1_1.etc.bytesToHex(addressBytes);
+    return `0x${address}`;
+}

package/script/src/signing/_signTypedData/viem.d.ts

@@ -1,12 +1,11 @@
-import type { Hex } from "../../base.js";
-/** Abstract interface for a [viem wallet](https://viem.sh/docs/clients/wallet). */
-export interface AbstractViemWalletClient {
+/** Abstract interface for a viem {@link https://viem.sh/docs/accounts/jsonRpc#json-rpc-account | JSON-RPC Account}. */
+export interface AbstractViemJsonRpcAccount {
     signTypedData(params: {
         domain: {
             name: string;
             version: string;
             chainId: number;
-            verifyingContract: Hex;
+            verifyingContract: `0x${string}`;
         };
         types: {
             [key: string]: {
@@ -16,8 +15,30 @@ export interface AbstractViemWalletClient {
         };
         primaryType: string;
         message: Record<string, unknown>;
-    }, options?: unknown): Promise<Hex>;
+    }, options?: unknown): Promise<`0x${string}`>;
+    getAddresses?(): Promise<`0x${string}`[]>;
+    getChainId?(): Promise<number>;
+}
+/** Abstract interface for a viem {@link https://viem.sh/docs/accounts/local | Local Account}. */
+export interface AbstractViemLocalAccount {
+    signTypedData(params: {
+        domain: {
+            name: string;
+            version: string;
+            chainId: number;
+            verifyingContract: `0x${string}`;
+        };
+        types: {
+            [key: string]: {
+                name: string;
+                type: string;
+            }[];
+        };
+        primaryType: string;
+        message: Record<string, unknown>;
+    }, options?: unknown): Promise<`0x${string}`>;
+    address?: `0x${string}`;
 }
 /** Checks if the given value is an abstract viem wallet. */
-export declare function isAbstractViemWalletClient(client: unknown): client is AbstractViemWalletClient;
+export declare function isAbstractViemWallet(client: unknown): client is AbstractViemJsonRpcAccount | AbstractViemLocalAccount;
 //# sourceMappingURL=viem.d.ts.map

package/script/src/signing/_signTypedData/viem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"viem.d.ts","sourceRoot":"","sources":["../../../../src/src/signing/_signTypedData/viem.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAEzC,mFAAmF;AACnF,MAAM,WAAW,wBAAwB;IACrC,aAAa,CACT,MAAM,EAAE;QACJ,MAAM,EAAE;YACJ,IAAI,EAAE,MAAM,CAAC;YACb,OAAO,EAAE,MAAM,CAAC;YAChB,OAAO,EAAE,MAAM,CAAC;YAChB,iBAAiB,EAAE,GAAG,CAAC;SAC1B,CAAC;QACF,KAAK,EAAE;YACH,CAAC,GAAG,EAAE,MAAM,GAAG;gBACX,IAAI,EAAE,MAAM,CAAC;gBACb,IAAI,EAAE,MAAM,CAAC;aAChB,EAAE,CAAC;SACP,CAAC;QACF,WAAW,EAAE,MAAM,CAAC;QACpB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KACpC,EACD,OAAO,CAAC,EAAE,OAAO,GAClB,OAAO,CAAC,GAAG,CAAC,CAAC;CACnB;AAED,4DAA4D;AAC5D,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,IAAI,wBAAwB,CAI9F"}
+{"version":3,"file":"viem.d.ts","sourceRoot":"","sources":["../../../../src/src/signing/_signTypedData/viem.ts"],"names":[],"mappings":"AAAA,uHAAuH;AACvH,MAAM,WAAW,0BAA0B;IACvC,aAAa,CACT,MAAM,EAAE;QACJ,MAAM,EAAE;YACJ,IAAI,EAAE,MAAM,CAAC;YACb,OAAO,EAAE,MAAM,CAAC;YAChB,OAAO,EAAE,MAAM,CAAC;YAChB,iBAAiB,EAAE,KAAK,MAAM,EAAE,CAAC;SACpC,CAAC;QACF,KAAK,EAAE;YACH,CAAC,GAAG,EAAE,MAAM,GAAG;gBACX,IAAI,EAAE,MAAM,CAAC;gBACb,IAAI,EAAE,MAAM,CAAC;aAChB,EAAE,CAAC;SACP,CAAC;QACF,WAAW,EAAE,MAAM,CAAC;QACpB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KACpC,EACD,OAAO,CAAC,EAAE,OAAO,GAClB,OAAO,CAAC,KAAK,MAAM,EAAE,CAAC,CAAC;IAC1B,YAAY,CAAC,IAAI,OAAO,CAAC,KAAK,MAAM,EAAE,EAAE,CAAC,CAAC;IAC1C,UAAU,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;CAClC;AAED,iGAAiG;AACjG,MAAM,WAAW,wBAAwB;IACrC,aAAa,CACT,MAAM,EAAE;QACJ,MAAM,EAAE;YACJ,IAAI,EAAE,MAAM,CAAC;YACb,OAAO,EAAE,MAAM,CAAC;YAChB,OAAO,EAAE,MAAM,CAAC;YAChB,iBAAiB,EAAE,KAAK,MAAM,EAAE,CAAC;SACpC,CAAC;QACF,KAAK,EAAE;YACH,CAAC,GAAG,EAAE,MAAM,GAAG;gBACX,IAAI,EAAE,MAAM,CAAC;gBACb,IAAI,EAAE,MAAM,CAAC;aAChB,EAAE,CAAC;SACP,CAAC;QACF,WAAW,EAAE,MAAM,CAAC;QACpB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KACpC,EACD,OAAO,CAAC,EAAE,OAAO,GAClB,OAAO,CAAC,KAAK,MAAM,EAAE,CAAC,CAAC;IAC1B,OAAO,CAAC,EAAE,KAAK,MAAM,EAAE,CAAC;CAC3B;AAED,4DAA4D;AAC5D,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,IAAI,0BAA0B,GAAG,wBAAwB,CAIrH"}

package/script/src/signing/_signTypedData/viem.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isAbstractViemWalletClient = isAbstractViemWalletClient;
+exports.isAbstractViemWallet = isAbstractViemWallet;
 /** Checks if the given value is an abstract viem wallet. */
-function isAbstractViemWalletClient(client) {
+function isAbstractViemWallet(client) {
     return typeof client === "object" && client !== null &&
         "signTypedData" in client && typeof client.signTypedData === "function" &&
         (client.signTypedData.length === 1 || client.signTypedData.length === 2);

package/script/src/signing/_sorter.d.ts

@@ -1,5 +1,8 @@
-import type { DeepImmutable } from "../base.js";
-import type { ApproveAgentRequest, ApproveBuilderFeeRequest, BatchModifyRequest, CancelByCloidRequest, CancelRequest, CDepositRequest, ClaimRewardsRequest, ConvertToMultiSigUserRequest, CreateSubAccountRequest, CreateVaultRequest, CSignerActionRequest_JailSelf, CSignerActionRequest_UnjailSelf, CValidatorActionRequest_ChangeProfile, CValidatorActionRequest_Register, CValidatorActionRequest_Unregister, CWithdrawRequest, EvmUserModifyRequest, ModifyRequest, MultiSigRequest, OrderRequest, PerpDeployRequest_RegisterAsset, PerpDeployRequest_SetOracle, PerpDexClassTransferRequest, PerpDexTransferRequest, RegisterReferrerRequest, ReserveRequestWeightRequest, ScheduleCancelRequest, SetDisplayNameRequest, SetReferrerRequest, SpotDeployRequest_Genesis, SpotDeployRequest_RegisterHyperliquidity, SpotDeployRequest_RegisterSpot, SpotDeployRequest_RegisterToken2, SpotDeployRequest_SetDeployerTradingFeeShare, SpotDeployRequest_UserGenesis, SpotSendRequest, SpotUserRequest, SubAccountSpotTransferRequest, SubAccountTransferRequest, TokenDelegateRequest, TwapCancelRequest, TwapOrderRequest, UpdateIsolatedMarginRequest, UpdateLeverageRequest, UsdClassTransferRequest, UsdSendRequest, VaultDistributeRequest, VaultModifyRequest, VaultTransferRequest, Withdraw3Request } from "../types/exchange/requests.js";
+import type { ApproveAgentRequest, ApproveBuilderFeeRequest, BatchModifyRequest, CancelByCloidRequest, CancelRequest, CDepositRequest, ClaimRewardsRequest, ConvertToMultiSigUserRequest, ConvertToMultiSigUserRequestWithoutStringify, CreateSubAccountRequest, CreateVaultRequest, CSignerActionRequest, CValidatorActionRequest, CWithdrawRequest, EvmUserModifyRequest, ModifyRequest, MultiSigRequest, NoopRequest, OrderRequest, PerpDeployRequest, RegisterReferrerRequest, ReserveRequestWeightRequest, ScheduleCancelRequest, SendAssetRequest, SetDisplayNameRequest, SetReferrerRequest, SpotDeployRequest, SpotSendRequest, SpotUserRequest, SubAccountModifyRequest, SubAccountSpotTransferRequest, SubAccountTransferRequest, TokenDelegateRequest, TwapCancelRequest, TwapOrderRequest, UpdateIsolatedMarginRequest, UpdateLeverageRequest, UsdClassTransferRequest, UsdSendRequest, VaultDistributeRequest, VaultModifyRequest, VaultTransferRequest, Withdraw3Request } from "../types/mod.js";
+/** @see https://github.com/microsoft/TypeScript/issues/13923#issuecomment-2191862501 */
+type DeepImmutable<T> = {
+    readonly [K in keyof T]: DeepImmutable<T[K]>;
+};
 /** Action sorter and formatter for correct signature generation. */
 export declare const actionSorter: {
     approveAgent: (action: DeepImmutable<ApproveAgentRequest["action"]>) => ApproveAgentRequest["action"];
@@ -9,27 +12,28 @@ export declare const actionSorter: {
     cancelByCloid: (action: DeepImmutable<CancelByCloidRequest["action"]>) => CancelByCloidRequest["action"];
     cDeposit: (action: DeepImmutable<CDepositRequest["action"]>) => CDepositRequest["action"];
     claimRewards: (action: DeepImmutable<ClaimRewardsRequest["action"]>) => ClaimRewardsRequest["action"];
-    convertToMultiSigUser: (action: DeepImmutable<ConvertToMultiSigUserRequest["action"]>) => ConvertToMultiSigUserRequest["action"];
+    convertToMultiSigUser: (action: DeepImmutable<ConvertToMultiSigUserRequest["action"] | ConvertToMultiSigUserRequestWithoutStringify["action"]>) => ConvertToMultiSigUserRequest["action"];
     createSubAccount: (action: DeepImmutable<CreateSubAccountRequest["action"]>) => CreateSubAccountRequest["action"];
     createVault: (action: DeepImmutable<CreateVaultRequest["action"]>) => CreateVaultRequest["action"];
-    CSignerAction: (action: DeepImmutable<CSignerActionRequest_JailSelf["action"]> | DeepImmutable<CSignerActionRequest_UnjailSelf["action"]>) => CSignerActionRequest_JailSelf["action"] | CSignerActionRequest_UnjailSelf["action"];
-    CValidatorAction: (action: DeepImmutable<CValidatorActionRequest_ChangeProfile["action"]> | DeepImmutable<CValidatorActionRequest_Register["action"]> | DeepImmutable<CValidatorActionRequest_Unregister["action"]>) => CValidatorActionRequest_ChangeProfile["action"] | CValidatorActionRequest_Register["action"] | CValidatorActionRequest_Unregister["action"];
+    CSignerAction: (action: DeepImmutable<CSignerActionRequest["action"]>) => CSignerActionRequest["action"];
+    CValidatorAction: (action: DeepImmutable<CValidatorActionRequest["action"]>) => CValidatorActionRequest["action"];
     cWithdraw: (action: DeepImmutable<CWithdrawRequest["action"]>) => CWithdrawRequest["action"];
     evmUserModify: (action: DeepImmutable<EvmUserModifyRequest["action"]>) => EvmUserModifyRequest["action"];
     modify: (action: DeepImmutable<ModifyRequest["action"]>) => ModifyRequest["action"];
     multiSig: (action: DeepImmutable<MultiSigRequest["action"]>) => MultiSigRequest["action"];
+    noop: (action: DeepImmutable<NoopRequest["action"]>) => NoopRequest["action"];
     order: (action: DeepImmutable<OrderRequest["action"]>) => OrderRequest["action"];
-    perpDeploy: (action: DeepImmutable<PerpDeployRequest_RegisterAsset["action"]> | DeepImmutable<PerpDeployRequest_SetOracle["action"]>) => PerpDeployRequest_RegisterAsset["action"] | PerpDeployRequest_SetOracle["action"];
-    PerpDexClassTransfer: (action: DeepImmutable<PerpDexClassTransferRequest["action"]>) => PerpDexClassTransferRequest["action"];
-    PerpDexTransfer: (action: DeepImmutable<PerpDexTransferRequest["action"]>) => PerpDexTransferRequest["action"];
+    perpDeploy: (action: DeepImmutable<PerpDeployRequest["action"]>) => PerpDeployRequest["action"];
     registerReferrer: (action: DeepImmutable<RegisterReferrerRequest["action"]>) => RegisterReferrerRequest["action"];
     reserveRequestWeight: (action: DeepImmutable<ReserveRequestWeightRequest["action"]>) => ReserveRequestWeightRequest["action"];
     scheduleCancel: (action: DeepImmutable<ScheduleCancelRequest["action"]>) => ScheduleCancelRequest["action"];
+    sendAsset: (action: DeepImmutable<SendAssetRequest["action"]>) => SendAssetRequest["action"];
     setDisplayName: (action: DeepImmutable<SetDisplayNameRequest["action"]>) => SetDisplayNameRequest["action"];
     setReferrer: (action: DeepImmutable<SetReferrerRequest["action"]>) => SetReferrerRequest["action"];
-    spotDeploy: (action: DeepImmutable<SpotDeployRequest_Genesis["action"]> | DeepImmutable<SpotDeployRequest_RegisterHyperliquidity["action"]> | DeepImmutable<SpotDeployRequest_RegisterSpot["action"]> | DeepImmutable<SpotDeployRequest_RegisterToken2["action"]> | DeepImmutable<SpotDeployRequest_SetDeployerTradingFeeShare["action"]> | DeepImmutable<SpotDeployRequest_UserGenesis["action"]>) => SpotDeployRequest_Genesis["action"] | SpotDeployRequest_RegisterHyperliquidity["action"] | SpotDeployRequest_RegisterSpot["action"] | SpotDeployRequest_RegisterToken2["action"] | SpotDeployRequest_SetDeployerTradingFeeShare["action"] | SpotDeployRequest_UserGenesis["action"];
+    spotDeploy: (action: DeepImmutable<SpotDeployRequest["action"]>) => SpotDeployRequest["action"];
     spotSend: (action: DeepImmutable<SpotSendRequest["action"]>) => SpotSendRequest["action"];
     spotUser: (action: DeepImmutable<SpotUserRequest["action"]>) => SpotUserRequest["action"];
+    subAccountModify: (action: DeepImmutable<SubAccountModifyRequest["action"]>) => SubAccountModifyRequest["action"];
     subAccountSpotTransfer: (action: DeepImmutable<SubAccountSpotTransferRequest["action"]>) => SubAccountSpotTransferRequest["action"];
     subAccountTransfer: (action: DeepImmutable<SubAccountTransferRequest["action"]>) => SubAccountTransferRequest["action"];
     tokenDelegate: (action: DeepImmutable<TokenDelegateRequest["action"]>) => TokenDelegateRequest["action"];
@@ -76,20 +80,14 @@ export declare const userSignedActionEip712Types: {
             type: string;
         }[];
     };
-    PerpDexClassTransfer: {
-        "HyperliquidTransaction:PerpDexClassTransfer": {
-            name: string;
-            type: string;
-        }[];
-    };
-    PerpDexTransfer: {
-        "HyperliquidTransaction:PerpDexTransfer": {
+    multiSig: {
+        "HyperliquidTransaction:SendMultiSig": {
             name: string;
             type: string;
         }[];
     };
-    multiSig: {
-        "HyperliquidTransaction:SendMultiSig": {
+    sendAsset: {
+        "HyperliquidTransaction:SendAsset": {
             name: string;
             type: string;
         }[];
@@ -125,4 +123,5 @@ export declare const userSignedActionEip712Types: {
         }[];
     };
 };
+export {};
 //# sourceMappingURL=_sorter.d.ts.map

package/script/src/signing/_sorter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"_sorter.d.ts","sourceRoot":"","sources":["../../../src/src/signing/_sorter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"_sorter.d.ts","sourceRoot":"","sources":["../../../src/src/signing/_sorter.ts"],"names":[],"mappings":"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"}