impermax-sdk 2.1.47 → 2.1.49

package/lib/abis/contracts/ERC20.json

@@ -277,6 +277,21 @@
             "stateMutability": "view",
             "type": "function"
         },
+        {
+            "constant": true,
+            "inputs": [],
+            "name": "version",
+            "outputs": [
+                {
+                    "internalType": "string",
+                    "name": "",
+                    "type": "string"
+                }
+            ],
+            "payable": false,
+            "stateMutability": "view",
+            "type": "function"
+        },
         {
             "constant": true,
             "inputs": [],

package/lib/offchain/lendingPool/offchainLendingPool.d.ts

@@ -54,7 +54,7 @@ export default class OffchainLendingPool {
     isBlacklisted(): Promise<boolean>;
     isLowTVL(): Promise<boolean>;
     isHighTVL(): Promise<boolean>;
-    isStable(): boolean;
+    isStable(): Promise<boolean>;
     getLendingPoolVersion(): LendingPoolVersion;
     getTotalBorrowsUSD(): Promise<number>;
     getUniswapV2PairAddress(): Promise<Address>;

package/lib/offchain/lendingPool/offchainLendingPool.js

@@ -185,7 +185,7 @@ class OffchainLendingPool {
     getAmm() {
         var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
-            const lendingPoolData = yield this.getLendingPoolData();
+            const lendingPoolData = (yield this.getLendingPoolData());
             // TODO: this properly
             const pairFactory = (_b = (_a = lendingPoolData.pair) === null || _a === void 0 ? void 0 : _a.uniswapV2Factory) !== null && _b !== void 0 ? _b : (_c = lendingPoolData.nftlp) === null || _c === void 0 ? void 0 : _c.dexFactory;
             return (0, amms_1.getAmmByFactory)(this.offchain.network, pairFactory);
@@ -252,7 +252,7 @@ class OffchainLendingPool {
             const [supply0USD, supply1USD, totalBalanceUSD] = yield Promise.all([
                 this.getBorrowableA().getTotalBalanceUSD(),
                 this.getBorrowableB().getTotalBalanceUSD(),
-                this.getCollateral().getTotalBalanceUSD()
+                this.getCollateral().getTotalBalanceUSD(),
             ]);
             if (supply0USD && supply1USD && totalBalanceUSD)
                 return supply0USD + supply1USD + totalBalanceUSD;
@@ -280,12 +280,21 @@ class OffchainLendingPool {
             return false;
         });
     }
-    // WARN: If V3 supports multiple pool types, then need more robust way to check if is stable or not
+    // Stable is defined if any following condition is met:
+    // - Both tokens are stables
+    // - factory type is "7" (ie. SOL_STABLE)
     isStable() {
-        const factoryType = Number(this.factory);
-        if (factoryType === 7)
-            return true;
-        return false;
+        return __awaiter(this, void 0, void 0, function* () {
+            const [stables, token0, token1] = yield Promise.all([
+                this.getOffchain().getAPRHelper().getAllStablecoins(),
+                this.getBorrowableA().getSymbol(),
+                this.getBorrowableB().getSymbol(),
+            ]);
+            const bothStable = stables.includes(token0) && stables.includes(token1);
+            if (bothStable || this.factory === "7")
+                return true;
+            return false;
+        });
     }
     // Versions Specfics
     getLendingPoolVersion() {

package/lib/offchain/offchainAPRHelper.d.ts

@@ -13,14 +13,16 @@ export type LlamaChainChart = {
     }[];
 }[];
 export default class OffchainAPRHelper {
-    private llamaAllPools;
     private initialized;
-    private chainTvls;
+    private llamaAllPools;
+    private chainTvlCharts;
+    private protocolTvlChart;
     private tvlInitialized;
+    private chainTvls;
     private chainsTotalSupplied;
     private totalSuppliedInitialized;
-    private chainTvlCharts;
-    private protocolTvlChart;
+    private stablecoins;
+    private stablecoinsInitialized;
     private readonly blacklistedProjects;
     offchainMultichain: OffchainMultichain;
     constructor(offchainMultichain: OffchainMultichain);
@@ -43,4 +45,6 @@ export default class OffchainAPRHelper {
     getImpermaxTotalSupplied(): Promise<number>;
     getProtocolTvlChart(): Promise<LlamaTvlChart>;
     getChainTvlChart(chain: Networks): Promise<LlamaTvlChart>;
+    private initializeStablecoins;
+    getAllStablecoins(): Promise<string[]>;
 }

package/lib/offchain/offchainAPRHelper.js

@@ -35,18 +35,24 @@ const LlamaChains = {
 // Class to get the APR from DefiLlama directly, only makes 1 call to api and caches all pools
 class OffchainAPRHelper {
     constructor(offchainMultichain) {
-        this.llamaAllPools = {};
+        // Llama Yields
         this.initialized = null;
-        this.chainTvls = {};
+        this.llamaAllPools = {};
+        // Chain Charts
+        this.chainTvlCharts = {};
+        this.protocolTvlChart = [];
+        // Chain TVLs
         this.tvlInitialized = null;
+        this.chainTvls = {};
+        // Chain Total Supplied
         this.chainsTotalSupplied = {};
         this.totalSuppliedInitialized = null;
-        // Charts
-        this.chainTvlCharts = {};
-        this.protocolTvlChart = [];
+        // Misc.
+        this.stablecoins = [];
+        this.stablecoinsInitialized = null;
         this.blacklistedProjects = new Set([
             "extra-finance",
-            "beefy"
+            "beefy",
         ]);
         this.offchainMultichain = offchainMultichain;
     }
@@ -57,6 +63,8 @@ class OffchainAPRHelper {
         this.tvlInitialized = null;
         this.chainsTotalSupplied = {};
         this.totalSuppliedInitialized = null;
+        this.stablecoins = [];
+        this.stablecoinsInitialized = null;
     }
     // Blacklist certain projects which might report same pool as dex (aggregators, etc.)
     // Reason we need this is that we want the DEX APR and not the APR of other projects
@@ -123,9 +131,10 @@ class OffchainAPRHelper {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const response = yield fetch("https://yields.llama.fi/poolsBorrow").then((i) => i.json());
-                const impermaxPools = response.data.filter((i) => i.project === 'impermax-finance');
+                const impermaxPools = response.data.filter((i) => i.project === "impermax-finance");
                 this.chainsTotalSupplied = impermaxPools.reduce((acc, pool) => {
-                    acc[pool.chain.toLowerCase()] = (acc[pool.chain.toLowerCase()] || 0) + pool.totalSupplyUsd;
+                    acc[pool.chain.toLowerCase()] =
+                        (acc[pool.chain.toLowerCase()] || 0) + pool.totalSupplyUsd;
                     return acc;
                 }, {});
             }
@@ -191,7 +200,7 @@ class OffchainAPRHelper {
             // Get or initialize the tvl for all chains
             const [llamaTvls, totalSuppliedYields] = yield Promise.all([
                 this.getLlamaTvls(),
-                this.getChainsTotalSupplied()
+                this.getChainsTotalSupplied(),
             ]);
             const llamaChain = LlamaChains[chain];
             if (!llamaChain)
@@ -249,5 +258,26 @@ class OffchainAPRHelper {
             return this.chainTvlCharts[llamaChain];
         });
     }
+    initializeStablecoins() {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const response = yield fetch("https://stablecoins.llama.fi/stablecoins").then((i) => i.json());
+                this.stablecoins = response.peggedAssets.map((i) => i.symbol);
+            }
+            catch (err) {
+                console.log("Error getting stablecoins data: ", err);
+            }
+        });
+    }
+    // Other helpful defillama functions
+    // Get a list of stablecoins
+    getAllStablecoins() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.stablecoinsInitialized)
+                this.stablecoinsInitialized = this.initializeStablecoins();
+            yield this.stablecoinsInitialized;
+            return this.stablecoins;
+        });
+    }
 }
 exports.default = OffchainAPRHelper;

package/lib/onchain/interactions/onchainInteractionsPoolToken.js

@@ -116,7 +116,12 @@ class OnchainInteractionsPoolToken {
             const token = yield this.poolToken.getToken();
             // experimental feature: check if the token supports permit by getting the DOMAIN_SEPARATOR
             const domain = yield token.methods.DOMAIN_SEPARATOR().call();
-            return this.getPermitHelper().getTokenPermit(token, owner, spender, amount, domain);
+            let version = null;
+            try {
+                version = yield token.methods.version().call();
+            }
+            catch (_a) { }
+            return this.getPermitHelper().getTokenPermit(token, owner, spender, amount, version);
         });
     }
     permit2Underlying(amount) {

package/lib/onchain/onchainPermitHelper.d.ts

@@ -15,7 +15,7 @@ export default class OnchainPermitHelper {
     private getNftPermitJSONData;
     private getPermit2SingleJSONData;
     private getSignature;
-    getTokenPermit(token: Contract, owner: Address, spender: Address, value: BigNumber, overrideDomain?: null): Promise<Permit>;
+    getTokenPermit(token: Contract, owner: Address, spender: Address, value: BigNumber, version?: null): Promise<Permit>;
     getNftPermit(token: Contract, owner: Address, spender: Address, tokenId: BigNumber): Promise<Permit>;
     getPermit2Single(token: Contract, owner: Address, spender: Address, value: BigNumber): Promise<Permit>;
 }

package/lib/onchain/onchainPermitHelper.js

@@ -68,10 +68,10 @@ class OnchainPermitHelper {
     // TODO crate new router for V2 otherwise borrowPermit will stop working
     constructor(onchain) {
         this.deadline = general_1.DEADLINE.toString();
-        this.getDomainPermit1 = (contract) => __awaiter(this, void 0, void 0, function* () {
+        this.getDomainPermit1 = (contract, version = null) => __awaiter(this, void 0, void 0, function* () {
             return ({
                 name: yield contract.methods.name().call(),
-                version: "1",
+                version: version ? version : "1",
                 chainId: this.onchain.chainId,
                 verifyingContract: contract._address,
             });
@@ -89,11 +89,10 @@ class OnchainPermitHelper {
             permits = [];
         return ethers_1.ethers.utils.defaultAbiCoder.encode(['tuple(uint256 permitType, bytes permitData, bytes signature)[]'], [permits]);
     }
-    getTokenPermitJSONData(contract, message, overrideDomain = null) {
+    getTokenPermitJSONData(contract, message, version = null) {
         return __awaiter(this, void 0, void 0, function* () {
-            console.log("overrideDomain", overrideDomain);
-            console.log("domain", yield this.getDomainPermit1(contract));
-            const domain = !overrideDomain ? overrideDomain : yield this.getDomainPermit1(contract);
+            const domain = yield this.getDomainPermit1(contract, version);
+            console.log(domain);
             const primaryType = "Permit";
             return JSON.stringify({ types: TOKEN_PERMIT_TYPES, domain, primaryType, message });
         });
@@ -138,7 +137,7 @@ class OnchainPermitHelper {
             });
         });
     }
-    getTokenPermit(token, owner, spender, value, overrideDomain = null) {
+    getTokenPermit(token, owner, spender, value, version = null) {
         return __awaiter(this, void 0, void 0, function* () {
             const nonce = yield token.methods.nonces(owner).call();
             const jsonData = yield this.getTokenPermitJSONData(token, {
@@ -147,7 +146,7 @@ class OnchainPermitHelper {
                 value: value.toString(),
                 nonce: ethers_1.BigNumber.from(nonce).toHexString(),
                 deadline: this.deadline,
-            }, overrideDomain);
+            }, version);
             return {
                 permitType: onchainTypes_1.PermitType.PERMIT1,
                 permitData: ethers_1.ethers.utils.defaultAbiCoder.encode(['address', 'uint256', 'uint256'], [token._address, value.toString(), this.deadline]),

package/package.json

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