Merge pull request #227 from curvefi/feat/add-stable-ng-factory

fix: fixed totalLiquidity and ABI for factory-stable-ng
curvefi · Nov 13, 2023 · 990287d · 990287d
2 parents 9ad53ed + ded463d
commit 990287d
Show file tree

Hide file tree

Showing 8 changed files with 2,344 additions and 12 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@curvefi/api",
-  "version": "2.51.0",
+  "version": "2.51.1",
   "description": "JavaScript library for curve.fi",
   "main": "lib/index.js",
   "author": "Macket",

diff --git a/src/constants/abis/factory-stable-ng.json b/src/constants/abis/factory-stable-ng.json
diff --git a/src/constants/abis/factory-stable-ng/plain-stableswap-ng.json b/src/constants/abis/factory-stable-ng/plain-stableswap-ng.json
diff --git a/src/curve.ts b/src/curve.ts
@@ -787,7 +787,7 @@ class Curve implements ICurve {
         } else {
             this.constants.STABLE_NG_FACTORY_POOLS_DATA = lowerCasePoolDataAddresses(await getFactoryPoolData.call(this, 0, undefined, this.constants.ALIASES.stable_ng_factory));
         }
-        console.log(this.constants.STABLE_NG_FACTORY_POOLS_DATA)
+
         this.constants.STABLE_NG_FACTORY_POOLS_DATA = await this._filterHiddenPools(this.constants.STABLE_NG_FACTORY_POOLS_DATA);
         this._updateDecimalsAndGauges(this.constants.STABLE_NG_FACTORY_POOLS_DATA);
 

diff --git a/src/factory/factory-api.ts b/src/factory/factory-api.ts
@@ -9,7 +9,7 @@ import { FACTORY_CONSTANTS } from "./constants.js";
 import { CRYPTO_FACTORY_CONSTANTS } from "./constants-crypto.js";
 import { setFactoryZapContracts } from "./common.js";
 import { _getPoolsFromApi } from "../external-api.js";
-import { getPoolName } from "../utils.js";
+import { assetTypeNameHandler, getPoolName } from "../utils.js";
 
 export const lowerCasePoolDataAddresses = (poolsData: IPoolDataFromApi[]): IPoolDataFromApi[] => {
     for (const poolData of poolsData) {
@@ -185,7 +185,7 @@ export async function getFactoryPoolsDataFromApi(this: ICurve, factoryType: IFac
                 name: getPoolName(pool.name),
                 full_name: pool.name,
                 symbol: pool.symbol,
-                reference_asset: pool.assetTypeName.toUpperCase() as REFERENCE_ASSET,
+                reference_asset: assetTypeNameHandler(pool.assetTypeName),
                 swap_address: pool.address,
                 token_address: pool.address,
                 gauge_address: pool.gaugeAddress ? pool.gaugeAddress : curve.constants.ZERO_ADDRESS,
@@ -211,7 +211,7 @@ export async function getFactoryPoolsDataFromApi(this: ICurve, factoryType: IFac
                 name: getPoolName(pool.name),
                 full_name: pool.name,
                 symbol: pool.symbol,
-                reference_asset: pool.assetTypeName.toUpperCase() as REFERENCE_ASSET,
+                reference_asset: assetTypeNameHandler(pool.assetTypeName),
                 swap_address: pool.address,
                 token_address: pool.address,
                 gauge_address: pool.gaugeAddress ? pool.gaugeAddress : curve.constants.ZERO_ADDRESS,

diff --git a/src/pools/PoolTemplate.ts b/src/pools/PoolTemplate.ts
@@ -387,9 +387,8 @@ export class PoolTemplate {
             const network = curve.constants.NETWORK_NAME;
             let poolType = this.isCrypto ? "crypto" : "main";
             if (this.id.startsWith("factory")) {
-                poolType = "factory";
-                const factoryType = this.id.split("-")[1];
-                if (factoryType !== "v2") poolType += "-" + factoryType;
+                poolType = this.id.replace(/-\d+$/, '');
+                poolType = poolType.replace(/-v2$/, '');
             }
             const poolsData = (await _getPoolsFromApi(network, poolType as IPoolType)).poolData;
 

diff --git a/src/utils.ts b/src/utils.ts
@@ -2,7 +2,7 @@ import axios from 'axios';
 import { Contract } from 'ethers';
 import { Contract as MulticallContract } from "ethcall";
 import BigNumber from 'bignumber.js';
-import { IChainId, IDict, INetworkName, IRewardFromApi } from './interfaces';
+import {IChainId, IDict, INetworkName, IRewardFromApi, REFERENCE_ASSET} from './interfaces';
 import { curve, NETWORK_CONSTANTS } from "./curve.js";
 import { _getFactoryAPYsAndVolumes, _getLegacyAPYsAndVolumes, _getAllPoolsFromApi, _getSubgraphData } from "./external-api.js";
 import ERC20Abi from './constants/abis/ERC20.json' assert { type: 'json' };
@@ -655,4 +655,12 @@ export const getPoolName = (name: string): string => {
     } else {
         return separatedName[0].trim()
     }
+}
+
+export const assetTypeNameHandler = (assetTypeName: string): REFERENCE_ASSET => {
+    if (assetTypeName.toUpperCase() === 'UNKNOWN') {
+        return 'OTHER';
+    } else {
+        return assetTypeName.toUpperCase() as REFERENCE_ASSET;
+    }
 }
diff --git a/test/stats.test.ts b/test/stats.test.ts
@@ -29,7 +29,7 @@ const FACTORY_POOLS_COUNT_POLYGON = 263;
 const MAIN_POOLS_AVALANCHE = [ 'aave', 'ren', 'atricrypto'];
 const FACTORY_POOLS_COUNT_AVALANCHE = 81;
 
-const MAIN_POOLS_FANTOM = ['2pool', 'fusdt', 'ren', 'tricrypto', 'ib', 'geist'];;
+const MAIN_POOLS_FANTOM = ['2pool', 'fusdt', 'ren', 'tricrypto', 'ib', 'geist'];
 const FACTORY_POOLS_COUNT_FANTOM = 110;
 const CRYPTO_FACTORY_POOLS_COUNT_FANTOM = 6;