@defillama/sdk 4.0.76 → 4.0.78

package/build/ChainApi.d.ts

@@ -36,6 +36,7 @@ export declare class ChainApi {
     getBalances(): BalancesV1;
     getChainId(): number | undefined;
     removeTokenBalance(token: string): void;
+    erc4626Sum({ calls, tokenAbi, balanceAbi, balanceCalls, permitFailure }: any): Promise<void>;
     sumTokens({ tokens, owners, owner, tokensAndOwners, tokensAndOwners2, blacklistedTokens, blacklistedOwners, ownerTokens, }: {
         tokens?: string[];
         owner?: string;

package/build/ChainApi.js

@@ -146,6 +146,36 @@ var ChainApi = /** @class */ (function () {
     ChainApi.prototype.removeTokenBalance = function (token) {
         this._balances.removeTokenBalance(token);
     };
+    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 () {
+            var tokens, balances;
+            var _this = this;
+            return __generator(this, function (_e) {
+                switch (_e.label) {
+                    case 0:
+                        if (typeof tokenAbi === 'string' && (!tokenAbi.includes(':') && !tokenAbi.includes('(')))
+                            tokenAbi = "address:".concat(tokenAbi);
+                        if (typeof balanceAbi === 'string' && (!balanceAbi.includes(':') && !balanceAbi.includes('(')))
+                            balanceAbi = "uint256:".concat(balanceAbi);
+                        return [4 /*yield*/, this.multiCall({ calls: calls, abi: tokenAbi, permitFailure: permitFailure })];
+                    case 1:
+                        tokens = _e.sent();
+                        return [4 /*yield*/, this.multiCall({ calls: calls !== null && calls !== void 0 ? calls : balanceCalls, abi: balanceAbi, permitFailure: permitFailure })];
+                    case 2:
+                        balances = _e.sent();
+                        if (!permitFailure)
+                            this.addTokens(tokens, balances);
+                        else
+                            tokens.forEach(function (i, j) {
+                                if (i && balances[j])
+                                    _this.addToken(i, balances[j]);
+                            });
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
     ChainApi.prototype.sumTokens = function (_a) {
         var _b = _a.tokens, tokens = _b === void 0 ? [] : _b, _c = _a.owners, owners = _c === void 0 ? [] : _c, owner = _a.owner, _d = _a.tokensAndOwners, tokensAndOwners = _d === void 0 ? [] : _d, _e = _a.tokensAndOwners2, tokensAndOwners2 = _e === void 0 ? [] : _e, _f = _a.blacklistedTokens, blacklistedTokens = _f === void 0 ? [] : _f, _g = _a.blacklistedOwners, blacklistedOwners = _g === void 0 ? [] : _g, _h = _a.ownerTokens, ownerTokens = _h === void 0 ? [] : _h;
         return __awaiter(this, void 0, void 0, function () {

package/build/abi/abi2.js

@@ -134,6 +134,10 @@ function fetchList(params) {
             switch (_c.label) {
                 case 0:
                     _a = params.startFrom, startFrom = _a === void 0 ? 0 : _a, lengthAbi = params.lengthAbi, itemAbi = params.itemAbi, withMetadata = params.withMetadata, _b = params.startFromOne, startFromOne = _b === void 0 ? false : _b, itemCount = params.itemCount, commonParams = __rest(params, ["startFrom", "lengthAbi", "itemAbi", "withMetadata", "startFromOne", "itemCount"]);
+                    if (typeof lengthAbi === 'string' && (!lengthAbi.includes(':') && !lengthAbi.includes('(')))
+                        lengthAbi = "uint256:".concat(lengthAbi);
+                    if (typeof itemAbi === 'string' && (!itemAbi.includes(':') && !itemAbi.includes('(')))
+                        itemAbi = "function ".concat(itemAbi, "(uint256) view returns (address)");
                     if (!itemCount) return [3 /*break*/, 1];
                     itemLength = itemCount;
                     return [3 /*break*/, 3];

package/build/computeTVL/blocks.d.ts

@@ -1,19 +1 @@
-import type { Chain } from "../general";
-export declare const chainsForBlocks: string[];
-export declare function getChainBlocks(timestamp: number, chains?: Chain[]): Promise<{
-    [chain: string]: number;
-}>;
-export declare function getBlocks(timestamp: number, chains?: Chain[] | undefined): Promise<{
-    ethereumBlock: any;
-    chainBlocks: {
-        [chain: string]: number;
-    };
-}>;
-export declare function getCurrentBlocks(chains?: Chain[] | undefined): Promise<{
-    timestamp: number;
-    ethereumBlock: number;
-    chainBlocks: {
-        [chain: string]: number;
-    };
-}>;
-export declare function getBlock(chain: Chain, timestamp?: number | undefined): Promise<any>;
+export { getChainBlocks, getBlocks, getBlock, getCurrentBlocks, chainsForBlocks, } from "../util/blocks";

package/build/computeTVL/blocks.js

@@ -1,189 +1,9 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBlock = exports.getCurrentBlocks = exports.getBlocks = exports.getChainBlocks = exports.chainsForBlocks = void 0;
-var general_1 = require("../general");
-var index_1 = require("../util/index");
-exports.chainsForBlocks = ["avax", "bsc", "polygon", "xdai", "fantom", "arbitrum"];
-var blockRetries = 5;
-function getChainBlocks(timestamp, chains) {
-    if (chains === void 0) { chains = exports.chainsForBlocks; }
-    return __awaiter(this, void 0, void 0, function () {
-        var chainBlocks, setBlock;
-        var _this = this;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    chainBlocks = {};
-                    setBlock = function (chain) { return __awaiter(_this, void 0, void 0, function () { var _a, _b; return __generator(this, function (_c) {
-                        switch (_c.label) {
-                            case 0:
-                                _a = chainBlocks;
-                                _b = chain;
-                                return [4 /*yield*/, getBlock(chain, timestamp)];
-                            case 1: return [2 /*return*/, _a[_b] = (_c.sent()).block];
-                        }
-                    }); }); };
-                    return [4 /*yield*/, Promise.all(chains.map(setBlock))];
-                case 1:
-                    _a.sent();
-                    return [2 /*return*/, chainBlocks];
-            }
-        });
-    });
-}
-exports.getChainBlocks = getChainBlocks;
-function getBlocks(timestamp, chains) {
-    if (chains === void 0) { chains = undefined; }
-    return __awaiter(this, void 0, void 0, function () {
-        var _a, ethBlock, chainBlocks;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    chains = chains === null || chains === void 0 ? void 0 : chains.filter(function (i) { return i !== 'ethereum'; });
-                    return [4 /*yield*/, Promise.all([getBlock('ethereum', timestamp), getChainBlocks(timestamp, chains)])];
-                case 1:
-                    _a = _b.sent(), ethBlock = _a[0], chainBlocks = _a[1];
-                    chainBlocks['ethereum'] = ethBlock.block;
-                    return [2 /*return*/, {
-                            ethereumBlock: ethBlock.block,
-                            chainBlocks: chainBlocks,
-                        }];
-            }
-        });
-    });
-}
-exports.getBlocks = getBlocks;
-function getCurrentBlocks(chains) {
-    if (chains === void 0) { chains = undefined; }
-    return __awaiter(this, void 0, void 0, function () {
-        var block, chainBlocks;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    if (chains)
-                        chains = chains.filter(function (i) { return i !== "ethereum"; });
-                    return [4 /*yield*/, getBlock('ethereum')];
-                case 1:
-                    block = _a.sent();
-                    return [4 /*yield*/, getChainBlocks(block.timestamp, chains)];
-                case 2:
-                    chainBlocks = _a.sent();
-                    chainBlocks['ethereum'] = block.number;
-                    return [2 /*return*/, {
-                            timestamp: block.timestamp,
-                            ethereumBlock: block.number,
-                            chainBlocks: chainBlocks,
-                        }];
-            }
-        });
-    });
-}
-exports.getCurrentBlocks = getCurrentBlocks;
-var blockCache = {
-    current: {}
-};
-function getBlock(chain, timestamp) {
-    if (timestamp === void 0) { timestamp = undefined; }
-    return __awaiter(this, void 0, void 0, function () {
-        function getCurrentEthBlock() {
-            return __awaiter(this, void 0, void 0, function () {
-                var provider, lastBlockNumber;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0:
-                            provider = (0, general_1.getProvider)("ethereum");
-                            return [4 /*yield*/, provider.getBlockNumber()];
-                        case 1:
-                            lastBlockNumber = _a.sent();
-                            return [2 /*return*/, provider.getBlock(lastBlockNumber - 5)]; // To allow indexers to catch up
-                    }
-                });
-            });
-        }
-        function _getBlock() {
-            return __awaiter(this, void 0, void 0, function () {
-                var i, block, e_1;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0:
-                            i = 0;
-                            _a.label = 1;
-                        case 1:
-                            if (!(i < blockRetries)) return [3 /*break*/, 6];
-                            _a.label = 2;
-                        case 2:
-                            _a.trys.push([2, 4, , 5]);
-                            return [4 /*yield*/, (0, index_1.lookupBlock)(timestamp, { chain: chain, })];
-                        case 3:
-                            block = _a.sent();
-                            return [2 /*return*/, block];
-                        case 4:
-                            e_1 = _a.sent();
-                            if (i === blockRetries - 1) {
-                                throw e_1;
-                            }
-                            return [3 /*break*/, 5];
-                        case 5:
-                            i++;
-                            return [3 /*break*/, 1];
-                        case 6: return [2 /*return*/];
-                    }
-                });
-            });
-        }
-        return __generator(this, function (_a) {
-            if (!timestamp) {
-                if (chain !== 'ethereum')
-                    throw new Error('Timestamp  is missing!!!');
-                if (!blockCache.current)
-                    blockCache.current = {};
-                if (!blockCache.current.ethereum) {
-                    blockCache.current.ethereum = getCurrentEthBlock();
-                }
-                return [2 /*return*/, blockCache.current.ethereum];
-            }
-            if (!blockCache[timestamp])
-                blockCache[timestamp] = {};
-            if (!blockCache[timestamp][chain])
-                blockCache[timestamp][chain] = _getBlock();
-            return [2 /*return*/, blockCache[timestamp][chain]];
-        });
-    });
-}
-exports.getBlock = getBlock;
+exports.chainsForBlocks = exports.getCurrentBlocks = exports.getBlock = exports.getBlocks = exports.getChainBlocks = void 0;
+var blocks_1 = require("../util/blocks");
+Object.defineProperty(exports, "getChainBlocks", { enumerable: true, get: function () { return blocks_1.getChainBlocks; } });
+Object.defineProperty(exports, "getBlocks", { enumerable: true, get: function () { return blocks_1.getBlocks; } });
+Object.defineProperty(exports, "getBlock", { enumerable: true, get: function () { return blocks_1.getBlock; } });
+Object.defineProperty(exports, "getCurrentBlocks", { enumerable: true, get: function () { return blocks_1.getCurrentBlocks; } });
+Object.defineProperty(exports, "chainsForBlocks", { enumerable: true, get: function () { return blocks_1.chainsForBlocks; } });

package/build/generalUtil.js

@@ -178,7 +178,7 @@ function getUniqueAddresses(addresses, chain) {
 }
 exports.getUniqueAddresses = getUniqueAddresses;
 function formErrorString(e, errorParams) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
     if (errorParams === void 0) { errorParams = {}; }
     if (!e) {
         if (errorParams.promisePoolErrors) {
@@ -204,32 +204,40 @@ function formErrorString(e, errorParams) {
         return errorString;
     if ((e.reason || e.method) && e.code) { // ethers.js error
         var method = e.method;
+        if (e.body) {
+            try {
+                e.body = JSON.parse(e.body);
+            }
+            catch (e) { }
+            if ((_e = (_d = e.body) === null || _d === void 0 ? void 0 : _d.error) === null || _e === void 0 ? void 0 : _e.message)
+                return e.body.error.message;
+        }
         if (!method && e.requestBody) {
             try {
                 e.requestBody = JSON.parse(e.requestBody);
             }
             catch (e) { }
-            method = (_d = e.requestBody) === null || _d === void 0 ? void 0 : _d.method;
+            method = (_f = e.requestBody) === null || _f === void 0 ? void 0 : _f.method;
         }
         if (!e.provider && errorParams.provider)
             e.provider = errorParams.provider;
-        var providerUrl = (_e = e === null || e === void 0 ? void 0 : e.url) !== null && _e !== void 0 ? _e : (_k = (_j = (_h = ((_g = (_f = e.provider) === null || _f === void 0 ? void 0 : _f.providerConfigs) !== null && _g !== void 0 ? _g : [])[0]) === null || _h === void 0 ? void 0 : _h.provider) === null || _j === void 0 ? void 0 : _j.connection) === null || _k === void 0 ? void 0 : _k.url;
+        var providerUrl = (_g = e === null || e === void 0 ? void 0 : e.url) !== null && _g !== void 0 ? _g : (_m = (_l = (_k = ((_j = (_h = e.provider) === null || _h === void 0 ? void 0 : _h.providerConfigs) !== null && _j !== void 0 ? _j : [])[0]) === null || _k === void 0 ? void 0 : _k.provider) === null || _l === void 0 ? void 0 : _l.connection) === null || _m === void 0 ? void 0 : _m.url;
         if (!providerUrl) // in case of historical queries against archive nodes
-            providerUrl = (_m = (_l = e.provider) === null || _l === void 0 ? void 0 : _l.connection) === null || _m === void 0 ? void 0 : _m.url;
+            providerUrl = (_p = (_o = e.provider) === null || _o === void 0 ? void 0 : _o.connection) === null || _p === void 0 ? void 0 : _p.url;
         if (e.serverError)
             return "host: ".concat(providerUrl, " ").concat(e.serverError.toString());
         if (e.results) {
             var errors = e.results.filter(function (i) { return i.error; }).map(function (i) { return i.error; });
             if (errors.length) {
                 var eStrings = errors.map(function (i) { return formError(i); });
-                return "Failed to call ".concat(method, " errors:\n         ").concat(eStrings.join('\n'));
+                return "Failed to call method: ".concat(method, " provider: ").concat(providerUrl, "\n         ").concat(eStrings.join('\n'));
             }
         }
         else if (e.code === 'CALL_EXCEPTION' && errorParams.isCallError) {
             var extraInfo = 'target: ' + errorParams.target;
             if (errorParams.params && errorParams.params.length)
                 extraInfo += shortenString(' params: ' + errorParams.params.join(', '));
-            return "Failed to call ".concat(method, " ").concat(extraInfo, " on chain: [").concat(errorParams.chain, "] rpc: ").concat(providerUrl, "  call reverted ").concat((_o = e.errorName) !== null && _o !== void 0 ? _o : '', "   ").concat((_p = e.errorArgs) !== null && _p !== void 0 ? _p : '');
+            return "Failed to call ".concat(method, " ").concat(extraInfo, " on chain: [").concat(errorParams.chain, "] rpc: ").concat(providerUrl, "  call reverted ").concat((_q = e.errorName) !== null && _q !== void 0 ? _q : '', "   ").concat((_r = e.errorArgs) !== null && _r !== void 0 ? _r : '');
         }
         if (method === 'eth_blockNumber')
             return "host: ".concat(providerUrl, " reason: ").concat(e.reason, " code: ").concat(e.code);
@@ -247,6 +255,8 @@ function shortenString(str, length) {
 function formError(e, errorParams) {
     var _a;
     if (errorParams === void 0) { errorParams = {}; }
+    if ((e === null || e === void 0 ? void 0 : e._isCustomError) || (!Object.keys(errorParams).length && typeof e === 'object' && !Object.keys(e).length))
+        return e; // already formatted or vannila error
     var error = new Error(formErrorString(e, errorParams));
     try {
         if (errorParams.isMultiCallError)