@hfunlabs/hyperliquid 0.29.1-hfunlabs.1 → 0.30.2-hfunlabs.2

package/src/src/api/exchange/_methods/_base/_semaphore.ts

@@ -1,67 +1,32 @@
-// ============================================================
-// Semaphore
-// ============================================================
-
-// TODO: Replace with @std/async/semaphore if the PR (https://github.com/denoland/std/pull/6894) will be merged
-
-interface Node {
-  res: () => void;
-  next: Node | undefined;
-}
-
-export class Semaphore {
-  #max: number;
-  #count: number;
-  #head: Node | undefined;
-  #tail: Node | undefined;
-
-  constructor(max: number = 1) {
-    if (max < 1) {
-      throw new TypeError(
-        `Cannot create semaphore as 'max' must be at least 1: current value is ${max}`,
-      );
-    }
-    this.#count = this.#max = max;
-  }
-
-  acquire(): Promise<void> {
-    if (this.#count > 0) {
-      this.#count--;
-      return Promise.resolve();
-    }
-    return new Promise((res) => {
-      const node: Node = { res, next: undefined };
-      if (this.#tail) {
-        this.#tail = this.#tail.next = node;
-      } else {
-        this.#head = this.#tail = node;
-      }
-    });
-  }
-
-  release(): void {
-    if (this.#head) {
-      this.#head.res();
-      this.#head = this.#head.next;
-      if (!this.#head) this.#tail = undefined;
-    } else if (this.#count < this.#max) {
-      this.#count++;
-    }
-  }
-}
-
-// ============================================================
-// RefCounted Registry
-// ============================================================
+import { Semaphore } from "../../../../../deps/jsr.io/@std/async/1.0.16/unstable_semaphore.js";
 
+/**
+ * A reference-counted registry for lazily creating and reusing per-key values.
+ *
+ * @template K - Map key type.
+ * @template V - Stored value type.
+ */
 class RefCountedRegistry<K, V> {
   #map = new Map<K, { value: V; refs: number }>();
   #factory: () => V;
 
+  /**
+   * Creates a new registry instance.
+   *
+   * @param factory - Factory function used to create a new value when a key is first referenced.
+   */
   constructor(factory: () => V) {
     this.#factory = factory;
   }
 
+  /**
+   * Increments the reference count for a key and returns its value.
+   *
+   * If the key is not present, a new value is created via the factory.
+   *
+   * @param key - Registry key.
+   * @returns The value associated with the key.
+   */
   ref(key: K): V {
     let entry = this.#map.get(key);
     if (!entry) {
@@ -72,6 +37,13 @@ class RefCountedRegistry<K, V> {
     return entry.value;
   }
 
+  /**
+   * Decrements the reference count for a key.
+   *
+   * When the count reaches zero, the entry is removed.
+   *
+   * @param key - Registry key.
+   */
   unref(key: K): void {
     const entry = this.#map.get(key);
     if (!entry) return;
@@ -81,12 +53,15 @@ class RefCountedRegistry<K, V> {
   }
 }
 
-// ============================================================
-// Helper
-// ============================================================
-
 const semaphores = new RefCountedRegistry(() => new Semaphore(1));
 
+/**
+ * Acquires a lock for the given key, executes the provided async function, and releases the lock.
+ *
+ * @param key The key to lock on.
+ * @param fn The async function to execute while holding the lock.
+ * @returns The result of the async function.
+ */
 export async function withLock<K, T>(key: K, fn: () => Promise<T>): Promise<T> {
   const semaphore = semaphores.ref(key);
   await semaphore.acquire();

package/src/src/api/exchange/_methods/_base/{schemas.ts → commonSchemas.ts}

@@ -1,5 +1,5 @@
 import * as v from "valibot";
-import { Hex, UnsignedInteger } from "../../../_schemas.js";
+import { Hex } from "../../../_schemas.js";
 
 /** Error response for failed operations. */
 export const ErrorResponse = /* @__PURE__ */ (() => {
@@ -48,17 +48,19 @@ export const SuccessResponse = /* @__PURE__ */ (() => {
 export type SuccessResponse = v.InferOutput<typeof SuccessResponse>;
 
 /** ECDSA signature components. */
-export const Signature = /* @__PURE__ */ (() => {
+export const SignatureSchema = /* @__PURE__ */ (() => {
   return v.pipe(
     v.object({
       /** First 32-byte component. */
       r: v.pipe(
-        v.pipe(Hex, v.length(66)),
+        Hex,
+        v.length(66),
         v.description("First 32-byte component."),
       ),
       /** Second 32-byte component. */
       s: v.pipe(
-        v.pipe(Hex, v.length(66)),
+        Hex,
+        v.length(66),
         v.description("Second 32-byte component."),
       ),
       /** Recovery identifier. */
@@ -70,31 +72,13 @@ export const Signature = /* @__PURE__ */ (() => {
     v.description("ECDSA signature components."),
   );
 })();
-export type Signature = v.InferOutput<typeof Signature>;
-
-/** Nonce (timestamp in ms) used to prevent replay attacks. */
-export const Nonce = /* @__PURE__ */ (() => {
-  return v.pipe(
-    UnsignedInteger,
-    v.description("Nonce (timestamp in ms) used to prevent replay attacks."),
-  );
-})();
-export type Nonce = v.InferOutput<typeof Nonce>;
-
-/** Chain ID in hex format for EIP-712 signing. */
-export const SignatureChainId = /* @__PURE__ */ (() => {
-  return v.pipe(
-    Hex,
-    v.description("Chain ID in hex format for EIP-712 signing."),
-  );
-})();
-export type SignatureChainId = v.InferOutput<typeof SignatureChainId>;
+export type SignatureSchema = v.InferOutput<typeof SignatureSchema>;
 
 /** HyperLiquid network type. */
-export const HyperliquidChain = /* @__PURE__ */ (() => {
+export const HyperliquidChainSchema = /* @__PURE__ */ (() => {
   return v.pipe(
     v.picklist(["Mainnet", "Testnet"]),
     v.description("HyperLiquid network type."),
   );
 })();
-export type HyperliquidChain = v.InferOutput<typeof HyperliquidChain>;
+export type HyperliquidChainSchema = v.InferOutput<typeof HyperliquidChainSchema>;

package/src/src/api/exchange/_methods/_base/errors.ts

@@ -1,4 +1,4 @@
-import { HyperliquidError } from "../../../../_errors.js";
+import { HyperliquidError } from "../../../../_base.js";
 
 // =============================================================
 // Error Detection (Duck Typing)

package/src/src/api/exchange/_methods/_base/execute.ts

@@ -1,6 +1,5 @@
 import * as v from "valibot";
-import type { HttpTransport } from "../../../../transport/http/mod.js";
-import type { WebSocketTransport } from "../../../../transport/websocket/mod.js";
+import type { IRequestTransport } from "../../../../transport/mod.js";
 import { Address, Hex, UnsignedInteger } from "../../../_schemas.js";
 import {
   type AbstractWallet,
@@ -11,9 +10,9 @@ import {
   signUserSignedAction,
 } from "../../../../signing/mod.js";
 import { assertSuccessResponse } from "./errors.js";
-import { defaultNonceManager } from "./_nonce.js";
+import { globalNonceManager } from "./_nonce.js";
 import { withLock } from "./_semaphore.js";
-import type { Signature } from "./schemas.js";
+import type { SignatureSchema } from "./commonSchemas.js";
 
 // =============================================================
 // Type Utilities
@@ -26,7 +25,7 @@ type Prettify<T> = { [K in keyof T]: T[K] } & {};
 
 /** Options for any execute functions. */
 interface BaseOptions {
-  /** [AbortSignal](https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal) to cancel a request. */
+  /** {@link https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal | AbortSignal} to cancel a request. */
   signal?: AbortSignal;
 }
 
@@ -41,7 +40,7 @@ export type ExtractRequestOptions<T extends { action: Record<string, unknown> }>
 // =============================================================
 
 /** Base configuration shared by single-wallet and multi-sig configs. */
-interface BaseConfig<T extends HttpTransport | WebSocketTransport = HttpTransport | WebSocketTransport> {
+interface BaseConfig<T extends IRequestTransport = IRequestTransport> {
   /** The transport used to connect to the Hyperliquid Exchange API. */
   transport: T;
 
@@ -69,25 +68,33 @@ interface BaseConfig<T extends HttpTransport | WebSocketTransport = HttpTranspor
 }
 
 /** Configuration for single-wallet Exchange API requests. */
-export interface ExchangeSingleWalletConfig<
-  T extends HttpTransport | WebSocketTransport = HttpTransport | WebSocketTransport,
-> extends BaseConfig<T> {
+export interface ExchangeSingleWalletConfig<T extends IRequestTransport = IRequestTransport> extends BaseConfig<T> {
   /** The wallet used to sign requests. */
   wallet: AbstractWallet;
 }
 
 /** Configuration for multi-signature Exchange API requests. */
-export interface ExchangeMultiSigConfig<
-  T extends HttpTransport | WebSocketTransport = HttpTransport | WebSocketTransport,
-> extends BaseConfig<T> {
+export interface ExchangeMultiSigConfig<T extends IRequestTransport = IRequestTransport> extends BaseConfig<T> {
   /** Array of wallets for multi-sig. First wallet is the leader. */
   signers: readonly [AbstractWallet, ...AbstractWallet[]];
   /** The multi-signature account address. */
   multiSigUser: `0x${string}`;
 }
 
+/**
+ * Configuration for external signing Exchange API requests.
+ * Use this when signing is handled externally (e.g., by a gRPC server or HSM).
+ * The transport receives unsigned action payloads and is responsible for signing.
+ */
+export interface ExchangeExternalSigningConfig<T extends IRequestTransport = IRequestTransport> extends BaseConfig<T> {
+  /** Marks this config as external signing mode. */
+  externalSigning: true;
+  /** The user address for nonce management. */
+  userAddress: `0x${string}`;
+}
+
 /** Union type for all Exchange API configurations. */
-export type ExchangeConfig = ExchangeSingleWalletConfig | ExchangeMultiSigConfig;
+export type ExchangeConfig = ExchangeSingleWalletConfig | ExchangeMultiSigConfig | ExchangeExternalSigningConfig;
 
 // =============================================================
 // Execute L1 Action
@@ -95,7 +102,7 @@ export type ExchangeConfig = ExchangeSingleWalletConfig | ExchangeMultiSigConfig
 
 /**
  * Execute an L1 action on the Hyperliquid Exchange.
- * Handles both single-wallet and multi-sig signing.
+ * Handles single-wallet, multi-sig, and external signing.
  */
 export async function executeL1Action<T>(
   config: ExchangeConfig,
@@ -107,13 +114,14 @@ export async function executeL1Action<T>(
   },
 ): Promise<T> {
   const { transport } = config;
-  const leader = getLeader(config);
-  const walletAddress = await getWalletAddress(leader);
+  const walletAddress = "externalSigning" in config
+    ? v.parse(Address, config.userAddress)
+    : await getWalletAddress(getLeader(config));
 
   // Semaphore ensures requests arrive at server in nonce order (prevents out-of-order delivery)
   const key = `${walletAddress}:${transport.isTestnet}`;
   return await withLock(key, async () => {
-    const nonce = await (config.nonceManager?.(walletAddress) ?? defaultNonceManager.getNonce(key));
+    const nonce = await (config.nonceManager?.(walletAddress) ?? globalNonceManager.getNonce(key));
 
     // Validate and resolve options
     const vaultAddress = v.parse(
@@ -129,7 +137,22 @@ export async function executeL1Action<T>(
     );
     const signal = options?.signal;
 
+    // Handle external signing - send unsigned action to transport
+    if ("externalSigning" in config) {
+      const response = await transport.request("exchange", {
+        action,
+        nonce,
+        vaultAddress,
+        expiresAfter,
+        isTestnet: transport.isTestnet,
+        userAddress: walletAddress,
+      }, signal);
+      assertSuccessResponse(response);
+      return response as T;
+    }
+
     // Sign action (multi-sig or single wallet)
+    const leader = getLeader(config);
     const [finalAction, signature] = "wallet" in config
       ? [
         action,
@@ -173,7 +196,7 @@ function getNonceFieldName(types: Record<string, { name: string; type: string }[
 
 /**
  * Execute a user-signed action (EIP-712) on the Hyperliquid Exchange.
- * Handles both single-wallet and multi-sig signing.
+ * Handles single-wallet, multi-sig, and external signing.
  * Automatically adds signatureChainId, hyperliquidChain, and nonce/time.
  */
 export async function executeUserSignedAction<T>(
@@ -185,27 +208,43 @@ export async function executeUserSignedAction<T>(
   },
 ): Promise<T> {
   const { transport } = config;
-  const leader = getLeader(config);
-  const walletAddress = await getWalletAddress(leader);
+  const walletAddress = "externalSigning" in config
+    ? v.parse(Address, config.userAddress)
+    : await getWalletAddress(getLeader(config));
 
   // Semaphore ensures requests arrive at server in nonce order (prevents out-of-order delivery)
   const key = `${walletAddress}:${transport.isTestnet}`;
   return withLock(key, async () => {
-    const nonce = await (config.nonceManager?.(walletAddress) ?? defaultNonceManager.getNonce(key));
+    const nonce = await (config.nonceManager?.(walletAddress) ?? globalNonceManager.getNonce(key));
     const signal = options?.signal;
 
     // Add system fields for user-signed actions
     const { type, ...restAction } = action;
     const nonceFieldName = getNonceFieldName(types);
+    const signatureChainId = await getSignatureChainId(config);
     const fullAction = { // key order is important for multi-sig
       type,
-      signatureChainId: await getSignatureChainId(config),
+      signatureChainId,
       hyperliquidChain: transport.isTestnet ? "Testnet" : "Mainnet",
       ...restAction,
       [nonceFieldName]: nonce,
     };
 
+    // Handle external signing - send unsigned action with types to transport
+    if ("externalSigning" in config) {
+      const response = await transport.request("exchange", {
+        action: fullAction,
+        types,
+        nonce,
+        isTestnet: transport.isTestnet,
+        userAddress: walletAddress,
+      }, signal);
+      assertSuccessResponse(response);
+      return response as T;
+    }
+
     // Sign action (multi-sig or single wallet)
+    const leader = getLeader(config);
     const [finalAction, signature] = "wallet" in config
       ? [fullAction, await signUserSignedAction({ wallet: leader, action: fullAction, types })]
       : await signMultiSigUserSigned(config, fullAction, types, walletAddress, nonce);
@@ -226,7 +265,7 @@ export async function executeUserSignedAction<T>(
 // =============================================================
 
 /** Remove leading zeros from signature components (required by Hyperliquid). */
-function trimSignature(sig: Signature): Signature {
+function trimSignature(sig: SignatureSchema): SignatureSchema {
   return {
     r: sig.r.replace(/^0x0+/, "0x") as `0x${string}`,
     s: sig.s.replace(/^0x0+/, "0x") as `0x${string}`,
@@ -242,7 +281,7 @@ async function signMultiSigL1(
   nonce: number,
   vaultAddress?: `0x${string}`,
   expiresAfter?: number,
-): Promise<[Record<string, unknown>, Signature]> {
+): Promise<[Record<string, unknown>, SignatureSchema]> {
   const { transport: { isTestnet }, signers, multiSigUser } = config;
   const multiSigUser_ = v.parse(Address, multiSigUser);
   const outerSigner_ = v.parse(Address, outerSigner);
@@ -292,7 +331,7 @@ async function signMultiSigUserSigned(
   types: Record<string, { name: string; type: string }[]>,
   outerSigner: `0x${string}`,
   nonce: number,
-): Promise<[Record<string, unknown>, Signature]> {
+): Promise<[Record<string, unknown>, SignatureSchema]> {
   const { signers, multiSigUser, transport: { isTestnet } } = config;
   const multiSigUser_ = v.parse(Address, multiSigUser);
   const outerSigner_ = v.parse(Address, outerSigner);
@@ -339,7 +378,7 @@ async function signMultiSigUserSigned(
 // =============================================================
 
 /** Get the leader wallet (first signer for the single wallet, or multi-sig). */
-function getLeader(config: ExchangeConfig): AbstractWallet {
+function getLeader(config: ExchangeSingleWalletConfig | ExchangeMultiSigConfig): AbstractWallet {
   return "wallet" in config ? config.wallet : config.signers[0];
 }
 
@@ -351,5 +390,9 @@ async function getSignatureChainId(config: ExchangeConfig): Promise<`0x${string}
       : config.signatureChainId;
     return v.parse(Hex, id);
   }
+  // External signing defaults to chain ID 1 (mainnet) if not specified
+  if ("externalSigning" in config) {
+    return "0x1";
+  }
   return getWalletChainId(getLeader(config));
 }

package/src/src/api/exchange/_methods/agentEnableDexAbstraction.ts

@@ -5,7 +5,7 @@ import * as v from "valibot";
 // ============================================================
 
 import { UnsignedInteger } from "../../_schemas.js";
-import { ErrorResponse, Nonce, Signature, SuccessResponse } from "./_base/schemas.js";
+import { ErrorResponse, SignatureSchema, SuccessResponse } from "./_base/commonSchemas.js";
 
 /**
  * Enable HIP-3 DEX abstraction.
@@ -26,16 +26,22 @@ export const AgentEnableDexAbstractionRequest = /* @__PURE__ */ (() => {
         v.description("Action to perform."),
       ),
       /** Nonce (timestamp in ms) used to prevent replay attacks. */
-      nonce: Nonce,
+      nonce: v.pipe(
+        UnsignedInteger,
+        v.description("Nonce (timestamp in ms) used to prevent replay attacks."),
+      ),
       /** ECDSA signature components. */
-      signature: Signature,
+      signature: v.pipe(
+        SignatureSchema,
+        v.description("ECDSA signature components."),
+      ),
       /** Expiration time of the action. */
       expiresAfter: v.pipe(
         v.optional(UnsignedInteger),
         v.description("Expiration time of the action."),
       ),
     }),
-    v.description("Enable HIP-3 DEX abstraction request."),
+    v.description("Enable HIP-3 DEX abstraction."),
   );
 })();
 export type AgentEnableDexAbstractionRequest = v.InferOutput<typeof AgentEnableDexAbstractionRequest>;

package/src/src/api/exchange/_methods/approveAgent.ts

@@ -4,15 +4,8 @@ import * as v from "valibot";
 // API Schemas
 // ============================================================
 
-import { Address } from "../../_schemas.js";
-import {
-  ErrorResponse,
-  HyperliquidChain,
-  Nonce,
-  Signature,
-  SignatureChainId,
-  SuccessResponse,
-} from "./_base/schemas.js";
+import { Address, Hex, UnsignedInteger } from "../../_schemas.js";
+import { ErrorResponse, HyperliquidChainSchema, SignatureSchema, SuccessResponse } from "./_base/commonSchemas.js";
 
 /**
  * Approve an agent to sign on behalf of the master account.
@@ -30,28 +23,50 @@ export const ApproveAgentRequest = /* @__PURE__ */ (() => {
             v.description("Type of action."),
           ),
           /** Chain ID in hex format for EIP-712 signing. */
-          signatureChainId: SignatureChainId,
+          signatureChainId: v.pipe(
+            Hex,
+            v.description("Chain ID in hex format for EIP-712 signing."),
+          ),
           /** HyperLiquid network type. */
-          hyperliquidChain: HyperliquidChain,
+          hyperliquidChain: v.pipe(
+            HyperliquidChainSchema,
+            v.description("HyperLiquid network type."),
+          ),
           /** Agent address. */
           agentAddress: v.pipe(
             Address,
             v.description("Agent address."),
           ),
-          /** Agent name or null for unnamed agent (default: null). */
+          /** Agent name or null for unnamed agent. */
           agentName: v.pipe(
-            v.optional(v.nullable(v.string()), null),
+            v.nullish(
+              v.pipe(
+                v.string(),
+                v.minLength(1),
+                v.maxLength(17),
+              ),
+              null,
+            ),
             v.description("Agent name or null for unnamed agent."),
           ),
           /** Nonce (timestamp in ms) used to prevent replay attacks. */
-          nonce: Nonce,
+          nonce: v.pipe(
+            UnsignedInteger,
+            v.description("Nonce (timestamp in ms) used to prevent replay attacks."),
+          ),
         }),
         v.description("Action to perform."),
       ),
       /** Nonce (timestamp in ms) used to prevent replay attacks. */
-      nonce: Nonce,
+      nonce: v.pipe(
+        UnsignedInteger,
+        v.description("Nonce (timestamp in ms) used to prevent replay attacks."),
+      ),
       /** ECDSA signature components. */
-      signature: Signature,
+      signature: v.pipe(
+        SignatureSchema,
+        v.description("ECDSA signature components."),
+      ),
     }),
     v.description("Approve an agent to sign on behalf of the master account."),
   );

package/src/src/api/exchange/_methods/approveBuilderFee.ts

@@ -4,15 +4,8 @@ import * as v from "valibot";
 // API Schemas
 // ============================================================
 
-import { Address, Percent } from "../../_schemas.js";
-import {
-  ErrorResponse,
-  HyperliquidChain,
-  Nonce,
-  Signature,
-  SignatureChainId,
-  SuccessResponse,
-} from "./_base/schemas.js";
+import { Address, Hex, Percent, UnsignedInteger } from "../../_schemas.js";
+import { ErrorResponse, HyperliquidChainSchema, SignatureSchema, SuccessResponse } from "./_base/commonSchemas.js";
 
 /**
  * Approve a maximum fee rate for a builder.
@@ -30,9 +23,15 @@ export const ApproveBuilderFeeRequest = /* @__PURE__ */ (() => {
             v.description("Type of action."),
           ),
           /** Chain ID in hex format for EIP-712 signing. */
-          signatureChainId: SignatureChainId,
+          signatureChainId: v.pipe(
+            Hex,
+            v.description("Chain ID in hex format for EIP-712 signing."),
+          ),
           /** HyperLiquid network type. */
-          hyperliquidChain: HyperliquidChain,
+          hyperliquidChain: v.pipe(
+            HyperliquidChainSchema,
+            v.description("HyperLiquid network type."),
+          ),
           /** Max fee rate (e.g., "0.01%"). */
           maxFeeRate: v.pipe(
             Percent,
@@ -44,14 +43,23 @@ export const ApproveBuilderFeeRequest = /* @__PURE__ */ (() => {
             v.description("Builder address."),
           ),
           /** Nonce (timestamp in ms) used to prevent replay attacks. */
-          nonce: Nonce,
+          nonce: v.pipe(
+            UnsignedInteger,
+            v.description("Nonce (timestamp in ms) used to prevent replay attacks."),
+          ),
         }),
         v.description("Action to perform."),
       ),
       /** Nonce (timestamp in ms) used to prevent replay attacks. */
-      nonce: Nonce,
+      nonce: v.pipe(
+        UnsignedInteger,
+        v.description("Nonce (timestamp in ms) used to prevent replay attacks."),
+      ),
       /** ECDSA signature components. */
-      signature: Signature,
+      signature: v.pipe(
+        SignatureSchema,
+        v.description("ECDSA signature components."),
+      ),
     }),
     v.description("Approve a maximum fee rate for a builder."),
   );

package/src/src/api/exchange/_methods/batchModify.ts

@@ -4,8 +4,8 @@ import * as v from "valibot";
 // API Schemas
 // ============================================================
 
-import { Address, Hex, UnsignedDecimal, UnsignedInteger } from "../../_schemas.js";
-import { Nonce, Signature } from "./_base/schemas.js";
+import { Address, Cloid, UnsignedDecimal, UnsignedInteger } from "../../_schemas.js";
+import { SignatureSchema } from "./_base/commonSchemas.js";
 import { OrderResponse } from "./order.js";
 
 /**
@@ -29,10 +29,7 @@ export const BatchModifyRequest = /* @__PURE__ */ (() => {
               v.object({
                 /** Order ID or Client Order ID. */
                 oid: v.pipe(
-                  v.union([
-                    UnsignedInteger,
-                    v.pipe(Hex, v.length(34)),
-                  ]),
+                  v.union([UnsignedInteger, Cloid]),
                   v.description("Order ID or Client Order ID."),
                 ),
                 /** New order parameters. */
@@ -51,6 +48,7 @@ export const BatchModifyRequest = /* @__PURE__ */ (() => {
                     /** Price. */
                     p: v.pipe(
                       UnsignedDecimal,
+                      v.check((input) => Number(input) > 0, "Value must be greater than zero."),
                       v.description("Price."),
                     ),
                     /** Size (in base currency units). */
@@ -63,7 +61,7 @@ export const BatchModifyRequest = /* @__PURE__ */ (() => {
                       v.boolean(),
                       v.description("Is reduce-only?"),
                     ),
-                    /** Order type. */
+                    /** Order type (`limit` for limit orders, `trigger` for stop-loss/take-profit orders). */
                     t: v.pipe(
                       v.union([
                         v.object({
@@ -105,6 +103,7 @@ export const BatchModifyRequest = /* @__PURE__ */ (() => {
                               /** Trigger price. */
                               triggerPx: v.pipe(
                                 UnsignedDecimal,
+                                v.check((input) => Number(input) > 0, "Value must be greater than zero."),
                                 v.description("Trigger price."),
                               ),
                               /** Indicates whether it is take profit or stop loss. */
@@ -117,11 +116,13 @@ export const BatchModifyRequest = /* @__PURE__ */ (() => {
                           ),
                         }),
                       ]),
-                      v.description("Order type."),
+                      v.description(
+                        "Order type (`limit` for limit orders, `trigger` for stop-loss/take-profit orders).",
+                      ),
                     ),
                     /** Client Order ID. */
                     c: v.pipe(
-                      v.optional(v.pipe(Hex, v.length(34))),
+                      v.optional(Cloid),
                       v.description("Client Order ID."),
                     ),
                   }),
@@ -135,9 +136,15 @@ export const BatchModifyRequest = /* @__PURE__ */ (() => {
         v.description("Action to perform."),
       ),
       /** Nonce (timestamp in ms) used to prevent replay attacks. */
-      nonce: Nonce,
+      nonce: v.pipe(
+        UnsignedInteger,
+        v.description("Nonce (timestamp in ms) used to prevent replay attacks."),
+      ),
       /** ECDSA signature components. */
-      signature: Signature,
+      signature: v.pipe(
+        SignatureSchema,
+        v.description("ECDSA signature components."),
+      ),
       /** Vault address (for vault trading). */
       vaultAddress: v.pipe(
         v.optional(Address),