@defillama/sdk 4.0.74 → 4.0.76

package/build/abi/index.js

@@ -208,6 +208,7 @@ function call(params) {
                         }];
                 case 3:
                     e_1 = _c.sent();
+                    errorParams.isCallError = true;
                     throw (0, generalUtil_1.formError)(e_1, errorParams);
                 case 4: return [2 /*return*/];
             }

package/build/generalUtil.js

@@ -225,10 +225,10 @@ function formErrorString(e, errorParams) {
                 return "Failed to call ".concat(method, " errors:\n         ").concat(eStrings.join('\n'));
             }
         }
-        else if (e.code === 'CALL_EXCEPTION' && errorParams.chain && errorParams.result === '0x') {
+        else if (e.code === 'CALL_EXCEPTION' && errorParams.isCallError) {
             var extraInfo = 'target: ' + errorParams.target;
             if (errorParams.params && errorParams.params.length)
-                extraInfo += ' params: ' + errorParams.params.join(', ');
+                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 : '');
         }
         if (method === 'eth_blockNumber')
@@ -240,18 +240,23 @@ function formErrorString(e, errorParams) {
     return errorString;
 }
 exports.formErrorString = formErrorString;
+function shortenString(str, length) {
+    if (length === void 0) { length = 150; }
+    return str.length > length ? str.slice(0, length).concat('...') : str;
+}
 function formError(e, errorParams) {
     var _a;
     if (errorParams === void 0) { errorParams = {}; }
     var error = new Error(formErrorString(e, errorParams));
     try {
         if (errorParams.isMultiCallError)
-            error._underlyingErrors = (_a = errorParams === null || errorParams === void 0 ? void 0 : errorParams.failedQueries) === null || _a === void 0 ? void 0 : _a.map(function (i) { return i.error.toString().slice(0, 150); });
+            error._underlyingErrors = (_a = errorParams === null || errorParams === void 0 ? void 0 : errorParams.failedQueries) === null || _a === void 0 ? void 0 : _a.map(function (i) { return shortenString(i.error.toString()); });
         else
-            error._underlyingError = e.toString().slice(0, 150);
+            error._underlyingError = shortenString(e.toString());
     }
     catch (e) { }
     error._isCustomError = true;
+    error.stack = '';
     return error;
 }
 exports.formError = formError;

package/build/util/index.js

@@ -167,7 +167,7 @@ function getBlockscoutBlock(timestamp, chain) {
 }
 var blockTimeCache = {};
 function lookupBlock(timestamp, extraParams) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     if (extraParams === void 0) { extraParams = {}; }
     return __awaiter(this, void 0, void 0, function () {
         function updateBlock(blocks) {
@@ -203,21 +203,21 @@ function lookupBlock(timestamp, extraParams) {
                 .sort(function (a, b) { return a.timestamp - b.timestamp; })[0];
         }
         var chain, response, e_1, api, res, data, low, lowBlock, highBlock, block, i, time, allowedTimeRange, acceptableBlockImprecision, blockImprecision, imprecision, firstBlock, lastBlock, provider, firstBlockNum, blockDiff, timeDiff, avgBlockTime, closeBlock, midBlock, blocks, e_2;
-        var _d;
-        return __generator(this, function (_e) {
-            switch (_e.label) {
+        var _j;
+        return __generator(this, function (_k) {
+            switch (_k.label) {
                 case 0:
                     chain = (_a = extraParams === null || extraParams === void 0 ? void 0 : extraParams.chain) !== null && _a !== void 0 ? _a : "ethereum";
                     if (!blockscoutEndpoints[chain]) return [3 /*break*/, 4];
-                    _e.label = 1;
+                    _k.label = 1;
                 case 1:
-                    _e.trys.push([1, 3, , 4]);
+                    _k.trys.push([1, 3, , 4]);
                     return [4 /*yield*/, getBlockscoutBlock(timestamp, chain)];
                 case 2:
-                    response = _e.sent();
+                    response = _k.sent();
                     return [2 /*return*/, response];
                 case 3:
-                    e_1 = _e.sent();
+                    e_1 = _k.sent();
                     (0, debugLog_1.debugLog)('error fetching block from blockscout', e_1);
                     return [3 /*break*/, 4];
                 case 4:
@@ -225,10 +225,10 @@ function lookupBlock(timestamp, extraParams) {
                     api = "https://nodes.wavesnodes.com/blocks/heightByTimestamp/".concat(timestamp);
                     return [4 /*yield*/, (0, node_fetch_1.default)(api)];
                 case 5:
-                    res = _e.sent();
+                    res = _k.sent();
                     return [4 /*yield*/, res.json()];
                 case 6:
-                    data = _e.sent();
+                    data = _k.sent();
                     return [2 /*return*/, {
                             timestamp: timestamp,
                             block: +data.height
@@ -242,36 +242,36 @@ function lookupBlock(timestamp, extraParams) {
                     allowedTimeRange = 15 * 60 // how much imprecision is allowed (15 minutes now)
                     ;
                     acceptableBlockImprecision = chain === 'ethereum' ? 20 : 200;
-                    _e.label = 8;
+                    _k.label = 8;
                 case 8:
-                    _e.trys.push([8, 17, , 18]);
+                    _k.trys.push([8, 17, , 18]);
                     firstBlock = void 0, lastBlock = void 0;
                     provider = getExtraProvider(chain);
                     if (!['evmos'].includes(chain)) return [3 /*break*/, 11];
                     return [4 /*yield*/, getBlock(provider, "latest", chain)];
                 case 9:
-                    lastBlock = _e.sent();
+                    lastBlock = _k.sent();
                     firstBlockNum = lastBlock.number;
                     switch (chain) {
                         default: firstBlockNum -= 2 * 1e5; // evmos hold only the last 200k block data
                     }
                     return [4 /*yield*/, getBlock(provider, firstBlockNum, chain)];
                 case 10:
-                    firstBlock = _e.sent();
+                    firstBlock = _k.sent();
                     return [3 /*break*/, 13];
                 case 11: return [4 /*yield*/, Promise.all([
                         getBlock(provider, "latest", chain),
                         lowBlock ? lowBlock : getBlock(provider, low, chain),
                     ])];
                 case 12:
-                    _d = _e.sent(), lastBlock = _d[0], firstBlock = _d[1];
-                    _e.label = 13;
+                    _j = _k.sent(), lastBlock = _j[0], firstBlock = _j[1];
+                    _k.label = 13;
                 case 13:
                     lowBlock = firstBlock;
                     if (!highBlock)
                         highBlock = lastBlock;
                     if (lastBlock.timestamp - timestamp < -30 * 60) {
-                        throw new Error("Last block of chain \"".concat(chain, "\" is further than 30 minutes into the past. Provider is \"").concat((_c = provider === null || provider === void 0 ? void 0 : provider.connection) === null || _c === void 0 ? void 0 : _c.url, "\""));
+                        throw new Error("Last block of chain \"".concat(chain, "\" is further than 30 minutes into the past. Provider is \"").concat((_d = (_c = provider === null || provider === void 0 ? void 0 : provider.connection) === null || _c === void 0 ? void 0 : _c.url) !== null && _d !== void 0 ? _d : (_h = (_g = (_f = ((_e = provider === null || provider === void 0 ? void 0 : provider.providerConfigs) !== null && _e !== void 0 ? _e : [])[0]) === null || _f === void 0 ? void 0 : _f.provider) === null || _g === void 0 ? void 0 : _g.connection) === null || _h === void 0 ? void 0 : _h.url, "\""));
                     }
                     if (Math.abs(highBlock.timestamp - timestamp) < 60 * 30) {
                         // Short-circuit in case we are trying to get the current block
@@ -281,7 +281,7 @@ function lookupBlock(timestamp, extraParams) {
                             }];
                     }
                     updateBlock();
-                    _e.label = 14;
+                    _k.label = 14;
                 case 14:
                     if (!(imprecision > allowedTimeRange && blockImprecision > acceptableBlockImprecision)) return [3 /*break*/, 16];
                     ++i;
@@ -297,7 +297,7 @@ function lookupBlock(timestamp, extraParams) {
                             getBlock(provider, midBlock, chain),
                         ])];
                 case 15:
-                    blocks = _e.sent();
+                    blocks = _k.sent();
                     updateBlock(blocks);
                     return [3 /*break*/, 14];
                 case 16:
@@ -311,7 +311,7 @@ function lookupBlock(timestamp, extraParams) {
                             timestamp: block.timestamp
                         }];
                 case 17:
-                    e_2 = _e.sent();
+                    e_2 = _k.sent();
                     throw (0, generalUtil_1.formError)(e_2);
                 case 18: return [2 /*return*/];
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defillama/sdk",
-  "version": "4.0.74",
+  "version": "4.0.76",
   "description": "SDK for calculating TVL",
   "main": "build/index.js",
   "scripts": {