@hyperbridge/sdk 1.8.6-rc.1 → 1.8.8

package/dist/node/index.d.ts

@@ -617,11 +617,15 @@ declare class ChainConfigService {
     getHyperbridgeChainId(): number;
     getRpcUrl(chain: string): string;
     getUniswapRouterV2Address(chain: string): HexString;
+    getAerodromeRouterAddress(chain: string): HexString;
     getUniswapV2FactoryAddress(chain: string): HexString;
     getUniswapV3FactoryAddress(chain: string): HexString;
     getUniversalRouterAddress(chain: string): HexString;
     getUniswapV3QuoterAddress(chain: string): HexString;
     getUniswapV4QuoterAddress(chain: string): HexString;
+    getUniswapV4PositionManagerAddress(chain: string): HexString;
+    getUniswapV4PoolManagerAddress(chain: string): HexString;
+    getUniswapV4StateViewAddress(chain: string): HexString;
     getPermit2Address(chain: string): HexString;
     getSolverAccountAddress(chain: string): HexString | undefined;
     getCoingeckoId(chain: string): string | undefined;
@@ -2803,6 +2807,12 @@ interface SubmitBidOptions {
 }
 interface EstimateFillOrderParams {
     order: Order;
+    /**
+     * Optional ERC-7821 calls to prepend before the fillOrder call in the
+     * simulated UserOp. Used for funding calls (e.g. LP withdrawal) so the
+     * bundler estimates gas for the complete atomic batch.
+     */
+    prependCalls?: ERC7821Call[];
     /**
      * Optional percentage to bump maxPriorityFeePerGas.
      * This is added on top of the base gasPrice.
@@ -2893,7 +2903,7 @@ declare const IntentOrderStatus: Readonly<{
     USEROP_SUBMITTED: "USEROP_SUBMITTED";
     FILLED: "FILLED";
     PARTIAL_FILL: "PARTIAL_FILL";
-    PARTIAL_FILL_EXHAUSTED: "PARTIAL_FILL_EXHAUSTED";
+    EXPIRED: "EXPIRED";
     FAILED: "FAILED";
 }>;
 type IntentOrderStatus = typeof IntentOrderStatus;
@@ -2949,7 +2959,7 @@ type IntentOrderStatusUpdate = {
     totalFilledAssets: TokenInfo[];
     remainingAssets: TokenInfo[];
 } | {
-    status: "PARTIAL_FILL_EXHAUSTED";
+    status: "EXPIRED";
     commitment: HexString;
     totalFilledAssets?: TokenInfo[];
     remainingAssets?: TokenInfo[];
@@ -3762,6 +3772,8 @@ declare const BundlerMethod: {
     readonly ETH_ESTIMATE_USER_OPERATION_GAS: "eth_estimateUserOperationGas";
     /** Pimlico-specific method to fetch recommended EIP-1559 gas prices for UserOperations. */
     readonly PIMLICO_GET_USER_OPERATION_GAS_PRICE: "pimlico_getUserOperationGasPrice";
+    /** Alchemy (Rundler) method to fetch recommended priority fee for UserOperations. */
+    readonly RUNDLER_MAX_PRIORITY_FEE_PER_GAS: "rundler_maxPriorityFeePerGas";
 };
 /** Union of all valid bundler RPC method name strings. */
 type BundlerMethod = (typeof BundlerMethod)[keyof typeof BundlerMethod];
@@ -8096,6 +8108,14 @@ interface ChainConfigData {
         Usdt0Oft?: `0x${string}`;
         /** SolverAccount contract address used for EIP-7702 delegation */
         SolverAccount?: `0x${string}`;
+        /** Aerodrome (Solidly-style) router for LP removal / swaps on chains where Aerodrome is deployed */
+        AerodromeRouter?: `0x${string}`;
+        /** Uniswap V4 PositionManager (canonical CREATE2 address) for LP position management */
+        UniswapV4PositionManager?: `0x${string}`;
+        /** Uniswap V4 PoolManager (canonical CREATE2 address) for pool state reads via extsload */
+        UniswapV4PoolManager?: `0x${string}`;
+        /** Uniswap V4 StateView (canonical CREATE2 address) for pool state reads via extsload */
+        UniswapV4StateView?: `0x${string}`;
     };
     rpcEnvKey?: string;
     defaultRpcUrl?: string;

package/dist/node/index.js

@@ -559,7 +559,7 @@ var IntentOrderStatus = Object.freeze({
   USEROP_SUBMITTED: "USEROP_SUBMITTED",
   FILLED: "FILLED",
   PARTIAL_FILL: "PARTIAL_FILL",
-  PARTIAL_FILL_EXHAUSTED: "PARTIAL_FILL_EXHAUSTED",
+  EXPIRED: "EXPIRED",
   FAILED: "FAILED"
 });
 
@@ -3787,6 +3787,9 @@ var chainConfigs = {
       UniversalRouter: "0x66a9893cc07d91d95644aedd05d03f95e1dba8af",
       UniswapV3Quoter: "0x61fFE014bA17989E743c5F6cB21bF9697530B21e",
       UniswapV4Quoter: "0x52f0e24d1c21c8a0cb1e5a5dd6198556bd9e1203",
+      UniswapV4PositionManager: "0xbd216513d74c8cf14cf4747e6aaa6420ff64ee9e",
+      UniswapV4PoolManager: "0x000000000004444c5dc75cB358380D2e3dE08A90",
+      UniswapV4StateView: "0x7ffe42c4a5deea5b0fec41c94c136cf115597227",
       Calldispatcher: "0xc71251c8b3e7b02697a84363eef6dce8dfbdf333",
       Permit2: "0x000000000022D473030F116dDEE9F6B43aC78BA3",
       EntryPointV08: "0x4337084D9E255Ff0702461CF8895CE9E3b5Ff108",
@@ -3839,6 +3842,9 @@ var chainConfigs = {
       UniversalRouter: "0xd9C500DfF816a1Da21A48A732d3498Bf09dc9AEB",
       UniswapV3Quoter: "0xB048Bbc1Ee6b733FFfCFb9e9CeF7375518e25997",
       UniswapV4Quoter: "0xd0737C9762912dD34c3271197E362Aa736Df0926",
+      UniswapV4PositionManager: "0x7a4a5c919ae2541aed11041a1aeee68f1287f95b",
+      UniswapV4PoolManager: "0x28e2ea090877bf75740558f6bfb36a5ffee9e9df",
+      UniswapV4StateView: "0xd13dd3d6e93f276fafc9db9e6bb47c1180aee0c4",
       Calldispatcher: "0xc71251c8b3e7b02697a84363eef6dce8dfbdf333",
       Permit2: "0x000000000022D473030F116dDEE9F6B43aC78BA3",
       EntryPointV08: "0x4337084D9E255Ff0702461CF8895CE9E3b5Ff108"
@@ -3893,6 +3899,9 @@ var chainConfigs = {
       UniversalRouter: "0xa51afafe0263b40edaef0df8781ea9aa03e381a3",
       UniswapV3Quoter: "0x61fFE014bA17989E743c5F6cB21bF9697530B21e",
       UniswapV4Quoter: "0x3972c00f7ed4885e145823eb7c655375d275a1c5",
+      UniswapV4PositionManager: "0xd88f38f930b7952f2db2432cb002e7abbf3dd869",
+      UniswapV4PoolManager: "0x360e68faccca8ca495c1b759fd9eee466db9fb32",
+      UniswapV4StateView: "0x76fd297e2d437cd7f76d50f01afe6160f86e9990",
       Calldispatcher: "0xc71251c8b3e7b02697a84363eef6dce8dfbdf333",
       Permit2: "0x000000000022D473030F116dDEE9F6B43aC78BA3",
       EntryPointV08: "0x4337084D9E255Ff0702461CF8895CE9E3b5Ff108",
@@ -3949,7 +3958,11 @@ var chainConfigs = {
       UniswapV4Quoter: "0x0d5e0f971ed27fbff6c2837bf31316121532048d",
       Calldispatcher: "0xc71251c8b3e7b02697a84363eef6dce8dfbdf333",
       Permit2: "0x000000000022D473030F116dDEE9F6B43aC78BA3",
-      EntryPointV08: "0x4337084D9E255Ff0702461CF8895CE9E3b5Ff108"
+      EntryPointV08: "0x4337084D9E255Ff0702461CF8895CE9E3b5Ff108",
+      AerodromeRouter: "0xcF77a3Ba9A5CA399B7c97c74d54e5b1Beb874E43",
+      UniswapV4PositionManager: "0x7c5f5a4bbd8fd63184577525326123b519429bdc",
+      UniswapV4PoolManager: "0x498581ff718922c3f8e6a244956af099b2652b2b",
+      UniswapV4StateView: "0xa3c0c9b65bad0b08107aa264b0f3db444b867a71"
       // Usdt0Oft: Not available on Base
     },
     rpcEnvKey: "BASE_MAINNET",
@@ -4001,6 +4014,9 @@ var chainConfigs = {
       UniversalRouter: "0x1095692a6237d83c6a72f3f5efedb9a670c49223",
       UniswapV3Quoter: "0x61fFE014bA17989E743c5F6cB21bF9697530B21e",
       UniswapV4Quoter: "0xb3d5c3dfc3a7aebff71895a7191796bffc2c81b9",
+      UniswapV4PositionManager: "0x1ec2ebf4f37e7363fdfe3551602425af0b3ceef9",
+      UniswapV4PoolManager: "0x67366782805870060151383f4bbff9dab53e5cd6",
+      UniswapV4StateView: "0x5ea1bd7974c8a611cbab0bdcafcb1d9cc9b3ba5a",
       Calldispatcher: "0xc71251c8b3e7b02697a84363eef6dce8dfbdf333",
       Permit2: "0x000000000022D473030F116dDEE9F6B43aC78BA3",
       EntryPointV08: "0x4337084D9E255Ff0702461CF8895CE9E3b5Ff108",
@@ -4045,6 +4061,9 @@ var chainConfigs = {
       UniversalRouter: "0xef740bf23acae26f6492b10de645d6b98dc8eaf3",
       UniswapV3Quoter: "0x385a5cf5f83e99f7bb2852b6a19c3538b9fa7658",
       UniswapV4Quoter: "0x52f0e24d1c21c8a0cb1e5a5dd6198556bd9e1203",
+      UniswapV4PositionManager: "0x4529a01c7a0410167c5740c487a8de60232617bf",
+      UniswapV4PoolManager: "0x1f98400000000000000000000000000000000004",
+      UniswapV4StateView: "0x86e8631a016f9068c3f085faf484ee3f5fdee8f2",
       Calldispatcher: "0xc71251c8b3e7b02697a84363eef6dce8dfbdf333",
       Permit2: "0x000000000022D473030F116dDEE9F6B43aC78BA3",
       EntryPointV08: "0x4337084D9E255Ff0702461CF8895CE9E3b5Ff108",
@@ -4150,7 +4169,9 @@ var chainConfigs = {
       UniswapV3Factory: "0x1F98431c8aD98523631AE4a59f267346ea31F984",
       Calldispatcher: "0xC71251c8b3e7B02697A84363Eef6DcE8DfBdF333",
       Permit2: "0x000000000022D473030F116dDEE9F6B43aC78BA3",
-      EntryPointV08: "0x4337084D9E255Ff0702461CF8895CE9E3b5Ff108"
+      EntryPointV08: "0x4337084D9E255Ff0702461CF8895CE9E3b5Ff108",
+      UniswapV4PositionManager: "0x3c3ea4b57a46241e54610e5f022e5c45859a1017",
+      UniswapV4PoolManager: "0x9a13f98cb987694c9f086b1f5eb990eea8264ec3"
     },
     defaultRpcUrl: "https://mainnet.optimism.io",
     consensusStateId: "ETH0",
@@ -4206,7 +4227,9 @@ var chainConfigs = {
     addresses: {
       TokenGateway: "0xCe304770236f39F9911BfCC51afBdfF3b8635718",
       Host: "0x7F0165140D0f3251c8f6465e94E9d12C7FD40711",
-      EntryPointV08: "0x4337084D9E255Ff0702461CF8895CE9E3b5Ff108"
+      EntryPointV08: "0x4337084D9E255Ff0702461CF8895CE9E3b5Ff108",
+      UniswapV4PositionManager: "0x1b35d13a2e2528f192637f14b05f0dc0e7deb566",
+      UniswapV4PoolManager: "0x360e68faccca8ca495c1b759fd9eee466db9fb32"
     },
     defaultRpcUrl: "https://rpc.soneium.org",
     consensusStateId: "ETH0",
@@ -4400,6 +4423,9 @@ var ChainConfigService = class {
   getUniswapRouterV2Address(chain) {
     return this.getConfig(chain)?.addresses.UniswapRouter02 ?? "0x";
   }
+  getAerodromeRouterAddress(chain) {
+    return this.getConfig(chain)?.addresses.AerodromeRouter ?? "0x";
+  }
   getUniswapV2FactoryAddress(chain) {
     return this.getConfig(chain)?.addresses.UniswapV2Factory ?? "0x";
   }
@@ -4415,6 +4441,15 @@ var ChainConfigService = class {
   getUniswapV4QuoterAddress(chain) {
     return this.getConfig(chain)?.addresses.UniswapV4Quoter ?? "0x";
   }
+  getUniswapV4PositionManagerAddress(chain) {
+    return this.getConfig(chain)?.addresses.UniswapV4PositionManager ?? "0x";
+  }
+  getUniswapV4PoolManagerAddress(chain) {
+    return this.getConfig(chain)?.addresses.UniswapV4PoolManager ?? "0x";
+  }
+  getUniswapV4StateViewAddress(chain) {
+    return this.getConfig(chain)?.addresses.UniswapV4StateView ?? "0x";
+  }
   getPermit2Address(chain) {
     return this.getConfig(chain)?.addresses.Permit2 ?? "0x";
   }
@@ -7604,14 +7639,21 @@ var PolkadotHubChain = class _PolkadotHubChain {
         childKeysHex,
         blockHash
       ]);
+      const childNodes = childRead.proof.map((p) => hexToBytes(p));
       storageProofEncoded.set(
         addr20,
-        childRead.proof.map((p) => hexToBytes(p))
+        childNodes
       );
     }
+    const storageEntries = Array.from(storageProofEncoded.entries());
+    const contractProofForEnc = mainProofBytes.map((b) => Array.from(b));
+    const storageProofForEnc = storageEntries.map(([k, nodes]) => [
+      Array.from(k),
+      nodes.map((n) => Array.from(n))
+    ]);
     const encoded = EvmStateProof.enc({
-      contractProof: mainProofBytes,
-      storageProof: Array.from(storageProofEncoded.entries())
+      contractProof: contractProofForEnc,
+      storageProof: storageProofForEnc
     });
     return bytesToHex(encoded);
   }
@@ -12564,7 +12606,9 @@ var BundlerMethod = {
   /** Estimates gas limits for a UserOperation before submission. */
   ETH_ESTIMATE_USER_OPERATION_GAS: "eth_estimateUserOperationGas",
   /** Pimlico-specific method to fetch recommended EIP-1559 gas prices for UserOperations. */
-  PIMLICO_GET_USER_OPERATION_GAS_PRICE: "pimlico_getUserOperationGasPrice"
+  PIMLICO_GET_USER_OPERATION_GAS_PRICE: "pimlico_getUserOperationGasPrice",
+  /** Alchemy (Rundler) method to fetch recommended priority fee for UserOperations. */
+  RUNDLER_MAX_PRIORITY_FEE_PER_GAS: "rundler_maxPriorityFeePerGas"
 };
 
 // src/protocols/intents/CryptoUtils.ts
@@ -15225,10 +15269,11 @@ var OrderExecutor = class {
    *
    * **Status progression (same-chain orders):**
    * `AWAITING_BIDS` → `BIDS_RECEIVED` → `BID_SELECTED` → `USEROP_SUBMITTED`
-   * → (`FILLED` | `PARTIAL_FILL`)* → (`FILLED` | `PARTIAL_FILL_EXHAUSTED`)
+   * → (`FILLED` | `PARTIAL_FILL`)* → (`FILLED` | `EXPIRED`)
    *
-   * **Error statuses:** `FAILED` (fatal, no fills) or `PARTIAL_FILL_EXHAUSTED`
-   * (deadline reached or no new bids after at least one partial fill).
+   * **Error statuses:** `FAILED` (retryable error during bid selection/submission,
+   * triggers automatic retry) or `EXPIRED` (deadline reached or no new bids —
+   * terminal, no further retries).
    *
    * @param options - Execution parameters including the placed order, its
    *   session private key, bid collection settings, and poll interval.
@@ -15281,19 +15326,14 @@ var OrderExecutor = class {
       while (true) {
         const currentBlock = await this.ctx.dest.client.getBlockNumber();
         if (currentBlock >= order.deadline) {
-          const isPartiallyFilled = totalFilledAssets.some((a) => a.amount > 0n);
           const deadlineError = `Order deadline reached (block ${currentBlock} >= ${order.deadline})`;
-          if (isPartiallyFilled) {
-            yield {
-              status: "PARTIAL_FILL_EXHAUSTED",
-              commitment,
-              totalFilledAssets,
-              remainingAssets,
-              error: deadlineError
-            };
-          } else {
-            yield { status: "FAILED", commitment, error: deadlineError };
-          }
+          yield {
+            status: "EXPIRED",
+            commitment,
+            totalFilledAssets,
+            remainingAssets,
+            error: deadlineError
+          };
           return;
         }
         yield { status: "AWAITING_BIDS", commitment, totalFilledAssets, remainingAssets };
@@ -15323,20 +15363,16 @@ var OrderExecutor = class {
           return !usedUserOps.has(key);
         });
         if (freshBids.length === 0) {
-          const isPartiallyFilled = totalFilledAssets.some((a) => a.amount > 0n);
           const solverClause = solver && !solverLockExpired ? ` for requested solver ${solver.address}` : "";
+          const isPartiallyFilled = totalFilledAssets.some((a) => a.amount > 0n);
           const noBidsError = isPartiallyFilled ? `No new bids${solverClause} after partial fill` : `No new bids${solverClause} available within ${bidTimeoutMs}ms timeout`;
-          if (isPartiallyFilled) {
-            yield {
-              status: "PARTIAL_FILL_EXHAUSTED",
-              commitment,
-              totalFilledAssets,
-              remainingAssets,
-              error: noBidsError
-            };
-          } else {
-            yield { status: "FAILED", commitment, error: noBidsError };
-          }
+          yield {
+            status: "EXPIRED",
+            commitment,
+            totalFilledAssets,
+            remainingAssets,
+            error: noBidsError
+          };
           return;
         }
         yield { status: "BIDS_RECEIVED", commitment, bidCount: freshBids.length, bids: freshBids };
@@ -15351,7 +15387,8 @@ var OrderExecutor = class {
             remainingAssets,
             error: `Failed to select bid and submit: ${err instanceof Error ? err.message : String(err)}`
           };
-          return;
+          await sleep(pollIntervalMs);
+          continue;
         }
         const usedKey = userOpHashKey(result.userOp);
         usedUserOps.add(usedKey);
@@ -15396,7 +15433,10 @@ var OrderExecutor = class {
           remainingAssets = targetAssets.map((target) => {
             const filled = totalFilledAssets.find((a) => a.token === target.token);
             const filledAmt = filled?.amount ?? 0n;
-            return { token: target.token, amount: filledAmt >= target.amount ? 0n : target.amount - filledAmt };
+            return {
+              token: target.token,
+              amount: filledAmt >= target.amount ? 0n : target.amount - filledAmt
+            };
           });
           const fullyFilled = remainingAssets.every((a) => a.amount === 0n);
           if (fullyFilled) {
@@ -18022,11 +18062,13 @@ var GasEstimator = class {
     const entryPointAddress = this.ctx.dest.configService.getEntryPointV08Address(destStateMachineId);
     const chainId = BigInt(Number.parseInt(destStateMachineId.split("-")[1]));
     const totalEthValue = order.output.assets.filter((output) => bytes32ToBytes20(output.token) === ADDRESS_ZERO2).reduce((sum, output) => sum + output.amount, 0n);
-    const [sourceFeeToken, destFeeToken, gasPrice] = await Promise.all([
+    const [sourceFeeToken, destFeeToken, gasPrice, latestBlock] = await Promise.all([
       getFeeToken(this.ctx, this.ctx.source.config.stateMachineId, this.ctx.source),
       getFeeToken(this.ctx, this.ctx.dest.config.stateMachineId, this.ctx.dest),
-      this.ctx.dest.client.getGasPrice()
+      this.ctx.dest.client.getGasPrice(),
+      this.ctx.dest.client.getBlock({ blockTag: "latest" })
     ]);
+    const baseFeePerGas = latestBlock.baseFeePerGas ?? gasPrice;
     const feeTokenAsBytes32 = bytes20ToBytes32(destFeeToken.address);
     const assetsForOverrides = [...order.output.assets];
     if (!assetsForOverrides.some((asset) => asset.token.toLowerCase() === feeTokenAsBytes32.toLowerCase())) {
@@ -18074,6 +18116,7 @@ var GasEstimator = class {
     if (this.ctx.bundlerUrl) {
       try {
         const callData = this.crypto.encodeERC7821Execute([
+          ...params.prependCalls ?? [],
           { target: intentGatewayV2Address, value: totalNativeValue, data: fillOrderCalldata }
         ]);
         const accountGasLimits = this.crypto.packGasLimits(100000n, callGasLimit);
@@ -18115,7 +18158,9 @@ var GasEstimator = class {
           sessionSignature
         ]);
         const bundlerUserOp = this.crypto.prepareBundlerCall(preliminaryUserOp);
-        const isPimlico = this.ctx.bundlerUrl.toLowerCase().includes("pimlico.io");
+        const bundlerUrlLower = this.ctx.bundlerUrl.toLowerCase();
+        const isPimlico = bundlerUrlLower.includes("pimlico.io");
+        const isAlchemy = bundlerUrlLower.includes("alchemy.com");
         const bundlerRequests = [
           {
             method: BundlerMethod.ETH_ESTIMATE_USER_OPERATION_GAS,
@@ -18128,14 +18173,24 @@ var GasEstimator = class {
             params: []
           });
         }
+        if (isAlchemy) {
+          bundlerRequests.push({
+            method: BundlerMethod.RUNDLER_MAX_PRIORITY_FEE_PER_GAS,
+            params: []
+          });
+        }
         let gasEstimate;
         let pimlicoGasPrices = null;
+        let alchemyMaxPriorityFee = null;
         try {
           const batchResults = await this.crypto.sendBundlerBatch(bundlerRequests);
           gasEstimate = batchResults[0];
           if (isPimlico && batchResults.length > 1) {
             pimlicoGasPrices = batchResults[1];
           }
+          if (isAlchemy && batchResults.length > 1) {
+            alchemyMaxPriorityFee = batchResults[1];
+          }
         } catch {
           gasEstimate = await this.crypto.sendBundler(
             BundlerMethod.ETH_ESTIMATE_USER_OPERATION_GAS,
@@ -18154,6 +18209,14 @@ var GasEstimator = class {
             maxPriorityFeePerGas = pimMaxPriorityFeePerGas + pimMaxPriorityFeePerGas * BigInt(priorityFeeBumpPercent) / 100n;
           }
         }
+        if (alchemyMaxPriorityFee) {
+          const rundlerPriorityFee = BigInt(alchemyMaxPriorityFee);
+          const isArbitrum = chainId === 42161n;
+          const alchemyPrioBump = isArbitrum ? 0n : 25n;
+          maxPriorityFeePerGas = rundlerPriorityFee + rundlerPriorityFee * alchemyPrioBump / 100n;
+          const bufferedBaseFee = baseFeePerGas + baseFeePerGas * 50n / 100n;
+          maxFeePerGas = bufferedBaseFee + maxPriorityFeePerGas;
+        }
       } catch (e) {
         console.warn("Bundler gas estimation failed, using fallback values:", e);
       }