Merge pull request #378 from balancer/develop

Release 4.1.1-beta.7
balancer · Mar 24, 2023 · 2eedb66 · 2eedb66
2 parents c1432fd + 86c5706
commit 2eedb66
Show file tree

Hide file tree

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

diff --git a/src/frontendHelpers/phantomStableHelpers.ts b/src/frontendHelpers/phantomStableHelpers.ts
diff --git a/src/frontendHelpers/queryBatchSwapHelpers.ts b/src/frontendHelpers/queryBatchSwapHelpers.ts
diff --git a/src/index.ts b/src/index.ts
@@ -1,11 +1,6 @@
 export { SOR } from './wrapper';
 export { BPTForTokensZeroPriceImpact as weightedBPTForTokensZeroPriceImpact } from './frontendHelpers/weightedHelpers';
 export { BPTForTokensZeroPriceImpact as stableBPTForTokensZeroPriceImpact } from './frontendHelpers/stableHelpers';
-export { BPTForTokensZeroPriceImpact as phantomStableBPTForTokensZeroPriceImpact } from './frontendHelpers/phantomStableHelpers';
-export {
-    queryBatchSwapTokensIn,
-    queryBatchSwapTokensOut,
-} from './frontendHelpers/queryBatchSwapHelpers';
 export * from './types';
 export { formatSequence, getTokenAddressesForSwap } from './formatSwaps';
 export { RouteProposer } from './routeProposal';

diff --git a/src/pools/index.ts b/src/pools/index.ts
@@ -8,6 +8,7 @@ import { ComposableStablePool } from './composableStable/composableStablePool';
 import { Gyro2Pool } from './gyro2Pool/gyro2Pool';
 import { Gyro3Pool } from './gyro3Pool/gyro3Pool';
 import { GyroEPool } from './gyroEPool/gyroEPool';
+import { FxPool } from './xaveFxPool/fxPool';
 import {
     BigNumber as OldBigNumber,
     INFINITY,
@@ -36,6 +37,7 @@ export function parseNewPool(
     | Gyro2Pool
     | Gyro3Pool
     | GyroEPool
+    | FxPool
     | undefined {
     // We're not interested in any pools which don't allow swapping
     if (!pool.swapEnabled) return undefined;
@@ -50,7 +52,8 @@ export function parseNewPool(
         | ComposableStablePool
         | Gyro2Pool
         | Gyro3Pool
-        | GyroEPool;
+        | GyroEPool
+        | FxPool;
 
     try {
         if (pool.poolType === 'Weighted' || pool.poolType === 'Investment') {
@@ -73,6 +76,7 @@ export function parseNewPool(
         else if (pool.poolType === 'Gyro2') newPool = Gyro2Pool.fromPool(pool);
         else if (pool.poolType === 'Gyro3') newPool = Gyro3Pool.fromPool(pool);
         else if (pool.poolType === 'GyroE') newPool = GyroEPool.fromPool(pool);
+        else if (pool.poolType === 'FX') newPool = FxPool.fromPool(pool);
         else {
             console.error(
                 `Unknown pool type or type field missing: ${pool.poolType} ${pool.id}`