(clean-up) factory address added

package.json

@@ -64,7 +64,7 @@
     "@uniswap/sdk": "3.0.2",
     "@uniswap/sdk-core": "^3.0.0",
     "@uniswap/smart-order-router": "^3.28.7",
-    "@uniswap/v3-core": "^1.0.0",
+    "@uniswap/v3-core": "^1.0.1",
     "@uniswap/v3-periphery": "^1.1.1",
     "@uniswap/v3-sdk": "^3.7.0",
     "abi-decoder": "^2.4.0",

src/connectors/uniswap/uniswap.lp.helper.ts

@@ -23,6 +23,7 @@ import { getAddress } from 'ethers/lib/utils';
 export class UniswapLPHelper {
   protected ethereum: Ethereum;
   protected chainId;
+  private _factory: string;
   private _router: string;
   private _nftManager: string;
   private _ttl: number;
@@ -43,6 +44,7 @@ export class UniswapLPHelper {
       chainId: this.chainId,
       provider: this.ethereum.provider,
     });
+    this._factory = UniswapConfig.config.uniswapV3FactoryAddress(network);
     this._router =
       UniswapConfig.config.uniswapV3SmartOrderRouterAddress(network);
     this._nftManager = UniswapConfig.config.uniswapV3NftManagerAddress(network);
@@ -221,7 +223,7 @@ export class UniswapLPHelper {
     const prices = [];
     const fee = uniV3.FeeAmount[tier as keyof typeof uniV3.FeeAmount];
     const poolContract = new Contract(
-      uniV3.Pool.getAddress(token0, token1, fee),
+      uniV3.Pool.getAddress(token0, token1, fee, undefined, this._factory),
       this.poolAbi,
       this.ethereum.provider
     );
@@ -311,7 +313,7 @@ export class UniswapLPHelper {
     const lowerPriceInFraction = math.fraction(lowerPrice) as math.Fraction;
     const upperPriceInFraction = math.fraction(upperPrice) as math.Fraction;
     const poolData = await this.getPoolState(
-      uniV3.Pool.getAddress(token0, token1, fee),
+      uniV3.Pool.getAddress(token0, token1, fee, undefined, this._factory),
       fee
     );
     const pool = new uniV3.Pool(
@@ -392,13 +394,14 @@ export class UniswapLPHelper {
     const positionData = await this.getRawPosition(wallet, tokenId);
     const token0 = this.getTokenByAddress(positionData.token0);
     const token1 = this.getTokenByAddress(positionData.token1);
+    const factoryAddress = this._factory
     const fee = positionData.fee;
     if (!token0 || !token1) {
       throw new Error(
         `One of the tokens in this position isn't recognized. $token0: ${token0}, $token1: ${token1}`
       );
     }
-    const poolAddress = uniV3.Pool.getAddress(token0, token1, fee);
+    const poolAddress = uniV3.Pool.getAddress(token0, token1, fee, undefined, factoryAddress);
     const poolData = await this.getPoolState(poolAddress, fee);
     const position = new uniV3.Position({
       pool: new uniV3.Pool(

test-helpers/curl/requests/eth_uniswap_add_liquidity.json

@@ -1,13 +1,13 @@
 {
-  "address": "$ETH_ADDRESS",
-  "token0": "COIN1",
-  "token1": "COIN3",
+  "address": "0x0a0CdC90CC16A0f3E67c296c8C0f7207cbdC0F4E",
+  "token0": "WAVAX",
+  "token1": "USDT",
   "amount0": "1",
   "amount1": "1",
   "fee": "LOW",
-  "lowerPrice": "1",
-  "upperPrice": "5",
-  "chain": "ethereum",
-  "network": "goerli",
+  "lowerPrice": "0.028842772",
+  "upperPrice": "0.028851772",
+  "chain": "avalanche",
+  "network": "avalanche",
   "connector": "uniswapLP"
 }

test-helpers/curl/requests/eth_uniswap_pool_price.json

@@ -1,10 +1,10 @@
 {
-  "token0": "COIN1",
-  "token1": "COIN3",
+  "token0": "WAVAX",
+  "token1": "USDT",
   "fee": "LOW",
   "period": 120,
   "interval": 60,
-  "chain": "ethereum",
-  "network": "goerli",
+  "chain": "avalanche",
+  "network": "avalanche",
   "connector": "uniswapLP"
 }

test-helpers/curl/requests/price_uniswap.json

@@ -1,9 +1,9 @@
 {
   "connector": "uniswap",
-  "chain": "ethereum",
-  "network": "goerli",
-  "quote": "WETH",
-  "base": "DAI",
+  "chain": "avalanche",
+  "network": "avalanche",
+  "quote": "WAVAX",
+  "base": "USDT",
   "amount": "1",
   "side": "BUY"
 }