@curvefi/llamalend-api 1.0.3 → 1.0.4

package/lib/constants/aliases.js

@@ -109,16 +109,16 @@ export var ALIASES_FRAXTAL = lowerCaseValues({
     "crv": "0x331B9182088e2A7d6D3Fe4742AbA1fB231aEcc56",
     "one_way_factory": "0xf3c9bdAB17B7016fBE3B77D17b1602A7db93ac66",
     "gauge_controller": "0x0000000000000000000000000000000000000000",
-    "gauge_factory": "0xeF672bD94913CB6f1d2812a6e18c1fFdEd8eFf5c",
+    "gauge_factory_old": "0xeF672bD94913CB6f1d2812a6e18c1fFdEd8eFf5c",
+    "gauge_factory": "0x0b8d6b6cefc7aa1c2852442e518443b1b22e1c52",
     "leverage_zap": "0x37c5ab57AF7100Bdc9B668d766e193CCbF6614FD",
     "leverage_markets_start_id": "0",
 });
 export var 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",
-    "leverage_markets_start_id": "9",
+    "gauge_factory": "0xf3A431008396df8A8b2DF492C913706BDB0874ef",
+    "leverage_zap": "0x5552b631e2aD801fAa129Aacf4B701071cC9D1f7",
+    "leverage_markets_start_id": "0",
 });

package/lib/interfaces.d.ts

@@ -3,8 +3,8 @@ import { Contract as MulticallContract, Provider as MulticallProvider } from "@c
 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/lib/lendMarkets/LendMarketTemplate.js

@@ -1506,24 +1506,45 @@ var LendMarketTemplate = /** @class */ (function () {
     };
     LendMarketTemplate.prototype._vaultClaimCrv = function (estimateGas) {
         return __awaiter(this, void 0, void 0, function () {
-            var contract, gas, gasLimit;
+            var isOldFactory, contract, oldFactoryContract, lpToken, gaugeAddress, gas, gasLimit;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         if (this.vaultRewardsOnly())
                             throw Error("".concat(this.name, " has Rewards-Only Gauge. Use claimRewards instead"));
-                        contract = llamalend.contracts[llamalend.constants.ALIASES.minter].contract;
+                        isOldFactory = false;
+                        if (!(llamalend.chainId !== 1)) return [3 /*break*/, 3];
+                        if (!(llamalend.constants.ALIASES.gauge_factory_old && llamalend.constants.ALIASES.gauge_factory_old !== llamalend.constants.ZERO_ADDRESS)) return [3 /*break*/, 3];
+                        oldFactoryContract = llamalend.contracts[llamalend.constants.ALIASES.gauge_factory_old].contract;
+                        return [4 /*yield*/, llamalend.contracts[this.addresses.gauge].contract.lp_token()];
+                    case 1:
+                        lpToken = _a.sent();
+                        return [4 /*yield*/, oldFactoryContract.get_gauge_from_lp_token(lpToken)];
+                    case 2:
+                        gaugeAddress = _a.sent();
+                        isOldFactory = gaugeAddress.toLowerCase() === this.addresses.gauge.toLowerCase();
+                        if (isOldFactory) {
+                            contract = oldFactoryContract;
+                        }
+                        _a.label = 3;
+                    case 3:
+                        if (!isOldFactory) {
+                            contract = llamalend.contracts[llamalend.constants.ALIASES.minter].contract;
+                        }
+                        if (!contract) {
+                            throw Error("".concat(this.name, " couldn't match gauge factory"));
+                        }
                         return [4 /*yield*/, contract.mint.estimateGas(this.addresses.gauge, llamalend.constantOptions)];
-                    case 1:
+                    case 4:
                         gas = _a.sent();
                         if (estimateGas)
                             return [2 /*return*/, smartNumber(gas)];
                         return [4 /*yield*/, llamalend.updateFeeData()];
-                    case 2:
+                    case 5:
                         _a.sent();
                         gasLimit = _mulBy1_3(DIGas(gas));
                         return [4 /*yield*/, contract.mint(this.addresses.gauge, __assign(__assign({}, llamalend.options), { gasLimit: gasLimit }))];
-                    case 3: return [2 /*return*/, (_a.sent()).hash];
+                    case 6: return [2 /*return*/, (_a.sent()).hash];
                 }
             });
         });

package/lib/llamalend.js

@@ -76,6 +76,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' };
@@ -506,9 +507,9 @@ var Llamalend = /** @class */ (function () {
         var _a;
         if (options === void 0) { options = {}; }
         return __awaiter(this, void 0, void 0, function () {
-            var jsonRpcApiProviderOptions, _b, e_1, _c, network, _d, err_1, _i, _e, llamma, monetary_policy_address, _f, _g, pegKeeper, factoryContract, factoryMulticallContract, N1, N2, calls, i, res, collaterals, amms, controllers, _h, collaterals_1, collateral, _j, collaterals_2, collateral, res_1, i, is_eth, _k, collateral_symbol, collateral_decimals, monetary_policy_address, _llammaId, llammaId, j, lendingInstance_1, originalEstimate_1, oldEstimate, newEstimate;
-            return __generator(this, function (_l) {
-                switch (_l.label) {
+            var jsonRpcApiProviderOptions, _b, e_1, _c, network, _d, err_1, _i, _e, llamma, monetary_policy_address, _f, _g, pegKeeper, factoryContract, factoryMulticallContract, N1, N2, calls, i, res, collaterals, amms, controllers, _h, collaterals_1, collateral, _j, collaterals_2, collateral, res_1, _k, amms_1, amm, AParams, i, is_eth, _l, collateral_symbol, collateral_decimals, monetary_policy_address, _llammaId, llammaId, j, lendingInstance_1, originalEstimate_1, oldEstimate, newEstimate;
+            return __generator(this, function (_m) {
+                switch (_m.label) {
                     case 0:
                         // @ts-ignore
                         this.provider = null;
@@ -560,16 +561,16 @@ var Llamalend = /** @class */ (function () {
                         return [3 /*break*/, 5];
                     case 1:
                         if (!!((_a = providerSettings.url) === null || _a === void 0 ? void 0 : _a.startsWith("https://rpc.gnosischain.com"))) return [3 /*break*/, 5];
-                        _l.label = 2;
+                        _m.label = 2;
                     case 2:
-                        _l.trys.push([2, 4, , 5]);
+                        _m.trys.push([2, 4, , 5]);
                         _b = this;
                         return [4 /*yield*/, this.provider.getSigner()];
                     case 3:
-                        _b.signer = _l.sent();
+                        _b.signer = _m.sent();
                         return [3 /*break*/, 5];
                     case 4:
-                        e_1 = _l.sent();
+                        e_1 = _m.sent();
                         this.signer = null;
                         return [3 /*break*/, 5];
                     case 5: return [3 /*break*/, 9];
@@ -580,7 +581,7 @@ var Llamalend = /** @class */ (function () {
                         _c = this;
                         return [4 /*yield*/, this.provider.getSigner()];
                     case 7:
-                        _c.signer = _l.sent();
+                        _c.signer = _m.sent();
                         return [3 /*break*/, 9];
                     case 8:
                         if (providerType.toLowerCase() === 'Infura'.toLowerCase()) {
@@ -597,10 +598,10 @@ var Llamalend = /** @class */ (function () {
                         else {
                             throw Error('Wrong providerType');
                         }
-                        _l.label = 9;
+                        _m.label = 9;
                     case 9: return [4 /*yield*/, this.provider.getNetwork()];
                     case 10:
-                        network = _l.sent();
+                        network = _m.sent();
                         this.chainId = Number(network.chainId) === 133 || Number(network.chainId) === 31337 ? 1 : Number(network.chainId);
                         console.log("CURVE-LENDING-JS IS CONNECTED TO NETWORK:", { name: network.name.toUpperCase(), chainId: Number(this.chainId) });
                         if (this.chainId === 42161) {
@@ -618,27 +619,27 @@ var Llamalend = /** @class */ (function () {
                         this.constants.DECIMALS[this.constants.ALIASES.st_crvUSD] = 18;
                         this.multicallProvider = new MulticallProvider(this.chainId, this.provider);
                         if (!this.signer) return [3 /*break*/, 15];
-                        _l.label = 11;
+                        _m.label = 11;
                     case 11:
-                        _l.trys.push([11, 13, , 14]);
+                        _m.trys.push([11, 13, , 14]);
                         _d = this;
                         return [4 /*yield*/, this.signer.getAddress()];
                     case 12:
-                        _d.signerAddress = _l.sent();
+                        _d.signerAddress = _m.sent();
                         return [3 /*break*/, 14];
                     case 13:
-                        err_1 = _l.sent();
+                        err_1 = _m.sent();
                         this.signer = null;
                         return [3 /*break*/, 14];
                     case 14: return [3 /*break*/, 16];
                     case 15:
                         this.signerAddress = '';
-                        _l.label = 16;
+                        _m.label = 16;
                     case 16:
                         this.feeData = { gasPrice: options.gasPrice, maxFeePerGas: options.maxFeePerGas, maxPriorityFeePerGas: options.maxPriorityFeePerGas };
                         return [4 /*yield*/, this.updateFeeData()];
                     case 17:
-                        _l.sent();
+                        _m.sent();
                         // oneWayMarkets contracts
                         this.setContract(this.constants.ALIASES['one_way_factory'], OneWayLendingFactoryABI);
                         this.setContract(this.constants.ALIASES['gauge_controller'], GaugeControllerABI);
@@ -648,13 +649,23 @@ var Llamalend = /** @class */ (function () {
                             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);
+                            }
                         }
                         if (!(this.chainId === 1)) return [3 /*break*/, 22];
                         this.setContract(this.constants.COINS.crvusd.toLowerCase(), ERC20ABI);
                         _i = 0, _e = Object.values(this.constants.LLAMMAS);
-                        _l.label = 18;
+                        _m.label = 18;
                     case 18:
                         if (!(_i < _e.length)) return [3 /*break*/, 21];
                         llamma = _e[_i];
@@ -662,7 +673,7 @@ var Llamalend = /** @class */ (function () {
                         this.setContract(llamma.controller_address, controllerABI);
                         return [4 /*yield*/, this.contracts[llamma.controller_address].contract.monetary_policy(this.constantOptions)];
                     case 19:
-                        monetary_policy_address = _l.sent();
+                        monetary_policy_address = _m.sent();
                         llamma.monetary_policy_address = monetary_policy_address.toLowerCase();
                         this.setContract(llamma.monetary_policy_address, llamma.monetary_policy_abi);
                         if (llamma.collateral_address === "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee") {
@@ -675,7 +686,7 @@ var Llamalend = /** @class */ (function () {
                         this.setContract(llamma.deleverage_zap, DeleverageZapABI);
                         if (llamma.health_calculator_zap)
                             this.setContract(llamma.health_calculator_zap, HealthCalculatorZapABI);
-                        _l.label = 20;
+                        _m.label = 20;
                     case 20:
                         _i++;
                         return [3 /*break*/, 18];
@@ -684,7 +695,7 @@ var Llamalend = /** @class */ (function () {
                             pegKeeper = _g[_f];
                             this.setContract(pegKeeper, PegKeeper);
                         }
-                        _l.label = 22;
+                        _m.label = 22;
                     case 22:
                         // TODO Put it in a separate method
                         // Fetch new llammas
@@ -694,18 +705,18 @@ var Llamalend = /** @class */ (function () {
                         N1 = Object.keys(this.constants.LLAMMAS).length;
                         return [4 /*yield*/, factoryContract.n_collaterals(this.constantOptions)];
                     case 23:
-                        N2 = _l.sent();
+                        N2 = _m.sent();
                         calls = [];
                         for (i = N1; i < N2; i++) {
                             calls.push(factoryMulticallContract.collaterals(i), factoryMulticallContract.amms(i), factoryMulticallContract.controllers(i));
                         }
                         return [4 /*yield*/, this.multicallProvider.all(calls)];
                     case 24:
-                        res = (_l.sent()).map(function (c) { return c.toLowerCase(); });
+                        res = (_m.sent()).map(function (c) { return c.toLowerCase(); });
                         collaterals = res.filter(function (a, i) { return i % 3 == 0; });
                         amms = res.filter(function (a, i) { return i % 3 == 1; });
                         controllers = res.filter(function (a, i) { return i % 3 == 2; });
-                        if (!(collaterals.length > 0)) return [3 /*break*/, 29];
+                        if (!(collaterals.length > 0)) return [3 /*break*/, 30];
                         for (_h = 0, collaterals_1 = collaterals; _h < collaterals_1.length; _h++) {
                             collateral = collaterals_1[_h];
                             this.setContract(collateral, ERC20ABI);
@@ -717,22 +728,38 @@ var Llamalend = /** @class */ (function () {
                         }
                         return [4 /*yield*/, this.multicallProvider.all(calls)];
                     case 25:
-                        res_1 = (_l.sent()).map(function (x) {
+                        res_1 = (_m.sent()).map(function (x) {
                             if (typeof x === "string")
                                 return x.toLowerCase();
                             return x;
                         });
-                        i = 0;
-                        _l.label = 26;
+                        calls = [];
+                        for (_k = 0, amms_1 = amms; _k < amms_1.length; _k++) {
+                            amm = amms_1[_k];
+                            this.setContract(amm, llammaABI);
+                            calls.push(this.contracts[amm].multicallContract.A());
+                        }
+                        return [4 /*yield*/, this.multicallProvider.all(calls)];
                     case 26:
-                        if (!(i < collaterals.length)) return [3 /*break*/, 29];
+                        AParams = (_m.sent()).map(function (x) {
+                            return Number(x);
+                        });
+                        i = 0;
+                        _m.label = 27;
+                    case 27:
+                        if (!(i < collaterals.length)) return [3 /*break*/, 30];
                         is_eth = collaterals[i] === this.constants.WETH;
-                        _k = res_1.splice(0, 2), collateral_symbol = _k[0], collateral_decimals = _k[1];
-                        this.setContract(amms[i], llammaABI);
+                        _l = res_1.splice(0, 2), collateral_symbol = _l[0], collateral_decimals = _l[1];
+                        if (i >= collaterals.length - 3) {
+                            this.setContract(controllers[i], controllerV2ABI);
+                        }
+                        else {
+                            this.setContract(controllers[i], controllerABI);
+                        }
                         this.setContract(controllers[i], controllerABI);
                         return [4 /*yield*/, this.contracts[controllers[i]].contract.monetary_policy(this.constantOptions)];
-                    case 27:
-                        monetary_policy_address = (_l.sent()).toLowerCase();
+                    case 28:
+                        monetary_policy_address = (_m.sent()).toLowerCase();
                         this.setContract(monetary_policy_address, MonetaryPolicy2ABI);
                         _llammaId = is_eth ? "eth" : collateral_symbol.toLowerCase();
                         llammaId = _llammaId;
@@ -751,14 +778,14 @@ var Llamalend = /** @class */ (function () {
                             min_bands: 4,
                             max_bands: 50,
                             default_bands: 10,
-                            A: 100,
+                            A: AParams[i],
                             monetary_policy_abi: MonetaryPolicy2ABI,
                         };
-                        _l.label = 28;
-                    case 28:
-                        i++;
-                        return [3 /*break*/, 26];
+                        _m.label = 29;
                     case 29:
+                        i++;
+                        return [3 /*break*/, 27];
+                    case 30:
                         this.constants.DECIMALS = extractDecimals(this.constants.LLAMMAS);
                         this.constants.DECIMALS[this.address] = 18;
                         if (L2Networks.includes(this.chainId)) {

package/lib/utils.js

@@ -426,7 +426,7 @@ export var _getUsdRate = function (assetId) { return __awaiter(void 0, void 0, v
                     56: "binance-smart-chain",
                     100: 'xdai',
                     137: 'polygon-pos',
-                    156: 'sonic',
+                    146: 'sonic',
                     196: 'x-layer',
                     250: 'fantom',
                     252: 'fraxtal',
@@ -446,7 +446,7 @@ export var _getUsdRate = function (assetId) { return __awaiter(void 0, void 0, v
                     56: 'binancecoin',
                     100: 'xdai',
                     137: 'matic-network',
-                    156: 'sonic-3',
+                    146: 'sonic-3',
                     196: 'okb',
                     250: 'fantom',
                     252: 'frax-ether',

package/package.json

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