@curvefi/api 2.66.30 → 2.66.31

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

@@ -1,3 +1,4 @@
-import { IDict, IFactoryPoolType, IPoolData, ICurve, IPoolDataFromApi } from "../interfaces";
+import { IDict, IFactoryPoolType, IPoolData, IPoolDataFromApi } from "../interfaces";
+import { type Curve } from "../curve";
 export declare const lowerCasePoolDataAddresses: (poolsData: IPoolDataFromApi[]) => IPoolDataFromApi[];
-export declare function getFactoryPoolsDataFromApi(this: ICurve, factoryType: IFactoryPoolType): Promise<IDict<IPoolData>>;
+export declare function getFactoryPoolsDataFromApi(this: Curve, factoryType: IFactoryPoolType): Promise<IDict<IPoolData>>;

package/lib/factory/factory-api.js

@@ -7,20 +7,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { curve } from "../curve.js";
-import factoryGaugeABI from "../constants/abis/gauge_factory.json" with { type: 'json' };
-import gaugeChildABI from "../constants/abis/gauge_child.json" with { type: 'json' };
-import ERC20ABI from "../constants/abis/ERC20.json" with { type: 'json' };
-import cryptoFactorySwapABI from "../constants/abis/factory-crypto/factory-crypto-pool-2.json" with { type: 'json' };
-import twocryptoFactorySwapABI from "../constants/abis/factory-twocrypto/factory-twocrypto-pool.json" with { type: 'json' };
-import tricryptoFactorySwapABI from "../constants/abis/factory-tricrypto/factory-tricrypto-pool.json" with { type: 'json' };
-import tricryptoFactoryEthDisabledSwapABI from "../constants/abis/factory-tricrypto/factory-tricrypto-pool-eth-disabled.json" with { type: 'json' };
+import factoryGaugeABI from "../constants/abis/gauge_factory.json" with { type: "json" };
+import gaugeChildABI from "../constants/abis/gauge_child.json" with { type: "json" };
+import ERC20ABI from "../constants/abis/ERC20.json" with { type: "json" };
+import cryptoFactorySwapABI from "../constants/abis/factory-crypto/factory-crypto-pool-2.json" with { type: "json" };
+import twocryptoFactorySwapABI from "../constants/abis/factory-twocrypto/factory-twocrypto-pool.json" with { type: "json" };
+import tricryptoFactorySwapABI from "../constants/abis/factory-tricrypto/factory-tricrypto-pool.json" with { type: "json" };
+import tricryptoFactoryEthDisabledSwapABI from "../constants/abis/factory-tricrypto/factory-tricrypto-pool-eth-disabled.json" with { type: "json" };
 import { getPoolIdByAddress, setFactoryZapContracts } from "./common.js";
 import { _getPoolsFromApi } from "../cached.js";
 import { assetTypeNameHandler, getPoolName, isStableNgPool } from "../utils.js";
-import StableNgBasePoolZapABI from "../constants/abis/stable-ng-base-pool-zap.json" with { type: 'json' };
-import MetaStableSwapNGABI from "../constants/abis/factory-stable-ng/meta-stableswap-ng.json" with { type: 'json' };
-import PlainStableSwapNGABI from "../constants/abis/factory-stable-ng/plain-stableswap-ng.json" with { type: 'json' };
+import StableNgBasePoolZapABI from "../constants/abis/stable-ng-base-pool-zap.json" with { type: "json" };
+import MetaStableSwapNGABI from "../constants/abis/factory-stable-ng/meta-stableswap-ng.json" with { type: "json" };
+import PlainStableSwapNGABI from "../constants/abis/factory-stable-ng/plain-stableswap-ng.json" with { type: "json" };
 export const lowerCasePoolDataAddresses = (poolsData) => {
     var _a;
     for (const poolData of poolsData) {
@@ -41,20 +40,20 @@ export const lowerCasePoolDataAddresses = (poolsData) => {
     }
     return poolsData;
 };
-const getSwapAbiByFactoryType = (factoryType, pool) => {
+function getSwapAbiByFactoryType(factoryType, pool) {
     var _a;
-    const isETHEnabled = pool.implementationAddress === ((_a = curve.constants.CRYPTO_FACTORY_CONSTANTS.tricryptoDeployImplementations) === null || _a === void 0 ? void 0 : _a.amm_native_transfers_enabled);
+    const isETHEnabled = pool.implementationAddress === ((_a = this.constants.CRYPTO_FACTORY_CONSTANTS.tricryptoDeployImplementations) === null || _a === void 0 ? void 0 : _a.amm_native_transfers_enabled);
     const map = {
         "factory-crypto": cryptoFactorySwapABI,
         "factory-twocrypto": twocryptoFactorySwapABI,
         "factory-tricrypto": isETHEnabled ? tricryptoFactorySwapABI : tricryptoFactoryEthDisabledSwapABI,
     };
     return map[factoryType];
-};
+}
 function setFactorySwapContracts(rawPoolList, swapABIs, factoryType) {
     if (["factory-crypto", "factory-twocrypto", "factory-tricrypto"].includes(factoryType)) {
         rawPoolList.forEach((pool) => {
-            this.setContract(pool.address, getSwapAbiByFactoryType(factoryType, pool));
+            this.setContract(pool.address, getSwapAbiByFactoryType.call(this, factoryType, pool));
         });
     }
     else {
@@ -110,7 +109,7 @@ export function getFactoryPoolsDataFromApi(factoryType) {
         rawPoolList.forEach((pool, i) => {
             var _a, _b, _c, _d, _e, _f, _g, _h;
             const nativeToken = this.constants.NATIVE_TOKEN;
-            const isETHEnabled = pool.implementationAddress === ((_a = curve.constants.CRYPTO_FACTORY_CONSTANTS.tricryptoDeployImplementations) === null || _a === void 0 ? void 0 : _a.amm_native_transfers_enabled);
+            const isETHEnabled = pool.implementationAddress === ((_a = this.constants.CRYPTO_FACTORY_CONSTANTS.tricryptoDeployImplementations) === null || _a === void 0 ? void 0 : _a.amm_native_transfers_enabled);
             let coinAddresses = pool.coins.map((c) => c.address);
             if (this.chainId === 137) {
                 coinAddresses = coinAddresses.map((a) => a === "0x0000000000000000000000000000000000001010" ? nativeToken.wrappedAddress : a);
@@ -169,7 +168,7 @@ export function getFactoryPoolsDataFromApi(factoryType) {
                         reference_asset: "CRYPTO",
                         swap_address: pool.address,
                         token_address: pool.lpTokenAddress,
-                        gauge_address: pool.gaugeAddress ? pool.gaugeAddress : curve.constants.ZERO_ADDRESS,
+                        gauge_address: pool.gaugeAddress ? pool.gaugeAddress : this.constants.ZERO_ADDRESS,
                         deposit_address: basePoolZap.address,
                         is_meta: true,
                         is_crypto: true,
@@ -196,7 +195,7 @@ export function getFactoryPoolsDataFromApi(factoryType) {
                         reference_asset: "CRYPTO",
                         swap_address: pool.address,
                         token_address: pool.lpTokenAddress,
-                        gauge_address: pool.gaugeAddress ? pool.gaugeAddress : curve.constants.ZERO_ADDRESS,
+                        gauge_address: pool.gaugeAddress ? pool.gaugeAddress : this.constants.ZERO_ADDRESS,
                         is_crypto: true,
                         is_plain: isPlain,
                         is_factory: true,
@@ -206,7 +205,7 @@ export function getFactoryPoolsDataFromApi(factoryType) {
                         wrapped_coin_addresses: coinAddresses,
                         underlying_decimals: coinDecimals,
                         wrapped_decimals: coinDecimals,
-                        swap_abi: getSwapAbiByFactoryType(factoryType, pool),
+                        swap_abi: getSwapAbiByFactoryType.call(this, factoryType, pool),
                         gauge_abi: this.chainId === 1 ? factoryGaugeABI : gaugeChildABI,
                         in_api: true,
                         is_ng,
@@ -215,13 +214,13 @@ export function getFactoryPoolsDataFromApi(factoryType) {
             }
             else if (pool.isMetaPool) {
                 const allPoolsData = Object.assign(Object.assign({}, this.constants.POOLS_DATA), FACTORY_POOLS_DATA);
-                const basePoolId = getPoolIdByAddress(rawPoolList, pool.basePoolAddress);
+                const basePoolId = getPoolIdByAddress.call(this, rawPoolList, pool.basePoolAddress);
                 this.constants.BASE_POOLS[basePoolId] = this.constants.BASE_POOLS[basePoolId] ? this.constants.BASE_POOLS[basePoolId] + 1 : 1;
                 const basePoolCoinNames = (_d = allPoolsData[basePoolId]) === null || _d === void 0 ? void 0 : _d.underlying_coins;
                 const basePoolCoinAddresses = (_e = allPoolsData[basePoolId]) === null || _e === void 0 ? void 0 : _e.underlying_coin_addresses;
                 const basePoolDecimals = (_f = allPoolsData[basePoolId]) === null || _f === void 0 ? void 0 : _f.underlying_decimals;
                 const basePoolIdZapDict = (_g = this.constants.STABLE_FACTORY_CONSTANTS.basePoolIdZapDict) !== null && _g !== void 0 ? _g : {};
-                let deposit_address = (_h = this.constants.STABLE_FACTORY_CONSTANTS.stableNgBasePoolZap) !== null && _h !== void 0 ? _h : curve.constants.ZERO_ADDRESS;
+                let deposit_address = (_h = this.constants.STABLE_FACTORY_CONSTANTS.stableNgBasePoolZap) !== null && _h !== void 0 ? _h : this.constants.ZERO_ADDRESS;
                 let deposit_abi = StableNgBasePoolZapABI;
                 if (isStableNgPool(basePoolId)) {
                     this.setContract(deposit_address, StableNgBasePoolZapABI);
@@ -237,7 +236,7 @@ export function getFactoryPoolsDataFromApi(factoryType) {
                     reference_asset: assetTypeNameHandler(pool.assetTypeName),
                     swap_address: pool.address,
                     token_address: pool.address,
-                    gauge_address: pool.gaugeAddress ? pool.gaugeAddress : curve.constants.ZERO_ADDRESS,
+                    gauge_address: pool.gaugeAddress ? pool.gaugeAddress : this.constants.ZERO_ADDRESS,
                     deposit_address,
                     implementation_address: pool.implementationAddress, // Only for testing
                     is_meta: true,
@@ -264,7 +263,7 @@ export function getFactoryPoolsDataFromApi(factoryType) {
                     reference_asset: assetTypeNameHandler(pool.assetTypeName),
                     swap_address: pool.address,
                     token_address: pool.address,
-                    gauge_address: pool.gaugeAddress ? pool.gaugeAddress : curve.constants.ZERO_ADDRESS,
+                    gauge_address: pool.gaugeAddress ? pool.gaugeAddress : this.constants.ZERO_ADDRESS,
                     implementation_address: pool.implementationAddress, // Only for testing
                     is_plain: true,
                     is_factory: true,

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

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

package/lib/factory/factory-crypto.js

@@ -7,17 +7,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { curve } from "../curve.js";
-import ERC20ABI from "../constants/abis/ERC20.json" with { type: 'json' };
-import cryptoFactorySwapABI from "../constants/abis/factory-crypto/factory-crypto-pool-2.json" with { type: 'json' };
-import factoryGaugeABI from "../constants/abis/gauge_factory.json" with { type: 'json' };
-import gaugeChildABI from "../constants/abis/gauge_child.json" with { type: 'json' };
+import ERC20ABI from "../constants/abis/ERC20.json" with { type: "json" };
+import cryptoFactorySwapABI from "../constants/abis/factory-crypto/factory-crypto-pool-2.json" with { type: "json" };
+import factoryGaugeABI from "../constants/abis/gauge_factory.json" with { type: "json" };
+import gaugeChildABI from "../constants/abis/gauge_child.json" with { type: "json" };
 import { setFactoryZapContracts } from "./common.js";
 const deepFlatten = (arr) => [].concat(...arr.map((v) => (Array.isArray(v) ? deepFlatten(v) : v)));
 function getRecentlyCreatedCryptoPoolId(swapAddress) {
     return __awaiter(this, void 0, void 0, function* () {
         const factoryContract = this.contracts[this.constants.ALIASES.crypto_factory].contract;
-        const poolCount = Number(curve.formatUnits(yield factoryContract.pool_count(this.constantOptions), 0));
+        const poolCount = Number(this.formatUnits(yield factoryContract.pool_count(this.constantOptions), 0));
         for (let i = 1; i <= poolCount; i++) {
             const address = yield factoryContract.pool_list(poolCount - i);
             if (address.toLowerCase() === swapAddress.toLowerCase())
@@ -30,7 +29,7 @@ function getCryptoFactoryIdsAndSwapAddresses() {
     return __awaiter(this, arguments, void 0, function* (fromIdx = 0) {
         const factoryContract = this.contracts[this.constants.ALIASES.crypto_factory].contract;
         const factoryMulticallContract = this.contracts[this.constants.ALIASES.crypto_factory].multicallContract;
-        const poolCount = Number(curve.formatUnits(yield factoryContract.pool_count(this.constantOptions), 0));
+        const poolCount = Number(this.formatUnits(yield factoryContract.pool_count(this.constantOptions), 0));
         const calls = [];
         for (let i = fromIdx; i < poolCount; i++) {
             calls.push(factoryMulticallContract.pool_list(i));
@@ -69,7 +68,7 @@ function _getLpTokenMap(factorySwapAddresses) {
 function getPoolsData(factorySwapAddresses) {
     return __awaiter(this, void 0, void 0, function* () {
         const factoryMulticallContract = this.contracts[this.constants.ALIASES.crypto_factory].multicallContract;
-        const isChildGaugeFactoryNull = curve.chainId !== 1 && this.constants.ALIASES.child_gauge_factory === curve.constants.ZERO_ADDRESS;
+        const isChildGaugeFactoryNull = this.chainId !== 1 && this.constants.ALIASES.child_gauge_factory === this.constants.ZERO_ADDRESS;
         const isChildGaugeFactoryOldNull = !("child_gauge_factory_old" in this.constants.ALIASES);
         const calls = [];
         if (this.chainId === 1) {
@@ -96,9 +95,9 @@ function getPoolsData(factorySwapAddresses) {
         if (isChildGaugeFactoryNull || isChildGaugeFactoryOldNull) {
             for (let index = 0; index < res.length; index++) {
                 if (isChildGaugeFactoryNull && index % 4 == 1)
-                    res.splice(index, 0, curve.constants.ZERO_ADDRESS);
+                    res.splice(index, 0, this.constants.ZERO_ADDRESS);
                 if (isChildGaugeFactoryOldNull && index % 4 == 2)
-                    res.splice(index, 0, curve.constants.ZERO_ADDRESS);
+                    res.splice(index, 0, this.constants.ZERO_ADDRESS);
             }
         }
         const tokenAddresses = res.filter((a, i) => i % 4 == 0).map((a) => a.toLowerCase());
@@ -119,9 +118,7 @@ function setCryptoFactoryTokenContracts(factoryTokenAddresses) {
     });
 }
 function setCryptoFactoryGaugeContracts(factoryGaugeAddresses) {
-    factoryGaugeAddresses.filter((addr) => addr !== curve.constants.ZERO_ADDRESS).forEach((addr, i) => {
-        this.setContract(addr, this.chainId === 1 ? factoryGaugeABI : gaugeChildABI);
-    });
+    factoryGaugeAddresses.filter((addr) => addr !== this.constants.ZERO_ADDRESS).forEach((addr) => this.setContract(addr, this.chainId === 1 ? factoryGaugeABI : gaugeChildABI));
 }
 function setCryptoFactoryCoinsContracts(coinAddresses) {
     const flattenedCoinAddresses = Array.from(new Set(deepFlatten(coinAddresses)));
@@ -185,7 +182,7 @@ function getCoinsData(tokenAddresses, coinAddresses, existingCoinAddrNameDict, e
         const tokenNames = res1.filter((a, i) => i % 2 == 1);
         const res2 = res.slice(tokenAddresses.length * 2);
         const symbols = res2.filter((a, i) => i % 2 == 0);
-        const decimals = res2.filter((a, i) => i % 2 == 1).map((_d) => Number(curve.formatUnits(_d, 0)));
+        const decimals = res2.filter((a, i) => i % 2 == 1).map((_d) => Number(this.formatUnits(_d, 0)));
         newCoinAddresses.forEach((addr, i) => {
             coinAddrNamesDict[addr] = symbols[i];
             coinAddrDecimalsDict[addr] = decimals[i];
@@ -206,7 +203,7 @@ export function getCryptoFactoryPoolData() {
         const [tokenAddresses, rawGaugeAddresses, rawOldGaugeAddresses, coinAddresses] = yield getPoolsData.call(this, swapAddresses);
         const gaugeAddresses = [];
         for (let i = 0; i < rawGaugeAddresses.length; i++) {
-            gaugeAddresses.push(rawGaugeAddresses[i] !== curve.constants.ZERO_ADDRESS ? rawGaugeAddresses[i] : rawOldGaugeAddresses[i]);
+            gaugeAddresses.push(rawGaugeAddresses[i] !== this.constants.ZERO_ADDRESS ? rawGaugeAddresses[i] : rawOldGaugeAddresses[i]);
         }
         setCryptoFactorySwapContracts.call(this, swapAddresses);
         setCryptoFactoryTokenContracts.call(this, tokenAddresses);

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

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

package/lib/factory/factory-tricrypto.js

@@ -7,17 +7,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { curve } from "../curve.js";
-import ERC20ABI from "../constants/abis/ERC20.json" with { type: 'json' };
-import tricryptoFactorySwapABI from "../constants/abis/factory-tricrypto/factory-tricrypto-pool.json" with { type: 'json' };
-import tricryptoFactoryEthDisabledSwapABI from "../constants/abis/factory-tricrypto/factory-tricrypto-pool-eth-disabled.json" with { type: 'json' };
-import factoryGaugeABI from "../constants/abis/gauge_factory.json" with { type: 'json' };
-import gaugeChildABI from "../constants/abis/gauge_child.json" with { type: 'json' };
+import ERC20ABI from "../constants/abis/ERC20.json" with { type: "json" };
+import tricryptoFactorySwapABI from "../constants/abis/factory-tricrypto/factory-tricrypto-pool.json" with { type: "json" };
+import tricryptoFactoryEthDisabledSwapABI from "../constants/abis/factory-tricrypto/factory-tricrypto-pool-eth-disabled.json" with { type: "json" };
+import factoryGaugeABI from "../constants/abis/gauge_factory.json" with { type: "json" };
+import gaugeChildABI from "../constants/abis/gauge_child.json" with { type: "json" };
 const deepFlatten = (arr) => [].concat(...arr.map((v) => (Array.isArray(v) ? deepFlatten(v) : v)));
 function getRecentlyCreatedCryptoPoolId(swapAddress) {
     return __awaiter(this, void 0, void 0, function* () {
         const factoryContract = this.contracts[this.constants.ALIASES.tricrypto_factory].contract;
-        const poolCount = Number(curve.formatUnits(yield factoryContract.pool_count(this.constantOptions), 0));
+        const poolCount = Number(this.formatUnits(yield factoryContract.pool_count(this.constantOptions), 0));
         for (let i = 1; i <= poolCount; i++) {
             const address = yield factoryContract.pool_list(poolCount - i);
             if (address.toLowerCase() === swapAddress.toLowerCase())
@@ -30,7 +29,7 @@ function getCryptoFactoryIdsAndSwapAddresses() {
     return __awaiter(this, arguments, void 0, function* (fromIdx = 0) {
         const factoryContract = this.contracts[this.constants.ALIASES.tricrypto_factory].contract;
         const factoryMulticallContract = this.contracts[this.constants.ALIASES.tricrypto_factory].multicallContract;
-        const poolCount = Number(curve.formatUnits(yield factoryContract.pool_count(this.constantOptions), 0));
+        const poolCount = Number(this.formatUnits(yield factoryContract.pool_count(this.constantOptions), 0));
         const calls = [];
         for (let i = fromIdx; i < poolCount; i++) {
             calls.push(factoryMulticallContract.pool_list(i));
@@ -49,7 +48,7 @@ function _handleCoinAddresses(coinAddresses) {
 function getPoolsData(factorySwapAddresses) {
     return __awaiter(this, void 0, void 0, function* () {
         const factoryMulticallContract = this.contracts[this.constants.ALIASES.tricrypto_factory].multicallContract;
-        const isChildGaugeFactoryNull = curve.chainId !== 1 && this.constants.ALIASES.child_gauge_factory === curve.constants.ZERO_ADDRESS;
+        const isChildGaugeFactoryNull = this.chainId !== 1 && this.constants.ALIASES.child_gauge_factory === this.constants.ZERO_ADDRESS;
         const isChildGaugeFactoryOldNull = !("child_gauge_factory_old" in this.constants.ALIASES);
         const calls = [];
         if (this.chainId === 1) {
@@ -74,11 +73,11 @@ function getPoolsData(factorySwapAddresses) {
         if (isChildGaugeFactoryNull || isChildGaugeFactoryOldNull || this.chainId === 1) {
             for (let index = 0; index < res.length; index++) {
                 if (isChildGaugeFactoryNull && index % 4 == 0)
-                    res.splice(index, 0, curve.constants.ZERO_ADDRESS);
+                    res.splice(index, 0, this.constants.ZERO_ADDRESS);
                 if (isChildGaugeFactoryOldNull && index % 4 == 1)
-                    res.splice(index, 0, curve.constants.ZERO_ADDRESS);
+                    res.splice(index, 0, this.constants.ZERO_ADDRESS);
                 if (this.chainId === 1 && index % 4 == 3)
-                    res.splice(index, 0, curve.constants.ZERO_ADDRESS);
+                    res.splice(index, 0, this.constants.ZERO_ADDRESS);
             }
         }
         const gaugeAddresses = res.filter((a, i) => i % 4 == 0).map((a) => a.toLowerCase());
@@ -94,7 +93,7 @@ function setCryptoFactorySwapContracts(factorySwapAddresses) {
     });
 }
 function setCryptoFactoryGaugeContracts(factoryGaugeAddresses) {
-    factoryGaugeAddresses.filter((addr) => addr !== curve.constants.ZERO_ADDRESS).forEach((addr, i) => {
+    factoryGaugeAddresses.filter((addr) => addr !== this.constants.ZERO_ADDRESS).forEach((addr) => {
         this.setContract(addr, this.chainId === 1 ? factoryGaugeABI : gaugeChildABI);
     });
 }
@@ -156,7 +155,7 @@ function getCoinsData(tokenAddresses, coinAddresses, existingCoinAddrNameDict, e
         const tokenNames = res1.filter((a, i) => i % 2 == 1);
         const res2 = res.slice(tokenAddresses.length * 2);
         const symbols = res2.filter((a, i) => i % 2 == 0);
-        const decimals = res2.filter((a, i) => i % 2 == 1).map((_d) => Number(curve.formatUnits(_d, 0)));
+        const decimals = res2.filter((a, i) => i % 2 == 1).map((_d) => Number(this.formatUnits(_d, 0)));
         newCoinAddresses.forEach((addr, i) => {
             coinAddrNamesDict[addr] = symbols[i];
             coinAddrDecimalsDict[addr] = decimals[i];
@@ -177,7 +176,7 @@ export function getTricryptoFactoryPoolData() {
         const [rawGaugeAddresses, rawOldGaugeAddresses, coinAddresses, implementationAddresses] = yield getPoolsData.call(this, swapAddresses);
         const gaugeAddresses = [];
         for (let i = 0; i < rawGaugeAddresses.length; i++) {
-            gaugeAddresses.push(rawGaugeAddresses[i] !== curve.constants.ZERO_ADDRESS ? rawGaugeAddresses[i] : rawOldGaugeAddresses[i]);
+            gaugeAddresses.push(rawGaugeAddresses[i] !== this.constants.ZERO_ADDRESS ? rawGaugeAddresses[i] : rawOldGaugeAddresses[i]);
         }
         setCryptoFactorySwapContracts.call(this, swapAddresses);
         setCryptoFactoryGaugeContracts.call(this, gaugeAddresses);

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

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

package/lib/factory/factory-twocrypto.js

@@ -7,16 +7,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { curve } from "../curve.js";
-import ERC20ABI from "../constants/abis/ERC20.json" with { type: 'json' };
-import twocryptoFactorySwapABI from "../constants/abis/factory-twocrypto/factory-twocrypto-pool.json" with { type: 'json' };
-import factoryGaugeABI from "../constants/abis/gauge_factory.json" with { type: 'json' };
-import gaugeChildABI from "../constants/abis/gauge_child.json" with { type: 'json' };
+import ERC20ABI from "../constants/abis/ERC20.json" with { type: "json" };
+import twocryptoFactorySwapABI from "../constants/abis/factory-twocrypto/factory-twocrypto-pool.json" with { type: "json" };
+import factoryGaugeABI from "../constants/abis/gauge_factory.json" with { type: "json" };
+import gaugeChildABI from "../constants/abis/gauge_child.json" with { type: "json" };
 const deepFlatten = (arr) => [].concat(...arr.map((v) => (Array.isArray(v) ? deepFlatten(v) : v)));
 function getRecentlyCreatedCryptoPoolId(swapAddress) {
     return __awaiter(this, void 0, void 0, function* () {
         const factoryContract = this.contracts[this.constants.ALIASES.twocrypto_factory].contract;
-        const poolCount = Number(curve.formatUnits(yield factoryContract.pool_count(this.constantOptions), 0));
+        const poolCount = Number(this.formatUnits(yield factoryContract.pool_count(this.constantOptions), 0));
         for (let i = 1; i <= poolCount; i++) {
             const address = yield factoryContract.pool_list(poolCount - i);
             if (address.toLowerCase() === swapAddress.toLowerCase())
@@ -29,7 +28,7 @@ function getTwocryptoFactoryIdsAndSwapAddresses() {
     return __awaiter(this, arguments, void 0, function* (fromIdx = 0) {
         const factoryContract = this.contracts[this.constants.ALIASES.twocrypto_factory].contract;
         const factoryMulticallContract = this.contracts[this.constants.ALIASES.twocrypto_factory].multicallContract;
-        const poolCount = Number(curve.formatUnits(yield factoryContract.pool_count(this.constantOptions), 0));
+        const poolCount = Number(this.formatUnits(yield factoryContract.pool_count(this.constantOptions), 0));
         const calls = [];
         for (let i = fromIdx; i < poolCount; i++) {
             calls.push(factoryMulticallContract.pool_list(i));
@@ -48,7 +47,7 @@ function _handleCoinAddresses(coinAddresses) {
 function getPoolsData(factorySwapAddresses) {
     return __awaiter(this, void 0, void 0, function* () {
         const factoryMulticallContract = this.contracts[this.constants.ALIASES.twocrypto_factory].multicallContract;
-        const isChildGaugeFactoryNull = curve.chainId !== 1 && this.constants.ALIASES.child_gauge_factory === curve.constants.ZERO_ADDRESS;
+        const isChildGaugeFactoryNull = this.chainId !== 1 && this.constants.ALIASES.child_gauge_factory === this.constants.ZERO_ADDRESS;
         const isChildGaugeFactoryOldNull = !("child_gauge_factory_old" in this.constants.ALIASES);
         const calls = [];
         if (this.chainId === 1) {
@@ -72,9 +71,9 @@ function getPoolsData(factorySwapAddresses) {
         if (isChildGaugeFactoryNull || isChildGaugeFactoryOldNull) {
             for (let index = 0; index < res.length; index++) {
                 if (isChildGaugeFactoryNull && index % 3 == 0)
-                    res.splice(index, 0, curve.constants.ZERO_ADDRESS);
+                    res.splice(index, 0, this.constants.ZERO_ADDRESS);
                 if (isChildGaugeFactoryOldNull && index % 3 == 1)
-                    res.splice(index, 0, curve.constants.ZERO_ADDRESS);
+                    res.splice(index, 0, this.constants.ZERO_ADDRESS);
             }
         }
         const gaugeAddresses = res.filter((a, i) => i % 3 == 0).map((a) => a.toLowerCase());
@@ -89,7 +88,7 @@ function setTwocryptoFactorySwapContracts(factorySwapAddresses) {
     });
 }
 function setTwocryptoFactoryGaugeContracts(factoryGaugeAddresses) {
-    factoryGaugeAddresses.filter((addr) => addr !== curve.constants.ZERO_ADDRESS).forEach((addr, i) => {
+    factoryGaugeAddresses.filter((addr) => addr !== this.constants.ZERO_ADDRESS).forEach((addr) => {
         this.setContract(addr, this.chainId === 1 ? factoryGaugeABI : gaugeChildABI);
     });
 }
@@ -154,7 +153,7 @@ function getCoinsData(tokenAddresses, coinAddresses, existingCoinAddrNameDict, e
         const tokenNames = res1.filter((a, i) => i % 2 == 1);
         const res2 = res.slice(tokenAddresses.length * 2);
         const symbols = res2.filter((a, i) => i % 2 == 0);
-        const decimals = res2.filter((a, i) => i % 2 == 1).map((_d) => Number(curve.formatUnits(_d, 0)));
+        const decimals = res2.filter((a, i) => i % 2 == 1).map((_d) => Number(this.formatUnits(_d, 0)));
         newCoinAddresses.forEach((addr, i) => {
             coinAddrNamesDict[addr] = symbols[i];
             coinAddrDecimalsDict[addr] = decimals[i];
@@ -174,7 +173,7 @@ export function getTwocryptoFactoryPoolData() {
         const [rawGaugeAddresses, rawOldGaugeAddresses, coinAddresses] = yield getPoolsData.call(this, swapAddresses);
         const gaugeAddresses = [];
         for (let i = 0; i < rawGaugeAddresses.length; i++) {
-            gaugeAddresses.push(rawGaugeAddresses[i] !== curve.constants.ZERO_ADDRESS ? rawGaugeAddresses[i] : rawOldGaugeAddresses[i]);
+            gaugeAddresses.push(rawGaugeAddresses[i] !== this.constants.ZERO_ADDRESS ? rawGaugeAddresses[i] : rawOldGaugeAddresses[i]);
         }
         setTwocryptoFactorySwapContracts.call(this, swapAddresses);
         setTwocryptoFactoryGaugeContracts.call(this, gaugeAddresses);

package/lib/factory/factory.d.ts

@@ -1,9 +1,10 @@
-import { IDict, IPoolData, ICurve, IPoolDataShort } from "../interfaces";
+import { IDict, IPoolData, IPoolDataShort } from "../interfaces";
+import { Curve } from "../curve";
 export declare const BLACK_LIST: {
     [index: number]: any;
 };
-export declare function getBasePools(this: ICurve, factoryAddress: string, rawSwapAddresses: string[], tmpPools: IPoolDataShort[]): Promise<{
+export declare function getBasePools(this: Curve, factoryAddress: string, rawSwapAddresses: string[], tmpPools: IPoolDataShort[]): Promise<{
     ids: string[];
     addresses: string[];
 }>;
-export declare function getFactoryPoolData(this: ICurve, fromIdx?: number, swapAddress?: string, factoryAddress?: string): Promise<IDict<IPoolData>>;
+export declare function getFactoryPoolData(this: Curve, fromIdx?: number, swapAddress?: string, factoryAddress?: string): Promise<IDict<IPoolData>>;

package/lib/factory/factory.js

@@ -8,15 +8,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { Contract as MulticallContract } from "@curvefi/ethcall";
-import { curve } from "../curve.js";
-import ERC20ABI from "../constants/abis/ERC20.json" with { type: 'json' };
-import PlainStableSwapNGABI from "../constants/abis/factory-stable-ng/plain-stableswap-ng.json" with { type: 'json' };
-import MetaStableSwapNGABI from "../constants/abis/factory-stable-ng/meta-stableswap-ng.json" with { type: 'json' };
-import factoryGaugeABI from "../constants/abis/gauge_factory.json" with { type: 'json' };
-import gaugeChildABI from "../constants/abis/gauge_child.json" with { type: 'json' };
-import StableNgBasePoolZapABI from "../constants/abis/stable-ng-base-pool-zap.json" with { type: 'json' };
+import ERC20ABI from "../constants/abis/ERC20.json" with { type: "json" };
+import PlainStableSwapNGABI from "../constants/abis/factory-stable-ng/plain-stableswap-ng.json" with { type: "json" };
+import MetaStableSwapNGABI from "../constants/abis/factory-stable-ng/meta-stableswap-ng.json" with { type: "json" };
+import factoryGaugeABI from "../constants/abis/gauge_factory.json" with { type: "json" };
+import gaugeChildABI from "../constants/abis/gauge_child.json" with { type: "json" };
+import StableNgBasePoolZapABI from "../constants/abis/stable-ng-base-pool-zap.json" with { type: "json" };
 import { getPoolIdByAddress, setFactoryZapContracts } from "./common.js";
 import { getPoolName, isStableNgPool } from "../utils.js";
+import { formatUnits } from "../constants/utils";
 export const BLACK_LIST = {
     1: [
         "0x066b6e1e93fa7dcd3f0eb7f8bac7d5a747ce0bf9",
@@ -44,7 +44,7 @@ export function getBasePools(factoryAddress, rawSwapAddresses, tmpPools) {
         const basePoolAddresses = [];
         result.forEach((item) => {
             if (item !== '0x0000000000000000000000000000000000000000') {
-                basePoolIds.push(getPoolIdByAddress(tmpPools, item));
+                basePoolIds.push(getPoolIdByAddress.call(this, tmpPools, item));
                 basePoolAddresses.push(item);
             }
             else {
@@ -62,7 +62,7 @@ function getRecentlyCreatedPoolId(swapAddress, factoryAddress) {
     return __awaiter(this, void 0, void 0, function* () {
         const factoryContract = this.contracts[factoryAddress].contract;
         const prefix = factoryAddress === this.constants.ALIASES.factory ? 'factory-v2' : 'factory-stable-ng';
-        const poolCount = Number(curve.formatUnits(yield factoryContract.pool_count(this.constantOptions), 0));
+        const poolCount = Number(this.formatUnits(yield factoryContract.pool_count(this.constantOptions), 0));
         for (let i = 1; i <= poolCount; i++) {
             const address = yield factoryContract.pool_list(poolCount - i);
             if (address.toLowerCase() === swapAddress.toLowerCase())
@@ -76,7 +76,7 @@ function getFactoryIdsAndSwapAddresses() {
         var _a;
         const factoryContract = this.contracts[factoryAddress].contract;
         const factoryMulticallContract = this.contracts[factoryAddress].multicallContract;
-        const poolCount = Number(curve.formatUnits(yield factoryContract.pool_count(this.constantOptions), 0));
+        const poolCount = Number(this.formatUnits(yield factoryContract.pool_count(this.constantOptions), 0));
         const calls = [];
         for (let i = fromIdx; i < poolCount; i++) {
             calls.push(factoryMulticallContract.pool_list(i));
@@ -99,18 +99,18 @@ function _handleReferenceAssets(referenceAssets) {
             0: "USD",
             1: "ETH",
             2: "BTC",
-        }[curve.formatUnits(t, 0)] || "OTHER";
+        }[formatUnits(t, 0)] || "OTHER";
     });
 }
 function _handleCoinAddresses(coinAddresses) {
     return coinAddresses.map((addresses) => addresses
-        .filter((addr) => addr !== curve.constants.ZERO_ADDRESS)
+        .filter((addr) => addr !== this.constants.ZERO_ADDRESS)
         .map((addr) => this.chainId === 137 && addr === "0x0000000000000000000000000000000000001010" ? this.constants.NATIVE_TOKEN.address : addr.toLowerCase()));
 }
 function getPoolsData(factorySwapAddresses, factoryAddress) {
     return __awaiter(this, void 0, void 0, function* () {
         const factoryMulticallContract = this.contracts[factoryAddress].multicallContract;
-        const isChildGaugeFactoryNull = curve.chainId !== 1 && this.constants.ALIASES.child_gauge_factory === curve.constants.ZERO_ADDRESS;
+        const isChildGaugeFactoryNull = this.chainId !== 1 && this.constants.ALIASES.child_gauge_factory === this.constants.ZERO_ADDRESS;
         const isChildGaugeFactoryOldNull = !("child_gauge_factory_old" in this.constants.ALIASES);
         const isStableNgFactory = factoryAddress === this.constants.ALIASES['stable_ng_factory'];
         const calls = [];
@@ -139,9 +139,9 @@ function getPoolsData(factorySwapAddresses, factoryAddress) {
         if (isChildGaugeFactoryNull || isChildGaugeFactoryOldNull || isStableNgFactory) {
             for (let index = 0; index < res.length; index++) {
                 if (isChildGaugeFactoryNull && index % 8 == 1)
-                    res.splice(index, 0, curve.constants.ZERO_ADDRESS);
+                    res.splice(index, 0, this.constants.ZERO_ADDRESS);
                 if (isChildGaugeFactoryOldNull && index % 8 == 2)
-                    res.splice(index, 0, curve.constants.ZERO_ADDRESS);
+                    res.splice(index, 0, this.constants.ZERO_ADDRESS);
                 if (isStableNgFactory && index % 8 == 3)
                     res.splice(index, 0, -1);
             }
@@ -163,7 +163,7 @@ function setFactorySwapContracts(factorySwapAddresses, factorySwapABIs) {
     });
 }
 function setFactoryGaugeContracts(factoryGaugeAddresses) {
-    factoryGaugeAddresses.filter((addr) => addr !== curve.constants.ZERO_ADDRESS).forEach((addr, i) => {
+    factoryGaugeAddresses.filter((addr) => addr !== this.constants.ZERO_ADDRESS).forEach((addr) => {
         this.setContract(addr, this.chainId === 1 ? factoryGaugeABI : gaugeChildABI);
     });
 }
@@ -214,7 +214,7 @@ function getCoinsData(coinAddresses, existingCoinAddrNameDict, existingCoinAddrD
         }
         const res = yield this.multicallProvider.all(calls);
         const symbols = res.filter((a, i) => i % 2 == 0);
-        const decimals = res.filter((a, i) => i % 2 == 1).map((_d) => Number(curve.formatUnits(_d, 0)));
+        const decimals = res.filter((a, i) => i % 2 == 1).map((_d) => Number(this.formatUnits(_d, 0)));
         newCoinAddresses.forEach((addr, i) => {
             coinAddrNamesDict[addr] = symbols[i];
             coinAddrDecimalsDict[addr] = decimals[i];
@@ -223,14 +223,14 @@ function getCoinsData(coinAddresses, existingCoinAddrNameDict, existingCoinAddrD
     });
 }
 export function getFactoryPoolData() {
-    return __awaiter(this, arguments, void 0, function* (fromIdx = 0, swapAddress, factoryAddress = curve.constants.ALIASES.factory) {
+    return __awaiter(this, arguments, void 0, function* (fromIdx = 0, swapAddress, factoryAddress = this.constants.ALIASES.factory) {
         var _a, _b, _c;
         const [rawPoolIds, rawSwapAddresses] = swapAddress ?
             [[yield getRecentlyCreatedPoolId.call(this, swapAddress, factoryAddress)], [swapAddress.toLowerCase()]]
             : yield getFactoryIdsAndSwapAddresses.call(this, fromIdx, factoryAddress);
         if (rawPoolIds.length === 0)
             return {};
-        const is_ng = factoryAddress === curve.constants.ALIASES.stable_ng_factory;
+        const is_ng = factoryAddress === this.constants.ALIASES.stable_ng_factory;
         const [rawImplementations, rawGauges, rawOldGauges, rawReferenceAssets, rawPoolSymbols, rawPoolNames, rawIsMeta, rawCoinAddresses] = yield getPoolsData.call(this, rawSwapAddresses, factoryAddress);
         const poolIds = [];
         const swapAddresses = [];
@@ -247,7 +247,7 @@ export function getFactoryPoolData() {
                 poolIds.push(rawPoolIds[i]);
                 swapAddresses.push(rawSwapAddresses[i]);
                 implementations.push(rawImplementations[i]);
-                gaugeAddresses.push(rawGauges[i] !== curve.constants.ZERO_ADDRESS ? rawGauges[i] : rawOldGauges[i]);
+                gaugeAddresses.push(rawGauges[i] !== this.constants.ZERO_ADDRESS ? rawGauges[i] : rawOldGauges[i]);
                 referenceAssets.push(rawReferenceAssets[i]);
                 poolSymbols.push(rawPoolSymbols[i]);
                 poolNames.push(rawPoolNames[i]);
@@ -298,15 +298,12 @@ export function getFactoryPoolData() {
             }
             else {
                 const allPoolsData = Object.assign(Object.assign(Object.assign(Object.assign({}, this.constants.POOLS_DATA), this.constants.FACTORY_POOLS_DATA), this.constants.STABLE_NG_FACTORY_POOLS_DATA), FACTORY_POOLS_DATA);
-                // @ts-ignore
                 const basePoolIdCoinsDict = Object.fromEntries(basePools.ids.map((poolId) => { var _a; return [poolId, (_a = allPoolsData[poolId]) === null || _a === void 0 ? void 0 : _a.underlying_coins]; }));
-                // @ts-ignore
                 const basePoolIdCoinAddressesDict = Object.fromEntries(basePools.ids.map((poolId) => { var _a; return [poolId, (_a = allPoolsData[poolId]) === null || _a === void 0 ? void 0 : _a.underlying_coin_addresses]; }));
-                // @ts-ignore
                 const basePoolIdDecimalsDict = Object.fromEntries(basePools.ids.map((poolId) => { var _a; return [poolId, (_a = allPoolsData[poolId]) === null || _a === void 0 ? void 0 : _a.underlying_decimals]; }));
                 const basePoolIdZapDict = (_b = this.constants.STABLE_FACTORY_CONSTANTS.basePoolIdZapDict) !== null && _b !== void 0 ? _b : {};
                 this.constants.BASE_POOLS[basePools.ids[i]] = this.constants.BASE_POOLS[basePools.ids[i]] ? this.constants.BASE_POOLS[basePools.ids[i]] + 1 : 1;
-                let deposit_address = (_c = this.constants.STABLE_FACTORY_CONSTANTS.stableNgBasePoolZap) !== null && _c !== void 0 ? _c : curve.constants.ZERO_ADDRESS;
+                let deposit_address = (_c = this.constants.STABLE_FACTORY_CONSTANTS.stableNgBasePoolZap) !== null && _c !== void 0 ? _c : this.constants.ZERO_ADDRESS;
                 let deposit_abi = StableNgBasePoolZapABI;
                 if (isStableNgPool(basePools.ids[i])) {
                     this.setContract(deposit_address, StableNgBasePoolZapABI);