@defillama/sdk 4.0.74 → 4.0.75

package/build/{abi → src/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 → src/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 → src/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/build/test.d.ts

@@ -0,0 +1 @@
+export {};

package/build/test.js

@@ -0,0 +1,62 @@
+"use strict";
+// process.env.ETHEREUM_RPC=''
+// process.env.SDK_MULTICALL_CHUNK_SIZE='100'
+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 });
+var src_1 = require("./src");
+function run() {
+    return __awaiter(this, void 0, void 0, function () {
+        var api, calls, target, loanData;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    api = new src_1.ChainApi({
+                        chain: 'ethereum',
+                    });
+                    calls = ["76", "91", "92", "93", "94", "100", "101", "124", "125", "126", "137", "142", "147", "150", "173", "179", "183", "195", "198", "203", "238", "245", "258", "281", "283", "286", "294", "296", "302", "303", "324", "338", "342", "344", "351", "352", "353", "365", "386", "428", "436", "437", "438", "439", "440", "442", "444", "445", "451", "453", "454", "461", "462", "465", "468", "481", "482", "483", "491", "495", "496", "497", "498", "499", "505", "506", "523", "525", "527", "528", "529", "531", "541", "596", "599", "605", "610", "611", "612", "613", "614", "615", "616", "617", "618", "619", "620", "622", "623", "655", "663", "664", "665", "666", "680", "709", "771", "772", "776", "777", "778", "779", "780", "783", "785", "802", "806", "816", "819", "824", "852", "853", "888", "896", "906", "907", "921", "927", "928", "929", "930", "931", "932", "933", "934", "935", "939", "942", "943", "950", "956", "957", "958", "961", "972", "978", "980", "987", "997", "998", "1001", "1002", "1003", "1004", "1005", "1010", "1011", "1012", "1013", "1014", "1015", "1016", "1017", "1018", "1019", "1024", "1025", "1029", "1031", "1036", "1037", "1046", "1063", "1064", "1065", "1067", "1068", "1071", "1072", "1073", "1079", "1080", "1089", "1090", "1091", "1092", "1093", "1094", "1096", "1105", "1106", "1107", "1111", "1112", "1114", "1115", "1116", "1117", "1123", "1126", "1127", "1131", "1132", "1134", "1142", "1146", "1147", "1149", "1154", "1155", "1156", "1158", "1159", "1160", "1165", "1166", "1167"];
+                    target = '0x00182FdB0B880eE24D428e3Cc39383717677C37e';
+                    return [4 /*yield*/, api.multiCall({ abi: "function bids(uint256) view returns (address borrower, address receiver, address lender, uint256 marketplaceId, bytes32 _metadataURI, tuple(address lendingToken, uint256 principal, tuple(uint256 principal, uint256 interest) totalRepaid, uint32 timestamp, uint32 acceptedTimestamp, uint32 lastRepaidTimestamp, uint32 loanDuration) loanDetails, tuple(uint256 paymentCycleAmount, uint32 paymentCycle, uint16 APR) terms, uint8 state, uint8 paymentType)", calls: calls, target: target, })];
+                case 1:
+                    loanData = _a.sent();
+                    console.log(loanData.length);
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+run().catch(console.error);

package/package.json

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