@curvefi/api 2.63.1 → 2.63.2

package/lib/curve.d.ts

@@ -1,6 +1,6 @@
 import { ethers, Contract, Networkish, BigNumberish, Numeric, BrowserProvider, JsonRpcProvider, Signer } from "ethers";
 import { Provider as MulticallProvider, Contract as MulticallContract } from "@curvefi/ethcall";
-import { IPoolData, IDict, ICurve, INetworkName, IChainId, IFactoryPoolType } from "./interfaces";
+import { IPoolData, IDict, ICurve, INetworkName, IChainId, IFactoryPoolType, Abi } from "./interfaces";
 export declare const memoizedContract: () => (address: string, abi: any, provider: BrowserProvider | JsonRpcProvider | Signer) => Contract;
 export declare const memoizedMulticallContract: () => (address: string, abi: any) => MulticallContract;
 export declare const NATIVE_TOKENS: {
@@ -14,6 +14,11 @@ export declare const NATIVE_TOKENS: {
 export declare const NETWORK_CONSTANTS: {
     [index: number]: any;
 };
+export type ContractItem = {
+    contract: Contract;
+    multicallContract: MulticallContract;
+    abi: Abi;
+};
 declare class Curve implements ICurve {
     provider: ethers.BrowserProvider | ethers.JsonRpcProvider;
     multicallProvider: MulticallProvider;
@@ -21,10 +26,7 @@ declare class Curve implements ICurve {
     signerAddress: string;
     chainId: IChainId;
     contracts: {
-        [index: string]: {
-            contract: Contract;
-            multicallContract: MulticallContract;
-        };
+        [index: string]: ContractItem;
     };
     feeData: {
         gasPrice?: number;

package/lib/interfaces.d.ts

@@ -263,3 +263,48 @@ export interface IBasePoolShortItem {
     token: string;
 }
 export type TVoteType = "PARAMETER" | "OWNERSHIP";
+export type AbiParameter = {
+    type: string;
+    name?: string;
+    components?: readonly AbiParameter[];
+};
+type CtorMutability = 'payable' | 'nonpayable';
+export type AbiStateMutability = 'pure' | 'view' | CtorMutability;
+export type AbiFunction = {
+    type: 'function';
+    constant?: boolean;
+    gas?: number;
+    inputs: readonly AbiParameter[];
+    name: string;
+    outputs: readonly AbiParameter[];
+    payable?: boolean | undefined;
+    stateMutability: AbiStateMutability;
+};
+export type AbiConstructor = {
+    type: 'constructor';
+    inputs: readonly AbiParameter[];
+    payable?: boolean;
+    stateMutability: CtorMutability;
+};
+export type AbiFallback = {
+    type: 'fallback';
+    payable?: boolean;
+    stateMutability: CtorMutability;
+};
+export type AbiReceive = {
+    type: 'receive';
+    stateMutability: Extract<AbiStateMutability, 'payable'>;
+};
+export type AbiEvent = {
+    type: 'event';
+    anonymous?: boolean;
+    inputs: readonly AbiParameter[];
+    name: string;
+};
+export type AbiError = {
+    type: 'error';
+    inputs: readonly AbiParameter[];
+    name: string;
+};
+export type Abi = (AbiConstructor | AbiError | AbiEvent | AbiFallback | AbiFunction | AbiReceive)[];
+export {};

package/lib/pools/PoolTemplate.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import memoize from "memoizee";
 import { _getAllGaugesFormatted, _getPoolsFromApi } from '../external-api.js';
-import { _getCoinAddresses, _getBalances, _prepareAddresses, _ensureAllowance, _getUsdRate, hasAllowance, ensureAllowance, ensureAllowanceEstimateGas, BN, toBN, toStringFromBN, parseUnits, getEthIndex, fromBN, _cutZeros, _setContracts, _get_small_x, _get_price_impact, checkNumber, _getCrvApyFromApi, _getRewardsFromApi, mulBy1_3, smartNumber, DIGas, _getAddress, isMethodExist, getVolumeApiController, } from '../utils.js';
+import { _getCoinAddresses, _getBalances, _prepareAddresses, _ensureAllowance, _getUsdRate, hasAllowance, ensureAllowance, ensureAllowanceEstimateGas, BN, toBN, toStringFromBN, parseUnits, getEthIndex, fromBN, _cutZeros, _setContracts, _get_small_x, _get_price_impact, checkNumber, _getCrvApyFromApi, _getRewardsFromApi, mulBy1_3, smartNumber, DIGas, _getAddress, findAbiFunction, getVolumeApiController, } from '../utils.js';
 import { curve } from "../curve.js";
 import ERC20Abi from '../constants/abis/ERC20.json' assert { type: 'json' };
 import { GaugePool } from "./gaugePool.js";
@@ -730,8 +730,7 @@ export class PoolTemplate {
                 return [BN(1), toBN(_vp)];
             }
             //for crvusd and stable-ng implementations
-            const isUseStoredRates = isMethodExist(curve.contracts[this.address].contract, 'stored_rates') && this.isPlain;
-            if (isUseStoredRates) {
+            if (findAbiFunction(curve.contracts[this.address].abi, 'stored_rates').length > 0 && this.isPlain) {
                 const _stored_rates = yield curve.contracts[this.address].contract.stored_rates();
                 return _stored_rates.map((_r, i) => toBN(_r, 36 - this.wrappedDecimals[i]));
             }
@@ -873,8 +872,8 @@ export class PoolTemplate {
             return true; // TODO remove this for Kava and ZkSync
         if (this.gauge.address === curve.constants.ZERO_ADDRESS)
             throw Error(`${this.name} doesn't have gauge`);
-        const gaugeContract = curve.contracts[this.gauge.address].contract;
-        return !('inflation_rate()' in gaugeContract || 'inflation_rate(uint256)' in gaugeContract);
+        return !findAbiFunction(curve.contracts[this.gauge.address].abi, 'inflation_rate')
+            .find((func) => ['', 'uint256'].includes(func.inputs.map((a) => `${a.type}`).join(',')));
     }
     statsWrappedBalances() {
         return __awaiter(this, void 0, void 0, function* () {

package/lib/pools/poolConstructor.js

@@ -15,7 +15,7 @@ import { withdrawOneCoinWrappedExpected2argsMixin, withdrawOneCoinWrappedExpecte
 import { withdrawOneCoinWrappedLendingOrCryptoMixin, withdrawOneCoinWrappedMixin } from "./mixins/withdrawOneCoinWrappedMixins.js";
 import { swapTricrypto2Mixin, swapMetaFactoryMixin, swapCryptoMetaFactoryMixin, swapMixin } from "./mixins/swapMixins.js";
 import { swapWrappedExpectedAndApproveMixin, swapWrappedTricrypto2Mixin, swapWrappedMixin, swapWrappedRequiredMixin, } from "./mixins/swapWrappedMixins.js";
-import { getCountArgsOfMethodByContract } from "../utils.js";
+import { getCountArgsOfMethodByAbi, findAbiSignature } from "../utils.js";
 export const getPool = (poolId) => {
     const poolDummy = new PoolTemplate(poolId);
     class Pool extends PoolTemplate {
@@ -55,7 +55,7 @@ export const getPool = (poolId) => {
     else if (poolDummy.zap && poolId !== 'susd') {
         Object.assign(Pool.prototype, depositZapMixin);
     }
-    else if (getCountArgsOfMethodByContract(curve.contracts[poolDummy.address].contract, 'add_liquidity') > 2) {
+    else if (getCountArgsOfMethodByAbi(curve.contracts[poolDummy.address].abi, 'add_liquidity') > 2) {
         Object.assign(Pool.prototype, depositLendingOrCryptoMixin);
     }
     else {
@@ -92,7 +92,7 @@ export const getPool = (poolId) => {
     else if (poolDummy.zap && poolId !== 'susd') {
         Object.assign(Pool.prototype, withdrawZapMixin);
     }
-    else if (getCountArgsOfMethodByContract(curve.contracts[poolDummy.address].contract, 'remove_liquidity') > 2) {
+    else if (getCountArgsOfMethodByAbi(curve.contracts[poolDummy.address].abi, 'remove_liquidity') > 2) {
         Object.assign(Pool.prototype, withdrawLendingOrCryptoMixin);
     }
     else {
@@ -158,7 +158,7 @@ export const getPool = (poolId) => {
     else if (poolDummy.zap) { // including susd
         Object.assign(Pool.prototype, withdrawOneCoinZapMixin);
     }
-    else if (getCountArgsOfMethodByContract(curve.contracts[poolDummy.address].contract, 'remove_liquidity_one_coin') > 3) {
+    else if (getCountArgsOfMethodByAbi(curve.contracts[poolDummy.address].abi, 'remove_liquidity_one_coin') > 3) {
         Object.assign(Pool.prototype, withdrawOneCoinLendingOrCryptoMixin);
     }
     else {
@@ -183,7 +183,7 @@ export const getPool = (poolId) => {
         }
     }
     // swap and swapEstimateGas
-    if ('exchange(uint256,uint256,uint256,uint256,bool)' in curve.contracts[poolDummy.address].contract &&
+    if (findAbiSignature(curve.contracts[poolDummy.address].abi, 'exchange', 'uint256,uint256,uint256,uint256,bool') &&
         !(curve.chainId === 100 && poolDummy.id === "tricrypto")) { // tricrypto2 (eth), tricrypto (arbitrum), avaxcrypto (avalanche); 100 is xDAI
         Object.assign(Pool.prototype, swapTricrypto2Mixin);
     }
@@ -202,7 +202,7 @@ export const getPool = (poolId) => {
     if (!poolDummy.isPlain && !poolDummy.isFake) {
         Object.assign(Pool.prototype, swapWrappedExpectedAndApproveMixin);
         Object.assign(Pool.prototype, swapWrappedRequiredMixin);
-        if ('exchange(uint256,uint256,uint256,uint256,bool)' in curve.contracts[poolDummy.address].contract) { // tricrypto2 (eth), tricrypto (arbitrum)
+        if (findAbiSignature(curve.contracts[poolDummy.address].abi, 'exchange', 'uint256,uint256,uint256,uint256,bool')) { // tricrypto2 (eth), tricrypto (arbitrum)
             Object.assign(Pool.prototype, swapWrappedTricrypto2Mixin);
         }
         else {

package/lib/utils.d.ts

@@ -1,6 +1,5 @@
-import { Contract } from 'ethers';
 import BigNumber from 'bignumber.js';
-import { IBasePoolShortItem, IChainId, IDict, INetworkName, IRewardFromApi, IVolumeAndAPYs, REFERENCE_ASSET } from './interfaces';
+import { Abi, AbiFunction, IBasePoolShortItem, IChainId, IDict, INetworkName, IRewardFromApi, IVolumeAndAPYs, REFERENCE_ASSET } from './interfaces';
 export declare const ETH_ADDRESS = "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee";
 export declare const MAX_ALLOWANCE: bigint;
 export declare const _cutZeros: (strn: string) => string;
@@ -60,8 +59,9 @@ export declare const getCoinsData: (...coins: string[] | string[][]) => Promise<
 }[]>;
 export declare const hasDepositAndStake: () => boolean;
 export declare const hasRouter: () => boolean;
-export declare const getCountArgsOfMethodByContract: (contract: Contract, methodName: string) => number;
-export declare const isMethodExist: (contract: Contract, methodName: string) => boolean;
+export declare const findAbiFunction: (abi: Abi, methodName: string) => AbiFunction[];
+export declare const getCountArgsOfMethodByAbi: (abi: Abi, methodName: string) => number;
+export declare const findAbiSignature: (abi: Abi, methodName: string, signature: string) => AbiFunction | undefined;
 export declare const getPoolName: (name: string) => string;
 export declare const isStableNgPool: (name: string) => boolean;
 export declare const assetTypeNameHandler: (assetTypeName: string) => REFERENCE_ASSET;

package/lib/utils.js

@@ -569,6 +569,7 @@ export const getVolume = (network = curve.chainId) => __awaiter(void 0, void 0,
 });
 export const _setContracts = (address, abi) => {
     curve.contracts[address] = {
+        abi,
         contract: new Contract(address, abi, curve.signer || curve.provider),
         multicallContract: new MulticallContract(address, abi),
     };
@@ -626,16 +627,9 @@ export const getCoinsData = (...coins) => __awaiter(void 0, void 0, void 0, func
 });
 export const hasDepositAndStake = () => curve.constants.ALIASES.deposit_and_stake !== curve.constants.ZERO_ADDRESS;
 export const hasRouter = () => curve.constants.ALIASES.router !== curve.constants.ZERO_ADDRESS;
-export const getCountArgsOfMethodByContract = (contract, methodName) => {
-    const func = contract.interface.fragments.find((item) => item.name === methodName);
-    if (func) {
-        return func.inputs.length;
-    }
-    else {
-        return -1;
-    }
-};
-export const isMethodExist = (contract, methodName) => contract.interface.fragments.find((item) => item.name === methodName) !== undefined;
+export const findAbiFunction = (abi, methodName) => abi.filter((item) => item.type == 'function' && item.name === methodName);
+export const getCountArgsOfMethodByAbi = (abi, methodName) => { var _a, _b; return (_b = (_a = findAbiFunction(abi, methodName)[0]) === null || _a === void 0 ? void 0 : _a.inputs.length) !== null && _b !== void 0 ? _b : -1; };
+export const findAbiSignature = (abi, methodName, signature) => findAbiFunction(abi, methodName).find((func) => func.inputs.map((i) => `${i.type}`).join(',') == signature);
 export const getPoolName = (name) => {
     const separatedName = name.split(": ");
     if (separatedName.length > 1) {
@@ -645,9 +639,7 @@ export const getPoolName = (name) => {
         return separatedName[0].trim();
     }
 };
-export const isStableNgPool = (name) => {
-    return name.includes('factory-stable-ng');
-};
+export const isStableNgPool = (name) => name.includes('factory-stable-ng');
 export const assetTypeNameHandler = (assetTypeName) => {
     if (assetTypeName.toUpperCase() === 'UNKNOWN') {
         return 'OTHER';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@curvefi/api",
-  "version": "2.63.1",
+  "version": "2.63.2",
   "description": "JavaScript library for curve.fi",
   "main": "lib/index.js",
   "author": "Macket",
@@ -14,7 +14,8 @@
     "url": "https://github.com/curvefi/curve-js/issues"
   },
   "scripts": {
-    "build": "rm -rf lib && tsc -p tsconfig.build.json"
+    "build": "rm -rf lib && tsc -p tsconfig.build.json",
+    "lint": "eslint src --ext .ts"
   },
   "type": "module",
   "devDependencies": {