@yodlpay/payment-decoder 1.3.7 → 1.3.8

package/dist/index.js

@@ -31,7 +31,8 @@ import {
   erc20Abi as erc20Abi2,
   getAddress,
   isAddressEqual as isAddressEqual2,
-  parseEventLogs
+  parseEventLogs,
+  zeroAddress as zeroAddress2
 } from "viem";
 
 // src/abi.ts
@@ -41,6 +42,9 @@ var yodlAbi = getRouterAbi("0.8");
 var relaySwapAbi = parseAbi([
   "event Swap(address indexed sender, address indexed recipient, address inputToken, address outputToken, uint256 inputAmount, uint256 outputAmount)"
 ]);
+var fundsMovementAbi = parseAbi([
+  "event FundsMovement(address from, address to, address currency, uint256 amount, bytes metadata)"
+]);
 
 // src/utils.ts
 import { getTokenByAddress } from "@yodlpay/tokenlists";
@@ -153,6 +157,20 @@ function extractTokenTransfers(logs) {
     return [{ token: log.address, from, to, amount: value }];
   });
 }
+function extractFundsMovements(logs) {
+  const parsed = parseEventLogs({
+    abi: fundsMovementAbi,
+    logs: [...logs],
+    eventName: "FundsMovement",
+    strict: false
+  });
+  return parsed.flatMap((log) => {
+    if (!log.args) return [];
+    const { from, to, currency, amount } = log.args;
+    if (!from || !to || !currency || amount === void 0) return [];
+    return [{ emitter: log.address, from, to, currency, amount }];
+  });
+}
 function isKnownToken(address) {
   return tokenlist.some((t) => isAddressEqual2(t.address, address));
 }
@@ -221,52 +239,68 @@ function findInputTransfer(transfers, sender) {
 }
 function inferSwapFromTransfers(logs, sender, yodlToken) {
   const transfers = extractTokenTransfers(logs);
+  const tokenOutAmount = transfers.filter(
+    (t) => isAddressEqual2(t.to, sender) && isAddressEqual2(t.token, yodlToken)
+  ).reduce((sum, t) => sum + t.amount, 0n);
+  if (tokenOutAmount === 0n) return void 0;
   const outgoingDifferentToken = transfers.filter(
     (t) => isAddressEqual2(t.from, sender) && !isAddressEqual2(t.token, yodlToken)
   );
-  if (outgoingDifferentToken.length === 0) return void 0;
-  const byToken = /* @__PURE__ */ new Map();
-  for (const t of outgoingDifferentToken) {
-    const key = getAddress(t.token);
-    const existing = byToken.get(key);
-    if (existing) {
-      existing.gross += t.amount;
-    } else {
-      byToken.set(key, { token: t.token, gross: t.amount, refund: 0n });
+  if (outgoingDifferentToken.length > 0) {
+    const byToken = /* @__PURE__ */ new Map();
+    for (const t of outgoingDifferentToken) {
+      const key = getAddress(t.token);
+      const existing = byToken.get(key);
+      if (existing) {
+        existing.gross += t.amount;
+      } else {
+        byToken.set(key, { token: t.token, gross: t.amount, refund: 0n });
+      }
     }
-  }
-  const incomingNonYodl = transfers.filter(
-    (t) => isAddressEqual2(t.to, sender) && !isAddressEqual2(t.token, yodlToken)
-  );
-  for (const t of incomingNonYodl) {
-    const key = getAddress(t.token);
-    const existing = byToken.get(key);
-    if (existing) {
-      existing.refund += t.amount;
+    const incomingNonYodl = transfers.filter(
+      (t) => isAddressEqual2(t.to, sender) && !isAddressEqual2(t.token, yodlToken)
+    );
+    for (const t of incomingNonYodl) {
+      const key = getAddress(t.token);
+      const existing = byToken.get(key);
+      if (existing) {
+        existing.refund += t.amount;
+      }
+    }
+    let tokenIn;
+    let tokenInAmount = 0n;
+    for (const { token, gross, refund } of byToken.values()) {
+      const net = gross - refund;
+      if (net > tokenInAmount) {
+        tokenIn = token;
+        tokenInAmount = net;
+      }
     }
+    if (tokenIn && tokenInAmount > 0n) {
+      return {
+        tokenIn,
+        tokenOut: yodlToken,
+        tokenInAmount,
+        tokenOutAmount
+      };
+    }
+    return void 0;
   }
-  let tokenIn;
-  let tokenInAmount = 0n;
-  for (const { token, gross, refund } of byToken.values()) {
-    const net = gross - refund;
-    if (net > tokenInAmount) {
-      tokenIn = token;
-      tokenInAmount = net;
+  let nativeInAmount = 0n;
+  for (const movement of extractFundsMovements(logs)) {
+    if (!isAddressEqual2(movement.currency, zeroAddress2)) continue;
+    if (isAddressEqual2(movement.from, sender)) {
+      nativeInAmount += movement.amount;
+    }
+    if (isAddressEqual2(movement.to, sender)) {
+      nativeInAmount -= movement.amount;
     }
   }
-  if (!tokenIn || tokenInAmount <= 0n) return void 0;
-  const incomingYodlToken = transfers.filter(
-    (t) => isAddressEqual2(t.to, sender) && isAddressEqual2(t.token, yodlToken)
-  );
-  const tokenOutAmount = incomingYodlToken.reduce(
-    (sum, t) => sum + t.amount,
-    0n
-  );
-  if (tokenOutAmount === 0n) return void 0;
+  if (nativeInAmount <= 0n) return void 0;
   return {
-    tokenIn,
+    tokenIn: zeroAddress2,
     tokenOut: yodlToken,
-    tokenInAmount,
+    tokenInAmount: nativeInAmount,
     tokenOutAmount
   };
 }
@@ -426,7 +460,7 @@ import {
   isAddress as isAddress2,
   isAddressEqual as isAddressEqual3,
   parseEventLogs as parseEventLogs2,
-  zeroAddress as zeroAddress2
+  zeroAddress as zeroAddress3
 } from "viem";
 import { entryPoint08Abi, entryPoint08Address } from "viem/account-abstraction";
 
@@ -627,7 +661,7 @@ async function decodeRelayBridgePayment(hash, clients, options = {}) {
       clients
     );
   } catch (error) {
-    if (error instanceof ExpectedDecodeError && inputToken && isAddressEqual3(inputToken, zeroAddress2) && inputAmountGross > 0n) {
+    if (error instanceof ExpectedDecodeError && inputToken && isAddressEqual3(inputToken, zeroAddress3) && inputAmountGross > 0n) {
       const swapEvent = decodeSwapFromLogs(destReceipt.logs);
       const tokenOutAmountGross = swapEvent ? swapEvent.tokenOutAmount : yodlEvent.amount;
       tokens = {
@@ -887,7 +921,7 @@ async function decodePayment(hash, chainId2, clients, cachedReceipt) {
 import {
   formatUnits,
   isAddressEqual as isAddressEqual5,
-  zeroAddress as zeroAddress3
+  zeroAddress as zeroAddress4
 } from "viem";
 async function buildTokenInfo(params, clients) {
   const sameToken = isAddressEqual5(params.tokenIn, params.tokenOut) && params.inChainId === params.outChainId;
@@ -1003,7 +1037,7 @@ async function decodeYodlPayment(txHash2, chainId2, clients, cachedReceipt) {
     cachedReceipt
   );
   const firstWebhook = paymentInfo.webhooks[0];
-  const processorAddress = firstWebhook?.webhookAddress ?? zeroAddress3;
+  const processorAddress = firstWebhook?.webhookAddress ?? zeroAddress4;
   const processorMemo = firstWebhook?.memo ?? "";
   const tokenInfo = await extractTokenInfo(
     paymentInfo,

package/package.json

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