@hyperbridge/sdk 1.9.3 → 1.9.5

package/dist/node/index.d.ts

@@ -638,6 +638,7 @@ declare class ChainConfigService {
     getPopularTokens(chain: string): string[];
     getIntentGatewayV2Address(chain: string): HexString;
     getEntryPointV08Address(chain: string): HexString;
+    getCirclePaymasterV08Address(chain: string): HexString | undefined;
     getHyperbridgeAddress(): string;
     /**
      * Get the LayerZero Endpoint ID for the chain
@@ -2788,6 +2789,11 @@ interface SigningAccount {
         s: HexString;
         yParity: number;
     }>;
+    /**
+     * Signs an EIP-712 typed-data payload (e.g. an EIP-2612 USDC permit for the Circle paymaster).
+     * The shape of `typedData` matches viem's `TypedDataDefinition` (domain + types + message).
+     */
+    signTypedData: (typedData: unknown, chainId?: number) => Promise<HexString>;
 }
 interface SubmitBidOptions {
     order: Order;
@@ -2804,6 +2810,12 @@ interface SubmitBidOptions {
     maxPriorityFeePerGas: bigint;
     /** Pre-built ERC-7821 calldata encoding the UserOp execution (approvals + fillOrder). */
     callData: HexString;
+    /**
+     * Optional packed paymasterAndData for EntryPoint v0.8.
+     * Must be built BEFORE calling prepareSubmitBid so the hash covers paymaster bytes.
+     * Defaults to "0x" (EntryPoint deposit pays gas).
+     */
+    paymasterAndData?: HexString;
 }
 interface EstimateFillOrderParams {
     order: Order;
@@ -2831,6 +2843,10 @@ interface FillOrderEstimate {
     callGasLimit: bigint;
     verificationGasLimit: bigint;
     preVerificationGas: bigint;
+    /** Paymaster verification gas limit from bundler estimate, or Circle's cap if absent. 0n when no paymaster. */
+    paymasterVerificationGasLimit: bigint;
+    /** Paymaster postOp gas limit from bundler estimate, or Circle's cap if absent. 0n when no paymaster. */
+    paymasterPostOpGasLimit: bigint;
     maxFeePerGas: bigint;
     maxPriorityFeePerGas: bigint;
     totalGasCostWei: bigint;
@@ -8153,6 +8169,8 @@ interface ChainConfigData {
         UniswapV4PoolManager?: `0x${string}`;
         /** Uniswap V4 StateView (canonical CREATE2 address) for pool state reads via extsload */
         UniswapV4StateView?: `0x${string}`;
+        /** Circle Paymaster v0.8 contract address (ERC-4337 onchain USDC paymaster) */
+        CirclePaymasterV08?: `0x${string}`;
     };
     rpcEnvKey?: string;
     defaultRpcUrl?: string;

package/dist/node/index.js

@@ -3744,7 +3744,8 @@ var chainConfigs = {
       UniswapV2Factory: "0x0000000000000000000000000000000000000000",
       UniswapV3Factory: "0x0000000000000000000000000000000000000000",
       Calldispatcher: "0xC7f13b6D03A0A7F3239d38897503E90553ABe155",
-      EntryPointV08: "0x4337084D9E255Ff0702461CF8895CE9E3b5Ff108"
+      EntryPointV08: "0x4337084D9E255Ff0702461CF8895CE9E3b5Ff108",
+      CirclePaymasterV08: "0x3BA9A96eE3eFf3A69E2B18886AcF52027EFF8966"
     },
     rpcEnvKey: "SEPOLIA",
     defaultRpcUrl: "https://1rpc.io/sepolia",
@@ -3778,7 +3779,7 @@ var chainConfigs = {
     addresses: {
       IntentGateway: "0x1a4ee689a004b10210a1df9f24a387ea13359acf",
       IntentGatewayV2: "0x2d61624A17f361020679FaA16fbB566C344AaF4B",
-      SolverAccount: "0xd4d594C99f23b1Fb9d65fdd9062854B1A1C5780b",
+      SolverAccount: "0x66C4459fa61E5Ca647152EEb6dA56150EE975512",
       TokenGateway: "0xFd413e3AFe560182C4471F4d143A96d3e259B6dE",
       Host: "0x792A6236AF69787C40cF76b69B4c8c7B28c4cA20",
       UniswapRouter02: "0x7a250d5630B4cF539739dF2C5dAcb4c659F2488D",
@@ -3793,6 +3794,7 @@ var chainConfigs = {
       Calldispatcher: "0xc71251c8b3e7b02697a84363eef6dce8dfbdf333",
       Permit2: "0x000000000022D473030F116dDEE9F6B43aC78BA3",
       EntryPointV08: "0x4337084D9E255Ff0702461CF8895CE9E3b5Ff108",
+      CirclePaymasterV08: "0x0578cFB241215b77442a541325d6A4E6dFE700Ec",
       Usdt0Oft: "0x6C96dE32CEa08842dcc4058c14d3aaAD7Fa41dee"
     },
     rpcEnvKey: "ETH_MAINNET",
@@ -3833,7 +3835,7 @@ var chainConfigs = {
     addresses: {
       IntentGateway: "0x1a4ee689a004b10210a1df9f24a387ea13359acf",
       IntentGatewayV2: "0x2d61624A17f361020679FaA16fbB566C344AaF4B",
-      SolverAccount: "0xd4d594C99f23b1Fb9d65fdd9062854B1A1C5780b",
+      SolverAccount: "0x66C4459fa61E5Ca647152EEb6dA56150EE975512",
       TokenGateway: "0xFd413e3AFe560182C4471F4d143A96d3e259B6dE",
       Host: "0x24B5d421Ec373FcA57325dd2F0C074009Af021F7",
       UniswapRouter02: "0x10ED43C718714eb63d5aA57B78B54704E256024E",
@@ -3890,7 +3892,7 @@ var chainConfigs = {
     addresses: {
       IntentGateway: "0x1a4ee689a004b10210a1df9f24a387ea13359acf",
       IntentGatewayV2: "0x2d61624A17f361020679FaA16fbB566C344AaF4B",
-      SolverAccount: "0xd4d594C99f23b1Fb9d65fdd9062854B1A1C5780b",
+      SolverAccount: "0x66C4459fa61E5Ca647152EEb6dA56150EE975512",
       TokenGateway: "0xFd413e3AFe560182C4471F4d143A96d3e259B6dE",
       Host: "0xE05AFD4Eb2ce6d65c40e1048381BD0Ef8b4B299e",
       UniswapRouter02: "0x4752ba5DBc23f44D87826276BF6Fd6b1C372aD24",
@@ -3905,6 +3907,7 @@ var chainConfigs = {
       Calldispatcher: "0xc71251c8b3e7b02697a84363eef6dce8dfbdf333",
       Permit2: "0x000000000022D473030F116dDEE9F6B43aC78BA3",
       EntryPointV08: "0x4337084D9E255Ff0702461CF8895CE9E3b5Ff108",
+      CirclePaymasterV08: "0x0578cFB241215b77442a541325d6A4E6dFE700Ec",
       Usdt0Oft: "0x14E4A1B13bf7F943c8ff7C51fb60FA964A298D92"
     },
     rpcEnvKey: "ARBITRUM_MAINNET",
@@ -3947,7 +3950,7 @@ var chainConfigs = {
     addresses: {
       IntentGateway: "0x1a4ee689a004b10210a1df9f24a387ea13359acf",
       IntentGatewayV2: "0x2d61624A17f361020679FaA16fbB566C344AaF4B",
-      SolverAccount: "0xd4d594C99f23b1Fb9d65fdd9062854B1A1C5780b",
+      SolverAccount: "0xb7d5Bb305Fd102C9B0a343978f3b9Accc00e9603",
       TokenGateway: "0xFd413e3AFe560182C4471F4d143A96d3e259B6dE",
       Host: "0x6FFe92e4d7a9D589549644544780e6725E84b248",
       UniswapRouter02: "0x4752ba5DBc23f44D87826276BF6Fd6b1C372aD24",
@@ -3959,6 +3962,7 @@ var chainConfigs = {
       Calldispatcher: "0xc71251c8b3e7b02697a84363eef6dce8dfbdf333",
       Permit2: "0x000000000022D473030F116dDEE9F6B43aC78BA3",
       EntryPointV08: "0x4337084D9E255Ff0702461CF8895CE9E3b5Ff108",
+      CirclePaymasterV08: "0x0578cFB241215b77442a541325d6A4E6dFE700Ec",
       AerodromeRouter: "0xcF77a3Ba9A5CA399B7c97c74d54e5b1Beb874E43",
       UniswapV4PositionManager: "0x7c5f5a4bbd8fd63184577525326123b519429bdc",
       UniswapV4PoolManager: "0x498581ff718922c3f8e6a244956af099b2652b2b",
@@ -4005,7 +4009,7 @@ var chainConfigs = {
     addresses: {
       IntentGateway: "0x1a4ee689a004b10210a1df9f24a387ea13359acf",
       IntentGatewayV2: "0x2d61624A17f361020679FaA16fbB566C344AaF4B",
-      SolverAccount: "0xd4d594C99f23b1Fb9d65fdd9062854B1A1C5780b",
+      SolverAccount: "0x66C4459fa61E5Ca647152EEb6dA56150EE975512",
       TokenGateway: "0x8b536105b6Fae2aE9199f5146D3C57Dfe53b614E",
       Host: "0xD8d3db17C1dF65b301D45C84405CcAC1395C559a",
       UniswapRouter02: "0xd2f9496824951D5237cC71245D659E48d0d5f9E8",
@@ -4020,6 +4024,7 @@ var chainConfigs = {
       Calldispatcher: "0xc71251c8b3e7b02697a84363eef6dce8dfbdf333",
       Permit2: "0x000000000022D473030F116dDEE9F6B43aC78BA3",
       EntryPointV08: "0x4337084D9E255Ff0702461CF8895CE9E3b5Ff108",
+      CirclePaymasterV08: "0x0578cFB241215b77442a541325d6A4E6dFE700Ec",
       Usdt0Oft: "0x6BA10300f0DC58B7a1e4c0e41f5daBb7D7829e13"
     },
     rpcEnvKey: "POLYGON_MAINNET",
@@ -4052,7 +4057,7 @@ var chainConfigs = {
     addresses: {
       IntentGateway: "0x1a4ee689a004b10210a1df9f24a387ea13359acf",
       IntentGatewayV2: "0x2d61624A17f361020679FaA16fbB566C344AaF4B",
-      SolverAccount: "0xd4d594C99f23b1Fb9d65fdd9062854B1A1C5780b",
+      SolverAccount: "0x66C4459fa61E5Ca647152EEb6dA56150EE975512",
       TokenGateway: "0x8b536105b6Fae2aE9199f5146D3C57Dfe53b614E",
       Host: "0x2A17C1c3616Bbc33FCe5aF5B965F166ba76cEDAf",
       UniswapRouter02: "0x284f11109359a7e1306c3e447ef14d38400063ff",
@@ -4067,6 +4072,7 @@ var chainConfigs = {
       Calldispatcher: "0xc71251c8b3e7b02697a84363eef6dce8dfbdf333",
       Permit2: "0x000000000022D473030F116dDEE9F6B43aC78BA3",
       EntryPointV08: "0x4337084D9E255Ff0702461CF8895CE9E3b5Ff108",
+      CirclePaymasterV08: "0x0578cFB241215b77442a541325d6A4E6dFE700Ec",
       Usdt0Oft: "0xc07be8994d035631c36fb4a89c918cefb2f03ec3"
     },
     rpcEnvKey: "UNICHAIN_MAINNET",
@@ -4137,6 +4143,7 @@ var chainConfigs = {
       Calldispatcher: "0x876F1891982E260026630c233A4897160A281Fb8",
       Permit2: "0x000000000022D473030F116dDEE9F6B43aC78BA3",
       EntryPointV08: "0x4337084D9E255Ff0702461CF8895CE9E3b5Ff108",
+      CirclePaymasterV08: "0x3BA9A96eE3eFf3A69E2B18886AcF52027EFF8966",
       SolverAccount: "0xCDFcFeD7A14154846808FddC8Ba971A2f8a830a3"
     },
     rpcEnvKey: "POLYGON_AMOY",
@@ -4161,7 +4168,7 @@ var chainConfigs = {
     },
     addresses: {
       IntentGatewayV2: "0x2d61624A17f361020679FaA16fbB566C344AaF4B",
-      SolverAccount: "0xd4d594C99f23b1Fb9d65fdd9062854B1A1C5780b",
+      SolverAccount: "0x66C4459fa61E5Ca647152EEb6dA56150EE975512",
       TokenGateway: "0xFd413e3AFe560182C4471F4d143A96d3e259B6dE",
       Host: "0x78c8A5F27C06757EA0e30bEa682f1FD5C8d7645d",
       UniswapRouter02: "0x4A7b5Da61326A6379179b40d00F57E5bbDC962c2",
@@ -4170,6 +4177,7 @@ var chainConfigs = {
       Calldispatcher: "0xC71251c8b3e7B02697A84363Eef6DcE8DfBdF333",
       Permit2: "0x000000000022D473030F116dDEE9F6B43aC78BA3",
       EntryPointV08: "0x4337084D9E255Ff0702461CF8895CE9E3b5Ff108",
+      CirclePaymasterV08: "0x0578cFB241215b77442a541325d6A4E6dFE700Ec",
       UniswapV4PositionManager: "0x3c3ea4b57a46241e54610e5f022e5c45859a1017",
       UniswapV4PoolManager: "0x9a13f98cb987694c9f086b1f5eb990eea8264ec3"
     },
@@ -4253,7 +4261,8 @@ var chainConfigs = {
     addresses: {
       TokenGateway: "0xFcDa26cA021d5535C3059547390E6cCd8De7acA6",
       Host: "0x3435bD7e5895356535459D6087D1eB982DAd90e7",
-      EntryPointV08: "0x4337084D9E255Ff0702461CF8895CE9E3b5Ff108"
+      EntryPointV08: "0x4337084D9E255Ff0702461CF8895CE9E3b5Ff108",
+      CirclePaymasterV08: "0x3BA9A96eE3eFf3A69E2B18886AcF52027EFF8966"
     },
     defaultRpcUrl: "https://sepolia-rollup.arbitrum.io/rpc",
     consensusStateId: "ETH0",
@@ -4277,7 +4286,8 @@ var chainConfigs = {
     addresses: {
       TokenGateway: "0xFcDa26cA021d5535C3059547390E6cCd8De7acA6",
       Host: "0x6d51b678836d8060d980605d2999eF211809f3C2",
-      EntryPointV08: "0x4337084D9E255Ff0702461CF8895CE9E3b5Ff108"
+      EntryPointV08: "0x4337084D9E255Ff0702461CF8895CE9E3b5Ff108",
+      CirclePaymasterV08: "0x3BA9A96eE3eFf3A69E2B18886AcF52027EFF8966"
     },
     defaultRpcUrl: "https://sepolia.optimism.io",
     consensusStateId: "ETH0",
@@ -4301,7 +4311,8 @@ var chainConfigs = {
     addresses: {
       TokenGateway: "0xFcDa26cA021d5535C3059547390E6cCd8De7acA6",
       Host: "0xD198c01839dd4843918617AfD1e4DDf44Cc3BB4a",
-      EntryPointV08: "0x4337084D9E255Ff0702461CF8895CE9E3b5Ff108"
+      EntryPointV08: "0x4337084D9E255Ff0702461CF8895CE9E3b5Ff108",
+      CirclePaymasterV08: "0x3BA9A96eE3eFf3A69E2B18886AcF52027EFF8966"
     },
     defaultRpcUrl: "https://sepolia.base.org",
     consensusStateId: "ETH0",
@@ -4485,6 +4496,9 @@ var ChainConfigService = class {
   getEntryPointV08Address(chain) {
     return this.getConfig(chain)?.addresses.EntryPointV08;
   }
+  getCirclePaymasterV08Address(chain) {
+    return this.getConfig(chain)?.addresses.CirclePaymasterV08;
+  }
   getHyperbridgeAddress() {
     return hyperbridgeAddress;
   }
@@ -12801,8 +12815,11 @@ var CryptoUtils = class {
     const factory = hasFactory ? `0x${userOp.initCode.slice(2, 42)}` : void 0;
     const factoryData = hasFactory ? `0x${userOp.initCode.slice(42)}` : void 0;
     const hasPaymaster = userOp.paymasterAndData && userOp.paymasterAndData !== "0x" && userOp.paymasterAndData.length > 2;
-    const paymaster = hasPaymaster ? `0x${userOp.paymasterAndData.slice(2, 42)}` : void 0;
-    const paymasterData = hasPaymaster ? `0x${userOp.paymasterAndData.slice(42)}` : void 0;
+    const pmHex = hasPaymaster ? userOp.paymasterAndData.slice(2) : "";
+    const paymaster = hasPaymaster ? `0x${pmHex.slice(0, 40)}` : void 0;
+    const paymasterVerificationGasLimit = hasPaymaster ? BigInt(`0x${pmHex.slice(40, 72)}`) : void 0;
+    const paymasterPostOpGasLimit = hasPaymaster ? BigInt(`0x${pmHex.slice(72, 104)}`) : void 0;
+    const paymasterData = hasPaymaster ? `0x${pmHex.slice(104)}` : void 0;
     const userOpBundler = {
       sender: userOp.sender,
       nonce: toHex(userOp.nonce),
@@ -12821,8 +12838,8 @@ var CryptoUtils = class {
     if (paymaster) {
       userOpBundler.paymaster = paymaster;
       userOpBundler.paymasterData = paymasterData || "0x";
-      userOpBundler.paymasterVerificationGasLimit = toHex(50000n);
-      userOpBundler.paymasterPostOpGasLimit = toHex(50000n);
+      userOpBundler.paymasterVerificationGasLimit = toHex(paymasterVerificationGasLimit);
+      userOpBundler.paymasterPostOpGasLimit = toHex(paymasterPostOpGasLimit);
     }
     return userOpBundler;
   }
@@ -15419,7 +15436,7 @@ var OrderExecutor = class {
   async *executeOrder(options) {
     const { order, sessionPrivateKey, auctionTimeMs, pollIntervalMs = DEFAULT_POLL_INTERVAL, solver } = options;
     const commitment = order.id;
-    const isSameChain = order.source === order.destination;
+    order.source === order.destination;
     if (!this.ctx.intentsCoprocessor) {
       yield { status: "FAILED", error: "IntentsCoprocessor required for order execution" };
       return;
@@ -15448,10 +15465,15 @@ var OrderExecutor = class {
     });
     const deadlineTimeout = this.deadlineStream(order.deadline, commitment);
     const combined = mergeRace(deadlineTimeout, executionStream);
-    for await (const update of combined) {
-      yield update;
-      if (update.status === "EXPIRED" || update.status === "FILLED") return;
-      if (update.status === "BID_SELECTED" && !isSameChain) return;
+    try {
+      for await (const update of combined) {
+        yield update;
+        if (update.status === "EXPIRED" || update.status === "FILLED") return;
+      }
+    } finally {
+      console.log(`[OrderExecutor] Tearing down streams for commitment=${commitment}`);
+      await executionStream.return(void 0);
+      await deadlineTimeout.return(void 0);
     }
   }
   /**
@@ -15472,6 +15494,12 @@ var OrderExecutor = class {
       targetAssets
     } = params;
     let { totalFilledAssets, remainingAssets } = params;
+    const MAX_BID_ATTEMPTS = 2;
+    const bidFailCounts = /* @__PURE__ */ new Map();
+    const isFreshBid = (bid) => {
+      const key = userOpHashKey(bid.userOp);
+      return !usedUserOps.has(key) && (bidFailCounts.get(key) ?? 0) < MAX_BID_ATTEMPTS;
+    };
     const solverLockStartTime = Date.now();
     yield { status: "AWAITING_BIDS", commitment, totalFilledAssets, remainingAssets };
     try {
@@ -15499,7 +15527,7 @@ var OrderExecutor = class {
         let freshBids;
         try {
           const bids = await this.fetchBids({ commitment, solver, solverLockStartTime });
-          freshBids = bids.filter((bid) => !usedUserOps.has(userOpHashKey(bid.userOp)));
+          freshBids = bids.filter(isFreshBid);
         } catch {
           await sleep(pollIntervalMs);
           continue;
@@ -15527,6 +15555,14 @@ var OrderExecutor = class {
             remainingAssets,
             error: `Failed to select bid and submit: ${err instanceof Error ? err.message : String(err)}`
           };
+          try {
+            const sorted = await this.bidManager.validateAndSortBids(freshBids, order);
+            if (sorted.length > 0) {
+              const key = userOpHashKey(sorted[0].bid.userOp);
+              bidFailCounts.set(key, (bidFailCounts.get(key) ?? 0) + 1);
+            }
+          } catch {
+          }
           await sleep(pollIntervalMs);
           continue;
         }
@@ -16065,7 +16101,8 @@ var BidManager = class {
       preVerificationGas,
       maxFeePerGas,
       maxPriorityFeePerGas,
-      callData
+      callData,
+      paymasterAndData = "0x"
     } = options;
     const chainId = BigInt(
       this.ctx.dest.client.chain?.id ?? Number.parseInt(this.ctx.dest.config.stateMachineId.split("-")[1])
@@ -16080,7 +16117,7 @@ var BidManager = class {
       accountGasLimits,
       preVerificationGas,
       gasFees,
-      paymasterAndData: "0x",
+      paymasterAndData,
       signature: "0x"
     };
     const userOpHash = this.crypto.computeUserOpHash(userOp, entryPointAddress, chainId);
@@ -18206,6 +18243,8 @@ var GasEstimator = class {
     let callGasLimit = 500000n;
     let verificationGasLimit = 100000n;
     let preVerificationGas = 100000n;
+    let paymasterVerificationGasLimit = 0n;
+    let paymasterPostOpGasLimit = 0n;
     if (this.ctx.bundlerUrl) {
       try {
         const callData = this.crypto.encodeERC7821Execute([
@@ -18293,6 +18332,12 @@ var GasEstimator = class {
         callGasLimit = BigInt(gasEstimate.callGasLimit) * 160n / 100n;
         verificationGasLimit = BigInt(gasEstimate.verificationGasLimit) * 105n / 100n;
         preVerificationGas = BigInt(gasEstimate.preVerificationGas) * 105n / 100n;
+        if (gasEstimate.paymasterVerificationGasLimit) {
+          paymasterVerificationGasLimit = BigInt(gasEstimate.paymasterVerificationGasLimit) * 105n / 100n;
+        }
+        if (gasEstimate.paymasterPostOpGasLimit) {
+          paymasterPostOpGasLimit = BigInt(gasEstimate.paymasterPostOpGasLimit) * 105n / 100n;
+        }
         if (pimlicoGasPrices) {
           const level = pimlicoGasPrices.fast ?? pimlicoGasPrices.standard ?? pimlicoGasPrices.slow ?? null;
           if (level) {
@@ -18329,7 +18374,7 @@ var GasEstimator = class {
         console.warn("fillOrder gas estimation failed, using fallback:", e);
       }
     }
-    const totalGas = callGasLimit + verificationGasLimit + preVerificationGas;
+    const totalGas = callGasLimit + verificationGasLimit + preVerificationGas + paymasterVerificationGasLimit + paymasterPostOpGasLimit;
     const rawTotalGasCostWei = totalGas * maxFeePerGas;
     const totalGasInDestFeeToken = await convertGasToFeeToken(
       this.ctx,
@@ -18344,6 +18389,8 @@ var GasEstimator = class {
       callGasLimit,
       verificationGasLimit,
       preVerificationGas,
+      paymasterVerificationGasLimit,
+      paymasterPostOpGasLimit,
       maxFeePerGas,
       maxPriorityFeePerGas,
       totalGasCostWei,