@curvefi/api 2.29.0 → 2.30.0

package/README.md

@@ -23,8 +23,8 @@ import curve from "@curvefi/api";
     await curve.init('Web3', { externalProvider: <WEB3_PROVIDER> }, { chainId: 1 });
     
     // Fetch factory pools
-    await curve.fetchFactoryPools();
-    await curve.getCryptoFactoryPoolList();
+    await curve.factory.fetchPools();
+    await curve.cryptoFactory.fetchPools();
 })()
 ```
 **Note 1.** ```chainId``` parameter is optional, but you must specify it in the case you use Metamask on localhost network, because Metamask has that [bug](https://hardhat.org/metamask-issue.html)
@@ -184,8 +184,8 @@ import curve from "@curvefi/api";
 
 (async () => {
     await curve.init('JsonRpc', {}, { gasPrice: 0, maxFeePerGas: 0, maxPriorityFeePerGas: 0 });
-    await curve.fetchFactoryPools();
-    await curve.fetchCryptoFactoryPools();
+    await curve.factory.fetchPools();
+    await curve.cryptoFactory.fetchPools();
 
     curve.getPoolList();
     // [
@@ -204,7 +204,7 @@ import curve from "@curvefi/api";
     //     '2pool',    '4pool'
     // ]
     
-    curve.getFactoryPoolList();
+    curve.factory.getPoolList();
     // [
     //     'factory-v2-0',   'factory-v2-2',   'factory-v2-3',   'factory-v2-4',
     //     'factory-v2-5',   'factory-v2-6',   'factory-v2-7',   'factory-v2-8',
@@ -234,7 +234,7 @@ import curve from "@curvefi/api";
     //     ... 27 more items
     // ]
     
-    curve.getCryptoFactoryPoolList();
+    curve.cryptoFactory.getPoolList();
     // [
     //     'factory-crypto-0',  'factory-crypto-1',  'factory-crypto-2',
     //     'factory-crypto-3',  'factory-crypto-4',  'factory-crypto-5',
@@ -267,8 +267,8 @@ import curve from "@curvefi/api";
 
 (async () => {
     await curve.init('JsonRpc', {}, { gasPrice: 0, maxFeePerGas: 0, maxPriorityFeePerGas: 0 });
-    await curve.fetchFactoryPools();
-    await curve.fetchCryptoFactoryPools();
+    await curve.factory.fetchPools();
+    await curve.cryptoFactory.fetchPools();
 
     const pool = curve.getPool('factory-v2-11');
 
@@ -970,8 +970,8 @@ import curve from "@curvefi/api";
 
 (async () => {
     await curve.init('JsonRpc', {}, { gasPrice: 0, maxFeePerGas: 0, maxPriorityFeePerGas: 0 });
-    await curve.fetchFactoryPools();
-    await curve.getCryptoFactoryPoolList();
+    await curve.factory.fetchPools();
+    await curve.cryptoFactory.fetchPools();
 
     await curve.getBalances(['DAI', 'CRV']);
     // [ '9900.0', '100049.744832225238317557' ]
@@ -1283,6 +1283,26 @@ import curve from "@curvefi/api";
 
 ## Factory
 
+### Fetch new pools from blockchain
+
+```ts
+import curve from "@curvefi/api";
+
+(async () => {
+    await curve.init('JsonRpc', {}, { gasPrice: 0 });
+
+    // Fetch pools from api (if false arg is not passed)
+    await curve.factory.fetchPools();
+    await curve.cryptoFactory.fetchPools();
+
+    // Fetch very new pools (that haven't been added to api yet) from blockchain
+    await curve.factory.fetchNewPools();
+    // [ 'factory-v2-285' ]
+    await curve.cryptoFactory.fetchNewPools();
+    // [ 'factory-crypto-232' ]
+})()
+```
+
 ### Deploy stable plain pool
 
 ```ts

package/lib/curve.d.ts

@@ -71,10 +71,16 @@ declare class Curve implements ICurve {
     }): Promise<void>;
     setContract(address: string, abi: any): void;
     _filterHiddenPools(pools: IDict<IPoolData>): Promise<IDict<IPoolData>>;
-    fetchFactoryPools(useApi?: boolean): Promise<void>;
-    fetchCryptoFactoryPools(useApi?: boolean): Promise<void>;
-    fetchRecentlyDeployedFactoryPool(poolAddress: string): Promise<string>;
-    fetchRecentlyDeployedCryptoFactoryPool(poolAddress: string): Promise<string>;
+    _updateDecimalsAndGauges(pools: IDict<IPoolData>): void;
+    fetchFactoryPools: (useApi?: boolean) => Promise<void>;
+    fetchCryptoFactoryPools: (useApi?: boolean) => Promise<void>;
+    fetchNewFactoryPools: () => Promise<string[]>;
+    fetchNewCryptoFactoryPools: () => Promise<string[]>;
+    fetchRecentlyDeployedFactoryPool: (poolAddress: string) => Promise<string>;
+    fetchRecentlyDeployedCryptoFactoryPool: (poolAddress: string) => Promise<string>;
+    getPoolList: () => string[];
+    getFactoryPoolList: () => string[];
+    getCryptoFactoryPoolList: () => string[];
     setCustomFeeData(customFeeData: {
         gasPrice?: number;
         maxFeePerGas?: number;

package/lib/curve.js

@@ -299,6 +299,156 @@ exports.NETWORK_CONSTANTS = {
 };
 var Curve = /** @class */ (function () {
     function Curve() {
+        var _this = this;
+        this.fetchFactoryPools = function (useApi) {
+            if (useApi === void 0) { useApi = true; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var _a, _b, _c, _d, _e;
+                return __generator(this, function (_f) {
+                    switch (_f.label) {
+                        case 0:
+                            if (this.chainId === 1313161554)
+                                return [2 /*return*/];
+                            if (!useApi) return [3 /*break*/, 2];
+                            _a = this.constants;
+                            _b = utils_1.lowerCasePoolDataAddresses;
+                            return [4 /*yield*/, factory_api_1.getFactoryPoolsDataFromApi.call(this, false)];
+                        case 1:
+                            _a.FACTORY_POOLS_DATA = _b.apply(void 0, [_f.sent()]);
+                            return [3 /*break*/, 4];
+                        case 2:
+                            _c = this.constants;
+                            _d = utils_1.lowerCasePoolDataAddresses;
+                            return [4 /*yield*/, factory_1.getFactoryPoolData.call(this)];
+                        case 3:
+                            _c.FACTORY_POOLS_DATA = _d.apply(void 0, [_f.sent()]);
+                            _f.label = 4;
+                        case 4:
+                            _e = this.constants;
+                            return [4 /*yield*/, this._filterHiddenPools(this.constants.FACTORY_POOLS_DATA)];
+                        case 5:
+                            _e.FACTORY_POOLS_DATA = _f.sent();
+                            this._updateDecimalsAndGauges(this.constants.FACTORY_POOLS_DATA);
+                            return [4 /*yield*/, _killGauges(this.constants.FACTORY_POOLS_DATA)];
+                        case 6:
+                            _f.sent();
+                            return [2 /*return*/];
+                    }
+                });
+            });
+        };
+        this.fetchCryptoFactoryPools = function (useApi) {
+            if (useApi === void 0) { useApi = true; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var _a, _b, _c, _d, _e;
+                return __generator(this, function (_f) {
+                    switch (_f.label) {
+                        case 0:
+                            if (![1, 137, 250].includes(this.chainId))
+                                return [2 /*return*/];
+                            if (!useApi) return [3 /*break*/, 2];
+                            _a = this.constants;
+                            _b = utils_1.lowerCasePoolDataAddresses;
+                            return [4 /*yield*/, factory_api_1.getFactoryPoolsDataFromApi.call(this, true)];
+                        case 1:
+                            _a.CRYPTO_FACTORY_POOLS_DATA = _b.apply(void 0, [_f.sent()]);
+                            return [3 /*break*/, 4];
+                        case 2:
+                            _c = this.constants;
+                            _d = utils_1.lowerCasePoolDataAddresses;
+                            return [4 /*yield*/, factory_crypto_1.getCryptoFactoryPoolData.call(this)];
+                        case 3:
+                            _c.CRYPTO_FACTORY_POOLS_DATA = _d.apply(void 0, [_f.sent()]);
+                            _f.label = 4;
+                        case 4:
+                            _e = this.constants;
+                            return [4 /*yield*/, this._filterHiddenPools(this.constants.CRYPTO_FACTORY_POOLS_DATA)];
+                        case 5:
+                            _e.CRYPTO_FACTORY_POOLS_DATA = _f.sent();
+                            this._updateDecimalsAndGauges(this.constants.CRYPTO_FACTORY_POOLS_DATA);
+                            return [4 /*yield*/, _killGauges(this.constants.CRYPTO_FACTORY_POOLS_DATA)];
+                        case 6:
+                            _f.sent();
+                            return [2 /*return*/];
+                    }
+                });
+            });
+        };
+        this.fetchNewFactoryPools = function () { return __awaiter(_this, void 0, void 0, function () {
+            var currentPoolIds, lastPoolIdx, poolData, _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        if (this.chainId === 1313161554)
+                            return [2 /*return*/, []];
+                        currentPoolIds = Object.keys(this.constants.FACTORY_POOLS_DATA);
+                        lastPoolIdx = Number(currentPoolIds[currentPoolIds.length - 1].split("-")[2]);
+                        _a = utils_1.lowerCasePoolDataAddresses;
+                        return [4 /*yield*/, factory_1.getFactoryPoolData.call(this, lastPoolIdx + 1)];
+                    case 1:
+                        poolData = _a.apply(void 0, [_b.sent()]);
+                        this.constants.FACTORY_POOLS_DATA = __assign(__assign({}, this.constants.FACTORY_POOLS_DATA), poolData);
+                        this._updateDecimalsAndGauges(this.constants.FACTORY_POOLS_DATA);
+                        return [2 /*return*/, Object.keys(poolData)];
+                }
+            });
+        }); };
+        this.fetchNewCryptoFactoryPools = function () { return __awaiter(_this, void 0, void 0, function () {
+            var currentPoolIds, lastPoolIdx, poolData, _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        if (![1, 137, 250].includes(this.chainId))
+                            return [2 /*return*/, []];
+                        currentPoolIds = Object.keys(this.constants.CRYPTO_FACTORY_POOLS_DATA);
+                        lastPoolIdx = Number(currentPoolIds[currentPoolIds.length - 1].split("-")[2]);
+                        _a = utils_1.lowerCasePoolDataAddresses;
+                        return [4 /*yield*/, factory_crypto_1.getCryptoFactoryPoolData.call(this, lastPoolIdx + 1)];
+                    case 1:
+                        poolData = _a.apply(void 0, [_b.sent()]);
+                        this.constants.CRYPTO_FACTORY_POOLS_DATA = __assign(__assign({}, this.constants.CRYPTO_FACTORY_POOLS_DATA), poolData);
+                        this._updateDecimalsAndGauges(this.constants.CRYPTO_FACTORY_POOLS_DATA);
+                        return [2 /*return*/, Object.keys(poolData)];
+                }
+            });
+        }); };
+        this.fetchRecentlyDeployedFactoryPool = function (poolAddress) { return __awaiter(_this, void 0, void 0, function () {
+            var poolData, _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        if (this.chainId === 1313161554)
+                            return [2 /*return*/, ''];
+                        _a = utils_1.lowerCasePoolDataAddresses;
+                        return [4 /*yield*/, factory_1.getFactoryPoolData.call(this, 0, poolAddress)];
+                    case 1:
+                        poolData = _a.apply(void 0, [_b.sent()]);
+                        this.constants.FACTORY_POOLS_DATA = __assign(__assign({}, this.constants.FACTORY_POOLS_DATA), poolData);
+                        this._updateDecimalsAndGauges(this.constants.FACTORY_POOLS_DATA);
+                        return [2 /*return*/, Object.keys(poolData)[0]]; // id
+                }
+            });
+        }); };
+        this.fetchRecentlyDeployedCryptoFactoryPool = function (poolAddress) { return __awaiter(_this, void 0, void 0, function () {
+            var poolData, _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        if (![1, 137, 250].includes(this.chainId))
+                            return [2 /*return*/, ''];
+                        _a = utils_1.lowerCasePoolDataAddresses;
+                        return [4 /*yield*/, factory_crypto_1.getCryptoFactoryPoolData.call(this, 0, poolAddress)];
+                    case 1:
+                        poolData = _a.apply(void 0, [_b.sent()]);
+                        this.constants.CRYPTO_FACTORY_POOLS_DATA = __assign(__assign({}, this.constants.CRYPTO_FACTORY_POOLS_DATA), poolData);
+                        this._updateDecimalsAndGauges(this.constants.CRYPTO_FACTORY_POOLS_DATA);
+                        return [2 /*return*/, Object.keys(poolData)[0]]; // id
+                }
+            });
+        }); };
+        this.getPoolList = function () { return Object.keys(_this.constants.POOLS_DATA); };
+        this.getFactoryPoolList = function () { return Object.keys(_this.constants.FACTORY_POOLS_DATA); };
+        this.getCryptoFactoryPoolList = function () { return Object.keys(_this.constants.CRYPTO_FACTORY_POOLS_DATA); };
         // @ts-ignore
         this.provider = null;
         // @ts-ignore
@@ -543,121 +693,9 @@ var Curve = /** @class */ (function () {
             });
         });
     };
-    Curve.prototype.fetchFactoryPools = function (useApi) {
-        if (useApi === void 0) { useApi = true; }
-        return __awaiter(this, void 0, void 0, function () {
-            var _a, _b, _c, _d, _e;
-            return __generator(this, function (_f) {
-                switch (_f.label) {
-                    case 0:
-                        if (this.chainId === 1313161554)
-                            return [2 /*return*/];
-                        if (!useApi) return [3 /*break*/, 2];
-                        _a = this.constants;
-                        _b = utils_1.lowerCasePoolDataAddresses;
-                        return [4 /*yield*/, factory_api_1.getFactoryPoolsDataFromApi.call(this, false)];
-                    case 1:
-                        _a.FACTORY_POOLS_DATA = _b.apply(void 0, [_f.sent()]);
-                        return [3 /*break*/, 4];
-                    case 2:
-                        _c = this.constants;
-                        _d = utils_1.lowerCasePoolDataAddresses;
-                        return [4 /*yield*/, factory_1.getFactoryPoolData.call(this)];
-                    case 3:
-                        _c.FACTORY_POOLS_DATA = _d.apply(void 0, [_f.sent()]);
-                        _f.label = 4;
-                    case 4:
-                        _e = this.constants;
-                        return [4 /*yield*/, this._filterHiddenPools(this.constants.FACTORY_POOLS_DATA)];
-                    case 5:
-                        _e.FACTORY_POOLS_DATA = _f.sent();
-                        this.constants.DECIMALS = __assign(__assign({}, this.constants.DECIMALS), (0, utils_1.extractDecimals)(this.constants.FACTORY_POOLS_DATA));
-                        this.constants.GAUGES = __spreadArray(__spreadArray([], this.constants.GAUGES, true), (0, utils_1.extractGauges)(this.constants.FACTORY_POOLS_DATA), true);
-                        return [4 /*yield*/, _killGauges(this.constants.FACTORY_POOLS_DATA)];
-                    case 6:
-                        _f.sent();
-                        return [2 /*return*/];
-                }
-            });
-        });
-    };
-    Curve.prototype.fetchCryptoFactoryPools = function (useApi) {
-        if (useApi === void 0) { useApi = true; }
-        return __awaiter(this, void 0, void 0, function () {
-            var _a, _b, _c, _d, _e;
-            return __generator(this, function (_f) {
-                switch (_f.label) {
-                    case 0:
-                        if (![1, 137, 250].includes(this.chainId))
-                            return [2 /*return*/];
-                        if (!useApi) return [3 /*break*/, 2];
-                        _a = this.constants;
-                        _b = utils_1.lowerCasePoolDataAddresses;
-                        return [4 /*yield*/, factory_api_1.getFactoryPoolsDataFromApi.call(this, true)];
-                    case 1:
-                        _a.CRYPTO_FACTORY_POOLS_DATA = _b.apply(void 0, [_f.sent()]);
-                        return [3 /*break*/, 4];
-                    case 2:
-                        _c = this.constants;
-                        _d = utils_1.lowerCasePoolDataAddresses;
-                        return [4 /*yield*/, factory_crypto_1.getCryptoFactoryPoolData.call(this)];
-                    case 3:
-                        _c.CRYPTO_FACTORY_POOLS_DATA = _d.apply(void 0, [_f.sent()]);
-                        _f.label = 4;
-                    case 4:
-                        _e = this.constants;
-                        return [4 /*yield*/, this._filterHiddenPools(this.constants.CRYPTO_FACTORY_POOLS_DATA)];
-                    case 5:
-                        _e.CRYPTO_FACTORY_POOLS_DATA = _f.sent();
-                        this.constants.DECIMALS = __assign(__assign({}, this.constants.DECIMALS), (0, utils_1.extractDecimals)(this.constants.CRYPTO_FACTORY_POOLS_DATA));
-                        this.constants.GAUGES = __spreadArray(__spreadArray([], this.constants.GAUGES, true), (0, utils_1.extractGauges)(this.constants.CRYPTO_FACTORY_POOLS_DATA), true);
-                        return [4 /*yield*/, _killGauges(this.constants.CRYPTO_FACTORY_POOLS_DATA)];
-                    case 6:
-                        _f.sent();
-                        return [2 /*return*/];
-                }
-            });
-        });
-    };
-    Curve.prototype.fetchRecentlyDeployedFactoryPool = function (poolAddress) {
-        return __awaiter(this, void 0, void 0, function () {
-            var poolData, _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        if (this.chainId === 1313161554)
-                            return [2 /*return*/, ''];
-                        _a = utils_1.lowerCasePoolDataAddresses;
-                        return [4 /*yield*/, factory_1.getFactoryPoolData.call(this, poolAddress)];
-                    case 1:
-                        poolData = _a.apply(void 0, [_b.sent()]);
-                        this.constants.FACTORY_POOLS_DATA = __assign(__assign({}, this.constants.FACTORY_POOLS_DATA), poolData);
-                        this.constants.DECIMALS = __assign(__assign({}, this.constants.DECIMALS), (0, utils_1.extractDecimals)(this.constants.FACTORY_POOLS_DATA));
-                        this.constants.GAUGES = __spreadArray(__spreadArray([], this.constants.GAUGES, true), (0, utils_1.extractGauges)(this.constants.FACTORY_POOLS_DATA), true);
-                        return [2 /*return*/, Object.keys(poolData)[0]]; // id
-                }
-            });
-        });
-    };
-    Curve.prototype.fetchRecentlyDeployedCryptoFactoryPool = function (poolAddress) {
-        return __awaiter(this, void 0, void 0, function () {
-            var poolData, _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        if (![1, 137, 250].includes(this.chainId))
-                            return [2 /*return*/, ''];
-                        _a = utils_1.lowerCasePoolDataAddresses;
-                        return [4 /*yield*/, factory_crypto_1.getCryptoFactoryPoolData.call(this, poolAddress)];
-                    case 1:
-                        poolData = _a.apply(void 0, [_b.sent()]);
-                        this.constants.CRYPTO_FACTORY_POOLS_DATA = __assign(__assign({}, this.constants.CRYPTO_FACTORY_POOLS_DATA), poolData);
-                        this.constants.DECIMALS = __assign(__assign({}, this.constants.DECIMALS), (0, utils_1.extractDecimals)(this.constants.CRYPTO_FACTORY_POOLS_DATA));
-                        this.constants.GAUGES = __spreadArray(__spreadArray([], this.constants.GAUGES, true), (0, utils_1.extractGauges)(this.constants.CRYPTO_FACTORY_POOLS_DATA), true);
-                        return [2 /*return*/, Object.keys(poolData)[0]]; // id
-                }
-            });
-        });
+    Curve.prototype._updateDecimalsAndGauges = function (pools) {
+        this.constants.DECIMALS = __assign(__assign({}, this.constants.DECIMALS), (0, utils_1.extractDecimals)(pools));
+        this.constants.GAUGES = __spreadArray(__spreadArray([], this.constants.GAUGES, true), (0, utils_1.extractGauges)(pools), true);
     };
     Curve.prototype.setCustomFeeData = function (customFeeData) {
         this.feeData = __assign(__assign({}, this.feeData), customFeeData);

package/lib/factory/constants.js

@@ -284,6 +284,10 @@ exports.basePoolIdZapDictEthereum = {
         address: "0x08780fb7E580e492c1935bEe4fA5920b94AA95Da".toLowerCase(),
         ABI: meta_zap_json_1.default,
     },
+    fraxusdp: {
+        address: "0x63B709d2118Ba0389ee75A131d1F9a473e06afbD".toLowerCase(),
+        ABI: meta_zap_json_1.default,
+    },
     sbtc: {
         address: "0x7abdbaf29929e7f8621b757d2a7c04d78d633834".toLowerCase(),
         ABI: deposit_json_1.default,

package/lib/factory/deploy.js

@@ -187,7 +187,7 @@ var getDeployedStableMetaPoolAddress = function (tx) { return __awaiter(void 0,
             case 0: return [4 /*yield*/, tx.wait()];
             case 1:
                 txInfo = _a.sent();
-                return [2 /*return*/, txInfo.logs[txInfo.logs.length - 3].address.toLowerCase()];
+                return [2 /*return*/, txInfo.logs[3].address.toLowerCase()];
         }
     });
 }); };

package/lib/factory/factory-api.js

@@ -272,6 +272,7 @@ function getFactoryPoolsDataFromApi(isCrypto) {
                                 token_address: pool.address,
                                 gauge_address: pool.gaugeAddress ? pool.gaugeAddress : ethers_1.ethers.constants.AddressZero,
                                 deposit_address: basePoolZap.address,
+                                implementation_address: pool.implementationAddress,
                                 is_meta: true,
                                 is_factory: true,
                                 base_pool: basePoolId,
@@ -296,6 +297,7 @@ function getFactoryPoolsDataFromApi(isCrypto) {
                                 swap_address: pool.address,
                                 token_address: pool.address,
                                 gauge_address: pool.gaugeAddress ? pool.gaugeAddress : ethers_1.ethers.constants.AddressZero,
+                                implementation_address: pool.implementationAddress,
                                 is_plain: true,
                                 is_factory: true,
                                 underlying_coins: coinNames,

package/lib/factory/factory-crypto.d.ts

@@ -1,2 +1,2 @@
 import { IDict, IPoolData, ICurve } from "../interfaces";
-export declare function getCryptoFactoryPoolData(this: ICurve, swapAddress?: string): Promise<IDict<IPoolData>>;
+export declare function getCryptoFactoryPoolData(this: ICurve, fromIdx?: number, swapAddress?: string): Promise<IDict<IPoolData>>;