@hyperbridge/sdk 2.3.2 → 2.4.0

package/dist/node/index.cjs

@@ -2596,7 +2596,7 @@ var chainConfigs = {
       UniswapV3Quoter: "0x0000000000000000000000000000000000000000",
       UniswapV4Quoter: "0x0000000000000000000000000000000000000000",
       EntryPointV08: "0x4337084D9E255Ff0702461CF8895CE9E3b5Ff108",
-      SolverAccount: "0x07FeC66d967800998060194EaECDd7C66dA4a1B1"
+      SolverAccount: "0x110C7E1814c923127469Ca8939a12dAa70B96a17"
     },
     rpcEnvKey: "BSC_CHAPEL",
     defaultRpcUrl: "https://bnb-testnet.api.onfinality.io/public",
@@ -2704,7 +2704,7 @@ var chainConfigs = {
     },
     addresses: {
       IntentGateway: "0xAe041F7B0CB581876832830baeB6a2Aa2a3C9716",
-      SolverAccount: "0x975e80B476cB1d4Cd06c292ce36898f2bE4159ea",
+      SolverAccount: "0x3bdB532d91F165BeFad5542700205f5BB5152a82",
       TokenGateway: "0xFd413e3AFe560182C4471F4d143A96d3e259B6dE",
       Host: "0x620128E2B19193d6Bd244a3AC8D3bBa0541B19c3",
       UniswapRouter02: "0x7a250d5630B4cF539739dF2C5dAcb4c659F2488D",
@@ -2759,7 +2759,7 @@ var chainConfigs = {
     },
     addresses: {
       IntentGateway: "0xAe041F7B0CB581876832830baeB6a2Aa2a3C9716",
-      SolverAccount: "0x975e80B476cB1d4Cd06c292ce36898f2bE4159ea",
+      SolverAccount: "0x3bdB532d91F165BeFad5542700205f5BB5152a82",
       TokenGateway: "0xFd413e3AFe560182C4471F4d143A96d3e259B6dE",
       Host: "0x620128E2B19193d6Bd244a3AC8D3bBa0541B19c3",
       UniswapRouter02: "0x10ED43C718714eb63d5aA57B78B54704E256024E",
@@ -2815,7 +2815,7 @@ var chainConfigs = {
     },
     addresses: {
       IntentGateway: "0xAe041F7B0CB581876832830baeB6a2Aa2a3C9716",
-      SolverAccount: "0x975e80B476cB1d4Cd06c292ce36898f2bE4159ea",
+      SolverAccount: "0x3bdB532d91F165BeFad5542700205f5BB5152a82",
       TokenGateway: "0xFd413e3AFe560182C4471F4d143A96d3e259B6dE",
       Host: "0x620128E2B19193d6Bd244a3AC8D3bBa0541B19c3",
       UniswapRouter02: "0x4752ba5DBc23f44D87826276BF6Fd6b1C372aD24",
@@ -2872,7 +2872,7 @@ var chainConfigs = {
     },
     addresses: {
       IntentGateway: "0xAe041F7B0CB581876832830baeB6a2Aa2a3C9716",
-      SolverAccount: "0x975e80B476cB1d4Cd06c292ce36898f2bE4159ea",
+      SolverAccount: "0x3bdB532d91F165BeFad5542700205f5BB5152a82",
       TokenGateway: "0xFd413e3AFe560182C4471F4d143A96d3e259B6dE",
       Host: "0x620128E2B19193d6Bd244a3AC8D3bBa0541B19c3",
       UniswapRouter02: "0x4752ba5DBc23f44D87826276BF6Fd6b1C372aD24",
@@ -2931,7 +2931,7 @@ var chainConfigs = {
     },
     addresses: {
       IntentGateway: "0xAe041F7B0CB581876832830baeB6a2Aa2a3C9716",
-      SolverAccount: "0x975e80B476cB1d4Cd06c292ce36898f2bE4159ea",
+      SolverAccount: "0x3bdB532d91F165BeFad5542700205f5BB5152a82",
       TokenGateway: "0x8b536105b6Fae2aE9199f5146D3C57Dfe53b614E",
       Host: "0x620128E2B19193d6Bd244a3AC8D3bBa0541B19c3",
       UniswapRouter02: "0xd2f9496824951D5237cC71245D659E48d0d5f9E8",
@@ -3018,7 +3018,7 @@ var chainConfigs = {
       Calldispatcher: "0x876F1891982E260026630c233A4897160A281Fb8",
       Permit2: "0x000000000022D473030F116dDEE9F6B43aC78BA3",
       EntryPointV08: "0x4337084D9E255Ff0702461CF8895CE9E3b5Ff108",
-      SolverAccount: "0x07FeC66d967800998060194EaECDd7C66dA4a1B1"
+      SolverAccount: "0x110C7E1814c923127469Ca8939a12dAa70B96a17"
     },
     rpcEnvKey: "POLYGON_AMOY",
     defaultRpcUrl: "https://rpc-amoy.polygon.technology",
@@ -3042,7 +3042,7 @@ var chainConfigs = {
     },
     addresses: {
       IntentGateway: "0xAe041F7B0CB581876832830baeB6a2Aa2a3C9716",
-      SolverAccount: "0x975e80B476cB1d4Cd06c292ce36898f2bE4159ea",
+      SolverAccount: "0x3bdB532d91F165BeFad5542700205f5BB5152a82",
       TokenGateway: "0xFd413e3AFe560182C4471F4d143A96d3e259B6dE",
       Host: "0x620128E2B19193d6Bd244a3AC8D3bBa0541B19c3",
       UniswapRouter02: "0x4A7b5Da61326A6379179b40d00F57E5bbDC962c2",
@@ -3077,7 +3077,7 @@ var chainConfigs = {
     },
     addresses: {
       IntentGateway: "0xAe041F7B0CB581876832830baeB6a2Aa2a3C9716",
-      SolverAccount: "0x975e80B476cB1d4Cd06c292ce36898f2bE4159ea",
+      SolverAccount: "0x3bdB532d91F165BeFad5542700205f5BB5152a82",
       TokenGateway: "0xFd413e3AFe560182C4471F4d143A96d3e259B6dE",
       Host: "0x620128E2B19193d6Bd244a3AC8D3bBa0541B19c3",
       UniswapRouter02: "0xB2e26652e4BAd1e56055A051f922E06760cA0BFE",
@@ -3232,7 +3232,7 @@ var chainConfigs = {
     },
     addresses: {
       IntentGateway: "0xAe041F7B0CB581876832830baeB6a2Aa2a3C9716",
-      SolverAccount: "0x975e80B476cB1d4Cd06c292ce36898f2bE4159ea",
+      SolverAccount: "0x3bdB532d91F165BeFad5542700205f5BB5152a82",
       Host: "0x620128E2B19193d6Bd244a3AC8D3bBa0541B19c3",
       Calldispatcher: "0xE2C7e576E26E0bE7aC97c6fE925bcDAbD87c4bEd"
     },
@@ -7044,6 +7044,11 @@ var ExpectedError = class _ExpectedError extends Error {
     return error instanceof _ExpectedError;
   }
 };
+
+// src/configs/constants.ts
+var ISMP_PREFIX = ":child_storage:default:ISMPv2";
+
+// src/chains/substrate.ts
 var HttpRpcClient = class {
   constructor(url) {
     this.url = url;
@@ -7167,7 +7172,7 @@ var SubstrateChain = class _SubstrateChain {
    * @returns {Promise<HexString | undefined>} The commitment data if found, undefined otherwise.
    */
   async queryRequestCommitment(commitment) {
-    const prefix = viem.toHex(":child_storage:default:ISMP");
+    const prefix = viem.toHex(ISMP_PREFIX);
     const key = this.requestCommitmentKey(commitment);
     const item = await this.rpcClient.call("childstate_getStorage", [prefix, key]);
     return item;
@@ -7178,7 +7183,7 @@ var SubstrateChain = class _SubstrateChain {
    * @returns {Promise<HexString | undefined>} The relayer address responsible for delivering the request.
    */
   async queryRequestReceipt(commitment) {
-    const prefix = viem.toHex(":child_storage:default:ISMP");
+    const prefix = viem.toHex(ISMP_PREFIX);
     const key = this.requestReceiptKey(commitment);
     const item = await this.rpcClient.call("childstate_getStorage", [prefix, key]);
     return item;
@@ -7202,7 +7207,7 @@ var SubstrateChain = class _SubstrateChain {
    * @returns {Promise<HexString | undefined>} The receipt data if present, otherwise undefined.
    */
   async queryResponseReceipt(commitment) {
-    const prefix = viem.toHex(":child_storage:default:ISMP");
+    const prefix = viem.toHex(ISMP_PREFIX);
     const key = this.responseReceiptKey(commitment);
     const item = await this.rpcClient.call("childstate_getStorage", [prefix, key]);
     return item;
@@ -14769,6 +14774,67 @@ var CryptoUtils = class _CryptoUtils {
       viem.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(viem.keccak256(viem.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`.
    *
@@ -15310,7 +15376,11 @@ var OrderExecutor = class {
    */
   async fetchBids(params) {
     const { commitment, solver, solverLockStartTime } = params;
-    const fetchedBids = await this.ctx.intentsCoprocessor.getBidsForOrder(commitment);
+    const intentsCoprocessor = this.ctx.intentsCoprocessor;
+    if (!intentsCoprocessor) {
+      throw new Error("IntentsCoprocessor required for order execution");
+    }
+    const fetchedBids = await intentsCoprocessor.getBidsForOrder(commitment);
     if (solver) {
       const { address, timeoutMs } = solver;
       const solverLockActive = Date.now() - solverLockStartTime < timeoutMs;
@@ -15399,7 +15469,7 @@ var OrderExecutor = class {
    *   → (`FILLED` | `PARTIAL_FILL`)* → (`FILLED` | `EXPIRED`)
    *
    * **Cross-chain:** `AWAITING_BIDS` → `BIDS_RECEIVED` → `BID_SELECTED`
-   *   (terminates — settlement is confirmed async via Hyperbridge)
+   *   → `FILLED`
    */
   async *executeOrder(options) {
     const { order, sessionPrivateKey, auctionTimeMs, pollIntervalMs = DEFAULT_POLL_INTERVAL, solver } = options;
@@ -15538,7 +15608,13 @@ var OrderExecutor = class {
           userOp: result.userOp,
           transactionHash: result.txnHash
         };
-        const fill = this.processFillResult(result, commitment, targetAssets, totalFilledAssets, remainingAssets);
+        const fill = this.processFillResult(
+          result,
+          commitment,
+          targetAssets,
+          totalFilledAssets,
+          remainingAssets
+        );
         totalFilledAssets = fill.totalFilledAssets;
         remainingAssets = fill.remainingAssets;
         if (fill.update) {
@@ -15564,6 +15640,10 @@ var OrderCanceller = class {
     this.ctx = ctx;
   }
   ctx;
+  logger = consola.createConsola({
+    level: consola.LogLevels.info,
+    formatOptions: { columns: 80, colors: true, compact: true, date: false }
+  }).withTag("[OrderCanceller]");
   /**
    * Returns both the native token cost and the relayer fee for cancelling an
    * order. Frontends can use `relayerFee` to approve the ERC-20 spend before
@@ -15979,32 +16059,55 @@ var OrderCanceller = class {
   }
   /**
    * Submits an unsigned GET request message to Hyperbridge and waits until
-   * the request receipt is confirmed on-chain.
+   * the GET response receipt is confirmed on-chain.
    *
-   * If the initial submission fails, the method waits 30 seconds and then
-   * retries querying for the receipt up to 10 times with 5-second back-off.
+   * GET handling on Hyperbridge creates a response receipt keyed by the
+   * request commitment. That receipt is the durable delivery signal, so a
+   * duplicate unsigned submission is considered successful only if the
+   * response receipt can be observed.
    *
    * @param hyperbridge - Hyperbridge Substrate chain client.
    * @param commitment - The GET request commitment hash used to poll for the receipt.
    * @param message - The fully constructed GET request message to submit.
    */
   async submitAndConfirmReceipt(hyperbridge, commitment, message) {
-    let storageValue = await hyperbridge.queryRequestReceipt(commitment);
-    if (!storageValue) {
-      try {
-        await hyperbridge.submitUnsigned(message);
-      } catch {
-      }
+    this.logger.info(`Checking GET response receipt before Hyperbridge delivery (${commitment})`);
+    if (await this.queryDeliveredReceipt(hyperbridge, commitment)) {
+      this.logger.info(`GET ${commitment} already delivered to Hyperbridge; skipping unsigned submission`);
+      return;
+    }
+    try {
+      this.logger.info(`Submitting unsigned GET ${commitment} to Hyperbridge`);
+      await hyperbridge.submitUnsigned(message);
+      this.logger.info(`Unsigned GET ${commitment} submitted; waiting for Hyperbridge response receipt`);
       await sleep(3e4);
-      storageValue = await retryPromise(
-        async () => {
-          const value = await hyperbridge.queryRequestReceipt(commitment);
-          if (!value) throw new Error("Receipt not found");
-          return value;
-        },
-        { maxRetries: 10, backoffMs: 5e3, logMessage: "Checking for receipt" }
+    } catch (error) {
+      this.logger.warn(
+        `Unsigned GET submit failed for ${commitment}; polling response receipt before failing: ${String(error)}`
       );
     }
+    try {
+      await this.pollDeliveredReceipt(hyperbridge, commitment);
+      this.logger.info(`Confirmed Hyperbridge GET delivery for ${commitment}`);
+    } catch (error) {
+      const message2 = `Failed to deliver GET request to Hyperbridge; no response receipt found for ${commitment}: ${String(error)}`;
+      this.logger.error(message2);
+      throw new Error(message2);
+    }
+  }
+  async queryDeliveredReceipt(hyperbridge, commitment) {
+    return hyperbridge.queryResponseReceipt(commitment);
+  }
+  async pollDeliveredReceipt(hyperbridge, commitment) {
+    this.logger.info(`Polling Hyperbridge GET response receipt for ${commitment}`);
+    return retryPromise(
+      async () => {
+        const value = await this.queryDeliveredReceipt(hyperbridge, commitment);
+        if (!value) throw new Error(`GET response receipt not found for ${commitment}`);
+        return value;
+      },
+      { maxRetries: 10, backoffMs: 5e3, logMessage: `Checking GET response receipt ${commitment}` }
+    );
   }
   /**
    * Estimates the relayer fee for delivering a POST from dest to source.
@@ -16075,7 +16178,7 @@ var BidImpl = class {
     const sessionKeyAddress = this.order.session;
     const sessionKeyData = this.sessionPrivateKey ? { privateKey: this.sessionPrivateKey } : await this.ctx.sessionKeyStorage.getSessionKeyByAddress(sessionKeyAddress);
     if (!sessionKeyData) {
-      throw new Error("SessionKey not found for commitment: " + commitment);
+      throw new Error(`SessionKey not found for commitment: ${commitment}`);
     }
     const signature = await CryptoUtils.signSolverSelection(
       commitment,
@@ -16135,8 +16238,8 @@ var BidImpl = class {
   /**
    * Signs the `SelectSolver` message with the session key, appends it to the
    * solver's existing UserOp signature, and submits the UserOperation to the
-   * bundler. For same-chain orders, waits for the receipt and reads
-   * `OrderFilled` / `PartialFill` logs to determine fill status.
+   * bundler. Waits for the receipt and reads `OrderFilled` / `PartialFill`
+   * logs to determine fill status.
    *
    * @returns A {@link SelectBidResult} with the submitted UserOperation, its hash,
    *   the solver address, transaction hash, and fill status.
@@ -16176,33 +16279,31 @@ var BidImpl = class {
         { maxRetries: 5, backoffMs: 2e3, logMessage: "Fetching user operation receipt" }
       );
       txnHash = receipt.receipt.transactionHash;
-      if (this.order.source === this.order.destination) {
-        try {
-          const chainReceipt = await this.ctx.dest.client.waitForTransactionReceipt({
-            hash: txnHash,
-            confirmations: 1
-          });
-          const events = viem.parseEventLogs({
-            abi: ABI3,
-            logs: chainReceipt.logs,
-            eventName: ["OrderFilled", "PartialFill"]
-          });
-          const matched = events.find((e) => {
-            if (e.eventName === "OrderFilled")
-              return e.args.commitment.toLowerCase() === commitment.toLowerCase();
-            if (e.eventName === "PartialFill")
-              return e.args.commitment.toLowerCase() === commitment.toLowerCase();
-            return false;
-          });
-          if (matched?.eventName === "OrderFilled") {
-            fillStatus = "full";
-          } else if (matched?.eventName === "PartialFill") {
-            fillStatus = "partial";
-            filledAssets = matched.args.outputs ?? [];
-          }
-        } catch {
-          throw new Error("Failed to determine fill status from logs");
+      try {
+        const chainReceipt = await this.ctx.dest.client.waitForTransactionReceipt({
+          hash: txnHash,
+          confirmations: 1
+        });
+        const events = viem.parseEventLogs({
+          abi: ABI3,
+          logs: chainReceipt.logs,
+          eventName: ["OrderFilled", "PartialFill"]
+        });
+        const matched = events.find((e) => {
+          if (e.eventName === "OrderFilled")
+            return e.args.commitment.toLowerCase() === commitment.toLowerCase();
+          if (e.eventName === "PartialFill")
+            return e.args.commitment.toLowerCase() === commitment.toLowerCase();
+          return false;
+        });
+        if (matched?.eventName === "OrderFilled") {
+          fillStatus = "full";
+        } else if (matched?.eventName === "PartialFill") {
+          fillStatus = "partial";
+          filledAssets = matched.args.outputs ?? [];
         }
+      } catch {
+        throw new Error("Failed to determine fill status from logs");
       }
     } catch (err) {
       throw new Error(`Failed to execute bid: ${err instanceof Error ? err.message : String(err)}`);
@@ -16242,9 +16343,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.
@@ -16282,10 +16386,17 @@ var BidManager = class {
       paymasterAndData,
       signature: "0x"
     };
-    const userOpHash = CryptoUtils.computeUserOpHash(userOp, entryPointAddress, chainId);
-    const sessionKey = order.session;
-    const messageHash = viem.keccak256(viem.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 = viem.concat([order.id, solverSignature]);
     return { ...userOp, signature };
   }