@cryptorubic/web3 1.5.1-alpha.tron.4 → 1.5.1-alpha.tron.6

package/package.json

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

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

@@ -63,7 +63,7 @@ class TronAdapter extends abstract_adapter_1.AbstractAdapter {
             tokensAddresses.splice(indexOfNativeCoin, 1);
             promises[1] = this.getBalance(userAddress);
         }
-        promises[0] = this.batchMulticallTokenBalance(userAddress, tokensAddresses, 50);
+        promises[0] = this.batchMulticallTokenBalance(userAddress, tokensAddresses, 10);
         const results = await Promise.all(promises);
         const tokensBalances = results[0].map((tokenResults) => {
             const { success, output } = tokenResults[0];
@@ -75,32 +75,21 @@ class TronAdapter extends abstract_adapter_1.AbstractAdapter {
         return tokensBalances;
     }
     async batchMulticallTokenBalance(userAddress, tokensAddresses, batchSize) {
-        if (tokensAddresses.length > 100) {
-            const balances = [];
-            for (let i = 0; i < tokensAddresses.length; i += batchSize) {
-                const batchRequest = tokensAddresses.slice(i, i + batchSize);
-                const batchResult = await this.multicallContractsMethods(trc_20_contract_abi_1.TRC20_CONTRACT_ABI, batchRequest.map((tokenAddress) => ({
-                    contractAddress: tokenAddress,
-                    methodsData: [
-                        {
-                            methodName: 'balanceOf',
-                            methodArguments: [userAddress]
-                        }
-                    ]
-                })));
-                balances.push(...batchResult);
-            }
-            return balances;
+        const balances = [];
+        for (let i = 0; i < tokensAddresses.length; i += batchSize) {
+            const batchRequest = tokensAddresses.slice(i, i + batchSize);
+            const batchResult = await this.multicallContractsMethods(trc_20_contract_abi_1.TRC20_CONTRACT_ABI, batchRequest.map((tokenAddress) => ({
+                contractAddress: tokenAddress,
+                methodsData: [
+                    {
+                        methodName: 'balanceOf',
+                        methodArguments: [userAddress]
+                    }
+                ]
+            })));
+            balances.push(...batchResult);
         }
-        return this.multicallContractsMethods(trc_20_contract_abi_1.TRC20_CONTRACT_ABI, tokensAddresses.map((tokenAddress) => ({
-            contractAddress: tokenAddress,
-            methodsData: [
-                {
-                    methodName: 'balanceOf',
-                    methodArguments: [userAddress]
-                }
-            ]
-        })));
+        return balances;
     }
     // public async multicallContractsMethods<Output extends TronWeb3PrimitiveType>(
     //     contractAbi: any,
@@ -156,6 +145,10 @@ class TronAdapter extends abstract_adapter_1.AbstractAdapter {
             let outputIndex = 0;
             return contractsData.map((contractData) => contractData.methodsData.map((methodData) => {
                 const output = outputs[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 {
@@ -165,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() {

package/src/lib/adapter/adapters/constants/tron-multicall-abi.js

@@ -54,239 +54,3 @@ exports.TRON_MULTICALL_ABI = [
         type: 'function'
     }
 ];
-[
-    {
-        inputs: [
-            {
-                components: [
-                    { internalType: 'address', name: 'target', type: 'address' },
-                    { internalType: 'bytes', name: 'callData', type: 'bytes' }
-                ],
-                internalType: 'struct Multicall3.Call[]',
-                name: 'calls',
-                type: 'tuple[]'
-            }
-        ],
-        name: 'aggregate',
-        outputs: [
-            { internalType: 'uint256', name: 'blockNumber', type: 'uint256' },
-            { internalType: 'bytes[]', name: 'returnData', type: 'bytes[]' }
-        ],
-        stateMutability: 'payable',
-        type: 'function'
-    },
-    {
-        inputs: [
-            {
-                components: [
-                    { internalType: 'address', name: 'target', type: 'address' },
-                    { internalType: 'bool', name: 'allowFailure', type: 'bool' },
-                    { internalType: 'bytes', name: 'callData', type: 'bytes' }
-                ],
-                internalType: 'struct Multicall3.Call3[]',
-                name: 'calls',
-                type: 'tuple[]'
-            }
-        ],
-        name: 'aggregate3',
-        outputs: [
-            {
-                components: [
-                    { internalType: 'bool', name: 'success', type: 'bool' },
-                    { internalType: 'bytes', name: 'returnData', type: 'bytes' }
-                ],
-                internalType: 'struct Multicall3.Result[]',
-                name: 'returnData',
-                type: 'tuple[]'
-            }
-        ],
-        stateMutability: 'payable',
-        type: 'function'
-    },
-    {
-        inputs: [
-            {
-                components: [
-                    { internalType: 'address', name: 'target', type: 'address' },
-                    { internalType: 'bool', name: 'allowFailure', type: 'bool' },
-                    { internalType: 'uint256', name: 'value', type: 'uint256' },
-                    { internalType: 'bytes', name: 'callData', type: 'bytes' }
-                ],
-                internalType: 'struct Multicall3.Call3Value[]',
-                name: 'calls',
-                type: 'tuple[]'
-            }
-        ],
-        name: 'aggregate3Value',
-        outputs: [
-            {
-                components: [
-                    { internalType: 'bool', name: 'success', type: 'bool' },
-                    { internalType: 'bytes', name: 'returnData', type: 'bytes' }
-                ],
-                internalType: 'struct Multicall3.Result[]',
-                name: 'returnData',
-                type: 'tuple[]'
-            }
-        ],
-        stateMutability: 'payable',
-        type: 'function'
-    },
-    {
-        inputs: [
-            {
-                components: [
-                    { internalType: 'address', name: 'target', type: 'address' },
-                    { internalType: 'bytes', name: 'callData', type: 'bytes' }
-                ],
-                internalType: 'struct Multicall3.Call[]',
-                name: 'calls',
-                type: 'tuple[]'
-            }
-        ],
-        name: 'blockAndAggregate',
-        outputs: [
-            { internalType: 'uint256', name: 'blockNumber', type: 'uint256' },
-            { internalType: 'bytes32', name: 'blockHash', type: 'bytes32' },
-            {
-                components: [
-                    { internalType: 'bool', name: 'success', type: 'bool' },
-                    { internalType: 'bytes', name: 'returnData', type: 'bytes' }
-                ],
-                internalType: 'struct Multicall3.Result[]',
-                name: 'returnData',
-                type: 'tuple[]'
-            }
-        ],
-        stateMutability: 'payable',
-        type: 'function'
-    },
-    {
-        inputs: [],
-        name: 'getBasefee',
-        outputs: [{ internalType: 'uint256', name: 'basefee', type: 'uint256' }],
-        stateMutability: 'view',
-        type: 'function'
-    },
-    {
-        inputs: [{ internalType: 'uint256', name: 'blockNumber', type: 'uint256' }],
-        name: 'getBlockHash',
-        outputs: [{ internalType: 'bytes32', name: 'blockHash', type: 'bytes32' }],
-        stateMutability: 'view',
-        type: 'function'
-    },
-    {
-        inputs: [],
-        name: 'getBlockNumber',
-        outputs: [{ internalType: 'uint256', name: 'blockNumber', type: 'uint256' }],
-        stateMutability: 'view',
-        type: 'function'
-    },
-    {
-        inputs: [],
-        name: 'getChainId',
-        outputs: [{ internalType: 'uint256', name: 'chainid', type: 'uint256' }],
-        stateMutability: 'view',
-        type: 'function'
-    },
-    {
-        inputs: [],
-        name: 'getCurrentBlockCoinbase',
-        outputs: [{ internalType: 'address', name: 'coinbase', type: 'address' }],
-        stateMutability: 'view',
-        type: 'function'
-    },
-    {
-        inputs: [],
-        name: 'getCurrentBlockDifficulty',
-        outputs: [{ internalType: 'uint256', name: 'difficulty', type: 'uint256' }],
-        stateMutability: 'view',
-        type: 'function'
-    },
-    {
-        inputs: [],
-        name: 'getCurrentBlockGasLimit',
-        outputs: [{ internalType: 'uint256', name: 'gaslimit', type: 'uint256' }],
-        stateMutability: 'view',
-        type: 'function'
-    },
-    {
-        inputs: [],
-        name: 'getCurrentBlockTimestamp',
-        outputs: [{ internalType: 'uint256', name: 'timestamp', type: 'uint256' }],
-        stateMutability: 'view',
-        type: 'function'
-    },
-    {
-        inputs: [{ internalType: 'address', name: 'addr', type: 'address' }],
-        name: 'getEthBalance',
-        outputs: [{ internalType: 'uint256', name: 'balance', type: 'uint256' }],
-        stateMutability: 'view',
-        type: 'function'
-    },
-    {
-        inputs: [],
-        name: 'getLastBlockHash',
-        outputs: [{ internalType: 'bytes32', name: 'blockHash', type: 'bytes32' }],
-        stateMutability: 'view',
-        type: 'function'
-    },
-    {
-        inputs: [
-            { internalType: 'bool', name: 'requireSuccess', type: 'bool' },
-            {
-                components: [
-                    { internalType: 'address', name: 'target', type: 'address' },
-                    { internalType: 'bytes', name: 'callData', type: 'bytes' }
-                ],
-                internalType: 'struct Multicall3.Call[]',
-                name: 'calls',
-                type: 'tuple[]'
-            }
-        ],
-        name: 'tryAggregate',
-        outputs: [
-            {
-                components: [
-                    { internalType: 'bool', name: 'success', type: 'bool' },
-                    { internalType: 'bytes', name: 'returnData', type: 'bytes' }
-                ],
-                internalType: 'struct Multicall3.Result[]',
-                name: 'returnData',
-                type: 'tuple[]'
-            }
-        ],
-        stateMutability: 'payable',
-        type: 'function'
-    },
-    {
-        inputs: [
-            { internalType: 'bool', name: 'requireSuccess', type: 'bool' },
-            {
-                components: [
-                    { internalType: 'address', name: 'target', type: 'address' },
-                    { internalType: 'bytes', name: 'callData', type: 'bytes' }
-                ],
-                internalType: 'struct Multicall3.Call[]',
-                name: 'calls',
-                type: 'tuple[]'
-            }
-        ],
-        name: 'tryBlockAndAggregate',
-        outputs: [
-            { internalType: 'uint256', name: 'blockNumber', type: 'uint256' },
-            { internalType: 'bytes32', name: 'blockHash', type: 'bytes32' },
-            {
-                components: [
-                    { internalType: 'bool', name: 'success', type: 'bool' },
-                    { internalType: 'bytes', name: 'returnData', type: 'bytes' }
-                ],
-                internalType: 'struct Multicall3.Result[]',
-                name: 'returnData',
-                type: 'tuple[]'
-            }
-        ],
-        stateMutability: 'payable',
-        type: 'function'
-    }
-];