@curvefi/llamalend-api 1.0.2 → 1.0.4

package/src/constants/aliases.ts

@@ -125,17 +125,17 @@ export const ALIASES_FRAXTAL = lowerCaseValues({
     "crv": "0x331B9182088e2A7d6D3Fe4742AbA1fB231aEcc56",
     "one_way_factory": "0xf3c9bdAB17B7016fBE3B77D17b1602A7db93ac66",
     "gauge_controller": "0x0000000000000000000000000000000000000000", // <--- TODO CHANGE
-    "gauge_factory": "0xeF672bD94913CB6f1d2812a6e18c1fFdEd8eFf5c",
+    "gauge_factory_old": "0xeF672bD94913CB6f1d2812a6e18c1fFdEd8eFf5c",
+    "gauge_factory": "0x0b8d6b6cefc7aa1c2852442e518443b1b22e1c52",
     "leverage_zap": "0x37c5ab57AF7100Bdc9B668d766e193CCbF6614FD", // odos
     "leverage_markets_start_id": "0",
 });
 
 export const ALIASES_SONIC = lowerCaseValues({
-    "crv": "0x11cDb42B0EB46D95f990BeDD4695A6e3fA034978",
-    "one_way_factory": "0xcaEC110C784c9DF37240a8Ce096D352A75922DeA",
+    "crv": "0x5Af79133999f7908953E94b7A5CF367740Ebee35",
+    "one_way_factory": "0x30d1859dad5a52ae03b6e259d1b48c4b12933993",
     "gauge_controller": "0x2F50D538606Fa9EDD2B11E2446BEb18C9D5846bB",
-    "gauge_factory": "0xabC000d88f23Bb45525E447528DBF656A9D55bf5",
-    // "leverage_zap": "0x0000000000000000000000000000000000000000", // 1inch
-    "leverage_zap": "0xb7b240CFa985306563A301bC417Bc9715059a117", // odos
-    "leverage_markets_start_id": "9",
+    "gauge_factory": "0xf3A431008396df8A8b2DF492C913706BDB0874ef",
+    "leverage_zap": "0x5552b631e2aD801fAa129Aacf4B701071cC9D1f7", // odos
+    "leverage_markets_start_id": "0",
 });

package/src/interfaces.ts

@@ -5,8 +5,8 @@ export interface IDict<T> {
     [index: string]: T,
 }
 
-export type INetworkName = "ethereum" | "optimism" | "bsc" | "xdai" | "polygon" | "x-layer" | "fantom" | "fraxtal" | "zksync" | "moonbeam" | "kava" | "mantle" | "base" | "arbitrum" | "celo" | "avalanche" | "aurora";
-export type IChainId = 1 | 10 | 56 | 100 | 137 | 196 | 250 | 252 | 324 | 1284 | 2222 | 5000 | 8453 | 42161 | 42220 | 43114 | 1313161554;
+export type INetworkName = "ethereum" | "optimism" | "bsc" | "xdai" | "polygon" | 'sonic' | "x-layer" | "fantom" | "fraxtal" | "zksync" | "moonbeam" | "kava" | "mantle" | "base" | "arbitrum" | "celo" | "avalanche" | "aurora";
+export type IChainId = 1 | 10 | 56 | 100 | 137 | 146 | 196 | 250 | 252 | 324 | 1284 | 2222 | 5000 | 8453 | 42161 | 42220 | 43114 | 1313161554;
 export type IPoolFactory = "main" | "crypto" | "factory" | "factory-crvusd" | "factory-crypto" | "factory-twocrypto" | "factory-tricrypto" | "factory-stable-ng";
 export interface ICurveContract {
     contract: Contract,

package/src/lendMarkets/LendMarketTemplate.ts

@@ -723,7 +723,32 @@ export class LendMarketTemplate {
 
     private async _vaultClaimCrv(estimateGas: boolean): Promise<string | TGas> {
         if (this.vaultRewardsOnly()) throw Error(`${this.name} has Rewards-Only Gauge. Use claimRewards instead`);
-        const contract = llamalend.contracts[llamalend.constants.ALIASES.minter].contract;
+
+        let isOldFactory = false;
+        let contract;
+
+        if (llamalend.chainId !== 1) {
+            if (llamalend.constants.ALIASES.gauge_factory_old && llamalend.constants.ALIASES.gauge_factory_old !== llamalend.constants.ZERO_ADDRESS) {
+                const oldFactoryContract = llamalend.contracts[llamalend.constants.ALIASES.gauge_factory_old].contract;
+                const lpToken = await llamalend.contracts[this.addresses.gauge].contract.lp_token();
+                const gaugeAddress = await oldFactoryContract.get_gauge_from_lp_token(lpToken);
+
+                isOldFactory = gaugeAddress.toLowerCase() === this.addresses.gauge.toLowerCase();
+
+                if (isOldFactory) {
+                    contract = oldFactoryContract;
+                }
+            }
+        }
+
+        if (!isOldFactory) {
+            contract = llamalend.contracts[llamalend.constants.ALIASES.minter].contract
+        }
+
+        if(!contract) {
+            throw Error(`${this.name} couldn't match gauge factory`);
+        }
+
         const gas = await contract.mint.estimateGas(this.addresses.gauge, llamalend.constantOptions);
         if (estimateGas) return smartNumber(gas);
 
@@ -1010,7 +1035,7 @@ export class LendMarketTemplate {
     private statsBandsInfo = memoize(async (): Promise<{ activeBand: number, maxBand: number, minBand: number, liquidationBand: number | null }> => {
         const ammContract = llamalend.contracts[this.addresses.amm].multicallContract;
         const calls = [
-            ammContract.active_band(),
+            ammContract.active_band_with_skip(),
             ammContract.max_band(),
             ammContract.min_band(),
         ]

package/src/llamalend.ts

@@ -32,6 +32,7 @@ import gasOracleBlobABI from './constants/abis/gas_oracle_optimism_blob.json' as
 // crvUSD ABIs
 import llammaABI from "./constants/abis/crvUSD/llamma.json" assert { type: 'json'};
 import controllerABI from "./constants/abis/crvUSD/controller.json" assert { type: 'json'};
+import controllerV2ABI from "./constants/abis/crvUSD/controller_v2.json";
 import PegKeeper from "./constants/abis/crvUSD/PegKeeper.json" assert { type: 'json'};
 import FactoryABI from "./constants/abis/crvUSD/Factory.json" assert { type: 'json'};
 import MonetaryPolicy2ABI from "./constants/abis/crvUSD/MonetaryPolicy2.json" assert { type: 'json'};
@@ -352,8 +353,18 @@ class Llamalend implements ILlamalend {
             this.setContract(this.constants.ALIASES.minter, MinterABI);
             this.setContract(this.constants.ALIASES.gauge_factory, GaugeFactoryMainnetABI);
         } else {
-            this.constants.ALIASES.minter = this.constants.ALIASES.gauge_factory;
-            this.setContract(this.constants.ALIASES.gauge_factory, GaugeFactorySidechainABI);
+            if(this.constants.ALIASES.gauge_factory_old && this.constants.ALIASES.gauge_factory_old !== this.constants.ZERO_ADDRESS) {
+                // set old gauge factory
+                this.constants.ALIASES.minter_old = this.constants.ALIASES.gauge_factory_old;
+                this.setContract(this.constants.ALIASES.gauge_factory_old, GaugeFactorySidechainABI);
+
+                // set new gauge factory
+                this.constants.ALIASES.minter = this.constants.ALIASES.gauge_factory;
+                this.setContract(this.constants.ALIASES.gauge_factory, GaugeFactorySidechainABI);
+            } else {
+                this.constants.ALIASES.minter = this.constants.ALIASES.gauge_factory;
+                this.setContract(this.constants.ALIASES.gauge_factory, GaugeFactorySidechainABI);
+            }
         }
 
         // crvUSD contracts
@@ -415,10 +426,29 @@ class Llamalend implements ILlamalend {
                 return x;
             });
 
+            calls = [];
+
+            for(const amm of amms) {
+                this.setContract(amm, llammaABI);
+                calls.push(
+                    this.contracts[amm].multicallContract.A()
+                )
+            }
+
+            const AParams = (await this.multicallProvider.all(calls)).map((x) => {
+                return Number(x)
+            });
+
             for (let i = 0; i < collaterals.length; i++) {
                 const is_eth = collaterals[i] === this.constants.WETH;
                 const [collateral_symbol, collateral_decimals] = res.splice(0, 2) as [string, number];
-                this.setContract(amms[i], llammaABI);
+
+                if (i >= collaterals.length - 3) {
+                    this.setContract(controllers[i], controllerV2ABI);
+                } else {
+                    this.setContract(controllers[i], controllerABI);
+                }
+
                 this.setContract(controllers[i], controllerABI);
                 const monetary_policy_address = (await this.contracts[controllers[i]].contract.monetary_policy(this.constantOptions)).toLowerCase();
                 this.setContract(monetary_policy_address, MonetaryPolicy2ABI);
@@ -438,7 +468,7 @@ class Llamalend implements ILlamalend {
                     min_bands: 4,
                     max_bands: 50,
                     default_bands: 10,
-                    A: 100,
+                    A: AParams[i],
                     monetary_policy_abi: MonetaryPolicy2ABI,
                 }
             }

package/src/mintMarkets/MintMarketTemplate.ts

@@ -281,7 +281,7 @@ export class MintMarketTemplate {
     });
 
     private statsActiveBand = memoize(async (): Promise<number> => {
-        return (await llamalend.contracts[this.address].contract.active_band()).toNumber()
+        return (await llamalend.contracts[this.address].contract.active_band_with_skip()).toNumber()
     },
     {
         promise: true,

package/src/utils.ts

@@ -295,7 +295,7 @@ export const _getUsdRate = async (assetId: string): Promise<number> => {
         56: "binance-smart-chain",
         100: 'xdai',
         137: 'polygon-pos',
-        156: 'sonic',
+        146: 'sonic',
         196: 'x-layer',
         250: 'fantom',
         252: 'fraxtal',
@@ -316,7 +316,7 @@ export const _getUsdRate = async (assetId: string): Promise<number> => {
         56: 'binancecoin',
         100: 'xdai',
         137: 'matic-network',
-        156: 'sonic-3',
+        146: 'sonic-3',
         196: 'okb',
         250: 'fantom',
         252: 'frax-ether',