@curvefi/llamalend-api 1.0.21 → 1.0.22-beta.2

package/lib/lendMarkets/lendMarketConstructor.d.ts

@@ -1,2 +1,3 @@
 import { LendMarketTemplate } from "./LendMarketTemplate.js";
-export declare const getLendMarket: (lendMarketId: string) => LendMarketTemplate;
+import type { Llamalend } from "../llamalend.js";
+export declare const getLendMarket: (this: Llamalend, lendMarketId: string) => LendMarketTemplate;

package/lib/lendMarkets/lendMarketConstructor.js

@@ -1,6 +1,5 @@
 import { LendMarketTemplate } from "./LendMarketTemplate.js";
-import { llamalend } from "../llamalend.js";
-export const getLendMarket = (lendMarketId) => {
-    const marketData = llamalend.constants.ONE_WAY_MARKETS[lendMarketId];
-    return new LendMarketTemplate(lendMarketId, marketData);
+export const getLendMarket = function (lendMarketId) {
+    const marketData = this.constants.ONE_WAY_MARKETS[lendMarketId];
+    return new LendMarketTemplate(lendMarketId, marketData, this);
 };

package/lib/llamalend.d.ts

@@ -76,6 +76,6 @@ declare class Llamalend implements ILlamalend {
     formatUnits(value: BigNumberish, unit?: string | Numeric): string;
     parseUnits(value: string, unit?: string | Numeric): bigint;
     updateFeeData(): Promise<void>;
+    _filterHiddenPools(pools: IDict<ILlamma>): Promise<IDict<ILlamma>>;
 }
-export declare const llamalend: Llamalend;
-export {};
+export { Llamalend };

package/lib/llamalend.js

@@ -42,7 +42,7 @@ import { LLAMMAS } from "./constants/llammas";
 import { L2Networks } from "./constants/L2Networks.js";
 import { createCall, handleMultiCallResponse } from "./utils.js";
 import { cacheKey, cacheStats } from "./cache/index.js";
-import { _getMarketsData } from "./external-api.js";
+import { _getHiddenPools, _getMarketsData } from "./external-api.js";
 import { extractDecimals } from "./constants/utils.js";
 export const NETWORK_CONSTANTS = {
     1: {
@@ -344,12 +344,10 @@ class Llamalend {
         });
         this.address = '00000';
         this.crvUsdAddress = COINS_ETHEREUM.crvusd;
-        // @ts-ignore
         this.provider = null;
         this.signer = null;
         this.signerAddress = "";
         this.chainId = 1;
-        // @ts-ignore
         this.multicallProvider = null;
         this.contracts = {};
         this.feeData = {};
@@ -379,13 +377,10 @@ class Llamalend {
         return __awaiter(this, arguments, void 0, function* (providerType, providerSettings, options = {} // gasPrice in Gwei
         ) {
             var _a;
-            // @ts-ignore
             this.provider = null;
-            // @ts-ignore
             this.signer = null;
             this.signerAddress = "";
             this.chainId = 1;
-            // @ts-ignore
             this.multicallProvider = null;
             this.contracts = {};
             this.feeData = {};
@@ -393,7 +388,7 @@ class Llamalend {
             this.options = {};
             this.constants = {
                 ONE_WAY_MARKETS: {},
-                LLAMMAS: Object.assign({}, LLAMMAS),
+                LLAMMAS: yield this._filterHiddenPools(LLAMMAS),
                 COINS: {},
                 DECIMALS: {},
                 NETWORK_NAME: 'ethereum',
@@ -610,24 +605,19 @@ class Llamalend {
                 const lendingInstance = this;
                 lendingInstance.setContract(lendingInstance.constants.ALIASES.gas_oracle, gasOracleABI);
                 lendingInstance.setContract(lendingInstance.constants.ALIASES.gas_oracle_blob, gasOracleBlobABI);
-                // @ts-ignore
-                if (AbstractProvider.prototype.originalEstimate) {
-                    // @ts-ignore
+                if ('originalEstimate' in AbstractProvider.prototype) {
                     AbstractProvider.prototype.estimateGas = AbstractProvider.prototype.originalEstimate;
                 }
                 const originalEstimate = AbstractProvider.prototype.estimateGas;
                 const oldEstimate = function (arg) {
                     return __awaiter(this, void 0, void 0, function* () {
-                        // @ts-ignore
                         const originalEstimateFunc = originalEstimate.bind(this);
-                        const gas = yield originalEstimateFunc(arg);
-                        return gas;
+                        return yield originalEstimateFunc(arg);
                     });
                 };
                 //Override
                 const newEstimate = function (arg) {
                     return __awaiter(this, void 0, void 0, function* () {
-                        // @ts-ignore
                         const L2EstimateGas = originalEstimate.bind(this);
                         const L1GasUsed = yield lendingInstance.contracts[lendingInstance.constants.ALIASES.gas_oracle_blob].contract.getL1GasUsed(arg.data);
                         const L1Fee = yield lendingInstance.contracts[lendingInstance.constants.ALIASES.gas_oracle_blob].contract.getL1Fee(arg.data);
@@ -636,15 +626,11 @@ class Llamalend {
                         return [L2GasUsed, L1GasUsed];
                     });
                 };
-                // @ts-ignore
                 AbstractProvider.prototype.estimateGas = newEstimate;
-                // @ts-ignore
                 AbstractProvider.prototype.originalEstimate = oldEstimate;
             }
             else {
-                // @ts-ignore
-                if (AbstractProvider.prototype.originalEstimate) {
-                    // @ts-ignore
+                if ('originalEstimate' in AbstractProvider.prototype) {
                     AbstractProvider.prototype.estimateGas = AbstractProvider.prototype.originalEstimate;
                 }
             }
@@ -690,5 +676,11 @@ class Llamalend {
             }
         });
     }
+    _filterHiddenPools(pools) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const hiddenPools = (yield _getHiddenPools())[this.constants.NETWORK_NAME] || [];
+            return Object.fromEntries(Object.entries(pools).filter(([id]) => !hiddenPools.includes(id)));
+        });
+    }
 }
-export const llamalend = new Llamalend();
+export { Llamalend };

package/lib/mintMarkets/MintMarketTemplate.d.ts

@@ -1,6 +1,8 @@
 import memoize from "memoizee";
+import type { Llamalend } from "../llamalend.js";
 import { IDict, TGas } from "../interfaces";
 export declare class MintMarketTemplate {
+    private llamalend;
     id: string;
     address: string;
     controller: string;
@@ -127,7 +129,7 @@ export declare class MintMarketTemplate {
             repay: (collateral: number | string, slippage?: number) => Promise<number>;
         };
     };
-    constructor(id: string);
+    constructor(id: string, llamalend: Llamalend);
     private statsParameters;
     private statsBalances;
     private statsMaxMinBands;