Merge pull request #284 from balancer-labs/develop

4.0.1-beta.3
balancer · Aug 23, 2022 · e15d6d4 · e15d6d4
2 parents 10a4027 + 3721c27
commit e15d6d4
Show file tree

Hide file tree

Showing 27 changed files with 358 additions and 316 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@balancer-labs/sor",
-    "version": "4.0.1-beta.2",
+    "version": "4.0.1-beta.3",
     "license": "GPL-3.0-only",
     "main": "dist/index.js",
     "module": "dist/index.esm.js",

diff --git a/src/index.ts b/src/index.ts
@@ -19,3 +19,4 @@ export { LinearPool } from './pools/linearPool/linearPool';
 export { getSpotPriceAfterSwapForPath } from './router/helpersClass';
 export * as WeightedMaths from './pools/weightedPool/weightedMath';
 export * as StableMaths from './pools/stablePool/stableMath';
+export * as StableMathBigInt from './pools/stablePool/stableMathBigInt';
diff --git a/src/poolCacher.ts b/src/poolCacher.ts
@@ -28,7 +28,7 @@ export class PoolCacher {
             // On error clear all caches and return false so user knows to try again.
             this._finishedFetching = false;
             this.pools = [];
-            console.error(`Error: fetchPools(): ${err.message}`);
+            console.error(`Error: fetchPools(): ${err}`);
             return false;
         }
     }

diff --git a/src/pools/gyro2Pool/gyro2Pool.ts b/src/pools/gyro2Pool/gyro2Pool.ts
@@ -198,148 +198,164 @@ export class Gyro2Pool implements PoolBase {
         poolPairData: Gyro2PoolPairData,
         amount: OldBigNumber
     ): OldBigNumber {
-        const balances = [poolPairData.balanceIn, poolPairData.balanceOut];
-        const normalizedBalances = _normalizeBalances(
-            balances,
-            poolPairData.decimalsIn,
-            poolPairData.decimalsOut
-        );
-        const invariant = _calculateInvariant(
-            normalizedBalances,
-            poolPairData.sqrtAlpha,
-            poolPairData.sqrtBeta
-        );
-        const [virtualParamIn, virtualParamOut] = _findVirtualParams(
-            invariant,
-            poolPairData.sqrtAlpha,
-            poolPairData.sqrtBeta
-        );
-        const inAmount = parseFixed(amount.toString(), 18);
-        const inAmountLessFee = _reduceFee(inAmount, poolPairData.swapFee);
+        try {
+            const balances = [poolPairData.balanceIn, poolPairData.balanceOut];
+            const normalizedBalances = _normalizeBalances(
+                balances,
+                poolPairData.decimalsIn,
+                poolPairData.decimalsOut
+            );
+            const invariant = _calculateInvariant(
+                normalizedBalances,
+                poolPairData.sqrtAlpha,
+                poolPairData.sqrtBeta
+            );
+            const [virtualParamIn, virtualParamOut] = _findVirtualParams(
+                invariant,
+                poolPairData.sqrtAlpha,
+                poolPairData.sqrtBeta
+            );
+            const inAmount = parseFixed(amount.toString(), 18);
+            const inAmountLessFee = _reduceFee(inAmount, poolPairData.swapFee);
 
-        const outAmount = _calcOutGivenIn(
-            normalizedBalances[0],
-            normalizedBalances[1],
-            inAmountLessFee,
-            virtualParamIn,
-            virtualParamOut
-        );
+            const outAmount = _calcOutGivenIn(
+                normalizedBalances[0],
+                normalizedBalances[1],
+                inAmountLessFee,
+                virtualParamIn,
+                virtualParamOut
+            );
 
-        return bnum(formatFixed(outAmount, 18));
+            return bnum(formatFixed(outAmount, 18));
+        } catch (error) {
+            return bnum(0);
+        }
     }
 
     _tokenInForExactTokenOut(
         poolPairData: Gyro2PoolPairData,
         amount: OldBigNumber
     ): OldBigNumber {
-        const outAmount = parseFixed(amount.toString(), 18);
-        const balances = [poolPairData.balanceIn, poolPairData.balanceOut];
-        const normalizedBalances = _normalizeBalances(
-            balances,
-            poolPairData.decimalsIn,
-            poolPairData.decimalsOut
-        );
-        const invariant = _calculateInvariant(
-            normalizedBalances,
-            poolPairData.sqrtAlpha,
-            poolPairData.sqrtBeta
-        );
-        const [virtualParamIn, virtualParamOut] = _findVirtualParams(
-            invariant,
-            poolPairData.sqrtAlpha,
-            poolPairData.sqrtBeta
-        );
-        const inAmountLessFee = _calcInGivenOut(
-            normalizedBalances[0],
-            normalizedBalances[1],
-            outAmount,
-            virtualParamIn,
-            virtualParamOut
-        );
-        const inAmount = _addFee(inAmountLessFee, poolPairData.swapFee);
+        try {
+            const outAmount = parseFixed(amount.toString(), 18);
+            const balances = [poolPairData.balanceIn, poolPairData.balanceOut];
+            const normalizedBalances = _normalizeBalances(
+                balances,
+                poolPairData.decimalsIn,
+                poolPairData.decimalsOut
+            );
+            const invariant = _calculateInvariant(
+                normalizedBalances,
+                poolPairData.sqrtAlpha,
+                poolPairData.sqrtBeta
+            );
+            const [virtualParamIn, virtualParamOut] = _findVirtualParams(
+                invariant,
+                poolPairData.sqrtAlpha,
+                poolPairData.sqrtBeta
+            );
+            const inAmountLessFee = _calcInGivenOut(
+                normalizedBalances[0],
+                normalizedBalances[1],
+                outAmount,
+                virtualParamIn,
+                virtualParamOut
+            );
+            const inAmount = _addFee(inAmountLessFee, poolPairData.swapFee);
 
-        return bnum(formatFixed(inAmount, 18));
+            return bnum(formatFixed(inAmount, 18));
+        } catch (error) {
+            return bnum(0);
+        }
     }
 
     _spotPriceAfterSwapExactTokenInForTokenOut(
         poolPairData: Gyro2PoolPairData,
         amount: OldBigNumber
     ): OldBigNumber {
-        const balances = [poolPairData.balanceIn, poolPairData.balanceOut];
-        const normalizedBalances = _normalizeBalances(
-            balances,
-            poolPairData.decimalsIn,
-            poolPairData.decimalsOut
-        );
-        const invariant = _calculateInvariant(
-            normalizedBalances,
-            poolPairData.sqrtAlpha,
-            poolPairData.sqrtBeta
-        );
-        const [virtualParamIn, virtualParamOut] = _findVirtualParams(
-            invariant,
-            poolPairData.sqrtAlpha,
-            poolPairData.sqrtBeta
-        );
-        const inAmount = parseFixed(amount.toString(), 18);
-        const inAmountLessFee = _reduceFee(inAmount, poolPairData.swapFee);
-        const outAmount = _calcOutGivenIn(
-            normalizedBalances[0],
-            normalizedBalances[1],
-            inAmountLessFee,
-            virtualParamIn,
-            virtualParamOut
-        );
-        const newSpotPrice = _calculateNewSpotPrice(
-            normalizedBalances,
-            inAmount,
-            outAmount,
-            virtualParamIn,
-            virtualParamOut,
-            poolPairData.swapFee
-        );
-        return bnum(formatFixed(newSpotPrice, 18));
+        try {
+            const balances = [poolPairData.balanceIn, poolPairData.balanceOut];
+            const normalizedBalances = _normalizeBalances(
+                balances,
+                poolPairData.decimalsIn,
+                poolPairData.decimalsOut
+            );
+            const invariant = _calculateInvariant(
+                normalizedBalances,
+                poolPairData.sqrtAlpha,
+                poolPairData.sqrtBeta
+            );
+            const [virtualParamIn, virtualParamOut] = _findVirtualParams(
+                invariant,
+                poolPairData.sqrtAlpha,
+                poolPairData.sqrtBeta
+            );
+            const inAmount = parseFixed(amount.toString(), 18);
+            const inAmountLessFee = _reduceFee(inAmount, poolPairData.swapFee);
+            const outAmount = _calcOutGivenIn(
+                normalizedBalances[0],
+                normalizedBalances[1],
+                inAmountLessFee,
+                virtualParamIn,
+                virtualParamOut
+            );
+            const newSpotPrice = _calculateNewSpotPrice(
+                normalizedBalances,
+                inAmount,
+                outAmount,
+                virtualParamIn,
+                virtualParamOut,
+                poolPairData.swapFee
+            );
+            return bnum(formatFixed(newSpotPrice, 18));
+        } catch (error) {
+            return bnum(0);
+        }
     }
 
     _spotPriceAfterSwapTokenInForExactTokenOut(
         poolPairData: Gyro2PoolPairData,
         amount: OldBigNumber
     ): OldBigNumber {
-        const outAmount = parseFixed(amount.toString(), 18);
-        const balances = [poolPairData.balanceIn, poolPairData.balanceOut];
-        const normalizedBalances = _normalizeBalances(
-            balances,
-            poolPairData.decimalsIn,
-            poolPairData.decimalsOut
-        );
-        const invariant = _calculateInvariant(
-            normalizedBalances,
-            poolPairData.sqrtAlpha,
-            poolPairData.sqrtBeta
-        );
-        const [virtualParamIn, virtualParamOut] = _findVirtualParams(
-            invariant,
-            poolPairData.sqrtAlpha,
-            poolPairData.sqrtBeta
-        );
-        const inAmountLessFee = _calcInGivenOut(
-            normalizedBalances[0],
-            normalizedBalances[1],
-            outAmount,
-            virtualParamIn,
-            virtualParamOut
-        );
-        const inAmount = _addFee(inAmountLessFee, poolPairData.swapFee);
-        const newSpotPrice = _calculateNewSpotPrice(
-            normalizedBalances,
-            inAmount,
-            outAmount,
-            virtualParamIn,
-            virtualParamOut,
-            poolPairData.swapFee
-        );
+        try {
+            const outAmount = parseFixed(amount.toString(), 18);
+            const balances = [poolPairData.balanceIn, poolPairData.balanceOut];
+            const normalizedBalances = _normalizeBalances(
+                balances,
+                poolPairData.decimalsIn,
+                poolPairData.decimalsOut
+            );
+            const invariant = _calculateInvariant(
+                normalizedBalances,
+                poolPairData.sqrtAlpha,
+                poolPairData.sqrtBeta
+            );
+            const [virtualParamIn, virtualParamOut] = _findVirtualParams(
+                invariant,
+                poolPairData.sqrtAlpha,
+                poolPairData.sqrtBeta
+            );
+            const inAmountLessFee = _calcInGivenOut(
+                normalizedBalances[0],
+                normalizedBalances[1],
+                outAmount,
+                virtualParamIn,
+                virtualParamOut
+            );
+            const inAmount = _addFee(inAmountLessFee, poolPairData.swapFee);
+            const newSpotPrice = _calculateNewSpotPrice(
+                normalizedBalances,
+                inAmount,
+                outAmount,
+                virtualParamIn,
+                virtualParamOut,
+                poolPairData.swapFee
+            );
 
-        return bnum(formatFixed(newSpotPrice, 18));
+            return bnum(formatFixed(newSpotPrice, 18));
+        } catch (error) {
+            return bnum(0);
+        }
     }
 
     _derivativeSpotPriceAfterSwapExactTokenInForTokenOut(