@curvefi/api 2.29.0 → 2.30.1

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');
 
@@ -330,6 +330,8 @@ import curve from "@curvefi/api";
     // [ 18, 18 ]
     pool.useLending;
     // [ false, false, false, false ]
+    pool.inApi;
+    // true
 })()
 ````
 
@@ -970,8 +972,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 +1285,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
@@ -328,7 +478,7 @@ var Curve = /** @class */ (function () {
         var _a;
         if (options === void 0) { options = {}; }
         return __awaiter(this, void 0, void 0, function () {
-            var network, _b, _c, cTokens, yTokens, ycTokens, aTokens, customAbiTokens, _d, err_1, _i, _e, pool, _f, _g, coinAddr, _h, _j, coinAddr, _k, _l, coinAddr, _minterABI, addressProviderContract, _m;
+            var network, _b, poolId, _c, cTokens, yTokens, ycTokens, aTokens, customAbiTokens, _d, err_1, _i, _e, pool, _f, _g, coinAddr, _h, _j, coinAddr, _k, _l, coinAddr, _minterABI, addressProviderContract, _m;
             return __generator(this, function (_o) {
                 switch (_o.label) {
                     case 0:
@@ -406,6 +556,8 @@ var Curve = /** @class */ (function () {
                         this.constants.NETWORK_NAME = exports.NETWORK_CONSTANTS[this.chainId].NAME;
                         this.constants.ALIASES = exports.NETWORK_CONSTANTS[this.chainId].ALIASES;
                         this.constants.POOLS_DATA = exports.NETWORK_CONSTANTS[this.chainId].POOLS_DATA;
+                        for (poolId in this.constants.POOLS_DATA)
+                            this.constants.POOLS_DATA[poolId].in_api = true;
                         this.constants.COINS = exports.NETWORK_CONSTANTS[this.chainId].COINS;
                         this.constants.DECIMALS = (0, utils_1.extractDecimals)(this.constants.POOLS_DATA);
                         this.constants.DECIMALS[this.constants.NATIVE_TOKEN.address] = 18;
@@ -543,121 +695,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.d.ts

@@ -1,12 +1,12 @@
 import { ethers } from "ethers";
-export declare const deployStablePlainPoolEstimateGas: (name: string, symbol: string, coins: string[], A: number, fee: number, assetType: 0 | 1 | 2 | 3, implementationIdx: 0 | 1 | 2 | 3) => Promise<number>;
-export declare const deployStablePlainPool: (name: string, symbol: string, coins: string[], A: number, fee: number, assetType: 0 | 1 | 2 | 3, implementationIdx: 0 | 1 | 2 | 3) => Promise<ethers.ContractTransaction>;
+export declare const deployStablePlainPoolEstimateGas: (name: string, symbol: string, coins: string[], A: number | string, fee: number | string, assetType: 0 | 1 | 2 | 3, implementationIdx: 0 | 1 | 2 | 3) => Promise<number>;
+export declare const deployStablePlainPool: (name: string, symbol: string, coins: string[], A: number | string, fee: number | string, assetType: 0 | 1 | 2 | 3, implementationIdx: 0 | 1 | 2 | 3) => Promise<ethers.ContractTransaction>;
 export declare const getDeployedStablePlainPoolAddress: (tx: ethers.ContractTransaction) => Promise<string>;
-export declare const deployStableMetaPoolEstimateGas: (basePool: string, name: string, symbol: string, coin: string, A: number, fee: number, implementationIdx: 0 | 1) => Promise<number>;
-export declare const deployStableMetaPool: (basePool: string, name: string, symbol: string, coin: string, A: number, fee: number, implementationIdx: 0 | 1) => Promise<ethers.ContractTransaction>;
+export declare const deployStableMetaPoolEstimateGas: (basePool: string, name: string, symbol: string, coin: string, A: number | string, fee: number | string, implementationIdx: 0 | 1) => Promise<number>;
+export declare const deployStableMetaPool: (basePool: string, name: string, symbol: string, coin: string, A: number | string, fee: number | string, implementationIdx: 0 | 1) => Promise<ethers.ContractTransaction>;
 export declare const getDeployedStableMetaPoolAddress: (tx: ethers.ContractTransaction) => Promise<string>;
-export declare const deployCryptoPoolEstimateGas: (name: string, symbol: string, coins: string[], A: number, gamma: number, midFee: number, outFee: number, allowedExtraProfit: number, feeGamma: number, adjustmentStep: number, maHalfTime: number, initialPrice: number) => Promise<number>;
-export declare const deployCryptoPool: (name: string, symbol: string, coins: string[], A: number, gamma: number, midFee: number, outFee: number, allowedExtraProfit: number, feeGamma: number, adjustmentStep: number, maHalfTime: number, initialPrice: number) => Promise<ethers.ContractTransaction>;
+export declare const deployCryptoPoolEstimateGas: (name: string, symbol: string, coins: string[], A: number | string, gamma: number | string, midFee: number | string, outFee: number | string, allowedExtraProfit: number | string, feeGamma: number | string, adjustmentStep: number | string, maHalfTime: number | string, initialPrice: number | string) => Promise<number>;
+export declare const deployCryptoPool: (name: string, symbol: string, coins: string[], A: number | string, gamma: number | string, midFee: number | string, outFee: number | string, allowedExtraProfit: number | string, feeGamma: number | string, adjustmentStep: number | string, maHalfTime: number | string, initialPrice: number | string) => Promise<ethers.ContractTransaction>;
 export declare const getDeployedCryptoPoolAddress: (tx: ethers.ContractTransaction) => Promise<string>;
 export declare const deployGaugeEstimateGas: (pool: string, isCrypto: boolean) => Promise<number>;
 export declare const deployGauge: (pool: string, isCrypto: boolean) => Promise<ethers.ContractTransaction>;

package/lib/factory/deploy.js

@@ -68,10 +68,10 @@ assetType, implementationIdx, estimateGas) { return __awaiter(void 0, void 0, vo
                     throw Error("Max symbol length = 10");
                 if (![2, 3, 4].includes(coins.length))
                     throw Error("Invalid number of coins. Must be 2, 3 or 4");
-                if (fee < 0.04)
-                    throw Error("Fee must be >= 0.04%");
-                if (fee > 1)
-                    throw Error("Fee must be <= 1%");
+                if ((0, utils_1.BN)(fee).lt(0.04))
+                    throw Error("fee must be >= 0.04%. Passed fee = ".concat(fee));
+                if ((0, utils_1.BN)(fee).gt(1))
+                    throw Error("fee must be <= 1%. Passed fee = ".concat(fee));
                 if (![0, 1, 2, 3].includes(assetType))
                     throw Error("Invalid assetType. Must be one of: 0 = USD, 1 = ETH, 2 = BTC, 3 = Other");
                 if (![0, 1, 2, 3].includes(implementationIdx))
@@ -137,10 +137,10 @@ implementationIdx, estimateGas) { return __awaiter(void 0, void 0, void 0, funct
                     throw Error("Max name length = 32");
                 if (symbol.length > 10)
                     throw Error("Max symbol length = 10");
-                if (fee < 0.04)
-                    throw Error("Fee must be >= 0.04%");
-                if (fee > 1)
-                    throw Error("Fee must be <= 1%");
+                if ((0, utils_1.BN)(fee).lt(0.04))
+                    throw Error("fee must be >= 0.04%. Passed fee = ".concat(fee));
+                if ((0, utils_1.BN)(fee).gt(1))
+                    throw Error("fee must be <= 1%. Passed fee = ".concat(fee));
                 if (![0, 1].includes(implementationIdx))
                     throw Error("Invalid implementationIdx. Must be one 0 or 1");
                 _A = (0, utils_1.parseUnits)(A, 0);
@@ -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()];
         }
     });
 }); };
@@ -197,7 +197,7 @@ var _deployCryptoPool = function (name, symbol, coins, A, gamma, midFee, // %
 outFee, // %
 allowedExtraProfit, feeGamma, adjustmentStep, maHalfTime, // Seconds
 initialPrice, estimateGas) { return __awaiter(void 0, void 0, void 0, function () {
-    var _gamma, _midFee, _outFee, _allowedExtraProfit, _feeGamma, _adjustmentStep, _initialPrice, contract, gas, gasLimit;
+    var _A, _gamma, _midFee, _outFee, _allowedExtraProfit, _feeGamma, _adjustmentStep, _maHalfTime, _initialPrice, contract, gas, gasLimit;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
@@ -209,51 +209,53 @@ initialPrice, estimateGas) { return __awaiter(void 0, void 0, void 0, function (
                     throw Error("Invalid number of coins. Must be 2");
                 if (coins[1] === coins[2])
                     throw Error("Coins must be different");
-                if (A < 4000)
-                    throw Error("A must be >= 4000");
-                if (A > 4 * (Math.pow(10, 9)))
-                    throw Error("A must be <= 4 * 10 ** 9");
-                if (gamma < 1e-8)
-                    throw Error("gamma must be >= 1e-8");
-                if (gamma > 0.02)
-                    throw Error("gamma must be <= 0.02");
-                if (midFee < 0.005)
-                    throw Error("midFee must be >= 0.005");
-                if (midFee > 100)
-                    throw Error("midFee must be <= 100");
-                if (outFee < midFee)
-                    throw Error("outFee must be >= midFee");
-                if (outFee > 100)
-                    throw Error("outFee must be <= 100");
-                if (allowedExtraProfit < 0)
-                    throw Error("allowedExtraProfit must be >= 0");
-                if (allowedExtraProfit > 0.01)
-                    throw Error("allowedExtraProfit must be <= 0.01");
-                if (feeGamma < 0)
-                    throw Error("feeGamma must be >= 0");
-                if (feeGamma > 1)
-                    throw Error("feeGamma must be <= 1");
-                if (adjustmentStep < 0)
-                    throw Error("adjustmentStep must be >= 0");
-                if (adjustmentStep > 1)
-                    throw Error("adjustmentStep must be <= 1");
-                if (maHalfTime < 0)
-                    throw Error("daoFee must be >= 0");
-                if (maHalfTime > 604800)
-                    throw Error("daoFee must be <= 604800");
-                if (initialPrice < 1e-12)
-                    throw Error("initialPrice must be >= 1e-12");
-                if (initialPrice > 1e12)
-                    throw Error("initialPrice must be <= 1e12");
+                if ((0, utils_1.BN)(A).lt(4000))
+                    throw Error("A must be >= 4000. Passed A = ".concat(A));
+                if ((0, utils_1.BN)(A).gt(4 * (Math.pow(10, 9))))
+                    throw Error("A must be <= 4 * 10 ** 9. Passed A = ".concat(A));
+                if ((0, utils_1.BN)(gamma).lt(1e-8))
+                    throw Error("gamma must be >= 1e-8. Passed gamma = ".concat(gamma));
+                if ((0, utils_1.BN)(gamma).gt(0.02))
+                    throw Error("gamma must be <= 0.02. Passed gamma = ".concat(gamma));
+                if ((0, utils_1.BN)(midFee).lt(0.005))
+                    throw Error("midFee must be >= 0.005. Passed midFee = ".concat(midFee));
+                if ((0, utils_1.BN)(midFee).gt(100))
+                    throw Error("midFee must be <= 100. Passed midFee = ".concat(midFee));
+                if ((0, utils_1.BN)(outFee).lt((0, utils_1.BN)(midFee)))
+                    throw Error("outFee must be >= midFee. Passed outFee = ".concat(outFee, " < midFee = ").concat(midFee));
+                if ((0, utils_1.BN)(outFee).gt(100))
+                    throw Error("outFee must be <= 100. Passed outFee = ".concat(outFee));
+                if ((0, utils_1.BN)(allowedExtraProfit).lt(0))
+                    throw Error("allowedExtraProfit must be >= 0. Passed allowedExtraProfit = ".concat(allowedExtraProfit));
+                if ((0, utils_1.BN)(allowedExtraProfit).gt(0.01))
+                    throw Error("allowedExtraProfit must be <= 0.01. Passed allowedExtraProfit = ".concat(allowedExtraProfit));
+                if ((0, utils_1.BN)(feeGamma).lt(0))
+                    throw Error("feeGamma must be >= 0. Passed feeGamma = ".concat(feeGamma));
+                if ((0, utils_1.BN)(feeGamma).gt(1))
+                    throw Error("feeGamma must be <= 1. Passed feeGamma = ".concat(feeGamma));
+                if ((0, utils_1.BN)(adjustmentStep).lt(0))
+                    throw Error("adjustmentStep must be >= 0. Passed adjustmentStep=".concat(adjustmentStep));
+                if ((0, utils_1.BN)(adjustmentStep).gt(1))
+                    throw Error("adjustmentStep must be <= 1. Passed adjustmentStep=".concat(adjustmentStep));
+                if ((0, utils_1.BN)(maHalfTime).lt(0))
+                    throw Error("maHalfTime must be >= 0. Passed maHalfTime=".concat(maHalfTime));
+                if ((0, utils_1.BN)(maHalfTime).gt(604800))
+                    throw Error("maHalfTime must be <= 604800. Passed maHalfTime=".concat(maHalfTime));
+                if ((0, utils_1.BN)(initialPrice).lt(1e-12))
+                    throw Error("initialPrice must be >= 1e-12. Passed initialPrice=".concat(initialPrice));
+                if ((0, utils_1.BN)(initialPrice).gt(1e12))
+                    throw Error("initialPrice must be <= 1e12. Passed initialPrice=".concat(initialPrice));
+                _A = (0, utils_1.parseUnits)(A, 0);
                 _gamma = (0, utils_1.parseUnits)(gamma);
                 _midFee = (0, utils_1.parseUnits)(midFee, 8);
                 _outFee = (0, utils_1.parseUnits)(outFee, 8);
                 _allowedExtraProfit = (0, utils_1.parseUnits)(allowedExtraProfit);
                 _feeGamma = (0, utils_1.parseUnits)(feeGamma);
                 _adjustmentStep = (0, utils_1.parseUnits)(adjustmentStep);
+                _maHalfTime = (0, utils_1.parseUnits)(maHalfTime, 0);
                 _initialPrice = (0, utils_1.parseUnits)(initialPrice);
                 contract = curve_1.curve.contracts[curve_1.curve.constants.ALIASES.crypto_factory].contract;
-                return [4 /*yield*/, contract.estimateGas.deploy_pool(name, symbol, coins, A, _gamma, _midFee, _outFee, _allowedExtraProfit, _feeGamma, _adjustmentStep, 5000000000, maHalfTime, _initialPrice, curve_1.curve.constantOptions)];
+                return [4 /*yield*/, contract.estimateGas.deploy_pool(name, symbol, coins, _A, _gamma, _midFee, _outFee, _allowedExtraProfit, _feeGamma, _adjustmentStep, 5000000000, _maHalfTime, _initialPrice, curve_1.curve.constantOptions)];
             case 1:
                 gas = _a.sent();
                 if (estimateGas)
@@ -262,8 +264,8 @@ initialPrice, estimateGas) { return __awaiter(void 0, void 0, void 0, function (
                 return [4 /*yield*/, curve_1.curve.updateFeeData()];
             case 2:
                 _a.sent();
-                return [4 /*yield*/, contract.deploy_pool(name, symbol, coins, A, _gamma, _midFee, _outFee, _allowedExtraProfit, _feeGamma, _adjustmentStep, 5000000000, // 50%
-                    maHalfTime, _initialPrice, __assign(__assign({}, curve_1.curve.options), { gasLimit: gasLimit }))];
+                return [4 /*yield*/, contract.deploy_pool(name, symbol, coins, _A, _gamma, _midFee, _outFee, _allowedExtraProfit, _feeGamma, _adjustmentStep, 5000000000, // 50%
+                    _maHalfTime, _initialPrice, __assign(__assign({}, curve_1.curve.options), { gasLimit: gasLimit }))];
             case 3: return [2 /*return*/, _a.sent()];
         }
     });