@hyperbridge/sdk 2.7.2 → 2.8.0

package/dist/node/intents-helpers.cjs

@@ -1610,6 +1610,24 @@ var ABI2 = [
             internalType: "uint256"
           }
         ]
+      },
+      {
+        name: "predispatchCall",
+        type: "bytes",
+        indexed: false,
+        internalType: "bytes"
+      },
+      {
+        name: "outputCall",
+        type: "bytes",
+        indexed: false,
+        internalType: "bytes"
+      },
+      {
+        name: "graffiti",
+        type: "bytes32",
+        indexed: false,
+        internalType: "bytes32"
       }
     ],
     anonymous: false
@@ -2340,6 +2358,49 @@ async function rpcCall(url, payload) {
   throw lastErr;
 }
 var FILL_ORDER_ABI = IntentGatewayV2_default.ABI;
+var DECLARATION_VERSION = 1;
+var MAX_DECLARED_CHAINS = 255;
+function encodeAcceptedSourceChains(chains) {
+  if (chains.length > MAX_DECLARED_CHAINS) {
+    throw new Error(`Cannot declare more than ${MAX_DECLARED_CHAINS} source chains`);
+  }
+  const bytes = [DECLARATION_VERSION, chains.length];
+  for (const chain of chains) {
+    const encoded = util.stringToU8a(chain);
+    if (encoded.length === 0 || encoded.length > 255) {
+      throw new Error(`Invalid state machine id in source chain declaration: ${chain}`);
+    }
+    bytes.push(encoded.length, ...encoded);
+  }
+  return util.u8aToHex(new Uint8Array(bytes));
+}
+function decodeAcceptedSourceChains(paymasterAndData) {
+  if (!paymasterAndData || !util.isHex(paymasterAndData)) return null;
+  const bytes = util.hexToU8a(paymasterAndData);
+  if (bytes.length < 2 || bytes[0] !== DECLARATION_VERSION) return null;
+  const count = bytes[1];
+  const chains = [];
+  let offset = 2;
+  for (let entry = 0; entry < count; entry++) {
+    if (offset >= bytes.length) return null;
+    const length = bytes[offset];
+    offset += 1;
+    if (length === 0 || offset + length > bytes.length) return null;
+    chains.push(util.u8aToString(bytes.subarray(offset, offset + length)));
+    offset += length;
+  }
+  if (offset !== bytes.length) return null;
+  return chains;
+}
+function zipFillLegs(assets, outputs) {
+  return assets.map((asset, index) => {
+    const rawAmount = outputs[index]?.amount;
+    return {
+      outputToken: asset.token,
+      solverAmount: rawAmount === void 0 || rawAmount === null ? 0n : BigInt(rawAmount.toString())
+    };
+  });
+}
 function weightedMedian(entries) {
   const sorted = [...entries].sort((a, b) => a.price < b.price ? -1 : a.price > b.price ? 1 : 0);
   const totalWeight = sorted.reduce((acc, e) => e.weight > 0n ? acc + e.weight : acc, 0n);
@@ -2365,10 +2426,10 @@ function extractFillData(callData, gatewayAddress) {
       if (decoded.functionName !== "fillOrder" || !decoded.args || decoded.args.length < 2) continue;
       const order = decoded.args[0];
       const options = decoded.args[1];
-      const outputToken = order?.output?.assets?.[0]?.token;
+      const assets = order?.output?.assets;
       const outputs = options?.outputs;
-      if (!outputToken || !outputs?.length) continue;
-      return { order, options, outputToken, solverAmount: outputs[0].amount };
+      if (!assets?.length || !outputs?.length) continue;
+      return { order, options, legs: zipFillLegs(assets, outputs) };
     } catch {
       continue;
     }
@@ -2486,13 +2547,25 @@ async function getTotalSolverBalance(evmRpcUrl, chain, token, solver, yieldVault
   );
   return vaultBalances.reduce((acc, b) => acc + b, raw);
 }
-async function sweepSolverLiquidity(evmRpcUrls, yieldVaults, solver) {
+function memoizedSolverBalance(yieldVaults) {
+  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);
+      cache.set(key, pending);
+    }
+    return pending;
+  };
+}
+async function sweepSolverLiquidity(evmRpcUrls, yieldVaults, solver, getBalance) {
   const balances = [];
   for (const [chain, tokens] of Object.entries(yieldVaults)) {
     const url = evmRpcUrls[chain];
     if (!url) continue;
     for (const token of Object.keys(tokens)) {
-      const balance = await getTotalSolverBalance(url, chain, token, solver, yieldVaults);
+      const balance = await getBalance(url, chain, token, solver);
       if (balance === 0n) continue;
       balances.push({ solver, chain, tokenAddress: token, balance });
     }
@@ -2519,7 +2592,8 @@ async function aggregatePhantomBids(params) {
   }
   const bids = await fetchBidsForOrder(nodeUrl, commitment);
   if (bids.length === 0) return null;
-  const quotes = [];
+  const getBalance = params.getBalance ?? memoizedSolverBalance(yieldVaults);
+  const quotesByLeg = /* @__PURE__ */ new Map();
   const lpBalances = [];
   const countedSolvers = /* @__PURE__ */ new Set();
   for (const bid of bids) {
@@ -2557,39 +2631,59 @@ async function aggregatePhantomBids(params) {
         continue;
       }
       countedSolvers.add(normalizedSolver);
-      const outputTokenAddress = toAddress(fillData.outputToken);
-      const weight = await getTotalSolverBalance(destUrl, chain, outputTokenAddress, solver, yieldVaults);
-      quotes.push({ price: fillData.solverAmount, weight });
-      lpBalances.push(...await sweepSolverLiquidity(evmRpcUrls, yieldVaults, solver));
+      const acceptedSources = decodeAcceptedSourceChains(decoded.paymasterAndData);
+      const quotedLegs = [...fillData.legs.entries()].filter(([, leg]) => leg.solverAmount !== 0n);
+      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.
+        quotedLegs.map(([, leg]) => getBalance(destUrl, chain, toAddress(leg.outputToken), solver))
+      );
+      for (const [position, [legIndex, leg]] of quotedLegs.entries()) {
+        const weight = weights[position];
+        const entry = quotesByLeg.get(legIndex) ?? { outputToken: leg.outputToken, quotes: [], bidders: [] };
+        entry.quotes.push({ price: leg.solverAmount, weight });
+        entry.bidders.push({ solver: normalizedSolver, weight, acceptedSources });
+        quotesByLeg.set(legIndex, entry);
+      }
+      lpBalances.push(...await sweepSolverLiquidity(evmRpcUrls, yieldVaults, solver, getBalance));
     } catch (err) {
       logger?.warn({ err, filler: bid.filler }, "Failed to process bid for price snapshot");
     }
   }
-  if (quotes.length === 0) return null;
-  const medianPrice = weightedMedian(quotes);
-  return {
-    lowestPrice: medianPrice,
-    highestPrice: medianPrice,
-    medianPrice,
-    bidCount: quotes.length,
-    lpBalances
-  };
+  if (quotesByLeg.size === 0) return null;
+  const legs = [...quotesByLeg.entries()].sort(([a], [b]) => a - b).map(([legIndex, { outputToken, quotes, bidders }]) => {
+    const medianPrice = weightedMedian(quotes);
+    return {
+      legIndex,
+      outputToken,
+      lowestPrice: medianPrice,
+      highestPrice: medianPrice,
+      medianPrice,
+      bidCount: quotes.length,
+      bidders
+    };
+  });
+  return { legs, lpBalances };
 }
 
 exports.ENTRY_POINT_V08_ADDRESS = ENTRY_POINT_V08_ADDRESS;
 exports.FILL_ORDER_ABI = FILL_ORDER_ABI;
 exports.IntentGatewayV2 = IntentGatewayV2_default;
 exports.aggregatePhantomBids = aggregatePhantomBids;
+exports.decodeAcceptedSourceChains = decodeAcceptedSourceChains;
 exports.decodeERC7821ExecuteBatch = decodeERC7821ExecuteBatch;
 exports.decodeUserOpScale = decodeUserOpScale;
+exports.encodeAcceptedSourceChains = encodeAcceptedSourceChains;
 exports.encodeERC7821ExecuteBatch = encodeERC7821ExecuteBatch;
 exports.encodeUserOpScale = encodeUserOpScale;
 exports.extractFillData = extractFillData;
 exports.fetchBidsForOrder = fetchBidsForOrder;
+exports.memoizedSolverBalance = memoizedSolverBalance;
 exports.orderCommitmentFromDecoded = orderCommitmentFromDecoded;
 exports.recoverBidSignerViem = recoverBidSignerViem;
 exports.setAggregationFetch = setAggregationFetch;
 exports.splitBidSignature = splitBidSignature;
 exports.weightedMedian = weightedMedian;
+exports.zipFillLegs = zipFillLegs;
 //# sourceMappingURL=intents-helpers.cjs.map
 //# sourceMappingURL=intents-helpers.cjs.map