@curvefi/api 2.70.2 → 2.70.4

package/lib/pools/PoolTemplate.js

@@ -1760,13 +1760,13 @@ export class PoolTemplate extends CorePool {
             const contractAddress = this.isCrypto && this.isMeta ? this.zap : this.address;
             const contract = this.curve.contracts[contractAddress].contract;
             if ('get_dy_underlying' in contract) {
-                return yield contract.get_dy_underlying(i, j, _amount, this.curve.constantOptions);
+                return yield contract.get_dy_underlying(i, j, _amount);
             }
             else {
                 if ('get_dy(address,uint256,uint256,uint256)' in contract) { // atricrypto3 based metapools
-                    return yield contract.get_dy(this.address, i, j, _amount, this.curve.constantOptions);
+                    return yield contract.get_dy(this.address, i, j, _amount);
                 }
-                return yield contract.get_dy(i, j, _amount, this.curve.constantOptions);
+                return yield contract.get_dy(i, j, _amount);
             }
         });
     }
@@ -1793,21 +1793,21 @@ export class PoolTemplate extends CorePool {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.isCrypto) {
                 if (this.isNg)
-                    return yield this.curve.contracts[this.address].contract.get_dx(i, j, _amount, this.curve.constantOptions);
+                    return yield this.curve.contracts[this.address].contract.get_dx(i, j, _amount);
                 const contract = this.curve.contracts[this.curve.constants.ALIASES.crypto_calc].contract;
                 if (this.isMeta && isUnderlying) {
                     const basePool = new PoolTemplate(this.basePool, this.curve);
                     if (this.wrappedCoins.length === 3) {
-                        return yield contract.get_dx_tricrypto_meta_underlying(this.address, i, j, _amount, this.wrappedCoins.length, basePool.address, basePool.lpToken, this.curve.constantOptions);
+                        return yield contract.get_dx_tricrypto_meta_underlying(this.address, i, j, _amount, this.wrappedCoins.length, basePool.address, basePool.lpToken);
                     }
                     if (basePool.isFake) {
                         const secondPool = new PoolTemplate(basePool.basePool, this.curve);
-                        return yield contract.get_dx_double_meta_underlying(this.address, i, j, _amount, basePool.address, basePool.zap, secondPool.address, secondPool.lpToken, this.curve.constantOptions);
+                        return yield contract.get_dx_double_meta_underlying(this.address, i, j, _amount, basePool.address, basePool.zap, secondPool.address, secondPool.lpToken);
                     }
-                    return yield contract.get_dx_meta_underlying(this.address, i, j, _amount, this.underlyingCoins.length, basePool.address, basePool.lpToken, this.curve.constantOptions);
+                    return yield contract.get_dx_meta_underlying(this.address, i, j, _amount, this.underlyingCoins.length, basePool.address, basePool.lpToken);
                 }
                 else {
-                    return yield contract.get_dx(this.address, i, j, _amount, this.wrappedCoins.length, this.curve.constantOptions);
+                    return yield contract.get_dx(this.address, i, j, _amount, this.wrappedCoins.length);
                 }
             }
             else {
@@ -1815,32 +1815,32 @@ export class PoolTemplate extends CorePool {
                     const contract = this.curve.contracts[this.address].contract;
                     if (this.isMeta) {
                         if (isUnderlying) {
-                            return yield contract.get_dx_underlying(i, j, _amount, this.curve.constantOptions);
+                            return yield contract.get_dx_underlying(i, j, _amount);
                         }
                         else {
-                            return yield contract.get_dx(i, j, _amount, this.curve.constantOptions);
+                            return yield contract.get_dx(i, j, _amount);
                         }
                     }
                     else {
-                        return yield contract.get_dx(i, j, _amount, this.curve.constantOptions);
+                        return yield contract.get_dx(i, j, _amount);
                     }
                 }
                 const contract = this.curve.contracts[this.curve.constants.ALIASES.stable_calc].contract;
                 if (this.isMeta) {
                     const basePool = new PoolTemplate(this.basePool, this.curve);
                     if (isUnderlying) {
-                        return yield contract.get_dx_meta_underlying(this.address, i, j, _amount, this.underlyingCoins.length, basePool.address, basePool.lpToken, this.curve.constantOptions);
+                        return yield contract.get_dx_meta_underlying(this.address, i, j, _amount, this.underlyingCoins.length, basePool.address, basePool.lpToken);
                     }
                     else {
-                        return yield contract.get_dx_meta(this.address, i, j, _amount, this.wrappedCoins.length, basePool.address, this.curve.constantOptions);
+                        return yield contract.get_dx_meta(this.address, i, j, _amount, this.wrappedCoins.length, basePool.address);
                     }
                 }
                 else {
                     if (isUnderlying && this.isLending) {
-                        return yield contract.get_dx_underlying(this.address, i, j, _amount, this.underlyingCoins.length, this.curve.constantOptions);
+                        return yield contract.get_dx_underlying(this.address, i, j, _amount, this.underlyingCoins.length);
                     }
                     else {
-                        return yield contract.get_dx(this.address, i, j, _amount, this.wrappedCoins.length, this.curve.constantOptions);
+                        return yield contract.get_dx(this.address, i, j, _amount, this.wrappedCoins.length);
                     }
                 }
             }

package/lib/utils.d.ts

@@ -6,14 +6,14 @@ import { Curve } from "./curve.js";
 export declare const ETH_ADDRESS = "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee";
 export declare const MAX_ALLOWANCE: bigint;
 export declare const abiInfoBuild: (address: string, method: string, abi: any) => IMethodInfo;
-export declare const _cutZeros: (strn: string) => string;
 export declare const checkNumber: (n: number | string) => number | string;
-export declare const formatNumber: (n: number | string, decimals?: number) => string;
-export declare function parseUnits(n: number | string, decimals?: number): bigint;
 export declare const BN: (val: number | string) => BigNumber;
 export declare const toBN: (n: bigint, decimals?: number) => BigNumber;
 export declare const toStringFromBN: (bn: BigNumber, decimals?: number) => string;
 export declare const fromBN: (bn: BigNumber, decimals?: number) => bigint;
+export declare const _cutZeros: (strn: string) => string;
+export declare const formatNumber: (n: number | string, decimals?: number) => string;
+export declare function parseUnits(n: number | string, decimals?: number): bigint;
 export declare const mulBy1_3: (n: bigint) => bigint;
 export declare const smartNumber: (abstractNumber: bigint | bigint[]) => number | number[];
 export declare const DIGas: (gas: bigint | Array<bigint>) => bigint;

package/lib/utils.js

@@ -28,25 +28,12 @@ export const abiInfoBuild = (address, method, abi) => ({
     method,
     abi,
 });
-// Formatting numbers
-export const _cutZeros = (strn) => {
-    return strn.replace(/(\.\d*[1-9])0+$/gi, '$1').replace(/\.0+$/gi, '');
-};
+// bignumber.js
 export const checkNumber = (n) => {
     if (Number(n) !== Number(n))
         throw Error(`${n} is not a number`); // NaN
     return n;
 };
-export const formatNumber = (n, decimals = 18) => {
-    if (Number(n) !== Number(n))
-        throw Error(`${n} is not a number`); // NaN
-    const [integer, fractional] = String(n).split(".");
-    return !fractional ? integer : integer + "." + fractional.slice(0, decimals);
-};
-export function parseUnits(n, decimals = 18) {
-    return ethers.parseUnits(formatNumber(n, decimals), decimals);
-}
-// bignumber.js
 export const BN = (val) => new BigNumber(checkNumber(val));
 export const toBN = (n, decimals = 18) => {
     return BN(formatUnits(n, decimals));
@@ -57,6 +44,14 @@ export const toStringFromBN = (bn, decimals = 18) => {
 export const fromBN = (bn, decimals = 18) => {
     return parseUnits(toStringFromBN(bn, decimals), decimals);
 };
+// Formatting numbers
+export const _cutZeros = (strn) => {
+    return strn.replace(/(\.\d*[1-9])0+$/gi, '$1').replace(/\.0+$/gi, '');
+};
+export const formatNumber = (n, decimals = 18) => BN(n).toFixed(decimals, BigNumber.ROUND_DOWN);
+export function parseUnits(n, decimals = 18) {
+    return ethers.parseUnits(formatNumber(n, decimals), decimals);
+}
 // -------------------
 export const mulBy1_3 = (n) => n * parseUnits("130", 0) / parseUnits("100", 0);
 export const smartNumber = (abstractNumber) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@curvefi/api",
-  "version": "2.70.2",
+  "version": "2.70.4",
   "description": "JavaScript library for curve.finance",
   "main": "lib/index.js",
   "author": "Macket",