@nktkas/hyperliquid 0.23.1 → 0.24.0

package/script/src/clients/subscription.js

@@ -24,9 +24,9 @@ class SubscriptionClient {
     }
     /**
      * Subscribe to context updates for a specific perpetual asset.
-     * @param args - The parameters for the subscription.
-     * @param listener - The callback function to be called when the event is received.
-     * @returns A promise that resolves with a {@link Subscription} object to manage the subscription lifecycle.
+     * @param params - Subscription-specific parameters.
+     * @param listener - A callback function to be called when the event is received.
+     * @returns A request-promise that resolves with a {@link Subscription} object to manage the subscription lifecycle.
      *
      * @throws {TransportError} When the transport layer throws an error.
      *
@@ -43,23 +43,20 @@ class SubscriptionClient {
      * });
      * ```
      */
-    activeAssetCtx(args, listener) {
-        const channel = args.coin.startsWith("@") ? "activeSpotAssetCtx" : "activeAssetCtx";
-        const payload = {
-            type: "activeAssetCtx",
-            coin: args.coin,
-        };
+    activeAssetCtx(params, listener) {
+        const channel = params.coin.startsWith("@") ? "activeSpotAssetCtx" : "activeAssetCtx";
+        const payload = { type: "activeAssetCtx", ...params };
         return this.transport.subscribe(channel, payload, (e) => {
-            if (e.detail.coin === args.coin) {
+            if (e.detail.coin === params.coin) {
                 listener(e.detail);
             }
         });
     }
     /**
      * Subscribe to trading data updates for a specific asset and user.
-     * @param args - The parameters for the subscription.
-     * @param listener - The callback function to be called when the event is received.
-     * @returns A promise that resolves with a {@link Subscription} object to manage the subscription lifecycle.
+     * @param params - Subscription-specific parameters.
+     * @param listener - A callback function to be called when the event is received.
+     * @returns A request-promise that resolves with a {@link Subscription} object to manage the subscription lifecycle.
      *
      * @throws {TransportError} When the transport layer throws an error.
      *
@@ -76,34 +73,27 @@ class SubscriptionClient {
      * });
      * ```
      */
-    activeAssetData(args, listener) {
-        const payload = {
-            type: "activeAssetData",
-            coin: args.coin,
-            user: args.user,
-        };
+    activeAssetData(params, listener) {
+        const payload = { type: "activeAssetData", ...params };
         return this.transport.subscribe(payload.type, payload, (e) => {
-            if (e.detail.coin === args.coin && e.detail.user === args.user.toLowerCase()) {
+            if (e.detail.coin === params.coin && e.detail.user === params.user.toLowerCase()) {
                 listener(e.detail);
             }
         });
     }
-    allMids(args_or_listener, maybeListener) {
-        const args = typeof args_or_listener === "function" ? {} : args_or_listener;
-        const listener = typeof args_or_listener === "function" ? args_or_listener : maybeListener;
-        const payload = {
-            type: "allMids",
-            dex: args.dex,
-        };
+    allMids(params_or_listener, maybeListener) {
+        const params = typeof params_or_listener === "function" ? {} : params_or_listener;
+        const listener = typeof params_or_listener === "function" ? params_or_listener : maybeListener;
+        const payload = { type: "allMids", ...params };
         return this.transport.subscribe(payload.type, payload, (e) => {
             listener(e.detail);
         });
     }
     /**
      * Subscribe to best bid and offer updates for a specific asset.
-     * @param args - The parameters for the subscription.
-     * @param listener - The callback function to be called when the event is received.
-     * @returns A promise that resolves with a {@link Subscription} object to manage the subscription lifecycle.
+     * @param params - Subscription-specific parameters.
+     * @param listener - A callback function to be called when the event is received.
+     * @returns A request-promise that resolves with a {@link Subscription} object to manage the subscription lifecycle.
      *
      * @throws {TransportError} When the transport layer throws an error.
      *
@@ -120,22 +110,19 @@ class SubscriptionClient {
      * });
      * ```
      */
-    bbo(args, listener) {
-        const payload = {
-            type: "bbo",
-            coin: args.coin,
-        };
+    bbo(params, listener) {
+        const payload = { type: "bbo", ...params };
         return this.transport.subscribe(payload.type, payload, (e) => {
-            if (e.detail.coin === args.coin) {
+            if (e.detail.coin === params.coin) {
                 listener(e.detail);
             }
         });
     }
     /**
      * Subscribe to candlestick data updates for a specific asset.
-     * @param args - The parameters for the subscription.
-     * @param listener - The callback function to be called when the event is received.
-     * @returns A promise that resolves with a {@link Subscription} object to manage the subscription lifecycle.
+     * @param params - Subscription-specific parameters.
+     * @param listener - A callback function to be called when the event is received.
+     * @returns A request-promise that resolves with a {@link Subscription} object to manage the subscription lifecycle.
      *
      * @throws {TransportError} When the transport layer throws an error.
      *
@@ -152,22 +139,18 @@ class SubscriptionClient {
      * });
      * ```
      */
-    candle(args, listener) {
-        const payload = {
-            type: "candle",
-            coin: args.coin,
-            interval: args.interval,
-        };
+    candle(params, listener) {
+        const payload = { type: "candle", ...params };
         return this.transport.subscribe(payload.type, payload, (e) => {
-            if (e.detail.s === args.coin && e.detail.i === args.interval) {
+            if (e.detail.s === params.coin && e.detail.i === params.interval) {
                 listener(e.detail);
             }
         });
     }
     /**
      * Subscribe to explorer block updates.
-     * @param listener - The callback function to be called when the event is received.
-     * @returns A promise that resolves with a {@link Subscription} object to manage the subscription lifecycle.
+     * @param listener - A callback function to be called when the event is received.
+     * @returns A request-promise that resolves with a {@link Subscription} object to manage the subscription lifecycle.
      * @note Make sure the endpoint in the {@link transport} supports this method.
      *
      * @throws {TransportError} When the transport layer throws an error.
@@ -186,17 +169,15 @@ class SubscriptionClient {
      * ```
      */
     explorerBlock(listener) {
-        const payload = {
-            type: "explorerBlock",
-        };
+        const payload = { type: "explorerBlock" };
         return this.transport.subscribe("_explorerBlock", payload, (e) => {
             listener(e.detail);
         });
     }
     /**
      * Subscribe to explorer transaction updates.
-     * @param listener - The callback function to be called when the event is received.
-     * @returns A promise that resolves with a {@link Subscription} object to manage the subscription lifecycle.
+     * @param listener - A callback function to be called when the event is received.
+     * @returns A request-promise that resolves with a {@link Subscription} object to manage the subscription lifecycle.
      * @note Make sure the endpoint in the {@link transport} supports this method.
      *
      * @throws {TransportError} When the transport layer throws an error.
@@ -215,18 +196,16 @@ class SubscriptionClient {
      * ```
      */
     explorerTxs(listener) {
-        const payload = {
-            type: "explorerTxs",
-        };
+        const payload = { type: "explorerTxs" };
         return this.transport.subscribe("_explorerTxs", payload, (e) => {
             listener(e.detail);
         });
     }
     /**
      * Subscribe to L2 order book updates for a specific asset.
-     * @param args - The parameters for the subscription.
-     * @param listener - The callback function to be called when the event is received.
-     * @returns A promise that resolves with a {@link Subscription} object to manage the subscription lifecycle.
+     * @param params - Subscription-specific parameters.
+     * @param listener - A callback function to be called when the event is received.
+     * @returns A request-promise that resolves with a {@link Subscription} object to manage the subscription lifecycle.
      *
      * @throws {TransportError} When the transport layer throws an error.
      *
@@ -243,24 +222,24 @@ class SubscriptionClient {
      * });
      * ```
      */
-    l2Book(args, listener) {
+    l2Book(params, listener) {
         const payload = {
             type: "l2Book",
-            coin: args.coin,
-            nSigFigs: args.nSigFigs ?? null,
-            mantissa: args.mantissa ?? null,
+            nSigFigs: params.nSigFigs ?? null,
+            mantissa: params.mantissa ?? null,
+            ...params,
         };
         return this.transport.subscribe(payload.type, payload, (e) => {
-            if (e.detail.coin === args.coin) {
+            if (e.detail.coin === params.coin) {
                 listener(e.detail);
             }
         });
     }
     /**
      * Subscribe to notification updates for a specific user.
-     * @param args - The parameters for the subscription.
-     * @param listener - The callback function to be called when the event is received.
-     * @returns A promise that resolves with a {@link Subscription} object to manage the subscription lifecycle.
+     * @param params - Subscription-specific parameters.
+     * @param listener - A callback function to be called when the event is received.
+     * @returns A request-promise that resolves with a {@link Subscription} object to manage the subscription lifecycle.
      *
      * @throws {TransportError} When the transport layer throws an error.
      *
@@ -277,20 +256,17 @@ class SubscriptionClient {
      * });
      * ```
      */
-    notification(args, listener) {
-        const payload = {
-            type: "notification",
-            user: args.user,
-        };
+    notification(params, listener) {
+        const payload = { type: "notification", ...params };
         return this.transport.subscribe(payload.type, payload, (e) => {
             listener(e.detail);
         });
     }
     /**
      * Subscribe to order status updates for a specific user.
-     * @param args - The parameters for the subscription.
-     * @param listener - The callback function to be called when the event is received.
-     * @returns A promise that resolves with a {@link Subscription} object to manage the subscription lifecycle.
+     * @param params - Subscription-specific parameters.
+     * @param listener - A callback function to be called when the event is received.
+     * @returns A request-promise that resolves with a {@link Subscription} object to manage the subscription lifecycle.
      *
      * @throws {TransportError} When the transport layer throws an error.
      *
@@ -307,20 +283,17 @@ class SubscriptionClient {
      * });
      * ```
      */
-    orderUpdates(args, listener) {
-        const payload = {
-            type: "orderUpdates",
-            user: args.user,
-        };
+    orderUpdates(params, listener) {
+        const payload = { type: "orderUpdates", ...params };
         return this.transport.subscribe(payload.type, payload, (e) => {
             listener(e.detail);
         });
     }
     /**
      * Subscribe to real-time trade updates for a specific asset.
-     * @param args - The parameters for the subscription.
-     * @param listener - The callback function to be called when the event is received.
-     * @returns A promise that resolves with a {@link Subscription} object to manage the subscription lifecycle.
+     * @param params - Subscription-specific parameters.
+     * @param listener - A callback function to be called when the event is received.
+     * @returns A request-promise that resolves with a {@link Subscription} object to manage the subscription lifecycle.
      *
      * @throws {TransportError} When the transport layer throws an error.
      *
@@ -337,22 +310,19 @@ class SubscriptionClient {
      * });
      * ```
      */
-    trades(args, listener) {
-        const payload = {
-            type: "trades",
-            coin: args.coin,
-        };
+    trades(params, listener) {
+        const payload = { type: "trades", ...params };
         return this.transport.subscribe(payload.type, payload, (e) => {
-            if (e.detail[0]?.coin === args.coin) {
+            if (e.detail[0]?.coin === params.coin) {
                 listener(e.detail);
             }
         });
     }
     /**
      * Subscribe to non-order events for a specific user.
-     * @param args - The parameters for the subscription.
-     * @param listener - The callback function to be called when the event is received.
-     * @returns A promise that resolves with a {@link Subscription} object to manage the subscription lifecycle.
+     * @param params - Subscription-specific parameters.
+     * @param listener - A callback function to be called when the event is received.
+     * @returns A request-promise that resolves with a {@link Subscription} object to manage the subscription lifecycle.
      * @note Different subscriptions cannot be distinguished from each other.
      *
      * @throws {TransportError} When the transport layer throws an error.
@@ -370,20 +340,17 @@ class SubscriptionClient {
      * });
      * ```
      */
-    userEvents(args, listener) {
-        const payload = {
-            type: "userEvents",
-            user: args.user,
-        };
+    userEvents(params, listener) {
+        const payload = { type: "userEvents", ...params };
         return this.transport.subscribe("user", payload, (e) => {
             listener(e.detail);
         });
     }
     /**
      * Subscribe to trade fill updates for a specific user.
-     * @param args - The parameters for the subscription.
-     * @param listener - The callback function to be called when the event is received.
-     * @returns A promise that resolves with a {@link Subscription} object to manage the subscription lifecycle.
+     * @param params - Subscription-specific parameters.
+     * @param listener - A callback function to be called when the event is received.
+     * @returns A request-promise that resolves with a {@link Subscription} object to manage the subscription lifecycle.
      *
      * @throws {TransportError} When the transport layer throws an error.
      *
@@ -400,23 +367,23 @@ class SubscriptionClient {
      * });
      * ```
      */
-    userFills(args, listener) {
+    userFills(params, listener) {
         const payload = {
             type: "userFills",
-            user: args.user,
-            aggregateByTime: args.aggregateByTime ?? false,
+            aggregateByTime: params.aggregateByTime ?? false,
+            ...params,
         };
         return this.transport.subscribe(payload.type, payload, (e) => {
-            if (e.detail.user === args.user.toLowerCase()) {
+            if (e.detail.user === params.user.toLowerCase()) {
                 listener(e.detail);
             }
         });
     }
     /**
      * Subscribe to funding payment updates for a specific user.
-     * @param args - The parameters for the subscription.
-     * @param listener - The callback function to be called when the event is received.
-     * @returns A promise that resolves with a {@link Subscription} object to manage the subscription lifecycle.
+     * @param params - Subscription-specific parameters.
+     * @param listener - A callback function to be called when the event is received.
+     * @returns A request-promise that resolves with a {@link Subscription} object to manage the subscription lifecycle.
      *
      * @throws {TransportError} When the transport layer throws an error.
      *
@@ -433,22 +400,19 @@ class SubscriptionClient {
      * });
      * ```
      */
-    userFundings(args, listener) {
-        const payload = {
-            type: "userFundings",
-            user: args.user,
-        };
+    userFundings(params, listener) {
+        const payload = { type: "userFundings", ...params };
         return this.transport.subscribe(payload.type, payload, (e) => {
-            if (e.detail.user === args.user.toLowerCase()) {
+            if (e.detail.user === params.user.toLowerCase()) {
                 listener(e.detail);
             }
         });
     }
     /**
      * Subscribe to non-funding ledger updates for a specific user.
-     * @param args - The parameters for the subscription.
-     * @param listener - The callback function to be called when the event is received.
-     * @returns A promise that resolves with a {@link Subscription} object to manage the subscription lifecycle.
+     * @param params - Subscription-specific parameters.
+     * @param listener - A callback function to be called when the event is received.
+     * @returns A request-promise that resolves with a {@link Subscription} object to manage the subscription lifecycle.
      *
      * @throws {TransportError} When the transport layer throws an error.
      *
@@ -465,22 +429,22 @@ class SubscriptionClient {
      * });
      * ```
      */
-    userNonFundingLedgerUpdates(args, listener) {
+    userNonFundingLedgerUpdates(params, listener) {
         const payload = {
             type: "userNonFundingLedgerUpdates",
-            user: args.user,
+            ...params,
         };
         return this.transport.subscribe(payload.type, payload, (e) => {
-            if (e.detail.user === args.user.toLowerCase()) {
+            if (e.detail.user === params.user.toLowerCase()) {
                 listener(e.detail);
             }
         });
     }
     /**
      * Subscribe to TWAP order history updates for a specific user.
-     * @param args - The parameters for the subscription.
-     * @param listener - The callback function to be called when the event is received.
-     * @returns A promise that resolves with a {@link Subscription} object to manage the subscription lifecycle.
+     * @param params - Subscription-specific parameters.
+     * @param listener - A callback function to be called when the event is received.
+     * @returns A request-promise that resolves with a {@link Subscription} object to manage the subscription lifecycle.
      *
      * @throws {TransportError} When the transport layer throws an error.
      *
@@ -497,22 +461,19 @@ class SubscriptionClient {
      * });
      * ```
      */
-    userTwapHistory(args, listener) {
-        const payload = {
-            type: "userTwapHistory",
-            user: args.user,
-        };
+    userTwapHistory(params, listener) {
+        const payload = { type: "userTwapHistory", ...params };
         return this.transport.subscribe(payload.type, payload, (e) => {
-            if (e.detail.user === args.user.toLowerCase()) {
+            if (e.detail.user === params.user.toLowerCase()) {
                 listener(e.detail);
             }
         });
     }
     /**
      * Subscribe to TWAP execution updates for a specific user.
-     * @param args - The parameters for the subscription.
-     * @param listener - The callback function to be called when the event is received.
-     * @returns A promise that resolves with a {@link Subscription} object to manage the subscription lifecycle.
+     * @param params - Subscription-specific parameters.
+     * @param listener - A callback function to be called when the event is received.
+     * @returns A request-promise that resolves with a {@link Subscription} object to manage the subscription lifecycle.
      *
      * @throws {TransportError} When the transport layer throws an error.
      *
@@ -529,22 +490,19 @@ class SubscriptionClient {
      * });
      * ```
      */
-    userTwapSliceFills(args, listener) {
-        const payload = {
-            type: "userTwapSliceFills",
-            user: args.user,
-        };
+    userTwapSliceFills(params, listener) {
+        const payload = { type: "userTwapSliceFills", ...params };
         return this.transport.subscribe(payload.type, payload, (e) => {
-            if (e.detail.user === args.user.toLowerCase()) {
+            if (e.detail.user === params.user.toLowerCase()) {
                 listener(e.detail);
             }
         });
     }
     /**
      * Subscribe to comprehensive user and market data updates.
-     * @param args - The parameters for the subscription.
-     * @param listener - The callback function to be called when the event is received.
-     * @returns A promise that resolves with a {@link Subscription} object to manage the subscription lifecycle.
+     * @param params - Subscription-specific parameters.
+     * @param listener - A callback function to be called when the event is received.
+     * @returns A request-promise that resolves with a {@link Subscription} object to manage the subscription lifecycle.
      *
      * @throws {TransportError} When the transport layer throws an error.
      *
@@ -561,13 +519,10 @@ class SubscriptionClient {
      * });
      * ```
      */
-    webData2(args, listener) {
-        const payload = {
-            type: "webData2",
-            user: args.user,
-        };
+    webData2(params, listener) {
+        const payload = { type: "webData2", ...params };
         return this.transport.subscribe(payload.type, payload, (e) => {
-            if (e.detail.user === args.user.toLowerCase()) {
+            if (e.detail.user === params.user.toLowerCase()) {
                 listener(e.detail);
             }
         });

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

@@ -1,5 +1,5 @@
-/** Abstract interface for an [ethers.js signer](https://docs.ethers.org/v6/api/providers/#Signer). */
-export interface AbstractEthersSigner {
+/** Abstract interface for an {@link https://docs.ethers.org/v6/api/providers/#Signer | ethers.js signer}. */
+export interface AbstractEthersV6Signer {
     signTypedData(domain: {
         name: string;
         version: string;
@@ -11,8 +11,14 @@ export interface AbstractEthersSigner {
             type: string;
         }[];
     }, value: Record<string, unknown>): Promise<string>;
+    getAddress?(): Promise<string>;
+    provider?: {
+        getNetwork(): Promise<{
+            chainId: number | bigint;
+        }>;
+    } | null;
 }
-/** Abstract interface for an [ethers.js v5 signer](https://docs.ethers.org/v5/api/signer/). */
+/** Abstract interface for an {@link https://docs.ethers.org/v5/api/signer/ | ethers.js v5 signer}. */
 export interface AbstractEthersV5Signer {
     _signTypedData(domain: {
         name: string;
@@ -25,9 +31,15 @@ export interface AbstractEthersV5Signer {
             type: string;
         }[];
     }, value: Record<string, unknown>): Promise<string>;
+    getAddress?(): Promise<string>;
+    provider?: {
+        getNetwork(): Promise<{
+            chainId: number | bigint;
+        }>;
+    } | null;
 }
 /** Checks if the given value is an abstract ethers signer. */
-export declare function isAbstractEthersSigner(client: unknown): client is AbstractEthersSigner;
+export declare function isAbstractEthersV6Signer(client: unknown): client is AbstractEthersV6Signer;
 /** Checks if the given value is an abstract ethers v5 signer. */
 export declare function isAbstractEthersV5Signer(client: unknown): client is AbstractEthersV5Signer;
 //# sourceMappingURL=ethers.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ethers.d.ts","sourceRoot":"","sources":["../../../../src/src/signing/_signTypedData/ethers.ts"],"names":[],"mappings":"AAAA,sGAAsG;AACtG,MAAM,WAAW,oBAAoB;IACjC,aAAa,CACT,MAAM,EAAE;QACJ,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;QAChB,iBAAiB,EAAE,MAAM,CAAC;KAC7B,EACD,KAAK,EAAE;QACH,CAAC,GAAG,EAAE,MAAM,GAAG;YACX,IAAI,EAAE,MAAM,CAAC;YACb,IAAI,EAAE,MAAM,CAAC;SAChB,EAAE,CAAC;KACP,EACD,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC/B,OAAO,CAAC,MAAM,CAAC,CAAC;CACtB;AAED,+FAA+F;AAC/F,MAAM,WAAW,sBAAsB;IACnC,cAAc,CACV,MAAM,EAAE;QACJ,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;QAChB,iBAAiB,EAAE,MAAM,CAAC;KAC7B,EACD,KAAK,EAAE;QACH,CAAC,GAAG,EAAE,MAAM,GAAG;YACX,IAAI,EAAE,MAAM,CAAC;YACb,IAAI,EAAE,MAAM,CAAC;SAChB,EAAE,CAAC;KACP,EACD,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC/B,OAAO,CAAC,MAAM,CAAC,CAAC;CACtB;AAED,8DAA8D;AAC9D,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,IAAI,oBAAoB,CAItF;AAED,iEAAiE;AACjE,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,IAAI,sBAAsB,CAI1F"}
+{"version":3,"file":"ethers.d.ts","sourceRoot":"","sources":["../../../../src/src/signing/_signTypedData/ethers.ts"],"names":[],"mappings":"AAAA,6GAA6G;AAC7G,MAAM,WAAW,sBAAsB;IACnC,aAAa,CACT,MAAM,EAAE;QACJ,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;QAChB,iBAAiB,EAAE,MAAM,CAAC;KAC7B,EACD,KAAK,EAAE;QACH,CAAC,GAAG,EAAE,MAAM,GAAG;YACX,IAAI,EAAE,MAAM,CAAC;YACb,IAAI,EAAE,MAAM,CAAC;SAChB,EAAE,CAAC;KACP,EACD,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC/B,OAAO,CAAC,MAAM,CAAC,CAAC;IACnB,UAAU,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAC/B,QAAQ,CAAC,EACH;QAAE,UAAU,IAAI,OAAO,CAAC;YAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAAA;SAAE,CAAC,CAAA;KAAE,GACvD,IAAI,CAAC;CACd;AAED,sGAAsG;AACtG,MAAM,WAAW,sBAAsB;IACnC,cAAc,CACV,MAAM,EAAE;QACJ,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;QAChB,iBAAiB,EAAE,MAAM,CAAC;KAC7B,EACD,KAAK,EAAE;QACH,CAAC,GAAG,EAAE,MAAM,GAAG;YACX,IAAI,EAAE,MAAM,CAAC;YACb,IAAI,EAAE,MAAM,CAAC;SAChB,EAAE,CAAC;KACP,EACD,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC/B,OAAO,CAAC,MAAM,CAAC,CAAC;IACnB,UAAU,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAC/B,QAAQ,CAAC,EACH;QAAE,UAAU,IAAI,OAAO,CAAC;YAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAAA;SAAE,CAAC,CAAA;KAAE,GACvD,IAAI,CAAC;CACd;AAED,8DAA8D;AAC9D,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,IAAI,sBAAsB,CAI1F;AAED,iEAAiE;AACjE,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,IAAI,sBAAsB,CAI1F"}

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

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isAbstractEthersSigner = isAbstractEthersSigner;
+exports.isAbstractEthersV6Signer = isAbstractEthersV6Signer;
 exports.isAbstractEthersV5Signer = isAbstractEthersV5Signer;
 /** Checks if the given value is an abstract ethers signer. */
-function isAbstractEthersSigner(client) {
+function isAbstractEthersV6Signer(client) {
     return typeof client === "object" && client !== null &&
         "signTypedData" in client && typeof client.signTypedData === "function" &&
         client.signTypedData.length === 3;

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

@@ -1,19 +1,15 @@
-import type { Hex } from "../../base.js";
-import { type AbstractEthersSigner, type AbstractEthersV5Signer, isAbstractEthersSigner, isAbstractEthersV5Signer } from "./ethers.js";
-import { isValidPrivateKey } from "./private_key.js";
-import { type AbstractViemWalletClient, isAbstractViemWalletClient } from "./viem.js";
-import { type AbstractWindowEthereum, isAbstractWindowEthereum } from "./window.js";
-export { type AbstractEthersSigner, type AbstractEthersV5Signer, type AbstractViemWalletClient, type AbstractWindowEthereum, isAbstractEthersSigner, isAbstractEthersV5Signer, isAbstractViemWalletClient, isAbstractWindowEthereum, isValidPrivateKey, };
+import { type AbstractEthersV5Signer, type AbstractEthersV6Signer } from "./ethers.js";
+import { type AbstractViemJsonRpcAccount, type AbstractViemLocalAccount } from "./viem.js";
 /** Abstract interface for a wallet that can sign typed data. */
-export type AbstractWallet = Hex | AbstractViemWalletClient | AbstractEthersSigner | AbstractEthersV5Signer | AbstractWindowEthereum;
+export type AbstractWallet = `0x${string}` | AbstractViemJsonRpcAccount | AbstractViemLocalAccount | AbstractEthersV6Signer | AbstractEthersV5Signer;
 /** ECDSA signature components for Ethereum transactions and typed data. */
 export interface Signature {
     /** First 32-byte component of ECDSA signature */
-    r: Hex;
+    r: `0x${string}`;
     /** Second 32-byte component of ECDSA signature */
-    s: Hex;
-    /** Recovery identifier (27 or 28, or 0 or 1 for EIP-155) */
-    v: number;
+    s: `0x${string}`;
+    /** Recovery identifier */
+    v: 27 | 28;
 }
 export declare function signTypedData(args: {
     wallet: AbstractWallet;
@@ -21,7 +17,7 @@ export declare function signTypedData(args: {
         name: string;
         version: string;
         chainId: number;
-        verifyingContract: Hex;
+        verifyingContract: `0x${string}`;
     };
     types: {
         [key: string]: {
@@ -32,4 +28,8 @@ export declare function signTypedData(args: {
     primaryType: string;
     message: Record<string, unknown>;
 }): Promise<Signature>;
+/** Get the chain ID of the wallet. */
+export declare function getWalletChainId(wallet: AbstractWallet): Promise<`0x${string}`>;
+/** Get the wallet address from various wallet types. */
+export declare function getWalletAddress(wallet: AbstractWallet): Promise<`0x${string}`>;
 //# sourceMappingURL=mod.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../../../src/src/signing/_signTypedData/mod.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EACH,KAAK,oBAAoB,EACzB,KAAK,sBAAsB,EAC3B,sBAAsB,EACtB,wBAAwB,EAC3B,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,iBAAiB,EAAgD,MAAM,kBAAkB,CAAC;AACnG,OAAO,EAAE,KAAK,wBAAwB,EAAE,0BAA0B,EAAE,MAAM,WAAW,CAAC;AACtF,OAAO,EAAE,KAAK,sBAAsB,EAAE,wBAAwB,EAAmC,MAAM,aAAa,CAAC;AAErH,OAAO,EACH,KAAK,oBAAoB,EACzB,KAAK,sBAAsB,EAC3B,KAAK,wBAAwB,EAC7B,KAAK,sBAAsB,EAC3B,sBAAsB,EACtB,wBAAwB,EACxB,0BAA0B,EAC1B,wBAAwB,EACxB,iBAAiB,GACpB,CAAC;AAEF,gEAAgE;AAChE,MAAM,MAAM,cAAc,GACpB,GAAG,GACH,wBAAwB,GACxB,oBAAoB,GACpB,sBAAsB,GACtB,sBAAsB,CAAC;AAE7B,2EAA2E;AAC3E,MAAM,WAAW,SAAS;IACtB,iDAAiD;IACjD,CAAC,EAAE,GAAG,CAAC;IACP,kDAAkD;IAClD,CAAC,EAAE,GAAG,CAAC;IACP,4DAA4D;IAC5D,CAAC,EAAE,MAAM,CAAC;CACb;AAED,wBAAsB,aAAa,CAAC,IAAI,EAAE;IACtC,MAAM,EAAE,cAAc,CAAC;IACvB,MAAM,EAAE;QACJ,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;QAChB,iBAAiB,EAAE,GAAG,CAAC;KAC1B,CAAC;IACF,KAAK,EAAE;QACH,CAAC,GAAG,EAAE,MAAM,GAAG;YACX,IAAI,EAAE,MAAM,CAAC;YACb,IAAI,EAAE,MAAM,CAAC;SAChB,EAAE,CAAC;KACP,CAAC;IACF,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACpC,GAAG,OAAO,CAAC,SAAS,CAAC,CA4CrB"}
+{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../../../src/src/signing/_signTypedData/mod.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,KAAK,sBAAsB,EAC3B,KAAK,sBAAsB,EAG9B,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,KAAK,0BAA0B,EAAE,KAAK,wBAAwB,EAAwB,MAAM,WAAW,CAAC;AAEjH,gEAAgE;AAChE,MAAM,MAAM,cAAc,GACpB,KAAK,MAAM,EAAE,GACb,0BAA0B,GAC1B,wBAAwB,GACxB,sBAAsB,GACtB,sBAAsB,CAAC;AAE7B,2EAA2E;AAC3E,MAAM,WAAW,SAAS;IACtB,iDAAiD;IACjD,CAAC,EAAE,KAAK,MAAM,EAAE,CAAC;IACjB,kDAAkD;IAClD,CAAC,EAAE,KAAK,MAAM,EAAE,CAAC;IACjB,0BAA0B;IAC1B,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC;CACd;AAED,wBAAsB,aAAa,CAAC,IAAI,EAAE;IACtC,MAAM,EAAE,cAAc,CAAC;IACvB,MAAM,EAAE;QACJ,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;QAChB,iBAAiB,EAAE,KAAK,MAAM,EAAE,CAAC;KACpC,CAAC;IACF,KAAK,EAAE;QACH,CAAC,GAAG,EAAE,MAAM,GAAG;YACX,IAAI,EAAE,MAAM,CAAC;YACb,IAAI,EAAE,MAAM,CAAC;SAChB,EAAE,CAAC;KACP,CAAC;IACF,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACpC,GAAG,OAAO,CAAC,SAAS,CAAC,CA8BrB;AASD,sCAAsC;AACtC,wBAAsB,gBAAgB,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,KAAK,MAAM,EAAE,CAAC,CAkBrF;AAED,wDAAwD;AACxD,wBAAsB,gBAAgB,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,KAAK,MAAM,EAAE,CAAC,CAgBrF"}