@nktkas/hyperliquid 0.17.4 → 0.18.1

package/script/src/clients/wallet.js

@@ -158,6 +158,13 @@
                 writable: true,
                 value: void 0
             });
+            /** Sets a default expiresAfter to be used if no expiresAfter is explicitly passed to a method. */
+            Object.defineProperty(this, "defaultExpiresAfter", {
+                enumerable: true,
+                configurable: true,
+                writable: true,
+                value: void 0
+            });
             /**
              * The network that will be used to sign transactions.
              * Must match the network of the {@link wallet}.
@@ -179,6 +186,7 @@
             this.wallet = args.wallet;
             this.isTestnet = args.isTestnet ?? false;
             this.defaultVaultAddress = args.defaultVaultAddress;
+            this.defaultExpiresAfter = args.defaultExpiresAfter;
             this.signatureChainId = args.signatureChainId ?? this._guessSignatureChainId;
             this.nonceManager = args.nonceManager ?? new NonceManager().getNonce;
         }
@@ -206,11 +214,10 @@
             // Construct an action
             const action = {
                 ...args,
+                agentName: args.agentName ?? "",
                 type: "approveAgent",
-                hyperliquidChain: this.isTestnet ? "Testnet" : "Mainnet",
-                signatureChainId: typeof this.signatureChainId === "string"
-                    ? this.signatureChainId
-                    : await this.signatureChainId(),
+                hyperliquidChain: this._getHyperliquidChain(),
+                signatureChainId: await this._getSignatureChainId(),
                 nonce: await this.nonceManager(),
             };
             // Sign the action
@@ -227,6 +234,8 @@
                 },
                 chainId: parseInt(action.signatureChainId, 16),
             });
+            if (action.agentName === "")
+                delete action.agentName;
             // Send a request
             const request = { action, signature, nonce: action.nonce };
             const response = await this.transport.request("exchange", request, signal);
@@ -259,10 +268,8 @@
             const action = {
                 ...args,
                 type: "approveBuilderFee",
-                hyperliquidChain: this.isTestnet ? "Testnet" : "Mainnet",
-                signatureChainId: typeof this.signatureChainId === "string"
-                    ? this.signatureChainId
-                    : await this.signatureChainId(),
+                hyperliquidChain: this._getHyperliquidChain(),
+                signatureChainId: await this._getSignatureChainId(),
                 nonce: await this.nonceManager(),
             };
             // Sign the action
@@ -325,7 +332,7 @@
          */
         async batchModify(args, signal) {
             // Destructure the parameters
-            const { vaultAddress = this.defaultVaultAddress, ...actionArgs } = args;
+            const { vaultAddress = this.defaultVaultAddress, expiresAfter = await this._getDefaultExpiresAfter(), ...actionArgs } = args;
             // Construct an action
             const nonce = await this.nonceManager();
             const action = {
@@ -367,9 +374,10 @@
                 nonce,
                 isTestnet: this.isTestnet,
                 vaultAddress,
+                expiresAfter,
             });
             // Send a request
-            const request = { action, signature, nonce, vaultAddress };
+            const request = { action, signature, nonce, vaultAddress, expiresAfter };
             const response = await this.transport.request("exchange", request, signal);
             // Validate a response
             this._validateResponse(response);
@@ -402,7 +410,7 @@
          */
         async cancel(args, signal) {
             // Destructure the parameters
-            const { vaultAddress = this.defaultVaultAddress, ...actionArgs } = args;
+            const { vaultAddress = this.defaultVaultAddress, expiresAfter = await this._getDefaultExpiresAfter(), ...actionArgs } = args;
             // Construct an action
             const nonce = await this.nonceManager();
             const action = {
@@ -419,9 +427,10 @@
                 nonce,
                 isTestnet: this.isTestnet,
                 vaultAddress,
+                expiresAfter,
             });
             // Send a request
-            const request = { action, signature, nonce, vaultAddress };
+            const request = { action, signature, nonce, vaultAddress, expiresAfter };
             const response = await this.transport.request("exchange", request, signal);
             // Validate a response
             this._validateResponse(response);
@@ -453,7 +462,7 @@
          */
         async cancelByCloid(args, signal) {
             // Destructure the parameters
-            const { vaultAddress = this.defaultVaultAddress, ...actionArgs } = args;
+            const { vaultAddress = this.defaultVaultAddress, expiresAfter = await this._getDefaultExpiresAfter(), ...actionArgs } = args;
             // Construct an action
             const nonce = await this.nonceManager();
             const action = {
@@ -470,9 +479,10 @@
                 nonce,
                 isTestnet: this.isTestnet,
                 vaultAddress,
+                expiresAfter,
             });
             // Send a request
-            const request = { action, signature, nonce, vaultAddress };
+            const request = { action, signature, nonce, vaultAddress, expiresAfter };
             const response = await this.transport.request("exchange", request, signal);
             // Validate a response
             this._validateResponse(response);
@@ -503,10 +513,8 @@
             const action = {
                 ...args,
                 type: "cDeposit",
-                hyperliquidChain: this.isTestnet ? "Testnet" : "Mainnet",
-                signatureChainId: typeof this.signatureChainId === "string"
-                    ? this.signatureChainId
-                    : await this.signatureChainId(),
+                hyperliquidChain: this._getHyperliquidChain(),
+                signatureChainId: await this._getSignatureChainId(),
                 nonce: await this.nonceManager(),
             };
             // Sign the action
@@ -681,10 +689,8 @@
             const action = {
                 ...args,
                 type: "cWithdraw",
-                hyperliquidChain: this.isTestnet ? "Testnet" : "Mainnet",
-                signatureChainId: typeof this.signatureChainId === "string"
-                    ? this.signatureChainId
-                    : await this.signatureChainId(),
+                hyperliquidChain: this._getHyperliquidChain(),
+                signatureChainId: await this._getSignatureChainId(),
                 nonce: await this.nonceManager(),
             };
             // Sign the action
@@ -785,7 +791,7 @@
          */
         async modify(args, signal) {
             // Destructure the parameters
-            const { vaultAddress = this.defaultVaultAddress, ...actionArgs } = args;
+            const { vaultAddress = this.defaultVaultAddress, expiresAfter = await this._getDefaultExpiresAfter(), ...actionArgs } = args;
             // Construct an action
             const nonce = await this.nonceManager();
             const action = {
@@ -822,9 +828,10 @@
                 nonce,
                 isTestnet: this.isTestnet,
                 vaultAddress,
+                expiresAfter,
             });
             // Send a request
-            const request = { action, signature, nonce, vaultAddress };
+            const request = { action, signature, nonce, vaultAddress, expiresAfter };
             const response = await this.transport.request("exchange", request, signal);
             // Validate a response
             this._validateResponse(response);
@@ -867,7 +874,7 @@
          */
         async order(args, signal) {
             // Destructure the parameters
-            const { vaultAddress = this.defaultVaultAddress, ...actionArgs } = args;
+            const { vaultAddress = this.defaultVaultAddress, expiresAfter = await this._getDefaultExpiresAfter(), ...actionArgs } = args;
             // Construct an action
             const nonce = await this.nonceManager();
             const action = {
@@ -915,9 +922,10 @@
                 nonce,
                 isTestnet: this.isTestnet,
                 vaultAddress,
+                expiresAfter,
             });
             // Send a request
-            const request = { action, signature, nonce, vaultAddress };
+            const request = { action, signature, nonce, vaultAddress, expiresAfter };
             const response = await this.transport.request("exchange", request, signal);
             // Validate a response
             this._validateResponse(response);
@@ -985,11 +993,13 @@
          * ```
          */
         async reserveRequestWeight(args, signal) {
+            // Destructure the parameters
+            const { expiresAfter = await this._getDefaultExpiresAfter(), ...actionArgs } = args;
             // Construct an action
             const nonce = await this.nonceManager();
             const action = {
                 type: "reserveRequestWeight",
-                weight: args.weight,
+                weight: actionArgs.weight,
             };
             // Sign the action
             const signature = await (0, signing_js_1.signL1Action)({
@@ -997,9 +1007,10 @@
                 action,
                 nonce,
                 isTestnet: this.isTestnet,
+                expiresAfter,
             });
             // Send a request
-            const request = { action, signature, nonce };
+            const request = { action, signature, nonce, expiresAfter };
             const response = await this.transport.request("exchange", request, signal);
             // Validate a response
             this._validateResponse(response);
@@ -1027,7 +1038,7 @@
          */
         async scheduleCancel(args = {}, signal) {
             // Destructure the parameters
-            const { vaultAddress = this.defaultVaultAddress, ...actionArgs } = args;
+            const { vaultAddress = this.defaultVaultAddress, expiresAfter = await this._getDefaultExpiresAfter(), ...actionArgs } = args;
             // Construct an action
             const nonce = await this.nonceManager();
             const action = {
@@ -1043,9 +1054,10 @@
                 nonce,
                 isTestnet: this.isTestnet,
                 vaultAddress,
+                expiresAfter,
             });
             // Send a request
-            const request = { action, signature, nonce, vaultAddress };
+            const request = { action, signature, nonce, vaultAddress, expiresAfter };
             const response = await this.transport.request("exchange", request, signal);
             // Validate a response
             this._validateResponse(response);
@@ -1264,10 +1276,8 @@
             const action = {
                 ...args,
                 type: "spotSend",
-                hyperliquidChain: this.isTestnet ? "Testnet" : "Mainnet",
-                signatureChainId: typeof this.signatureChainId === "string"
-                    ? this.signatureChainId
-                    : await this.signatureChainId(),
+                hyperliquidChain: this._getHyperliquidChain(),
+                signatureChainId: await this._getSignatureChainId(),
                 time: await this.nonceManager(),
             };
             // Sign the action
@@ -1460,10 +1470,8 @@
             const action = {
                 ...args,
                 type: "tokenDelegate",
-                hyperliquidChain: this.isTestnet ? "Testnet" : "Mainnet",
-                signatureChainId: typeof this.signatureChainId === "string"
-                    ? this.signatureChainId
-                    : await this.signatureChainId(),
+                hyperliquidChain: this._getHyperliquidChain(),
+                signatureChainId: await this._getSignatureChainId(),
                 nonce: await this.nonceManager(),
             };
             // Sign the action
@@ -1513,7 +1521,7 @@
          */
         async twapCancel(args, signal) {
             // Destructure the parameters
-            const { vaultAddress = this.defaultVaultAddress, ...actionArgs } = args;
+            const { vaultAddress = this.defaultVaultAddress, expiresAfter = await this._getDefaultExpiresAfter(), ...actionArgs } = args;
             // Construct an action
             const nonce = await this.nonceManager();
             const action = {
@@ -1528,9 +1536,10 @@
                 nonce,
                 isTestnet: this.isTestnet,
                 vaultAddress,
+                expiresAfter,
             });
             // Send a request
-            const request = { action, signature, nonce, vaultAddress };
+            const request = { action, signature, nonce, vaultAddress, expiresAfter };
             const response = await this.transport.request("exchange", request, signal);
             // Validate a response
             this._validateResponse(response);
@@ -1565,7 +1574,7 @@
          */
         async twapOrder(args, signal) {
             // Destructure the parameters
-            const { vaultAddress = this.defaultVaultAddress, ...actionArgs } = args;
+            const { vaultAddress = this.defaultVaultAddress, expiresAfter = await this._getDefaultExpiresAfter(), ...actionArgs } = args;
             // Construct an action
             const nonce = await this.nonceManager();
             const action = {
@@ -1586,9 +1595,10 @@
                 nonce,
                 isTestnet: this.isTestnet,
                 vaultAddress,
+                expiresAfter,
             });
             // Send a request
-            const request = { action, signature, nonce, vaultAddress };
+            const request = { action, signature, nonce, vaultAddress, expiresAfter };
             const response = await this.transport.request("exchange", request, signal);
             // Validate a response
             this._validateResponse(response);
@@ -1616,7 +1626,7 @@
          */
         async updateIsolatedMargin(args, signal) {
             // Destructure the parameters
-            const { vaultAddress = this.defaultVaultAddress, ...actionArgs } = args;
+            const { vaultAddress = this.defaultVaultAddress, expiresAfter = await this._getDefaultExpiresAfter(), ...actionArgs } = args;
             // Construct an action
             const nonce = await this.nonceManager();
             const action = {
@@ -1632,9 +1642,10 @@
                 nonce,
                 isTestnet: this.isTestnet,
                 vaultAddress,
+                expiresAfter,
             });
             // Send a request
-            const request = { action, signature, nonce, vaultAddress };
+            const request = { action, signature, nonce, vaultAddress, expiresAfter };
             const response = await this.transport.request("exchange", request, signal);
             // Validate a response
             this._validateResponse(response);
@@ -1662,7 +1673,7 @@
          */
         async updateLeverage(args, signal) {
             // Destructure the parameters
-            const { vaultAddress = this.defaultVaultAddress, ...actionArgs } = args;
+            const { vaultAddress = this.defaultVaultAddress, expiresAfter = await this._getDefaultExpiresAfter(), ...actionArgs } = args;
             // Construct an action
             const nonce = await this.nonceManager();
             const action = {
@@ -1678,9 +1689,10 @@
                 nonce,
                 isTestnet: this.isTestnet,
                 vaultAddress,
+                expiresAfter,
             });
             // Send a request
-            const request = { action, signature, nonce, vaultAddress };
+            const request = { action, signature, nonce, vaultAddress, expiresAfter };
             const response = await this.transport.request("exchange", request, signal);
             // Validate a response
             this._validateResponse(response);
@@ -1711,10 +1723,8 @@
             const action = {
                 ...args,
                 type: "usdClassTransfer",
-                hyperliquidChain: this.isTestnet ? "Testnet" : "Mainnet",
-                signatureChainId: typeof this.signatureChainId === "string"
-                    ? this.signatureChainId
-                    : await this.signatureChainId(),
+                hyperliquidChain: this._getHyperliquidChain(),
+                signatureChainId: await this._getSignatureChainId(),
                 nonce: await this.nonceManager(),
             };
             // Sign the action
@@ -1763,10 +1773,8 @@
             const action = {
                 ...args,
                 type: "usdSend",
-                hyperliquidChain: this.isTestnet ? "Testnet" : "Mainnet",
-                signatureChainId: typeof this.signatureChainId === "string"
-                    ? this.signatureChainId
-                    : await this.signatureChainId(),
+                hyperliquidChain: this._getHyperliquidChain(),
+                signatureChainId: await this._getSignatureChainId(),
                 time: await this.nonceManager(),
             };
             // Sign the action
@@ -1904,13 +1912,15 @@
          * ```
          */
         async vaultTransfer(args, signal) {
+            // Destructure the parameters
+            const { expiresAfter = await this._getDefaultExpiresAfter(), ...actionArgs } = args;
             // Construct an action
             const nonce = await this.nonceManager();
             const action = {
                 type: "vaultTransfer",
-                vaultAddress: args.vaultAddress,
-                isDeposit: args.isDeposit,
-                usd: args.usd,
+                vaultAddress: actionArgs.vaultAddress,
+                isDeposit: actionArgs.isDeposit,
+                usd: actionArgs.usd,
             };
             // Sign the action
             const signature = await (0, signing_js_1.signL1Action)({
@@ -1918,9 +1928,10 @@
                 action,
                 nonce,
                 isTestnet: this.isTestnet,
+                expiresAfter,
             });
             // Send a request
-            const request = { action, signature, nonce };
+            const request = { action, signature, nonce, expiresAfter };
             const response = await this.transport.request("exchange", request, signal);
             // Validate a response
             this._validateResponse(response);
@@ -1951,10 +1962,8 @@
             const action = {
                 ...args,
                 type: "withdraw3",
-                hyperliquidChain: this.isTestnet ? "Testnet" : "Mainnet",
-                signatureChainId: typeof this.signatureChainId === "string"
-                    ? this.signatureChainId
-                    : await this.signatureChainId(),
+                hyperliquidChain: this._getHyperliquidChain(),
+                signatureChainId: await this._getSignatureChainId(),
                 time: await this.nonceManager(),
             };
             // Sign the action
@@ -2011,6 +2020,20 @@
             // Attempt to guess chain ID based on isTestnet
             return this.isTestnet ? "0x66eee" : "0xa4b1";
         }
+        /** Get the default expiration time for an action. */
+        async _getDefaultExpiresAfter() {
+            return typeof this.defaultExpiresAfter === "number"
+                ? this.defaultExpiresAfter
+                : await this.defaultExpiresAfter?.();
+        }
+        /** Get the signature chain ID for the wallet. */
+        async _getSignatureChainId() {
+            return typeof this.signatureChainId === "string" ? this.signatureChainId : await this.signatureChainId();
+        }
+        /** Get the Hyperliquid chain based on the isTestnet flag. */
+        _getHyperliquidChain() {
+            return this.isTestnet ? "Testnet" : "Mainnet";
+        }
         /** Validate a response from the API. */
         _validateResponse(response) {
             if (response.status === "err") {
@@ -2027,6 +2050,9 @@
                 }
             }
         }
+        async [Symbol.asyncDispose]() {
+            await this.transport[Symbol.asyncDispose]?.();
+        }
     }
     exports.WalletClient = WalletClient;
 });

package/script/src/signing.d.ts

@@ -131,9 +131,10 @@ export interface AbstractWindowEthereum {
  * @param action - The action to be hashed.
  * @param nonce - Unique request identifier (recommended current timestamp in ms).
  * @param vaultAddress - Optional vault address used in the action.
+ * @param expiresAfter - Optional expiration time of the action in milliseconds since the epoch.
  * @returns The hash of the action.
  */
-export declare function createL1ActionHash(action: ValueType, nonce: number, vaultAddress?: Hex): Hex;
+export declare function createL1ActionHash(action: ValueType, nonce: number, vaultAddress?: Hex, expiresAfter?: number): Hex;
 /**
  * Sign an L1 action.
  *
@@ -181,6 +182,8 @@ export declare function signL1Action(args: {
     isTestnet?: boolean;
     /** Optional vault address used in the action. */
     vaultAddress?: Hex;
+    /** Optional expiration time of the action in milliseconds since the epoch. */
+    expiresAfter?: number;
 }): Promise<{
     r: Hex;
     s: Hex;

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

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

package/script/src/signing.js

@@ -53,7 +53,7 @@
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "../deps/jsr.io/@noble/hashes/1.8.0/src/sha3.js", "../deps/jsr.io/@std/msgpack/1.0.3/encode.js", "../deps/jsr.io/@std/encoding/1.0.9/hex.js"], factory);
+        define(["require", "exports", "../deps/jsr.io/@noble/hashes/1.8.0/src/sha3.js", "../deps/jsr.io/@std/msgpack/1.0.3/encode.js", "../deps/jsr.io/@std/encoding/1.0.10/hex.js", "../deps/jsr.io/@std/bytes/1.0.5/concat.js"], factory);
     }
 })(function (require, exports) {
     "use strict";
@@ -68,7 +68,8 @@
     exports.isAbstractWindowEthereum = isAbstractWindowEthereum;
     const sha3_js_1 = require("../deps/jsr.io/@noble/hashes/1.8.0/src/sha3.js");
     const encode_js_1 = require("../deps/jsr.io/@std/msgpack/1.0.3/encode.js");
-    const hex_js_1 = require("../deps/jsr.io/@std/encoding/1.0.9/hex.js");
+    const hex_js_1 = require("../deps/jsr.io/@std/encoding/1.0.10/hex.js");
+    const concat_js_1 = require("../deps/jsr.io/@std/bytes/1.0.5/concat.js");
     /**
      * Create a hash of the L1 action.
      *
@@ -76,26 +77,36 @@
      * @param action - The action to be hashed.
      * @param nonce - Unique request identifier (recommended current timestamp in ms).
      * @param vaultAddress - Optional vault address used in the action.
+     * @param expiresAfter - Optional expiration time of the action in milliseconds since the epoch.
      * @returns The hash of the action.
      */
-    function createL1ActionHash(action, nonce, vaultAddress) {
-        const normalizedAction = normalizeIntegersForMsgPack(action);
-        const msgPackBytes = (0, encode_js_1.encode)(normalizedAction);
-        const additionalBytesLength = vaultAddress ? 29 : 9;
-        const data = new Uint8Array(msgPackBytes.length + additionalBytesLength);
-        data.set(msgPackBytes);
-        const view = new DataView(data.buffer);
-        view.setBigUint64(msgPackBytes.length, BigInt(nonce));
-        if (vaultAddress) {
-            view.setUint8(msgPackBytes.length + 8, 1);
-            data.set((0, hex_js_1.decodeHex)(vaultAddress.slice(2)), msgPackBytes.length + 9);
+    function createL1ActionHash(action, nonce, vaultAddress, expiresAfter) {
+        // 1. Action
+        const actionBytes = (0, encode_js_1.encode)(normalizeIntegersForMsgPack(action));
+        // 2. Nonce
+        const nonceBytes = new Uint8Array(8);
+        new DataView(nonceBytes.buffer).setBigUint64(0, BigInt(nonce));
+        // 3. Vault address
+        const vaultMarker = Uint8Array.of(vaultAddress ? 0x01 : 0x00);
+        const vaultBytes = vaultAddress ? (0, hex_js_1.decodeHex)(vaultAddress.slice(2)) : new Uint8Array();
+        // 4. Expires after
+        const expiresMarker = new Uint8Array(expiresAfter !== undefined ? 1 : 0);
+        const expiresBytes = new Uint8Array(expiresAfter !== undefined ? 8 : 0);
+        if (expiresAfter !== undefined) {
+            new DataView(expiresBytes.buffer).setBigUint64(0, BigInt(expiresAfter));
         }
-        else {
-            view.setUint8(msgPackBytes.length + 8, 0);
-        }
-        const hashBytes = (0, sha3_js_1.keccak_256)(data);
-        const hashHex = (0, hex_js_1.encodeHex)(hashBytes);
-        return `0x${hashHex}`;
+        // Create a keccak256 hash
+        const chunks = [
+            actionBytes,
+            nonceBytes,
+            vaultMarker,
+            vaultBytes,
+            expiresMarker,
+            expiresBytes,
+        ];
+        const bytes = (0, concat_js_1.concat)(chunks);
+        const hash = (0, sha3_js_1.keccak_256)(bytes);
+        return `0x${(0, hex_js_1.encodeHex)(hash)}`;
     }
     /** Layer to make {@link https://jsr.io/@std/msgpack | @std/msgpack} compatible with {@link https://github.com/msgpack/msgpack-javascript | @msgpack/msgpack}. */
     function normalizeIntegersForMsgPack(obj) {
@@ -151,7 +162,7 @@
      * ```
      */
     async function signL1Action(args) {
-        const { wallet, action, nonce, isTestnet = false, vaultAddress, } = args;
+        const { wallet, action, nonce, isTestnet = false, vaultAddress, expiresAfter, } = args;
         const domain = {
             name: "Exchange",
             version: "1",
@@ -164,7 +175,7 @@
                 { name: "connectionId", type: "bytes32" },
             ],
         };
-        const actionHash = createL1ActionHash(action, nonce, vaultAddress);
+        const actionHash = createL1ActionHash(action, nonce, vaultAddress, expiresAfter);
         const message = {
             source: isTestnet ? "b" : "a",
             connectionId: actionHash,
@@ -231,8 +242,20 @@
     async function abstractSignTypedData(args) {
         const { wallet, domain, types, message } = args;
         if (isAbstractViemWalletClient(wallet) || isAbstractExtendedViemWalletClient(wallet)) {
-            const primaryType = Object.keys(types)[0];
-            return await wallet.signTypedData({ domain, types, primaryType, message });
+            return await wallet.signTypedData({
+                domain,
+                types: {
+                    EIP712Domain: [
+                        { name: "name", type: "string" },
+                        { name: "version", type: "string" },
+                        { name: "chainId", type: "uint256" },
+                        { name: "verifyingContract", type: "address" },
+                    ],
+                    ...types,
+                },
+                primaryType: Object.keys(types)[0],
+                message,
+            });
         }
         else if (isAbstractEthersSigner(wallet)) {
             return await wallet.signTypedData(domain, types, message);