@yodlpay/payment-decoder 1.3.5 → 1.3.7

package/dist/index.js

@@ -1,3 +1,6 @@
+// src/bridges/bridge-payment.ts
+import { parseDepositLogs as parseDepositLogs2, parseFillLogs as parseFillLogs2 } from "@across-protocol/app-sdk";
+
 // src/errors.ts
 var ExpectedDecodeError = class extends Error {
   constructor(message = "Expected decode error") {
@@ -27,7 +30,7 @@ import { tokenlist } from "@yodlpay/tokenlists";
 import {
   erc20Abi as erc20Abi2,
   getAddress,
-  isAddressEqual,
+  isAddressEqual as isAddressEqual2,
   parseEventLogs
 } from "viem";
 
@@ -45,9 +48,17 @@ import {
   erc20Abi,
   getContract,
   hexToString,
-  stringify
+  isAddressEqual,
+  stringify,
+  zeroAddress
 } from "viem";
 import { z } from "zod";
+
+// src/chains.ts
+import { chains as allChains } from "@yodlpay/tokenlists";
+var chains = allChains.filter((c) => !c.testnet);
+
+// src/utils.ts
 function decodeMemo(memo) {
   if (!memo || memo === "0x") return "";
   try {
@@ -59,6 +70,19 @@ function decodeMemo(memo) {
 var erc20String = z.string().max(64).transform((s) => s.replace(/\p{Cc}/gu, ""));
 var erc20Decimals = z.number().int().nonnegative().max(36);
 async function resolveToken(address, chainId2, client) {
+  if (isAddressEqual(address, zeroAddress)) {
+    const chain = chains.find((c) => c.id === chainId2);
+    if (!chain) {
+      throw new Error(`Native token requested for unknown chainId ${chainId2}`);
+    }
+    return {
+      chainId: chainId2,
+      address,
+      name: chain.nativeCurrency.name,
+      symbol: chain.nativeCurrency.symbol,
+      decimals: chain.nativeCurrency.decimals
+    };
+  }
   try {
     return getTokenByAddress(address, chainId2);
   } catch {
@@ -82,7 +106,7 @@ async function resolveToken(address, chainId2, client) {
 function decodeYodlFromLogs(logs, routerAddress) {
   const parsed = parseEventLogs({
     abi: yodlAbi,
-    logs: logs.filter((l) => isAddressEqual(l.address, routerAddress)),
+    logs: logs.filter((l) => isAddressEqual2(l.address, routerAddress)),
     eventName: "Yodl",
     strict: true
   });
@@ -130,7 +154,7 @@ function extractTokenTransfers(logs) {
   });
 }
 function isKnownToken(address) {
-  return tokenlist.some((t) => isAddressEqual(t.address, address));
+  return tokenlist.some((t) => isAddressEqual2(t.address, address));
 }
 function transferSignature(t) {
   return `${getAddress(t.from)}:${getAddress(t.to)}:${t.amount}`;
@@ -177,7 +201,7 @@ function detectMirrorTokens(allTransfers) {
   return mirrors;
 }
 function findInputTransfer(transfers, sender) {
-  const fromSender = transfers.filter((t) => isAddressEqual(t.from, sender));
+  const fromSender = transfers.filter((t) => isAddressEqual2(t.from, sender));
   if (fromSender.length === 0) return void 0;
   const maxAmount = fromSender.reduce(
     (max, t) => t.amount > max ? t.amount : max,
@@ -198,7 +222,7 @@ function findInputTransfer(transfers, sender) {
 function inferSwapFromTransfers(logs, sender, yodlToken) {
   const transfers = extractTokenTransfers(logs);
   const outgoingDifferentToken = transfers.filter(
-    (t) => isAddressEqual(t.from, sender) && !isAddressEqual(t.token, yodlToken)
+    (t) => isAddressEqual2(t.from, sender) && !isAddressEqual2(t.token, yodlToken)
   );
   if (outgoingDifferentToken.length === 0) return void 0;
   const byToken = /* @__PURE__ */ new Map();
@@ -212,7 +236,7 @@ function inferSwapFromTransfers(logs, sender, yodlToken) {
     }
   }
   const incomingNonYodl = transfers.filter(
-    (t) => isAddressEqual(t.to, sender) && !isAddressEqual(t.token, yodlToken)
+    (t) => isAddressEqual2(t.to, sender) && !isAddressEqual2(t.token, yodlToken)
   );
   for (const t of incomingNonYodl) {
     const key = getAddress(t.token);
@@ -232,7 +256,7 @@ function inferSwapFromTransfers(logs, sender, yodlToken) {
   }
   if (!tokenIn || tokenInAmount <= 0n) return void 0;
   const incomingYodlToken = transfers.filter(
-    (t) => isAddressEqual(t.to, sender) && isAddressEqual(t.token, yodlToken)
+    (t) => isAddressEqual2(t.to, sender) && isAddressEqual2(t.token, yodlToken)
   );
   const tokenOutAmount = incomingYodlToken.reduce(
     (sum, t) => sum + t.amount,
@@ -264,12 +288,6 @@ import { decodeFunctionData, toFunctionSelector } from "viem";
 // src/validation.ts
 import { isAddress, isHash, isHex } from "viem";
 import { z as z2 } from "zod";
-
-// src/chains.ts
-import { chains as allChains } from "@yodlpay/tokenlists";
-var chains = allChains.filter((c) => !c.testnet);
-
-// src/validation.ts
 var validChainIds = chains.map((c) => c.id);
 var txHashSchema = z2.string().refine((val) => isHash(val), "Invalid transaction hash");
 var chainIdSchema = z2.coerce.number().int().refine((id) => validChainIds.includes(id), {
@@ -405,8 +423,10 @@ async function fetchAcrossDepositByTx(hash) {
 // src/bridges/relay-bridge.ts
 import { getRouter } from "@yodlpay/tokenlists";
 import {
-  isAddressEqual as isAddressEqual2,
-  parseEventLogs as parseEventLogs2
+  isAddress as isAddress2,
+  isAddressEqual as isAddressEqual3,
+  parseEventLogs as parseEventLogs2,
+  zeroAddress as zeroAddress2
 } from "viem";
 import { entryPoint08Abi, entryPoint08Address } from "viem/account-abstraction";
 
@@ -495,19 +515,18 @@ async function calculateOutputAmountGross(inputAmount, inputToken, inputChainId,
   if (decimalDiff > 0) return inputAmount / 10n ** BigInt(decimalDiff);
   return inputAmount * 10n ** BigInt(-decimalDiff);
 }
-async function extractSenderFromSource(sourceReceipt, sourceProvider, sourceHash) {
+function extractSenderFromSource(sourceReceipt) {
   const userOps = parseEventLogs2({
     abi: entryPoint08Abi,
     logs: sourceReceipt.logs.filter(
-      (l) => isAddressEqual2(l.address, entryPoint08Address)
+      (l) => isAddressEqual3(l.address, entryPoint08Address)
     ),
     eventName: "UserOperationEvent"
   });
   if (userOps[0]) {
     return userOps[0].args.sender;
   }
-  const sourceTx = await sourceProvider.getTransaction({ hash: sourceHash });
-  return sourceTx.from;
+  return sourceReceipt.from;
 }
 async function resolveBridgeTokens(sourceReceipt, destReceipt, yodlEvent, sender, inputAmountGross, inputChainId, outputChainId, clients) {
   const sourceTransfers = extractTokenTransfers(sourceReceipt.logs);
@@ -550,12 +569,15 @@ function parseRelayResponse(request) {
   if (!inTx?.hash || !inTx?.chainId || !outTx?.hash || !outTx?.chainId) {
     throw new NoBridgeFoundError();
   }
+  const rawInputToken = data?.metadata?.currencyIn?.currency?.address;
+  const inputToken = rawInputToken && isAddress2(rawInputToken) ? rawInputToken : void 0;
   return {
     sourceChainId: inTx.chainId,
     sourceTxHash: inTx.hash,
     destinationChainId: outTx.chainId,
     destinationTxHash: outTx.hash,
-    inputAmountGross: BigInt(data?.metadata?.currencyIn?.amount ?? 0)
+    inputAmountGross: BigInt(data?.metadata?.currencyIn?.amount ?? 0),
+    inputToken
   };
 }
 async function decodeRelayBridgePayment(hash, clients, options = {}) {
@@ -565,7 +587,8 @@ async function decodeRelayBridgePayment(hash, clients, options = {}) {
     sourceTxHash,
     destinationChainId,
     destinationTxHash,
-    inputAmountGross
+    inputAmountGross,
+    inputToken
   } = parseRelayResponse(request);
   const destProvider = clients[destinationChainId];
   const sourceProvider = clients[sourceChainId];
@@ -586,21 +609,38 @@ async function decodeRelayBridgePayment(hash, clients, options = {}) {
       "No Yodl event found in destination transaction"
     );
   }
-  const [destBlock, destTx, sender] = await Promise.all([
+  const sender = extractSenderFromSource(sourceReceipt);
+  const [destBlock, destTx] = await Promise.all([
     destProvider.getBlock({ blockNumber: destReceipt.blockNumber }),
-    destProvider.getTransaction({ hash: destinationTxHash }),
-    extractSenderFromSource(sourceReceipt, sourceProvider, sourceTxHash)
+    destProvider.getTransaction({ hash: destinationTxHash })
   ]);
-  const tokens = await resolveBridgeTokens(
-    sourceReceipt,
-    destReceipt,
-    yodlEvent,
-    sender,
-    inputAmountGross,
-    sourceChainId,
-    destinationChainId,
-    clients
-  );
+  let tokens;
+  try {
+    tokens = await resolveBridgeTokens(
+      sourceReceipt,
+      destReceipt,
+      yodlEvent,
+      sender,
+      inputAmountGross,
+      sourceChainId,
+      destinationChainId,
+      clients
+    );
+  } catch (error) {
+    if (error instanceof ExpectedDecodeError && inputToken && isAddressEqual3(inputToken, zeroAddress2) && inputAmountGross > 0n) {
+      const swapEvent = decodeSwapFromLogs(destReceipt.logs);
+      const tokenOutAmountGross = swapEvent ? swapEvent.tokenOutAmount : yodlEvent.amount;
+      tokens = {
+        tokenIn: inputToken,
+        tokenInAmount: inputAmountGross,
+        tokenOut: yodlEvent.token,
+        tokenOutAmount: yodlEvent.amount,
+        tokenOutAmountGross
+      };
+    } else {
+      throw error;
+    }
+  }
   const bridge = {
     sourceChainId,
     sourceTxHash,
@@ -619,29 +659,26 @@ async function decodeRelayBridgePayment(hash, clients, options = {}) {
 }
 
 // src/bridges/across-bridge.ts
-async function resolveAcrossStatus(hash, fillReceipt) {
-  try {
-    return await fetchAcrossDepositByTx(hash);
-  } catch (error) {
-    if (!(error instanceof NoBridgeFoundError) || !fillReceipt) {
-      throw error;
+async function resolveAcrossStatus(hash, fillReceipt, cachedFillLog) {
+  const fillLog = cachedFillLog !== void 0 ? cachedFillLog : fillReceipt ? parseFillLogs(fillReceipt.logs) : null;
+  if (fillLog) {
+    const status = await fetchAcrossDepositByDepositId(
+      Number(fillLog.originChainId),
+      String(fillLog.depositId)
+    );
+    if (status.fillTxnRef?.toLowerCase() === hash.toLowerCase()) {
+      return status;
     }
+    return await fetchAcrossDepositByTx(hash);
   }
-  const fillLog = parseFillLogs(fillReceipt.logs);
-  if (!fillLog) {
-    throw new NoBridgeFoundError();
-  }
-  const status = await fetchAcrossDepositByDepositId(
-    Number(fillLog.originChainId),
-    String(fillLog.depositId)
-  );
-  if (!status.fillTxnRef || status.fillTxnRef.toLowerCase() !== hash.toLowerCase()) {
-    throw new NoBridgeFoundError();
-  }
-  return status;
+  return await fetchAcrossDepositByTx(hash);
 }
 async function decodeAcrossBridgePayment(hash, clients, options = {}) {
-  const status = await resolveAcrossStatus(hash, options.fillReceipt);
+  const status = await resolveAcrossStatus(
+    hash,
+    options.fillReceipt,
+    options.parsedFillLog
+  );
   if (status.status !== "filled" || !status.fillTxnRef) {
     throw new NoBridgeFoundError();
   }
@@ -669,10 +706,10 @@ async function decodeAcrossBridgePayment(hash, clients, options = {}) {
   if (!yodlEvent) {
     throw new NoBridgeFoundError();
   }
-  const [destBlock, destTx, sender] = await Promise.all([
+  const sender = extractSenderFromSource(sourceReceipt);
+  const [destBlock, destTx] = await Promise.all([
     destProvider.getBlock({ blockNumber: destReceipt.blockNumber }),
-    destProvider.getTransaction({ hash: destinationTxHash }),
-    extractSenderFromSource(sourceReceipt, sourceProvider, sourceTxHash)
+    destProvider.getTransaction({ hash: destinationTxHash })
   ]);
   const depositLog = parseDepositLogs(sourceReceipt.logs);
   const depositData = depositLog && depositLog.depositId === BigInt(status.depositId) ? {
@@ -733,6 +770,16 @@ async function decodeAcrossBridgePayment(hash, clients, options = {}) {
 // src/bridges/bridge-payment.ts
 async function decodeBridgePayment(hash, clients, options = {}) {
   const includeAcross = options.includeAcross ?? true;
+  const parsedFillLog = options.fillReceipt ? parseFillLogs2(options.fillReceipt.logs) : null;
+  const parsedDepositLog = options.sourceReceipt ? parseDepositLogs2(options.sourceReceipt.logs) : null;
+  const hasAcrossEvents = !!(parsedFillLog || parsedDepositLog);
+  if (includeAcross && hasAcrossEvents) {
+    return await decodeAcrossBridgePayment(hash, clients, {
+      fillReceipt: options.fillReceipt,
+      sourceReceipt: options.sourceReceipt,
+      parsedFillLog
+    });
+  }
   let relayError;
   try {
     return await decodeRelayBridgePayment(hash, clients, {
@@ -768,6 +815,7 @@ async function decodeBridgePayment(hash, clients, options = {}) {
 
 // src/core/payment-decoder.ts
 import { getRouter as getRouter3 } from "@yodlpay/tokenlists";
+import { isAddressEqual as isAddressEqual4 } from "viem";
 async function tryDecodeBridge(hash, clients, options = {}) {
   try {
     return await decodeBridgePayment(hash, clients, options);
@@ -798,10 +846,17 @@ async function decodePayment(hash, chainId2, clients, cachedReceipt) {
       );
       return { type: "swap", ...paymentEvent2, ...swapEvent };
     }
-    const bridgeResult2 = await tryDecodeBridge(hash, clients, {
-      fillReceipt: receipt
-    });
-    if (bridgeResult2) return bridgeResult2;
+    const effectiveSender = extractSenderFromSource(receipt);
+    const isSameChainPayment = isAddressEqual4(
+      effectiveSender,
+      yodlEvent.sender
+    );
+    if (!isSameChainPayment) {
+      const bridgeResult2 = await tryDecodeBridge(hash, clients, {
+        fillReceipt: receipt
+      });
+      if (bridgeResult2) return bridgeResult2;
+    }
     const [block, tx] = await Promise.all([
       provider.getBlock({ blockNumber: receipt.blockNumber }),
       provider.getTransaction({ hash })
@@ -831,10 +886,16 @@ async function decodePayment(hash, chainId2, clients, cachedReceipt) {
 // src/core/yodl-payment.ts
 import {
   formatUnits,
-  zeroAddress
+  isAddressEqual as isAddressEqual5,
+  zeroAddress as zeroAddress3
 } from "viem";
 async function buildTokenInfo(params, clients) {
-  const [inToken, outToken] = await Promise.all([
+  const sameToken = isAddressEqual5(params.tokenIn, params.tokenOut) && params.inChainId === params.outChainId;
+  const [inToken, outToken] = sameToken ? await resolveToken(
+    params.tokenIn,
+    params.inChainId,
+    getClient(clients, params.inChainId)
+  ).then((t) => [t, t]) : await Promise.all([
     resolveToken(
       params.tokenIn,
       params.inChainId,
@@ -942,7 +1003,7 @@ async function decodeYodlPayment(txHash2, chainId2, clients, cachedReceipt) {
     cachedReceipt
   );
   const firstWebhook = paymentInfo.webhooks[0];
-  const processorAddress = firstWebhook?.webhookAddress ?? zeroAddress;
+  const processorAddress = firstWebhook?.webhookAddress ?? zeroAddress3;
   const processorMemo = firstWebhook?.memo ?? "";
   const tokenInfo = await extractTokenInfo(
     paymentInfo,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@yodlpay/payment-decoder",
-	"version": "1.3.5",
+	"version": "1.3.7",
 	"description": "Decode Yodl payment hashes into structured payment data",
 	"keywords": [
 		"yodl",