From 5fd35c511b8d49fe80ad966a5aa63a6da2f8ce19 Mon Sep 17 00:00:00 2001 From: totop716 Date: Sun, 9 Jul 2023 10:52:26 -0400 Subject: [PATCH 1/2] fix deposit on the farm --- src/constants/index.ts | 1 + src/constants/v3/addresses.ts | 7 +++++++ src/lib/src/pool.ts | 3 +-- src/state/mint/v3/hooks.ts | 4 +--- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/constants/index.ts b/src/constants/index.ts index b18f92e4b..296e7bdea 100755 --- a/src/constants/index.ts +++ b/src/constants/index.ts @@ -1439,6 +1439,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 index 68afe58e6..5d4ae9eab 100644 --- 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 index a29ec465b..4cf3cbc36 100644 --- 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 index 026863cf1..b791d1d51 100644 --- 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 | undefined = useMemo(() => { const dependentCurrency = @@ -720,7 +719,6 @@ export function useV3DerivedMintInfo( poolForPosition, presetRange, depositAmount, - independentField, outOfRange, invalidRange, ]); From 198f597b17122a119c7176ad0f5bda02d9397272 Mon Sep 17 00:00:00 2001 From: totop716 Date: Mon, 10 Jul 2023 20:51:58 -0400 Subject: [PATCH 2/2] add new gamma pair in zkevm --- src/constants/index.ts | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/constants/index.ts b/src/constants/index.ts index 296e7bdea..58664cf23 100755 --- 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, + }, + ], }, };