@defillama/sdk 5.0.180 → 5.0.184

package/build/util/blocks.js

@@ -134,6 +134,9 @@ let lastBlockCacheSave = Date.now();
 const blockCacheSaveInterval = 1000 * 60 * 5; // 5 minutes 
 const { data: blockTimeCache, saveCacheFile: saveBlockCacheFile } = (0, cache_1.getTempLocalCache)({ file: 'BlockCache.json', defaultData: {}, clearAfter: cache_1.ONE_WEEK, returnWithSaveFunction: true });
 function validateCurrentBlock(block, chain = 'ethereum') {
+    // sometimes the chain is halted or facing issues, so we skip the validation for those chains
+    if ((0, env_1.shouldSkipBlockValidation)(chain))
+        return;
     const provider = getExtraProvider(chain);
     const now = Math.floor(Date.now() / 1000);
     const minutesDiff = Math.floor((now - block.timestamp) / 60);
@@ -229,8 +232,9 @@ async function _lookupBlock(timestamp, extraParams) {
         }
         if (i > 2 && env_1.ENV_CONSTANTS.GET_BLOCK_STATS)
             (0, debugLog_1.debugLog)(`chain: ${chain} block: ${block.number} #calls: ${i} imprecision: ${Number((imprecision) / 60).toFixed(2)} (min) Time Taken: ${Number((Date.now() - time) / 1000).toFixed(2)} (in sec)`);
-        if (chain !== "bsc" && // this check is there because bsc halted the chain for few days
-            Math.abs(block.timestamp - timestamp) > 3600) {
+        if (Math.abs(block.timestamp - timestamp) > 3600
+            && chain !== "bsc" // this check is there because bsc halted the chain for few days
+            && !(0, env_1.shouldSkipBlockValidation)(chain)) {
             throw new Error("Block selected is more than 1 hour away from the requested timestamp");
         }
         return {

package/build/util/common.js

@@ -234,7 +234,7 @@ function formErrorString(e, errorParams = {}) {
     }
     if (e.llamaRPCError) {
         const errorString = `Llama RPC error! method: ${e.method} `;
-        const errors = e.errors.map((i) => { var _a; return `- host: ${i === null || i === void 0 ? void 0 : i.host} error: ${(_a = i === null || i === void 0 ? void 0 : i.error) === null || _a === void 0 ? void 0 : _a.message}`; });
+        const errors = e.errors.map((i) => { var _a; return `- host: ${i === null || i === void 0 ? void 0 : i.host} error: ${typeof (i === null || i === void 0 ? void 0 : i.error) === 'string' ? i === null || i === void 0 ? void 0 : i.error : (_a = i === null || i === void 0 ? void 0 : i.error) === null || _a === void 0 ? void 0 : _a.message}`; });
         return errorString + '\n' + errors.join('\n');
     }
     let errorString = e.toString();
@@ -302,6 +302,9 @@ function shortenString(str, length) {
 }
 function formError(e, errorParams = {}) {
     var _a;
+    if (e instanceof Error && (0, env_1.getBoolEnvValue)('DEBUG_ERROR_STACK')) {
+        console.error(e);
+    }
     const errorParamsSet = Object.keys(errorParams).length;
     if ((e === null || e === void 0 ? void 0 : e._isCustomError) || (!errorParamsSet && typeof e === 'object' && !Object.keys(e).length))
         return e; // already formatted or vannila error

package/build/util/env.d.ts

@@ -14,3 +14,5 @@ export declare function getBatchMaxCount(chain: string): number;
 export declare function getArchivalRPCs(chain: string): string[];
 export declare function getChainRPCs(chain: string, defaultList?: string[]): string | undefined;
 export declare function getWhitelistedRPCs(chain: string): string[];
+export declare function shouldSkipBlockValidation(chain: string): boolean;
+export declare function getBoolEnvValue(key: string, defaultValue?: boolean): boolean;

package/build/util/env.js

@@ -15,6 +15,8 @@ exports.getBatchMaxCount = getBatchMaxCount;
 exports.getArchivalRPCs = getArchivalRPCs;
 exports.getChainRPCs = getChainRPCs;
 exports.getWhitelistedRPCs = getWhitelistedRPCs;
+exports.shouldSkipBlockValidation = shouldSkipBlockValidation;
+exports.getBoolEnvValue = getBoolEnvValue;
 const whitelistedEnvConstants = [
     'R2_ENDPOINT', 'R2_ACCESS_KEY_ID', 'R2_SECRET_ACCESS_KEY', 'TRON_PRO_API_KEY', 'COINS_API_KEY',
     'ELASTICSEARCH_CONFIG', 'GRAPH_API_KEY', 'LLAMA_INDEXER_ENDPOINT', 'LLAMA_INDEXER_API_KEY', 'LLAMA_INDEXER_V2_ENDPOINT', 'LLAMA_INDEXER_V2_API_KEY',
@@ -37,6 +39,7 @@ const defaultEnvValues = {
 };
 const _ENV_CONSTANTS = {
     DEBUG_ENABLED: getEnvValue('DEBUG') === "true" || process.env.LLAMA_DEBUG_MODE ? 'true' : 'false',
+    DEBUG_ERROR_STACK: getEnvValue('DEBUG_ERROR_STACK') === "true",
     DEBUG_LEVEL2: process.env.LLAMA_DEBUG_LEVEL2 || process.env.LLAMA_SDK_DEBUG_LEVEL_3 ? 'true' : 'false',
     DEBUG_LEBEL_3: isDebugLevel3,
     LOG_LLAMA_PROVIDER_CALLS: isDebugLevel3 || process.env.LLAMA_SDK_LOG_LLAMA_PROVIDER_CALLS === 'true',
@@ -131,3 +134,18 @@ function getWhitelistedRPCs(chain) {
         return getEnvValue(key).split(',');
     return [];
 }
+let skipBlockValidationChainSet = null;
+function shouldSkipBlockValidation(chain) {
+    if (!skipBlockValidationChainSet) {
+        const envValue = getEnvValue('SKIP_BLOCK_VALIDATION_CHAINS', '');
+        const chainList = envValue ? envValue.split(',').map(c => c.trim()) : [];
+        skipBlockValidationChainSet = new Set(chainList);
+    }
+    return skipBlockValidationChainSet.has(chain);
+}
+function getBoolEnvValue(key, defaultValue = false) {
+    const envValue = getEnvValue(key);
+    if (envValue === undefined)
+        return defaultValue;
+    return envValue === 'true';
+}

package/package.json

@@ -1,15 +1,16 @@
 {
   "name": "@defillama/sdk",
-  "version": "5.0.180",
+  "version": "5.0.184",
   "description": "SDK for calculating TVL",
   "main": "build/index.js",
   "scripts": {
     "start": "npm run build && node build/index.js",
+    "pack-and-publish": "bash ./scripts/skipTestPatchAndPublish.sh",
     "build": "tsc",
     "watch": "tsc --watch",
-    "load-providers": "wget https://unpkg.com/@defillama/sdk@latest/build/providers.json -O build/providers.json",
-    "test": "npm run load-providers && TEST_MODE=true LLAMA_DEBUG_MODE='' SDK_DEBUG='' LLAMA_DEBUG_LEVEL2='' jest",
-    "test-only": "echo 'skipped building providers.json' && TEST_MODE=true LLAMA_DEBUG_MODE='' SDK_DEBUG='' LLAMA_DEBUG_LEVEL2='' jest",
+    "load-providers": "mkdir -p build && wget https://unpkg.com/@defillama/sdk@latest/build/providers.json -O build/providers.json",
+    "test": "npm run load-providers && TEST_MODE=true LLAMA_DEBUG_MODE='' SDK_DEBUG='' LLAMA_DEBUG_LEVEL2=''  LLAMA_DEBUG_LEVEL3='' jest",
+    "test-only": "echo 'skipped building providers.json' && TEST_MODE=true LLAMA_DEBUG_MODE='' SDK_DEBUG='' LLAMA_DEBUG_LEVEL2=''  LLAMA_DEBUG_LEVEL3='' jest",
     "test-debug": "TEST_MODE=true jest",
     "update-providers": "ts-node src/util/updateProviderList.ts",
     "remove-rpcs": "ts-node src/util/removeRedundantRPCs.ts",