@curvefi/llamalend-api 1.0.7 → 1.0.8

package/lib/llamalend.d.ts

@@ -6,6 +6,7 @@ export declare const NETWORK_CONSTANTS: {
 };
 declare class Llamalend implements ILlamalend {
     address: string;
+    crvUsdAddress: string;
     provider: ethers.BrowserProvider | ethers.JsonRpcProvider;
     multicallProvider: MulticallProvider;
     signer: ethers.Signer | null;

package/lib/llamalend.js

@@ -342,7 +342,8 @@ class Llamalend {
                 };
             });
         });
-        this.address = '00000'; //COINS.lending.toLowerCase();
+        this.address = '00000';
+        this.crvUsdAddress = COINS_ETHEREUM.crvusd;
         // @ts-ignore
         this.provider = null;
         this.signer = null;
@@ -510,6 +511,7 @@ class Llamalend {
                 }
             }
             // crvUSD contracts
+            this.setContract(this.crvUsdAddress, ERC20ABI);
             if (this.chainId === 1) {
                 this.setContract(this.constants.COINS.crvusd.toLowerCase(), ERC20ABI);
                 for (const llamma of Object.values(this.constants.LLAMMAS)) {
@@ -603,7 +605,7 @@ class Llamalend {
                 }
             }
             this.constants.DECIMALS = extractDecimals(this.constants.LLAMMAS);
-            this.constants.DECIMALS[this.address] = 18;
+            this.constants.DECIMALS[this.crvUsdAddress] = 18;
             if (L2Networks.includes(this.chainId)) {
                 // eslint-disable-next-line @typescript-eslint/no-this-alias
                 const lendingInstance = this;

package/lib/mintMarkets/MintMarketTemplate.js

@@ -72,7 +72,7 @@ export class MintMarketTemplate {
             maxAge: 60 * 1000, // 1m
         });
         this.statsTotalStablecoin = memoize(() => __awaiter(this, void 0, void 0, function* () {
-            const stablecoinContract = llamalend.contracts[llamalend.address].multicallContract;
+            const stablecoinContract = llamalend.contracts[llamalend.crvUsdAddress].multicallContract;
             const ammContract = llamalend.contracts[this.address].multicallContract;
             const [_balance, _fee] = yield llamalend.multicallProvider.all([
                 stablecoinContract.balanceOf(this.address),
@@ -97,7 +97,7 @@ export class MintMarketTemplate {
         });
         this.statsCapAndAvailable = memoize(() => __awaiter(this, void 0, void 0, function* () {
             const factoryContract = llamalend.contracts[llamalend.constants.FACTORY].multicallContract;
-            const crvusdContract = llamalend.contracts[llamalend.address].multicallContract;
+            const crvusdContract = llamalend.contracts[llamalend.crvUsdAddress].multicallContract;
             const [_cap, _available] = yield llamalend.multicallProvider.all([
                 factoryContract.debt_ceiling(this.controller),
                 crvusdContract.balanceOf(this.controller),
@@ -247,7 +247,7 @@ export class MintMarketTemplate {
         this.collateralSymbol = llammaData.collateral_symbol;
         this.collateralDecimals = llammaData.collateral_decimals;
         this.coins = ["crvUSD", llammaData.collateral_symbol];
-        this.coinAddresses = [llamalend.address, llammaData.collateral_address];
+        this.coinAddresses = [llamalend.crvUsdAddress, llammaData.collateral_address];
         this.coinDecimals = [18, llammaData.collateral_decimals];
         this.minBands = llammaData.min_bands;
         this.maxBands = llammaData.max_bands;
@@ -326,7 +326,7 @@ export class MintMarketTemplate {
     }
     statsBalances() {
         return __awaiter(this, void 0, void 0, function* () {
-            const crvusdContract = llamalend.contracts[llamalend.address].multicallContract;
+            const crvusdContract = llamalend.contracts[llamalend.crvUsdAddress].multicallContract;
             const collateralContract = llamalend.contracts[isEth(this.collateral) ? llamalend.constants.WETH : this.collateral].multicallContract;
             const contract = llamalend.contracts[this.address].multicallContract;
             const calls = [
@@ -550,7 +550,7 @@ export class MintMarketTemplate {
     // ---------------- WALLET BALANCES ----------------
     walletBalances() {
         return __awaiter(this, arguments, void 0, function* (address = "") {
-            const [collateral, stablecoin] = yield getBalances([this.collateral, llamalend.address], address);
+            const [collateral, stablecoin] = yield getBalances([this.collateral, llamalend.crvUsdAddress], address);
             return { stablecoin, collateral };
         });
     }
@@ -1006,17 +1006,17 @@ export class MintMarketTemplate {
     }
     repayIsApproved(debt) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield hasAllowance([llamalend.address], [debt], llamalend.signerAddress, this.controller);
+            return yield hasAllowance([llamalend.crvUsdAddress], [debt], llamalend.signerAddress, this.controller);
         });
     }
     repayApproveEstimateGas(debt) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield ensureAllowanceEstimateGas([llamalend.address], [debt], this.controller);
+            return yield ensureAllowanceEstimateGas([llamalend.crvUsdAddress], [debt], this.controller);
         });
     }
     repayApprove(debt) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield ensureAllowance([llamalend.address], [debt], this.controller);
+            return yield ensureAllowance([llamalend.crvUsdAddress], [debt], this.controller);
         });
     }
     repayHealth(debt_1) {
@@ -1240,19 +1240,19 @@ export class MintMarketTemplate {
     liquidateIsApproved() {
         return __awaiter(this, arguments, void 0, function* (address = "") {
             const tokensToLiquidate = yield this.tokensToLiquidate(address);
-            return yield hasAllowance([llamalend.address], [tokensToLiquidate], llamalend.signerAddress, this.controller);
+            return yield hasAllowance([llamalend.crvUsdAddress], [tokensToLiquidate], llamalend.signerAddress, this.controller);
         });
     }
     liquidateApproveEstimateGas() {
         return __awaiter(this, arguments, void 0, function* (address = "") {
             const tokensToLiquidate = yield this.tokensToLiquidate(address);
-            return yield ensureAllowanceEstimateGas([llamalend.address], [tokensToLiquidate], this.controller);
+            return yield ensureAllowanceEstimateGas([llamalend.crvUsdAddress], [tokensToLiquidate], this.controller);
         });
     }
     liquidateApprove() {
         return __awaiter(this, arguments, void 0, function* (address = "") {
             const tokensToLiquidate = yield this.tokensToLiquidate(address);
-            return yield ensureAllowance([llamalend.address], [tokensToLiquidate], this.controller);
+            return yield ensureAllowance([llamalend.crvUsdAddress], [tokensToLiquidate], this.controller);
         });
     }
     _liquidate(address, slippage, estimateGas) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@curvefi/llamalend-api",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "JavaScript library for Curve Lending",
   "main": "lib/index.js",
   "author": "Macket",

package/src/llamalend.ts

@@ -171,6 +171,7 @@ export const NETWORK_CONSTANTS: { [index: number]: any } = {
 
 class Llamalend implements ILlamalend {
     address: string;
+    crvUsdAddress: string;
     provider: ethers.BrowserProvider | ethers.JsonRpcProvider;
     multicallProvider: MulticallProvider;
     signer: ethers.Signer | null;
@@ -196,7 +197,8 @@ class Llamalend implements ILlamalend {
     };
 
     constructor() {
-        this.address = '00000'//COINS.lending.toLowerCase();
+        this.address = '00000'
+        this.crvUsdAddress = COINS_ETHEREUM.crvusd;
         // @ts-ignore
         this.provider = null;
         this.signer = null;
@@ -368,6 +370,7 @@ class Llamalend implements ILlamalend {
         }
 
         // crvUSD contracts
+        this.setContract(this.crvUsdAddress, ERC20ABI);
         if(this.chainId === 1) {
             this.setContract(this.constants.COINS.crvusd.toLowerCase(), ERC20ABI);
             for (const llamma of Object.values(this.constants.LLAMMAS)) {
@@ -475,7 +478,7 @@ class Llamalend implements ILlamalend {
         }
 
         this.constants.DECIMALS = extractDecimals(this.constants.LLAMMAS);
-        this.constants.DECIMALS[this.address] = 18;
+        this.constants.DECIMALS[this.crvUsdAddress] = 18;
 
         if(L2Networks.includes(this.chainId)) {
             // eslint-disable-next-line @typescript-eslint/no-this-alias

package/src/mintMarkets/MintMarketTemplate.ts

@@ -131,7 +131,7 @@ export class MintMarketTemplate {
         this.collateralSymbol = llammaData.collateral_symbol;
         this.collateralDecimals = llammaData.collateral_decimals;
         this.coins = ["crvUSD", llammaData.collateral_symbol];
-        this.coinAddresses = [llamalend.address, llammaData.collateral_address];
+        this.coinAddresses = [llamalend.crvUsdAddress, llammaData.collateral_address];
         this.coinDecimals = [18, llammaData.collateral_decimals];
         this.minBands = llammaData.min_bands;
         this.maxBands = llammaData.max_bands;
@@ -248,7 +248,7 @@ export class MintMarketTemplate {
     });
 
     private async statsBalances(): Promise<[string, string]> {
-        const crvusdContract = llamalend.contracts[llamalend.address].multicallContract;
+        const crvusdContract = llamalend.contracts[llamalend.crvUsdAddress].multicallContract;
         const collateralContract = llamalend.contracts[isEth(this.collateral) ? llamalend.constants.WETH : this.collateral].multicallContract;
         const contract = llamalend.contracts[this.address].multicallContract;
         const calls = [
@@ -357,7 +357,7 @@ export class MintMarketTemplate {
     });
 
     private statsTotalStablecoin = memoize(async (): Promise<string> => {
-        const stablecoinContract = llamalend.contracts[llamalend.address].multicallContract;
+        const stablecoinContract = llamalend.contracts[llamalend.crvUsdAddress].multicallContract;
         const ammContract = llamalend.contracts[this.address].multicallContract;
 
         const [_balance, _fee]: bigint[] = await llamalend.multicallProvider.all([
@@ -390,7 +390,7 @@ export class MintMarketTemplate {
 
     private statsCapAndAvailable = memoize(async (): Promise<{ "cap": string, "available": string }> => {
         const factoryContract = llamalend.contracts[llamalend.constants.FACTORY].multicallContract;
-        const crvusdContract = llamalend.contracts[llamalend.address].multicallContract;
+        const crvusdContract = llamalend.contracts[llamalend.crvUsdAddress].multicallContract;
 
         const [_cap, _available]: bigint[] = await llamalend.multicallProvider.all([
             factoryContract.debt_ceiling(this.controller),
@@ -577,7 +577,7 @@ export class MintMarketTemplate {
     // ---------------- WALLET BALANCES ----------------
 
     private async walletBalances(address = ""): Promise<{ collateral: string, stablecoin: string }> {
-        const [collateral, stablecoin] = await getBalances([this.collateral, llamalend.address], address);
+        const [collateral, stablecoin] = await getBalances([this.collateral, llamalend.crvUsdAddress], address);
         return { stablecoin, collateral }
     }
 
@@ -1028,15 +1028,15 @@ export class MintMarketTemplate {
     }
 
     public async repayIsApproved(debt: number | string): Promise<boolean> {
-        return await hasAllowance([llamalend.address], [debt], llamalend.signerAddress, this.controller);
+        return await hasAllowance([llamalend.crvUsdAddress], [debt], llamalend.signerAddress, this.controller);
     }
 
     private async repayApproveEstimateGas (debt: number | string): Promise<TGas> {
-        return await ensureAllowanceEstimateGas([llamalend.address], [debt], this.controller);
+        return await ensureAllowanceEstimateGas([llamalend.crvUsdAddress], [debt], this.controller);
     }
 
     public async repayApprove(debt: number | string): Promise<string[]> {
-        return await ensureAllowance([llamalend.address], [debt], this.controller);
+        return await ensureAllowance([llamalend.crvUsdAddress], [debt], this.controller);
     }
 
     public async repayHealth(debt: number | string, full = true, address = ""): Promise<string> {
@@ -1241,17 +1241,17 @@ export class MintMarketTemplate {
 
     public async liquidateIsApproved(address = ""): Promise<boolean> {
         const tokensToLiquidate = await this.tokensToLiquidate(address);
-        return await hasAllowance([llamalend.address], [tokensToLiquidate], llamalend.signerAddress, this.controller);
+        return await hasAllowance([llamalend.crvUsdAddress], [tokensToLiquidate], llamalend.signerAddress, this.controller);
     }
 
     private async liquidateApproveEstimateGas (address = ""): Promise<TGas> {
         const tokensToLiquidate = await this.tokensToLiquidate(address);
-        return await ensureAllowanceEstimateGas([llamalend.address], [tokensToLiquidate], this.controller);
+        return await ensureAllowanceEstimateGas([llamalend.crvUsdAddress], [tokensToLiquidate], this.controller);
     }
 
     public async liquidateApprove(address = ""): Promise<string[]> {
         const tokensToLiquidate = await this.tokensToLiquidate(address);
-        return await ensureAllowance([llamalend.address], [tokensToLiquidate], this.controller);
+        return await ensureAllowance([llamalend.crvUsdAddress], [tokensToLiquidate], this.controller);
     }
 
     private async _liquidate(address: string, slippage: number, estimateGas: boolean): Promise<string | TGas> {