@defillama/sdk 4.0.81 → 5.0.1

package/build/ChainApi.d.ts

@@ -1,13 +1,13 @@
 import { Block, CallOptions, MulticallOptions, FetchListOptions, ByteCodeCallOptions, Balances as BalancesV1 } from "./types";
 import Balances from "./Balances";
 import { Chain } from "./general";
-import { ethers } from "ethers";
+import { Provider } from "ethers";
 export declare class ChainApi {
     block?: Block;
     chain: Chain | string;
     chainId?: number;
     timestamp?: number;
-    provider: ethers.providers.BaseProvider;
+    provider: Provider;
     _balances: Balances;
     constructor(params: {
         block?: Block;
@@ -36,6 +36,8 @@ export declare class ChainApi {
     getBalances(): BalancesV1;
     getChainId(): number | undefined;
     removeTokenBalance(token: string): void;
+    deleteToken(token: string): void;
+    deleteTokens(tokens: string[]): void;
     erc4626Sum({ calls, tokenAbi, balanceAbi, balanceCalls, permitFailure }: any): Promise<void>;
     sumTokens({ tokens, owners, owner, tokensAndOwners, tokensAndOwners2, blacklistedTokens, blacklistedOwners, ownerTokens, }: {
         tokens?: string[];

package/build/ChainApi.js

@@ -146,6 +146,13 @@ var ChainApi = /** @class */ (function () {
     ChainApi.prototype.removeTokenBalance = function (token) {
         this._balances.removeTokenBalance(token);
     };
+    ChainApi.prototype.deleteToken = function (token) {
+        this._balances.removeTokenBalance(token);
+    };
+    ChainApi.prototype.deleteTokens = function (tokens) {
+        var _this = this;
+        tokens.forEach(function (i) { return _this.deleteToken(i); });
+    };
     ChainApi.prototype.erc4626Sum = function (_a) {
         var calls = _a.calls, _b = _a.tokenAbi, tokenAbi = _b === void 0 ? 'address:token' : _b, _c = _a.balanceAbi, balanceAbi = _c === void 0 ? 'uint256:balance' : _c, balanceCalls = _a.balanceCalls, _d = _a.permitFailure, permitFailure = _d === void 0 ? false : _d;
         return __awaiter(this, void 0, void 0, function () {

package/build/abi/convertResults.d.ts

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

package/build/abi/convertResults.js

@@ -20,9 +20,8 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var bignumber_1 = require("@ethersproject/bignumber");
 function isNumberOrBigNumber(value) {
-    return bignumber_1.BigNumber.isBigNumber(value) || typeof value === "number";
+    return typeof value === 'bigint' || typeof value === "number";
 }
 function stringifyBigNumbers(result) {
     var final = __assign({}, result);
@@ -38,16 +37,39 @@ function stringifyBigNumbers(result) {
     });
     return final;
 }
-function default_1(results) {
+function default_1(results, functionABI) {
     var response;
     if (typeof results === "string" || typeof results === "boolean")
         return results;
     if (isNumberOrBigNumber(results))
         return results.toString();
     response = stringifyBigNumbers(results);
+    if (functionABI && functionABI.outputs) {
+        var outputNames = functionABI.outputs.map(function (i) { return i.name; });
+        outputNames.map(function (name, i) {
+            setComponentDetails(response[i], functionABI.outputs[i]);
+            if (name)
+                response[name] = response[i];
+        });
+    }
     if (response instanceof Array)
         if (response.length === 1)
             return response[0];
     return response;
 }
 exports.default = default_1;
+function setComponentDetails(component, componentDefinition) {
+    if (componentDefinition.type === "tuple[]")
+        return component.map(setDetails);
+    if (componentDefinition.type === "tuple")
+        return setDetails(component);
+    function setDetails(value) {
+        var definitions = componentDefinition.components || componentDefinition.arrayChildren.components;
+        definitions.map(function (def, i) {
+            setComponentDetails(value[i], def);
+            var name = def.name;
+            if (name)
+                value[name] = value[i];
+        });
+    }
+}

package/build/abi/index.js

@@ -109,8 +109,8 @@ function resolveABI(providedAbi) {
     if (typeof abi === "string") {
         var _a = providedAbi.split(':'), outputType = _a[0], name_1 = _a[1];
         if (!knownTypes.includes(outputType) || !name_1) {
-            var contractInterface = new ethers_1.ethers.utils.Interface([providedAbi]);
-            var jsonAbi = contractInterface.format(ethers_1.ethers.utils.FormatTypes.json);
+            var contractInterface = new ethers_1.ethers.Interface([providedAbi]);
+            var jsonAbi = contractInterface.formatJson();
             return JSON.parse(jsonAbi)[0];
         }
         abi = {
@@ -160,11 +160,11 @@ function isValidTarget(target, chain) {
     return target.startsWith('0x') && target !== nullAddress;
 }
 function call(params) {
-    var _a, _b;
+    var _a;
     return __awaiter(this, void 0, void 0, function () {
         var chain, errorParams, abi, callParams, contractInterface, functionABI, callData, provider, result, decodedResult, output, e_1;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0:
                     if (!isValidTarget(params.target, params.chain))
                         throw new Error('Invalid target: ' + params.target);
@@ -173,29 +173,30 @@ function call(params) {
                     if (cachedABIs_1.default[params.abi])
                         params.abi = cachedABIs_1.default[params.abi];
                     errorParams = __assign({}, params);
-                    _c.label = 1;
+                    _b.label = 1;
                 case 1:
-                    _c.trys.push([1, 3, , 4]);
+                    _b.trys.push([1, 3, , 4]);
                     if (!params.skipCache)
                         return [2 /*return*/, cachedCall(params)];
                     abi = resolveABI(params.abi);
                     callParams = normalizeParams(params.params);
                     if (chain === 'tron')
                         return [2 /*return*/, Tron.call(__assign(__assign({}, params), { abi: abi, params: callParams }))];
-                    contractInterface = new ethers_1.ethers.utils.Interface([abi]);
-                    functionABI = ethers_1.ethers.utils.FunctionFragment.from(abi);
+                    contractInterface = new ethers_1.ethers.Interface([abi]);
+                    functionABI = ethers_1.ethers.FunctionFragment.from(abi);
                     callData = contractInterface.encodeFunctionData(functionABI, callParams);
                     provider = (0, general_1.getProvider)(chain);
                     errorParams.provider = provider;
                     return [4 /*yield*/, provider.call({
                             to: params.target,
                             data: callData,
-                        }, (_b = params.block) !== null && _b !== void 0 ? _b : "latest")];
+                            blockTag: params.block,
+                        })];
                 case 2:
-                    result = _c.sent();
+                    result = _b.sent();
                     errorParams.result = result;
-                    decodedResult = contractInterface.decodeFunctionResult(functionABI, result);
-                    output = (0, convertResults_1.default)(decodedResult);
+                    decodedResult = contractInterface.decodeFunctionResult(abi, result);
+                    output = (0, convertResults_1.default)(decodedResult, functionABI);
                     if (params.logArray && abi.name == 'balanceOf' && abi.outputs[0].type == 'uint256')
                         params.logArray.push({
                             chain: chain,
@@ -207,7 +208,7 @@ function call(params) {
                             output: output,
                         }];
                 case 3:
-                    e_1 = _c.sent();
+                    e_1 = _b.sent();
                     errorParams.isCallError = true;
                     throw (0, generalUtil_1.formError)(e_1, errorParams);
                 case 4: return [2 /*return*/];
@@ -228,12 +229,12 @@ function bytecodeCall(params) {
                         throw new Error('Missing bytecode parameter!');
                     if (chain === 'tron')
                         throw new Error('Bytecode call is not supported on Tron');
-                    inputData = ethers_1.ethers.utils.defaultAbiCoder.encode(inputTypes, inputs);
+                    inputData = ethers_1.ethers.AbiCoder.defaultAbiCoder().encode(inputTypes, inputs);
                     callData = '0x' + bytecode.concat(inputData.slice(2));
-                    return [4 /*yield*/, (0, general_1.getProvider)(chain).call({ data: callData, }, block !== null && block !== void 0 ? block : "latest")];
+                    return [4 /*yield*/, (0, general_1.getProvider)(chain).call({ data: callData, blockTag: block })];
                 case 1:
                     result = _a.sent();
-                    decodedResult = ethers_1.ethers.utils.defaultAbiCoder.decode(outputTypes, result);
+                    decodedResult = ethers_1.ethers.AbiCoder.defaultAbiCoder().decode(outputTypes, result);
                     return [2 /*return*/, {
                             output: (0, convertResults_1.default)(decodedResult),
                         }];

package/build/abi/multicall.d.ts

@@ -1,5 +1,4 @@
 import { Chain } from "../general";
-import { BlockTag } from "@ethersproject/providers";
 export declare const MULTICALL_ADDRESS_MAINNET = "0xeefba1e63905ef1d7acba5a8513c70307c1ce441";
 export declare const MULTICALL_ADDRESS_KOVAN = "0x2cc8688c5f75e365aaeeb4ea8d6a480405a48d2a";
 export declare const MULTICALL_ADDRESS_RINKEBY = "0x42ad527de7d4e9d9d011ac45b31d8551f8fe9821";
@@ -19,5 +18,6 @@ export declare const AGGREGATE_SELECTOR = "0x252dba42";
 export default function makeMultiCall(functionABI: any, calls: {
     contract: string;
     params: any[];
-}[], chain: Chain, block?: BlockTag): Promise<any>;
-export declare function networkSupportsMulticall(chain: Chain): boolean;
+}[], chain: Chain, block?: string | number): Promise<any>;
+export declare function multicallAddressOrThrow(chain: Chain): Promise<string>;
+export declare function networkSupportsMulticall(chain: Chain): Promise<boolean>;

package/build/abi/multicall.js

@@ -62,9 +62,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.networkSupportsMulticall = 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.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;
 var ethers_1 = require("ethers");
-var utils_1 = require("ethers/lib/utils");
 var general_1 = require("../general");
 var convertResults_1 = __importDefault(require("./convertResults"));
 var rpcCall_1 = require("./rpcCall");
@@ -95,8 +94,8 @@ function makeMultiCall(functionABI, calls, chain, block) {
                 case 0:
                     if (chain === 'tron')
                         return [2 /*return*/, Tron.multiCall(functionABI, calls)];
-                    contractInterface = new ethers_1.ethers.utils.Interface([functionABI]);
-                    fd = Object.values(contractInterface.functions)[0];
+                    contractInterface = new ethers_1.ethers.Interface([functionABI]);
+                    fd = contractInterface.fragments[0];
                     contractCalls = calls.map(function (call) {
                         var data = contractInterface.encodeFunctionData(fd, call.params);
                         return {
@@ -111,7 +110,7 @@ function makeMultiCall(functionABI, calls, chain, block) {
                             var output;
                             var error = undefined;
                             try {
-                                output = (0, convertResults_1.default)(contractInterface.decodeFunctionResult(fd, values));
+                                output = (0, convertResults_1.default)(contractInterface.decodeFunctionResult(fd, values), fd);
                             }
                             catch (e) {
                                 output = null;
@@ -136,17 +135,19 @@ function makeMultiCall(functionABI, calls, chain, block) {
 exports.default = makeMultiCall;
 function executeCalls(contractCalls, chain, block) {
     return __awaiter(this, void 0, void 0, function () {
-        var multicallData, address, callData, tx, returnData, _a, blockNumber, returnValues, e_1, chunkSize, chunks, response;
+        var multicallData, address, callData, tx, returnData, _a, blockNumber, returnValues, e_1, chunkSize, chunks, response, _b;
+        var _c;
         var _this = this;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    if (!networkSupportsMulticall(chain)) return [3 /*break*/, 7];
-                    _b.label = 1;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
+                case 0: return [4 /*yield*/, networkSupportsMulticall(chain)];
                 case 1:
-                    _b.trys.push([1, 4, , 7]);
-                    multicallData = ethers_1.ethers.utils.defaultAbiCoder.encode([
-                        utils_1.ParamType.fromObject({
+                    if (!_d.sent()) return [3 /*break*/, 8];
+                    _d.label = 2;
+                case 2:
+                    _d.trys.push([2, 5, , 8]);
+                    multicallData = ethers_1.ethers.AbiCoder.defaultAbiCoder().encode([
+                        ethers_1.ethers.ParamType.from({
                             components: [
                                 { name: "target", type: "address" },
                                 { name: "callData", type: "bytes" },
@@ -156,21 +157,21 @@ function executeCalls(contractCalls, chain, block) {
                         }),
                     ], [contractCalls.map(function (call) { return [call.to, call.data]; })]);
                     return [4 /*yield*/, multicallAddressOrThrow(chain)];
-                case 2:
-                    address = _b.sent();
+                case 3:
+                    address = _d.sent();
                     callData = exports.AGGREGATE_SELECTOR + multicallData.substr(2);
                     tx = {
                         to: address,
                         data: callData,
                     };
-                    return [4 /*yield*/, (0, rpcCall_1.call)((0, general_1.getProvider)(chain), tx, block !== null && block !== void 0 ? block : "latest", chain)];
-                case 3:
-                    returnData = _b.sent();
-                    _a = ethers_1.ethers.utils.defaultAbiCoder.decode(["uint256", "bytes[]"], returnData), blockNumber = _a[0], returnValues = _a[1];
-                    return [2 /*return*/, returnValues];
+                    return [4 /*yield*/, (0, rpcCall_1.call)((0, general_1.getProvider)(chain), tx, block, chain)];
                 case 4:
-                    e_1 = _b.sent();
-                    if (!(contractCalls.length > 10)) return [3 /*break*/, 6];
+                    returnData = _d.sent();
+                    _a = ethers_1.ethers.AbiCoder.defaultAbiCoder().decode(["uint256", "bytes[]"], returnData), blockNumber = _a[0], returnValues = _a[1];
+                    return [2 /*return*/, returnValues];
+                case 5:
+                    e_1 = _d.sent();
+                    if (!(contractCalls.length > 10)) return [3 /*break*/, 7];
                     chunkSize = Math.ceil(contractCalls.length / 5);
                     chunks = (0, util_1.sliceIntoChunks)(contractCalls, chunkSize);
                     (0, debugLog_1.debugLog)("Multicall failed, call size: ".concat(contractCalls.length, ", splitting into smaller chunks and trying again, new call size: ").concat(chunks[0].length));
@@ -179,50 +180,58 @@ function executeCalls(contractCalls, chain, block) {
                             concurrency: 2,
                             processor: function (calls) { return executeCalls(calls, chain, block); }
                         })];
-                case 5:
-                    response = _b.sent();
-                    return [2 /*return*/, response.flat()];
                 case 6:
+                    response = _d.sent();
+                    return [2 /*return*/, response.flat()];
+                case 7:
                     (0, debugLog_1.debugLog)("Multicall failed, defaulting to single transactions...");
-                    return [3 /*break*/, 7];
-                case 7: return [2 /*return*/, (0, util_1.runInPromisePool)({
-                        items: contractCalls,
-                        concurrency: networkSupportsMulticall(chain) ? 2 : 10,
-                        processor: function (_a) {
-                            var to = _a.to, data = _a.data;
-                            return __awaiter(_this, void 0, void 0, function () {
-                                var result, e_2;
-                                return __generator(this, function (_b) {
-                                    switch (_b.label) {
-                                        case 0:
-                                            result = null;
-                                            _b.label = 1;
-                                        case 1:
-                                            _b.trys.push([1, 3, , 4]);
-                                            return [4 /*yield*/, (0, rpcCall_1.call)((0, general_1.getProvider)(chain), { to: to, data: data }, block !== null && block !== void 0 ? block : "latest", chain)];
-                                        case 2:
-                                            result = _b.sent();
-                                            return [3 /*break*/, 4];
-                                        case 3:
-                                            e_2 = _b.sent();
-                                            (0, debugLog_1.debugLog)(e_2);
-                                            return [3 /*break*/, 4];
-                                        case 4: return [2 /*return*/, result];
-                                    }
+                    return [3 /*break*/, 8];
+                case 8:
+                    _b = util_1.runInPromisePool;
+                    _c = {
+                        items: contractCalls
+                    };
+                    return [4 /*yield*/, networkSupportsMulticall(chain)];
+                case 9: return [2 /*return*/, _b.apply(void 0, [(_c.concurrency = (_d.sent()) ? 2 : 10,
+                            _c.processor = function (_a) {
+                                var to = _a.to, data = _a.data;
+                                return __awaiter(_this, void 0, void 0, function () {
+                                    var result, e_2;
+                                    return __generator(this, function (_b) {
+                                        switch (_b.label) {
+                                            case 0:
+                                                result = null;
+                                                _b.label = 1;
+                                            case 1:
+                                                _b.trys.push([1, 3, , 4]);
+                                                return [4 /*yield*/, (0, rpcCall_1.call)((0, general_1.getProvider)(chain), { to: to, data: data }, block, chain)];
+                                            case 2:
+                                                result = _b.sent();
+                                                return [3 /*break*/, 4];
+                                            case 3:
+                                                e_2 = _b.sent();
+                                                (0, debugLog_1.debugLog)(e_2);
+                                                return [3 /*break*/, 4];
+                                            case 4: return [2 /*return*/, result];
+                                        }
+                                    });
                                 });
-                            });
-                        }
-                    })];
+                            },
+                            _c)])];
             }
         });
     });
 }
 function multicallAddressOrThrow(chain) {
     return __awaiter(this, void 0, void 0, function () {
-        var network, address, msg;
+        var multicallEnv, network, address, msg;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, (0, general_1.getProvider)(chain).getNetwork()];
+                case 0:
+                    multicallEnv = process.env["".concat(chain.toUpperCase(), "_RPC_MULTICALL")];
+                    if (multicallEnv)
+                        return [2 /*return*/, multicallEnv];
+                    return [4 /*yield*/, (0, general_1.getProvider)(chain).getNetwork()];
                 case 1:
                     network = _a.sent();
                     address = multicallAddress(network === null || network === void 0 ? void 0 : network.chainId);
@@ -236,14 +245,34 @@ function multicallAddressOrThrow(chain) {
         });
     });
 }
+exports.multicallAddressOrThrow = multicallAddressOrThrow;
+var networkMulticallCache = {};
 function networkSupportsMulticall(chain) {
     var _a;
-    var network = (_a = (0, general_1.getProvider)(chain)) === null || _a === void 0 ? void 0 : _a.network;
-    var address = multicallAddress(network === null || network === void 0 ? void 0 : network.chainId);
-    return address !== null;
+    return __awaiter(this, void 0, void 0, function () {
+        var multicallEnv, network, address;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    multicallEnv = process.env["".concat(chain.toUpperCase(), "_RPC_MULTICALL")];
+                    if (multicallEnv)
+                        networkMulticallCache[chain] = true;
+                    if (!!networkMulticallCache.hasOwnProperty(chain)) return [3 /*break*/, 2];
+                    return [4 /*yield*/, ((_a = (0, general_1.getProvider)(chain)) === null || _a === void 0 ? void 0 : _a.getNetwork())];
+                case 1:
+                    network = _b.sent();
+                    address = multicallAddress(network === null || network === void 0 ? void 0 : network.chainId);
+                    networkMulticallCache[chain] = address !== null;
+                    _b.label = 2;
+                case 2: return [2 /*return*/, networkMulticallCache[chain]];
+            }
+        });
+    });
 }
 exports.networkSupportsMulticall = networkSupportsMulticall;
 function multicallAddress(chainId) {
+    if (typeof chainId === "bigint")
+        chainId = Number(chainId);
     switch (chainId) {
         case 1:
         case 10001:
@@ -428,6 +457,8 @@ function multicallAddress(chainId) {
             return '0x952e846E505d4e4ddf579541A0d739f1681F2282';
         case 34443: // mode
             return '0xA1da7a7eB5A858da410dE8FBC5092c2079B58413';
+        case 42766: // zkfair
+            return '0x9eF6667974Fb12D07774221AAB1E90b2ec48896E';
         default:
             return null;
     }

package/build/abi/multicall3.d.ts

@@ -1,8 +1,7 @@
 import { Chain } from "../general";
-import { BlockTag } from "@ethersproject/providers";
 export default function makeMultiCall(functionABI: any, calls: {
     contract: string;
     params: any[];
-}[], chain: Chain, block?: BlockTag): Promise<any>;
-export declare function isMulticallV3Supported(chain: Chain, block?: BlockTag): boolean;
-export declare function getMulticallAddress(chain: Chain, block?: BlockTag): string | null;
+}[], chain: Chain, block?: string | number): Promise<any>;
+export declare function isMulticallV3Supported(chain: Chain, block?: string | number): boolean;
+export declare function getMulticallAddress(chain: Chain, block?: string | number): string | null;

package/build/abi/multicall3.js

@@ -142,6 +142,11 @@ var DEPLOYMENT_BLOCK = {
     azktn: 31317,
     lightlink_phoenix: 51289975,
     eon: 646592,
+    jfin: 13857465,
+    ethereumclassic: 18288646,
+    core: 6988931,
+    callisto: 13811517,
+    bittorrent: 31078552,
 };
 function makeMultiCall(functionABI, calls, chain, block) {
     return __awaiter(this, void 0, void 0, function () {
@@ -173,8 +178,8 @@ function makeMultiCall(functionABI, calls, chain, block) {
                         throw new Error('Missing target, abi:' + functionABI);
                     if (!isMulticallV3Supported(chain, block))
                         return [2 /*return*/, (0, multicall_1.default)(functionABI, calls, chain, block)];
-                    contractInterface = new ethers_1.ethers.utils.Interface([functionABI]);
-                    fd = Object.values(contractInterface.functions)[0];
+                    contractInterface = new ethers_1.ethers.Interface([functionABI]);
+                    fd = contractInterface.fragments[0];
                     contractCalls = calls.map(function (call) {
                         var data = contractInterface.encodeFunctionData(fd, call.params);
                         return {
@@ -197,12 +202,12 @@ function makeMultiCall(functionABI, calls, chain, block) {
                     // debugLog(chain, 'Multicall failed, retrying call...')
                     _a.sent();
                     return [3 /*break*/, 5];
-                case 5: return [2 /*return*/, returnValues.map(function (values, index) {
+                case 5: return [2 /*return*/, returnValues.map(function (_a, index) {
+                        var success = _a[0], values = _a[1];
                         var output = null;
-                        var success = true;
                         var error = null;
                         try {
-                            output = (0, convertResults_1.default)(contractInterface.decodeFunctionResult(fd, values.returnData));
+                            output = (0, convertResults_1.default)(contractInterface.decodeFunctionResult(fd, values), fd);
                         }
                         catch (e) {
                             error = e;

package/build/abi/rpcCall.d.ts

@@ -1,5 +1,4 @@
-import { Deferrable } from "@ethersproject/properties";
-import { BaseProvider, BlockTag, TransactionRequest } from "@ethersproject/providers";
-export declare function call(provider: BaseProvider, data: Deferrable<TransactionRequest>, block: BlockTag, chain?: string, options?: {
+import { ethers } from "ethers";
+export declare function call(provider: ethers.Provider, data: ethers.JsonRpcTransactionRequest, block?: string | number, chain?: string, options?: {
     retry: boolean;
 }): Promise<any>;

package/build/abi/rpcCall.js

@@ -71,6 +71,7 @@ function call(provider, data, block, chain, options) {
             switch (_b.label) {
                 case 0:
                     retry = (_a = options.retry) !== null && _a !== void 0 ? _a : true;
+                    data.blockTag = block;
                     if (!chain)
                         chain = 'noChain';
                     counter = getChainCounter(chain);

package/build/abi/tron.js

@@ -51,7 +51,6 @@ var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBalances = exports.getBalance = exports.multiCall = exports.call = void 0;
 var node_fetch_1 = __importDefault(require("node-fetch"));
-var utils_1 = require("ethers/lib/utils");
 var ethers_1 = require("ethers");
 var tron_format_address_1 = require("tron-format-address");
 var convertResults_1 = __importDefault(require("./convertResults"));
@@ -73,11 +72,11 @@ function call(options) {
                 case 0:
                     target = options.target, abi = options.abi, params = options.params, isMulticall = options.isMulticall;
                     target = unhexifyTarget(target);
-                    contractInterface = new ethers_1.ethers.utils.Interface([abi]);
-                    functionABI = ethers_1.ethers.utils.FunctionFragment.from(abi);
+                    contractInterface = new ethers_1.ethers.Interface([abi]);
+                    functionABI = ethers_1.ethers.FunctionFragment.from(abi);
                     inputTypes = ((_a = abi.inputs) !== null && _a !== void 0 ? _a : []).map(function (i) { return i.type; });
                     if (isMulticall)
-                        inputTypes = [utils_1.ParamType.fromObject({
+                        inputTypes = [ethers_1.ethers.ParamType.from({
                                 components: [
                                     { name: "target", type: "address" },
                                     { name: "callData", type: "bytes" },
@@ -94,7 +93,7 @@ function call(options) {
                     body = {
                         owner_address: ownerAddress,
                         contract_address: target,
-                        function_selector: Object.keys(contractInterface.functions).pop(),
+                        function_selector: contractInterface.fragments[0].format(),
                         parameter: callData.slice(2),
                         visible: true,
                     };
@@ -113,7 +112,7 @@ function call(options) {
                             decodedResult[outputName] = v;
                     });
                     return [2 /*return*/, {
-                            output: (0, convertResults_1.default)(decodedResult),
+                            output: (0, convertResults_1.default)(decodedResult, functionABI),
                         }];
             }
         });
@@ -201,8 +200,8 @@ function executeCalls(functionABI, calls) {
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
-                    contractInterface = new ethers_1.ethers.utils.Interface([functionABI]);
-                    fd = Object.values(contractInterface.functions)[0];
+                    contractInterface = new ethers_1.ethers.Interface([functionABI]);
+                    fd = contractInterface.fragments[0];
                     contractCalls = calls.map(function (call) {
                         var data = contractInterface.encodeFunctionData(fd, call.params);
                         return {
@@ -230,7 +229,7 @@ function executeCalls(functionABI, calls) {
                                 if (outputName && outputName.length)
                                     output[outputName] = v;
                             });
-                            return (0, convertResults_1.default)(output);
+                            return (0, convertResults_1.default)(output, fd);
                         })];
                 case 3:
                     e_1 = _b.sent();

package/build/erc20/index.d.ts

@@ -3,14 +3,14 @@ import { Chain } from "../general";
 export declare function info(tokenAddress: Address, chain?: Chain): Promise<{
     output: {
         symbol: any;
-        decimals: any;
+        decimals: number;
     };
 }>;
 export declare function symbol(tokenAddress: Address, chain?: Chain): Promise<{
     output: any;
 }>;
 export declare function decimals(tokenAddress: Address, chain?: Chain): Promise<{
-    output: any;
+    output: number;
 }>;
 export declare function totalSupply(params: {
     target: Address;