feat: foxwifhat discount

src/components/FeeExplainer/FeeExplainer.tsx

@@ -1,5 +1,6 @@
 import type { CardProps, StackProps } from '@chakra-ui/react'
 import { Box, Card, CardBody, Flex, Heading, Stack, useToken } from '@chakra-ui/react'
+import { foxWifHatAssetId } from '@shapeshiftoss/caip'
 import { bnOrZero } from '@shapeshiftoss/chain-adapters'
 import { LinearGradient } from '@visx/gradient'
 import { GridColumns, GridRows } from '@visx/grid'
@@ -31,6 +32,7 @@ import {
   selectIsSnapshotApiQueriesRejected,
   selectVotingPower,
 } from 'state/apis/snapshot/selectors'
+import { selectPortfolioCryptoBalanceBaseUnitByFilter } from 'state/slices/common-selectors'
 import { useAppSelector } from 'state/store'
 
 import { CHART_TRADE_SIZE_MAX_USD } from './common'
@@ -149,6 +151,9 @@ const FeeChart: React.FC<FeeChartProps> = ({ foxHolding, tradeSize, feeModel })
           foxHeld: bn(debouncedFoxHolding),
           feeModel,
           isSnapshotApiQueriesRejected,
+          // This is for feeExplainer which is not supporting anything else than FOX discount for now
+          foxWifHatHeld: bn(0),
+          thorHeld: bn(0),
         }).feeBpsFloat.toNumber()
         return { x: trade, y: feeBps }
       })
@@ -161,6 +166,9 @@ const FeeChart: React.FC<FeeChartProps> = ({ foxHolding, tradeSize, feeModel })
       foxHeld: bn(debouncedFoxHolding),
       feeModel,
       isSnapshotApiQueriesRejected,
+      // This is for feeExplainer which is not supporting anything else than FOX discount for now
+      foxWifHatHeld: bn(0),
+      thorHeld: bn(0),
     }).feeBpsFloat.toNumber()
 
     return [{ x: tradeSize, y: feeBps }]
@@ -262,12 +270,20 @@ type FeeOutputProps = {
 
 export const FeeOutput: React.FC<FeeOutputProps> = ({ tradeSizeUSD, foxHolding, feeModel }) => {
   const isSnapshotApiQueriesRejected = useAppSelector(selectIsSnapshotApiQueriesRejected)
+
+  const foxWifHatHeld = useAppSelector(state =>
+    selectPortfolioCryptoBalanceBaseUnitByFilter(state, { assetId: foxWifHatAssetId }),
+  )
+
   const { feeUsd, feeBps, foxDiscountPercent, feeUsdBeforeDiscount, feeBpsBeforeDiscount } =
     calculateFees({
       tradeAmountUsd: bn(tradeSizeUSD),
       foxHeld: bn(foxHolding),
       feeModel,
       isSnapshotApiQueriesRejected,
+      foxWifHatHeld: bn(foxWifHatHeld),
+      // @TODO: remove this when thor swap discount is removed
+      thorHeld: bn(0),
     })
 
   const basedOnFeeTranslation: TextPropTypes['translation'] = useMemo(

src/lib/fees/model.test.ts

@@ -41,6 +41,8 @@ describe('calculateFees', () => {
     const { feeBps } = calculateFees({
       tradeAmountUsd,
       foxHeld,
+      thorHeld: bn(0),
+      foxWifHatHeld: bn(0),
       feeModel: 'SWAPPER',
       isSnapshotApiQueriesRejected,
     })
@@ -54,6 +56,8 @@ describe('calculateFees', () => {
     const { feeBps } = calculateFees({
       tradeAmountUsd,
       foxHeld,
+      thorHeld: bn(0),
+      foxWifHatHeld: bn(0),
       feeModel: 'SWAPPER',
       isSnapshotApiQueriesRejected,
     })
@@ -67,6 +71,8 @@ describe('calculateFees', () => {
     const { feeBps } = calculateFees({
       tradeAmountUsd,
       foxHeld,
+      thorHeld: bn(0),
+      foxWifHatHeld: bn(0),
       feeModel: 'SWAPPER',
       isSnapshotApiQueriesRejected,
     })
@@ -80,6 +86,8 @@ describe('calculateFees', () => {
     const { feeBps } = calculateFees({
       tradeAmountUsd,
       foxHeld,
+      thorHeld: bn(0),
+      foxWifHatHeld: bn(0),
       feeModel: 'SWAPPER',
       isSnapshotApiQueriesRejected,
     })
@@ -93,6 +101,8 @@ describe('calculateFees', () => {
     const { feeBps } = calculateFees({
       tradeAmountUsd,
       foxHeld,
+      thorHeld: bn(0),
+      foxWifHatHeld: bn(0),
       feeModel: 'SWAPPER',
       isSnapshotApiQueriesRejected,
     })
@@ -106,6 +116,8 @@ describe('calculateFees', () => {
     const { feeBps, foxDiscountPercent } = calculateFees({
       tradeAmountUsd,
       foxHeld,
+      thorHeld: bn(0),
+      foxWifHatHeld: bn(0),
       feeModel: 'SWAPPER',
       isSnapshotApiQueriesRejected,
     })
@@ -120,6 +132,8 @@ describe('calculateFees', () => {
     const { feeBps, foxDiscountPercent } = calculateFees({
       tradeAmountUsd,
       foxHeld,
+      thorHeld: bn(0),
+      foxWifHatHeld: bn(0),
       feeModel: 'SWAPPER',
       isSnapshotApiQueriesRejected,
     })
@@ -136,6 +150,8 @@ describe('calculateFees', () => {
     const { feeBps, foxDiscountPercent } = calculateFees({
       tradeAmountUsd,
       foxHeld,
+      thorHeld: bn(0),
+      foxWifHatHeld: bn(0),
       feeModel: 'SWAPPER',
       isSnapshotApiQueriesRejected,
     })
@@ -156,12 +172,14 @@ describe('calculateFees', () => {
       vi.setSystemTime(new Date(FOX_WIF_HAT_CAMPAIGN_STARTING_TIME_MS))
       const tradeAmountUsd = bn(FEE_CURVE_MIDPOINT_USD)
       const foxHeld = bn(0)
+      const thorHeld = bn(0)
       const foxWifHatHeld = bn(FOX_WIF_HAT_MINIMUM_AMOUNT_BASE_UNIT)
       const isSnapshotApiQueriesRejected = selectIsSnapshotApiQueriesRejected(store.getState())
 
       const { feeBps, foxDiscountPercent } = calculateFees({
         tradeAmountUsd,
         foxHeld,
+        thorHeld,
         foxWifHatHeld,
         feeModel: 'SWAPPER',
         isSnapshotApiQueriesRejected,
@@ -179,12 +197,14 @@ describe('calculateFees', () => {
       vi.setSystemTime(new Date(campaignMidpoint))
       const tradeAmountUsd = bn(FEE_CURVE_MIDPOINT_USD)
       const foxHeld = bn(0)
+      const thorHeld = bn(0)
       const foxWifHatHeld = bn(FOX_WIF_HAT_MINIMUM_AMOUNT_BASE_UNIT)
       const isSnapshotApiQueriesRejected = selectIsSnapshotApiQueriesRejected(store.getState())
 
       const { feeBps, foxDiscountPercent } = calculateFees({
         tradeAmountUsd,
         foxHeld,
+        thorHeld,
         foxWifHatHeld,
         feeModel: 'SWAPPER',
         isSnapshotApiQueriesRejected,
@@ -198,12 +218,14 @@ describe('calculateFees', () => {
       vi.setSystemTime(new Date(FOX_WIF_HAT_CAMPAIGN_ENDING_TIME_MS))
       const tradeAmountUsd = bn(FEE_CURVE_MIDPOINT_USD)
       const foxHeld = bn(0)
+      const thorHeld = bn(0)
       const foxWifHatHeld = bn(FOX_WIF_HAT_MINIMUM_AMOUNT_BASE_UNIT)
       const isSnapshotApiQueriesRejected = selectIsSnapshotApiQueriesRejected(store.getState())
 
       const { feeBps, foxDiscountPercent } = calculateFees({
         tradeAmountUsd,
         foxHeld,
+        thorHeld,
         foxWifHatHeld,
         feeModel: 'SWAPPER',
         isSnapshotApiQueriesRejected,
@@ -217,12 +239,14 @@ describe('calculateFees', () => {
       vi.setSystemTime(new Date(FOX_WIF_HAT_CAMPAIGN_STARTING_TIME_MS))
       const tradeAmountUsd = bn(FEE_CURVE_MIDPOINT_USD)
       const foxHeld = bn(0)
+      const thorHeld = bn(0)
       const foxWifHatHeld = bn(FOX_WIF_HAT_MINIMUM_AMOUNT_BASE_UNIT).minus(1)
       const isSnapshotApiQueriesRejected = selectIsSnapshotApiQueriesRejected(store.getState())
 
       const { feeBps, foxDiscountPercent } = calculateFees({
         tradeAmountUsd,
         foxHeld,
+        thorHeld,
         foxWifHatHeld,
         feeModel: 'SWAPPER',
         isSnapshotApiQueriesRejected,
@@ -236,12 +260,14 @@ describe('calculateFees', () => {
       vi.setSystemTime(new Date(FOX_WIF_HAT_CAMPAIGN_ENDING_TIME_MS + 1))
       const tradeAmountUsd = bn(FEE_CURVE_MIDPOINT_USD)
       const foxHeld = bn(0)
+      const thorHeld = bn(0)
       const foxWifHatHeld = bn(FOX_WIF_HAT_MINIMUM_AMOUNT_BASE_UNIT)
       const isSnapshotApiQueriesRejected = selectIsSnapshotApiQueriesRejected(store.getState())
 
       const { feeBps, foxDiscountPercent } = calculateFees({
         tradeAmountUsd,
         foxHeld,
+        thorHeld,
         foxWifHatHeld,
         feeModel: 'SWAPPER',
         isSnapshotApiQueriesRejected,

src/lib/fees/model.ts

@@ -16,8 +16,8 @@ export const THORSWAP_MAXIMUM_YEAR_TRESHOLD = 2025
 type CalculateFeeBpsArgs = {
   tradeAmountUsd: BigNumber
   foxHeld: BigNumber
-  thorHeld?: BigNumber
-  foxWifHatHeld?: BigNumber
+  thorHeld: BigNumber
+  foxWifHatHeld: BigNumber
   feeModel: ParameterModel
   isSnapshotApiQueriesRejected: boolean
 }
@@ -92,26 +92,21 @@ export const calculateFees: CalculateFeeBps = ({
 
   const isThorFree =
     isThorFreeEnabled &&
-    thorHeld?.gte(THORSWAP_UNIT_THRESHOLD) &&
+    thorHeld.gte(THORSWAP_UNIT_THRESHOLD) &&
     new Date().getUTCFullYear() < THORSWAP_MAXIMUM_YEAR_TRESHOLD
 
   // failure to fetch fox discount results in free trades.
-  const isFallbackFees =
-    isSnapshotApiQueriesRejected &&
-    (!foxWifHatHeld ||
-      foxWifHatHeld?.lt(FOX_WIF_HAT_MINIMUM_AMOUNT_BASE_UNIT) ||
-      !isFoxWifHatCampaignActive)
+  const isFallbackFees = isSnapshotApiQueriesRejected
 
   // the fox discount before any other logic is applied
   const foxBaseDiscountPercent = (() => {
     if (isFree) return bn(100)
     // THOR holder before TIP014 are trade free until 2025
     if (isThorFree) return bn(100)
 
-    const foxDiscountPercent = BigNumber.minimum(
-      bn(100),
-      bnOrZero(foxHeld).times(100).div(bn(FEE_CURVE_FOX_MAX_DISCOUNT_THRESHOLD)),
-    )
+    const foxDiscountPercent = isFoxWifHatCampaignActive
+      ? bnOrZero(foxHeld).times(100).div(bn(FEE_CURVE_FOX_MAX_DISCOUNT_THRESHOLD))
+      : bn(0)
 
     // No discount if we cannot fetch FOX holdings
     if (isFallbackFees) return bn(0)

src/pages/ThorChainLP/components/AddLiquidity/AddLiquidityInput.tsx

@@ -18,7 +18,13 @@ import {
   usePrevious,
 } from '@chakra-ui/react'
 import type { AccountId, AssetId, ChainId } from '@shapeshiftoss/caip'
-import { fromAccountId, fromAssetId, thorchainAssetId, thorchainChainId } from '@shapeshiftoss/caip'
+import {
+  foxWifHatAssetId,
+  fromAccountId,
+  fromAssetId,
+  thorchainAssetId,
+  thorchainChainId,
+} from '@shapeshiftoss/caip'
 import { SwapperName } from '@shapeshiftoss/swapper'
 import {
   assetIdToPoolAssetId,
@@ -202,6 +208,10 @@ export const AddLiquidityInput: React.FC<AddLiquidityInputProps> = ({
   const [virtualRuneDepositAmountFiatUserCurrency, setVirtualRuneDepositAmountFiatUserCurrency] =
     useState<string | undefined>()
 
+  const foxWifHatHeld = useAppSelector(state =>
+    selectPortfolioCryptoBalanceBaseUnitByFilter(state, { assetId: foxWifHatAssetId }),
+  )
+
   const [slippageDecimalPercentage, setSlippageDecimalPercentage] = useState<string | undefined>()
 
   const isUnsafeQuote = useMemo(
@@ -1014,6 +1024,9 @@ export const AddLiquidityInput: React.FC<AddLiquidityInputProps> = ({
     const { feeBps, feeUsd } = calculateFees({
       tradeAmountUsd: bn(totalAmountUsd),
       foxHeld: bnOrZero(votingPower),
+      foxWifHatHeld: bn(foxWifHatHeld),
+      // @TODO: remove this when thor swap discount is removed
+      thorHeld: bn(0),
       feeModel: 'THORCHAIN_LP',
       isSnapshotApiQueriesRejected,
     })
@@ -1058,6 +1071,7 @@ export const AddLiquidityInput: React.FC<AddLiquidityInputProps> = ({
     userCurrencyToUsdRate,
     votingPower,
     isSnapshotApiQueriesRejected,
+    foxWifHatHeld,
   ])
 
   const percentOptions = useMemo(() => [], [])