From 203c571bc549a0d45e27efc358c0aa25c07a51a7 Mon Sep 17 00:00:00 2001
From: tjs <tjshipe@gmail.com>
Date: Fri, 18 Nov 2022 14:11:06 -0500
Subject: [PATCH] use jupiter api and hooks

---
 apis/coingecko.ts                             |   7 +-
 components/MangoProvider.tsx                  |  24 +-
 components/TokenList.tsx                      |  30 +-
 components/account/ActionTokenItem.tsx        |  11 +-
 components/modals/BorrowModal.tsx             |   9 +-
 components/modals/DepositModal.tsx            |   9 +-
 components/modals/RepayModal.tsx              |  11 +-
 components/modals/WithdrawModal.tsx           |   9 +-
 components/shared/BalancesTable.tsx           |  11 +-
 components/stats/SpotMarketsTable.tsx         |  24 +-
 components/stats/TokenStats.tsx               |  11 +-
 components/swap/JupiterRouteInfo.tsx          |  77 +--
 components/swap/LeverageSlider.tsx            |  14 +-
 components/swap/RoutesModal.tsx               |  17 +-
 components/swap/SwapForm.tsx                  | 114 ++--
 components/swap/SwapFormTokenList.tsx         |  32 +-
 components/swap/SwapHistoryTable.tsx          |  18 +-
 components/swap/SwapPage.tsx                  |  10 +-
 components/swap/SwapTokenChart.tsx            |  50 +-
 components/swap/TokenSelect.tsx               |  11 +-
 components/swap/useJupiter.ts                 | 116 ----
 components/swap/useJupiterRoutes.ts           |  81 +++
 components/swap/useJupiterSwapData.ts         |  33 +
 components/trade/AdvancedMarketHeader.tsx     |   7 +-
 components/trade/AdvancedTradeForm.tsx        |  15 +-
 components/trade/MarketLogos.tsx              |  13 +-
 components/trade/PerpSlider.tsx               |   4 +-
 components/trade/SpotSlider.tsx               |   1 +
 components/trade/UnsettledTrades.tsx          |   1 -
 hooks/useCoingecko.ts                         |  49 ++
 hooks/useJupiterMints.ts                      |  51 ++
 ...orageState.tsx => useLocalStorageState.ts} |   0
 ...useMangoAccount.tsx => useMangoAccount.ts} |   0
 hooks/useMangoGroup.ts                        |  10 +
 .../{useOraclePrice.tsx => useOraclePrice.ts} |   0
 hooks/{useSolBalance.tsx => useSolBalance.ts} |   0
 ...lances.tsx => useUnsettledSpotBalances.ts} |   0
 package.json                                  |   3 +-
 pages/token/[token].tsx                       |  45 +-
 store/mangoStore.ts                           |  86 +--
 types/jupiter.ts                              | 130 +++-
 utils/constants.ts                            |   3 +-
 yarn.lock                                     | 638 +-----------------
 43 files changed, 645 insertions(+), 1140 deletions(-)
 delete mode 100644 components/swap/useJupiter.ts
 create mode 100644 components/swap/useJupiterRoutes.ts
 create mode 100644 components/swap/useJupiterSwapData.ts
 create mode 100644 hooks/useCoingecko.ts
 create mode 100644 hooks/useJupiterMints.ts
 rename hooks/{useLocalStorageState.tsx => useLocalStorageState.ts} (100%)
 rename hooks/{useMangoAccount.tsx => useMangoAccount.ts} (100%)
 create mode 100644 hooks/useMangoGroup.ts
 rename hooks/{useOraclePrice.tsx => useOraclePrice.ts} (100%)
 rename hooks/{useSolBalance.tsx => useSolBalance.ts} (100%)
 rename hooks/{useUnsettledSpotBalances.tsx => useUnsettledSpotBalances.ts} (100%)

diff --git a/apis/coingecko.ts b/apis/coingecko.ts
index 6821a62b..f1a59fd3 100644
--- a/apis/coingecko.ts
+++ b/apis/coingecko.ts
@@ -1,8 +1,11 @@
 export const fetchChartData = async (
-  baseTokenId: string,
-  quoteTokenId: string,
+  baseTokenId: string | undefined,
+  quoteTokenId: string | undefined,
   daysToShow: number
 ) => {
+  console.log('fetching chart:', baseTokenId, quoteTokenId)
+
+  if (!baseTokenId || !quoteTokenId) return
   try {
     const [inputResponse, outputResponse] = await Promise.all([
       fetch(
diff --git a/components/MangoProvider.tsx b/components/MangoProvider.tsx
index a6ac47c2..69d25134 100644
--- a/components/MangoProvider.tsx
+++ b/components/MangoProvider.tsx
@@ -1,42 +1,20 @@
 import { useEffect } from 'react'
 import mangoStore from '@store/mangoStore'
-import useInterval from '@components/shared/useInterval'
 import { PublicKey } from '@solana/web3.js'
 import { useRouter } from 'next/router'
 import { MangoAccount } from '@blockworks-foundation/mango-v4'
 import useMangoAccount from 'hooks/useMangoAccount'
 
-const rehydrateStore = async () => {
-  const actions = mangoStore.getState().actions
-  actions.fetchGroup()
-  const mangoAccount = mangoStore.getState().mangoAccount.current
-  if (mangoAccount) {
-    // actions.reloadMangoAccount()
-  }
-}
-
 const HydrateStore = () => {
   const actions = mangoStore((s) => s.actions)
   const { mangoAccount } = useMangoAccount()
-  const jupiterTokens = mangoStore((s) => s.jupiterTokens)
-
-  useInterval(() => {
-    rehydrateStore()
-  }, 5000)
 
   useEffect(() => {
     const fetchData = async () => {
       await actions.fetchGroup()
-      actions.fetchJupiterTokens()
     }
     fetchData()
-  }, [])
-
-  useEffect(() => {
-    if (jupiterTokens.length) {
-      actions.fetchCoingeckoPrices()
-    }
-  }, [jupiterTokens])
+  }, [actions])
 
   // watch selected Mango Account for changes
   useEffect(() => {
diff --git a/components/TokenList.tsx b/components/TokenList.tsx
index 6b7f69eb..723d5743 100644
--- a/components/TokenList.tsx
+++ b/components/TokenList.tsx
@@ -30,6 +30,7 @@ import Tooltip from './shared/Tooltip'
 import { formatTokenSymbol } from 'utils/tokens'
 import RepayModal from './modals/RepayModal'
 import useMangoAccount from 'hooks/useMangoAccount'
+import useJupiterMints from '../hooks/useJupiterMints'
 
 const TokenList = () => {
   const { t } = useTranslation(['common', 'token', 'trade'])
@@ -38,7 +39,7 @@ const TokenList = () => {
   const { mangoAccount } = useMangoAccount()
   const spotBalances = mangoStore((s) => s.mangoAccount.spotBalances)
   const group = mangoStore((s) => s.group)
-  const jupiterTokens = mangoStore((s) => s.jupiterTokens)
+  const { mangoTokens } = useJupiterMints()
   const totalInterestData = mangoStore(
     (s) => s.mangoAccount.stats.interestTotals.data
   )
@@ -136,8 +137,8 @@ const TokenList = () => {
               const oraclePrice = bank.uiPrice
 
               let logoURI
-              if (jupiterTokens.length) {
-                logoURI = jupiterTokens.find(
+              if (mangoTokens?.length) {
+                logoURI = mangoTokens.find(
                   (t) => t.address === bank.mint.toString()
                 )!.logoURI
               }
@@ -263,7 +264,7 @@ export default TokenList
 const MobileTokenListItem = ({ bank }: { bank: Bank }) => {
   const { t } = useTranslation(['common', 'token'])
   const [showTokenDetails, setShowTokenDetails] = useState(false)
-  const jupiterTokens = mangoStore((s) => s.jupiterTokens)
+  const { mangoTokens } = useJupiterMints()
   const spotBalances = mangoStore((s) => s.mangoAccount.spotBalances)
   const { mangoAccount } = useMangoAccount()
   const totalInterestData = mangoStore(
@@ -274,8 +275,8 @@ const MobileTokenListItem = ({ bank }: { bank: Bank }) => {
   const router = useRouter()
 
   let logoURI
-  if (jupiterTokens.length) {
-    logoURI = jupiterTokens.find(
+  if (mangoTokens?.length) {
+    logoURI = mangoTokens.find(
       (t) => t.address === bank.mint.toString()
     )!.logoURI
   }
@@ -420,7 +421,7 @@ const ActionsMenu = ({
   // const set = mangoStore.getState().set
   // const router = useRouter()
   // const { asPath } = router
-  const jupiterTokens = mangoStore((s) => s.jupiterTokens)
+  const { mangoTokens } = useJupiterMints()
 
   const handleShowActionModals = useCallback(
     (token: string, action: 'borrow' | 'deposit' | 'withdraw' | 'repay') => {
@@ -437,7 +438,7 @@ const ActionsMenu = ({
   )
 
   // const handleBuy = useCallback(() => {
-  //   const outputTokenInfo = jupiterTokens.find(
+  //   const outputTokenInfo = mangoTokens.find(
   //     (t: any) => t.address === bank.mint.toString()
   //   )
   //   set((s) => {
@@ -447,10 +448,10 @@ const ActionsMenu = ({
   //   if (asPath === '/') {
   //     router.push('/swap', undefined, { shallow: true })
   //   }
-  // }, [bank, router, asPath, set, jupiterTokens])
+  // }, [bank, router, asPath, set, mangoTokens])
 
   // const handleSell = useCallback(() => {
-  //   const inputTokenInfo = jupiterTokens.find(
+  //   const inputTokenInfo = mangoTokens.find(
   //     (t: any) => t.address === bank.mint.toString()
   //   )
   //   set((s) => {
@@ -460,13 +461,12 @@ const ActionsMenu = ({
   //   if (asPath === '/') {
   //     router.push('/swap', undefined, { shallow: true })
   //   }
-  // }, [router, asPath, set, bank, jupiterTokens])
+  // }, [router, asPath, set, bank, mangoTokens])
 
   const logoURI = useMemo(() => {
-    if (!bank || !jupiterTokens.length) return ''
-    return jupiterTokens.find((t) => t.address === bank.mint.toString())
-      ?.logoURI
-  }, [bank, jupiterTokens])
+    if (!bank || !mangoTokens?.length) return ''
+    return mangoTokens.find((t) => t.address === bank.mint.toString())?.logoURI
+  }, [bank, mangoTokens])
 
   return (
     <>
diff --git a/components/account/ActionTokenItem.tsx b/components/account/ActionTokenItem.tsx
index 68c46d98..74a76416 100644
--- a/components/account/ActionTokenItem.tsx
+++ b/components/account/ActionTokenItem.tsx
@@ -3,6 +3,7 @@ import Image from 'next/legacy/image'
 import { useMemo } from 'react'
 import mangoStore from '@store/mangoStore'
 import { formatDecimal } from '../../utils/numbers'
+import useJupiterMints from 'hooks/useJupiterMints'
 
 const ActionTokenItem = ({
   bank,
@@ -18,17 +19,15 @@ const ActionTokenItem = ({
   showDepositRates?: boolean
 }) => {
   const { mint, name } = bank
-  const jupiterTokens = mangoStore((s) => s.jupiterTokens)
+  const { mangoTokens } = useJupiterMints()
 
   const logoUri = useMemo(() => {
     let logoURI
-    if (jupiterTokens.length) {
-      logoURI = jupiterTokens.find(
-        (t) => t.address === mint.toString()
-      )!.logoURI
+    if (mangoTokens?.length) {
+      logoURI = mangoTokens.find((t) => t.address === mint.toString())!.logoURI
     }
     return logoURI
-  }, [mint, jupiterTokens])
+  }, [mint, mangoTokens])
 
   return (
     <button
diff --git a/components/modals/BorrowModal.tsx b/components/modals/BorrowModal.tsx
index bc57fa8f..27666ce2 100644
--- a/components/modals/BorrowModal.tsx
+++ b/components/modals/BorrowModal.tsx
@@ -28,6 +28,7 @@ import MaxAmountButton from '@components/shared/MaxAmountButton'
 import HealthImpactTokenChange from '@components/HealthImpactTokenChange'
 import Tooltip from '@components/shared/Tooltip'
 import useMangoAccount from 'hooks/useMangoAccount'
+import useJupiterMints from 'hooks/useJupiterMints'
 
 interface BorrowModalProps {
   token?: string
@@ -45,7 +46,7 @@ function BorrowModal({ isOpen, onClose, token }: ModalCombinedProps) {
   )
   const [showTokenList, setShowTokenList] = useState(false)
   const [sizePercentage, setSizePercentage] = useState('')
-  const jupiterTokens = mangoStore((s) => s.jupiterTokens)
+  const { mangoTokens } = useJupiterMints()
   const { mangoAccount } = useMangoAccount()
 
   const bank = useMemo(() => {
@@ -55,13 +56,13 @@ function BorrowModal({ isOpen, onClose, token }: ModalCombinedProps) {
 
   const logoUri = useMemo(() => {
     let logoURI
-    if (jupiterTokens.length) {
-      logoURI = jupiterTokens.find(
+    if (mangoTokens?.length) {
+      logoURI = mangoTokens.find(
         (t) => t.address === bank?.mint.toString()
       )!.logoURI
     }
     return logoURI
-  }, [jupiterTokens, bank])
+  }, [mangoTokens, bank])
 
   const tokenMax = useMemo(() => {
     const group = mangoStore.getState().group
diff --git a/components/modals/DepositModal.tsx b/components/modals/DepositModal.tsx
index fcce993d..d9e61095 100644
--- a/components/modals/DepositModal.tsx
+++ b/components/modals/DepositModal.tsx
@@ -31,6 +31,7 @@ import Tooltip from '@components/shared/Tooltip'
 import HealthImpactTokenChange from '@components/HealthImpactTokenChange'
 import useSolBalance from 'hooks/useSolBalance'
 import SolBalanceWarnings from '@components/shared/SolBalanceWarnings'
+import useJupiterMints from 'hooks/useJupiterMints'
 
 interface DepositModalProps {
   token?: string
@@ -69,7 +70,7 @@ function DepositModal({ isOpen, onClose, token }: ModalCombinedProps) {
   )
   const [showTokenList, setShowTokenList] = useState(false)
   const [sizePercentage, setSizePercentage] = useState('')
-  const jupiterTokens = mangoStore((s) => s.jupiterTokens)
+  const { mangoTokens } = useJupiterMints()
 
   const bank = useMemo(() => {
     const group = mangoStore.getState().group
@@ -78,13 +79,13 @@ function DepositModal({ isOpen, onClose, token }: ModalCombinedProps) {
 
   const logoUri = useMemo(() => {
     let logoURI
-    if (jupiterTokens.length) {
-      logoURI = jupiterTokens.find(
+    if (mangoTokens.length) {
+      logoURI = mangoTokens.find(
         (t) => t.address === bank?.mint.toString()
       )!.logoURI
     }
     return logoURI
-  }, [bank?.mint, jupiterTokens])
+  }, [bank?.mint, mangoTokens])
 
   const { wallet } = useWallet()
   const walletTokens = mangoStore((s) => s.wallet.tokens)
diff --git a/components/modals/RepayModal.tsx b/components/modals/RepayModal.tsx
index ecb6ba88..38a401b4 100644
--- a/components/modals/RepayModal.tsx
+++ b/components/modals/RepayModal.tsx
@@ -29,6 +29,7 @@ import { walletBalanceForToken } from './DepositModal'
 import SolBalanceWarnings from '@components/shared/SolBalanceWarnings'
 import useSolBalance from 'hooks/useSolBalance'
 import useMangoAccount from 'hooks/useMangoAccount'
+import useJupiterMints from 'hooks/useJupiterMints'
 
 interface RepayModalProps {
   token?: string
@@ -45,8 +46,8 @@ function RepayModal({ isOpen, onClose, token }: ModalCombinedProps) {
   const [selectedToken, setSelectedToken] = useState(token)
   const [showTokenList, setShowTokenList] = useState(false)
   const [sizePercentage, setSizePercentage] = useState('')
-  const jupiterTokens = mangoStore((s) => s.jupiterTokens)
-  const { maxSolDeposit } = useSolBalance()
+  const { mangoTokens } = useJupiterMints()
+  // const { maxSolDeposit } = useSolBalance()
 
   const bank = useMemo(() => {
     const group = mangoStore.getState().group
@@ -55,13 +56,13 @@ function RepayModal({ isOpen, onClose, token }: ModalCombinedProps) {
 
   const logoUri = useMemo(() => {
     let logoURI
-    if (jupiterTokens.length && bank) {
-      logoURI = jupiterTokens.find(
+    if (mangoTokens.length && bank) {
+      logoURI = mangoTokens.find(
         (t) => t.address === bank?.mint.toString()
       )!.logoURI
     }
     return logoURI
-  }, [bank, jupiterTokens])
+  }, [bank, mangoTokens])
 
   const { wallet } = useWallet()
   const walletTokens = mangoStore((s) => s.wallet.tokens)
diff --git a/components/modals/WithdrawModal.tsx b/components/modals/WithdrawModal.tsx
index 5471e421..5c0812cc 100644
--- a/components/modals/WithdrawModal.tsx
+++ b/components/modals/WithdrawModal.tsx
@@ -28,6 +28,7 @@ import { getMaxWithdrawForBank } from '../swap/useTokenMax'
 import MaxAmountButton from '@components/shared/MaxAmountButton'
 import HealthImpactTokenChange from '@components/HealthImpactTokenChange'
 import useMangoAccount from 'hooks/useMangoAccount'
+import useJupiterMints from 'hooks/useJupiterMints'
 
 interface WithdrawModalProps {
   token?: string
@@ -45,7 +46,7 @@ function WithdrawModal({ isOpen, onClose, token }: ModalCombinedProps) {
   )
   const [showTokenList, setShowTokenList] = useState(false)
   const [sizePercentage, setSizePercentage] = useState('')
-  const jupiterTokens = mangoStore((s) => s.jupiterTokens)
+  const { mangoTokens } = useJupiterMints()
   const { mangoAccount } = useMangoAccount()
 
   const bank = useMemo(() => {
@@ -55,13 +56,13 @@ function WithdrawModal({ isOpen, onClose, token }: ModalCombinedProps) {
 
   const logoUri = useMemo(() => {
     let logoURI
-    if (jupiterTokens.length) {
-      logoURI = jupiterTokens.find(
+    if (mangoTokens.length) {
+      logoURI = mangoTokens.find(
         (t) => t.address === bank?.mint.toString()
       )!.logoURI
     }
     return logoURI
-  }, [bank?.mint, jupiterTokens])
+  }, [bank?.mint, mangoTokens])
 
   const tokenMax = useMemo(() => {
     if (!bank || !mangoAccount || !group) return new Decimal(0)
diff --git a/components/shared/BalancesTable.tsx b/components/shared/BalancesTable.tsx
index cb1a2917..afdbca03 100644
--- a/components/shared/BalancesTable.tsx
+++ b/components/shared/BalancesTable.tsx
@@ -1,4 +1,5 @@
 import { Bank, Serum3Market } from '@blockworks-foundation/mango-v4'
+import useJupiterMints from 'hooks/useJupiterMints'
 import { QuestionMarkCircleIcon } from '@heroicons/react/20/solid'
 import mangoStore from '@store/mangoStore'
 import Decimal from 'decimal.js'
@@ -18,7 +19,7 @@ const BalancesTable = () => {
   const { mangoAccount } = useMangoAccount()
   const spotBalances = mangoStore((s) => s.mangoAccount.spotBalances)
   const group = mangoStore((s) => s.group)
-  const jupiterTokens = mangoStore((s) => s.jupiterTokens)
+  const { mangoTokens } = useJupiterMints()
   const { width } = useViewport()
   const showTableView = width ? width > breakpoints.md : false
 
@@ -69,8 +70,8 @@ const BalancesTable = () => {
             const bank = value[0]
 
             let logoURI
-            if (jupiterTokens.length) {
-              logoURI = jupiterTokens.find(
+            if (mangoTokens.length) {
+              logoURI = mangoTokens.find(
                 (t) => t.address === bank.mint.toString()
               )!.logoURI
             }
@@ -127,8 +128,8 @@ const BalancesTable = () => {
           const bank = value[0]
 
           let logoURI
-          if (jupiterTokens.length) {
-            logoURI = jupiterTokens.find(
+          if (mangoTokens.length) {
+            logoURI = mangoTokens.find(
               (t) => t.address === bank.mint.toString()
             )!.logoURI
           }
diff --git a/components/stats/SpotMarketsTable.tsx b/components/stats/SpotMarketsTable.tsx
index 6b5e0d2b..8696622c 100644
--- a/components/stats/SpotMarketsTable.tsx
+++ b/components/stats/SpotMarketsTable.tsx
@@ -11,6 +11,8 @@ import ContentBox from '../shared/ContentBox'
 import Change from '../shared/Change'
 import MarketLogos from '@components/trade/MarketLogos'
 import dynamic from 'next/dynamic'
+import { useCoingecko } from 'hooks/useCoingecko'
+import useMangoGroup from 'hooks/useMangoGroup'
 const SimpleAreaChart = dynamic(
   () => import('@components/shared/SimpleAreaChart'),
   { ssr: false }
@@ -18,8 +20,7 @@ const SimpleAreaChart = dynamic(
 
 const SpotMarketsTable = () => {
   const { t } = useTranslation('common')
-  const coingeckoPrices = mangoStore((s) => s.coingeckoPrices.data)
-  const loadingCoingeckoPrices = mangoStore((s) => s.coingeckoPrices.loading)
+  const { isLoading: loadingPrices, data: coingeckoPrices } = useCoingecko()
   const group = mangoStore((s) => s.group)
   const serumMarkets = mangoStore((s) => s.serumMarkets)
   const { theme } = useTheme()
@@ -74,7 +75,7 @@ const SpotMarketsTable = () => {
                     </div>
                   </td>
                   <td>
-                    {!loadingCoingeckoPrices ? (
+                    {!loadingPrices ? (
                       chartData !== undefined ? (
                         <SimpleAreaChart
                           color={
@@ -127,22 +128,17 @@ export default SpotMarketsTable
 
 const MobileSpotMarketItem = ({ market }: { market: Serum3Market }) => {
   const { t } = useTranslation('common')
-  const coingeckoPrices = mangoStore((s) => s.coingeckoPrices.data)
-  const loadingCoingeckoPrices = mangoStore((s) => s.coingeckoPrices.loading)
-  const group = mangoStore((s) => s.group)
+  const { isLoading: loadingPrices, data: coingeckoPrices } = useCoingecko()
+  const { group } = useMangoGroup()
   const { theme } = useTheme()
   const bank = group?.getFirstBankByTokenIndex(market.baseTokenIndex)
 
   const coingeckoData = useMemo(() => {
-    if (!loadingCoingeckoPrices && bank) {
-      return coingeckoPrices.find((asset) =>
-        bank.name === 'soETH'
-          ? asset.symbol === 'ETH'
-          : asset.symbol === bank?.name
-      )
+    if (!loadingPrices && bank) {
+      return coingeckoPrices.find((asset) => asset.symbol === bank?.name)
     }
     return null
-  }, [loadingCoingeckoPrices, bank])
+  }, [loadingPrices, bank])
 
   const change = useMemo(() => {
     if (coingeckoData) {
@@ -178,7 +174,7 @@ const MobileSpotMarketItem = ({ market }: { market: Serum3Market }) => {
             </div>
           </div>
         </div>
-        {!loadingCoingeckoPrices ? (
+        {!loadingPrices ? (
           chartData !== undefined ? (
             <SimpleAreaChart
               color={change >= 0 ? COLORS.GREEN[theme] : COLORS.RED[theme]}
diff --git a/components/stats/TokenStats.tsx b/components/stats/TokenStats.tsx
index 67a5cd7c..bd74fc80 100644
--- a/components/stats/TokenStats.tsx
+++ b/components/stats/TokenStats.tsx
@@ -18,12 +18,13 @@ import FlipNumbers from 'react-flip-numbers'
 import Tooltip from '@components/shared/Tooltip'
 import { Bank } from '@blockworks-foundation/mango-v4'
 import { useRouter } from 'next/router'
+import useJupiterMints from 'hooks/useJupiterMints'
 
 const TokenStats = () => {
   const { t } = useTranslation(['common', 'token'])
   const [showTokenDetails, setShowTokenDetails] = useState('')
   const group = mangoStore((s) => s.group)
-  const jupiterTokens = mangoStore((s) => s.jupiterTokens)
+  const { mangoTokens } = useJupiterMints()
   const { width } = useViewport()
   const showTableView = width ? width > breakpoints.md : false
   const router = useRouter()
@@ -141,8 +142,8 @@ const TokenStats = () => {
               const bank = value[0]
 
               let logoURI
-              if (jupiterTokens.length) {
-                logoURI = jupiterTokens.find(
+              if (mangoTokens.length) {
+                logoURI = mangoTokens.find(
                   (t) => t.address === bank.mint.toString()
                 )!.logoURI
               }
@@ -232,8 +233,8 @@ const TokenStats = () => {
           {banks.map(({ key, value }) => {
             const bank = value[0]
             let logoURI
-            if (jupiterTokens.length) {
-              logoURI = jupiterTokens.find(
+            if (mangoTokens.length) {
+              logoURI = mangoTokens.find(
                 (t) => t.address === bank.mint.toString()
               )!.logoURI
             }
diff --git a/components/swap/JupiterRouteInfo.tsx b/components/swap/JupiterRouteInfo.tsx
index de4ee288..a004545e 100644
--- a/components/swap/JupiterRouteInfo.tsx
+++ b/components/swap/JupiterRouteInfo.tsx
@@ -6,9 +6,6 @@ import React, {
   useState,
 } from 'react'
 import { TransactionInstruction, PublicKey } from '@solana/web3.js'
-import { toUiDecimals } from '@blockworks-foundation/mango-v4'
-import { Jupiter, RouteInfo, TransactionFeeInfo } from '@jup-ag/core'
-import JSBI from 'jsbi'
 import Decimal from 'decimal.js'
 
 import mangoStore from '@store/mangoStore'
@@ -31,10 +28,12 @@ import {
 } from '../../utils/numbers'
 import { notify } from '../../utils/notifications'
 import { useWallet } from '@solana/wallet-adapter-react'
+import useJupiterMints from '../../hooks/useJupiterMints'
+import { RouteInfo, TransactionFeeInfo } from 'types/jupiter'
+import useJupiterSwapData from './useJupiterSwapData'
 
 type JupiterRouteInfoProps = {
   amountIn: Decimal
-  jupiter: Jupiter | undefined
   onClose: () => void
   routes: RouteInfo[] | undefined
   selectedRoute: RouteInfo | undefined
@@ -43,14 +42,28 @@ type JupiterRouteInfoProps = {
 }
 
 const parseJupiterRoute = async (
-  jupiter: Jupiter,
   selectedRoute: RouteInfo,
   userPublicKey: PublicKey
 ): Promise<TransactionInstruction[]> => {
-  const { transactions } = await jupiter.exchange({
-    routeInfo: selectedRoute,
-    userPublicKey,
-  })
+  const transactions = await (
+    await fetch('https://quote-api.jup.ag/v3/swap', {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({
+        // route from /quote api
+        route: selectedRoute,
+        // user public key to be used for the swap
+        userPublicKey,
+        // auto wrap and unwrap SOL. default is true
+        wrapUnwrapSOL: true,
+        // feeAccount is optional. Use if you want to charge a fee.  feeBps must have been passed in /quote API.
+        // This is the ATA account for the output token where the fee will be sent to. If you are swapping from SOL->USDC then this would be the USDC ATA you want to collect the fee.
+        feeAccount: 'fee_account_public_key',
+      }),
+    })
+  ).json()
   const { swapTransaction } = transactions
   const instructions = []
   for (const ix of swapTransaction.instructions) {
@@ -72,7 +85,6 @@ const EMPTY_COINGECKO_PRICES = {
 const JupiterRouteInfo = ({
   amountIn,
   onClose,
-  jupiter,
   routes,
   selectedRoute,
   setSelectedRoute,
@@ -80,15 +92,11 @@ const JupiterRouteInfo = ({
   const { t } = useTranslation(['common', 'trade'])
   const [showRoutesModal, setShowRoutesModal] = useState(false)
   const [swapRate, setSwapRate] = useState<boolean>(false)
-  const [depositAndFee, setDepositAndFee] = useState<TransactionFeeInfo>()
   const [feeValue, setFeeValue] = useState<number | null>(null)
   const [submitting, setSubmitting] = useState(false)
   const [coingeckoPrices, setCoingeckoPrices] = useState(EMPTY_COINGECKO_PRICES)
-  const { connected } = useWallet()
-
-  const inputTokenInfo = mangoStore((s) => s.swap.inputTokenInfo)
-  const outputTokenInfo = mangoStore((s) => s.swap.outputTokenInfo)
-  const jupiterTokens = mangoStore((s) => s.jupiterTokens)
+  const { mangoTokens } = useJupiterMints()
+  const { inputTokenInfo, outputTokenInfo } = useJupiterSwapData()
   const inputBank = mangoStore((s) => s.swap.inputBank)
 
   const inputTokenIconUri = useMemo(() => {
@@ -102,18 +110,6 @@ const JupiterRouteInfo = ({
     )
   }, [selectedRoute, outputTokenInfo])
 
-  useEffect(() => {
-    const getDepositAndFee = async () => {
-      const fees = await selectedRoute?.getDepositAndFee()
-      if (fees) {
-        setDepositAndFee(fees)
-      }
-    }
-    if (selectedRoute && connected) {
-      getDepositAndFee()
-    }
-  }, [selectedRoute, connected])
-
   useEffect(() => {
     setCoingeckoPrices(EMPTY_COINGECKO_PRICES)
     const fetchTokenPrices = async () => {
@@ -140,7 +136,7 @@ const JupiterRouteInfo = ({
   }, [inputTokenInfo, outputTokenInfo])
 
   const onSwap = async () => {
-    if (!jupiter || !selectedRoute) return
+    if (!selectedRoute) return
     try {
       const client = mangoStore.getState().client
       const group = mangoStore.getState().group
@@ -151,11 +147,7 @@ const JupiterRouteInfo = ({
 
       if (!mangoAccount || !group || !inputBank || !outputBank) return
 
-      const ixs = await parseJupiterRoute(
-        jupiter,
-        selectedRoute,
-        mangoAccount!.owner
-      )
+      const ixs = await parseJupiterRoute(selectedRoute, mangoAccount!.owner)
 
       try {
         setSubmitting(true)
@@ -201,7 +193,9 @@ const JupiterRouteInfo = ({
 
     const remainingBalance =
       mangoAccount.getTokenDepositsUi(inputBank) - amountIn.toNumber()
-    return remainingBalance < 0 ? Math.abs(remainingBalance) : 0
+    const x = remainingBalance < 0 ? Math.abs(remainingBalance) : 0
+    console.log('borrowAmount', x)
+    return x
   }, [amountIn])
 
   const coinGeckoPriceDifference = useMemo(() => {
@@ -220,6 +214,8 @@ const JupiterRouteInfo = ({
       : new Decimal(0)
   }, [coingeckoPrices, amountIn, amountOut])
 
+  console.log('selectedRoute', selectedRoute)
+
   return routes?.length && selectedRoute && outputTokenInfo && amountOut ? (
     <div className="flex h-full flex-col justify-between">
       <div>
@@ -320,7 +316,7 @@ const JupiterRouteInfo = ({
             {outputTokenInfo?.decimals ? (
               <p className="text-right font-mono text-sm text-th-fgd-1">
                 {formatDecimal(
-                  JSBI.toNumber(selectedRoute?.otherAmountThreshold) /
+                  selectedRoute?.otherAmountThreshold /
                     10 ** outputTokenInfo.decimals || 1,
                   outputTokenInfo.decimals
                 )}{' '}
@@ -382,7 +378,7 @@ const JupiterRouteInfo = ({
                     includeSeparator = true
                   }
                   return (
-                    <span key={index}>{`${info.amm.label} ${
+                    <span key={index}>{`${info?.label} ${
                       includeSeparator ? 'x ' : ''
                     }`}</span>
                   )
@@ -402,21 +398,20 @@ const JupiterRouteInfo = ({
             </div>
           ) : (
             selectedRoute?.marketInfos.map((info, index) => {
-              const feeToken = jupiterTokens.find(
+              const feeToken = mangoTokens.find(
                 (item) => item?.address === info.lpFee?.mint
               )
               return (
                 <div className="flex justify-between" key={index}>
                   <p className="text-sm text-th-fgd-3">
                     {t('swap:fees-paid-to', {
-                      route: info?.amm?.label,
+                      route: info?.label,
                     })}
                   </p>
                   {feeToken?.decimals && (
                     <p className="text-right font-mono text-sm text-th-fgd-1">
                       {(
-                        JSBI.toNumber(info.lpFee?.amount) /
-                        Math.pow(10, feeToken.decimals)
+                        info.lpFee?.amount / Math.pow(10, feeToken.decimals)
                       ).toFixed(6)}{' '}
                       <span className="font-body tracking-wide">
                         {feeToken?.symbol}
diff --git a/components/swap/LeverageSlider.tsx b/components/swap/LeverageSlider.tsx
index c4dacce5..0a0db721 100644
--- a/components/swap/LeverageSlider.tsx
+++ b/components/swap/LeverageSlider.tsx
@@ -8,10 +8,12 @@ const LeverageSlider = ({
   amount,
   leverageMax,
   onChange,
+  step,
 }: {
   amount: number
   leverageMax: number
   onChange: (x: string) => any
+  step: number
 }) => {
   const [value, setValue] = useState(0)
   const inputEl = useRef<HTMLInputElement>(null)
@@ -58,7 +60,7 @@ const LeverageSlider = ({
         type="range"
         min="0"
         max={leverageMax}
-        step={inputTokenInfo ? 1 / 10 ** inputTokenInfo?.decimals : 6}
+        step={step}
         className="w-full"
         onChange={handleSliderChange}
         value={value}
@@ -71,10 +73,12 @@ export const SwapLeverageSlider = ({
   amount,
   onChange,
   useMargin,
+  step,
 }: {
   amount: number
   onChange: (x: string) => void
   useMargin: boolean
+  step: number
 }) => {
   const { mangoAccount } = useMangoAccount()
   const { amountWithBorrow } = useTokenMax(useMargin)
@@ -82,12 +86,18 @@ export const SwapLeverageSlider = ({
   return (
     <>
       {!mangoAccount ? (
-        <LeverageSlider amount={amount} leverageMax={100} onChange={onChange} />
+        <LeverageSlider
+          amount={amount}
+          leverageMax={100}
+          onChange={onChange}
+          step={step}
+        />
       ) : (
         <LeverageSlider
           amount={amount}
           leverageMax={amountWithBorrow.toNumber()}
           onChange={onChange}
+          step={step}
         />
       )}
     </>
diff --git a/components/swap/RoutesModal.tsx b/components/swap/RoutesModal.tsx
index 86a0cc20..d0ec171e 100644
--- a/components/swap/RoutesModal.tsx
+++ b/components/swap/RoutesModal.tsx
@@ -1,11 +1,9 @@
-import { RouteInfo } from '@jup-ag/core'
 import { Dispatch, SetStateAction } from 'react'
-import JSBI from 'jsbi'
 
-import mangoStore from '@store/mangoStore'
-import { Token } from '../../types/jupiter'
+import { RouteInfo, Token } from '../../types/jupiter'
 import { formatDecimal } from '../../utils/numbers'
 import Modal from '../shared/Modal'
+import useJupiterMints from '../../hooks/useJupiterMints'
 
 type RoutesModalProps = {
   onClose: () => void
@@ -26,7 +24,7 @@ const RoutesModal = ({
   inputTokenSymbol,
   outputTokenInfo,
 }: RoutesModalProps) => {
-  const tokens = mangoStore.getState().jupiterTokens
+  const { mangoTokens } = useJupiterMints()
 
   const handleSelectRoute = (route: RouteInfo) => {
     setSelectedRoute(route)
@@ -40,7 +38,7 @@ const RoutesModal = ({
       </div>
       <div className="thin-scroll max-h-96 overflow-y-auto overflow-x-hidden">
         {routes?.map((route, index) => {
-          const selected = selectedRoute === route
+          const selected = selectedRoute.outAmount === route.outAmount
           return (
             <div
               key={index}
@@ -66,7 +64,7 @@ const RoutesModal = ({
                           includeSeparator = true
                         }
                         return (
-                          <span key={index}>{`${info.amm.label} ${
+                          <span key={index}>{`${info.label} ${
                             includeSeparator ? 'x ' : ''
                           }`}</span>
                         )
@@ -81,7 +79,7 @@ const RoutesModal = ({
                           <span key={index}>
                             <span>
                               {
-                                tokens.find(
+                                mangoTokens.find(
                                   (item) =>
                                     item?.address === r?.outputMint?.toString()
                                 )?.symbol
@@ -95,8 +93,7 @@ const RoutesModal = ({
                   </div>
                   <div className="text-lg">
                     {formatDecimal(
-                      JSBI.toNumber(route.outAmount) /
-                        10 ** (outputTokenInfo?.decimals || 1),
+                      route.outAmount / 10 ** (outputTokenInfo?.decimals || 1),
                       6
                     )}
                   </div>
diff --git a/components/swap/SwapForm.tsx b/components/swap/SwapForm.tsx
index 64eb4065..b40f7561 100644
--- a/components/swap/SwapForm.tsx
+++ b/components/swap/SwapForm.tsx
@@ -7,7 +7,6 @@ import {
   ExclamationCircleIcon,
   LinkIcon,
 } from '@heroicons/react/20/solid'
-import { RouteInfo } from '@jup-ag/core'
 import NumberFormat, { NumberFormatValues } from 'react-number-format'
 import Decimal from 'decimal.js'
 import mangoStore from '@store/mangoStore'
@@ -24,19 +23,22 @@ import Button, { IconButton } from '../shared/Button'
 import ButtonGroup from '../forms/ButtonGroup'
 import Loading from '../shared/Loading'
 import { EnterBottomExitBottom } from '../shared/Transitions'
-import useJupiter from './useJupiter'
+import useJupiterRoutes from './useJupiterRoutes'
 import SwapSettings from './SwapSettings'
 import SheenLoader from '../shared/SheenLoader'
 import { HealthType } from '@blockworks-foundation/mango-v4'
 import {
   INPUT_TOKEN_DEFAULT,
+  MANGO_MINT,
   OUTPUT_TOKEN_DEFAULT,
+  USDC_MINT,
 } from '../../utils/constants'
 import { useTokenMax } from './useTokenMax'
 import MaxAmountButton from '@components/shared/MaxAmountButton'
 import HealthImpact from '@components/shared/HealthImpact'
 import { useWallet } from '@solana/wallet-adapter-react'
 import useMangoAccount from 'hooks/useMangoAccount'
+import { RouteInfo } from 'types/jupiter'
 
 const MAX_DIGITS = 11
 export const withValueLimit = (values: NumberFormatValues): boolean => {
@@ -53,15 +55,15 @@ const SwapForm = () => {
   const [showTokenSelect, setShowTokenSelect] = useState('')
   const [showSettings, setShowSettings] = useState(false)
   const [showConfirm, setShowConfirm] = useState(false)
-
-  const group = mangoStore.getState().group
+  console.log('amountInFormValue', amountInFormValue)
 
   const set = mangoStore.getState().set
-  const useMargin = mangoStore((s) => s.swap.margin)
-  const slippage = mangoStore((s) => s.swap.slippage)
-  const inputTokenInfo = mangoStore((s) => s.swap.inputTokenInfo)
-  const outputTokenInfo = mangoStore((s) => s.swap.outputTokenInfo)
-  const jupiterTokens = mangoStore((s) => s.jupiterTokens)
+  const {
+    margin: useMargin,
+    slippage,
+    inputBank,
+    outputBank,
+  } = mangoStore((s) => s.swap)
   const [debouncedAmountIn] = useDebounce(amountInFormValue, 300)
   const { mangoAccount } = useMangoAccount()
   const { connected } = useWallet()
@@ -72,16 +74,26 @@ const SwapForm = () => {
       : new Decimal(0)
   }, [debouncedAmountIn])
 
-  const { amountOut, jupiter, routes } = useJupiter({
-    inputTokenInfo,
-    outputTokenInfo,
+  const { bestRoute, routes } = useJupiterRoutes({
+    inputMint: inputBank?.mint.toString() || USDC_MINT,
+    outputMint: outputBank?.mint.toString() || MANGO_MINT,
     inputAmount: debouncedAmountIn,
     slippage,
   })
 
+  const outAmount: number = useMemo(() => {
+    return selectedRoute?.outAmount.toString()
+      ? new Decimal(selectedRoute.outAmount.toString())
+          .div(10 ** outputBank!.mintDecimals)
+          .toNumber()
+      : 0
+  }, [selectedRoute, outputBank])
+
   useEffect(() => {
-    setSelectedRoute(routes[0])
-  }, [routes])
+    if (bestRoute) {
+      setSelectedRoute(bestRoute)
+    }
+  }, [bestRoute])
 
   useEffect(() => {
     setAmountInFormValue('')
@@ -93,71 +105,50 @@ const SwapForm = () => {
 
   const handleTokenInSelect = useCallback(
     (mintAddress: string) => {
-      const inputTokenInfo = jupiterTokens.find(
-        (t: any) => t.address === mintAddress
-      )
       const group = mangoStore.getState().group
       if (group) {
         const bank = group.getFirstBankByMint(new PublicKey(mintAddress))
         set((s) => {
           s.swap.inputBank = bank
-          s.swap.inputTokenInfo = inputTokenInfo
         })
       }
       setShowTokenSelect('')
     },
-    [jupiterTokens, set]
+    [set]
   )
 
   const handleTokenOutSelect = useCallback(
     (mintAddress: string) => {
-      const outputTokenInfo = jupiterTokens.find(
-        (t: any) => t.address === mintAddress
-      )
       const group = mangoStore.getState().group
       if (group) {
         const bank = group.getFirstBankByMint(new PublicKey(mintAddress))
         set((s) => {
           s.swap.outputBank = bank
-          s.swap.outputTokenInfo = outputTokenInfo
         })
       }
       setShowTokenSelect('')
     },
-    [jupiterTokens, set]
+    [set]
   )
 
   const handleSwitchTokens = useCallback(() => {
-    if (amountIn?.gt(0)) {
-      setAmountInFormValue(amountOut.toString())
+    if (amountIn?.gt(0) && outAmount) {
+      setAmountInFormValue(outAmount.toString())
     }
     const inputBank = mangoStore.getState().swap.inputBank
     const outputBank = mangoStore.getState().swap.outputBank
     set((s) => {
       s.swap.inputBank = outputBank
       s.swap.outputBank = inputBank
-      s.swap.inputTokenInfo = outputTokenInfo
-      s.swap.outputTokenInfo = inputTokenInfo
     })
     setAnimateSwitchArrow(
       (prevanimateSwitchArrow) => prevanimateSwitchArrow + 1
     )
-  }, [inputTokenInfo, outputTokenInfo, set, amountOut, amountIn])
-
-  const currentMaintHealth = useMemo(() => {
-    if (!group || !mangoAccount) return 0
-    return mangoAccount.getHealthRatioUi(group, HealthType.maint)
-  }, [mangoAccount])
+  }, [set, outAmount, amountIn])
 
   const maintProjectedHealth = useMemo(() => {
     const group = mangoStore.getState().group
-    if (
-      !inputTokenInfo ||
-      !mangoAccount ||
-      !outputTokenInfo ||
-      !amountOut ||
-      !group
-    )
+    if (!inputBank || !mangoAccount || !outputBank || !outAmount || !group)
       return 0
 
     const simulatedHealthRatio =
@@ -165,12 +156,12 @@ const SwapForm = () => {
         group,
         [
           {
-            mintPk: new PublicKey(inputTokenInfo.address),
+            mintPk: inputBank.mint,
             uiTokenAmount: amountIn.toNumber() * -1,
           },
           {
-            mintPk: new PublicKey(outputTokenInfo.address),
-            uiTokenAmount: amountOut.toNumber(),
+            mintPk: outputBank.mint,
+            uiTokenAmount: outAmount,
           },
         ],
         HealthType.maint
@@ -180,15 +171,11 @@ const SwapForm = () => {
       : simulatedHealthRatio! < 0
       ? 0
       : Math.trunc(simulatedHealthRatio!)
-  }, [mangoAccount, inputTokenInfo, outputTokenInfo, amountIn, amountOut])
+  }, [mangoAccount, inputBank, outputBank, amountIn, outAmount])
 
   const loadingSwapDetails: boolean = useMemo(() => {
-    return (
-      !!amountIn.toNumber() && connected && (!selectedRoute || !outputTokenInfo)
-    )
-  }, [amountIn, connected, selectedRoute, outputTokenInfo])
-
-  const showHealthImpact = !!inputTokenInfo && !!outputTokenInfo && !!amountOut
+    return !!amountIn.toNumber() && connected && !selectedRoute
+  }, [amountIn, connected, selectedRoute])
 
   return (
     <ContentBox
@@ -211,7 +198,6 @@ const SwapForm = () => {
             onClose={() => setShowConfirm(false)}
             amountIn={amountIn}
             slippage={slippage}
-            jupiter={jupiter}
             routes={routes}
             selectedRoute={selectedRoute}
             setSelectedRoute={setSelectedRoute}
@@ -260,7 +246,7 @@ const SwapForm = () => {
         <div className="mb-3 grid grid-cols-2" id="swap-step-two">
           <div className="col-span-1 rounded-lg rounded-r-none border border-r-0 border-th-bkg-4 bg-th-bkg-1">
             <TokenSelect
-              tokenSymbol={inputTokenInfo?.symbol || INPUT_TOKEN_DEFAULT}
+              tokenSymbol={inputBank?.name || INPUT_TOKEN_DEFAULT}
               showTokenList={setShowTokenSelect}
               type="input"
             />
@@ -271,7 +257,7 @@ const SwapForm = () => {
               thousandSeparator=","
               allowNegative={false}
               isNumericString={true}
-              decimalScale={inputTokenInfo?.decimals || 6}
+              decimalScale={inputBank?.mintDecimals || 6}
               name="amountIn"
               id="amountIn"
               className="w-full rounded-r-lg border border-th-bkg-4 bg-th-bkg-1 p-3 text-right font-mono text-base font-bold text-th-fgd-1 focus:outline-none lg:text-lg xl:text-xl"
@@ -308,7 +294,7 @@ const SwapForm = () => {
         <div id="swap-step-three" className="mb-3 grid grid-cols-2">
           <div className="col-span-1 rounded-lg rounded-r-none border border-r-0 border-th-bkg-4 bg-th-bkg-1">
             <TokenSelect
-              tokenSymbol={outputTokenInfo?.symbol || OUTPUT_TOKEN_DEFAULT}
+              tokenSymbol={outputBank?.name || OUTPUT_TOKEN_DEFAULT}
               showTokenList={setShowTokenSelect}
               type="output"
             />
@@ -329,15 +315,13 @@ const SwapForm = () => {
                 thousandSeparator=","
                 allowNegative={false}
                 isNumericString={true}
-                decimalScale={outputTokenInfo?.decimals || 6}
+                decimalScale={outputBank?.mintDecimals || 6}
                 name="amountOut"
                 id="amountOut"
                 className="w-full rounded-r-lg bg-th-bkg-3 p-3 text-right font-mono text-base font-bold text-th-fgd-3 focus:outline-none lg:text-lg xl:text-xl"
                 placeholder="0.00"
                 disabled
-                value={
-                  amountOut ? numberFormat.format(amountOut.toNumber()) : ''
-                }
+                value={outAmount ? numberFormat.format(outAmount) : ''}
               />
             )}
           </div>
@@ -352,6 +336,7 @@ const SwapForm = () => {
               useMargin={useMargin}
               amount={amountIn.toNumber()}
               onChange={setAmountInFormValue}
+              step={1 / 10 ** (inputBank?.mintDecimals || 6)}
             />
           </>
         ) : null}
@@ -360,8 +345,8 @@ const SwapForm = () => {
           useMargin={useMargin}
           setShowConfirm={setShowConfirm}
           amountIn={amountIn}
-          inputSymbol={inputTokenInfo?.symbol}
-          amountOut={amountOut}
+          inputSymbol={inputBank?.name}
+          amountOut={selectedRoute ? outAmount : undefined}
         />
       </div>
       <div
@@ -385,7 +370,7 @@ const SwapFormSubmitButton = ({
   useMargin,
 }: {
   amountIn: Decimal
-  amountOut: Decimal
+  amountOut: number | undefined
   inputSymbol: string | undefined
   loadingSwapDetails: boolean
   setShowConfirm: (x: any) => any
@@ -400,10 +385,7 @@ const SwapFormSubmitButton = ({
     : tokenMax.lt(amountIn)
 
   const disabled =
-    !amountIn.toNumber() ||
-    !connected ||
-    showInsufficientBalance ||
-    !amountOut.gt(0)
+    !amountIn.toNumber() || !connected || showInsufficientBalance || !amountOut
 
   return (
     <Button
diff --git a/components/swap/SwapFormTokenList.tsx b/components/swap/SwapFormTokenList.tsx
index b3f9caee..98025b72 100644
--- a/components/swap/SwapFormTokenList.tsx
+++ b/components/swap/SwapFormTokenList.tsx
@@ -1,19 +1,13 @@
-import { memo, useMemo, useState, useEffect, ChangeEvent } from 'react'
-import Image from 'next/legacy/image'
+import { memo, useMemo, useEffect } from 'react'
 import { Token } from '../../types/jupiter'
 import mangoStore from '@store/mangoStore'
-import Input from '../forms/Input'
 import { IconButton } from '../shared/Button'
-import {
-  QuestionMarkCircleIcon,
-  MagnifyingGlassIcon,
-  XMarkIcon,
-} from '@heroicons/react/20/solid'
+import { XMarkIcon } from '@heroicons/react/20/solid'
 import { useTranslation } from 'next-i18next'
-import { floorToDecimal } from '../../utils/numbers'
 import Decimal from 'decimal.js'
 import { getTokenInMax } from './useTokenMax'
 import useMangoAccount from 'hooks/useMangoAccount'
+import useJupiterMints from 'hooks/useJupiterMints'
 
 const generateSearchTerm = (item: Token, searchValue: string) => {
   const normalizedSearchValue = searchValue.toLowerCase()
@@ -99,10 +93,8 @@ const SwapFormTokenList = ({
   useMargin: boolean
 }) => {
   const { t } = useTranslation(['common', 'swap'])
-  const [search, setSearch] = useState('')
-  const tokens = mangoStore.getState().jupiterTokens
-  const walletTokens = mangoStore((s) => s.wallet.tokens)
-  // const jupiterTokens = mangoStore((s) => s.jupiterTokens)
+  // const [search, setSearch] = useState('')
+  const { mangoTokens } = useJupiterMints()
   const inputBank = mangoStore((s) => s.swap.inputBank)
   const outputBank = mangoStore((s) => s.swap.outputBank)
   const group = mangoStore((s) => s.group)
@@ -128,13 +120,13 @@ const SwapFormTokenList = ({
 
   const tokenInfos = useMemo(() => {
     if (
-      tokens?.length &&
+      mangoTokens?.length &&
       group &&
       mangoAccount &&
       outputBank &&
       type === 'input'
     ) {
-      const filteredSortedTokens = tokens
+      const filteredSortedTokens = mangoTokens
         .map((token) => {
           const max = getTokenInMax(
             mangoAccount,
@@ -152,8 +144,8 @@ const SwapFormTokenList = ({
         )
 
       return filteredSortedTokens
-    } else if (tokens?.length) {
-      const filteredTokens = tokens
+    } else if (mangoTokens?.length) {
+      const filteredTokens = mangoTokens
         .map((token) => ({
           ...token,
           amount: new Decimal(0),
@@ -164,7 +156,7 @@ const SwapFormTokenList = ({
     } else {
       return []
     }
-  }, [tokens, walletTokens, inputBank, outputBank, mangoAccount, group])
+  }, [mangoTokens, inputBank, outputBank, mangoAccount, group, useMargin, type])
 
   // const handleUpdateSearch = (e: ChangeEvent<HTMLInputElement>) => {
   //   setSearch(e.target.value)
@@ -203,8 +195,8 @@ const SwapFormTokenList = ({
         <div className="mt-4 flex flex-wrap">
           {popularTokens.map((token) => {
             let logoURI
-            if (jupiterTokens.length) {
-              logoURI = jupiterTokens.find(
+            if (mangoTokens.length) {
+              logoURI = mangoTokens.find(
                 (t) => t.address === token.address
               )!.logoURI
             }
diff --git a/components/swap/SwapHistoryTable.tsx b/components/swap/SwapHistoryTable.tsx
index 411994b5..01b9c857 100644
--- a/components/swap/SwapHistoryTable.tsx
+++ b/components/swap/SwapHistoryTable.tsx
@@ -13,8 +13,7 @@ import { useViewport } from '../../hooks/useViewport'
 import { IconButton } from '../shared/Button'
 import { Transition } from '@headlessui/react'
 import SheenLoader from '../shared/SheenLoader'
-import { useWallet } from '@solana/wallet-adapter-react'
-import mangoStore, { SwapHistoryItem } from '@store/mangoStore'
+import { SwapHistoryItem } from '@store/mangoStore'
 import {
   countLeadingZeros,
   formatFixedDecimals,
@@ -26,6 +25,7 @@ import { EXPLORERS } from 'pages/settings'
 import Tooltip from '@components/shared/Tooltip'
 import { formatTokenSymbol } from 'utils/tokens'
 import useMangoAccount from 'hooks/useMangoAccount'
+import useJupiterMints from 'hooks/useJupiterMints'
 
 const SwapHistoryTable = ({
   swapHistory,
@@ -35,7 +35,7 @@ const SwapHistoryTable = ({
   loading: boolean
 }) => {
   const { t } = useTranslation(['common', 'settings'])
-  const jupiterTokens = mangoStore((s) => s.jupiterTokens)
+  const { mangoTokens } = useJupiterMints()
   const { mangoAccount } = useMangoAccount()
   const [showSwapDetails, setSwapDetails] = useState('')
   const { width } = useViewport()
@@ -95,11 +95,11 @@ const SwapHistoryTable = ({
                 const inSymbol = formatTokenSymbol(swap_in_symbol)
                 const outSymbol = formatTokenSymbol(swap_out_symbol)
 
-                if (jupiterTokens.length) {
-                  baseLogoURI = jupiterTokens.find(
+                if (mangoTokens.length) {
+                  baseLogoURI = mangoTokens.find(
                     (t) => t.symbol === inSymbol
                   )?.logoURI
-                  quoteLogoURI = jupiterTokens.find(
+                  quoteLogoURI = mangoTokens.find(
                     (t) => t.symbol === outSymbol
                   )?.logoURI
                 }
@@ -255,11 +255,11 @@ const SwapHistoryTable = ({
               const inSymbol = formatTokenSymbol(swap_in_symbol)
               const outSymbol = formatTokenSymbol(swap_out_symbol)
 
-              if (jupiterTokens.length) {
-                baseLogoURI = jupiterTokens.find(
+              if (mangoTokens.length) {
+                baseLogoURI = mangoTokens.find(
                   (t) => t.symbol === inSymbol
                 )?.logoURI
-                quoteLogoURI = jupiterTokens.find(
+                quoteLogoURI = mangoTokens.find(
                   (t) => t.symbol === outSymbol
                 )?.logoURI
               }
diff --git a/components/swap/SwapPage.tsx b/components/swap/SwapPage.tsx
index 829137e4..d432d117 100644
--- a/components/swap/SwapPage.tsx
+++ b/components/swap/SwapPage.tsx
@@ -9,8 +9,6 @@ import { IS_ONBOARDED_KEY } from 'utils/constants'
 const SwapTokenChart = dynamic(() => import('./SwapTokenChart'), { ssr: false })
 
 const SwapPage = () => {
-  const inputTokenInfo = mangoStore((s) => s.swap.inputTokenInfo)
-  const outputTokenInfo = mangoStore((s) => s.swap.outputTokenInfo)
   const { connected } = useWallet()
   const tourSettings = mangoStore((s) => s.settings.tours)
   const [isOnboarded] = useLocalStorageState(IS_ONBOARDED_KEY)
@@ -19,13 +17,7 @@ const SwapPage = () => {
     <>
       <div className="grid grid-cols-12">
         <div className="col-span-12 border-th-bkg-3 md:col-span-6 md:border-b lg:col-span-7 xl:col-span-8">
-          {inputTokenInfo?.extensions?.coingeckoId &&
-          outputTokenInfo?.extensions?.coingeckoId ? (
-            <SwapTokenChart
-              inputTokenId={inputTokenInfo?.extensions?.coingeckoId}
-              outputTokenId={outputTokenInfo?.extensions?.coingeckoId}
-            />
-          ) : null}
+          <SwapTokenChart />
         </div>
         <div className="col-span-12 mt-2 space-y-6 border-th-bkg-3 md:col-span-6 md:mt-0 md:border-b lg:col-span-5 xl:col-span-4">
           <SwapForm />
diff --git a/components/swap/SwapTokenChart.tsx b/components/swap/SwapTokenChart.tsx
index 57d3a2c0..054a6fd3 100644
--- a/components/swap/SwapTokenChart.tsx
+++ b/components/swap/SwapTokenChart.tsx
@@ -1,10 +1,4 @@
-import {
-  FunctionComponent,
-  useCallback,
-  useEffect,
-  useMemo,
-  useState,
-} from 'react'
+import { useEffect, useMemo, useState } from 'react'
 import dayjs from 'dayjs'
 import relativeTime from 'dayjs/plugin/relativeTime'
 import {
@@ -31,14 +25,10 @@ import { formatTokenSymbol } from 'utils/tokens'
 import { useQuery } from '@tanstack/react-query'
 import { fetchChartData } from 'apis/coingecko'
 import mangoStore from '@store/mangoStore'
+import useJupiterSwapData from './useJupiterSwapData'
 
 dayjs.extend(relativeTime)
 
-interface SwapTokenChartProps {
-  inputTokenId: string
-  outputTokenId: string
-}
-
 const CustomizedLabel = ({
   chartData,
   x,
@@ -77,21 +67,19 @@ const CustomizedLabel = ({
   } else return <div />
 }
 
-const SwapTokenChart: FunctionComponent<SwapTokenChartProps> = ({
-  inputTokenId,
-  outputTokenId,
-}) => {
-  const inputBank = mangoStore((s) => s.swap.inputBank)
-  const outputBank = mangoStore((s) => s.swap.outputBank)
-  const [baseTokenId, setBaseTokenId] = useState(inputTokenId)
-  const [quoteTokenId, setQuoteTokenId] = useState(outputTokenId)
+const SwapTokenChart = () => {
+  const { inputBank, outputBank } = mangoStore((s) => s.swap)
+  const { inputCoingeckoId, outputCoingeckoId } = useJupiterSwapData()
+  const [baseTokenId, setBaseTokenId] = useState(inputCoingeckoId)
+  const [quoteTokenId, setQuoteTokenId] = useState(outputCoingeckoId)
   const [mouseData, setMouseData] = useState<any>(null)
   const [daysToShow, setDaysToShow] = useState(1)
   const { theme } = useTheme()
+
   const chartDataQuery = useQuery(
     ['chart-data', baseTokenId, quoteTokenId, daysToShow],
     () => fetchChartData(baseTokenId, quoteTokenId, daysToShow),
-    { staleTime: 0 }
+    { staleTime: 0, enabled: !!baseTokenId && !!quoteTokenId }
   )
   const chartData = chartDataQuery.data
 
@@ -106,16 +94,16 @@ const SwapTokenChart: FunctionComponent<SwapTokenChartProps> = ({
   }
 
   useEffect(() => {
-    if (!inputTokenId || !outputTokenId) return
+    if (!inputCoingeckoId || !outputCoingeckoId) return
 
-    if (['usd-coin', 'tether'].includes(outputTokenId)) {
-      setBaseTokenId(inputTokenId)
-      setQuoteTokenId(outputTokenId)
+    if (['usd-coin', 'tether'].includes(outputCoingeckoId)) {
+      setBaseTokenId(inputCoingeckoId)
+      setQuoteTokenId(outputCoingeckoId)
     } else {
-      setBaseTokenId(outputTokenId)
-      setQuoteTokenId(inputTokenId)
+      setBaseTokenId(outputCoingeckoId)
+      setQuoteTokenId(inputCoingeckoId)
     }
-  }, [inputTokenId, outputTokenId])
+  }, [inputCoingeckoId, outputCoingeckoId])
 
   // const handleFlipChart = useCallback(() => {
   //   if (!baseTokenId || !quoteTokenId) return
@@ -144,7 +132,7 @@ const SwapTokenChart: FunctionComponent<SwapTokenChartProps> = ({
 
   return (
     <ContentBox hideBorder hidePadding className="h-full px-6 py-3">
-      {chartDataQuery?.isLoading ? (
+      {chartDataQuery?.isLoading || chartDataQuery.isFetching ? (
         <>
           <SheenLoader className="w-[148px] rounded-md">
             <div className="h-[18px] bg-th-bkg-2" />
@@ -159,14 +147,14 @@ const SwapTokenChart: FunctionComponent<SwapTokenChartProps> = ({
             <div className="h-[308px] bg-th-bkg-2" />
           </SheenLoader>
         </>
-      ) : chartData.length && baseTokenId && quoteTokenId ? (
+      ) : chartData?.length && baseTokenId && quoteTokenId ? (
         <div className="relative">
           <div className="flex items-start justify-between">
             <div>
               {inputBank && outputBank ? (
                 <div className="mb-0.5 flex items-center">
                   <p className="text-base text-th-fgd-3">
-                    {['usd-coin', 'tether'].includes(inputTokenId || '')
+                    {['usd-coin', 'tether'].includes(inputCoingeckoId || '')
                       ? `${formatTokenSymbol(
                           outputBank?.name?.toUpperCase()
                         )}/${inputBank?.name?.toUpperCase()}`
diff --git a/components/swap/TokenSelect.tsx b/components/swap/TokenSelect.tsx
index 3199536f..ec0058bd 100644
--- a/components/swap/TokenSelect.tsx
+++ b/components/swap/TokenSelect.tsx
@@ -3,7 +3,8 @@ import {
   QuestionMarkCircleIcon,
 } from '@heroicons/react/20/solid'
 import Image from 'next/legacy/image'
-import mangoStore from '@store/mangoStore'
+import useMangoGroup from 'hooks/useMangoGroup'
+import useJupiterMints from 'hooks/useJupiterMints'
 
 type TokenSelectProps = {
   tokenSymbol: string | undefined
@@ -16,14 +17,14 @@ const TokenSelect = ({
   showTokenList,
   type,
 }: TokenSelectProps) => {
-  const group = mangoStore((s) => s.group)
-  const jupiterTokens = mangoStore((s) => s.jupiterTokens)
+  const { group } = useMangoGroup()
+  const { mangoTokens } = useJupiterMints()
 
   if (!group) return null
 
   let logoURI
-  if (jupiterTokens.length) {
-    logoURI = jupiterTokens.find((t) => t.symbol === tokenSymbol)!.logoURI
+  if (mangoTokens.length) {
+    logoURI = mangoTokens.find((t) => t.symbol === tokenSymbol)!.logoURI
   }
 
   return (
diff --git a/components/swap/useJupiter.ts b/components/swap/useJupiter.ts
deleted file mode 100644
index 1a731558..00000000
--- a/components/swap/useJupiter.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-import { toUiDecimals } from '@blockworks-foundation/mango-v4'
-import { Jupiter, RouteInfo } from '@jup-ag/core'
-import { useEffect, useState } from 'react'
-import JSBI from 'jsbi'
-import Decimal from 'decimal.js'
-
-import mangoStore, { CLUSTER } from '@store/mangoStore'
-import { Token } from '../../types/jupiter'
-import { PublicKey } from '@solana/web3.js'
-
-type useJupiterPropTypes = {
-  inputTokenInfo: Token | undefined
-  outputTokenInfo: Token | undefined
-  inputAmount: string
-  slippage: number
-}
-
-type RouteParams = {
-  routes: RouteInfo[]
-  amountOut: Decimal
-}
-
-const defaultComputedInfo = {
-  routes: [],
-  amountOut: new Decimal(0),
-}
-
-const useJupiter = ({
-  inputTokenInfo,
-  outputTokenInfo,
-  inputAmount,
-  slippage,
-}: useJupiterPropTypes) => {
-  const [jupiter, setJupiter] = useState<Jupiter>()
-  const [computedInfo, setComputedInfo] =
-    useState<RouteParams>(defaultComputedInfo)
-
-  useEffect(() => {
-    const connection = mangoStore.getState().connection
-    const loadJupiter = async () => {
-      const jupiter = await Jupiter.load({
-        connection,
-        cluster: CLUSTER,
-        wrapUnwrapSOL: false,
-        // platformFeeAndAccounts:  NO_PLATFORM_FEE,
-        routeCacheDuration: 30_000, // Will not refetch data on computeRoutes for up to 10 seconds
-      })
-      setJupiter(jupiter)
-    }
-    try {
-      loadJupiter()
-    } catch (e) {
-      console.warn(e)
-    }
-  }, [])
-
-  useEffect(() => {
-    const group = mangoStore.getState().group
-    if (!group) return
-    const tokens = mangoStore.getState().jupiterTokens
-
-    const loadRoutes = async () => {
-      if (!outputTokenInfo || !inputTokenInfo) return
-      if (!inputAmount) {
-        setComputedInfo(defaultComputedInfo)
-      } else {
-        try {
-          const computedRoutes = await jupiter
-            ?.computeRoutes({
-              inputMint: new PublicKey(inputTokenInfo.address), // Mint address of the input token
-              outputMint: new PublicKey(outputTokenInfo.address), // Mint address of the output token
-              amount: JSBI.BigInt(
-                new Decimal(inputAmount).mul(10 ** inputTokenInfo.decimals)
-              ),
-              slippage, // The slippage in % terms
-              filterTopNResult: 10,
-              onlyDirectRoutes: true,
-            })
-            .catch((e) => {
-              console.error('Error computing Jupiter routes:', e)
-              return
-            })
-
-          const routesInfosWithoutRaydium = computedRoutes?.routesInfos.filter(
-            (r) => {
-              for (const mkt of r.marketInfos) {
-                if (mkt.amm.label === 'Raydium' || mkt.amm.label === 'Serum')
-                  return false
-              }
-
-              return true
-            }
-          )
-          if (routesInfosWithoutRaydium?.length) {
-            const bestRoute = routesInfosWithoutRaydium[0]
-
-            setComputedInfo({
-              routes: routesInfosWithoutRaydium,
-              amountOut: new Decimal(bestRoute.outAmount.toString()).div(
-                10 ** outputTokenInfo.decimals!
-              ),
-            })
-          }
-        } catch (e) {
-          console.warn(e)
-        }
-      }
-    }
-
-    loadRoutes()
-  }, [inputTokenInfo, outputTokenInfo, jupiter, slippage, inputAmount])
-
-  return { jupiter, ...computedInfo }
-}
-
-export default useJupiter
diff --git a/components/swap/useJupiterRoutes.ts b/components/swap/useJupiterRoutes.ts
new file mode 100644
index 00000000..65cba4ff
--- /dev/null
+++ b/components/swap/useJupiterRoutes.ts
@@ -0,0 +1,81 @@
+import { useQuery } from '@tanstack/react-query'
+import Decimal from 'decimal.js'
+import { RouteInfo } from 'types/jupiter'
+import useJupiterSwapData from './useJupiterSwapData'
+
+type useJupiterPropTypes = {
+  inputMint: string
+  outputMint: string
+  inputAmount: string
+  slippage: number
+}
+
+const fetchJupiterRoutes = async (
+  inputMint: string = 'So11111111111111111111111111111111111111112',
+  outputMint: string = 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v',
+  amount: number = 0,
+  slippageBps: number = 50,
+  feeBps: number = 0
+) => {
+  {
+    const params: any = {
+      inputMint: inputMint.toString(),
+      outputMint: outputMint.toString(),
+      amount,
+      slippageBps,
+      onlyDirectRoutes: 'true',
+      feeBps,
+    }
+
+    const paramsString = new URLSearchParams(params).toString()
+    const response = await fetch(
+      `https://quote-api.jup.ag/v1/quote?${paramsString}`
+    )
+
+    const res = await response.json()
+    const data = res.data
+
+    return {
+      routes: res.data,
+      bestRoute: data[0],
+    }
+  }
+}
+
+const useJupiterRoutes = ({
+  inputMint,
+  outputMint,
+  inputAmount,
+  slippage,
+}: useJupiterPropTypes) => {
+  const { inputTokenInfo } = useJupiterSwapData()
+
+  const amount = inputAmount
+    ? new Decimal(inputAmount).mul(10 ** (inputTokenInfo?.decimals || 6))
+    : new Decimal(0)
+
+  const res = useQuery<{ routes: RouteInfo[]; bestRoute: RouteInfo }, Error>(
+    ['swap-routes', inputMint, outputMint, inputAmount, slippage],
+    async () =>
+      fetchJupiterRoutes(inputMint, outputMint, amount.toNumber(), slippage),
+    {
+      enabled: inputAmount ? true : false,
+    }
+  )
+
+  return inputAmount
+    ? {
+        ...(res.data ?? {
+          routes: [],
+          bestRoute: undefined,
+        }),
+        isLoading: res.isLoading,
+      }
+    : {
+        routes: [],
+        bestRoute: undefined,
+        isLoading: false,
+      }
+}
+
+export default useJupiterRoutes
diff --git a/components/swap/useJupiterSwapData.ts b/components/swap/useJupiterSwapData.ts
new file mode 100644
index 00000000..f67abcce
--- /dev/null
+++ b/components/swap/useJupiterSwapData.ts
@@ -0,0 +1,33 @@
+import { useMemo } from 'react'
+import useJupiterMints from 'hooks/useJupiterMints'
+import mangoStore from '@store/mangoStore'
+
+const useJupiterSwapData = () => {
+  const inputBank = mangoStore((s) => s.swap.inputBank)
+  const outputBank = mangoStore((s) => s.swap.outputBank)
+  const { mangoTokens } = useJupiterMints()
+
+  const [inputTokenInfo, outputTokenInfo] = useMemo(() => {
+    if (inputBank && outputBank) {
+      return [
+        mangoTokens?.find(
+          (item) => item?.address === inputBank.mint.toString() || ''
+        ),
+        mangoTokens?.find(
+          (item) => item?.address === outputBank.mint.toString() || ''
+        ),
+      ]
+    } else {
+      return []
+    }
+  }, [inputBank, outputBank, mangoTokens])
+
+  return {
+    inputTokenInfo,
+    inputCoingeckoId: inputTokenInfo?.extensions?.coingeckoId,
+    outputTokenInfo,
+    outputCoingeckoId: outputTokenInfo?.extensions?.coingeckoId,
+  }
+}
+
+export default useJupiterSwapData
diff --git a/components/trade/AdvancedMarketHeader.tsx b/components/trade/AdvancedMarketHeader.tsx
index d8f3003b..7fe4f454 100644
--- a/components/trade/AdvancedMarketHeader.tsx
+++ b/components/trade/AdvancedMarketHeader.tsx
@@ -4,6 +4,7 @@ import TabUnderline from '@components/shared/TabUnderline'
 import { Popover } from '@headlessui/react'
 import { ChevronDownIcon } from '@heroicons/react/20/solid'
 import mangoStore from '@store/mangoStore'
+import { useCoingecko } from 'hooks/useCoingecko'
 import useOraclePrice from 'hooks/useOraclePrice'
 import { useTranslation } from 'next-i18next'
 import { useCallback, useMemo, useState } from 'react'
@@ -113,16 +114,14 @@ const MarketSelectDropdown = () => {
 const AdvancedMarketHeader = () => {
   const { t } = useTranslation(['common', 'trade'])
   const selectedMarket = mangoStore((s) => s.selectedMarket.current)
-  const coingeckoPrices = mangoStore((s) => s.coingeckoPrices.data)
-  const actions = mangoStore((s) => s.actions)
-  const serumMarkets = mangoStore((s) => s.serumMarkets)
+  const { data: tokenPrices } = useCoingecko()
   const oraclePrice = useOraclePrice()
 
   const baseSymbol = useMemo(() => {
     return selectedMarket?.name.split('/')[0]
   }, [selectedMarket])
 
-  const coingeckoData = coingeckoPrices.find((asset) =>
+  const coingeckoData = tokenPrices.find((asset) =>
     baseSymbol === 'soETH'
       ? asset.symbol === 'ETH'
       : asset.symbol === baseSymbol
diff --git a/components/trade/AdvancedTradeForm.tsx b/components/trade/AdvancedTradeForm.tsx
index d41c060d..8bc17710 100644
--- a/components/trade/AdvancedTradeForm.tsx
+++ b/components/trade/AdvancedTradeForm.tsx
@@ -36,6 +36,7 @@ import { TRADE_FORM_UI_KEY } from 'utils/constants'
 import SpotButtonGroup from './SpotButtonGroup'
 import PerpButtonGroup from './PerpButtonGroup'
 import SolBalanceWarnings from '@components/shared/SolBalanceWarnings'
+import useJupiterMints from 'hooks/useJupiterMints'
 
 const TABS: [string, number][] = [
   ['Limit', 0],
@@ -46,7 +47,7 @@ const AdvancedTradeForm = () => {
   const { t } = useTranslation(['common', 'trade'])
   const set = mangoStore.getState().set
   const tradeForm = mangoStore((s) => s.tradeForm)
-  const jupiterTokens = mangoStore((s) => s.jupiterTokens)
+  const { mangoTokens } = useJupiterMints()
   const selectedMarket = mangoStore((s) => s.selectedMarket.current)
   const [useMargin, setUseMargin] = useState(true)
   const [placingOrder, setPlacingOrder] = useState(false)
@@ -57,13 +58,13 @@ const AdvancedTradeForm = () => {
   }, [selectedMarket])
 
   const baseLogoURI = useMemo(() => {
-    if (!baseSymbol || !jupiterTokens.length) return ''
-    const token = jupiterTokens.find((t) => t.symbol === baseSymbol)
+    if (!baseSymbol || !mangoTokens.length) return ''
+    const token = mangoTokens.find((t) => t.symbol === baseSymbol)
     if (token) {
       return token.logoURI
     }
     return ''
-  }, [baseSymbol, jupiterTokens])
+  }, [baseSymbol, mangoTokens])
 
   const quoteBank = useMemo(() => {
     const group = mangoStore.getState().group
@@ -80,13 +81,13 @@ const AdvancedTradeForm = () => {
   }, [quoteBank])
 
   const quoteLogoURI = useMemo(() => {
-    if (!quoteSymbol || !jupiterTokens.length) return ''
-    const token = jupiterTokens.find((t) => t.symbol === quoteSymbol)
+    if (!quoteSymbol || !mangoTokens.length) return ''
+    const token = mangoTokens.find((t) => t.symbol === quoteSymbol)
     if (token) {
       return token.logoURI
     }
     return ''
-  }, [quoteSymbol, jupiterTokens])
+  }, [quoteSymbol, mangoTokens])
 
   const setTradeType = useCallback(
     (tradeType: 'Limit' | 'Market') => {
diff --git a/components/trade/MarketLogos.tsx b/components/trade/MarketLogos.tsx
index 23b8b128..1ba1a47d 100644
--- a/components/trade/MarketLogos.tsx
+++ b/components/trade/MarketLogos.tsx
@@ -1,4 +1,5 @@
 import { Serum3Market, PerpMarket } from '@blockworks-foundation/mango-v4'
+import useJupiterMints from 'hooks/useJupiterMints'
 import { QuestionMarkCircleIcon } from '@heroicons/react/20/solid'
 import mangoStore from '@store/mangoStore'
 import Image from 'next/legacy/image'
@@ -6,10 +7,10 @@ import { useMemo } from 'react'
 
 const MarketLogos = ({ market }: { market: Serum3Market | PerpMarket }) => {
   const group = mangoStore((s) => s.group)
-  const jupiterTokens = mangoStore((s) => s.jupiterTokens)
+  const { mangoTokens } = useJupiterMints()
 
   const logos = useMemo(() => {
-    if (!group || !jupiterTokens.length || !market)
+    if (!group || !mangoTokens.length || !market)
       return { baseLogoURI: '', quoteLogoURI: '' }
 
     let jupiterBaseToken, jupiterQuoteToken
@@ -17,14 +18,14 @@ const MarketLogos = ({ market }: { market: Serum3Market | PerpMarket }) => {
       const baseBank = group.getFirstBankByTokenIndex(market.baseTokenIndex)
       const quoteBank = group.getFirstBankByTokenIndex(market.quoteTokenIndex)
 
-      jupiterBaseToken = jupiterTokens.find(
+      jupiterBaseToken = mangoTokens.find(
         (t) => t.address === baseBank.mint.toString()
       )
-      jupiterQuoteToken = jupiterTokens.find(
+      jupiterQuoteToken = mangoTokens.find(
         (t) => t.address === quoteBank.mint.toString()
       )
     } else {
-      jupiterBaseToken = jupiterTokens.find(
+      jupiterBaseToken = mangoTokens.find(
         (t) => t.symbol === market.name.split('-')[0]
       )
     }
@@ -34,7 +35,7 @@ const MarketLogos = ({ market }: { market: Serum3Market | PerpMarket }) => {
       baseLogoURI,
       quoteLogoURI,
     }
-  }, [group, jupiterTokens, market])
+  }, [group, mangoTokens, market])
 
   return (
     <div
diff --git a/components/trade/PerpSlider.tsx b/components/trade/PerpSlider.tsx
index 6a66e7b0..f3862e19 100644
--- a/components/trade/PerpSlider.tsx
+++ b/components/trade/PerpSlider.tsx
@@ -1,7 +1,6 @@
-import { PerpMarket, Serum3Market } from '@blockworks-foundation/mango-v4'
+import { PerpMarket } from '@blockworks-foundation/mango-v4'
 import LeverageSlider from '@components/swap/LeverageSlider'
 import mangoStore from '@store/mangoStore'
-import Decimal from 'decimal.js'
 import useMangoAccount from 'hooks/useMangoAccount'
 import { useCallback, useMemo } from 'react'
 import { notify } from 'utils/notifications'
@@ -75,6 +74,7 @@ const PerpSlider = () => {
         }
         leverageMax={leverageMax}
         onChange={handleSlide}
+        step={0.01}
       />
     </div>
   )
diff --git a/components/trade/SpotSlider.tsx b/components/trade/SpotSlider.tsx
index 96033e74..36b7209a 100644
--- a/components/trade/SpotSlider.tsx
+++ b/components/trade/SpotSlider.tsx
@@ -74,6 +74,7 @@ const SpotSlider = () => {
         }
         leverageMax={leverageMax}
         onChange={handleSlide}
+        step={0.01}
       />
     </div>
   )
diff --git a/components/trade/UnsettledTrades.tsx b/components/trade/UnsettledTrades.tsx
index c7ff4497..4fd22ba0 100644
--- a/components/trade/UnsettledTrades.tsx
+++ b/components/trade/UnsettledTrades.tsx
@@ -20,7 +20,6 @@ const UnsettledTrades = ({
   const { t } = useTranslation(['common', 'trade'])
   const { mangoAccount } = useMangoAccount()
   const group = mangoStore((s) => s.group)
-  // const jupiterTokens = mangoStore((s) => s.jupiterTokens)
   const [settleMktAddress, setSettleMktAddress] = useState<string>('')
   const { width } = useViewport()
   const showTableView = width ? width > breakpoints.md : false
diff --git a/hooks/useCoingecko.ts b/hooks/useCoingecko.ts
new file mode 100644
index 00000000..6179d6cb
--- /dev/null
+++ b/hooks/useCoingecko.ts
@@ -0,0 +1,49 @@
+import { useQuery } from '@tanstack/react-query'
+import { Token } from 'types/jupiter'
+import useJupiterMints from './useJupiterMints'
+
+const fetchCoingecko = async (
+  mangoTokens: Token[]
+): Promise<{ prices: any[]; symbol: string }[]> => {
+  const coingeckoIds = mangoTokens.map((token) => ({
+    id: token.extensions?.coingeckoId,
+    symbol: token.symbol,
+  }))
+  const promises: any = []
+  for (const token of coingeckoIds) {
+    if (token.id) {
+      promises.push(
+        fetch(
+          `https://api.coingecko.com/api/v3/coins/${token.id}/market_chart?vs_currency=usd&days=1`
+        ).then((res) => res.json())
+      )
+    }
+  }
+
+  const data = await Promise.all(promises)
+  for (let i = 0; i < data.length; i++) {
+    data[i].symbol = coingeckoIds[i].symbol
+  }
+
+  return data || []
+}
+
+export const useCoingecko = () => {
+  const { mangoTokens } = useJupiterMints()
+
+  const res = useQuery<any[], Error>(
+    ['coingecko-tokens'],
+    () => fetchCoingecko(mangoTokens!),
+    {
+      cacheTime: 1000 * 60 * 2,
+      staleTime: 1000 * 60 * 2,
+      retry: true,
+      enabled: !!mangoTokens,
+    }
+  )
+
+  return {
+    isLoading: res.isLoading,
+    data: res.data || [],
+  }
+}
diff --git a/hooks/useJupiterMints.ts b/hooks/useJupiterMints.ts
new file mode 100644
index 00000000..8a5ba5ef
--- /dev/null
+++ b/hooks/useJupiterMints.ts
@@ -0,0 +1,51 @@
+import { Group } from '@blockworks-foundation/mango-v4'
+import { CLUSTER } from '@store/mangoStore'
+import { useQuery } from '@tanstack/react-query'
+import useMangoGroup from 'hooks/useMangoGroup'
+import { Token } from 'types/jupiter'
+
+const fetchJupiterTokens = async (group: Group) => {
+  const url =
+    CLUSTER === 'devnet'
+      ? 'https://api.jup.ag/api/tokens/devnet'
+      : 'https://cache.jup.ag/tokens'
+  const response = await fetch(url)
+  const data = await response.json()
+
+  const bankMints = Array.from(group!.banksMapByName.values()).map((b) =>
+    b[0].mint.toString()
+  )
+  const mangoTokens = data.filter((t: any) => bankMints.includes(t.address))
+
+  return {
+    mangoTokens,
+    jupiterTokens: data,
+  }
+}
+
+const useJupiterMints = (): {
+  mangoTokens: Token[]
+  jupiterTokens: Token[]
+  isFetching: boolean
+} => {
+  const { group } = useMangoGroup()
+
+  const res = useQuery<{ mangoTokens: Token[]; jupiterTokens: Token[] }, Error>(
+    ['jupiter-mango-tokens'],
+    () => fetchJupiterTokens(group!),
+    {
+      cacheTime: 1000 * 60 * 10,
+      staleTime: 1000 * 60 * 10,
+      retry: true,
+      enabled: !!group,
+    }
+  )
+
+  return {
+    mangoTokens: res?.data?.mangoTokens || [],
+    jupiterTokens: res?.data?.jupiterTokens || [],
+    isFetching: res?.isFetching || false,
+  }
+}
+
+export default useJupiterMints
diff --git a/hooks/useLocalStorageState.tsx b/hooks/useLocalStorageState.ts
similarity index 100%
rename from hooks/useLocalStorageState.tsx
rename to hooks/useLocalStorageState.ts
diff --git a/hooks/useMangoAccount.tsx b/hooks/useMangoAccount.ts
similarity index 100%
rename from hooks/useMangoAccount.tsx
rename to hooks/useMangoAccount.ts
diff --git a/hooks/useMangoGroup.ts b/hooks/useMangoGroup.ts
new file mode 100644
index 00000000..502b5ca2
--- /dev/null
+++ b/hooks/useMangoGroup.ts
@@ -0,0 +1,10 @@
+import { Group } from '@blockworks-foundation/mango-v4'
+import mangoStore from '@store/mangoStore'
+
+export default function useMangoGroup(): {
+  group: Group | undefined
+} {
+  const group = mangoStore((s) => s.group)
+
+  return { group }
+}
diff --git a/hooks/useOraclePrice.tsx b/hooks/useOraclePrice.ts
similarity index 100%
rename from hooks/useOraclePrice.tsx
rename to hooks/useOraclePrice.ts
diff --git a/hooks/useSolBalance.tsx b/hooks/useSolBalance.ts
similarity index 100%
rename from hooks/useSolBalance.tsx
rename to hooks/useSolBalance.ts
diff --git a/hooks/useUnsettledSpotBalances.tsx b/hooks/useUnsettledSpotBalances.ts
similarity index 100%
rename from hooks/useUnsettledSpotBalances.tsx
rename to hooks/useUnsettledSpotBalances.ts
diff --git a/package.json b/package.json
index a7cab479..be1bbc42 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,6 @@
     "@blockworks-foundation/mango-v4": "https://tylersssss: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@github.com/blockworks-foundation/mango-v4.git#main",
     "@headlessui/react": "^1.6.6",
     "@heroicons/react": "^2.0.10",
-    "@jup-ag/core": "^2.0.0-beta.3",
     "@project-serum/anchor": "0.25.0",
     "@solana/wallet-adapter-base": "^0.9.18",
     "@solana/wallet-adapter-react": "^0.15.24",
@@ -31,7 +30,6 @@
     "decimal.js": "^10.4.0",
     "html-react-parser": "^3.0.4",
     "immer": "^9.0.12",
-    "jsbi": "^4.3.0",
     "lodash": "^4.17.21",
     "next": "^13.0.0",
     "next-i18next": "^11.1.1",
@@ -55,6 +53,7 @@
     "@project-serum/serum": ">=0.13.62"
   },
   "devDependencies": {
+    "@types/big.js": "^6.1.6",
     "@types/node": "17.0.23",
     "@types/react": "18.0.3",
     "@types/react-dom": "18.0.0",
diff --git a/pages/token/[token].tsx b/pages/token/[token].tsx
index 8fe72f3b..4fe45e10 100644
--- a/pages/token/[token].tsx
+++ b/pages/token/[token].tsx
@@ -26,6 +26,9 @@ import ChartRangeButtons from '@components/shared/ChartRangeButtons'
 import dynamic from 'next/dynamic'
 import { LISTED_TOKENS } from 'utils/tokens'
 import useMangoAccount from 'hooks/useMangoAccount'
+import useMangoGroup from 'hooks/useMangoGroup'
+import useJupiterMints from 'hooks/useJupiterMints'
+import { useCoingecko } from 'hooks/useCoingecko'
 const PriceChart = dynamic(() => import('@components/token/PriceChart'), {
   ssr: false,
 })
@@ -74,13 +77,12 @@ const Token: NextPage = () => {
   const [loading, setLoading] = useState(true)
   const router = useRouter()
   const { token } = router.query
-  const group = mangoStore((s) => s.group)
+  const { group } = useMangoGroup()
   const { mangoAccount } = useMangoAccount()
-  const jupiterTokens = mangoStore((s) => s.jupiterTokens)
-  const coingeckoPrices = mangoStore((s) => s.coingeckoPrices.data)
+  const { mangoTokens } = useJupiterMints()
+  const { isLoading: loadingPrices, data: coingeckoPrices } = useCoingecko()
   const [chartData, setChartData] = useState<{ prices: any[] } | null>(null)
   const [loadChartData, setLoadChartData] = useState(true)
-  const loadingCoingeckoPrices = mangoStore((s) => s.coingeckoPrices.loading)
   const [daysToShow, setDaysToShow] = useState<number>(1)
 
   const bank = useMemo(() => {
@@ -95,18 +97,18 @@ const Token: NextPage = () => {
   }, [group, token])
 
   const logoURI = useMemo(() => {
-    if (bank && jupiterTokens.length) {
-      return jupiterTokens.find((t) => t.address === bank.mint.toString())
+    if (bank && mangoTokens.length) {
+      return mangoTokens.find((t) => t.address === bank.mint.toString())
         ?.logoURI
     }
-  }, [bank, jupiterTokens])
+  }, [bank, mangoTokens])
 
   const coingeckoId = useMemo(() => {
-    if (bank && jupiterTokens.length) {
-      return jupiterTokens.find((t) => t.address === bank.mint.toString())
+    if (bank && mangoTokens.length) {
+      return mangoTokens.find((t) => t.address === bank.mint.toString())
         ?.extensions?.coingeckoId
     }
-  }, [bank, jupiterTokens])
+  }, [bank, mangoTokens])
 
   const serumMarkets = useMemo(() => {
     if (group) {
@@ -137,13 +139,13 @@ const Token: NextPage = () => {
     return data
   }
 
-  const getCoingeckoData = async (id: string) => {
-    const response = await fetchTokenInfo(id)
-    setCoingeckoData(response)
-    setLoading(false)
-  }
-
   useEffect(() => {
+    const getCoingeckoData = async (id: string) => {
+      const response = await fetchTokenInfo(id)
+      setCoingeckoData(response)
+      setLoading(false)
+    }
+
     if (coingeckoId) {
       getCoingeckoData(coingeckoId)
     }
@@ -168,16 +170,15 @@ const Token: NextPage = () => {
   } = coingeckoData ? coingeckoData.market_data : DEFAULT_COINGECKO_VALUES
 
   const loadingChart = useMemo(() => {
-    return daysToShow == 1 ? loadingCoingeckoPrices : loadChartData
-  }, [loadChartData, loadingCoingeckoPrices])
+    return daysToShow == 1 ? loadingPrices : loadChartData
+  }, [loadChartData, loadingPrices])
 
   const coingeckoTokenPrices = useMemo(() => {
     if (daysToShow === 1 && coingeckoPrices.length && bank) {
-      const tokenPriceData = coingeckoPrices.find((asset) =>
-        bank?.name === 'soETH'
-          ? asset.symbol === 'ETH'
-          : asset.symbol === bank.name
+      const tokenPriceData = coingeckoPrices.find(
+        (asset) => asset.symbol === bank.name
       )
+
       if (tokenPriceData) {
         return tokenPriceData.prices
       }
diff --git a/store/mangoStore.ts b/store/mangoStore.ts
index d732d199..1d625da3 100644
--- a/store/mangoStore.ts
+++ b/store/mangoStore.ts
@@ -4,7 +4,6 @@ import create from 'zustand'
 import { subscribeWithSelector } from 'zustand/middleware'
 import { AnchorProvider, Wallet, web3 } from '@project-serum/anchor'
 import { Connection, Keypair, PublicKey } from '@solana/web3.js'
-import { TOKEN_LIST_URL } from '@jup-ag/core'
 import { OpenOrders, Order } from '@project-serum/serum/lib/market'
 import { Wallet as WalletAdapter } from '@solana/wallet-adapter-react'
 import {
@@ -45,7 +44,7 @@ export const connection = new web3.Connection(
   'processed'
 )
 const options = AnchorProvider.defaultOptions()
-export const CLUSTER = 'mainnet-beta'
+export const CLUSTER: 'mainnet-beta' | 'devnet' = 'mainnet-beta'
 const wallet = new EmptyWallet(Keypair.generate())
 const DEFAULT_PROVIDER = new AnchorProvider(connection, wallet, options)
 DEFAULT_PROVIDER.opts.skipPreflight = true
@@ -164,16 +163,11 @@ export type MangoStore = {
     initialLoad: boolean
     loading: boolean
   }
-  coingeckoPrices: {
-    data: any[]
-    loading: boolean
-  }
   connected: boolean
   connection: Connection
   group: Group | undefined
   groupLoaded: boolean
   client: MangoClient
-  jupiterTokens: Token[]
   mangoAccount: {
     current: MangoAccount | undefined
     initialLoad: boolean
@@ -246,9 +240,7 @@ export type MangoStore = {
       mangoAccountPk: string,
       range: number
     ) => Promise<void>
-    fetchCoingeckoPrices: () => Promise<void>
     fetchGroup: () => Promise<void>
-    fetchJupiterTokens: () => Promise<void>
     reloadMangoAccount: () => Promise<void>
     fetchMangoAccounts: (wallet: Wallet) => Promise<void>
     fetchNfts: (connection: Connection, walletPk: PublicKey) => void
@@ -270,16 +262,11 @@ const mangoStore = create<MangoStore>()(
         initialLoad: false,
         loading: true,
       },
-      coingeckoPrices: {
-        data: [],
-        loading: false,
-      },
       connected: false,
       connection,
       group: undefined,
       groupLoaded: false,
       client: DEFAULT_CLIENT,
-      jupiterTokens: [],
       mangoAccount: {
         current: undefined,
         initialLoad: true,
@@ -477,45 +464,6 @@ const mangoStore = create<MangoStore>()(
             })
           }
         },
-        fetchCoingeckoPrices: async () => {
-          const set = get().set
-          set((state) => {
-            state.coingeckoPrices.loading = true
-          })
-          try {
-            const jupiterTokens = mangoStore.getState().jupiterTokens
-            if (jupiterTokens.length) {
-              const coingeckoIds = jupiterTokens.map((token) => ({
-                id: token.extensions?.coingeckoId,
-                symbol: token.symbol,
-              }))
-              const promises: any = []
-              for (const token of coingeckoIds) {
-                if (token.id) {
-                  promises.push(
-                    fetch(
-                      `https://api.coingecko.com/api/v3/coins/${token.id}/market_chart?vs_currency=usd&days=1`
-                    ).then((res) => res.json())
-                  )
-                }
-              }
-
-              const data = await Promise.all(promises)
-              for (let i = 0; i < data.length; i++) {
-                data[i].symbol = coingeckoIds[i].symbol
-              }
-              set((state) => {
-                state.coingeckoPrices.data = data
-                state.coingeckoPrices.loading = false
-              })
-            }
-          } catch (e) {
-            console.warn('Unable to load Coingecko prices')
-            set((state) => {
-              state.coingeckoPrices.loading = false
-            })
-          }
-        },
         fetchGroup: async () => {
           try {
             const set = get().set
@@ -771,38 +719,6 @@ const mangoStore = create<MangoStore>()(
             })
           }
         },
-        fetchJupiterTokens: async () => {
-          const set = mangoStore.getState().set
-          const group = mangoStore.getState().group
-          if (!group) {
-            console.error(
-              'Mango group unavailable; Loading jupiter tokens failed'
-            )
-            return
-          }
-          const bankMints = Array.from(group.banksMapByName.values()).map((b) =>
-            b[0].mint.toString()
-          )
-
-          fetch(TOKEN_LIST_URL[CLUSTER])
-            .then((response) => response.json())
-            .then((result) => {
-              const groupTokens = result.filter((t: any) =>
-                bankMints.includes(t.address)
-              )
-              const inputTokenInfo = groupTokens.find(
-                (t: any) => t.symbol === INPUT_TOKEN_DEFAULT
-              )
-              const outputTokenInfo = groupTokens.find(
-                (t: any) => t.symbol === OUTPUT_TOKEN_DEFAULT
-              )
-              set((s) => {
-                s.swap.inputTokenInfo = inputTokenInfo
-                s.swap.outputTokenInfo = outputTokenInfo
-                s.jupiterTokens = groupTokens
-              })
-            })
-        },
         connectMangoClientWithWallet: async (wallet: WalletAdapter) => {
           const set = get().set
           try {
diff --git a/types/jupiter.ts b/types/jupiter.ts
index dde80056..1de80bfe 100644
--- a/types/jupiter.ts
+++ b/types/jupiter.ts
@@ -1,6 +1,134 @@
-import { RouteInfo } from '@jup-ag/core'
+import { AccountMeta } from '@solana/web3.js'
+import { AccountInfo } from '@solana/web3.js'
 import Decimal from 'decimal.js'
 
+export declare type SideType = typeof Side.Ask | typeof Side.Bid
+export declare const Side: {
+  Bid: {
+    bid: {}
+  }
+  Ask: {
+    ask: {}
+  }
+}
+
+export interface QuoteParams {
+  sourceMint: string
+  destinationMint: string
+  amount: number
+  swapMode: SwapMode
+}
+export declare type TokenMintAddress = string
+export interface Quote {
+  notEnoughLiquidity: boolean
+  minInAmount?: number
+  minOutAmount?: number
+  inAmount: number
+  outAmount: number
+  feeAmount: number
+  feeMint: TokenMintAddress
+  feePct: number
+  priceImpactPct: number
+}
+export declare type QuoteMintToReferrer = Map<TokenMintAddress, string>
+export interface SwapParams {
+  sourceMint: string
+  destinationMint: string
+  userSourceTokenAccount: string
+  userDestinationTokenAccount: string
+  userTransferAuthority: string
+  /**
+   * amount is used for instruction and can be null when it is an intermediate swap, only the first swap has an amount
+   */
+  amount: number
+  swapMode: SwapMode
+  openOrdersAddress?: string
+  quoteMintToReferrer?: QuoteMintToReferrer
+}
+export declare type PlatformFee = {
+  feeBps: number
+  feeAccount: string
+}
+export interface ExactOutSwapParams extends SwapParams {
+  inAmount: number
+  slippageBps: number
+  platformFee?: PlatformFee
+  overflowFeeAccount?: string
+}
+export declare type AccountInfoMap = Map<string, AccountInfo<Buffer> | null>
+
+declare type AmmLabel =
+  | 'Aldrin'
+  | 'Crema'
+  | 'Cropper'
+  | 'Cykura'
+  | 'DeltaFi'
+  | 'GooseFX'
+  | 'Invariant'
+  | 'Lifinity'
+  | 'Lifinity V2'
+  | 'Marinade'
+  | 'Mercurial'
+  | 'Meteora'
+  | 'Raydium'
+  | 'Raydium CLMM'
+  | 'Saber'
+  | 'Serum'
+  | 'Orca'
+  | 'Step'
+  | 'Penguin'
+  | 'Saros'
+  | 'Stepn'
+  | 'Orca (Whirlpools)'
+  | 'Sencha'
+  | 'Saber (Decimals)'
+  | 'Dradex'
+  | 'Balansol'
+  | 'Openbook'
+  | 'Unknown'
+
+export interface TransactionFeeInfo {
+  signatureFee: number
+  openOrdersDeposits: number[]
+  ataDeposits: number[]
+  totalFeeAndDeposits: number
+  minimumSOLForTransaction: number
+}
+
+export declare enum SwapMode {
+  ExactIn = 'ExactIn',
+  ExactOut = 'ExactOut',
+}
+
+export interface Fee {
+  amount: number
+  mint: string
+  pct: number
+}
+export interface MarketInfo {
+  id: string
+  inAmount: number
+  inputMint: string
+  label: string
+  lpFee: Fee
+  notEnoughLiquidity: boolean
+  outAmount: number
+  outputMint: string
+  platformFee: Fee
+  priceImpactPct: number
+}
+
+export interface RouteInfo {
+  amount: number
+  inAmount: number
+  marketInfos: MarketInfo[]
+  otherAmountThreshold: number
+  outAmount: number
+  priceImpactPct: number
+  slippageBps: number
+  swapMode: SwapMode
+}
+
 export type Routes = {
   routesInfos: RouteInfo[]
   cached: boolean
diff --git a/utils/constants.ts b/utils/constants.ts
index 71daa739..bd91de30 100644
--- a/utils/constants.ts
+++ b/utils/constants.ts
@@ -3,7 +3,8 @@ export const LAST_ACCOUNT_KEY = 'mangoAccount-0.1'
 export const CLIENT_TX_TIMEOUT = 90000
 
 export const INPUT_TOKEN_DEFAULT = 'USDC'
-
+export const MANGO_MINT = 'MangoCzJ36AjZyKwVj3VnYU4GTonjfVEnJmvvWaxLac'
+export const USDC_MINT = 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v'
 export const OUTPUT_TOKEN_DEFAULT = 'SOL'
 
 export const IS_ONBOARDED_KEY = 'isOnboarded-0.1'
diff --git a/yarn.lock b/yarn.lock
index cee946b3..5e7e84c5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -73,18 +73,6 @@
     eip1193-provider "^1.0.1"
     js-sha3 "^0.8.0"
 
-"@cykura/sdk-core@npm:@jup-ag/cykura-sdk-core@0.1.8", "@jup-ag/cykura-sdk-core@0.1.8":
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/@jup-ag/cykura-sdk-core/-/cykura-sdk-core-0.1.8.tgz#ba8724644e18d1006422dbba5c7701360a729b91"
-  integrity sha512-bVtDA4oEuzj/amuTPVlk1OFpdlYKK6H9nKWg6Tv6mn6MydS/ArC2EY2zuMHtWP+1YJ5CAwxHL/7Kl1k+7XBSoQ==
-  dependencies:
-    "@project-serum/anchor" "^0.22.0"
-    big.js "^5.2.2"
-    decimal.js "^10.3.1"
-    jsbi "^4.1.0"
-    tiny-invariant "^1.1.0"
-    toformat "^2.0.0"
-
 "@eslint/eslintrc@^1.3.0":
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.0.tgz#29f92c30bb3e771e4a2048c95fa6855392dfac4f"
@@ -140,18 +128,6 @@
   resolved "https://registry.yarnpkg.com/@hapi/bourne/-/bourne-2.1.0.tgz#66aff77094dc3080bd5df44ec63881f2676eb020"
   integrity sha512-i1BpaNDVLJdRBEKeJWkVO6tYX6DMFBuwMhSuWqLsY4ufeTKGVuV5rBsUhxPayXqnnWHgXUAmWK16H/ykO5Wj4Q==
 
-"@hapi/hoek@^9.0.0":
-  version "9.3.0"
-  resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.3.0.tgz#8368869dcb735be2e7f5cb7647de78e167a251fb"
-  integrity sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==
-
-"@hapi/topo@^5.0.0":
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-5.1.0.tgz#dc448e332c6c6e37a4dc02fd84ba8d44b9afb012"
-  integrity sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==
-  dependencies:
-    "@hapi/hoek" "^9.0.0"
-
 "@headlessui/react@^1.6.6":
   version "1.6.6"
   resolved "https://registry.yarnpkg.com/@headlessui/react/-/react-1.6.6.tgz#3073c066b85535c9d28783da0a4d9288b5354d0c"
@@ -211,90 +187,6 @@
     "@json-rpc-tools/types" "^1.7.6"
     "@pedrouid/environment" "^1.0.1"
 
-"@jup-ag/core@^2.0.0-beta.3":
-  version "2.0.0-beta.7"
-  resolved "https://registry.yarnpkg.com/@jup-ag/core/-/core-2.0.0-beta.7.tgz#d8006d87b08e22840d994f62714b3b831109656f"
-  integrity sha512-hU/0AADRyZKiqcST0uqnW6pbpXEhry+LQN7ivid4kLSZdFy1enBVfZyLh2ig+SRMuiUn8h7iFs506CLkYWpOHg==
-  dependencies:
-    "@jup-ag/crema-sdk" "2.0.7"
-    "@jup-ag/cykura-sdk" "0.1.25"
-    "@jup-ag/cykura-sdk-core" "0.1.8"
-    "@jup-ag/lifinity-sdk" "0.1.72"
-    "@jup-ag/math" "2.0.0-beta.7"
-    "@jup-ag/whirlpool-sdk" "0.1.1"
-    "@mercurial-finance/optimist" "0.1.7"
-    "@project-serum/anchor" "0.24.2"
-    "@project-serum/serum" "0.13.65"
-    "@saberhq/stableswap-sdk" "1.13.6"
-    "@solana/spl-token" "0.1.8"
-    bn.js "5.2.1"
-    cross-fetch "3.1.5"
-    decimal.js "10.3.1"
-    js-sha256 "~0.9.0"
-    jsbi "4.3.0"
-    promise-retry "2.0.1"
-
-"@jup-ag/crema-sdk@2.0.7":
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/@jup-ag/crema-sdk/-/crema-sdk-2.0.7.tgz#f9f19b07d6d32bd85eff9c8ba41c89b7a059cd42"
-  integrity sha512-EW1B36g2p1xZsXYLdY98pVP9yiI1viZBIIbfWZ9vVue1PDudsU8dNZXyjtnLbOBuRpT6QYecF/FTXcgLEjY7xg==
-  dependencies:
-    "@saberhq/solana-contrib" "^1.12.66"
-    "@saberhq/token-utils" "^1.12.66"
-    "@solana/buffer-layout" "^4.0.0"
-    "@solana/spl-token" "^0.1.8"
-    "@solana/spl-token-v2" "npm:@solana/spl-token@0.2.0"
-    "@solana/web3.js" "^1.36.0"
-    bn.js "^5.2.0"
-    bs58 "^5.0.0"
-    decimal.js "^10.3.1"
-    jsbi "^4.2.0"
-    tiny-invariant "^1.2.0"
-
-"@jup-ag/cykura-sdk@0.1.25":
-  version "0.1.25"
-  resolved "https://registry.yarnpkg.com/@jup-ag/cykura-sdk/-/cykura-sdk-0.1.25.tgz#03b73f9bb580cccb02e6240e43562330e0f396b6"
-  integrity sha512-DuBcN7SKN3l9lS7l5zADITVeuTEQxwNW7QB7GzcsZiGysauok6z4GIaYUrqGgZ6Vtqa6tJhFAQu9wlylozRlXw==
-  dependencies:
-    "@cykura/sdk-core" "npm:@jup-ag/cykura-sdk-core@0.1.8"
-    "@project-serum/anchor" "^0.22.1"
-    "@solana/web3.js" "^1.32.0"
-    tiny-invariant "^1.1.0"
-
-"@jup-ag/lifinity-sdk@0.1.72":
-  version "0.1.72"
-  resolved "https://registry.yarnpkg.com/@jup-ag/lifinity-sdk/-/lifinity-sdk-0.1.72.tgz#ef120303d99cd371fbff9b04d63d8cb3b92c6d9b"
-  integrity sha512-nHfpaSFsLGjXg9xG/6k4Miik9X4MuGGi5KxYdtSe2a4vR8fQxXNxY/1ATPObAsy2dKV8K7ppkUSwahbXOtLvdQ==
-  dependencies:
-    "@project-serum/anchor" "^0.20.1"
-    "@project-serum/borsh" "^0.2.5"
-    "@project-serum/serum" "^0.13.61"
-    "@pythnetwork/client" "^2.5.1"
-    "@solana/spl-token" "^0.1.8"
-    "@solana/web3.js" "1.31.0"
-    decimal.js "^10.3.1"
-
-"@jup-ag/math@2.0.0-beta.7":
-  version "2.0.0-beta.7"
-  resolved "https://registry.yarnpkg.com/@jup-ag/math/-/math-2.0.0-beta.7.tgz#8efb3ec79077e028f06f92fd5d065ac9e4c7c5f6"
-  integrity sha512-+t3cxJlI8HIS9hJHUSSTdsxIwSLPhlO6KVauLr+eCn7ksd4GTQ144NWId3HwDuVoTdeFJKfiubTZ5O8hydbSoQ==
-  dependencies:
-    decimal.js "10.3.1"
-    jsbi "4.3.0"
-
-"@jup-ag/whirlpool-sdk@0.1.1":
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/@jup-ag/whirlpool-sdk/-/whirlpool-sdk-0.1.1.tgz#f305bea2cf205994b87358ee5ad667d3c84c320e"
-  integrity sha512-GaEnG+T4ltQ3eKLVEnBRpatrRsR1v6t6epnp/hlXDTxiHyfFaVK/gmfi6ckCXs+npL/y39OtwsO0QV2zkOJdcg==
-  dependencies:
-    "@orca-so/whirlpool-client-sdk" "npm:@jup-ag/whirlpool-client-sdk@0.0.8"
-    "@project-serum/anchor" "~0.23.0"
-    "@solana/spl-token" "~0.1.8"
-    axios "^0.25.0"
-    bn.js "~5.2.0"
-    decimal.js "~10.3.1"
-    tiny-invariant "~1.2.0"
-
 "@keystonehq/bc-ur-registry-sol@^0.3.1":
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/@keystonehq/bc-ur-registry-sol/-/bc-ur-registry-sol-0.3.1.tgz#5319c7c4a22cc83bbacfa6fe09aaa6fb21363f24"
@@ -378,13 +270,6 @@
   resolved "https://registry.yarnpkg.com/@ledgerhq/logs/-/logs-6.10.0.tgz#c012c1ecc1a0e53d50e6af381618dca5268461c1"
   integrity sha512-lLseUPEhSFUXYTKj6q7s2O3s2vW2ebgA11vMAlKodXGf5AFw4zUoEbTz9CoFOC9jS6xY4Qr8BmRnxP/odT4Uuw==
 
-"@mercurial-finance/optimist@0.1.7":
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/@mercurial-finance/optimist/-/optimist-0.1.7.tgz#2ac2452f42353b25186b73fc3dbc8f0c9d4888f9"
-  integrity sha512-Ohjj9IjyJINt1OLkcvaD4pZ0X+mPIWpjaFXLTUgh2Gc0YYGBruBZGQiWNkUzeMJBGpaZlpKVWfGmFWIt6JuDGw==
-  dependencies:
-    promise-retry "2.0.1"
-
 "@metaplex-foundation/mpl-core@^0.0.2":
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/@metaplex-foundation/mpl-core/-/mpl-core-0.0.2.tgz#17ee2cc216e17629d6df1dbba75964625ebbd603"
@@ -528,17 +413,6 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@orca-so/whirlpool-client-sdk@npm:@jup-ag/whirlpool-client-sdk@0.0.8":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@jup-ag/whirlpool-client-sdk/-/whirlpool-client-sdk-0.0.8.tgz#d3715266e0a76ab699078ce1f5525f80e09dd825"
-  integrity sha512-nlAE/huKAWNxJ9g9BhD7nWGqTg/s0kGjWYqccsYM1Nv6CjesvWdtl8N4k81enmYYU2jgjm6f4XYKA8zTLHsBsA==
-  dependencies:
-    "@project-serum/anchor" "~0.23.0"
-    "@solana/spl-token" "~0.1.8"
-    bn.js "~5.2.0"
-    decimal.js "~10.3.1"
-    lru-cache "^7.9.0"
-
 "@particle-network/auth@^0.5.5":
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/@particle-network/auth/-/auth-0.5.6.tgz#058e00980511fdf72189b6d4a7576e67934a008a"
@@ -564,26 +438,6 @@
   resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.5.tgz#db5a11bf66bdab39569719555b0f76e138d7bd64"
   integrity sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw==
 
-"@project-serum/anchor@0.24.2", "@project-serum/anchor@^0.24.2":
-  version "0.24.2"
-  resolved "https://registry.yarnpkg.com/@project-serum/anchor/-/anchor-0.24.2.tgz#a3c52a99605c80735f446ca9b3a4885034731004"
-  integrity sha512-0/718g8/DnEuwAidUwh5wLYphUYXhUbiClkuRNhvNoa+1Y8a4g2tJyxoae+emV+PG/Gikd/QUBNMkIcimiIRTA==
-  dependencies:
-    "@project-serum/borsh" "^0.2.5"
-    "@solana/web3.js" "^1.36.0"
-    base64-js "^1.5.1"
-    bn.js "^5.1.2"
-    bs58 "^4.0.1"
-    buffer-layout "^1.2.2"
-    camelcase "^5.3.1"
-    cross-fetch "^3.1.5"
-    crypto-hash "^1.3.0"
-    eventemitter3 "^4.0.7"
-    js-sha256 "^0.9.0"
-    pako "^2.0.3"
-    snake-case "^3.0.4"
-    toml "^3.0.0"
-
 "@project-serum/anchor@0.25.0", "@project-serum/anchor@^0.25.0":
   version "0.25.0"
   resolved "https://registry.yarnpkg.com/@project-serum/anchor/-/anchor-0.25.0.tgz#88ee4843336005cf5a64c80636ce626f0996f503"
@@ -625,51 +479,10 @@
     snake-case "^3.0.4"
     toml "^3.0.0"
 
-"@project-serum/anchor@^0.20.1":
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/@project-serum/anchor/-/anchor-0.20.1.tgz#0937807e807e8332aa708cfef4bcb6cbb88b4129"
-  integrity sha512-2TuBmGUn9qeYz6sJINJlElrBuPsaUAtYyUsJ3XplEBf1pczrANAgs5ceJUFzdiqGEWLn+84ObSdBeChT/AXYFA==
-  dependencies:
-    "@project-serum/borsh" "^0.2.2"
-    "@solana/web3.js" "^1.17.0"
-    base64-js "^1.5.1"
-    bn.js "^5.1.2"
-    bs58 "^4.0.1"
-    buffer-layout "^1.2.2"
-    camelcase "^5.3.1"
-    crypto-hash "^1.3.0"
-    eventemitter3 "^4.0.7"
-    find "^0.3.0"
-    js-sha256 "^0.9.0"
-    pako "^2.0.3"
-    snake-case "^3.0.4"
-    toml "^3.0.0"
-
-"@project-serum/anchor@^0.22.0", "@project-serum/anchor@^0.22.1":
-  version "0.22.1"
-  resolved "https://registry.yarnpkg.com/@project-serum/anchor/-/anchor-0.22.1.tgz#698a9620f94691de0a12bbc650a5c8380e2f0e8a"
-  integrity sha512-5pHeyvQhzLahIQ8aZymmDMZJAJFklN0joZdI+YIqFkK2uU/mlKr6rBLQjxysf/j1mLLiNG00tdyLfUtTAdQz7w==
-  dependencies:
-    "@project-serum/borsh" "^0.2.5"
-    "@solana/web3.js" "^1.17.0"
-    base64-js "^1.5.1"
-    bn.js "^5.1.2"
-    bs58 "^4.0.1"
-    buffer-layout "^1.2.2"
-    camelcase "^5.3.1"
-    cross-fetch "^3.1.5"
-    crypto-hash "^1.3.0"
-    eventemitter3 "^4.0.7"
-    find "^0.3.0"
-    js-sha256 "^0.9.0"
-    pako "^2.0.3"
-    snake-case "^3.0.4"
-    toml "^3.0.0"
-
-"@project-serum/anchor@~0.23.0":
-  version "0.23.0"
-  resolved "https://registry.yarnpkg.com/@project-serum/anchor/-/anchor-0.23.0.tgz#2b2eb6b51601b073e8db26663aa2d6c2f2841771"
-  integrity sha512-LV2/ifZOJVFTZ4GbEloXln3iVfCvO1YM8i7BBCrUm4tehP7irMx4nr4/IabHWOzrQcQElsxSP/lb1tBp+2ff8A==
+"@project-serum/anchor@^0.24.2":
+  version "0.24.2"
+  resolved "https://registry.yarnpkg.com/@project-serum/anchor/-/anchor-0.24.2.tgz#a3c52a99605c80735f446ca9b3a4885034731004"
+  integrity sha512-0/718g8/DnEuwAidUwh5wLYphUYXhUbiClkuRNhvNoa+1Y8a4g2tJyxoae+emV+PG/Gikd/QUBNMkIcimiIRTA==
   dependencies:
     "@project-serum/borsh" "^0.2.5"
     "@solana/web3.js" "^1.36.0"
@@ -681,7 +494,6 @@
     cross-fetch "^3.1.5"
     crypto-hash "^1.3.0"
     eventemitter3 "^4.0.7"
-    find "^0.3.0"
     js-sha256 "^0.9.0"
     pako "^2.0.3"
     snake-case "^3.0.4"
@@ -695,7 +507,7 @@
     bn.js "^5.1.2"
     buffer-layout "^1.2.0"
 
-"@project-serum/serum@0.13.65", "@project-serum/serum@^0.13.61", "@project-serum/serum@^0.13.65":
+"@project-serum/serum@^0.13.65":
   version "0.13.65"
   resolved "https://registry.yarnpkg.com/@project-serum/serum/-/serum-0.13.65.tgz#6d3cf07912f13985765237f053cca716fe84b0b0"
   integrity sha512-BHRqsTqPSfFB5p+MgI2pjvMBAQtO8ibTK2fYY96boIFkCI3TTwXDt2gUmspeChKO2pqHr5aKevmexzAcXxrSRA==
@@ -722,13 +534,6 @@
     bs58 "^4.0.1"
     eventemitter3 "^4.0.7"
 
-"@pythnetwork/client@^2.5.1":
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/@pythnetwork/client/-/client-2.7.1.tgz#33a3ff108937bc7da765ed9d84878002396719f8"
-  integrity sha512-q8lRwon69Q6P7TC8u3IFVXvC6Wa0FjxuuvbGclOelE2zbom7ZA2014bwPlu5ta9NDs4EUkUAPv39e+2ikYHyHg==
-  dependencies:
-    buffer "^6.0.1"
-
 "@pythnetwork/client@^2.7.0":
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/@pythnetwork/client/-/client-2.8.0.tgz#1b764d710f17c2f3cd3c9ba0c4ae74d26e72b01b"
@@ -748,68 +553,6 @@
   resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.1.4.tgz#0c8b74c50f29ee44f423f7416829c0bf8bb5eb27"
   integrity sha512-LwzQKA4vzIct1zNZzBmRKI9QuNpLgTQMEjsQLf3BXuGYb3QPTP4Yjf6mkdX+X1mYttZ808QpOwAzZjv28kq7DA==
 
-"@saberhq/option-utils@^1.13.31":
-  version "1.13.31"
-  resolved "https://registry.yarnpkg.com/@saberhq/option-utils/-/option-utils-1.13.31.tgz#0ca73cfb782ca4388e37078962662441e9c18801"
-  integrity sha512-3RmW6hDFLvucll8uDsYaeMXunb2vhUYXBHZw/fWJc30dgSittvkdhhE4lvF5udpcOSOKqt9vnWDRDRwQO4cpuQ==
-  dependencies:
-    tslib "^2.4.0"
-
-"@saberhq/solana-contrib@^1.12.66", "@saberhq/solana-contrib@^1.13.31", "@saberhq/solana-contrib@^1.13.6":
-  version "1.13.31"
-  resolved "https://registry.yarnpkg.com/@saberhq/solana-contrib/-/solana-contrib-1.13.31.tgz#d20239aad8eca694f792d8f1677e4d2f4657ed2e"
-  integrity sha512-XRNPwJzEr8+brpIR0Tz1p0QIwCjHGadfL5/Nk87PELnOGRx+ccR1WCBqiLHf3fwCVaAU4D7vhtPsD77Z4AvlTg==
-  dependencies:
-    "@saberhq/option-utils" "^1.13.31"
-    "@solana/buffer-layout" "^4.0.0"
-    "@types/promise-retry" "^1.1.3"
-    "@types/retry" "^0.12.2"
-    promise-retry "^2.0.1"
-    retry "^0.13.1"
-    tiny-invariant "^1.2.0"
-    tslib "^2.4.0"
-
-"@saberhq/stableswap-sdk@1.13.6":
-  version "1.13.6"
-  resolved "https://registry.yarnpkg.com/@saberhq/stableswap-sdk/-/stableswap-sdk-1.13.6.tgz#6b45059c0b060180feb679030fe2fbaf0d6efaa5"
-  integrity sha512-WkMzKnvjAZS6WIYmbqdSmRQXY0X5a6OFsta+tM1+iCp6Yug1OkGYSnYHTZJ4byIgXWvPd9B88c4z5T17sWRUDQ==
-  dependencies:
-    "@saberhq/solana-contrib" "^1.13.6"
-    "@saberhq/token-utils" "^1.13.6"
-    "@solana/buffer-layout" "^4.0.0"
-    lodash.mapvalues "^4.6.0"
-    tiny-invariant "^1.2.0"
-    tslib "^2.4.0"
-
-"@saberhq/token-utils@^1.12.66", "@saberhq/token-utils@^1.13.6":
-  version "1.13.31"
-  resolved "https://registry.yarnpkg.com/@saberhq/token-utils/-/token-utils-1.13.31.tgz#dd6c10dee6332f24cefbe0ac271c420160c51089"
-  integrity sha512-cDeKnXzFmJnx4yvZSH092oZOEU3PAMmxK7TljoKPJgzXujeK+RDVgCUa7HAJZSYF3x47zW1hE/f2R5AGssF8IA==
-  dependencies:
-    "@saberhq/solana-contrib" "^1.13.31"
-    "@solana/buffer-layout" "^4.0.0"
-    "@solana/spl-token" "^0.1.8"
-    "@ubeswap/token-math" "^5.1.6"
-    tiny-invariant "^1.2.0"
-    tslib "^2.4.0"
-
-"@sideway/address@^4.1.3":
-  version "4.1.4"
-  resolved "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.4.tgz#03dccebc6ea47fdc226f7d3d1ad512955d4783f0"
-  integrity sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==
-  dependencies:
-    "@hapi/hoek" "^9.0.0"
-
-"@sideway/formula@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@sideway/formula/-/formula-3.0.0.tgz#fe158aee32e6bd5de85044be615bc08478a0a13c"
-  integrity sha512-vHe7wZ4NOXVfkoRb8T5otiENVlT7a3IAiw7H5M2+GO+9CDgcVUUsX1zalAztCmwyOr2RUTGJdgB+ZvSVqmdHmg==
-
-"@sideway/pinpoint@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz#cff8ffadc372ad29fd3f78277aeb29e632cc70df"
-  integrity sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==
-
 "@socket.io/component-emitter@~3.1.0":
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz#96116f2a912e0c02817345b3c10751069920d553"
@@ -849,13 +592,6 @@
     bigint-buffer "^1.1.5"
     bignumber.js "^9.0.1"
 
-"@solana/buffer-layout@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@solana/buffer-layout/-/buffer-layout-3.0.0.tgz#b9353caeb9a1589cb77a1b145bcb1a9a93114326"
-  integrity sha512-MVdgAKKL39tEs0l8je0hKaXLQFb7Rdfb0Xg2LjFZd8Lfdazkg6xiS98uAZrEKvaoF3i4M95ei9RydkGIDMeo3w==
-  dependencies:
-    buffer "~6.0.3"
-
 "@solana/buffer-layout@^4.0.0":
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/@solana/buffer-layout/-/buffer-layout-4.0.0.tgz#75b1b11adc487234821c81dfae3119b73a5fd734"
@@ -863,17 +599,7 @@
   dependencies:
     buffer "~6.0.3"
 
-"@solana/spl-token-v2@npm:@solana/spl-token@0.2.0":
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/@solana/spl-token/-/spl-token-0.2.0.tgz#329bb6babb5de0f9c40035ddb1657f01a8347acd"
-  integrity sha512-RWcn31OXtdqIxmkzQfB2R+WpsJOVS6rKuvpxJFjvik2LyODd+WN58ZP3Rpjpro03fscGAkzlFuP3r42doRJgyQ==
-  dependencies:
-    "@solana/buffer-layout" "^4.0.0"
-    "@solana/buffer-layout-utils" "^0.2.0"
-    "@solana/web3.js" "^1.32.0"
-    start-server-and-test "^1.14.0"
-
-"@solana/spl-token@0.1.8", "@solana/spl-token@^0.1.6", "@solana/spl-token@^0.1.8", "@solana/spl-token@~0.1.8":
+"@solana/spl-token@^0.1.6", "@solana/spl-token@^0.1.8":
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/@solana/spl-token/-/spl-token-0.1.8.tgz#f06e746341ef8d04165e21fc7f555492a2a0faa6"
   integrity sha512-LZmYCKcPQDtJgecvWOgT/cnoIQPWjdH+QVyzPcFvyDUiT0DiRjZaam4aqNUyvchLFhzgunv3d9xOoyE34ofdoQ==
@@ -1341,26 +1067,6 @@
     "@wallet-standard/app" "^1.0.0"
     "@wallet-standard/base" "^1.0.0"
 
-"@solana/web3.js@1.31.0":
-  version "1.31.0"
-  resolved "https://registry.yarnpkg.com/@solana/web3.js/-/web3.js-1.31.0.tgz#7a313d4c1a90b77f27ddbfe845a10d6883e06452"
-  integrity sha512-7nHHx1JNFnrt15e9y8m38I/EJCbaB+bFC3KZVM1+QhybCikFxGMtGA5r7PDC3GEL1R2RZA8yKoLkDKo3vzzqnw==
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    "@ethersproject/sha2" "^5.5.0"
-    "@solana/buffer-layout" "^3.0.0"
-    bn.js "^5.0.0"
-    borsh "^0.4.0"
-    bs58 "^4.0.1"
-    buffer "6.0.1"
-    cross-fetch "^3.1.4"
-    jayson "^3.4.4"
-    js-sha3 "^0.8.0"
-    rpc-websockets "^7.4.2"
-    secp256k1 "^4.0.2"
-    superstruct "^0.14.2"
-    tweetnacl "^1.0.0"
-
 "@solana/web3.js@^1.17.0", "@solana/web3.js@^1.21.0", "@solana/web3.js@^1.32.0", "@solana/web3.js@^1.36.0", "@solana/web3.js@^1.44.3", "@solana/web3.js@^1.63.1":
   version "1.66.2"
   resolved "https://registry.yarnpkg.com/@solana/web3.js/-/web3.js-1.66.2.tgz#80b43c5868b846124fe3ebac7d3943930c3fa60c"
@@ -1717,17 +1423,10 @@
     loglevel "^1.8.0"
     pump "^3.0.0"
 
-"@types/big.js@^6.1.3":
-  version "6.1.4"
-  resolved "https://registry.yarnpkg.com/@types/big.js/-/big.js-6.1.4.tgz#a2299b68c4a9e39099661e5fb3ddf14c7b29f4cb"
-  integrity sha512-yBEfFBLpvnIS9MLcKG4XIpBhMRjDWEf4cSJ/uR5cPq2JrYB+yhYMPK8cF17hGfWmsWL7LuzJF/N4APRtmcg4sw==
-
-"@types/bn.js@^4.11.5":
-  version "4.11.6"
-  resolved "https://registry.yarnpkg.com/@types/bn.js/-/bn.js-4.11.6.tgz#c306c70d9358aaea33cd4eda092a742b9505967c"
-  integrity sha512-pqr857jrp2kPuO9uRjZ3PwnJTjoQy+fcdxvBTvHm6dkmEL9q+hDD/2j/0ELOBPtPnS8LjCX0gI9nbl8lVkadpg==
-  dependencies:
-    "@types/node" "*"
+"@types/big.js@^6.1.6":
+  version "6.1.6"
+  resolved "https://registry.yarnpkg.com/@types/big.js/-/big.js-6.1.6.tgz#3d417e758483d55345a03a087f7e0c87137ca444"
+  integrity sha512-0r9J+Zz9rYm2hOTwiMAVkm3XFQ4u5uTK37xrQMhc9bysn/sf/okzovWMYYIBMFTn/yrEZ11pusgLEaoarTlQbA==
 
 "@types/bn.js@^5.1.0":
   version "5.1.0"
@@ -1819,13 +1518,6 @@
   dependencies:
     "@types/node" "*"
 
-"@types/promise-retry@^1.1.3":
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/@types/promise-retry/-/promise-retry-1.1.3.tgz#baab427419da9088a1d2f21bf56249c21b3dd43c"
-  integrity sha512-LxIlEpEX6frE3co3vCO2EUJfHIta1IOmhDlcAsR4GMMv9hev1iTI9VwberVGkePJAuLZs5rMucrV8CziCfuJMw==
-  dependencies:
-    "@types/retry" "*"
-
 "@types/prop-types@*":
   version "15.7.5"
   resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf"
@@ -1861,11 +1553,6 @@
     "@types/scheduler" "*"
     csstype "^3.0.2"
 
-"@types/retry@*", "@types/retry@^0.12.2":
-  version "0.12.2"
-  resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.2.tgz#ed279a64fa438bb69f2480eda44937912bb7480a"
-  integrity sha512-XISRgDJ2Tc5q4TRqvgJtzsRkFYNJzZrhTdtMoGVBttwzzQJkPnS3WWTFc7kuDRoPtPakl+T+OfdEUjYJj7Jbow==
-
 "@types/scheduler@*":
   version "0.16.2"
   resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39"
@@ -1929,17 +1616,6 @@
     "@typescript-eslint/types" "5.30.7"
     eslint-visitor-keys "^3.3.0"
 
-"@ubeswap/token-math@^5.1.6":
-  version "5.1.6"
-  resolved "https://registry.yarnpkg.com/@ubeswap/token-math/-/token-math-5.1.6.tgz#193d1877e34ec4056f6ffcda13611383775c652b"
-  integrity sha512-OS0L+WfdZ7jXX6Q/MFC5hIAAIposSDLWvnbx0F2EI0DRRhXxxGEXpmWLAVdJwZbbFPw0TQ+pVz4yJLVZP/9vQw==
-  dependencies:
-    "@types/big.js" "^6.1.3"
-    big.js "^6.2.0"
-    decimal.js-light "^2.5.1"
-    tiny-invariant "^1.2.0"
-    tslib "^2.4.0"
-
 "@wallet-standard/app@^1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@wallet-standard/app/-/app-1.0.0.tgz#8b77d66c4413f4106afe20a25e0122a9a86d1fb6"
@@ -2389,20 +2065,13 @@ axe-core@^4.4.3:
   resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.4.3.tgz#11c74d23d5013c0fa5d183796729bc3482bd2f6f"
   integrity sha512-32+ub6kkdhhWick/UjvEwRchgoetXqTK14INLqbGm5U2TzBkBNF3nQtLYm8ovxSkQWArjEQvftCKryjZaATu3w==
 
-axios@^0.21.0, axios@^0.21.1:
+axios@^0.21.0:
   version "0.21.4"
   resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575"
   integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==
   dependencies:
     follow-redirects "^1.14.0"
 
-axios@^0.25.0:
-  version "0.25.0"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.25.0.tgz#349cfbb31331a9b4453190791760a8d35b093e0a"
-  integrity sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==
-  dependencies:
-    follow-redirects "^1.14.7"
-
 axobject-query@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.2.0.tgz#943d47e10c0b704aa42275e20edf3722648989be"
@@ -2447,12 +2116,7 @@ base64url@^3.0.1:
   resolved "https://registry.yarnpkg.com/base64url/-/base64url-3.0.1.tgz#6399d572e2bc3f90a9a8b22d5dbb0a32d33f788d"
   integrity sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A==
 
-big.js@^5.2.2:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
-  integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
-
-big.js@^6.1.1, big.js@^6.2.0, big.js@^6.2.1:
+big.js@^6.1.1, big.js@^6.2.1:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-6.2.1.tgz#7205ce763efb17c2e41f26f121c420c6a7c2744f"
   integrity sha512-bCtHMwL9LeDIozFn+oNhhFoq+yQ3BNdnsLSASUxLciOb1vgvpHsIO1dsENiGMgbb4SkP5TrzWzRiLddn8ahVOQ==
@@ -2498,30 +2162,15 @@ blakejs@^1.1.0:
   resolved "https://registry.yarnpkg.com/blakejs/-/blakejs-1.2.1.tgz#5057e4206eadb4a97f7c0b6e197a505042fc3814"
   integrity sha512-QXUSXI3QVc/gJME0dBpXrag1kbzOqCjCX8/b54ntNyW6sjtoqxqRk3LTmXzaJoh71zMsDCjM+47jS7XiwN/+fQ==
 
-bluebird@3.7.2:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
-  integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
-
-bn.js@5.2.1, bn.js@^5.0.0, bn.js@^5.1.0, bn.js@^5.1.1, bn.js@^5.1.2, bn.js@^5.2.0, bn.js@~5.2.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.1.tgz#0bc527a6a0d18d0aa8d5b0538ce4a77dccfa7b70"
-  integrity sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==
-
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.8, bn.js@^4.11.9:
   version "4.12.0"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88"
   integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==
 
-borsh@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/borsh/-/borsh-0.4.0.tgz#9dd6defe741627f1315eac2a73df61421f6ddb9f"
-  integrity sha512-aX6qtLya3K0AkT66CmYWCCDr77qsE9arV05OmdFpmat9qu8Pg9J5tBUPDztAW5fNh/d/MyVG/OYziP52Ndzx1g==
-  dependencies:
-    "@types/bn.js" "^4.11.5"
-    bn.js "^5.0.0"
-    bs58 "^4.0.0"
-    text-encoding-utf-8 "^1.0.2"
+bn.js@^5.0.0, bn.js@^5.1.0, bn.js@^5.1.1, bn.js@^5.1.2, bn.js@^5.2.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.1.tgz#0bc527a6a0d18d0aa8d5b0538ce4a77dccfa7b70"
+  integrity sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==
 
 borsh@^0.7.0:
   version "0.7.0"
@@ -2783,11 +2432,6 @@ chalk@^4.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-check-more-types@2.24.0:
-  version "2.24.0"
-  resolved "https://registry.yarnpkg.com/check-more-types/-/check-more-types-2.24.0.tgz#1420ffb10fd444dcfc79b43891bbfffd32a84600"
-  integrity sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA==
-
 chokidar@^3.5.3:
   version "3.5.3"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
@@ -2929,14 +2573,14 @@ create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-cross-fetch@3.1.5, cross-fetch@^3.1.4, cross-fetch@^3.1.5:
+cross-fetch@^3.1.4, cross-fetch@^3.1.5:
   version "3.1.5"
   resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz#e1389f44d9e7ba767907f7af8454787952ab534f"
   integrity sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==
   dependencies:
     node-fetch "2.6.7"
 
-cross-spawn@^7.0.2, cross-spawn@^7.0.3:
+cross-spawn@^7.0.2:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
   integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
@@ -3068,13 +2712,6 @@ dayjs@^1.11.3:
   resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.3.tgz#4754eb694a624057b9ad2224b67b15d552589258"
   integrity sha512-xxwlswWOlGhzgQ4TKzASQkUhqERI3egRNqgV4ScR8wlANA/A9tZ7miXa44vTTKEq5l7vWoL5G57bG3zA+Kow0A==
 
-debug@4.3.2:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
-  integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
-  dependencies:
-    ms "2.1.2"
-
 debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
@@ -3101,16 +2738,11 @@ decamelize@^1.2.0:
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==
 
-decimal.js-light@^2.4.1, decimal.js-light@^2.5.1:
+decimal.js-light@^2.4.1:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/decimal.js-light/-/decimal.js-light-2.5.1.tgz#134fd32508f19e208f4fb2f8dac0d2626a867934"
   integrity sha512-qIMFpTMZmny+MMIitAB6D7iVPEorVw6YQRWkvarTkT4tBeSLLiHzcwj6q0MmYSFCiVpiqPJTJEYIrpcPzVEIvg==
 
-decimal.js@10.3.1, decimal.js@^10.3.1, decimal.js@~10.3.1:
-  version "10.3.1"
-  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783"
-  integrity sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==
-
 decimal.js@^10.4.0:
   version "10.4.0"
   resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.0.tgz#97a7448873b01e92e5ff9117d89a7bca8e63e0fe"
@@ -3280,11 +2912,6 @@ drbg.js@^1.0.1:
     create-hash "^1.1.2"
     create-hmac "^1.1.4"
 
-duplexer@~0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
-  integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==
-
 eip1193-provider@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/eip1193-provider/-/eip1193-provider-1.0.1.tgz#420d29cf4f6c443e3f32e718fb16fafb250637c3"
@@ -3348,11 +2975,6 @@ entities@^4.2.0, entities@^4.3.0:
   resolved "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz#97bdaba170339446495e653cfd2db78962900174"
   integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==
 
-err-code@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9"
-  integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==
-
 es-abstract@^1.18.5:
   version "1.19.5"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.5.tgz#a2cb01eb87f724e815b278b0dd0d00f36ca9a7f1"
@@ -3755,19 +3377,6 @@ ethereumjs-util@^7.1.5:
     ethereum-cryptography "^0.1.3"
     rlp "^2.2.4"
 
-event-stream@=3.3.4:
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/event-stream/-/event-stream-3.3.4.tgz#4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571"
-  integrity sha512-QHpkERcGsR0T7Qm3HNJSyXKEEj8AHNxkY3PK8TS2KJvQ7NiSHe3DDpwVKKtoYprL/AreyzFBeIkBIWChAqn60g==
-  dependencies:
-    duplexer "~0.1.1"
-    from "~0"
-    map-stream "~0.1.0"
-    pause-stream "0.0.11"
-    split "0.3"
-    stream-combiner "~0.0.4"
-    through "~2.3.1"
-
 eventemitter3@^4.0.0, eventemitter3@^4.0.1, eventemitter3@^4.0.4, eventemitter3@^4.0.7:
   version "4.0.7"
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
@@ -3786,21 +3395,6 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
     md5.js "^1.3.4"
     safe-buffer "^5.1.1"
 
-execa@5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
-  integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
-  dependencies:
-    cross-spawn "^7.0.3"
-    get-stream "^6.0.0"
-    human-signals "^2.1.0"
-    is-stream "^2.0.0"
-    merge-stream "^2.0.0"
-    npm-run-path "^4.0.1"
-    onetime "^5.1.2"
-    signal-exit "^3.0.3"
-    strip-final-newline "^2.0.0"
-
 exenv@^1.2.0:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/exenv/-/exenv-1.2.2.tgz#2ae78e85d9894158670b03d47bec1f03bd91bb9d"
@@ -3932,11 +3526,6 @@ follow-redirects@^1.14.0:
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
   integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
 
-follow-redirects@^1.14.7:
-  version "1.15.1"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz#0ca6a452306c9b276e4d3127483e29575e207ad5"
-  integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==
-
 foreach@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
@@ -3947,11 +3536,6 @@ fraction.js@^4.2.0:
   resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.2.0.tgz#448e5109a313a3527f5a3ab2119ec4cf0e0e2950"
   integrity sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==
 
-from@~0:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe"
-  integrity sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g==
-
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
@@ -4001,11 +3585,6 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
     has "^1.0.3"
     has-symbols "^1.0.3"
 
-get-stream@^6.0.0:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
-  integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
-
 get-symbol-description@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6"
@@ -4180,11 +3759,6 @@ htmlparser2@8.0.1:
     domutils "^3.0.1"
     entities "^4.3.0"
 
-human-signals@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
-  integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
-
 husky@^8.0.1:
   version "8.0.1"
   resolved "https://registry.yarnpkg.com/husky/-/husky-8.0.1.tgz#511cb3e57de3e3190514ae49ed50f6bc3f50b3e9"
@@ -4394,7 +3968,7 @@ is-shared-array-buffer@^1.0.2:
   dependencies:
     call-bind "^1.0.2"
 
-is-stream@^2.0.0, is-stream@^2.0.1:
+is-stream@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
   integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
@@ -4477,17 +4051,6 @@ jmespath@^0.15.0:
   resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.15.0.tgz#a3f222a9aae9f966f5d27c796510e28091764217"
   integrity sha512-+kHj8HXArPfpPEKGLZ+kB5ONRTCiGQXo8RQYL0hH8t6pWXUBBK5KkkQmTNOwKK4LEsd0yTsgtjJVm4UBSZea4w==
 
-joi@^17.4.0:
-  version "17.7.0"
-  resolved "https://registry.yarnpkg.com/joi/-/joi-17.7.0.tgz#591a33b1fe1aca2bc27f290bcad9b9c1c570a6b3"
-  integrity sha512-1/ugc8djfn93rTE3WRKdCzGGt/EtiYKxITMO4Wiv6q5JL1gl9ePt4kBsl1S499nbosspfctIQTpYIhSmHA3WAg==
-  dependencies:
-    "@hapi/hoek" "^9.0.0"
-    "@hapi/topo" "^5.0.0"
-    "@sideway/address" "^4.1.3"
-    "@sideway/formula" "^3.0.0"
-    "@sideway/pinpoint" "^2.0.0"
-
 joycon@^2.2.5:
   version "2.2.5"
   resolved "https://registry.yarnpkg.com/joycon/-/joycon-2.2.5.tgz#8d4cf4cbb2544d7b7583c216fcdfec19f6be1615"
@@ -4498,7 +4061,7 @@ js-base64@^3.7.2:
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-3.7.2.tgz#816d11d81a8aff241603d19ce5761e13e41d7745"
   integrity sha512-NnRs6dsyqUXejqk/yv2aiXlAvOs56sLkX6nUdeaNezI5LFFLlsZjOThmwnrcwh5ZZRwZlCMnVAY3CvhIhoVEKQ==
 
-js-sha256@^0.9.0, js-sha256@~0.9.0:
+js-sha256@^0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/js-sha256/-/js-sha256-0.9.0.tgz#0b89ac166583e91ef9123644bd3c5334ce9d0966"
   integrity sha512-sga3MHh9sgQN2+pJ9VYZ+1LPwXOxuBJBA5nrR5/ofPfuiJBE2hnjsaN8se8JznOmGLN2p49Pe5U/ttafcs/apA==
@@ -4520,11 +4083,6 @@ js-yaml@^4.1.0:
   dependencies:
     argparse "^2.0.1"
 
-jsbi@4.3.0, jsbi@^4.1.0, jsbi@^4.2.0, jsbi@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/jsbi/-/jsbi-4.3.0.tgz#b54ee074fb6fcbc00619559305c8f7e912b04741"
-  integrity sha512-SnZNcinB4RIcnEyZqFPdGPVgrg2AcnykiBy0sHVJQKHYeaLUvi3Exj+iaPpLnFVkDPZIV4U0yvgC9/R4uEAZ9g==
-
 jsbi@^3.1.5:
   version "3.2.5"
   resolved "https://registry.yarnpkg.com/jsbi/-/jsbi-3.2.5.tgz#b37bb90e0e5c2814c1c2a1bcd8c729888a2e37d6"
@@ -4621,11 +4179,6 @@ language-tags@^1.0.5:
   dependencies:
     language-subtag-registry "~0.3.2"
 
-lazy-ass@1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/lazy-ass/-/lazy-ass-1.6.0.tgz#7999655e8646c17f089fdd187d150d3324d54513"
-  integrity sha512-cc8oEVoctTvsFZ/Oje/kGnHbpWHYBe8IAJe4C0QNc3t8uM/0Y8+erSz/7Y1ALuXTEZTMvxXwO6YbX1ey3ujiZw==
-
 leven@2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580"
@@ -4680,11 +4233,6 @@ lodash.isequal@4.5.0, lodash.isequal@^4.0.0:
   resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
   integrity sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==
 
-lodash.mapvalues@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz#1bafa5005de9dd6f4f26668c30ca37230cc9689c"
-  integrity sha512-JPFqXFeZQ7BfS00H58kClY7SPVeHertPE0lNuCyZ26/XlN8TvakYD7b9bGyNmXbT/D3BbtPAAmq90gPWqLkxlQ==
-
 lodash.merge@^4.6.2:
   version "4.6.2"
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
@@ -4721,16 +4269,6 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
-lru-cache@^7.9.0:
-  version "7.12.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.12.0.tgz#be2649a992c8a9116efda5c487538dcf715f3476"
-  integrity sha512-OIP3DwzRZDfLg9B9VP/huWBlpvbkmbfiBy8xmsXp4RPmE4A3MhwNozc5ZJ3fWnSg8fDcdlE/neRTPG2ycEKliw==
-
-map-stream@~0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194"
-  integrity sha512-CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g==
-
 md5.js@^1.3.4:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
@@ -4752,11 +4290,6 @@ merge-options@^3.0.4:
   dependencies:
     is-plain-obj "^2.1.0"
 
-merge-stream@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
-  integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
-
 merge2@^1.3.0, merge2@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
@@ -4778,11 +4311,6 @@ miller-rabin@^4.0.0:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
-mimic-fn@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
-  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
-
 minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
@@ -4805,11 +4333,6 @@ minimist@^1.2.0, minimist@^1.2.6:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
   integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
 
-minimist@^1.2.5:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
-  integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
-
 mri@1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/mri/-/mri-1.1.4.tgz#7cb1dd1b9b40905f1fac053abe25b6720f44744a"
@@ -4939,13 +4462,6 @@ normalize-range@^0.1.2:
   resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
   integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=
 
-npm-run-path@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
-  integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
-  dependencies:
-    path-key "^3.0.0"
-
 object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
@@ -5039,13 +4555,6 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0:
   dependencies:
     wrappy "1"
 
-onetime@^5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
-  integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
-  dependencies:
-    mimic-fn "^2.1.0"
-
 optionator@^0.9.1:
   version "0.9.1"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
@@ -5129,7 +4638,7 @@ path-is-absolute@^1.0.0:
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
 
-path-key@^3.0.0, path-key@^3.1.0:
+path-key@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
@@ -5144,13 +4653,6 @@ path-type@^4.0.0:
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
-pause-stream@0.0.11:
-  version "0.0.11"
-  resolved "https://registry.yarnpkg.com/pause-stream/-/pause-stream-0.0.11.tgz#fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"
-  integrity sha512-e3FBlXLmN/D1S+zHzanP4E/4Z60oFAa3O051qt1pxa7DEJWKAyil6upYVXCWadEnuoqa4Pkc9oUx9zsxYeRv8A==
-  dependencies:
-    through "~2.3"
-
 pbkdf2@^3.0.17, pbkdf2@^3.0.3:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.2.tgz#dd822aa0887580e52f1a039dc3eda108efae3075"
@@ -5340,14 +4842,6 @@ process@^0.11.10:
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
   integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
 
-promise-retry@2.0.1, promise-retry@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22"
-  integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==
-  dependencies:
-    err-code "^2.0.2"
-    retry "^0.12.0"
-
 prop-types@15.x, prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:
   version "15.8.1"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
@@ -5357,13 +4851,6 @@ prop-types@15.x, prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.7.2, pro
     object-assign "^4.1.1"
     react-is "^16.13.1"
 
-ps-tree@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/ps-tree/-/ps-tree-1.2.0.tgz#5e7425b89508736cdd4f2224d028f7bb3f722ebd"
-  integrity sha512-0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA==
-  dependencies:
-    event-stream "=3.3.4"
-
 public-encrypt@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"
@@ -5764,16 +5251,6 @@ resolve@^2.0.0-next.3:
     is-core-module "^2.2.0"
     path-parse "^1.0.6"
 
-retry@^0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
-  integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==
-
-retry@^0.13.1:
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658"
-  integrity sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==
-
 reusify@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
@@ -5801,7 +5278,7 @@ rlp@^2.2.4:
   dependencies:
     bn.js "^5.2.0"
 
-rpc-websockets@^7.4.2, rpc-websockets@^7.5.0:
+rpc-websockets@^7.5.0:
   version "7.5.0"
   resolved "https://registry.yarnpkg.com/rpc-websockets/-/rpc-websockets-7.5.0.tgz#bbeb87572e66703ff151e50af1658f98098e2748"
   integrity sha512-9tIRi1uZGy7YmDjErf1Ax3wtqdSSLIlnmL5OtOzgd5eqPKbsPpwDP5whUDO2LQay3Xp0CcHlcNSGzacNRluBaQ==
@@ -5835,13 +5312,6 @@ rxjs@6, rxjs@^6.6.3:
   dependencies:
     tslib "^1.9.0"
 
-rxjs@^7.1.0:
-  version "7.5.7"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.7.tgz#2ec0d57fdc89ece220d2e702730ae8f1e49def39"
-  integrity sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==
-  dependencies:
-    tslib "^2.1.0"
-
 safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
@@ -5964,11 +5434,6 @@ side-channel@^1.0.4:
     get-intrinsic "^1.0.2"
     object-inspect "^1.9.0"
 
-signal-exit@^3.0.3:
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
-  integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
-
 slash@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
@@ -6025,26 +5490,6 @@ split2@^3.1.1:
   dependencies:
     readable-stream "^3.0.0"
 
-split@0.3:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/split/-/split-0.3.3.tgz#cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f"
-  integrity sha512-wD2AeVmxXRBoX44wAycgjVpMhvbwdI2aZjCkvfNcH1YqHQvJVa1duWc73OyVGJUc05fhFaTZeQ/PYsrmyH0JVA==
-  dependencies:
-    through "2"
-
-start-server-and-test@^1.14.0:
-  version "1.14.0"
-  resolved "https://registry.yarnpkg.com/start-server-and-test/-/start-server-and-test-1.14.0.tgz#c57f04f73eac15dd51733b551d775b40837fdde3"
-  integrity sha512-on5ELuxO2K0t8EmNj9MtVlFqwBMxfWOhu4U7uZD1xccVpFlOQKR93CSe0u98iQzfNxRyaNTb/CdadbNllplTsw==
-  dependencies:
-    bluebird "3.7.2"
-    check-more-types "2.24.0"
-    debug "4.3.2"
-    execa "5.1.1"
-    lazy-ass "1.6.0"
-    ps-tree "1.2.0"
-    wait-on "6.0.0"
-
 stream-browserify@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-3.0.0.tgz#22b0a2850cdf6503e73085da1fc7b7d0c2122f2f"
@@ -6053,13 +5498,6 @@ stream-browserify@^3.0.0:
     inherits "~2.0.4"
     readable-stream "^3.5.0"
 
-stream-combiner@~0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.0.4.tgz#4d5e433c185261dde623ca3f44c586bcf5c4ad14"
-  integrity sha512-rT00SPnTVyRsaSz5zgSPma/aHSOic5U1prhYdRy5HS2kTZviFpmDgzilbtsJsxiroqACmayynDN/9VzIbX5DOw==
-  dependencies:
-    duplexer "~0.1.1"
-
 strict-uri-encode@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546"
@@ -6132,11 +5570,6 @@ strip-bom@^3.0.0:
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
   integrity sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==
 
-strip-final-newline@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
-  integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
-
 strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
@@ -6230,16 +5663,11 @@ text-table@^0.2.0:
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
   integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
 
-through@2, "through@>=2.2.7 <3", through@~2.3, through@~2.3.1:
+"through@>=2.2.7 <3":
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
   integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
 
-tiny-invariant@^1.1.0, tiny-invariant@^1.2.0, tiny-invariant@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.2.0.tgz#a1141f86b672a9148c72e978a19a73b9b94a15a9"
-  integrity sha512-1Uhn/aqw5C6RI4KejVeTg6mIS7IqxnLJ8Mv2tV5rTc0qWobay7pDUz6Wi392Cnc8ak1H0F2cjoRzb2/AW4+Fvg==
-
 tippy.js@^6.3.1:
   version "6.3.7"
   resolved "https://registry.yarnpkg.com/tippy.js/-/tippy.js-6.3.7.tgz#8ccfb651d642010ed9a32ff29b0e9e19c5b8c61c"
@@ -6254,11 +5682,6 @@ to-regex-range@^5.0.1:
   dependencies:
     is-number "^7.0.0"
 
-toformat@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/toformat/-/toformat-2.0.0.tgz#7a043fd2dfbe9021a4e36e508835ba32056739d8"
-  integrity sha512-03SWBVop6nU8bpyZCx7SodpYznbZF5R4ljwNLBcTQzKOD9xuihRo/psX58llS1BMFhhAI08H3luot5GoXJz2pQ==
-
 toggle-selection@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/toggle-selection/-/toggle-selection-1.0.6.tgz#6e45b1263f2017fa0acc7d89d78b15b8bf77da32"
@@ -6294,7 +5717,7 @@ tslib@^1.8.1, tslib@^1.9.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2.0.3, tslib@^2.1.0:
+tslib@^2.0.3:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e"
   integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==
@@ -6735,17 +6158,6 @@ void-elements@3.1.0:
   resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-3.1.0.tgz#614f7fbf8d801f0bb5f0661f5b2f5785750e4f09"
   integrity sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==
 
-wait-on@6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/wait-on/-/wait-on-6.0.0.tgz#7e9bf8e3d7fe2daecbb7a570ac8ca41e9311c7e7"
-  integrity sha512-tnUJr9p5r+bEYXPUdRseolmz5XqJTTj98JgOsfBn7Oz2dxfE2g3zw1jE+Mo8lopM3j3et/Mq1yW7kKX6qw7RVw==
-  dependencies:
-    axios "^0.21.1"
-    joi "^17.4.0"
-    lodash "^4.17.21"
-    minimist "^1.2.5"
-    rxjs "^7.1.0"
-
 walktour@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/walktour/-/walktour-5.1.1.tgz#951b5bce2abed0ae4209dc74d4d79f252a85e813"