impermax-sdk 1.2.59 → 1.2.60

package/lib/offchain/index.d.ts

@@ -1,6 +1,7 @@
 import OffchainLendingPool from "./lendingPool";
 import * as lendingPool from './lendingPool';
 import OffchainPriceHelper from "./offchainPriceHelper";
+import OffchainAPRHelper from "./offchainAPRHelper";
 import OffchainSolidexHelper from "./offchainSolidexHelper";
 import OffchainAccount from "./account";
 import * as account from "./account";
@@ -9,5 +10,5 @@ import OffchainLendingVault from './offchainLendingVault';
 import OffchainPoolToken from "./offchainPoolToken";
 import Offchain from './offchain';
 import OffchainConfigManager from "./configManager";
-export { account, lendingPool, configManager, OffchainAccount, OffchainLendingPool, OffchainConfigManager, OffchainPoolToken, OffchainLendingVault, OffchainSolidexHelper, OffchainPriceHelper, };
+export { account, lendingPool, configManager, OffchainAccount, OffchainLendingPool, OffchainConfigManager, OffchainPoolToken, OffchainLendingVault, OffchainSolidexHelper, OffchainPriceHelper, OffchainAPRHelper };
 export default Offchain;

package/lib/offchain/index.js

@@ -26,13 +26,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OffchainPriceHelper = exports.OffchainSolidexHelper = exports.OffchainLendingVault = exports.OffchainPoolToken = exports.OffchainConfigManager = exports.OffchainLendingPool = exports.OffchainAccount = exports.configManager = exports.lendingPool = exports.account = void 0;
+exports.OffchainAPRHelper = exports.OffchainPriceHelper = exports.OffchainSolidexHelper = exports.OffchainLendingVault = exports.OffchainPoolToken = exports.OffchainConfigManager = exports.OffchainLendingPool = exports.OffchainAccount = exports.configManager = exports.lendingPool = exports.account = void 0;
 const lendingPool_1 = __importDefault(require("./lendingPool"));
 exports.OffchainLendingPool = lendingPool_1.default;
 const lendingPool = __importStar(require("./lendingPool"));
 exports.lendingPool = lendingPool;
 const offchainPriceHelper_1 = __importDefault(require("./offchainPriceHelper"));
 exports.OffchainPriceHelper = offchainPriceHelper_1.default;
+const offchainAPRHelper_1 = __importDefault(require("./offchainAPRHelper"));
+exports.OffchainAPRHelper = offchainAPRHelper_1.default;
 const offchainSolidexHelper_1 = __importDefault(require("./offchainSolidexHelper"));
 exports.OffchainSolidexHelper = offchainSolidexHelper_1.default;
 const account_1 = __importDefault(require("./account"));

package/lib/offchain/lendingPool/offchainLendingPool.js

@@ -19,7 +19,6 @@ const farms_1 = require("../../config/farms");
 const utils_1 = require("../../utils");
 const amms_1 = require("../../config/amms");
 const factories_1 = require("../../config/factories");
-const offchainAPRHelper_1 = require("../offchainAPRHelper");
 class OffchainLendingPool {
     constructor(offchain, factory, pairAddress) {
         this.getOffchain = () => this.offchain;
@@ -216,12 +215,16 @@ class OffchainLendingPool {
             return totalBorrowsUSDA + totalBorrowsUSDB;
         });
     }
-    // Try get APR from defillama
+    // Try get APR from defillama if the uniswapv2 pair is listed on `offchainAPRHelper`
     getTotalAPR() {
         return __awaiter(this, void 0, void 0, function* () {
-            const uniswapV2Pair = (yield this.getLendingPoolData()).pair.uniswapV2PairAddress.toLowerCase();
-            if (Object.keys(offchainAPRHelper_1.defillama_ids).includes(uniswapV2Pair)) {
-                return yield (0, offchainAPRHelper_1.getDefiLlamaAPR)(offchainAPRHelper_1.defillama_ids[uniswapV2Pair]);
+            const uniswapV2Pair = (yield this.getLendingPoolData()).pair.uniswapV2PairAddress;
+            // Remove this condition for all chains
+            if (this.offchain.network == types_1.Networks.Fantom) {
+                // If llama fails/apr is 0 we get the uniswapAPR and stakingAPR through subgraph
+                const apr = yield this.offchain.getAPRHelper().getLlamaAPR(uniswapV2Pair, this.offchain.network);
+                if (apr > 0)
+                    return apr;
             }
             const [uniswapAPR, stakingAPR] = yield Promise.all([this.getUniswapAPR(), this.getStakingAPR()]);
             return uniswapAPR + stakingAPR;

package/lib/offchain/offchain.d.ts

@@ -1,6 +1,7 @@
 import * as initializer from "./offchainInitializer";
 import OffchainLendingPool from "./lendingPool";
 import OffchainPriceHelper from "./offchainPriceHelper";
+import OffchainAPRHelper from "./offchainAPRHelper";
 import OffchainSolidexHelper from "./offchainSolidexHelper";
 import OffchainAccount from "./account";
 import { Address, AddressIndex, Factory, FactoryIndex, LendingPoolIndex, Networks, WhitelistState } from '../config/types';
@@ -20,6 +21,7 @@ export default class Offchain {
     protected lendingVaults: AddressIndex<OffchainLendingVault>;
     protected accounts: AddressIndex<OffchainAccount>;
     protected priceHelper: OffchainPriceHelper;
+    protected aprHelper: OffchainAPRHelper;
     protected solidexHelper: OffchainSolidexHelper;
     protected configManager: OffchainConfigManager;
     protected lendingPoolsData: Promise<LendingPoolIndex<LendingPoolData>> | null;
@@ -41,6 +43,7 @@ export default class Offchain {
     getPriceHelper: () => OffchainPriceHelper;
     getSolidexHelper: () => OffchainSolidexHelper;
     getConfigManager: () => OffchainConfigManager;
+    getAPRHelper: () => OffchainAPRHelper;
     /**
      * TODO
      * Potrei organizzare in:

package/lib/offchain/offchain.js

@@ -37,6 +37,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const initializer = __importStar(require("./offchainInitializer"));
 const offchainPriceHelper_1 = __importDefault(require("./offchainPriceHelper"));
+const offchainAPRHelper_1 = __importDefault(require("./offchainAPRHelper"));
 const offchainSolidexHelper_1 = __importDefault(require("./offchainSolidexHelper"));
 const account_1 = __importDefault(require("./account"));
 const offchainLendingVault_1 = __importDefault(require("./offchainLendingVault"));
@@ -46,6 +47,7 @@ class Offchain {
         this.getPriceHelper = () => this.priceHelper;
         this.getSolidexHelper = () => this.solidexHelper;
         this.getConfigManager = () => this.configManager;
+        this.getAPRHelper = () => this.aprHelper;
         /**
          * TODO
          * Potrei organizzare in:
@@ -92,6 +94,7 @@ class Offchain {
         this.priceHelper = new offchainPriceHelper_1.default(this);
         this.solidexHelper = new offchainSolidexHelper_1.default(this);
         this.configManager = new configManager_1.default(this);
+        this.aprHelper = new offchainAPRHelper_1.default(this);
         this.accounts = {};
         this.usersData = {};
         this.lendingVaultsUsersData = {};
@@ -107,6 +110,7 @@ class Offchain {
         this.priceHelper.cleanCache();
         this.solidexHelper.cleanCache();
         this.configManager.cleanCache();
+        this.aprHelper.cleanCache();
     }
     getLendingPool(factory, pairAddress) {
         return __awaiter(this, void 0, void 0, function* () {

package/lib/offchain/offchainAPRHelper.d.ts

@@ -1,4 +1,12 @@
-export declare const defillama_ids: {
-    [k: string]: string;
-};
-export declare const getDefiLlamaAPR: (poolId: any) => Promise<number>;
+import { Address, Networks } from '../config/types';
+import Offchain from "./index";
+export default class OffchainAPRHelper {
+    private llamaAllPools;
+    private initialized;
+    offchain: Offchain;
+    constructor(offchain: Offchain);
+    cleanCache(): void;
+    private initializeLlamaAllPools;
+    private getLlamaPools;
+    getLlamaAPR(pool: Address, chain: Networks): Promise<number>;
+}

package/lib/offchain/offchainAPRHelper.js

@@ -9,42 +9,86 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDefiLlamaAPR = exports.defillama_ids = void 0;
-const ids = {
-    // -------------------------------------- FANTOM ------------------------------------
-    // FTM/PLUS
-    "0x964cc3a9dbad0ddddc25601abc662b6e193f92f3": "1277ae6c-58cf-43a1-a130-55c9f80e9316",
-    // FSONIC/WFTM
-    "0x767520fA98e1E24b3326fD42B24c9DCFCe8BcE14": "d3e4b430-f2e5-44b0-a9f1-196d3bf54a2d",
-    // WFTM/TANGO
-    "0x997fBfb238125dB4e90a62b423bbED2e202edd5A": "c8523f56-c4bb-4213-acdf-6799f20c9ec1",
-    // WFTM/SGOAT
-    "0xAcB5B7A37310854A6E74dD9889f6a98dA0Ef9975": "dc1f2a39-7952-4460-98eb-ec2e5d9f181c",
-    // WFTM/BAY
-    "0xA169AF5669A1d5b0a57260918CB035E152Aa3269": "bd208a0f-d9ee-4692-930e-6bcf6e50228c",
-    // EQUAL/HOOPS
-    "0xfe02fd5b3F8904e2f4108505bEE7cf91E1D179E4": "bc0ada32-62b3-44b4-963d-f09a6484b366",
-    // WFTM/ECO
-    "0xC2D4eA5547AB3d642f61A2aDadA89c9E85299e69": "48faaded-4501-4a3d-bd60-6ca9b7233dc7",
-    // WFTM/EQUAL
-    "0x3d6c56f6855b7Cc746fb80848755B0a9c3770122": "2bae2b5d-e3c9-4a3b-ad4e-923d19bb9a2f",
-    // MCLB/FBOMB
-    "0x68ca64CABbB3d40dBB0de37101A8C0b701f66fD6": "e0d0bad2-1664-49c0-9a67-345b25ec03f8",
+const types_1 = require("../config/types");
+// Map of OUR chains to the chain names used by llama in their `poolsOld`
+const LlamaChains = {
+    [types_1.Networks.Ropsten]: 'ropsten',
+    [types_1.Networks.Mainnet]: 'ethereum',
+    [types_1.Networks.Polygon]: 'polygon',
+    [types_1.Networks.Arbitrum]: 'arbitrum',
+    [types_1.Networks.Avalanche]: 'avalanche',
+    [types_1.Networks.Moonriver]: 'moonriver',
+    [types_1.Networks.Aurora]: 'aurora',
+    [types_1.Networks.Cronos]: 'cronos',
+    [types_1.Networks.Fantom]: 'fantom',
+    [types_1.Networks.Harmony]: 'harmony',
+    [types_1.Networks.Moonbeam]: 'moonbeam',
+    [types_1.Networks.Sxnetwork]: 'sxnetwork',
+    [types_1.Networks.Canto]: 'canto',
+    [types_1.Networks.ZksyncEra]: 'zksync era',
+    [types_1.Networks.Base]: 'base',
+    [types_1.Networks.Mantle]: 'mantle',
+    [types_1.Networks.Scroll]: 'scroll'
 };
-// https://stackoverflow.com/questions/12539574/whats-the-best-way-most-efficient-to-turn-all-the-keys-of-an-object-to-lower
-// Convert all keys to lowercase just in case and export this
-exports.defillama_ids = Object.fromEntries(Object.entries(ids).map(([k, v]) => [k.toLowerCase(), v]));
-// Get the DefiLlama APR for `poolID`
-const getDefiLlamaAPR = (poolId) => __awaiter(void 0, void 0, void 0, function* () {
-    let apy;
-    try {
-        const res = yield fetch(`https://yields.llama.fi/chart/${poolId}`).then(i => i.json());
-        apy = res.data[res.data.length - 1].apy;
+// Class to get the APR from DefiLlama directly, only makes 1 call to api and caches all pools
+class OffchainAPRHelper {
+    constructor(offchain) {
+        this.llamaAllPools = {};
+        this.initialized = null;
+        this.offchain = offchain;
     }
-    catch (err) {
-        apy = 0;
+    cleanCache() {
+        this.llamaAllPools = {};
+        this.initialized = null;
     }
-    // in percentage to match uniswapAPR and stakingAPR
-    return apy / 100;
-});
-exports.getDefiLlamaAPR = getDefiLlamaAPR;
+    // Initializes all llama pools
+    initializeLlamaAllPools() {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const response = yield fetch('https://yields.llama.fi/poolsOld').then(i => i.json());
+                const pools = response.data;
+                // `i.pool_old` is the pool address with sometimes `-{chain}` separator if contracts exists on diff chains
+                this.llamaAllPools = pools.reduce((acc, i) => {
+                    const pool = i.pool_old.split("-")[0];
+                    const llamaChain = i.chain;
+                    const llamaId = pool.toLowerCase() + "-" + llamaChain.toLowerCase();
+                    acc[llamaId] = i;
+                    return acc;
+                }, {});
+            }
+            catch (err) {
+                console.warn("The llamas are down?");
+                this.llamaAllPools = {};
+            }
+        });
+    }
+    getLlamaPools() {
+        return __awaiter(this, void 0, void 0, function* () {
+            // First call initializes
+            if (!this.initialized)
+                this.initialized = this.initializeLlamaAllPools();
+            // async mutex to only call llama api once
+            yield this.initialized;
+            return this.llamaAllPools;
+        });
+    }
+    // Given a DefiLlama ID get the latest APR
+    getLlamaAPR(pool, chain) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            // Get or initialize the pools
+            const llamaAllPools = yield this.getLlamaPools();
+            // Map to llama chain names, if not supported, then fetch native way
+            const llamaChain = LlamaChains[chain];
+            if (!llamaChain)
+                return 0;
+            // Make pool unique ({poolAddress}-{chain})
+            const llamaId = pool.toLowerCase() + "-" + llamaChain.toLowerCase();
+            // Convert to decimals to match `getUniswapAPR` and `getStakingAPR`
+            const apy = ((_a = llamaAllPools[llamaId]) === null || _a === void 0 ? void 0 : _a.apy) / 100;
+            // If 0 then should fetch native way to make sure
+            return apy || 0;
+        });
+    }
+}
+exports.default = OffchainAPRHelper;

package/lib/offchain/offchainPriceHelper.js

@@ -125,6 +125,7 @@ class OffchainPriceHelper {
             offchainTokenPrice["0xea38f1ccf77bf43f352636241b05dd8f6f5f52b2"] = 0;
             offchainTokenPrice["0x21be370d5312f44cb42ce377bc9b8a0cef1a4c83"] = 0;
             offchainTokenPrice["0xc19669a405067927865b40ea045a2baabbbe57f5"] = 0;
+            offchainTokenPrice["0x3fd3a0c85b70754efc07ac9ac0cbbdce664865a6"] = 0;
             return offchainTokenPrice;
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "impermax-sdk",
-  "version": "1.2.59",
+  "version": "1.2.60",
   "description": "",
   "main": "./lib/index.js",
   "module": "./lib/index.js",