feat: query-key-factory doesn't pass options through

src/components/MultiHopTrade/components/TradeInput/components/TradeQuotes/TradeQuote.tsx

@@ -5,10 +5,10 @@ import { TradeQuoteError as SwapperTradeQuoteError } from '@shapeshiftoss/swappe
 import type { FC } from 'react'
 import { useCallback, useMemo } from 'react'
 import { useTranslate } from 'react-polyglot'
+import { useIsTradingActive } from 'react-queries/hooks/useIsTradingActive'
 import { Amount } from 'components/Amount/Amount'
 import { SlippageIcon } from 'components/Icons/Slippage'
 import { getQuoteErrorTranslation } from 'components/MultiHopTrade/components/TradeInput/getQuoteErrorTranslation'
-import { useIsTradingActive } from 'components/MultiHopTrade/hooks/useIsTradingActive'
 import { RawText } from 'components/Text'
 import { useLocaleFormatter } from 'hooks/useLocaleFormatter/useLocaleFormatter'
 import { bn, bnOrZero } from 'lib/bignumber/bignumber'
@@ -62,10 +62,17 @@ export const TradeQuoteLoaded: FC<TradeQuoteProps> = ({
     number: { toPercent },
   } = useLocaleFormatter()
 
-  const { isTradingActive } = useIsTradingActive()
-
   const buyAsset = useAppSelector(selectInputBuyAsset)
   const sellAsset = useAppSelector(selectInputSellAsset)
+  const { isTradingActive: isTradingActiveOnBuyPool } = useIsTradingActive({
+    assetId: buyAsset.assetId,
+  })
+  const { isTradingActive: isTradingActiveOnSellPool } = useIsTradingActive({
+    assetId: sellAsset.assetId,
+  })
+
+  const isTradingActive = Boolean(isTradingActiveOnBuyPool && isTradingActiveOnSellPool)
+
   const userSlippagePercentageDecimal = useAppSelector(selectUserSlippagePercentageDecimal)
 
   const buyAssetMarketData = useAppSelector(state =>

src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Deposit/components/Confirm.tsx

@@ -13,9 +13,7 @@ import { fromAccountId, fromAssetId, toAssetId } from '@shapeshiftoss/caip'
 import { CONTRACT_INTERACTION, FeeDataKey } from '@shapeshiftoss/chain-adapters'
 import type { BuildCustomTxInput } from '@shapeshiftoss/chain-adapters/src/evm/types'
 import { supportsETH } from '@shapeshiftoss/hdwallet-core'
-import { SwapperName } from '@shapeshiftoss/swapper'
 import type { Asset, KnownChainIds } from '@shapeshiftoss/types'
-import { useQuery } from '@tanstack/react-query'
 import { getConfig } from 'config'
 import { getOrCreateContractByType } from 'contracts/contractManager'
 import { ContractType } from 'contracts/types'
@@ -29,7 +27,7 @@ import type {
 import { DefiStep } from 'features/defi/contexts/DefiManagerProvider/DefiCommon'
 import { useCallback, useContext, useEffect, useMemo, useState } from 'react'
 import { useTranslate } from 'react-polyglot'
-import { reactQueries } from 'react-queries'
+import { useIsTradingActive } from 'react-queries/hooks/useIsTradingActive'
 import { encodeFunctionData, getAddress } from 'viem'
 import { Amount } from 'components/Amount/Amount'
 import { AssetIcon } from 'components/AssetIcon'
@@ -540,20 +538,8 @@ export const Confirm: React.FC<ConfirmProps> = ({ accountId, onNext }) => {
     })()
   }, [accountId, accountMetadata, accountType, assetId, bip44Params, chainAdapter, wallet])
 
-  const { data: isTradingActive, refetch: refetchIsTradingActive } = useQuery({
-    ...reactQueries.common.isTradingActive({
-      assetId,
-      swapperName: SwapperName.Thorchain,
-    }),
-    // @lukemorales/query-key-factory only returns queryFn and queryKey - all others will be ignored in the returned object
-    enabled: Boolean(assetId),
-    // Go stale instantly
-    staleTime: 0,
-    // Never store queries in cache since we always want fresh data
-    gcTime: 0,
-    refetchOnWindowFocus: true,
-    refetchOnMount: true,
-    refetchInterval: 60_000,
+  const { isTradingActive, refetch: refetchIsTradingActive } = useIsTradingActive({
+    assetId,
   })
 
   const handleDeposit = useCallback(async () => {
@@ -578,14 +564,14 @@ export const Confirm: React.FC<ConfirmProps> = ({ accountId, onNext }) => {
       contextDispatch({ type: ThorchainSaversDepositActionType.SET_LOADING, payload: true })
 
       // Was the pool active when it was fetched at the time of the component mount
+      // If it wasn't, it's definitely not going to become active again in the few seconds it takes to go from mount to sign click
       if (isTradingActive === false) {
         throw new Error(`THORChain pool halted for assetId: ${assetId}`)
       }
 
       // Refetch the trading active state JIT to ensure the pool didn't just become halted
-      const { data: isTradingActiveData } = await refetchIsTradingActive()
-
-      if (!isTradingActiveData) {
+      const _isTradingActive = await refetchIsTradingActive()
+      if (_isTradingActive === false) {
         throw new Error(`THORChain pool halted for assetId: ${assetId}`)
       }
 

src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Overview/ThorchainSaversOverview.tsx

@@ -14,10 +14,8 @@ import {
 import { QueryStatus } from '@reduxjs/toolkit/dist/query'
 import type { AccountId } from '@shapeshiftoss/caip'
 import { toAssetId } from '@shapeshiftoss/caip'
-import { SwapperName } from '@shapeshiftoss/swapper'
 import type { Asset } from '@shapeshiftoss/types'
 import { TxStatus } from '@shapeshiftoss/unchained-client'
-import { useQuery } from '@tanstack/react-query'
 import BigNumber from 'bignumber.js'
 import type { DefiButtonProps } from 'features/defi/components/DefiActionButtons'
 import { Overview } from 'features/defi/components/Overview/Overview'
@@ -29,7 +27,7 @@ import { DefiAction } from 'features/defi/contexts/DefiManagerProvider/DefiCommo
 import { useCallback, useEffect, useMemo, useState } from 'react'
 import { FaTwitter } from 'react-icons/fa'
 import { useTranslate } from 'react-polyglot'
-import { reactQueries } from 'react-queries'
+import { useIsTradingActive } from 'react-queries/hooks/useIsTradingActive'
 import type { AccountDropdownProps } from 'components/AccountDropdown/AccountDropdown'
 import { Amount } from 'components/Amount/Amount'
 import { CircularProgress } from 'components/CircularProgress/CircularProgress'
@@ -130,20 +128,8 @@ export const ThorchainSaversOverview: React.FC<OverviewProps> = ({
     [accountId, defaultAccountId, highestBalanceAccountId],
   )
 
-  const { data: isTradingActive, isLoading: isTradingActiveLoading } = useQuery({
-    ...reactQueries.common.isTradingActive({
-      assetId,
-      swapperName: SwapperName.Thorchain,
-    }),
-    // @lukemorales/query-key-factory only returns queryFn and queryKey - all others will be ignored in the returned object
-    enabled: Boolean(assetId),
-    // Go stale instantly
-    staleTime: 0,
-    // Never store queries in cache since we always want fresh data
-    gcTime: 0,
-    refetchOnWindowFocus: true,
-    refetchOnMount: true,
-    refetchInterval: 60_000,
+  const { isTradingActive, isLoading: isTradingActiveLoading } = useIsTradingActive({
+    assetId,
   })
 
   useEffect(() => {

src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Withdraw/components/Confirm.tsx

@@ -15,8 +15,6 @@ import { bchChainId, fromAccountId, fromAssetId, toAssetId } from '@shapeshiftos
 import { FeeDataKey } from '@shapeshiftoss/chain-adapters'
 import type { BuildCustomTxInput } from '@shapeshiftoss/chain-adapters/src/evm/types'
 import { supportsETH } from '@shapeshiftoss/hdwallet-core'
-import { SwapperName } from '@shapeshiftoss/swapper'
-import { useQuery } from '@tanstack/react-query'
 import { getConfig } from 'config'
 import { getOrCreateContractByType } from 'contracts/contractManager'
 import { ContractType } from 'contracts/types'
@@ -30,7 +28,7 @@ import type {
 import { DefiStep } from 'features/defi/contexts/DefiManagerProvider/DefiCommon'
 import { useCallback, useContext, useEffect, useMemo, useState } from 'react'
 import { useTranslate } from 'react-polyglot'
-import { reactQueries } from 'react-queries'
+import { useIsTradingActive } from 'react-queries/hooks/useIsTradingActive'
 import { encodeFunctionData, getAddress } from 'viem'
 import { Amount } from 'components/Amount/Amount'
 import { AssetIcon } from 'components/AssetIcon'
@@ -594,20 +592,8 @@ export const Confirm: React.FC<ConfirmProps> = ({ accountId, onNext }) => {
     return txId
   }, [getWithdrawInput, wallet])
 
-  const { data: isTradingActive, refetch: refetchIsTradingActive } = useQuery({
-    ...reactQueries.common.isTradingActive({
-      assetId,
-      swapperName: SwapperName.Thorchain,
-    }),
-    // @lukemorales/query-key-factory only returns queryFn and queryKey - all others will be ignored in the returned object
-    enabled: Boolean(assetId),
-    // Go stale instantly
-    staleTime: 0,
-    // Never store queries in cache since we always want fresh data
-    gcTime: 0,
-    refetchOnWindowFocus: true,
-    refetchOnMount: true,
-    refetchInterval: 60_000,
+  const { isTradingActive, refetch: refetchIsTradingActive } = useIsTradingActive({
+    assetId,
   })
 
   const handleConfirm = useCallback(async () => {
@@ -642,14 +628,14 @@ export const Confirm: React.FC<ConfirmProps> = ({ accountId, onNext }) => {
       }
 
       // Was the pool active when it was fetched at the time of the component mount
+      // If it wasn't, it's definitely not going to become active again in the few seconds it takes to go from mount to sign click
       if (isTradingActive === false) {
         throw new Error(`THORChain pool halted for assetId: ${assetId}`)
       }
 
       // Refetch the trading active state JIT to ensure the pool didn't just become halted
-      const { data: isTradingActiveData } = await refetchIsTradingActive()
-
-      if (!isTradingActiveData) {
+      const _isTradingActive = await refetchIsTradingActive()
+      if (_isTradingActive === false) {
         throw new Error(`THORChain pool halted for assetId: ${assetId}`)
       }
 

src/lib/swapper/swappers/ThorchainSwapper/types.ts

@@ -110,6 +110,7 @@ export type InboundAddressResponse = {
   gas_rate: string
   gas_rate_units: string
   router?: string
+  dust_threshold?: string
   global_trading_paused: boolean
   chain_trading_paused: boolean
   chain_lp_actions_paused: boolean

src/lib/utils/thorchain/constants.ts

@@ -1,4 +1,10 @@
+import { bn } from 'lib/bignumber/bignumber'
+
 export const THOR_PRECISION = 8
 export const BASE_BPS_POINTS = '10000'
 export const THORCHAIN_AFFILIATE_NAME = 'ss'
 export const THORCHAIN_POOL_MODULE_ADDRESS = 'thor1g98cy3n9mmjrpn0sxmn63lztelera37n8n67c0'
+
+// Current blocktime as per https://thorchain.network/stats
+export const THORCHAIN_BLOCK_TIME_SECONDS = '6.1'
+export const thorchainBlockTimeMs = bn(THORCHAIN_BLOCK_TIME_SECONDS).times(1000).toNumber()

src/pages/Lending/hooks/useLendingSupportedAssets/index.ts

@@ -23,6 +23,9 @@ export const useLendingSupportedAssets = ({ type }: { type: 'collateral' | 'borr
 
   const { data: availablePools } = useQuery({
     ...reactQueries.thornode.poolsData(),
+    // @lukemorales/query-key-factory only returns queryFn and queryKey - all others will be ignored in the returned object
+    // Infinity staleTime as we handle halted state JIT
+    staleTime: Infinity,
     select: pools => pools.filter(pool => pool.status === 'Available'),
   })
 

src/pages/Lending/hooks/useRepaymentLockData.tsx

@@ -2,8 +2,9 @@ import type { AccountId, AssetId } from '@shapeshiftoss/caip'
 import type { QueryObserverOptions } from '@tanstack/react-query'
 import { useQuery } from '@tanstack/react-query'
 import { useMemo } from 'react'
-import { reactQueries, thorchainBlockTimeSeconds } from 'react-queries'
+import { reactQueries } from 'react-queries'
 import { bnOrZero } from 'lib/bignumber/bignumber'
+import { THORCHAIN_BLOCK_TIME_SECONDS, thorchainBlockTimeMs } from 'lib/utils/thorchain/constants'
 
 import { thorchainLendingPositionQueryFn } from './useLendingPositionData'
 
@@ -20,6 +21,9 @@ export const useRepaymentLockData = ({
   enabled = true,
 }: UseLendingPositionDataProps & QueryObserverOptions) => {
   const { data: blockHeight } = useQuery({
+    // @lukemorales/query-key-factory only returns queryFn and queryKey - all others will be ignored in the returned object
+    // We use the block query to get the current height, so we obviously need to mark it stale at the end of each THOR block
+    staleTime: thorchainBlockTimeMs,
     ...reactQueries.thornode.block(),
     select: block => block.header.height,
     enabled,
@@ -44,6 +48,9 @@ export const useRepaymentLockData = ({
 
   const repaymentLockData = useQuery({
     ...reactQueries.thornode.mimir(),
+    // @lukemorales/query-key-factory only returns queryFn and queryKey - all others will be ignored in the returned object
+    // We use the mimir query to get the repayment maturity block, so need to mark it stale at the end of each THOR block
+    staleTime: thorchainBlockTimeMs,
     select: mimirData => {
       if (!mimirData || !blockHeight) return null
 
@@ -52,7 +59,7 @@ export const useRepaymentLockData = ({
       // If position is not available, return the repayment maturity as specified by the network, currently about 30 days
       if (!position) {
         return bnOrZero(repaymentMaturity)
-          .times(thorchainBlockTimeSeconds)
+          .times(THORCHAIN_BLOCK_TIME_SECONDS)
           .div(60 * 60 * 24)
           .toString()
       }
@@ -61,7 +68,7 @@ export const useRepaymentLockData = ({
       const repaymentBlock = bnOrZero(position.last_open_height).plus(repaymentMaturity)
       return bnOrZero(repaymentBlock)
         .minus(blockHeight)
-        .times(thorchainBlockTimeSeconds)
+        .times(THORCHAIN_BLOCK_TIME_SECONDS)
         .div(60 * 60 * 24)
         .toFixed(1)
     },

src/pages/ThorChainLP/AvailablePools.tsx

@@ -1,10 +1,10 @@
 import type { GridProps } from '@chakra-ui/react'
 import { Box, Button, Flex, SimpleGrid, Skeleton, Stack, Tag } from '@chakra-ui/react'
 import { thorchainAssetId } from '@shapeshiftoss/caip'
-import { SwapperName } from '@shapeshiftoss/swapper'
 import { useQuery } from '@tanstack/react-query'
 import { useCallback, useMemo } from 'react'
 import { reactQueries } from 'react-queries'
+import { useIsTradingActive } from 'react-queries/hooks/useIsTradingActive'
 import { generatePath, useHistory } from 'react-router'
 import { Amount } from 'components/Amount/Amount'
 import { Main } from 'components/Layout/Main'
@@ -51,19 +51,8 @@ type PoolButtonProps = {
 const PoolButton = ({ pool }: PoolButtonProps) => {
   const history = useHistory()
 
-  const { data: isTradingActive, isLoading: isTradingActiveLoading } = useQuery({
-    ...reactQueries.common.isTradingActive({
-      assetId: pool.assetId,
-      swapperName: SwapperName.Thorchain,
-    }),
-    // @lukemorales/query-key-factory only returns queryFn and queryKey - all others will be ignored in the returned object
-    // Go stale instantly
-    staleTime: 0,
-    // Never store queries in cache since we always want fresh data
-    gcTime: 0,
-    refetchOnWindowFocus: true,
-    refetchOnMount: true,
-    refetchInterval: 60_000,
+  const { isTradingActive, isLoading: isTradingActiveLoading } = useIsTradingActive({
+    assetId: pool?.assetId,
   })
 
   const handlePoolClick = useCallback(() => {
@@ -89,6 +78,8 @@ const PoolButton = ({ pool }: PoolButtonProps) => {
 
   const { data: volume7D, isLoading: isVolume7DLoading } = useQuery({
     ...reactQueries.midgard.swapsData(pool.assetId, '7d'),
+    // @lukemorales/query-key-factory only returns queryFn and queryKey - all others will be ignored in the returned object
+    staleTime: Infinity,
     select: data => getVolume(runeMarketData.price, data),
   })