@indexing/jiti 0.0.36 → 0.0.37

package/dist/module.js

@@ -998,7 +998,18 @@ const $f0bdc73ab4ea9846$export$1f0fe79deb1b813b = {
                     };
                     if (isNegDiff) delete txfer.to;
                     else delete txfer.from;
-                    transfersByKey[key] = Object.assign(transfersByKey[key] || {}, txfer);
+                    if (!transfersByKey[key]) transfersByKey[key] = [
+                        txfer
+                    ];
+                    else {
+                        let didMerge = false;
+                        for(let tbi = 0; tbi < transfersByKey[key].length; tbi += 1)if (txfer.to && !transfersByKey[key][tbi].to || txfer.from && !transfersByKey[key][tbi].from) {
+                            didMerge = true;
+                            transfersByKey[key][tbi] = Object.assign(transfersByKey[key][tbi] || {}, txfer);
+                            break;
+                        }
+                        if (!didMerge) transfersByKey[key].push(txfer);
+                    }
                     matched = true;
                 }
                 if (!matched) {
@@ -1019,7 +1030,18 @@ const $f0bdc73ab4ea9846$export$1f0fe79deb1b813b = {
                     };
                     if (isNegDiff) delete txfer.to;
                     else delete txfer.from;
-                    transfersByKey[key] = Object.assign(transfersByKey[key] || {}, txfer);
+                    if (!transfersByKey[key]) transfersByKey[key] = [
+                        txfer
+                    ];
+                    else {
+                        let didMerge = false;
+                        for(let tbi = 0; tbi < transfersByKey[key].length; tbi += 1)if (txfer.to && !transfersByKey[key][tbi].to || txfer.from && !transfersByKey[key][tbi].from) {
+                            didMerge = true;
+                            transfersByKey[key][tbi] = Object.assign(transfersByKey[key][tbi] || {}, txfer);
+                            break;
+                        }
+                        if (!didMerge) transfersByKey[key].push(txfer);
+                    }
                 }
             }
             for(let i = 0; i < solanaTx.meta.postBalances.length; i += 1){
@@ -1042,13 +1064,23 @@ const $f0bdc73ab4ea9846$export$1f0fe79deb1b813b = {
                     };
                     if (post > pre) delete txfer.from;
                     else delete txfer.to;
-                    transfersByKey[key] = Object.assign(transfersByKey[key] || {}, txfer);
+                    if (!transfersByKey[key]) transfersByKey[key] = [
+                        txfer
+                    ];
+                    else {
+                        let didMerge = false;
+                        for(let tbi = 0; tbi < transfersByKey[key].length; tbi += 1)if (txfer.to && !transfersByKey[key][tbi].to || txfer.from && !transfersByKey[key][tbi].from) {
+                            didMerge = true;
+                            transfersByKey[key][tbi] = Object.assign(transfersByKey[key][tbi] || {}, txfer);
+                            break;
+                        }
+                        if (!didMerge) transfersByKey[key].push(txfer);
+                    }
                 }
             }
             const unmatchedFrom = {};
             const unmatchedTo = {};
-            for(const key in transfersByKey){
-                const txfer = transfersByKey[key];
+            for(const key in transfersByKey)for (const txfer of transfersByKey[key]){
                 if (!txfer.from) {
                     if (!unmatchedFrom[txfer.token]) unmatchedFrom[txfer.token] = [];
                     unmatchedFrom[txfer.token].push(txfer);
@@ -1057,7 +1089,7 @@ const $f0bdc73ab4ea9846$export$1f0fe79deb1b813b = {
                     if (!unmatchedTo[txfer.token]) unmatchedTo[txfer.token] = [];
                     unmatchedTo[txfer.token].push(txfer);
                     delete transfersByKey[key];
-                }
+                } else transfers.push(txfer);
             }
             for(const token in unmatchedFrom)if (unmatchedTo[token]?.length && unmatchedFrom[token]?.length) {
                 const unmatchedDiff = unmatchedTo[token].reduce((a, b)=>a + BigInt(b.amount), BigInt(0)) - unmatchedFrom[token].reduce((a, b)=>a + BigInt(b.amount), BigInt(0));
@@ -1065,15 +1097,68 @@ const $f0bdc73ab4ea9846$export$1f0fe79deb1b813b = {
                     unmatchedTo[token].sort((a, b)=>a.amount > b.amount ? 1 : -1);
                     unmatchedFrom[token].forEach((um)=>{
                         um.from = unmatchedTo[token][0].from;
-                        transfersByKey[`${token}-${um.amount.toString()}`] = um;
+                        transfers.push(um);
                     });
                 }
             }
-            transfers.push(...Object.values(transfersByKey));
         }
         return transfers;
     },
     tests: [
+        {
+            params: {
+                network: "SOLANA",
+                walletAddress: "DgC9bBDvJYeVyTqcp8nW5F5USNvxBiZ9NMoTUVy5UVPz",
+                contractAddress: "6MQpbiTC2YcogidTmKqMLK82qvE9z5QEm7EP3AEDpump"
+            },
+            payload: "https://jiti.indexing.co/networks/solana/345871978",
+            output: [
+                {
+                    amount: 10492578617n,
+                    blockNumber: 324081557,
+                    from: "DgC9bBDvJYeVyTqcp8nW5F5USNvxBiZ9NMoTUVy5UVPz",
+                    timestamp: "2025-06-10T12:06:56.000Z",
+                    to: "ChkRerg6X89xHYqV4iBqcboBdU1WA8Uvs9fp2yZrqbg",
+                    token: "6MQpbiTC2YcogidTmKqMLK82qvE9z5QEm7EP3AEDpump",
+                    tokenType: "TOKEN",
+                    transactionGasFee: 2506024n,
+                    transactionHash: "65sABMeYatoyzsp1mL6UjAXoBqUdw47HR33ouvR9BFNipTNydqvWTt8PMbVqZZfvnX3TzwB3XSdk55cy3N6u8okR"
+                },
+                {
+                    amount: 10492578617n,
+                    blockNumber: 324081557,
+                    from: "DgC9bBDvJYeVyTqcp8nW5F5USNvxBiZ9NMoTUVy5UVPz",
+                    timestamp: "2025-06-10T12:06:56.000Z",
+                    to: "3shatpFgdVVwy8Pr723iE9L1fozzaXNdGYKtgrSwHYeJ",
+                    token: "6MQpbiTC2YcogidTmKqMLK82qvE9z5QEm7EP3AEDpump",
+                    tokenType: "TOKEN",
+                    transactionGasFee: 2506024n,
+                    transactionHash: "65sABMeYatoyzsp1mL6UjAXoBqUdw47HR33ouvR9BFNipTNydqvWTt8PMbVqZZfvnX3TzwB3XSdk55cy3N6u8okR"
+                },
+                {
+                    amount: 16788125787n,
+                    blockNumber: 324081557,
+                    from: "DgC9bBDvJYeVyTqcp8nW5F5USNvxBiZ9NMoTUVy5UVPz",
+                    timestamp: "2025-06-10T12:06:56.000Z",
+                    to: "GWPLjamb5ZxrGbTsYNWW7V3p1pAMryZSfaPFTdaEsWgC",
+                    token: "6MQpbiTC2YcogidTmKqMLK82qvE9z5QEm7EP3AEDpump",
+                    tokenType: "TOKEN",
+                    transactionGasFee: 2506024n,
+                    transactionHash: "65sABMeYatoyzsp1mL6UjAXoBqUdw47HR33ouvR9BFNipTNydqvWTt8PMbVqZZfvnX3TzwB3XSdk55cy3N6u8okR"
+                },
+                {
+                    amount: 4197031447n,
+                    blockNumber: 324081557,
+                    from: "DgC9bBDvJYeVyTqcp8nW5F5USNvxBiZ9NMoTUVy5UVPz",
+                    timestamp: "2025-06-10T12:06:56.000Z",
+                    to: "ANcfLC9JcbYbEWu71fE8973V8S6vD5hS98RNrz56hrT7",
+                    token: "6MQpbiTC2YcogidTmKqMLK82qvE9z5QEm7EP3AEDpump",
+                    tokenType: "TOKEN",
+                    transactionGasFee: 2506024n,
+                    transactionHash: "65sABMeYatoyzsp1mL6UjAXoBqUdw47HR33ouvR9BFNipTNydqvWTt8PMbVqZZfvnX3TzwB3XSdk55cy3N6u8okR"
+                }
+            ]
+        },
         {
             params: {
                 network: "SOLANA",
@@ -1284,7 +1369,7 @@ const $f0bdc73ab4ea9846$export$1f0fe79deb1b813b = {
                 }
             ]
         }
-    ].slice(0)
+    ]
 };