@yodlpay/payment-decoder 1.3.5 → 1.3.6

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") {
@@ -495,7 +498,7 @@ 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(
@@ -506,8 +509,7 @@ async function extractSenderFromSource(sourceReceipt, sourceProvider, sourceHash
   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);
@@ -586,10 +588,10 @@ 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,
@@ -619,29 +621,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 +668,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 +732,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 +777,7 @@ async function decodeBridgePayment(hash, clients, options = {}) {
 
 // src/core/payment-decoder.ts
 import { getRouter as getRouter3 } from "@yodlpay/tokenlists";
+import { isAddressEqual as isAddressEqual3 } from "viem";
 async function tryDecodeBridge(hash, clients, options = {}) {
   try {
     return await decodeBridgePayment(hash, clients, options);
@@ -798,10 +808,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 = isAddressEqual3(
+      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 +848,16 @@ async function decodePayment(hash, chainId2, clients, cachedReceipt) {
 // src/core/yodl-payment.ts
 import {
   formatUnits,
+  isAddressEqual as isAddressEqual4,
   zeroAddress
 } from "viem";
 async function buildTokenInfo(params, clients) {
-  const [inToken, outToken] = await Promise.all([
+  const sameToken = isAddressEqual4(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,

package/package.json

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