Merge branch 'balancer-v3' into feat/back-1700-1746

paraswap · Dec 11, 2024 · 71f3ee4 · 71f3ee4
2 parents 11d448d + 268b19e
commit 71f3ee4
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -52,12 +52,12 @@
   },
   "dependencies": {
     "@0x/utils": "^4.5.2",
-    "@balancer-labs/balancer-maths": "^0.0.19",
     "@balancer-labs/sor": "4.1.1-beta.4",
     "@bgd-labs/aave-address-book": "2.21.1",
     "@ethersproject/abi": "^5.7.0",
     "@hashflow/sdk": "^2.2.7",
     "@hashflow/taker-js": "^0.3.7",
+    "@paraswap/balancer-maths": "0.0.1",
     "@paraswap/core": "2.4.0",
     "@types/ws": "^8.5.12",
     "async": "^3.2.4",

diff --git a/src/dex/balancer-v3/balancer-v3-pool.ts b/src/dex/balancer-v3/balancer-v3-pool.ts
@@ -16,7 +16,7 @@ import { getPoolsApi } from './getPoolsApi';
 import vaultExtensionAbi_V3 from '../../abi/balancer-v3/vault-extension.json';
 import { decodeThrowError, getOnChainState } from './getOnChainState';
 import { BalancerV3Config } from './config';
-import { SwapKind, Vault } from '@balancer-labs/balancer-maths';
+import { SwapKind, Vault } from '@paraswap/balancer-maths';
 import {
   ampUpdateStartedEvent,
   ampUpdateStoppedEvent,

diff --git a/src/dex/balancer-v3/balancer-v3.ts b/src/dex/balancer-v3/balancer-v3.ts
@@ -19,7 +19,8 @@ import { SimpleExchange } from '../simple-exchange';
 import { BalancerV3Config } from './config';
 import { BalancerV3EventPool } from './balancer-v3-pool';
 import { NumberAsString } from '@paraswap/core';
-import { SwapKind } from '@balancer-labs/balancer-maths';
+// TODO: replace @paraswap/balancer-maths to @balancer-labs/balancer-maths after node migration
+import { SwapKind } from '@paraswap/balancer-maths';
 import { Interface } from '@ethersproject/abi';
 import { extractReturnAmountPosition } from '../../executor/utils';
 import { getTopPoolsApi } from './getTopPoolsApi';

diff --git a/src/dex/balancer-v3/stablePool.ts b/src/dex/balancer-v3/stablePool.ts
@@ -1,5 +1,5 @@
 import { defaultAbiCoder } from '@ethersproject/abi';
-import { PoolState } from '@balancer-labs/balancer-maths';
+import { PoolState } from '@paraswap/balancer-maths';
 import { StableMutableState } from './types';
 
 // TODO - Update with more accurate

diff --git a/src/dex/balancer-v3/types.ts b/src/dex/balancer-v3/types.ts
@@ -1,4 +1,4 @@
-import { BufferState } from '@balancer-labs/balancer-maths';
+import { BufferState } from '@paraswap/balancer-maths';
 import { Address } from '../../types';
 
 // Immutable data types available on all pools (Available from API)

diff --git a/yarn.lock b/yarn.lock
@@ -348,11 +348,6 @@
     "@babel/helper-validator-identifier" "^7.22.20"
     to-fast-properties "^2.0.0"
 
-"@balancer-labs/balancer-maths@^0.0.19":
-  version "0.0.19"
-  resolved "https://registry.yarnpkg.com/@balancer-labs/balancer-maths/-/balancer-maths-0.0.19.tgz#d3b92c4b17caca67894806bd7768af1ea31cb956"
-  integrity sha512-x8t17q8fbXYZJSaidr4BWBg3O9jVnF6xoAsoMWWyUd6AnaxPyFnxAGs76+iQln4WEmC7S5G5uufWJ0OefvcqXQ==
-
 "@balancer-labs/[email protected]":
   version "4.1.1-beta.4"
   resolved "https://registry.yarnpkg.com/@balancer-labs/sor/-/sor-4.1.1-beta.4.tgz#9369435f8bbc781e9048f33aa496a484631b56e9"
@@ -1219,6 +1214,11 @@
   resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.9.5.tgz#1eed23d4844c861a1835b5d33507c1017fa98de8"
   integrity sha512-ZK+W5mVhRppff9BE6YdR8CC52C8zAvsVAiWhEtQ5+oNxFE6h1WdeWo+FJSF8KKvtxxVYZ7MTP/5KoVpAU3aSWg==
 
+"@paraswap/[email protected]":
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/@paraswap/balancer-maths/-/balancer-maths-0.0.1.tgz#592c07db9c65f1b08fbd12461ed60395962c166e"
+  integrity sha512-cjflViyZTo2p0OnDqnBCKPTdTXP0Cah/6kORseNVNxOnkno8pcaCrcZC3yVTJ7ofe9lGDCAZV5/IvS+OSzDIHg==
+
 "@paraswap/[email protected]":
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/@paraswap/core/-/core-2.2.0.tgz#848175c7729f1064e715019269b1c193a23a5be8"