@hyperbridge/sdk 2.3.3 → 2.4.0

package/dist/node/index.d.cts

@@ -2335,6 +2335,57 @@ declare class CryptoUtils {
      * @returns The UserOperation hash as a hex string.
      */
     static computeUserOpHash(userOp: PackedUserOperation, entryPoint: Hex, chainId: bigint): Hex;
+    /**
+     * Derives the ERC-4337 nonce key that binds a bid UserOperation to its
+     * order and session key: the lower 192 bits of
+     * `keccak256(commitment ‖ sessionKey)`. `SolverAccount` rejects bid
+     * operations whose nonce key differs — this is what lets the solver sign
+     * the plain userOpHash while staying committed to the order and to the
+     * session key it bid against.
+     *
+     * @param commitment - The order commitment (`order.id`).
+     * @param sessionKey - The order's session key address (`order.session`).
+     * @returns The 192-bit nonce key as a bigint (pass to `EntryPoint.getNonce`).
+     */
+    static bidNonceKey(commitment: HexString, sessionKey: HexString): bigint;
+    /**
+     * Builds the EIP-712 typed-data payload whose digest is the EntryPoint v0.8
+     * `userOpHash` (i.e. `hashTypedData(packedUserOpTypedData(...)) ===
+     * computeUserOpHash(...)`). Signing this typed data is bit-identical to
+     * signing the raw userOpHash, but keeps the full operation visible to
+     * signing infrastructure (hardware wallets, MPC/TEE policy engines) instead
+     * of an opaque 32-byte digest.
+     *
+     * @param userOp - The packed UserOperation to sign (signature field ignored).
+     * @param entryPoint - Address of the EntryPoint v0.8 contract.
+     * @param chainId - Chain ID of the network on which the operation will execute.
+     * @returns A viem `TypedDataDefinition` for the operation.
+     */
+    static packedUserOpTypedData(userOp: PackedUserOperation, entryPoint: Hex, chainId: bigint): {
+        domain: {
+            name: string;
+            version: string;
+            chainId: bigint;
+            verifyingContract: `0x${string}`;
+        };
+        types: {
+            PackedUserOperation: {
+                name: string;
+                type: string;
+            }[];
+        };
+        primaryType: "PackedUserOperation";
+        message: {
+            sender: `0x${string}`;
+            nonce: bigint;
+            initCode: `0x${string}`;
+            callData: `0x${string}`;
+            accountGasLimits: `0x${string}`;
+            preVerificationGas: bigint;
+            gasFees: `0x${string}`;
+            paymasterAndData: `0x${string}`;
+        };
+    };
     /**
      * Computes the EIP-712 struct hash of a `PackedUserOperation`.
      *

package/dist/node/index.d.ts

@@ -2335,6 +2335,57 @@ declare class CryptoUtils {
      * @returns The UserOperation hash as a hex string.
      */
     static computeUserOpHash(userOp: PackedUserOperation, entryPoint: Hex, chainId: bigint): Hex;
+    /**
+     * Derives the ERC-4337 nonce key that binds a bid UserOperation to its
+     * order and session key: the lower 192 bits of
+     * `keccak256(commitment ‖ sessionKey)`. `SolverAccount` rejects bid
+     * operations whose nonce key differs — this is what lets the solver sign
+     * the plain userOpHash while staying committed to the order and to the
+     * session key it bid against.
+     *
+     * @param commitment - The order commitment (`order.id`).
+     * @param sessionKey - The order's session key address (`order.session`).
+     * @returns The 192-bit nonce key as a bigint (pass to `EntryPoint.getNonce`).
+     */
+    static bidNonceKey(commitment: HexString, sessionKey: HexString): bigint;
+    /**
+     * Builds the EIP-712 typed-data payload whose digest is the EntryPoint v0.8
+     * `userOpHash` (i.e. `hashTypedData(packedUserOpTypedData(...)) ===
+     * computeUserOpHash(...)`). Signing this typed data is bit-identical to
+     * signing the raw userOpHash, but keeps the full operation visible to
+     * signing infrastructure (hardware wallets, MPC/TEE policy engines) instead
+     * of an opaque 32-byte digest.
+     *
+     * @param userOp - The packed UserOperation to sign (signature field ignored).
+     * @param entryPoint - Address of the EntryPoint v0.8 contract.
+     * @param chainId - Chain ID of the network on which the operation will execute.
+     * @returns A viem `TypedDataDefinition` for the operation.
+     */
+    static packedUserOpTypedData(userOp: PackedUserOperation, entryPoint: Hex, chainId: bigint): {
+        domain: {
+            name: string;
+            version: string;
+            chainId: bigint;
+            verifyingContract: `0x${string}`;
+        };
+        types: {
+            PackedUserOperation: {
+                name: string;
+                type: string;
+            }[];
+        };
+        primaryType: "PackedUserOperation";
+        message: {
+            sender: `0x${string}`;
+            nonce: bigint;
+            initCode: `0x${string}`;
+            callData: `0x${string}`;
+            accountGasLimits: `0x${string}`;
+            preVerificationGas: bigint;
+            gasFees: `0x${string}`;
+            paymasterAndData: `0x${string}`;
+        };
+    };
     /**
      * Computes the EIP-712 struct hash of a `PackedUserOperation`.
      *

package/dist/node/index.js

@@ -2585,7 +2585,7 @@ var chainConfigs = {
       UniswapV3Quoter: "0x0000000000000000000000000000000000000000",
       UniswapV4Quoter: "0x0000000000000000000000000000000000000000",
       EntryPointV08: "0x4337084D9E255Ff0702461CF8895CE9E3b5Ff108",
-      SolverAccount: "0x07FeC66d967800998060194EaECDd7C66dA4a1B1"
+      SolverAccount: "0x110C7E1814c923127469Ca8939a12dAa70B96a17"
     },
     rpcEnvKey: "BSC_CHAPEL",
     defaultRpcUrl: "https://bnb-testnet.api.onfinality.io/public",
@@ -2693,7 +2693,7 @@ var chainConfigs = {
     },
     addresses: {
       IntentGateway: "0xAe041F7B0CB581876832830baeB6a2Aa2a3C9716",
-      SolverAccount: "0x975e80B476cB1d4Cd06c292ce36898f2bE4159ea",
+      SolverAccount: "0x3bdB532d91F165BeFad5542700205f5BB5152a82",
       TokenGateway: "0xFd413e3AFe560182C4471F4d143A96d3e259B6dE",
       Host: "0x620128E2B19193d6Bd244a3AC8D3bBa0541B19c3",
       UniswapRouter02: "0x7a250d5630B4cF539739dF2C5dAcb4c659F2488D",
@@ -2748,7 +2748,7 @@ var chainConfigs = {
     },
     addresses: {
       IntentGateway: "0xAe041F7B0CB581876832830baeB6a2Aa2a3C9716",
-      SolverAccount: "0x975e80B476cB1d4Cd06c292ce36898f2bE4159ea",
+      SolverAccount: "0x3bdB532d91F165BeFad5542700205f5BB5152a82",
       TokenGateway: "0xFd413e3AFe560182C4471F4d143A96d3e259B6dE",
       Host: "0x620128E2B19193d6Bd244a3AC8D3bBa0541B19c3",
       UniswapRouter02: "0x10ED43C718714eb63d5aA57B78B54704E256024E",
@@ -2804,7 +2804,7 @@ var chainConfigs = {
     },
     addresses: {
       IntentGateway: "0xAe041F7B0CB581876832830baeB6a2Aa2a3C9716",
-      SolverAccount: "0x975e80B476cB1d4Cd06c292ce36898f2bE4159ea",
+      SolverAccount: "0x3bdB532d91F165BeFad5542700205f5BB5152a82",
       TokenGateway: "0xFd413e3AFe560182C4471F4d143A96d3e259B6dE",
       Host: "0x620128E2B19193d6Bd244a3AC8D3bBa0541B19c3",
       UniswapRouter02: "0x4752ba5DBc23f44D87826276BF6Fd6b1C372aD24",
@@ -2861,7 +2861,7 @@ var chainConfigs = {
     },
     addresses: {
       IntentGateway: "0xAe041F7B0CB581876832830baeB6a2Aa2a3C9716",
-      SolverAccount: "0x975e80B476cB1d4Cd06c292ce36898f2bE4159ea",
+      SolverAccount: "0x3bdB532d91F165BeFad5542700205f5BB5152a82",
       TokenGateway: "0xFd413e3AFe560182C4471F4d143A96d3e259B6dE",
       Host: "0x620128E2B19193d6Bd244a3AC8D3bBa0541B19c3",
       UniswapRouter02: "0x4752ba5DBc23f44D87826276BF6Fd6b1C372aD24",
@@ -2920,7 +2920,7 @@ var chainConfigs = {
     },
     addresses: {
       IntentGateway: "0xAe041F7B0CB581876832830baeB6a2Aa2a3C9716",
-      SolverAccount: "0x975e80B476cB1d4Cd06c292ce36898f2bE4159ea",
+      SolverAccount: "0x3bdB532d91F165BeFad5542700205f5BB5152a82",
       TokenGateway: "0x8b536105b6Fae2aE9199f5146D3C57Dfe53b614E",
       Host: "0x620128E2B19193d6Bd244a3AC8D3bBa0541B19c3",
       UniswapRouter02: "0xd2f9496824951D5237cC71245D659E48d0d5f9E8",
@@ -3007,7 +3007,7 @@ var chainConfigs = {
       Calldispatcher: "0x876F1891982E260026630c233A4897160A281Fb8",
       Permit2: "0x000000000022D473030F116dDEE9F6B43aC78BA3",
       EntryPointV08: "0x4337084D9E255Ff0702461CF8895CE9E3b5Ff108",
-      SolverAccount: "0x07FeC66d967800998060194EaECDd7C66dA4a1B1"
+      SolverAccount: "0x110C7E1814c923127469Ca8939a12dAa70B96a17"
     },
     rpcEnvKey: "POLYGON_AMOY",
     defaultRpcUrl: "https://rpc-amoy.polygon.technology",
@@ -3031,7 +3031,7 @@ var chainConfigs = {
     },
     addresses: {
       IntentGateway: "0xAe041F7B0CB581876832830baeB6a2Aa2a3C9716",
-      SolverAccount: "0x975e80B476cB1d4Cd06c292ce36898f2bE4159ea",
+      SolverAccount: "0x3bdB532d91F165BeFad5542700205f5BB5152a82",
       TokenGateway: "0xFd413e3AFe560182C4471F4d143A96d3e259B6dE",
       Host: "0x620128E2B19193d6Bd244a3AC8D3bBa0541B19c3",
       UniswapRouter02: "0x4A7b5Da61326A6379179b40d00F57E5bbDC962c2",
@@ -3066,7 +3066,7 @@ var chainConfigs = {
     },
     addresses: {
       IntentGateway: "0xAe041F7B0CB581876832830baeB6a2Aa2a3C9716",
-      SolverAccount: "0x975e80B476cB1d4Cd06c292ce36898f2bE4159ea",
+      SolverAccount: "0x3bdB532d91F165BeFad5542700205f5BB5152a82",
       TokenGateway: "0xFd413e3AFe560182C4471F4d143A96d3e259B6dE",
       Host: "0x620128E2B19193d6Bd244a3AC8D3bBa0541B19c3",
       UniswapRouter02: "0xB2e26652e4BAd1e56055A051f922E06760cA0BFE",
@@ -3221,7 +3221,7 @@ var chainConfigs = {
     },
     addresses: {
       IntentGateway: "0xAe041F7B0CB581876832830baeB6a2Aa2a3C9716",
-      SolverAccount: "0x975e80B476cB1d4Cd06c292ce36898f2bE4159ea",
+      SolverAccount: "0x3bdB532d91F165BeFad5542700205f5BB5152a82",
       Host: "0x620128E2B19193d6Bd244a3AC8D3bBa0541B19c3",
       Calldispatcher: "0xE2C7e576E26E0bE7aC97c6fE925bcDAbD87c4bEd"
     },
@@ -14763,6 +14763,67 @@ var CryptoUtils = class _CryptoUtils {
       encodePacked(["bytes1", "bytes1", "bytes32", "bytes32"], ["0x19", "0x01", domainSeparator, structHash])
     );
   }
+  /**
+   * Derives the ERC-4337 nonce key that binds a bid UserOperation to its
+   * order and session key: the lower 192 bits of
+   * `keccak256(commitment ‖ sessionKey)`. `SolverAccount` rejects bid
+   * operations whose nonce key differs — this is what lets the solver sign
+   * the plain userOpHash while staying committed to the order and to the
+   * session key it bid against.
+   *
+   * @param commitment - The order commitment (`order.id`).
+   * @param sessionKey - The order's session key address (`order.session`).
+   * @returns The 192-bit nonce key as a bigint (pass to `EntryPoint.getNonce`).
+   */
+  static bidNonceKey(commitment, sessionKey) {
+    return BigInt(keccak256(encodePacked(["bytes32", "address"], [commitment, sessionKey]))) & (1n << 192n) - 1n;
+  }
+  /**
+   * Builds the EIP-712 typed-data payload whose digest is the EntryPoint v0.8
+   * `userOpHash` (i.e. `hashTypedData(packedUserOpTypedData(...)) ===
+   * computeUserOpHash(...)`). Signing this typed data is bit-identical to
+   * signing the raw userOpHash, but keeps the full operation visible to
+   * signing infrastructure (hardware wallets, MPC/TEE policy engines) instead
+   * of an opaque 32-byte digest.
+   *
+   * @param userOp - The packed UserOperation to sign (signature field ignored).
+   * @param entryPoint - Address of the EntryPoint v0.8 contract.
+   * @param chainId - Chain ID of the network on which the operation will execute.
+   * @returns A viem `TypedDataDefinition` for the operation.
+   */
+  static packedUserOpTypedData(userOp, entryPoint, chainId) {
+    return {
+      domain: {
+        name: "ERC4337",
+        version: "1",
+        chainId,
+        verifyingContract: entryPoint
+      },
+      types: {
+        PackedUserOperation: [
+          { name: "sender", type: "address" },
+          { name: "nonce", type: "uint256" },
+          { name: "initCode", type: "bytes" },
+          { name: "callData", type: "bytes" },
+          { name: "accountGasLimits", type: "bytes32" },
+          { name: "preVerificationGas", type: "uint256" },
+          { name: "gasFees", type: "bytes32" },
+          { name: "paymasterAndData", type: "bytes" }
+        ]
+      },
+      primaryType: "PackedUserOperation",
+      message: {
+        sender: userOp.sender,
+        nonce: userOp.nonce,
+        initCode: userOp.initCode,
+        callData: userOp.callData,
+        accountGasLimits: userOp.accountGasLimits,
+        preVerificationGas: userOp.preVerificationGas,
+        gasFees: userOp.gasFees,
+        paymasterAndData: userOp.paymasterAndData
+      }
+    };
+  }
   /**
    * Computes the EIP-712 struct hash of a `PackedUserOperation`.
    *
@@ -16271,9 +16332,12 @@ var BidManager = class {
    * Constructs a signed `PackedUserOperation` that a solver can submit to the
    * Hyperbridge coprocessor as a bid to fill an order.
    *
-   * The solver's signature covers a hash that binds the UserOperation to the
-   * order commitment and the session key address, so the IntentGatewayV2
-   * contract can verify the solver's intent on-chain.
+   * The solver signs the operation as EntryPoint v0.8 EIP-712 typed data,
+   * whose digest is the plain userOpHash. The binding to the order lives in
+   * the operation itself: the 4337 nonce key must be the lower 192 bits of
+   * the order commitment (`SolverAccount` enforces this during validation),
+   * and the callData carries the order. This keeps the signed payload fully
+   * transparent to signing infrastructure instead of an opaque digest.
    *
    * @param options - Parameters describing the solver account, gas limits, fee
    *   market values, and pre-built `callData` for the fill operation.
@@ -16311,10 +16375,17 @@ var BidManager = class {
       paymasterAndData,
       signature: "0x"
     };
-    const userOpHash = CryptoUtils.computeUserOpHash(userOp, entryPointAddress, chainId);
-    const sessionKey = order.session;
-    const messageHash = keccak256(concat([userOpHash, order.id, sessionKey]));
-    const solverSignature = await solverSigner.signMessage(messageHash, Number(chainId));
+    const nonceKey = BigInt(nonce) >> 64n;
+    const expectedKey = CryptoUtils.bidNonceKey(order.id, order.session);
+    if (nonceKey !== expectedKey) {
+      console.warn(
+        `[BidManager] bid nonce key does not bind the order commitment and session key; on-chain validation will fail (order=${order.id})`
+      );
+    }
+    const solverSignature = await solverSigner.signTypedData(
+      CryptoUtils.packedUserOpTypedData(userOp, entryPointAddress, chainId),
+      Number(chainId)
+    );
     const signature = concat([order.id, solverSignature]);
     return { ...userOp, signature };
   }