Feat/terra classic integration (White-Whale-Defi-Platform#360)

* feat(terra-classic-integration): added chain config * feat(terra-classic-integration): added configs, logos and integrated tax calculation * feat(terra-classic-integration): link fixes and pool styling improvements * feat(terra-classic-integration): debug commit * feat(terra-classic-integration): debug commit * feat(terra-classic-integration): debug commit * feat(terra-classic-integration): debug commit * feat(terra-classic-integration): debug commit * feat(terra-classic-integration): debug commit * feat(terra-classic-integration): undo debug changes * feat(terra-classic-integration): swap tax calc * feat(terra-classic-integration): fixed ustc related operations * feat(terra-classic-integration): sorting by denoms in fees * feat(terra-classic-integration): enabled incentives and added fee calc for incentive creation * feat(terra-classic-integration): fix * feat(terra-classic-integration): removed cors header * Update networks.ts --------- Co-authored-by: Sen Com <[email protected]>
nick134-bit · Aug 31, 2023 · 7db0f73 · 7db0f73
1 parent beed867
commit 7db0f73
Show file tree

Hide file tree

Showing 46 changed files with 668 additions and 117 deletions.
diff --git a/components/Finder.tsx b/components/Finder.tsx
@@ -32,6 +32,10 @@ const getUrl = (chainId, txHash) => {
       return `https://explorer.injective.network/transaction/${txHash}`
     case 'comdex-1':
       return `https://mintscan.io/comdex/txs/${txHash}`
+    case 'pacific-1':
+      return `https://ping.pub/sei/tx/${txHash}`
+    case 'columbus-5':
+      return `https://ping.pub/terra-luna/tx/${txHash}`
     default:
       return null
   }

diff --git a/components/InfoTooltip.tsx b/components/InfoTooltip.tsx
@@ -1,7 +1,7 @@
 import { InfoOutlineIcon } from '@chakra-ui/icons'
 import { Box, Icon, Tooltip } from '@chakra-ui/react'
 
-const InfoTooltip = ({ IconSize, description }) => (
+const InfoTooltip = ({ iconSize, description }) => (
   <Tooltip
     label={
       <Box
@@ -23,14 +23,14 @@ const InfoTooltip = ({ IconSize, description }) => (
     closeOnClick={false}
     arrowSize={0}
   >
-    <Icon as={InfoOutlineIcon} blockSize={IconSize} color={'white'} />
+    <Icon as={InfoOutlineIcon} blockSize={iconSize} color={'white'} />
   </Tooltip>
 )
-export const IncentiveTooltip = ({ IconSize }) => (
+export const IncentiveTooltip = ({ iconSize }) => (
   <InfoTooltip
-    IconSize={IconSize}
+    iconSize={iconSize}
     description={
-      'The Incentive Flow Creator can close their flows anytime. All unclaimed tokens will be clawed back.'
+      'The incentive flow creator can close their flows anytime. All unclaimed tokens will be clawed back.'
     }
   />
 )

diff --git a/components/Layout/RadialGradient.tsx b/components/Layout/RadialGradient.tsx
@@ -29,6 +29,11 @@ const backgrounds = {
     'linear-gradient(90deg, rgba(60, 205, 100, 0.25) 2.83%, rgba(43, 68, 46, 0.50) 97.47%)',
   'migaloo-1':
     'linear-gradient(90deg, rgba(60, 205, 100, 0.25) 2.83%, rgba(43, 68, 46, 0.50) 97.47%)',
+  'columbus-5':
+    'linear-gradient(90deg, rgba(60, 205, 100, 0.25) 2.83%, rgba(255, 255, 0, 0.25) 50%, rgba(0, 117, 255, 0.25) 97.47%)',
+  'rebel-2':
+    'linear-gradient(90deg, rgba(60, 205, 100, 0.25) 2.83%, rgba(255, 255, 0, 0.25) 50%, rgba(0, 117, 255, 0.25) 97.47%)',
+
 }
 
 const RadialGradient: FC = () => {

diff --git a/components/Navbar/LUNCNavMenu.json b/components/Navbar/LUNCNavMenu.json
@@ -0,0 +1,26 @@
+[
+  {
+    "label": "Dashboard",
+    "isExternal" : false,
+    "link": "/dashboard"
+  },
+  {
+    "label": "Trade",
+    "isExternal" : false,
+    "children": [
+      {
+        "label": "Swap",
+        "link": "/swap"
+      },
+      {
+        "label": "Pools",
+        "link": "/pools"
+      }
+    ]
+  },
+  {
+    "label": "Bridge",
+    "isExternal" : true,
+    "link": "https://tfm.com/bridge"
+  }
+]
diff --git a/components/Navbar/Logo.tsx b/components/Navbar/Logo.tsx
@@ -1,26 +1,28 @@
 import React from 'react'
 
 import { HStack, Image, Text } from '@chakra-ui/react'
-import Link from 'next/link'
 import { useRecoilState } from 'recoil'
 import { walletState } from 'state/atoms/walletAtoms'
+import { useRouter } from 'next/router'
 
 const Logo = () => {
   const [currentWalletState, setCurrentWalletState] =
     useRecoilState(walletState)
+  const router = useRouter()
   return (
     <HStack alignItems="center">
-      <Link href="/">
         <a
-          onClick={() => setCurrentWalletState({
-            ...currentWalletState,
-            chainId: 'migaloo-1',
-          })
+          onClick={async() => {
+            setCurrentWalletState({
+              ...currentWalletState,
+              chainId: 'migaloo-1'
+            })
+            await router.push('/migaloo/swap')
+          }
           }
         >
           <Image src="/img/logo.svg" alt="WhiteWhale Logo" boxSize={[8, 12]} />
         </a>
-      </Link>
       <HStack display={['none', 'flex']}>
         <Text pl={2} fontSize="26" fontWeight="400">
           White

diff --git a/components/Navbar/Navbar.tsx b/components/Navbar/Navbar.tsx
@@ -26,6 +26,7 @@ import WalletModal from '../Wallet/Modal/Modal'
 import Wallet from '../Wallet/Wallet'
 import DrawerLink from './DrawerLink'
 import Logo from './Logo'
+import luncMenuLinks from './LUNCNavMenu.json'
 import NavbarPopper from './NavbarPopper'
 import bondingDisabledMenuLinks from './NavBondingDisabledMenu.json'
 import menuLinks from './NavMenu.json'
@@ -102,7 +103,7 @@ const Navbar = () => {
           <Logo />
         </Box>
         <Card paddingX={10} gap={6}>
-          {(ACTIVE_BONDING_NETWORKS.includes(chainId)
+          {(chainId === 'columbus-5' ? luncMenuLinks : ACTIVE_BONDING_NETWORKS.includes(chainId)
             ? menuLinks
             : bondingDisabledMenuLinks
           ).map((menu) => (

diff --git a/components/Pages/BondingActions/Bond.tsx b/components/Pages/BondingActions/Bond.tsx
@@ -68,7 +68,7 @@ export const Bond = ({ balances, tokenSymbols }) => {
       currentBondState,
     },
   })
-  const currentTokenBalance = useMemo(() => tokenBalances?.find((balance) => balance.tokenSymbol === currentBondState.tokenSymbol).amount,
+  const currentTokenBalance = useMemo(() => tokenBalances?.find((balance) => balance.tokenSymbol === currentBondState.tokenSymbol)?.amount,
     [tokenBalances, currentBondState.tokenSymbol])
   return (
     <VStack px={7} width="full">

diff --git a/components/Pages/BondingActions/hooks/bondTokens.ts b/components/Pages/BondingActions/hooks/bondTokens.ts
@@ -1,5 +1,6 @@
 import { coin } from '@cosmjs/stargate'
 import { Config } from 'components/Pages/Dashboard/hooks/useDashboardData'
+import { TerraTreasuryService } from 'services/treasuryService'
 import { Wallet } from 'util/wallet-adapters'
 
 export const bondTokens = async (
@@ -8,6 +9,7 @@ export const bondTokens = async (
   amount: number,
   denom: string,
   config: Config,
+  chainId?: string,
 ) => {
   const handleMsg = {
     bond: {
@@ -21,9 +23,13 @@ export const bondTokens = async (
       },
     },
   }
+  let fee = null
+  if (chainId === 'columbus-5') {
+    fee = await TerraTreasuryService.getInstance().getTerraClassicFee(amount, denom)
+  }
   return client.execute(
     address, config.whale_lair, handleMsg, [
       coin(amount, denom),
-    ],
+    ], fee,
   )
 }
diff --git a/...nts/Pages/Dashboard/hooks/claimRewards.ts → ...ages/BondingActions/hooks/claimRewards.ts b/...nts/Pages/Dashboard/hooks/claimRewards.ts → ...ages/BondingActions/hooks/claimRewards.ts
diff --git a/components/Pages/BondingActions/hooks/useTransaction.tsx b/components/Pages/BondingActions/hooks/useTransaction.tsx
@@ -3,6 +3,7 @@ import { useMutation, useQuery } from 'react-query'
 
 import { useToast } from '@chakra-ui/react'
 import Finder from 'components/Finder'
+import { claimRewards } from 'components/Pages/BondingActions/hooks/claimRewards'
 import { createNewEpoch } from 'components/Pages/BondingActions/hooks/createNewEpoch'
 import {
   Config,
@@ -13,7 +14,6 @@ import { walletState } from 'state/atoms/walletAtoms'
 import { convertDenomToMicroDenom } from 'util/conversion'
 
 import { ActionType } from '../../Dashboard/BondingOverview'
-import { claimRewards } from '../../Dashboard/hooks/claimRewards'
 import { bondTokens } from './bondTokens'
 import { unbondTokens } from './unbondTokens'
 import { withdrawTokens } from './withdrawTokens'
@@ -130,6 +130,7 @@ export const useTransaction = () => {
         adjustedAmount,
         data.denom,
         config,
+        chainId,
       )
     } else if (data.bondingAction === ActionType.unbond) {
       return unbondTokens(

diff --git a/components/Pages/Incentivize/hooks/useIncentivePoolInfo.ts b/components/Pages/Incentivize/hooks/useIncentivePoolInfo.ts
@@ -70,8 +70,9 @@ export const useIncentivePoolInfo = (
 
   useEffect(() => {
     const fetchPoolData = async () => {
+      currentChainPrefix = chainId === 'columbus-5' ? 'terra-classic': currentChainPrefix
       const poolData =
-        currentChainPrefix === 'terra'
+        currentChainPrefix === 'terra' && chainId !== 'columbus-5'
           ? await getPairAprAndDailyVolumeTerra(pools)
           : await getPairAprAndDailyVolume(pools, currentChainPrefix)
       setPoolsWithAprAnd24HrVolume(poolData)

diff --git a/components/Pages/Incentivize/hooks/useOpenFlow.ts b/components/Pages/Incentivize/hooks/useOpenFlow.ts
@@ -22,6 +22,7 @@ import {
 
 import useEpoch from './useEpoch'
 import useFactoryConfig from './useFactoryConfig'
+import { TerraTreasuryService } from 'services/treasuryService'
 
 interface Props {
   poolId: string
@@ -81,7 +82,7 @@ export const useOpenFlow = ({ poolId, token, startDate, endDate }: Props) => {
     /* Increase allowance for each non-native token */
     if (!tokenInfo?.native) {
       increaseAllowanceMessages.push(createIncreaseAllowanceMessage({
-        tokenAmount: Number(amount),
+        tokenAmount: amount,
         tokenAddress: tokenInfo?.denom,
         senderAddress: address,
         swapAddress: pool?.staking_address,
@@ -115,7 +116,13 @@ export const useOpenFlow = ({ poolId, token, startDate, endDate }: Props) => {
   })
 
   const { mutate: submit, ...tx } = useMutation({
-    mutationFn: () => client.post(address, msgs),
+    mutationFn: async() => {
+      let fee = null
+      if (chainId === 'columbus-5') {
+        fee = await TerraTreasuryService.getInstance().getTerraClassicIncentiveFee(amount, tokenInfo?.denom)
+      }
+      return await client.post(address, msgs, fee)
+    },
     onError,
     onSuccess,
     onMutate,

diff --git a/components/Pages/Liquidity/hooks/useDepositTransaction.tsx b/components/Pages/Liquidity/hooks/useDepositTransaction.tsx
@@ -4,7 +4,9 @@ import { useMutation, useQuery, useQueryClient } from 'react-query'
 import { useToast } from '@chakra-ui/react'
 import Finder from 'components/Finder'
 import useDebounceValue from 'hooks/useDebounceValue'
+import { useRecoilValue } from 'recoil'
 import { executeAddLiquidity } from 'services/liquidity'
+import { walletState } from 'state/atoms/walletAtoms'
 import { TxStep } from 'types/common'
 
 type Params = {
@@ -28,16 +30,13 @@ type Params = {
 }
 
 export const useTransaction = ({
-  poolId,
   enabled,
   swapAddress,
   swapAssets,
   client,
   senderAddress,
   msgs,
   encodedMsgs,
-  amount,
-  price,
   tokenAAmount,
   tokenBAmount,
   onBroadcasting,
@@ -47,7 +46,7 @@ export const useTransaction = ({
   const debouncedMsgs = useDebounceValue(encodedMsgs, 200)
   const [tokenA, tokenB] = swapAssets
   const toast = useToast()
-
+  const { chainId } = useRecoilValue(walletState)
   const [txStep, setTxStep] = useState<TxStep>(TxStep.Idle)
   const [txHash, setTxHash] = useState<string | undefined>(undefined)
   const [error, setError] = useState<unknown | null>(null)
@@ -124,15 +123,16 @@ export const useTransaction = ({
     },
   )
 
-  const { mutate } = useMutation((data: any) => executeAddLiquidity({
+  const { mutate } = useMutation(() => executeAddLiquidity({
     tokenA,
     tokenB,
     tokenAAmount,
-    maxTokenBAmount: tokenBAmount,
+    tokenBAmount,
     client,
     swapAddress,
     senderAddress,
     msgs: encodedMsgs,
+    chainId,
   }),
   {
     onMutate: () => {
@@ -186,15 +186,12 @@ export const useTransaction = ({
 
       onError?.()
     },
-    onSuccess: (data: any) => {
+    onSuccess: async (data: any) => {
       setTxStep(TxStep.Broadcasting)
       setTxHash(data?.transactionHash || data?.txHash)
       onBroadcasting?.(data?.transactionHash || data?.txHash)
 
-      queryClient.invalidateQueries({ queryKey: ['@pool-liquidity'] })
-      queryClient.invalidateQueries({ queryKey: ['multipleTokenBalances'] })
-      queryClient.invalidateQueries({ queryKey: ['tokenBalance'] })
-      queryClient.invalidateQueries({ queryKey: ['positions'] })
+      await queryClient.invalidateQueries({ queryKey: ['@pool-liquidity','multipleTokenBalances','tokenBalance', 'positions'] })
 
       toast({
         title: 'Add Liquidity Success.',
@@ -239,11 +236,8 @@ export const useTransaction = ({
       return
     }
 
-    mutate({
-      msgs,
-      fee,
-    })
-  }, [msgs, fee, mutate, price])
+    mutate()
+  }, [msgs, fee, mutate])
 
   useEffect(() => {
     if (txInfo != null && txHash != null) {

diff --git a/components/Pages/Pools/AllPoolsTable.tsx b/components/Pages/Pools/AllPoolsTable.tsx
@@ -94,7 +94,7 @@ const columns = [
   columnHelper.accessor('incentives', {
     header: () => (
       <HStack paddingTop={'4'}>
-        <IncentiveTooltip IconSize={'3'} />
+        <IncentiveTooltip iconSize={'3'} />
         <Text align="left" color="brand.50">
           {'Incentives'}
         </Text>

diff --git a/components/Pages/Pools/MyPoolsTable.tsx b/components/Pages/Pools/MyPoolsTable.tsx
@@ -92,8 +92,8 @@ const columns = [
   }),
   columnHelper.accessor('incentives', {
     header: () => (
-      <HStack paddingTop={'4'}>
-        <IncentiveTooltip IconSize={'3'} />
+      <HStack>
+        <IncentiveTooltip iconSize={'3'} />
         <Text align="left" color="brand.50">
           {'Incentives'}
         </Text>

diff --git a/components/Pages/Pools/Pools.tsx b/components/Pages/Pools/Pools.tsx
@@ -85,6 +85,9 @@ const Pools = () => {
   if (window.debugLogsEnabled) {
     console.log('Pools-Liquidity: ', pools)
     console.log('Incentive-Pool-Infos: ', incentivePoolInfos)
+    console.log('Loading-Info: ', isLoading, isInitLoading, pairInfos.length === 0)
+    console.log('Pools: ', pools)
+    console.log('Pair Infos: ', pairInfos)
   }
 
   const calculateMyPosition = (pool) => {
@@ -227,16 +230,16 @@ const Pools = () => {
   const allPoolsForShown = useMemo(() => allPools?.filter((item) => !myPoolsId?.includes(item.pool)),
     [allPools, myPoolsId])
   const parseLiquidity = (liqString) => {
-    const value = parseFloat(liqString.replace(/[^\d.-]/g, ''))
+    const value = parseFloat(liqString?.replace(/[^\d.-]/g, ''))
     /*
      * We do this mutation because by now we already have modified the string to include a letter abbreviation
      * if the liquidity goes over 1000
-     * If its in the thousands, multiple the value by 1000, if the millions 1000000
+     * If it's in the thousands, multiply the value by 1000, if millions 1000000
      */
-    return liqString.toUpperCase().includes('K')
-      ? value * 1000
-      : liqString.toUpperCase().includes('M')
-        ? value * 1000000
+    return liqString?.toUpperCase().includes('K')
+      ? value * 1_000
+      : liqString?.toUpperCase().includes('M')
+        ? value * 1_000_000
         : value
   }
   const showAllPoolsList = useMemo(() => {

diff --git a/components/Pages/Swap/SwapForm.tsx b/components/Pages/Swap/SwapForm.tsx
@@ -358,7 +358,6 @@ const SwapForm: FC<Props> = ({
               balance={tokenBBalance}
               disabled={isInputDisabled}
               showBalanceSlider={false}
-              // OnInputFocus={() => setIsReverse(true)}
               onChange={(value, isTokenChange) => {
                 if (tokenB?.tokenSymbol && !isTokenChange) {
                   setReverse(true)