@defillama/sdk 5.0.217 → 5.0.218

package/build/util/cache.js

@@ -64,29 +64,51 @@ async function readCache(file, options = {}) {
         return {};
     }
     async function readFile() {
-        const filePath = getFilePath(file);
+        var _a;
         try {
-            if (options.checkIfRecent) {
-                const stats = await fs.stat(filePath);
-                if (Date.now() - stats.mtimeMs > ONE_DAY_IN_MS)
-                    throw new Error('File too old, read from R2 instead');
-            }
-            if (options.readFromR2Cache)
-                throw new Error('Read from R2 cache');
-            const data = await fs.readFile(filePath);
+            const data = await readDataFromLocal((_a = options.readFromR2Cache) !== null && _a !== void 0 ? _a : false);
             return data;
         }
         catch (error) {
             // debugLog('Error reading cache:', error)
-            if (options.skipR2Cache)
-                return;
-            const r2Data = await (0, r2_1.getR2JSONString)(exports.currentVersion + '/' + file);
+            return readDataFromR2();
+        }
+    }
+    async function readDataFromLocal(readFromR2Cache) {
+        const filePath = getFilePath(file);
+        if (options.checkIfRecent) {
+            const stats = await fs.stat(filePath);
+            if (Date.now() - stats.mtimeMs > ONE_DAY_IN_MS)
+                throw new Error('File too old, read from R2 instead');
+        }
+        if (readFromR2Cache)
+            throw new Error('Read from R2 cache');
+        const data = await fs.readFile(filePath);
+        return data;
+    }
+    async function readDataFromR2() {
+        var _a;
+        if (options.skipR2Cache)
+            return;
+        try {
+            const r2Data = await (0, r2_1.getR2JSONString)(exports.currentVersion + '/' + file, { throwErrorOnFail: (_a = options.readFromR2Cache) !== null && _a !== void 0 ? _a : false });
             if (r2Data) {
                 // `file` already carries the `-uncompressed` suffix (added above), so omit skipCompression here to avoid writeCache appending it again
                 await writeCache(file, r2Data, { alreadyCompressed: true, skipR2CacheWrite: true });
                 return r2Data;
             }
         }
+        catch (error) {
+            if (options.readFromR2Cache) {
+                // if we were forced to read from R2 cache, try reading from local cache if R2 fails
+                try {
+                    const data = await readDataFromLocal(false);
+                    return data;
+                }
+                catch (_e) { }
+            }
+            return {};
+        }
     }
 }
 async function writeCache(file, data, options = {}) {

package/build/util/chainUtils/data.json

@@ -25,6 +25,7 @@
         "althea": "Althea",
         "alv": "ALV",
         "ancient8": "Ancient8",
+        "anubi": "Anubis",
         "ao": "AO",
         "apechain": "ApeChain",
         "appchain": "Appchain",
@@ -254,6 +255,7 @@
         "joc": "JOC",
         "joltify": "Joltify",
         "juno": "Juno",
+        "jupnet": "Jupnet",
         "kadena": "Kadena",
         "kalshi": "Kalshi",
         "karak": "K2",
@@ -423,12 +425,14 @@
         "reya": "ReyaChain",
         "ripple": "XRPL",
         "rise": "RISE",
+        "robinhood": "Robinhood Chain",
         "robonomics": "Robonomics",
         "rollux": "Rollux",
         "ronin": "Ronin",
         "rpg": "Rangers",
         "rsk": "Rootstock",
         "rss3_vsl": "RSS3",
+        "rubin": "Rubin",
         "rvn": "Ravencoin",
         "saakuru": "Saakuru",
         "saga": "Saga",
@@ -588,6 +592,7 @@
         "AlphaSec": "alphasec",
         "Althea": "althea",
         "Ancient8": "ancient8",
+        "Anubis": "anubi",
         "ApeChain": "apechain",
         "Appchain": "appchain",
         "Aptos": "aptos",
@@ -823,6 +828,7 @@
         "JOC": "joc",
         "Joltify": "joltify",
         "Juno": "juno",
+        "Jupnet": "jupnet",
         "K2": "karak",
         "KCC": "kcc",
         "KUB": "bitkub",
@@ -1013,10 +1019,12 @@
         "Reya Network": "reya",
         "ReyaChain": "reya",
         "Ripple": "ripple",
+        "Robinhood Chain": "robinhood",
         "Robonomics": "robonomics",
         "Rollux": "rollux",
         "Ronin": "ronin",
         "Rootstock": "rsk",
+        "Rubin": "rubin",
         "SKALE": "skale",
         "SKALE Europa": "europa",
         "SX Network": "sx",

package/build/util/coins.js

@@ -11,6 +11,7 @@ const promisePool_1 = __importDefault(require("./promisePool"));
 const common_1 = require("./common");
 const _1 = require(".");
 const coinsApiKey = (0, env_1.getEnvValue)("COINS_API_KEY");
+const proApiKey = (0, env_1.getEnvValue)("INTERNAL_API_KEY");
 const bodySize = 100;
 function getBodies(readKeys, timestamp) {
     const chunks = (0, _1.sliceIntoChunks)(readKeys, bodySize);
@@ -31,9 +32,26 @@ async function restCallWrapper(request, retries = 3, name = "-") {
         if (retries <= 0)
             throw (0, common_1.formError)(e);
     }
-    await (0, common_1.sleepRandom)(5000 + 10000, 5000);
+    await (0, common_1.sleepRandom)(2000 + 10000, 2000);
     return restCallWrapper(request, retries, name);
 }
+async function fetchWithProFallback(body, subRoute) {
+    // if pro api key is set, try the pro route first and fall back to the normal route on failure
+    if (proApiKey) {
+        try {
+            return await restCallWrapper(() => axios_1.default.post(`https://pro-api.llama.fi/${proApiKey}/coins/${subRoute}`, body, {
+                headers: { "Content-Type": "application/json" },
+            }), 2);
+        }
+        catch (e) {
+            // fall through to the normal route below
+        }
+    }
+    return restCallWrapper(() => axios_1.default.post(`https://coins.llama.fi/${subRoute}`, body, {
+        headers: { "Content-Type": "application/json" },
+        params: { source: "internal", apikey: coinsApiKey },
+    }));
+}
 const priceCacheAll = {
     now: {
         "coingecko:tether": {
@@ -74,10 +92,7 @@ async function getPricesData(readKeys, timestamp, dataType) {
         processor: async (body) => {
             if (!body.coins.length)
                 return;
-            const res = await restCallWrapper(() => axios_1.default.post(`https://coins.llama.fi/${subRoute}`, body, {
-                headers: { "Content-Type": "application/json" },
-                params: { source: "internal", apikey: coinsApiKey },
-            }));
+            const res = await fetchWithProFallback(body, subRoute);
             const data = dataType === "price" ? res.data.coins : res.data;
             Object.entries(data).forEach(([PK, value]) => {
                 const pkNormalized = PK.toLowerCase();

package/build/util/env.d.ts

@@ -1,3 +1,4 @@
+export declare const whitelistedEnvConstants: string[];
 export declare const ENV_CONSTANTS: {
     [key: string]: string | boolean | undefined;
 };

package/build/util/env.js

@@ -1,7 +1,7 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ENV_CONSTANTS = void 0;
+exports.ENV_CONSTANTS = exports.whitelistedEnvConstants = void 0;
 exports.getChainId = getChainId;
 exports.getMaxParallelRequests = getMaxParallelRequests;
 exports.getParallelGetLogsLimit = getParallelGetLogsLimit;
@@ -17,8 +17,8 @@ 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',
+exports.whitelistedEnvConstants = [
+    'R2_ENDPOINT', 'R2_ACCESS_KEY_ID', 'R2_SECRET_ACCESS_KEY', 'TRON_PRO_API_KEY', 'COINS_API_KEY', 'INTERNAL_API_KEY',
     'ELASTICSEARCH_CONFIG', 'GRAPH_API_KEY', 'LLAMA_INDEXER_V2_ENDPOINT', 'LLAMA_INDEXER_V2_API_KEY', 'LLAMA_INDEXER_TIMEOUT_MS'
 ];
 const isDebugLevel3 = process.env.LLAMA_SDK_DEBUG_LEVEL_3 === 'true';
@@ -54,7 +54,7 @@ const _ENV_CONSTANTS = {
     GET_LOGS_INDEXER: isDebugLevel3 || process.env.LLAMA_SDK_GET_LOGS_INDEXER === 'true',
     DEFAULT_SHORTEN_STRING_LENGTH: (_a = process.env.LLAMA_SDK_DEFAULT_SHORTEN_STRING_LENGTH) !== null && _a !== void 0 ? _a : '120',
 };
-whitelistedEnvConstants.forEach(key => _ENV_CONSTANTS[key] = getEnvValue(key));
+exports.whitelistedEnvConstants.forEach(key => _ENV_CONSTANTS[key] = getEnvValue(key));
 Object.keys(defaultEnvValues).forEach(key => _ENV_CONSTANTS[key] = getEnvValue(key, defaultEnvValues[key]));
 // doing this as I am paranoid that that empty object when first declared might be exported before values are set
 exports.ENV_CONSTANTS = { ..._ENV_CONSTANTS };

package/build/util/r2.d.ts

@@ -1,2 +1,4 @@
 export declare function storeR2JSONString(filename: string, body: string | Buffer): Promise<any>;
-export declare function getR2JSONString(filename: string): Promise<any>;
+export declare function getR2JSONString(filename: string, { throwErrorOnFail }?: {
+    throwErrorOnFail?: boolean | undefined;
+}): Promise<any>;

package/build/util/r2.js

@@ -33,7 +33,7 @@ async function storeR2JSONString(filename, body) {
     });
     return R2.send(command);
 }
-async function getR2JSONString(filename) {
+async function getR2JSONString(filename, { throwErrorOnFail = false } = {}) {
     try {
         if (!R2)
             return await _fetchData();
@@ -42,6 +42,8 @@ async function getR2JSONString(filename) {
         return await Body.transformToString();
     }
     catch (e) {
+        if (throwErrorOnFail)
+            throw e;
         return {};
     }
     async function _fetchData() {

package/package.json

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