Auto claim reward farm v2 (#2271)

* feat(farmv2): integrate new farm v2 contract auto claim reward when removing liq * feat: hanlde collect fee on my earning page * change env to adpr * fix: CR-624 * fix: isssue * Update pr.yaml
KyberNetwork · Oct 11, 2023 · 97bef35 · 97bef35
1 parent 5c35bd5
commit 97bef35
Show file tree

Hide file tree

Showing 15 changed files with 1,620 additions and 62 deletions.
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -114,7 +114,7 @@ jobs:
           VITE_TAG: ${{ needs.prepare.outputs.image_tag }}
           CURRENT_BRANCH: ${{ needs.prepare.outputs.current_branch }}
           NODE_OPTIONS: '--max_old_space_size=4096'
-        run: yarn build-prod
+        run: yarn build
 
       - name: Docker build and push
         uses: docker/build-push-action@v2

diff --git a/src/components/Button/index.tsx b/src/components/Button/index.tsx
@@ -83,6 +83,11 @@ const disabledPrimary = css<{
 export const ButtonPrimary = styled(Base)`
   background-color: ${({ theme }) => theme.primary};
   color: ${({ theme }) => theme.textReverse};
+  &:hover {
+    color: ${({ theme }) => theme.textReverse};
+    filter: brightness(0.8);
+  }
+
   &:active {
     box-shadow: 0 0 0 1pt ${({ theme }) => darken(0.1, theme.primary)};
     background-color: ${({ theme }) => darken(0.1, theme.primary)};

diff --git a/src/components/ClassicElasticTab.tsx b/src/components/ClassicElasticTab.tsx
@@ -45,10 +45,18 @@ function ClassicElasticTab() {
 
   const upToMedium = useMedia(`(max-width: ${MEDIA_WIDTHS.upToMedium}px)`)
 
-  const showLegacyExplicit = upToMedium ? false : isFarmpage ? shouldShowFarmTab : shouldShowPositionTab
-
   const dontShowLegacy = [ChainId.ZKEVM, ChainId.BASE, ChainId.LINEA].includes(chainId)
 
+  const showLegacyExplicit =
+    upToMedium || dontShowLegacy ? false : isFarmpage ? shouldShowFarmTab : shouldShowPositionTab
+
+  useEffect(() => {
+    if (dontShowLegacy && tab === VERSION.ELASTIC_LEGACY) {
+      const newQs = { ...qs, tab: VERSION.ELASTIC }
+      navigate({ search: stringify(newQs) }, { replace: true })
+    }
+  }, [tab, dontShowLegacy, navigate, qs])
+
   const legacyTag = (small?: boolean) => (
     <Text
       sx={{

diff --git a/src/components/ProAmm/ProAmmFee.tsx b/src/components/ProAmm/ProAmmFee.tsx
@@ -15,7 +15,9 @@ import FormattedCurrencyAmount from 'components/FormattedCurrencyAmount'
 import QuestionHelper from 'components/QuestionHelper'
 import { RowBetween, RowFixed } from 'components/Row'
 import TransactionConfirmationModal, { TransactionErrorContent } from 'components/TransactionConfirmationModal'
+import FarmV21ABI from 'constants/abis/v2/farmv2.1.json'
 import FarmV2ABI from 'constants/abis/v2/farmv2.json'
+import { EVMNetworkInfo } from 'constants/networks/type'
 import { useActiveWeb3React, useWeb3React } from 'hooks'
 import { useContract, useProAmmNFTPositionManagerContract, useProMMFarmContract } from 'hooks/useContract'
 import useMixpanel, { MIXPANEL_TYPE } from 'hooks/useMixpanel'
@@ -26,7 +28,7 @@ import { useElasticFarmsV2 } from 'state/farms/elasticv2/hooks'
 import { useTransactionAdder } from 'state/transactions/hooks'
 import { TRANSACTION_TYPE } from 'state/transactions/type'
 import { useUserSlippageTolerance } from 'state/user/hooks'
-import { basisPointsToPercent, calculateGasMargin, formattedNumLong } from 'utils'
+import { basisPointsToPercent, buildFlagsForFarmV21, calculateGasMargin, formattedNumLong } from 'utils'
 
 export default function ProAmmFee({
   tokenId,
@@ -50,7 +52,7 @@ export default function ProAmmFee({
   feeValue0: CurrencyAmount<Currency> | undefined
   feeValue1: CurrencyAmount<Currency> | undefined
 }) {
-  const { account } = useActiveWeb3React()
+  const { account, networkInfo } = useActiveWeb3React()
   const { library } = useWeb3React()
   const theme = useTheme()
   const token0Shown = feeValue0?.currency || position.pool.token0
@@ -108,12 +110,18 @@ export default function ProAmmFee({
   const { userInfo } = useElasticFarmsV2()
   const info = userInfo?.find(item => item.nftId.toString() === tokenId.toString())
   const address = info?.farmAddress
+
+  const isFarmV21 = (networkInfo as EVMNetworkInfo).elastic['farmV2.1S']
+    ?.map(item => item.toLowerCase())
+    .includes(address?.toLowerCase())
+
   const farmV2Contract = useContract(address, FarmV2ABI)
+  const farmV21Contract = useContract(address, FarmV21ABI)
 
   const collectFeeFromFarmContract = async () => {
     const isInFarmV2 = !!info
 
-    const contract = isInFarmV2 ? farmV2Contract : farmContract
+    const contract = isInFarmV2 ? (isFarmV21 ? farmV21Contract : farmV2Contract) : farmContract
 
     if (!contract || !feeValue0 || !feeValue1) {
       setAttemptingTxn(false)
@@ -125,14 +133,28 @@ export default function ProAmmFee({
     const amount1Min = feeValue1.subtract(feeValue1.multiply(basisPointsToPercent(allowedSlippage)))
     try {
       const params = isInFarmV2
-        ? [
-            info.fId,
-            [tokenId.toString()],
-            amount0Min.quotient.toString(),
-            amount1Min.quotient.toString(),
-            deadline?.toString(),
-            true,
-          ]
+        ? isFarmV21
+          ? [
+              info.fId,
+              [tokenId.toString()],
+              amount0Min.quotient.toString(),
+              amount1Min.quotient.toString(),
+              deadline?.toString(),
+              buildFlagsForFarmV21({
+                isClaimFee: !!feeValue0?.greaterThan('0') && !!feeValue1?.greaterThan('0'),
+                isSyncFee: !!feeValue0?.greaterThan('0') && !!feeValue1?.greaterThan('0'),
+                isClaimReward: false,
+                isReceiveNative: true,
+              }),
+            ]
+          : [
+              info.fId,
+              [tokenId.toString()],
+              amount0Min.quotient.toString(),
+              amount1Min.quotient.toString(),
+              deadline?.toString(),
+              true,
+            ]
         : [
             [tokenId.toString()],
             amount0Min.quotient.toString(),