@cryptorubic/web3 1.5.1-alpha.tron.5 → 1.5.1-alpha.tron.7

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cryptorubic/web3",
-    "version": "1.5.1-alpha.tron.5",
+    "version": "1.5.1-alpha.tron.7",
     "dependencies": {
         "@ethersproject/bignumber": "^5.8.0",
         "@mysten/sui": "^1.24.0",

package/src/lib/adapter/adapters/adapter-tron/tron-adapter.js

@@ -75,10 +75,10 @@ class TronAdapter extends abstract_adapter_1.AbstractAdapter {
         return tokensBalances;
     }
     async batchMulticallTokenBalance(userAddress, tokensAddresses, batchSize) {
-        const multicalls = [];
+        const balances = [];
         for (let i = 0; i < tokensAddresses.length; i += batchSize) {
             const batchRequest = tokensAddresses.slice(i, i + batchSize);
-            const multicallPromise = this.multicallContractsMethods(trc_20_contract_abi_1.TRC20_CONTRACT_ABI, batchRequest.map((tokenAddress) => ({
+            const batchResult = await this.multicallContractsMethods(trc_20_contract_abi_1.TRC20_CONTRACT_ABI, batchRequest.map((tokenAddress) => ({
                 contractAddress: tokenAddress,
                 methodsData: [
                     {
@@ -87,10 +87,8 @@ class TronAdapter extends abstract_adapter_1.AbstractAdapter {
                     }
                 ]
             })));
-            multicalls.push(multicallPromise);
+            balances.push(...batchResult);
         }
-        const res = await Promise.all(multicalls);
-        const balances = res.map((batchResult) => batchResult.flat());
         return balances;
     }
     // public async multicallContractsMethods<Output extends TronWeb3PrimitiveType>(
@@ -146,7 +144,11 @@ class TronAdapter extends abstract_adapter_1.AbstractAdapter {
             console.log('[multicallContractsMethods] outputs ==>', outputs);
             let outputIndex = 0;
             return contractsData.map((contractData) => contractData.methodsData.map((methodData) => {
-                const output = outputs[outputIndex];
+                const output = outputs.returnData[outputIndex];
+                if (!output) {
+                    console.log('[multicallContractsMethods] Error index:', { outputIndex, outputs });
+                    return { output: null, success: false };
+                }
                 const methodOutputAbi = contractAbi.find((funcSignature) => funcSignature.name === methodData.methodName).outputs;
                 outputIndex++;
                 return {
@@ -156,11 +158,10 @@ class TronAdapter extends abstract_adapter_1.AbstractAdapter {
             }));
         }
         catch (err) {
-            console.log('[multicallContractsMethods] err ==>', err);
             this.logger
                 ? this.logger.customError('[TronAdapter_multicallContractsMethods] Error: ', err)
                 : console.debug('[TronAdapter_multicallContractsMethods] Error:', err);
-            return this.multicallContractsMethodsByOne(contractAbi, contractsData);
+            return contractsData.map((contractData) => contractData.methodsData.map(() => ({ output: null, success: false })));
         }
     }
     async getBlockNumber() {