@hyperbridge/sdk 2.8.8 → 2.8.11

package/dist/node/intents-helpers.js

@@ -1,7 +1,7 @@
 import { keccak256, toHex, encodeAbiParameters, encodeFunctionData, decodeFunctionData, decodeAbiParameters, numberToBytes, bytesToBigInt, recoverAddress, parseAbiParameters, concat, encodePacked, pad } from 'viem';
 import '@polkadot/api';
-import { hexToU8a, u8aToHex, stringToU8a, isHex, u8aToString } from '@polkadot/util';
-import '@polkadot/util-crypto';
+import { u8aToHex, u8aConcat, hexToU8a, stringToU8a, isHex, u8aToString } from '@polkadot/util';
+import { xxhashAsU8a } from '@polkadot/util-crypto';
 import { Struct, Vector, u8, Bytes } from 'scale-ts';
 import 'p-queue';
 import { privateKeyToAccount } from 'viem/accounts';
@@ -71,7 +71,7 @@ var ABI2 = [
     type: "constructor",
     inputs: [
       {
-        name: "admin",
+        name: "owner",
         type: "address",
         internalType: "address"
       }
@@ -146,25 +146,6 @@ var ABI2 = [
     ],
     stateMutability: "view"
   },
-  {
-    type: "function",
-    name: "_instances",
-    inputs: [
-      {
-        name: "",
-        type: "bytes32",
-        internalType: "bytes32"
-      }
-    ],
-    outputs: [
-      {
-        name: "",
-        type: "address",
-        internalType: "address"
-      }
-    ],
-    stateMutability: "view"
-  },
   {
     type: "function",
     name: "_nonce",
@@ -202,6 +183,19 @@ var ABI2 = [
     ],
     stateMutability: "view"
   },
+  {
+    type: "function",
+    name: "_owner",
+    inputs: [],
+    outputs: [
+      {
+        name: "",
+        type: "address",
+        internalType: "address"
+      }
+    ],
+    stateMutability: "view"
+  },
   {
     type: "function",
     name: "_partialFills",
@@ -576,6 +570,11 @@ var ABI2 = [
             type: "uint256",
             internalType: "uint256"
           },
+          {
+            name: "validUntil",
+            type: "uint256",
+            internalType: "uint256"
+          },
           {
             name: "outputs",
             type: "tuple[]",
@@ -612,6 +611,61 @@ var ABI2 = [
     ],
     stateMutability: "view"
   },
+  {
+    type: "function",
+    name: "initialize",
+    inputs: [
+      {
+        name: "p",
+        type: "tuple",
+        internalType: "struct Params",
+        components: [
+          {
+            name: "host",
+            type: "address",
+            internalType: "address"
+          },
+          {
+            name: "dispatcher",
+            type: "address",
+            internalType: "address"
+          },
+          {
+            name: "solverSelection",
+            type: "bool",
+            internalType: "bool"
+          },
+          {
+            name: "surplusShareBps",
+            type: "uint256",
+            internalType: "uint256"
+          },
+          {
+            name: "protocolFeeBps",
+            type: "uint256",
+            internalType: "uint256"
+          },
+          {
+            name: "priceOracle",
+            type: "address",
+            internalType: "address"
+          }
+        ]
+      },
+      {
+        name: "peerChains",
+        type: "bytes[]",
+        internalType: "bytes[]"
+      },
+      {
+        name: "relayer",
+        type: "address",
+        internalType: "address"
+      }
+    ],
+    outputs: [],
+    stateMutability: "nonpayable"
+  },
   {
     type: "function",
     name: "instance",
@@ -631,6 +685,19 @@ var ABI2 = [
     ],
     stateMutability: "view"
   },
+  {
+    type: "function",
+    name: "migrate",
+    inputs: [
+      {
+        name: "relayer",
+        type: "address",
+        internalType: "address"
+      }
+    ],
+    outputs: [],
+    stateMutability: "nonpayable"
+  },
   {
     type: "function",
     name: "onAccept",
@@ -1142,7 +1209,7 @@ var ABI2 = [
         internalType: "uint256"
       }
     ],
-    stateMutability: "view"
+    stateMutability: "nonpayable"
   },
   {
     type: "function",
@@ -1198,6 +1265,19 @@ var ABI2 = [
         internalType: "uint256"
       }
     ],
+    stateMutability: "nonpayable"
+  },
+  {
+    type: "function",
+    name: "relayer",
+    inputs: [],
+    outputs: [
+      {
+        name: "",
+        type: "address",
+        internalType: "address"
+      }
+    ],
     stateMutability: "view"
   },
   {
@@ -1238,66 +1318,67 @@ var ABI2 = [
   },
   {
     type: "function",
-    name: "init",
+    name: "setRelayer",
     inputs: [
       {
-        name: "p",
-        type: "tuple",
-        internalType: "struct Params",
-        components: [
-          {
-            name: "host",
-            type: "address",
-            internalType: "address"
-          },
-          {
-            name: "dispatcher",
-            type: "address",
-            internalType: "address"
-          },
-          {
-            name: "solverSelection",
-            type: "bool",
-            internalType: "bool"
-          },
-          {
-            name: "surplusShareBps",
-            type: "uint256",
-            internalType: "uint256"
-          },
-          {
-            name: "protocolFeeBps",
-            type: "uint256",
-            internalType: "uint256"
-          },
-          {
-            name: "priceOracle",
-            type: "address",
-            internalType: "address"
-          }
-        ]
+        name: "relayer",
+        type: "address",
+        internalType: "address"
+      }
+    ],
+    outputs: [],
+    stateMutability: "nonpayable"
+  },
+  {
+    type: "function",
+    name: "upgradeToAndCall",
+    inputs: [
+      {
+        name: "newImplementation",
+        type: "address",
+        internalType: "address"
       },
       {
-        name: "deployments",
-        type: "tuple[]",
-        internalType: "struct Deployment[]",
-        components: [
-          {
-            name: "chain",
-            type: "bytes",
-            internalType: "bytes"
-          },
-          {
-            name: "gateway",
-            type: "address",
-            internalType: "address"
-          }
-        ]
+        name: "data",
+        type: "bytes",
+        internalType: "bytes"
       }
     ],
     outputs: [],
     stateMutability: "nonpayable"
   },
+  {
+    type: "function",
+    name: "version",
+    inputs: [],
+    outputs: [
+      {
+        name: "",
+        type: "uint64",
+        internalType: "uint64"
+      }
+    ],
+    stateMutability: "view"
+  },
+  {
+    type: "event",
+    name: "DeploymentAdded",
+    inputs: [
+      {
+        name: "chain",
+        type: "string",
+        indexed: false,
+        internalType: "string"
+      },
+      {
+        name: "gateway",
+        type: "address",
+        indexed: false,
+        internalType: "address"
+      }
+    ],
+    anonymous: false
+  },
   {
     type: "event",
     name: "DestinationProtocolFeeUpdated",
@@ -1431,16 +1512,29 @@ var ABI2 = [
   },
   {
     type: "event",
-    name: "DeploymentAdded",
+    name: "Initialized",
     inputs: [
       {
-        name: "chain",
-        type: "string",
+        name: "version",
+        type: "uint64",
         indexed: false,
-        internalType: "string"
+        internalType: "uint64"
+      }
+    ],
+    anonymous: false
+  },
+  {
+    type: "event",
+    name: "OrderCancelled",
+    inputs: [
+      {
+        name: "commitment",
+        type: "bytes32",
+        indexed: true,
+        internalType: "bytes32"
       },
       {
-        name: "gateway",
+        name: "canceller",
         type: "address",
         indexed: false,
         internalType: "address"
@@ -1768,14 +1862,52 @@ var ABI2 = [
     ],
     anonymous: false
   },
+  {
+    type: "event",
+    name: "RelayerUpdated",
+    inputs: [
+      {
+        name: "previous",
+        type: "address",
+        indexed: false,
+        internalType: "address"
+      },
+      {
+        name: "current",
+        type: "address",
+        indexed: false,
+        internalType: "address"
+      }
+    ],
+    anonymous: false
+  },
+  {
+    type: "event",
+    name: "Upgraded",
+    inputs: [
+      {
+        name: "implementation",
+        type: "address",
+        indexed: true,
+        internalType: "address"
+      }
+    ],
+    anonymous: false
+  },
   {
     type: "error",
-    name: "Cancelled",
-    inputs: []
+    name: "AddressEmptyCode",
+    inputs: [
+      {
+        name: "target",
+        type: "address",
+        internalType: "address"
+      }
+    ]
   },
   {
     type: "error",
-    name: "UnknownInstance",
+    name: "Cancelled",
     inputs: []
   },
   {
@@ -1805,11 +1937,37 @@ var ABI2 = [
       }
     ]
   },
+  {
+    type: "error",
+    name: "ERC1967InvalidImplementation",
+    inputs: [
+      {
+        name: "implementation",
+        type: "address",
+        internalType: "address"
+      }
+    ]
+  },
+  {
+    type: "error",
+    name: "ERC1967NonPayable",
+    inputs: []
+  },
   {
     type: "error",
     name: "Expired",
     inputs: []
   },
+  {
+    type: "error",
+    name: "FailedCall",
+    inputs: []
+  },
+  {
+    type: "error",
+    name: "FillExpired",
+    inputs: []
+  },
   {
     type: "error",
     name: "Filled",
@@ -1820,6 +1978,11 @@ var ABI2 = [
     name: "InsufficientNativeToken",
     inputs: []
   },
+  {
+    type: "error",
+    name: "InvalidInitialization",
+    inputs: []
+  },
   {
     type: "error",
     name: "InvalidInput",
@@ -1835,6 +1998,21 @@ var ABI2 = [
     name: "NotExpired",
     inputs: []
   },
+  {
+    type: "error",
+    name: "NotInitializing",
+    inputs: []
+  },
+  {
+    type: "error",
+    name: "PartialFillNotAllowed",
+    inputs: []
+  },
+  {
+    type: "error",
+    name: "ReentrancyGuardReentrantCall",
+    inputs: []
+  },
   {
     type: "error",
     name: "SafeERC20FailedOperation",
@@ -1872,6 +2050,11 @@ var ABI2 = [
     name: "UnexpectedCall",
     inputs: []
   },
+  {
+    type: "error",
+    name: "UnknownInstance",
+    inputs: []
+  },
   {
     type: "error",
     name: "UnknownOrder",
@@ -1886,6 +2069,7 @@ var ABI2 = [
 var IntentGatewayV2_default = { ABI: ABI2 };
 
 // src/chains/intentsCoprocessor.ts
+u8aToHex(u8aConcat(xxhashAsU8a("System", 128), xxhashAsU8a("Events", 128)));
 new TextEncoder().encode("intents::bid::");
 new TextEncoder().encode("intents::phantom::order::");
 Struct({ filler: Bytes(32), user_op: Vector(u8) });
@@ -1945,6 +2129,53 @@ function sortPoolSymbols(symbolA, symbolB) {
 function poolSlug(symbolA, symbolB) {
   return sortPoolSymbols(symbolA, symbolB).join("-");
 }
+var FILL_ORDER_V1_ABI = [
+  {
+    type: "function",
+    name: "fillOrder",
+    stateMutability: "payable",
+    outputs: [],
+    inputs: [
+      ABI2.find((e) => e.type === "function" && e.name === "fillOrder").inputs[0],
+      {
+        name: "options",
+        type: "tuple",
+        internalType: "struct FillOptions",
+        components: [
+          { name: "relayerFee", type: "uint256", internalType: "uint256" },
+          { name: "nativeDispatchFee", type: "uint256", internalType: "uint256" },
+          {
+            name: "outputs",
+            type: "tuple[]",
+            internalType: "struct TokenInfo[]",
+            components: [
+              { name: "token", type: "bytes32", internalType: "bytes32" },
+              { name: "amount", type: "uint256", internalType: "uint256" }
+            ]
+          }
+        ]
+      }
+    ]
+  }
+];
+function decodeFillOrder(data) {
+  try {
+    const decoded = decodeFunctionData({ abi: ABI2, data });
+    if (decoded.functionName === "fillOrder" && decoded.args && decoded.args.length >= 2) {
+      return { order: decoded.args[0], options: decoded.args[1] };
+    }
+  } catch {
+  }
+  try {
+    const decoded = decodeFunctionData({ abi: FILL_ORDER_V1_ABI, data });
+    if (decoded.functionName === "fillOrder" && decoded.args && decoded.args.length >= 2) {
+      const legacy = decoded.args[1];
+      return { order: decoded.args[0], options: { ...legacy, validUntil: 0n } };
+    }
+  } catch {
+  }
+  return null;
+}
 var SELECT_SOLVER_TYPEHASH = keccak256(toHex("SelectSolver(bytes32 commitment,address solver)"));
 var PACKED_USEROP_TYPEHASH = keccak256(
   toHex(
@@ -2591,9 +2822,16 @@ function zipFillLegs(assets, outputs) {
     };
   });
 }
-var UNISWAP_QUOTE_HAIRCUT_BPS = 30n;
+var UNISWAP_QUOTE_HAIRCUT_BPS = 10n;
+var PHANTOM_QUOTE_HAIRCUT_BPS = 5n;
+function haircut(amount, bps) {
+  return amount * (10000n - bps) / 10000n;
+}
 function applyUniswapQuoteHaircut(amount) {
-  return amount * (10000n - UNISWAP_QUOTE_HAIRCUT_BPS) / 10000n;
+  return haircut(amount, UNISWAP_QUOTE_HAIRCUT_BPS);
+}
+function applyPhantomQuoteHaircut(amount) {
+  return haircut(amount, PHANTOM_QUOTE_HAIRCUT_BPS);
 }
 function weightedMedian(entries) {
   const sorted = [...entries].sort((a, b) => a.price < b.price ? -1 : a.price > b.price ? 1 : 0);
@@ -2616,10 +2854,10 @@ function extractFillData(callData, gatewayAddress) {
   for (const call of calls) {
     if (call.target.toLowerCase() !== normalized) continue;
     try {
-      const decoded = decodeFunctionData({ abi: FILL_ORDER_ABI, data: call.data });
-      if (decoded.functionName !== "fillOrder" || !decoded.args || decoded.args.length < 2) continue;
-      const order = decoded.args[0];
-      const options = decoded.args[1];
+      const decoded = decodeFillOrder(call.data);
+      if (!decoded) continue;
+      const order = decoded.order;
+      const options = decoded.options;
       const assets = order?.output?.assets;
       const outputs = options?.outputs;
       if (!assets?.length || !outputs?.length) continue;
@@ -2662,7 +2900,7 @@ var recoverBidSignerViem = async (userOp, entryPoint, chainId, solverSignature)
   }
 };
 var DELEGATION_INDICATOR_PREFIX = "0xef0100";
-async function isDelegatedToSolverAccount(evmRpcUrl, account, solverAccount) {
+async function isDelegatedToSolverAccount(evmRpcUrl, account, solverAccounts) {
   const response = await rpcCall(evmRpcUrl, {
     id: 1,
     jsonrpc: "2.0",
@@ -2674,15 +2912,17 @@ async function isDelegatedToSolverAccount(evmRpcUrl, account, solverAccount) {
   }
   const code = response.result.toLowerCase();
   if (!code.startsWith(DELEGATION_INDICATOR_PREFIX)) return false;
-  return `0x${code.slice(DELEGATION_INDICATOR_PREFIX.length)}` === solverAccount.toLowerCase();
+  const delegate = `0x${code.slice(DELEGATION_INDICATOR_PREFIX.length)}`;
+  return solverAccounts.some((solverAccount) => solverAccount.toLowerCase() === delegate);
 }
 function memoizedDelegationCheck() {
   const cache = /* @__PURE__ */ new Map();
-  return (evmRpcUrl, account, solverAccount) => {
-    const key = `${evmRpcUrl}|${account.toLowerCase()}|${solverAccount.toLowerCase()}`;
+  return (evmRpcUrl, account, solverAccounts) => {
+    const targets = solverAccounts.map((a) => a.toLowerCase()).sort().join(",");
+    const key = `${evmRpcUrl}|${account.toLowerCase()}|${targets}`;
     let pending = cache.get(key);
     if (!pending) {
-      pending = isDelegatedToSolverAccount(evmRpcUrl, account, solverAccount).catch((err) => {
+      pending = isDelegatedToSolverAccount(evmRpcUrl, account, solverAccounts).catch((err) => {
         cache.delete(key);
         throw err;
       });
@@ -2702,7 +2942,7 @@ async function isVerifiedSolverBid(params) {
     commitment,
     sessionKey,
     chainId,
-    solverAccount,
+    solverAccounts,
     evmRpcUrl,
     recoverSigner,
     bidNonceKey,
@@ -2731,8 +2971,8 @@ async function isVerifiedSolverBid(params) {
     logger?.warn({ solver, commitment, signer }, "Rejecting phantom bid: signature does not recover to the sender");
     return false;
   }
-  if (!await isDelegated(evmRpcUrl, solver, solverAccount)) {
-    logger?.warn({ solver, commitment, solverAccount }, "Rejecting phantom bid: sender is not a delegated solver");
+  if (!await isDelegated(evmRpcUrl, solver, solverAccounts)) {
+    logger?.warn({ solver, commitment, solverAccounts }, "Rejecting phantom bid: sender is not a delegated solver");
     return false;
   }
   return true;
@@ -2746,12 +2986,12 @@ async function fetchBidsForOrder(nodeUrl, commitment) {
   });
   return Array.isArray(data.result) ? data.result : [];
 }
-async function ethCallUint(evmRpcUrl, to, data) {
+async function ethCallUint(evmRpcUrl, to, data, blockTag = "latest") {
   const result = await rpcCall(evmRpcUrl, {
     id: 1,
     jsonrpc: "2.0",
     method: "eth_call",
-    params: [{ to, data }, "latest"]
+    params: [{ to, data }, blockTag]
   });
   if (result.result === "0x") return 0n;
   if (typeof result.result !== "string") {
@@ -2759,12 +2999,12 @@ async function ethCallUint(evmRpcUrl, to, data) {
   }
   return BigInt(result.result);
 }
-async function getTotalSolverBalance(evmRpcUrl, chain, token, solver, yieldVaults) {
+async function getTotalSolverBalance(evmRpcUrl, chain, token, solver, yieldVaults, blockTag = "latest") {
   const padded = solver.replace("0x", "").padStart(64, "0");
-  const raw = await ethCallUint(evmRpcUrl, token, `0x70a08231${padded}`);
+  const raw = await ethCallUint(evmRpcUrl, token, `0x70a08231${padded}`, blockTag);
   const vaults = yieldVaults[chain]?.[token.toLowerCase()] ?? [];
   const vaultBalances = await Promise.all(
-    vaults.map((v) => ethCallUint(evmRpcUrl, v, `0xce96cb77${padded}`))
+    vaults.map((v) => ethCallUint(evmRpcUrl, v, `0xce96cb77${padded}`, blockTag))
     // maxWithdraw(address)
   );
   return vaultBalances.reduce((acc, b) => acc + b, raw);
@@ -2774,13 +3014,14 @@ var SELECTOR_POSITION_LIQUIDITY = "0x1efeed33";
 var SELECTOR_POOL_AND_POSITION_INFO = "0x7ba03aad";
 var SELECTOR_GET_SLOT0 = "0xc815641c";
 var uint256Arg = (value) => value.toString(16).padStart(64, "0");
-async function readV4Position(evmRpcUrl, contracts, tokenId, keccak, logger) {
+async function readV4Position(params) {
+  const { evmRpcUrl, contracts, tokenId, keccak, blockTag = "latest", logger } = params;
   const call = async (to, data) => {
     const result = await rpcCall(evmRpcUrl, {
       id: 1,
       jsonrpc: "2.0",
       method: "eth_call",
-      params: [{ to, data }, "latest"]
+      params: [{ to, data }, blockTag]
     });
     if (result.result === "0x") return null;
     if (typeof result.result !== "string") {
@@ -2824,7 +3065,7 @@ function memoizedV4Position(keccak, logger) {
     const key = `${chain}|${tokenId}`;
     let pending = cache.get(key);
     if (!pending) {
-      pending = readV4Position(evmRpcUrl, contracts, tokenId, keccak, logger).catch((err) => {
+      pending = readV4Position({ evmRpcUrl, contracts, tokenId, keccak, logger }).catch((err) => {
         cache.delete(key);
         throw err;
       });
@@ -2833,13 +3074,13 @@ function memoizedV4Position(keccak, logger) {
     return pending;
   };
 }
-function memoizedSolverBalance(yieldVaults) {
+function memoizedSolverBalance(yieldVaults, blockTags = {}) {
   const cache = /* @__PURE__ */ new Map();
   return (evmRpcUrl, chain, token, solver) => {
     const key = `${chain}|${token.toLowerCase()}|${solver.toLowerCase()}`;
     let pending = cache.get(key);
     if (!pending) {
-      pending = getTotalSolverBalance(evmRpcUrl, chain, token, solver, yieldVaults).catch((err) => {
+      pending = getTotalSolverBalance(evmRpcUrl, chain, token, solver, yieldVaults, blockTags[chain]).catch((err) => {
         cache.delete(key);
         throw err;
       });
@@ -2895,7 +3136,10 @@ async function aggregatePhantomBids(params) {
 }
 var AGGREGATION_ATTEMPTS = 5;
 async function runAggregation(params, isDelegated) {
-  const { nodeUrl, evmRpcUrls, chain, gatewayAddress, commitment, yieldVaults, solverAccount, logger } = params;
+  const { nodeUrl, evmRpcUrls, chain, gatewayAddress, commitment, yieldVaults, logger } = params;
+  const solverAccounts = (Array.isArray(params.solverAccount) ? params.solverAccount : [params.solverAccount]).filter(
+    (a) => typeof a === "string" && a.length > 0
+  );
   const extractFill = params.extractFill ?? extractFillData;
   const recoverSigner = params.recoverSigner ?? recoverBidSignerViem;
   const bidNonceKey = params.bidNonceKey ?? CryptoUtils.bidNonceKey;
@@ -2903,7 +3147,7 @@ async function runAggregation(params, isDelegated) {
   const destUrl = evmRpcUrls[chain];
   if (!destUrl) return null;
   const chainId = evmChainId(chain);
-  if (!solverAccount || chainId === null) {
+  if (solverAccounts.length === 0 || chainId === null) {
     logger?.warn({ chain, commitment }, "Cannot verify phantom bids: no SolverAccount or chain id for chain");
     return null;
   }
@@ -2914,6 +3158,7 @@ async function runAggregation(params, isDelegated) {
   const getBalance = params.getBalance ?? memoizedSolverBalance(yieldVaults);
   const quotesByLeg = /* @__PURE__ */ new Map();
   const lpBalances = [];
+  const verifiedPositions = [];
   const countedSolvers = /* @__PURE__ */ new Set();
   for (const bid of bids) {
     if (!bid.user_op) continue;
@@ -2937,7 +3182,7 @@ async function runAggregation(params, isDelegated) {
         commitment,
         sessionKey,
         chainId,
-        solverAccount,
+        solverAccounts,
         evmRpcUrl: destUrl,
         recoverSigner,
         bidNonceKey,
@@ -2954,23 +3199,32 @@ async function runAggregation(params, isDelegated) {
       const declaration = decodePhantomBidDeclaration(decoded.paymasterAndData);
       const acceptedSources = declaration.acceptedSources;
       const poolPriced = declaration.uniswapV4Positions.length > 0;
-      const quotedLegs = [...fillData.legs.entries()].map(
-        ([legIndex, leg]) => poolPriced ? [legIndex, { ...leg, solverAmount: applyUniswapQuoteHaircut(leg.solverAmount) }] : [legIndex, leg]
-      ).filter(([, leg]) => leg.solverAmount !== 0n);
+      const applyHaircut = poolPriced ? applyUniswapQuoteHaircut : applyPhantomQuoteHaircut;
+      const quotedLegs = [...fillData.legs.entries()].map(([legIndex, leg]) => [
+        legIndex,
+        { ...leg, solverAmount: applyHaircut(leg.solverAmount) }
+      ]).filter(([, leg]) => leg.solverAmount !== 0n);
       const declaredPositions = v4Contracts ? declaration.uniswapV4Positions : [];
-      const positions = (await Promise.all(
-        declaredPositions.map((tokenId) => readPosition(destUrl, chain, v4Contracts, tokenId))
-      )).filter((state, index) => {
-        if (!state) return false;
-        if (state.owner !== normalizedSolver) {
+      const ownedPositions = (await Promise.all(
+        declaredPositions.map(async (tokenId) => ({
+          tokenId,
+          state: await readPosition(destUrl, chain, v4Contracts, tokenId)
+        }))
+      )).filter((entry) => {
+        if (!entry.state) return false;
+        if (entry.state.owner !== normalizedSolver) {
           logger?.warn(
-            { solver, commitment, tokenId: declaredPositions[index].toString(), owner: state.owner },
+            { solver, commitment, tokenId: entry.tokenId.toString(), owner: entry.state.owner },
             "Ignoring declared Uniswap V4 position: not owned by the bidding solver"
           );
           return false;
         }
         return true;
       });
+      const positions = ownedPositions.map((entry) => entry.state);
+      for (const entry of ownedPositions) {
+        verifiedPositions.push({ solver: normalizedSolver, chain, tokenId: entry.tokenId });
+      }
       const weights = await Promise.all(
         // Price influence: the solver's liquidity in THIS leg's output token on the destination
         // chain, so a leg is weighted by the inventory that actually backs it.
@@ -3030,9 +3284,9 @@ async function runAggregation(params, isDelegated) {
       }
     ];
   });
-  return { legs, lpBalances };
+  return { legs, lpBalances, positions: verifiedPositions, solvers: [...countedSolvers] };
 }
 
-export { ENTRY_POINT_V08_ADDRESS, FILL_ORDER_ABI, IntentGatewayV2_default as IntentGatewayV2, UNISWAP_QUOTE_HAIRCUT_BPS, aggregatePhantomBids, applyUniswapQuoteHaircut, decodeAcceptedSourceChains, decodeERC7821ExecuteBatch, decodePhantomBidDeclaration, decodeUserOpScale, encodeAcceptedSourceChains, encodeERC7821ExecuteBatch, encodePhantomBidDeclaration, encodeUserOpScale, extractFillData, fetchBidsForOrder, memoizedSolverBalance, orderCommitmentFromDecoded, poolSlug, recoverBidSignerViem, setAggregationFetch, sortPoolSymbols, splitBidSignature, weightedMedian, zipFillLegs };
+export { ENTRY_POINT_V08_ADDRESS, FILL_ORDER_ABI, FILL_ORDER_V1_ABI, IntentGatewayV2_default as IntentGatewayV2, PHANTOM_QUOTE_HAIRCUT_BPS, UNISWAP_QUOTE_HAIRCUT_BPS, aggregatePhantomBids, applyPhantomQuoteHaircut, applyUniswapQuoteHaircut, decodeAcceptedSourceChains, decodeERC7821ExecuteBatch, decodePhantomBidDeclaration, decodeUserOpScale, encodeAcceptedSourceChains, encodeERC7821ExecuteBatch, encodePhantomBidDeclaration, encodeUserOpScale, extractFillData, fetchBidsForOrder, getTotalSolverBalance, memoizedSolverBalance, orderCommitmentFromDecoded, poolSlug, positionAmountOfToken, readV4Position, recoverBidSignerViem, setAggregationFetch, sortPoolSymbols, splitBidSignature, weightedMedian, zipFillLegs };
 //# sourceMappingURL=intents-helpers.js.map
 //# sourceMappingURL=intents-helpers.js.map