@defillama/sdk 5.0.173 → 5.0.177

package/build/Balances.d.ts

@@ -65,7 +65,7 @@ export declare class Balances {
         rawTokenBalances: BalancesV1;
         labelBreakdown?: {
             [key: string]: number;
-        } | undefined;
+        };
         debugData?: {
             tokenData: {
                 balance: string | number;
@@ -76,7 +76,7 @@ export declare class Balances {
                 token: string;
                 symbol: string;
             }[];
-        } | undefined;
+        };
     }>;
     resizeBy(ratio: number): this;
     static getUSDValue(balances: BalancesV1, timestamp?: number): Promise<number>;

package/build/ChainApi.d.ts

@@ -12,6 +12,23 @@ type Erc4626SumOptions = {
     permitFailure?: boolean;
     isOG4626?: boolean;
 };
+type GetTokenBalancesOptions = {
+    token?: string;
+    tokens?: string[];
+    owner?: string;
+    owners?: string[];
+    tokensAndOwners?: [string, string][];
+    tokensAndOwners2?: [string[], string[]];
+    ownerTokens?: [string[], string][];
+    blacklistedTokens?: string[];
+    blacklistedOwners?: string[];
+    skipDuplicates?: boolean;
+    permitFailure?: boolean;
+    withTokenData?: boolean;
+};
+type SumTokensOptions = GetTokenBalancesOptions & {
+    balancesV2Options?: BalancesV2Options;
+};
 type DebugStats = {
     total: number;
     [key: string]: any;
@@ -61,18 +78,13 @@ export declare class ChainApi {
     deleteTokens(tokens: string[]): void;
     erc4626Sum2(options: Erc4626SumOptions): Promise<BalancesV1>;
     erc4626Sum({ calls, tokenAbi, balanceAbi, balanceCalls, permitFailure, isOG4626 }: Erc4626SumOptions): Promise<BalancesV1>;
-    sumTokens({ token, tokens, owners, owner, tokensAndOwners, tokensAndOwners2, blacklistedTokens, blacklistedOwners, ownerTokens, balancesV2Options, }: {
-        token?: string;
-        tokens?: string[];
-        owner?: string;
-        owners?: string[];
-        tokensAndOwners?: string[][];
-        tokensAndOwners2?: string[][];
-        ownerTokens?: any[];
-        blacklistedTokens?: string[];
-        blacklistedOwners?: string[];
-        balancesV2Options?: BalancesV2Options;
-    }): Promise<BalancesV1>;
+    getTokenBalances({ token, tokens, owners, owner, tokensAndOwners, tokensAndOwners2, blacklistedTokens, blacklistedOwners, ownerTokens, skipDuplicates, permitFailure, withTokenData, }: GetTokenBalancesOptions): Promise<string[] | [token: string, balance: string][]>;
+    sumTokens({ balancesV2Options, ...tokenBalanceOptions }: SumTokensOptions): Promise<BalancesV1>;
+    getERC20TokenBalances(options: GetTokenBalancesOptions): Promise<string[] | [token: string, balance: string][]>;
+    getGasTokenBalance(owner: string, options?: GetTokenBalancesOptions): Promise<string | [token: string, balance: string]>;
+    getGasTokenBalances(options: GetTokenBalancesOptions): Promise<string[] | [token: string, balance: string][]>;
+    getEthBalance(owner: string, options?: GetTokenBalancesOptions): Promise<string | [token: string, balance: string]>;
+    getEthBalances(options: GetTokenBalancesOptions): Promise<string[] | [token: string, balance: string][]>;
     getUSDValue(): Promise<number>;
     getUSDString(): Promise<string>;
     getUSDJSONs(): Promise<{
@@ -81,7 +93,7 @@ export declare class ChainApi {
         rawTokenBalances: BalancesV1;
         labelBreakdown?: {
             [key: string]: number;
-        } | undefined;
+        };
         debugData?: {
             tokenData: {
                 balance: string | number;
@@ -92,7 +104,7 @@ export declare class ChainApi {
                 token: string;
                 symbol: string;
             }[];
-        } | undefined;
+        };
     }>;
     getLogs(params: GetLogsOptions): Promise<any[] | import("ethers").EventLog[] | import("ethers").EventLog[][]>;
     getBalancesV2(): Balances;

package/build/ChainApi.js

@@ -3,15 +3,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDebugStats = exports.ChainApi = void 0;
+exports.ChainApi = void 0;
+exports.getDebugStats = getDebugStats;
 const abi2_1 = require("./abi/abi2");
 const Balances_1 = __importDefault(require("./Balances"));
 const blocks_1 = require("./computeTVL/blocks");
 const general_1 = require("./general");
 const providers_json_1 = __importDefault(require("./providers.json"));
-const multicall3_1 = require("./abi/multicall3");
 const eth_1 = require("./eth");
-const generalUtil_1 = require("./generalUtil");
+const common_1 = require("./util/common");
 const debugLog_1 = require("./util/debugLog");
 const logs_1 = __importDefault(require("./util/logs"));
 const transactions_1 = require("./util/transactions");
@@ -164,7 +164,7 @@ class ChainApi {
             });
         return this.getBalances();
     }
-    async sumTokens({ token, tokens = [], owners = [], owner, tokensAndOwners = [], tokensAndOwners2 = [], blacklistedTokens = [], blacklistedOwners = [], ownerTokens = [], balancesV2Options = {}, }) {
+    async getTokenBalances({ token, tokens = [], owners = [], owner, tokensAndOwners = [], tokensAndOwners2 = [], blacklistedTokens = [], blacklistedOwners = [], ownerTokens = [], skipDuplicates = false, permitFailure = false, withTokenData = false, }) {
         if (tokensAndOwners2.length)
             tokensAndOwners.push(...tokensAndOwners2[0].map((i, j) => [i, tokensAndOwners2[1][j]]));
         if (token)
@@ -176,36 +176,67 @@ class ChainApi {
         }
         for (const [tokens, owner] of ownerTokens)
             tokens.forEach((i) => tokensAndOwners.push([i, owner]));
-        tokensAndOwners = getUniqueTokensAndOwners(tokensAndOwners, this.chain);
-        blacklistedOwners = (0, generalUtil_1.getUniqueAddresses)(blacklistedOwners);
-        blacklistedTokens = (0, generalUtil_1.getUniqueAddresses)(blacklistedTokens);
+        if (skipDuplicates)
+            tokensAndOwners = getUniqueTokensAndOwners(tokensAndOwners, this.chain);
+        blacklistedOwners = (0, common_1.getUniqueAddresses)(blacklistedOwners);
+        blacklistedTokens = (0, common_1.getUniqueAddresses)(blacklistedTokens);
         tokensAndOwners = tokensAndOwners.filter(i => !blacklistedTokens.includes(i[0]) && !blacklistedOwners.includes(i[1]));
-        const ethBalOwners = tokensAndOwners.filter(i => i[0] === nullAddress).map(i => i[1]);
-        tokensAndOwners = tokensAndOwners.filter(i => i[0] !== nullAddress);
-        this.addStat('sumTokens', tokensAndOwners.length + ethBalOwners.length, true);
+        const tokenBalances = [];
+        const erc20TokensResponseIndex = [];
+        const ethBalanceResponseIndex = [];
+        const erc20TokensAndOwners = [];
+        const ethBalOwners = [];
+        tokensAndOwners.forEach((i, j) => {
+            if (i[0] !== nullAddress) {
+                erc20TokensAndOwners.push(i);
+                erc20TokensResponseIndex.push(j);
+            }
+            else {
+                ethBalOwners.push(i[1]);
+                ethBalanceResponseIndex.push(j);
+            }
+        });
+        this.addStat('sumTokens', erc20TokensAndOwners.length + ethBalOwners.length, true);
         const bals = await this.multiCall({
-            calls: tokensAndOwners.map(i => ({ target: i[0], params: [i[1]] })),
+            calls: erc20TokensAndOwners.map(([token, owner]) => ({ target: token, params: [owner] })),
             abi: 'erc20:balanceOf',
+            permitFailure,
+        });
+        bals.forEach((i, j) => {
+            if (!i)
+                i = '0';
+            const token = erc20TokensAndOwners[j][0];
+            const responseIndex = erc20TokensResponseIndex[j];
+            tokenBalances[responseIndex] = [token, i];
         });
-        this.addTokens(tokensAndOwners.map(i => i[0]), bals, balancesV2Options);
         if (ethBalOwners.length) {
-            let ethBals = [];
-            const multicallAddress = (0, multicall3_1.getMulticallAddress)(this.chain, this.block);
-            if (multicallAddress) {
-                ethBals = await this.multiCall({
-                    calls: ethBalOwners,
-                    target: multicallAddress,
-                    abi: 'function getEthBalance(address) view returns (uint256)',
-                });
-            }
-            else {
-                const res = await (0, eth_1.getBalances)({ chain: this.chain, targets: ethBalOwners, block: this.block });
-                ethBals = res.output.map((i) => i.balance);
-            }
-            ethBals.map(i => this.addToken(nullAddress, i, balancesV2Options));
+            let ethBals = (await (0, eth_1.getBalances)({ chain: this.chain, targets: ethBalOwners, block: this.block, permitFailure })).output.map((i) => i.balance);
+            ethBals.map((i, idx) => tokenBalances[ethBalanceResponseIndex[idx]] = [nullAddress, i]);
         }
+        if (!withTokenData)
+            return tokenBalances.map(i => i[1]);
+        return tokenBalances;
+    }
+    async sumTokens({ balancesV2Options = {}, ...tokenBalanceOptions }) {
+        const tokenBalances = await this.getTokenBalances({ ...tokenBalanceOptions, skipDuplicates: true, withTokenData: true });
+        tokenBalances.forEach(([token, balance]) => this.addToken(token, balance, balancesV2Options));
         return this.getBalances();
     }
+    async getERC20TokenBalances(options) {
+        return this.getTokenBalances(options);
+    }
+    async getGasTokenBalance(owner, options) {
+        return (await this.getGasTokenBalances({ ...options, owner, }))[0];
+    }
+    async getGasTokenBalances(options) {
+        return this.getTokenBalances({ ...options, token: nullAddress });
+    }
+    async getEthBalance(owner, options) {
+        return this.getGasTokenBalance(owner, options !== null && options !== void 0 ? options : {});
+    }
+    async getEthBalances(options) {
+        return this.getGasTokenBalances(options);
+    }
     async getUSDValue() {
         return this._balances.getUSDValue();
     }
@@ -239,10 +270,9 @@ function getUniqueTokensAndOwners(toa, chain) {
     if (!toa.length)
         return [];
     const mergedToa = toa.map(i => i.join('~'));
-    const uniqueMerged = (0, generalUtil_1.getUniqueAddresses)(mergedToa, chain);
+    const uniqueMerged = (0, common_1.getUniqueAddresses)(mergedToa, chain);
     return uniqueMerged.map(i => i.split('~'));
 }
 function getDebugStats() {
     return callStatsByProject;
 }
-exports.getDebugStats = getDebugStats;

package/build/abi/abi2.js

@@ -15,17 +15,29 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.bytecodeCall = exports.fetchList = exports.multiCall = exports.call = void 0;
+exports.call = call;
+exports.multiCall = multiCall;
+exports.fetchList = fetchList;
+exports.bytecodeCall = bytecodeCall;
 const abi1 = __importStar(require("./index"));
-const debugLog_1 = require("../util/debugLog");
 async function call(params) {
     try {
         const response = await abi1.call(params);
@@ -43,7 +55,6 @@ async function call(params) {
         return null;
     }
 }
-exports.call = call;
 async function multiCall(params) {
     if (params.excludeFailed)
         params.permitFailure = true;
@@ -66,7 +77,6 @@ async function multiCall(params) {
         return output;
     return output.map((i) => i.output);
 }
-exports.multiCall = multiCall;
 async function fetchList(params) {
     // itemAbi2 is used when we need to make a second call to get the final result
     let { startFrom = 0, lengthAbi, itemAbi, withMetadata, startFromOne = false, itemCount, target, targets, calls: _targets, chain, block, permitFailure, groupedByInput, excludeFailed, itemAbi2, field, field2, } = params;
@@ -93,7 +103,7 @@ async function fetchList(params) {
             itemLength = itemCount;
         else
             itemLength = await call({ chain, block, target, abi: lengthAbi, });
-        (0, debugLog_1.debugLog)('length: ', itemLength);
+        // debugLog('length: ', itemLength)
         if (startFromOne) {
             itemLength++;
             if (startFrom === 0)
@@ -110,7 +120,7 @@ async function fetchList(params) {
         itemLengths = targets.map(() => itemCount);
     else
         itemLengths = await multiCall({ chain, block, calls: targets, abi: lengthAbi, });
-    (0, debugLog_1.debugLog)('itemLengths: ', itemLengths);
+    // debugLog('itemLengths: ', itemLengths)
     let groupedByRes = itemLengths.map(() => []);
     const indexToTargetMapping = {};
     let k = 0;
@@ -146,11 +156,9 @@ async function fetchList(params) {
     res2.forEach((i, idx) => groupedByRes[indexToTargetMapping[idx]].push(i));
     return groupedByRes;
 }
-exports.fetchList = fetchList;
 async function bytecodeCall(params) {
     const response = await abi1.bytecodeCall(params);
     if (params.withMetadata)
         return response;
     return response.output;
 }
-exports.bytecodeCall = bytecodeCall;

package/build/abi/cachedABIs.d.ts

@@ -1,4 +1,4 @@
 declare const _default: {
-    [method: string]: any;
+    [method: string]: any | undefined;
 };
 export default _default;

package/build/abi/convertResults.d.ts

@@ -1,2 +1,5 @@
 import { ethers } from "ethers";
-export default function (results: ethers.Result, functionABI?: ethers.FunctionFragment): any;
+export default function (results: ethers.Result, { functionABI, chain }?: {
+    functionABI?: ethers.FunctionFragment;
+    chain?: string;
+}): any;

package/build/abi/convertResults.js

@@ -1,5 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
+const common_1 = require("../util/common");
 function isNumberOrBigNumber(value) {
     return typeof value === 'bigint' || typeof value === "number";
 }
@@ -17,7 +19,7 @@ function stringifyBigNumbers(result) {
     });
     return final;
 }
-function default_1(results, functionABI) {
+function default_1(results, { functionABI, chain } = {}) {
     let response;
     if (typeof results === "string" || typeof results === "boolean")
         return results;
@@ -25,11 +27,9 @@ function default_1(results, functionABI) {
         return results.toString();
     response = stringifyBigNumbers(results);
     if (functionABI && functionABI.outputs) {
-        const outputNames = functionABI.outputs.map((i) => i.name);
-        outputNames.map((name, i) => {
-            setComponentDetails(response[i], functionABI.outputs[i]);
-            if (name)
-                response[name] = response[i];
+        functionABI.outputs.map((componentDefinition, i) => {
+            setComponentDetails(response[i], componentDefinition, chain);
+            setNameAndTranformAddress({ response, componentDefinition, chain, index: i });
         });
     }
     if (response instanceof Array)
@@ -37,19 +37,24 @@ function default_1(results, functionABI) {
             return response[0];
     return response;
 }
-exports.default = default_1;
-function setComponentDetails(component, componentDefinition) {
+function setComponentDetails(component, componentDefinition, chain) {
     if (componentDefinition.type === "tuple[]")
-        return component.map(setDetails);
+        return component.map((item) => setDetails(item, chain));
     if (componentDefinition.type === "tuple")
-        return setDetails(component);
-    function setDetails(value) {
+        return setDetails(component, chain);
+    function setDetails(value, chain) {
         const definitions = componentDefinition.components || componentDefinition.arrayChildren.components;
         definitions.map((def, i) => {
-            setComponentDetails(value[i], def);
-            const name = def.name;
-            if (name)
-                value[name] = value[i];
+            setComponentDetails(value[i], def, chain);
+            setNameAndTranformAddress({ response: value, componentDefinition: def, chain, index: i });
         });
     }
 }
+function setNameAndTranformAddress({ response, componentDefinition, chain, index }) {
+    if (chain === 'tron' && componentDefinition.type === 'address') {
+        response[index] = (0, common_1.evmToTronAddress)(response[index]);
+    }
+    if (componentDefinition === null || componentDefinition === void 0 ? void 0 : componentDefinition.name)
+        response[componentDefinition.name] = response[index];
+    return response;
+}

package/build/abi/index.js

@@ -1,32 +1,11 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.multiCall = exports.bytecodeCall = exports.call = void 0;
+exports.call = call;
+exports.bytecodeCall = bytecodeCall;
+exports.multiCall = multiCall;
 const cachedABIs_1 = __importDefault(require("./cachedABIs"));
 const ethers_1 = require("ethers");
 const general_1 = require("../general");
@@ -35,8 +14,7 @@ const convertResults_1 = __importDefault(require("./convertResults"));
 const debugLog_1 = require("../util/debugLog");
 const internal_cache_1 = require("../util/internal-cache");
 const util_1 = require("../util");
-const Tron = __importStar(require("./tron"));
-const generalUtil_1 = require("../generalUtil");
+const common_1 = require("../util/common");
 const env_1 = require("../util/env");
 const nullAddress = '0x0000000000000000000000000000000000000000';
 // https://docs.soliditylang.org/en/latest/abi-spec.html
@@ -102,12 +80,12 @@ function fixBlockTag(params) {
 function isValidTarget(target, chain) {
     if (typeof target !== 'string')
         return false;
-    if (chain === 'tron')
-        return true;
     return target.startsWith('0x') && target !== nullAddress;
 }
 async function call(params) {
     var _a;
+    if (params.chain === 'tron')
+        (0, common_1.fixTronCallParams)(params);
     if (!isValidTarget(params.target, params.chain))
         throw new Error('Invalid target: ' + params.target);
     fixBlockTag(params);
@@ -120,8 +98,7 @@ async function call(params) {
             return cachedCall(params);
         const abi = resolveABI(params.abi);
         const callParams = normalizeParams(params.params);
-        if (chain === 'tron')
-            return Tron.call({ ...params, abi, params: callParams });
+        // if (chain === 'tron') return Tron.call({ ...params, abi, params: callParams })
         const contractInterface = new ethers_1.ethers.Interface([abi]);
         const functionABI = ethers_1.ethers.FunctionFragment.from(abi);
         const callData = contractInterface.encodeFunctionData(functionABI, callParams);
@@ -134,7 +111,7 @@ async function call(params) {
         });
         errorParams.result = result;
         const decodedResult = contractInterface.decodeFunctionResult(abi, result);
-        const output = (0, convertResults_1.default)(decodedResult, functionABI);
+        const output = (0, convertResults_1.default)(decodedResult, { functionABI, chain });
         if (params.logArray && abi.name == 'balanceOf' && abi.outputs[0].type == 'uint256')
             params.logArray.push({
                 chain,
@@ -148,10 +125,9 @@ async function call(params) {
     }
     catch (e) {
         errorParams.isCallError = true;
-        throw (0, generalUtil_1.formError)(e, errorParams);
+        throw (0, common_1.formError)(e, errorParams);
     }
 }
-exports.call = call;
 async function bytecodeCall(params) {
     fixBlockTag(params);
     const { block, bytecode, inputTypes, inputs, outputTypes, chain } = params;
@@ -164,13 +140,14 @@ async function bytecodeCall(params) {
     const result = await (0, general_1.getProvider)(chain).call({ data: callData, blockTag: block });
     const decodedResult = ethers_1.ethers.AbiCoder.defaultAbiCoder().decode(outputTypes, result);
     return {
-        output: (0, convertResults_1.default)(decodedResult),
+        output: (0, convertResults_1.default)(decodedResult, { chain }),
     };
 }
-exports.bytecodeCall = bytecodeCall;
 async function multiCall(params) {
     var _a;
     fixBlockTag(params);
+    if (params.chain === 'tron')
+        (0, common_1.fixTronCallParams)(params);
     if (cachedABIs_1.default[params.abi])
         params.abi = cachedABIs_1.default[params.abi];
     const chain = (_a = params.chain) !== null && _a !== void 0 ? _a : 'ethereum';
@@ -195,7 +172,7 @@ async function multiCall(params) {
                 return !isValidTarget(i.target, params.chain);
             return true;
         })) {
-            (0, debugLog_1.debugLog)('Multicall is missing target', JSON.stringify(params, null, 2));
+            // debugLog('Multicall is missing target', JSON.stringify(params, null, 2))
             throw new Error('Multicall is missing a target');
         }
     }
@@ -217,7 +194,8 @@ async function multiCall(params) {
     const results = await (0, util_1.runInPromisePool)({
         items: (0, util_1.sliceIntoChunks)(contractCalls, chunkSize),
         concurrency: 10,
-        processor: (calls) => (0, multicall3_1.default)(abi, calls, chain, params.block)
+        processor: (calls) => (0, multicall3_1.default)(abi, calls, chain, params.block),
+        permitFailure: params.permitFailure,
     });
     const flatResults = [].concat.apply([], results);
     const failedQueries = flatResults.filter(r => !r.success);
@@ -226,7 +204,7 @@ async function multiCall(params) {
         if (!params.permitFailure) {
             params.failedQueries = failedQueries;
             params.isMultiCallError = true;
-            throw (0, generalUtil_1.formError)(null, params);
+            throw (0, common_1.formError)(null, params);
         }
     }
     if (params.logArray && abi.name == 'balanceOf' && abi.outputs[0].type == 'uint256')
@@ -240,7 +218,6 @@ async function multiCall(params) {
         output: flatResults, // flatten array
     };
 }
-exports.multiCall = multiCall;
 async function cachedCall(params) {
     params.skipCache = true;
     if (!isCachableAbi(params.abi))

package/build/abi/multicall.js

@@ -1,39 +1,18 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.networkSupportsMulticall = exports.multicallAddressOrThrow = exports.AGGREGATE_SELECTOR = exports.MULTICALL_ADDRESS_OPTIMISM = exports.MULTICALL_ADDRESS_AURORA = exports.MULTICALL_ADDRESS_MOONRIVER = exports.MULTICALL_ADDRESS_AVAX = exports.MULTICALL_ADDRESS_ARBITRUM = exports.MULTICALL_ADDRESS_HARMONY = exports.MULTICALL_ADDRESS_HECO = exports.MULTICALL_ADDRESS_XDAI = exports.MULTICALL_ADDRESS_FANTOM = exports.MULTICALL_ADDRESS_BSC = exports.MULTICALL_ADDRESS_POLYGON = exports.MULTICALL_ADDRESS_GOERLI = exports.MULTICALL_ADDRESS_RINKEBY = exports.MULTICALL_ADDRESS_KOVAN = exports.MULTICALL_ADDRESS_MAINNET = void 0;
+exports.AGGREGATE_SELECTOR = exports.MULTICALL_ADDRESS_OPTIMISM = exports.MULTICALL_ADDRESS_AURORA = exports.MULTICALL_ADDRESS_MOONRIVER = exports.MULTICALL_ADDRESS_AVAX = exports.MULTICALL_ADDRESS_ARBITRUM = exports.MULTICALL_ADDRESS_HARMONY = exports.MULTICALL_ADDRESS_HECO = exports.MULTICALL_ADDRESS_XDAI = exports.MULTICALL_ADDRESS_FANTOM = exports.MULTICALL_ADDRESS_BSC = exports.MULTICALL_ADDRESS_POLYGON = exports.MULTICALL_ADDRESS_GOERLI = exports.MULTICALL_ADDRESS_RINKEBY = exports.MULTICALL_ADDRESS_KOVAN = exports.MULTICALL_ADDRESS_MAINNET = void 0;
+exports.default = makeMultiCall;
+exports.multicallAddressOrThrow = multicallAddressOrThrow;
+exports.networkSupportsMulticall = networkSupportsMulticall;
 const ethers_1 = require("ethers");
 const general_1 = require("../general");
 const convertResults_1 = __importDefault(require("./convertResults"));
 const rpcCall_1 = require("./rpcCall");
 const debugLog_1 = require("../util/debugLog");
 const util_1 = require("../util");
-const Tron = __importStar(require("./tron"));
 const env_1 = require("../util/env");
 exports.MULTICALL_ADDRESS_MAINNET = "0xeefba1e63905ef1d7acba5a8513c70307c1ce441";
 exports.MULTICALL_ADDRESS_KOVAN = "0x2cc8688c5f75e365aaeeb4ea8d6a480405a48d2a";
@@ -52,8 +31,6 @@ exports.MULTICALL_ADDRESS_AURORA = "0xe0e3887b158F7F9c80c835a61ED809389BC08d1b";
 exports.MULTICALL_ADDRESS_OPTIMISM = "0xD0E99f15B24F265074747B2A1444eB02b9E30422";
 exports.AGGREGATE_SELECTOR = "0x252dba42";
 async function makeMultiCall(functionABI, calls, chain, block) {
-    if (chain === 'tron')
-        return Tron.multiCall(functionABI, calls);
     const contractInterface = new ethers_1.ethers.Interface([functionABI]);
     let fd = contractInterface.fragments[0];
     const contractCalls = calls.map((call) => {
@@ -68,7 +45,7 @@ async function makeMultiCall(functionABI, calls, chain, block) {
         let output;
         let error = undefined;
         try {
-            output = (0, convertResults_1.default)(contractInterface.decodeFunctionResult(fd, values), fd);
+            output = (0, convertResults_1.default)(contractInterface.decodeFunctionResult(fd, values), { functionABI: fd, chain });
         }
         catch (e) {
             output = null;
@@ -87,7 +64,6 @@ async function makeMultiCall(functionABI, calls, chain, block) {
         return res;
     });
 }
-exports.default = makeMultiCall;
 async function executeCalls(contractCalls, chain, block) {
     if (await networkSupportsMulticall(chain)) {
         try {
@@ -154,7 +130,6 @@ async function multicallAddressOrThrow(chain) {
     }
     return address;
 }
-exports.multicallAddressOrThrow = multicallAddressOrThrow;
 const networkMulticallCache = {};
 async function networkSupportsMulticall(chain) {
     var _a;
@@ -168,7 +143,6 @@ async function networkSupportsMulticall(chain) {
     }
     return networkMulticallCache[chain];
 }
-exports.networkSupportsMulticall = networkSupportsMulticall;
 function multicallAddress(chainId) {
     if (typeof chainId === "bigint")
         chainId = Number(chainId);
@@ -394,6 +368,7 @@ function multicallAddress(chainId) {
             return '0x63cee78B11774535132fd773C5dDe3c4b41CD07f';
         case 11820: return '0x6d761c3fe633c67b1d3a55678b04eb4ad11c4642'; // artela
         case 2355: return '0x566da61a4D0841a67bA8F2c7e5975885fa0Af4DA'; // silicon_zk
+        case 728126428: return 'TEazPvZwDjDtFeJupyo7QunvnrnUjPH8ED'; // silicon_zk
         default:
             return null;
     }