@hyperbridge/sdk 2.8.8 → 2.8.10

package/dist/node/intents-helpers.cjs

@@ -3,7 +3,7 @@
 var viem = require('viem');
 require('@polkadot/api');
 var util = require('@polkadot/util');
-require('@polkadot/util-crypto');
+var utilCrypto = require('@polkadot/util-crypto');
 var scaleTs = require('scale-ts');
 require('p-queue');
 var accounts = require('viem/accounts');
@@ -578,6 +578,11 @@ var ABI2 = [
             type: "uint256",
             internalType: "uint256"
           },
+          {
+            name: "validUntil",
+            type: "uint256",
+            internalType: "uint256"
+          },
           {
             name: "outputs",
             type: "tuple[]",
@@ -1888,6 +1893,7 @@ var ABI2 = [
 var IntentGatewayV2_default = { ABI: ABI2 };
 
 // src/chains/intentsCoprocessor.ts
+util.u8aToHex(util.u8aConcat(utilCrypto.xxhashAsU8a("System", 128), utilCrypto.xxhashAsU8a("Events", 128)));
 new TextEncoder().encode("intents::bid::");
 new TextEncoder().encode("intents::phantom::order::");
 scaleTs.Struct({ filler: scaleTs.Bytes(32), user_op: scaleTs.Vector(scaleTs.u8) });
@@ -1947,6 +1953,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 = viem.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 = viem.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 = viem.keccak256(viem.toHex("SelectSolver(bytes32 commitment,address solver)"));
 var PACKED_USEROP_TYPEHASH = viem.keccak256(
   viem.toHex(
@@ -2593,9 +2646,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);
@@ -2618,10 +2678,10 @@ function extractFillData(callData, gatewayAddress) {
   for (const call of calls) {
     if (call.target.toLowerCase() !== normalized) continue;
     try {
-      const decoded = viem.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;
@@ -2748,12 +2808,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") {
@@ -2761,12 +2821,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);
@@ -2776,13 +2836,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") {
@@ -2826,7 +2887,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;
       });
@@ -2835,13 +2896,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;
       });
@@ -2916,6 +2977,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;
@@ -2956,23 +3018,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.
@@ -3032,14 +3103,17 @@ async function runAggregation(params, isDelegated) {
       }
     ];
   });
-  return { legs, lpBalances };
+  return { legs, lpBalances, positions: verifiedPositions, solvers: [...countedSolvers] };
 }
 
 exports.ENTRY_POINT_V08_ADDRESS = ENTRY_POINT_V08_ADDRESS;
 exports.FILL_ORDER_ABI = FILL_ORDER_ABI;
+exports.FILL_ORDER_V1_ABI = FILL_ORDER_V1_ABI;
 exports.IntentGatewayV2 = IntentGatewayV2_default;
+exports.PHANTOM_QUOTE_HAIRCUT_BPS = PHANTOM_QUOTE_HAIRCUT_BPS;
 exports.UNISWAP_QUOTE_HAIRCUT_BPS = UNISWAP_QUOTE_HAIRCUT_BPS;
 exports.aggregatePhantomBids = aggregatePhantomBids;
+exports.applyPhantomQuoteHaircut = applyPhantomQuoteHaircut;
 exports.applyUniswapQuoteHaircut = applyUniswapQuoteHaircut;
 exports.decodeAcceptedSourceChains = decodeAcceptedSourceChains;
 exports.decodeERC7821ExecuteBatch = decodeERC7821ExecuteBatch;
@@ -3051,9 +3125,12 @@ exports.encodePhantomBidDeclaration = encodePhantomBidDeclaration;
 exports.encodeUserOpScale = encodeUserOpScale;
 exports.extractFillData = extractFillData;
 exports.fetchBidsForOrder = fetchBidsForOrder;
+exports.getTotalSolverBalance = getTotalSolverBalance;
 exports.memoizedSolverBalance = memoizedSolverBalance;
 exports.orderCommitmentFromDecoded = orderCommitmentFromDecoded;
 exports.poolSlug = poolSlug;
+exports.positionAmountOfToken = positionAmountOfToken;
+exports.readV4Position = readV4Position;
 exports.recoverBidSignerViem = recoverBidSignerViem;
 exports.setAggregationFetch = setAggregationFetch;
 exports.sortPoolSymbols = sortPoolSymbols;