Merge branch 'develop' into feat_virtualized_markets_page

shapeshift · Jan 14, 2025 · 1e32e47 · 1e32e47
2 parents cd26642 + a26d13f
commit 1e32e47
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 8 deletions.
diff --git a/packages/swapper/src/swappers/ChainflipSwapper/utils/getQuoteOrRate.ts b/packages/swapper/src/swappers/ChainflipSwapper/utils/getQuoteOrRate.ts
@@ -2,7 +2,7 @@ import type { AssetId } from '@shapeshiftoss/caip'
 import { CHAIN_NAMESPACE, fromAssetId, solAssetId } from '@shapeshiftoss/caip'
 import type { GetFeeDataInput } from '@shapeshiftoss/chain-adapters'
 import type { KnownChainIds } from '@shapeshiftoss/types'
-import { assertUnreachable } from '@shapeshiftoss/utils'
+import { assertUnreachable, bnOrZero, toBaseUnit } from '@shapeshiftoss/utils'
 import type { Result } from '@sniptt/monads'
 import { Err, Ok } from '@sniptt/monads'
 import type { AxiosError } from 'axios'
@@ -297,6 +297,15 @@ export const getQuoteOrRate = async (
         singleQuoteResponse.boostQuote.egressAmountNative!,
       )
 
+      // This is not really a buyAmount before fees but rather an input/output calculation to get the sell amount
+      // prorated to the buy asset price to determine price impact
+      const buyAmountBeforeFeesCryptoBaseUnit = toBaseUnit(
+        bnOrZero(singleQuoteResponse.boostQuote.ingressAmount!).times(
+          singleQuoteResponse.estimatedPrice!,
+        ),
+        buyAsset.precision,
+      )
+
       const boostTradeRateOrQuote = {
         id: uuid(),
         rate: boostRate,
@@ -310,7 +319,7 @@ export const getQuoteOrRate = async (
           getDefaultSlippageDecimalPercentageForSwapper(SwapperName.Chainflip),
         steps: [
           {
-            buyAmountBeforeFeesCryptoBaseUnit: singleQuoteResponse.boostQuote.egressAmountNative!,
+            buyAmountBeforeFeesCryptoBaseUnit,
             buyAmountAfterFeesCryptoBaseUnit: singleQuoteResponse.boostQuote.egressAmountNative!,
             sellAmountIncludingProtocolFeesCryptoBaseUnit:
               singleQuoteResponse.boostQuote.ingressAmountNative!,
@@ -349,6 +358,13 @@ export const getQuoteOrRate = async (
       singleQuoteResponse.egressAmountNative!,
     )
 
+    // This is not really a buyAmount before fees but rather an input/output calculation to get the sell amount
+    // prorated to the buy asset price to determine price impact
+    const buyAmountBeforeFeesCryptoBaseUnit = toBaseUnit(
+      bnOrZero(singleQuoteResponse.ingressAmount!).times(singleQuoteResponse.estimatedPrice!),
+      buyAsset.precision,
+    )
+
     const tradeRateOrQuote = {
       id: uuid(),
       rate,
@@ -362,7 +378,7 @@ export const getQuoteOrRate = async (
         getDefaultSlippageDecimalPercentageForSwapper(SwapperName.Chainflip),
       steps: [
         {
-          buyAmountBeforeFeesCryptoBaseUnit: singleQuoteResponse.egressAmountNative!,
+          buyAmountBeforeFeesCryptoBaseUnit,
           buyAmountAfterFeesCryptoBaseUnit: singleQuoteResponse.egressAmountNative!,
           sellAmountIncludingProtocolFeesCryptoBaseUnit: singleQuoteResponse.ingressAmountNative!,
           feeData: {

diff --git a/packages/swapper/src/swappers/JupiterSwapper/swapperApi/getTradeQuote.ts b/packages/swapper/src/swappers/JupiterSwapper/swapperApi/getTradeQuote.ts
@@ -239,6 +239,7 @@ export const getTradeQuote = async (
     affiliateBps,
     receiveAddress,
     slippageTolerancePercentageDecimal,
+    priceImpactPercentageDecimal: priceResponse.priceImpactPct,
     steps: [
       {
         accountNumber,

diff --git a/packages/swapper/src/swappers/JupiterSwapper/swapperApi/getTradeRate.ts b/packages/swapper/src/swappers/JupiterSwapper/swapperApi/getTradeRate.ts
@@ -223,6 +223,7 @@ export const getTradeRate = async (
     receiveAddress,
     potentialAffiliateBps: affiliateBps,
     affiliateBps,
+    priceImpactPercentageDecimal: priceResponse.priceImpactPct,
     slippageTolerancePercentageDecimal,
     steps: [
       {

diff --git a/packages/swapper/src/types.ts b/packages/swapper/src/types.ts
@@ -310,6 +310,7 @@ type TradeQuoteBase = {
   potentialAffiliateBps: string // even if the swapper does not support affiliateBps, we need to zero-them out or view-layer will be borked
   affiliateBps: string // even if the swapper does not support affiliateBps, we need to zero-them out or view-layer will be borked
   isStreaming?: boolean
+  priceImpactPercentageDecimal?: string
   slippageTolerancePercentageDecimal: string | undefined // undefined if slippage limit is not provided or specified by the swapper
   isLongtail?: boolean
   quoteOrRate: 'quote' | 'rate'

diff --git a/src/components/MultiHopTrade/hooks/quoteValidation/usePriceImpact.tsx b/src/components/MultiHopTrade/hooks/quoteValidation/usePriceImpact.tsx
@@ -41,6 +41,10 @@ export const usePriceImpact = (tradeQuote: TradeQuote | TradeRate | undefined) =
   const priceImpactPercentage = useMemo(() => {
     if (!tradeQuote || !buyAsset || !buyAssetUsdRate || !sellAmountBeforeFeesUsd) return
 
+    if (tradeQuote.priceImpactPercentageDecimal) {
+      return bnOrZero(tradeQuote.priceImpactPercentageDecimal).times(100).abs()
+    }
+
     // price impact calculation must use buyAmountBeforeFees because it relates to the liquidity in
     // the pool rather than a rate of input versus output
 

diff --git a/src/components/MultiHopTrade/hooks/useReceiveAddress.tsx b/src/components/MultiHopTrade/hooks/useReceiveAddress.tsx
@@ -52,7 +52,7 @@ export const useReceiveAddress = ({
     return false
   }, [buyAsset, wallet])
 
-  const { data: walletReceiveAddress, isLoading } = useQuery({
+  const { data: walletReceiveAddress, isLoading } = useQuery<string | null>({
     queryKey: [
       'receiveAddress',
       buyAsset?.assetId,
@@ -67,7 +67,7 @@ export const useReceiveAddress = ({
         ? async () => {
             // Already partially covered in isInitializing, but TypeScript lyfe mang.
             if (!buyAsset || !wallet || !buyAccountId || !buyAccountMetadata || !deviceId) {
-              return undefined
+              return null
             }
 
             const buyAssetChainId = buyAsset.chainId
@@ -80,7 +80,7 @@ export const useReceiveAddress = ({
              * super dangerous - don't use the wrong bip44 params to generate receive addresses
              */
             if (buyAssetChainId !== buyAssetAccountChainId) {
-              return undefined
+              return null
             }
 
             if (isUtxoAccountId(buyAccountId) && !buyAccountMetadata?.accountType)
@@ -95,11 +95,14 @@ export const useReceiveAddress = ({
               pubKey: shouldFetchUnchainedAddress ? fromAccountId(buyAccountId).account : undefined,
             })
 
-            return walletReceiveAddress
+            return walletReceiveAddress ?? null
           }
         : skipToken,
     staleTime: Infinity,
   })
 
-  return { walletReceiveAddress, isLoading: isInitializing || isLoading }
+  return {
+    walletReceiveAddress: walletReceiveAddress ?? undefined,
+    isLoading: isInitializing || isLoading,
+  }
 }