@indexing/jiti 0.0.35 → 0.0.37

package/dist/module.js

@@ -68,7 +68,32 @@ const $bea1ed486f96b980$export$ace043a4f2efe476 = {
         for (const tx of block.transactions){
             if (!tx?.events || !Array.isArray(tx.events)) continue;
             const timestamp = tx.timestamp ? new Date(parseInt(tx.timestamp, 10) / 1000).toISOString() : null;
+            const gasUsed = BigInt(tx.gas_used || "0");
             const transfersByKey = {};
+            const sender = tx.sender;
+            const accountAddressMap = {};
+            const changes = tx.changes;
+            for(let ci = 0; ci < changes.length; ci += 1){
+                if (!changes[ci]?.data) continue;
+                const { address: accountAddress, data: { data: { balance: balance, metadata: metadata }, type: changeType } } = changes[ci];
+                if (changeType === "0x1::fungible_asset::FungibleStore") {
+                    if (!accountAddressMap[accountAddress]) accountAddressMap[accountAddress] = changes[ci + 1]?.data.data.owner;
+                    const to = accountAddressMap[accountAddress];
+                    const tokenAddress = metadata?.inner;
+                    if (!to || !tokenAddress || to === sender) continue;
+                    transfers.push({
+                        amount: BigInt(balance),
+                        blockNumber: parseInt(block.block_height, 10),
+                        from: sender,
+                        to: to,
+                        timestamp: timestamp,
+                        token: tokenAddress,
+                        tokenType: "TOKEN",
+                        transactionGasFee: gasUsed,
+                        transactionHash: tx.hash
+                    });
+                }
+            }
             for (const evt of tx.events){
                 const evtType = evt.type;
                 if (/::(Withdraw|Deposit)[^:]*/.test(evtType)) {
@@ -90,11 +115,11 @@ const $bea1ed486f96b980$export$ace043a4f2efe476 = {
                 if (!partial.from || !partial.to) continue;
                 const fromAddr = partial.from.length < 66 ? `0x0${partial.from.slice(2)}` : partial.from;
                 const toAddr = partial.to.length < 66 ? `0x0${partial.to.slice(2)}` : partial.to;
+                if (toAddr === "0x00") continue;
                 let finalToken = null;
                 let finalTokenType = "TOKEN";
                 if (partial.tokenAddress?.toLowerCase().includes("aptos_coin")) finalToken = null;
                 else finalToken = partial.tokenAddress?.toLowerCase();
-                const gasUsed = BigInt(tx.gas_used || "0");
                 transfers.push({
                     amount: BigInt(partial.amount),
                     blockNumber: parseInt(block.block_height, 10),
@@ -149,6 +174,17 @@ const $bea1ed486f96b980$export$ace043a4f2efe476 = {
             },
             payload: "https://jiti.indexing.co/networks/aptos/303623631",
             output: [
+                {
+                    amount: 3000160n,
+                    blockNumber: 303623631,
+                    from: "0xa4e7455d27731ab857e9701b1e6ed72591132b909fe6e4fd99b66c1d6318d9e8",
+                    timestamp: "2025-03-14T15:39:49.845Z",
+                    to: "0x9317336bfc9ba6987d40492ddea8d41e11b7c2e473f3556a9c82309d326e79ce",
+                    token: "0xbae207659db88bea0cbead6da0ed00aac12edcdda169e591cd41c94180b46f3b",
+                    tokenType: "TOKEN",
+                    transactionGasFee: 16n,
+                    transactionHash: "0x24b8854bad1f6543b35069eacd6ec40a583ca7fa452b422b04d747d24b65279c"
+                },
                 {
                     amount: 1000060n,
                     blockNumber: 303623631,
@@ -161,6 +197,27 @@ const $bea1ed486f96b980$export$ace043a4f2efe476 = {
                     transactionHash: "0x24b8854bad1f6543b35069eacd6ec40a583ca7fa452b422b04d747d24b65279c"
                 }
             ]
+        },
+        {
+            params: {
+                network: "APTOS",
+                contractAddress: "0x357b0b74bc833e95a115ad22604854d6b0fca151cecd94111770e5d6ffc9dc2b",
+                walletAddress: "0x1a07942979574456e8197ac0ba8e3bfcf93d7922493cc3ca0c6b46b580b0a47e"
+            },
+            payload: "https://jiti.indexing.co/networks/aptos/326121833",
+            output: [
+                {
+                    amount: 10000000n,
+                    blockNumber: 326121833,
+                    from: "0xd91c64b777e51395c6ea9dec562ed79a4afa0cd6dad5a87b187c37198a1f855a",
+                    timestamp: "2025-04-19T08:57:28.135Z",
+                    to: "0x1a07942979574456e8197ac0ba8e3bfcf93d7922493cc3ca0c6b46b580b0a47e",
+                    token: "0x357b0b74bc833e95a115ad22604854d6b0fca151cecd94111770e5d6ffc9dc2b",
+                    tokenType: "TOKEN",
+                    transactionGasFee: 10877n,
+                    transactionHash: "0xc5a21679a947f986908b09091516bc3896245d974686ca2bd5709b7dbc5118fb"
+                }
+            ]
         }
     ]
 };
@@ -941,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) {
@@ -962,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){
@@ -985,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);
@@ -1000,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));
@@ -1008,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",
@@ -1227,7 +1369,7 @@ const $f0bdc73ab4ea9846$export$1f0fe79deb1b813b = {
                 }
             ]
         }
-    ].slice(0)
+    ]
 };