tx-indexer 0.5.3 → 0.5.4

package/dist/index.js

@@ -1155,21 +1155,38 @@ function determineTokenRole(change, tx, feePayer) {
 }
 
 // ../classification/src/classifiers/transfer-classifier.ts
+function findBestTransferPair(legs) {
+  const senderLegs = legs.filter(
+    (l) => l.accountId.startsWith("external:") && l.side === "debit" && l.role === "sent"
+  );
+  if (senderLegs.length === 0) return null;
+  let bestPair = null;
+  let bestAmount = 0;
+  for (const senderLeg of senderLegs) {
+    const receiverLeg = legs.find(
+      (l) => l.accountId.startsWith("external:") && l.side === "credit" && l.role === "received" && l.amount.token.mint === senderLeg.amount.token.mint && l.accountId !== senderLeg.accountId
+      // Must be different account
+    );
+    if (receiverLeg) {
+      const amount = senderLeg.amount.amountUi;
+      if (amount > bestAmount) {
+        bestAmount = amount;
+        bestPair = { senderLeg, receiverLeg };
+      }
+    }
+  }
+  return bestPair;
+}
 var TransferClassifier = class {
   name = "transfer";
   priority = 20;
   classify(context) {
     const { legs, tx } = context;
     const facilitator = tx.accountKeys ? detectFacilitator(tx.accountKeys) : null;
-    const senderLeg = legs.find(
-      (l) => l.accountId.startsWith("external:") && l.side === "debit" && l.role === "sent"
-    );
-    if (!senderLeg) return null;
+    const pair = findBestTransferPair(legs);
+    if (!pair) return null;
+    const { senderLeg, receiverLeg } = pair;
     const sender = senderLeg.accountId.replace("external:", "");
-    const receiverLeg = legs.find(
-      (l) => l.accountId.startsWith("external:") && l.side === "credit" && l.role === "received" && l.amount.token.mint === senderLeg.amount.token.mint
-    );
-    if (!receiverLeg) return null;
     const receiver = receiverLeg.accountId.replace("external:", "");
     return {
       primaryType: "transfer",
@@ -1648,6 +1665,27 @@ var FeeOnlyClassifier = class {
 };
 
 // ../classification/src/classifiers/solana-pay-classifier.ts
+function findBestTransferPair2(legs) {
+  const senderLegs = legs.filter(
+    (l) => l.accountId.startsWith("external:") && l.side === "debit" && l.role === "sent"
+  );
+  if (senderLegs.length === 0) return null;
+  let bestPair = null;
+  let bestAmount = 0;
+  for (const senderLeg of senderLegs) {
+    const receiverLeg = legs.find(
+      (l) => l.accountId.startsWith("external:") && l.side === "credit" && l.role === "received" && l.amount.token.mint === senderLeg.amount.token.mint && l.accountId !== senderLeg.accountId
+    );
+    if (receiverLeg) {
+      const amount = senderLeg.amount.amountUi;
+      if (amount > bestAmount) {
+        bestAmount = amount;
+        bestPair = { senderLeg, receiverLeg };
+      }
+    }
+  }
+  return bestPair;
+}
 var SolanaPayClassifier = class {
   name = "solana-pay";
   priority = 95;
@@ -1657,12 +1695,9 @@ var SolanaPayClassifier = class {
       return null;
     }
     const memo = parseSolanaPayMemo(tx.memo);
-    const senderLeg = legs.find(
-      (leg) => leg.accountId.startsWith("external:") && leg.side === "debit" && leg.role === "sent"
-    );
-    const receiverLeg = legs.find(
-      (leg) => leg.accountId.startsWith("external:") && leg.side === "credit" && leg.role === "received"
-    );
+    const pair = findBestTransferPair2(legs);
+    const senderLeg = pair?.senderLeg ?? null;
+    const receiverLeg = pair?.receiverLeg ?? null;
     const sender = senderLeg?.accountId.replace("external:", "") ?? null;
     const receiver = receiverLeg?.accountId.replace("external:", "") ?? null;
     const primaryAmount = senderLeg?.amount ?? receiverLeg?.amount ?? null;