Merge pull request #903 from QuickSwap/dev2

Merge dev to master
QuickSwap · Jul 11, 2023 · 0e3f26a · 0e3f26a
2 parents f887968 + 5ec8502
commit 0e3f26a
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 5 deletions.
diff --git a/src/constants/index.ts b/src/constants/index.ts
@@ -1308,6 +1308,17 @@ export const GammaPairs: {
         pid: 16,
       },
     ],
+    '0x68286607a1d43602d880d349187c3c48c0fd05e6-0xa8ce8aee21bc2a48a5ef670afcc9274c7bbbc035': [
+      {
+        type: Presets.GAMMA_WIDE,
+        title: 'Wide',
+        address: '0x317a0d8d2a247004370fe4fb9362b2b256d890c0',
+        token0Address: '0x68286607a1d43602d880d349187c3c48c0fd05e6',
+        token1Address: '0xa8ce8aee21bc2a48a5ef670afcc9274c7bbbc035',
+        ableToFarm: true,
+        pid: 17,
+      },
+    ],
   },
 };
 
@@ -1439,6 +1450,7 @@ export const GlobalData = {
       USDC[ChainId.ZKEVM],
       DAI[ChainId.ZKEVM],
       USDT[ChainId.ZKEVM],
+      FRAX[ChainId.ZKEVM],
     ],
     [ChainId.ZKTESTNET]: [],
   },

diff --git a/src/constants/v3/addresses.ts b/src/constants/v3/addresses.ts
@@ -600,6 +600,13 @@ export const FRAX: { [chainId: number]: Token } = {
     'FRAX',
     'FRAX',
   ),
+  [ChainId.ZKEVM]: new Token(
+    ChainId.ZKEVM,
+    '0xFf8544feD5379D9ffa8D47a74cE6b91e632AC44D',
+    18,
+    'FRAX',
+    'FRAX',
+  ),
 };
 
 export const GHST: { [chainId: number]: Token } = {

diff --git a/src/lib/src/pool.ts b/src/lib/src/pool.ts
@@ -10,7 +10,6 @@ import { Tick, TickConstructorArgs } from './tick';
 import { NoTickDataProvider, TickDataProvider } from './tickDataProvider';
 import { TickListDataProvider } from './tickListDataProvider';
 import { POOL_DEPLOYER_ADDRESS } from 'constants/v3/addresses';
-import { ChainId } from '@uniswap/sdk';
 import { computePoolAddress } from 'hooks/v3/computePoolAddress';
 
 interface StepComputations {
@@ -138,7 +137,7 @@ export class Pool {
     initCodeHashManualOverride?: string,
   ): string {
     return computePoolAddress({
-      poolDeployer: POOL_DEPLOYER_ADDRESS[ChainId.MATIC],
+      poolDeployer: POOL_DEPLOYER_ADDRESS[tokenA.chainId],
       tokenA,
       tokenB,
       initCodeHashManualOverride,

diff --git a/src/state/mint/v3/hooks.ts b/src/state/mint/v3/hooks.ts
@@ -6,7 +6,6 @@ import {
   Price,
   Rounding,
   Token,
-  NativeCurrency,
 } from '@uniswap/sdk-core';
 import { useActiveWeb3React } from 'hooks';
 import { AppState } from '../../index';
@@ -634,7 +633,7 @@ export function useV3DerivedMintInfo(
       };
     }
     return;
-  }, [currencyB, depositAmountsData]);
+  }, [currencyA, currencyB, depositAmountsData, independentField]);
 
   const dependentAmount: CurrencyAmount<Currency> | undefined = useMemo(() => {
     const dependentCurrency =
@@ -720,7 +719,6 @@ export function useV3DerivedMintInfo(
     poolForPosition,
     presetRange,
     depositAmount,
-    independentField,
     outOfRange,
     invalidRange,
   ]);