Merge pull request #1656 from 0xoscario/feat/v4

update: core logic for V4 (algebra-integral)

Author: sameepsi

.env

@@ -14,6 +14,7 @@ REACT_APP_COINGECKO_IMMUTABLE_URL="https://tokens.coingecko.com/immutable/all.js
 REACT_APP_COINGECKO_DOGE_URL="https://tokens.coingecko.com/dogechain/all.json"
 REACT_APP_COINGECKO_ASTAR_URL="https://tokens.coingecko.com/astar/all.json"
 REACT_APP_COINGECKO_KAVA_URL="https://tokens.coingecko.com/kava/all.json"
+REACT_APP_COINGECKO_SONEIUM_URL="https://tokens.coingecko.com/soneium/all.json"
 REACT_APP_COINGECKO_ETHEREUM_URL="https://tokens.coingecko.com/ethereum/all.json"
 
 REACT_APP_STAKING_LIST_DEFAULT_URL="https://unpkg.com/quickswap-default-staking-list-address@latest/build/quickswap-default.lpfarms.json"

public/locales/en.json

@@ -140,6 +140,7 @@
   "crossChain": "Cross Chain",
   "marketV2": "Market (V2)",
   "marketV3": "Market (V3)",
+  "marketV4": "Market (V4)",
   "limit": "Limit",
   "twap": "TWAP",
   "proMode": "Pro Mode",

src/components/Header/Header.tsx

@@ -87,6 +87,7 @@ const Header: React.FC<{ onUpdateNewsletter: (val: boolean) => void }> = ({
   const showPool = config['pools']['available'];
   const showFarm = config['farm']['available'];
   const showLair = config['lair']['available'];
+  const showBridge = config['bridge']['available'];
   const showConvert = config['convert']['available'];
   const showAnalytics = config['analytics']['available'];
   const showLending = config['lending']['available'];
@@ -260,7 +261,7 @@ const Header: React.FC<{ onUpdateNewsletter: (val: boolean) => void }> = ({
     });
   }
 
-  if (isSupportedNetwork)
+  if (showBridge && isSupportedNetwork)
     menuItems.push({
       link: '/bridge',
       text: t('Bridge'),

src/components/Toggle/VersionToggle.tsx

@@ -4,19 +4,21 @@ import { Box } from '@material-ui/core';
 import { useTranslation } from 'react-i18next';
 import { useHistory, useParams } from 'react-router-dom';
 import './index.scss';
-import { useIsLpLock, useIsV2 } from 'state/application/hooks';
+import { useIsLpLock, useIsV2, useIsV4 } from 'state/application/hooks';
 import { NEW_QUICK_ADDRESS } from 'constants/v3/addresses';
 import { useActiveWeb3React, useAnalyticsVersion } from 'hooks';
 import { getConfig } from 'config/index';
 
 const VersionToggle: React.FC = () => {
   const { t } = useTranslation();
-  const { isV2, updateIsV2 } = useIsV2();
+  const { updateIsV2 } = useIsV2();
+  const { updateIsV4 } = useIsV4();
   const { isLpLock, updateIsLpLock } = useIsLpLock();
   const { chainId } = useActiveWeb3React();
   const config = getConfig(chainId);
   const v2Available = config['v2'];
   const v3Available = config['v3'];
+  const v4Available = config['v4'];
   const lHAnalyticsAvailable = config['analytics']['liquidityHub'];
   const singleTokenEnabled = config['ichi']['available'];
   const lpLockEnabled = config['lpLock']['available'];
@@ -35,6 +37,7 @@ const VersionToggle: React.FC = () => {
   useEffect(() => {
     updateIsV2(version === 'v2');
     updateIsLpLock(version === 'lpLocker');
+    updateIsV4(version === 'v4');
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [version]);
 
@@ -90,6 +93,18 @@ const VersionToggle: React.FC = () => {
         </Box>
       )}
 
+      {v4Available && (
+        <Box
+          className={version === 'v4' ? 'version-toggle-active' : ''}
+          onClick={() => {
+            redirectWithVersion('v4');
+          }}
+        >
+          <small style={{ lineHeight: 5.85, fontSize: '13px' }}>
+            {t('V4')}
+          </small>
+        </Box>
+      )}
       {/* {isPoolPage && singleTokenEnabled && (
         <Box
           className={version === 'singleToken' ? 'version-toggle-active' : ''}

src/components/v3/IncreaseLiquidityV3/index.tsx

@@ -4,6 +4,7 @@ import { Currency, CurrencyAmount, Percent } from '@uniswap/sdk-core';
 import {
   useUNIV3NFTPositionManagerContract,
   useV3NFTPositionManagerContract,
+  useV4NFTPositionManagerContract,
 } from 'hooks/useContract';
 import TransactionConfirmationModal, {
   ConfirmationModalContent,
@@ -24,13 +25,15 @@ import {
 } from 'state/mint/v3/hooks';
 import { useDerivedPositionInfo } from 'hooks/v3/useDerivedPositionInfo';
 import { NonfungiblePositionManager as NonFunPosMan } from 'v3lib/nonfungiblePositionManager';
+import { NonfungiblePositionV4Manager as NonFunPosV4Man } from 'v3lib/nonfungiblePositionV4Manager';
 import { UniV3NonfungiblePositionManager as UniV3NonFunPosMan } from 'v3lib/uniV3NonfungiblePositionManager';
 import './index.scss';
 import ReactGA from 'react-ga';
 import { WrappedCurrency } from 'models/types';
 import { ApprovalState, useApproveCallback } from 'hooks/useV3ApproveCallback';
 import {
   NONFUNGIBLE_POSITION_MANAGER_ADDRESSES,
+  NONFUNGIBLE_POSITION_V4_MANAGER_ADDRESSES,
   UNI_NFT_POSITION_MANAGER_ADDRESS,
 } from 'constants/v3/addresses';
 import { useUSDCValue } from 'hooks/v3/useUSDCPrice';
@@ -82,10 +85,14 @@ export default function IncreaseLiquidityV3({
       : currencyB;
 
   const algebrapositionManager = useV3NFTPositionManagerContract();
+  const algebrapositionV4Manager = useV4NFTPositionManagerContract();
   const uniPositionManager = useUNIV3NFTPositionManagerContract();
   const positionManager = positionDetails.isUni
     ? uniPositionManager
+    : positionDetails.isV4
+    ? algebrapositionV4Manager
     : algebrapositionManager;
+
   const tokenId = positionDetails.tokenId.toString();
   const addTransaction = useTransactionAdder();
   const finalizedTransaction = useTransactionFinalizer();
@@ -121,7 +128,9 @@ export default function IncreaseLiquidityV3({
     if (positionDetails.isUni) {
       return UNI_NFT_POSITION_MANAGER_ADDRESS[chainId];
     }
-    return NONFUNGIBLE_POSITION_MANAGER_ADDRESSES[chainId];
+    return positionDetails.isV4
+      ? NONFUNGIBLE_POSITION_V4_MANAGER_ADDRESSES[chainId]
+      : NONFUNGIBLE_POSITION_MANAGER_ADDRESSES[chainId];
   }, [chainId, positionDetails]);
 
   const { onFieldAInput, onFieldBInput } = useV3MintActionHandlers(noLiquidity);
@@ -215,6 +224,8 @@ export default function IncreaseLiquidityV3({
 
       const PositionManager = positionDetails.isUni
         ? UniV3NonFunPosMan
+        : positionDetails.isV4
+        ? NonFunPosV4Man
         : NonFunPosMan;
       const { calldata, value } = tokenId
         ? PositionManager.addCallParameters(position, {

src/components/v3/RemoveLiquidityV3/index.tsx

@@ -34,6 +34,7 @@ import usePrevious from 'hooks/usePrevious';
 import useDebouncedChangeHandler from 'utils/useDebouncedChangeHandler';
 import { WMATIC_EXTENDED } from 'constants/v3/addresses';
 import { NonfungiblePositionManager as AlgebraNonfungiblePositionManager } from 'v3lib/nonfungiblePositionManager';
+import { NonfungiblePositionV4Manager as AlgebraNonfungiblePositionV4Manager } from 'v3lib/nonfungiblePositionV4Manager';
 import { UniV3NonfungiblePositionManager } from 'v3lib/uniV3NonfungiblePositionManager';
 import { WrappedCurrency } from 'models/types';
 import RangeBadge from 'components/v3/Badge/RangeBadge';
@@ -145,6 +146,8 @@ export default function RemoveLiquidityV3({
 
     const NonfungiblePositionManager = position.isUni
       ? UniV3NonfungiblePositionManager
+      : position.isV4
+      ? AlgebraNonfungiblePositionV4Manager
       : AlgebraNonfungiblePositionManager;
     const { calldata, value } = NonfungiblePositionManager.removeCallParameters(
       positionSDK,
@@ -234,6 +237,7 @@ export default function RemoveLiquidityV3({
     liquidityPercentage,
     library,
     position.isUni,
+    position.isV4,
     tokenId,
     allowedSlippagePercent,
     t,

src/config/astarzkevm.json

@@ -1,4 +1,5 @@
 {
+  "v4": false,
   "v3": true,
   "v2": false,
   "rpc": "https://rpc.startale.com/astar-zkevm",
@@ -16,6 +17,7 @@
     "decimals": 18
   },
   "bridge": {
+    "available": true,
     "bridgeCoverImg": "/bridge/astar.webp",
     "supportedChains": ["/bridge/eth.svg", "/bridge/astar.webp"]
   },

src/config/dogechain.json

@@ -1,4 +1,5 @@
 {
+  "v4": false,
   "v3": true,
   "v2": true,
   "rpc": "https://rpc.dogechain.dog",
@@ -16,6 +17,7 @@
     "decimals": 18
   },
   "bridge": {
+    "available": true,
     "bridgeCoverImg": "/bridge/dogchain_cover_img.webp",
     "supportedChains": ["/bridge/dog_coin.webp"],
     "isBigCoverImg": true

src/config/ethereum.json

@@ -1,4 +1,5 @@
 {
+  "v4": false,
   "v3": false,
   "v2": false,
   "rpc": "https://mainnet.infura.io/v3/",
@@ -13,6 +14,9 @@
     "symbol": "ETH",
     "decimals": 18
   },
+  "bridge": {
+    "available": true
+  },
   "swap": {
     "available": true,
     "bestTrade": true,

src/config/imx.json

@@ -1,4 +1,5 @@
 {
+  "v4": false,
   "v3": true,
   "v2": false,
   "rpc": "https://rpc.immutable.com",
@@ -16,6 +17,7 @@
     "decimals": 18
   },
   "bridge": {
+    "available": true,
     "bridgeCoverImg": "/bridge/immutable_cover_img.svg",
     "supportedChains": ["/bridge/eth.svg", "/bridge/zkevm.webp"]
   },