Merge branch 'develop' into feat/integrate-debridge-swapper

Author: NeOMakinG

packages/swap-widget/src/hooks/useMarketData.ts

@@ -1,5 +1,5 @@
 import { adapters } from '@shapeshiftoss/caip'
-import { bn, fromBaseUnit } from '@shapeshiftoss/utils'
+import { BigAmount, bn } from '@shapeshiftoss/utils'
 import { useQuery } from '@tanstack/react-query'
 
 import type { AssetId } from '../types'
@@ -157,7 +157,7 @@ export const formatUsdValue = (
 ): string => {
   if (!usdPrice || usdPrice === '0') return '$0.00'
 
-  const amount = fromBaseUnit(cryptoAmount, precision)
+  const amount = BigAmount.fromBaseUnit({ value: cryptoAmount, precision }).toPrecision()
   const usdValue = bn(amount).times(usdPrice).toNumber()
 
   if (usdValue < 0.01) return '< $0.01'

packages/swap-widget/src/types/index.ts

@@ -26,7 +26,7 @@ import {
   thorchainChainId,
 } from '@shapeshiftoss/caip'
 import type { TransactionData } from '@shapeshiftoss/types'
-import { fromBaseUnit, toBaseUnit } from '@shapeshiftoss/utils'
+import { BigAmount } from '@shapeshiftoss/utils'
 import type { WalletClient } from 'viem'
 import { erc20Abi } from 'viem'
 
@@ -274,7 +274,9 @@ export const getChainType = (chainId: string): 'evm' | 'utxo' | 'cosmos' | 'sola
 
 export const formatAmount = (amount: string, decimals: number, maxDecimals?: number): string => {
   const effectiveMaxDecimals = maxDecimals ?? Math.min(decimals, 8)
-  const result = fromBaseUnit(amount, decimals, effectiveMaxDecimals)
+  const result = BigAmount.fromBaseUnit({ value: amount, precision: decimals }).toFixed(
+    effectiveMaxDecimals,
+  )
   const num = Number(result)
   if (num === 0) return '0'
 
@@ -290,7 +292,7 @@ export const formatAmount = (amount: string, decimals: number, maxDecimals?: num
 }
 
 export const parseAmount = (amount: string, decimals: number): string => {
-  return toBaseUnit(amount, decimals)
+  return BigAmount.fromPrecision({ value: amount, precision: decimals }).toBaseUnit()
 }
 
 export const truncateAddress = (address: string, chars = 4): string => {

packages/swapper/src/swappers/ButterSwap/swapperApi/getTradeQuote.ts

@@ -1,11 +1,10 @@
 import { btcChainId, solanaChainId, tronChainId } from '@shapeshiftoss/caip'
 import { isEvmChainId } from '@shapeshiftoss/chain-adapters'
 import {
+  BigAmount,
   bnOrZero,
   chainIdToFeeAssetId,
   convertDecimalPercentageToBasisPoints,
-  fromBaseUnit,
-  toBaseUnit,
 } from '@shapeshiftoss/utils'
 import type { Result } from '@sniptt/monads'
 import { Err, Ok } from '@sniptt/monads'
@@ -83,10 +82,10 @@ export const getTradeQuote = async (
   const routeResult = await getButterRoute({
     sellAsset,
     buyAsset,
-    sellAmountCryptoBaseUnit: fromBaseUnit(
-      sellAmountIncludingProtocolFeesCryptoBaseUnit,
-      sellAsset.precision,
-    ),
+    sellAmountCryptoPrecision: BigAmount.fromBaseUnit({
+      value: sellAmountIncludingProtocolFeesCryptoBaseUnit,
+      precision: sellAsset.precision,
+    }).toPrecision(),
     slippage,
     affiliate: makeButterSwapAffiliate(affiliateBps),
   })
@@ -96,10 +95,10 @@ export const getTradeQuote = async (
 
   if (!isRouteSuccess(routeResponse)) {
     if (routeResponse.errno === ButterSwapErrorCode.InsufficientAmount) {
-      const minAmountCryptoBaseUnit = toBaseUnit(
-        (routeResponse as any).minAmount,
-        sellAsset.precision,
-      )
+      const minAmountCryptoBaseUnit = BigAmount.fromPrecision({
+        value: (routeResponse as any).minAmount,
+        precision: sellAsset.precision,
+      }).toBaseUnit()
       return Err(
         createTradeAmountTooSmallErr({
           minAmountCryptoBaseUnit,
@@ -165,15 +164,21 @@ export const getTradeQuote = async (
   }
 
   // Map gasFee.amount to networkFeeCryptoBaseUnit using fee asset precision
-  const networkFeeCryptoBaseUnit = toBaseUnit(bnOrZero(route.gasFee?.amount), feeAsset.precision)
+  const networkFeeCryptoBaseUnit = BigAmount.fromPrecision({
+    value: bnOrZero(route.gasFee?.amount),
+    precision: feeAsset.precision,
+  }).toBaseUnit()
 
   // Use destination receive amount as a priority if present and defined
   // It won't for same-chain swaps, so we fall back to the source chain receive amount (i.e source chain *is* the destination chain)
   const outputAmount = route.dstChain?.totalAmountOut ?? route.srcChain.totalAmountOut
 
   // TODO: affiliate fees not yet here, gut feel is that Butter won't do the swap output - fees logic for us here
   // Sanity check me when affiliates are implemented, and do the math ourselves if needed
-  const buyAmountAfterFeesCryptoBaseUnit = toBaseUnit(outputAmount, buyAsset.precision)
+  const buyAmountAfterFeesCryptoBaseUnit = BigAmount.fromPrecision({
+    value: outputAmount,
+    precision: buyAsset.precision,
+  }).toBaseUnit()
 
   const rate = getInputOutputRate({
     sellAmountCryptoBaseUnit: sellAmountIncludingProtocolFeesCryptoBaseUnit,
@@ -239,7 +244,10 @@ export const getTradeQuote = async (
   const solanaTransactionMetadata = maybeSolanaTransactionMetadata?.unwrap()
 
   const step = {
-    buyAmountBeforeFeesCryptoBaseUnit: toBaseUnit(outputAmount, buyAsset.precision),
+    buyAmountBeforeFeesCryptoBaseUnit: BigAmount.fromPrecision({
+      value: outputAmount,
+      precision: buyAsset.precision,
+    }).toBaseUnit(),
     buyAmountAfterFeesCryptoBaseUnit,
     sellAmountIncludingProtocolFeesCryptoBaseUnit,
     feeData: {

packages/swapper/src/swappers/ButterSwap/swapperApi/getTradeRate.ts

@@ -1,11 +1,10 @@
 import { btcChainId, solanaChainId, tronChainId } from '@shapeshiftoss/caip'
 import { isEvmChainId } from '@shapeshiftoss/chain-adapters'
 import {
-  bn,
+  BigAmount,
   bnOrZero,
   chainIdToFeeAssetId,
   convertDecimalPercentageToBasisPoints,
-  toBaseUnit,
 } from '@shapeshiftoss/utils'
 import type { Result } from '@sniptt/monads'
 import { Err, Ok } from '@sniptt/monads'
@@ -53,9 +52,10 @@ export const getTradeRate = async (
     )
   }
 
-  const amount = bn(sellAmountIncludingProtocolFeesCryptoBaseUnit)
-    .shiftedBy(-sellAsset.precision)
-    .toString()
+  const amount = BigAmount.fromBaseUnit({
+    value: sellAmountIncludingProtocolFeesCryptoBaseUnit,
+    precision: sellAsset.precision,
+  }).toPrecision()
 
   const feeAssetId = chainIdToFeeAssetId(sellAsset.chainId)
 
@@ -69,7 +69,7 @@ export const getTradeRate = async (
   const result = await getButterRoute({
     sellAsset,
     buyAsset,
-    sellAmountCryptoBaseUnit: amount,
+    sellAmountCryptoPrecision: amount,
     slippage,
     affiliate: makeButterSwapAffiliate(affiliateBps),
   })
@@ -80,10 +80,10 @@ export const getTradeRate = async (
 
   if (!isRouteSuccess(routeResponse)) {
     if (routeResponse.errno === ButterSwapErrorCode.InsufficientAmount) {
-      const minAmountCryptoBaseUnit = toBaseUnit(
-        (routeResponse as any).minAmount,
-        sellAsset.precision,
-      )
+      const minAmountCryptoBaseUnit = BigAmount.fromPrecision({
+        value: (routeResponse as any).minAmount,
+        precision: sellAsset.precision,
+      }).toBaseUnit()
       return Err(
         createTradeAmountTooSmallErr({
           minAmountCryptoBaseUnit,
@@ -115,7 +115,10 @@ export const getTradeRate = async (
 
   // TODO: affiliate fees not yet here, gut feel is that Butter won't do the swap output - fees logic for us here
   // Sanity check me when affiliates are implemented, and do the math ourselves if needed
-  const buyAmountAfterFeesCryptoBaseUnit = toBaseUnit(outputAmount, buyAsset.precision)
+  const buyAmountAfterFeesCryptoBaseUnit = BigAmount.fromPrecision({
+    value: outputAmount,
+    precision: buyAsset.precision,
+  }).toBaseUnit()
 
   const rate = getInputOutputRate({
     sellAmountCryptoBaseUnit: sellAmountIncludingProtocolFeesCryptoBaseUnit,
@@ -136,13 +139,19 @@ export const getTradeRate = async (
 
   // Map gasFee.amount to networkFeeCryptoBaseUnit using fee asset precision
   const networkFeeCryptoBaseUnit = bnOrZero(route.gasFee?.amount).gt(0)
-    ? toBaseUnit(route.gasFee.amount, feeAsset.precision)
+    ? BigAmount.fromPrecision({
+        value: route.gasFee.amount,
+        precision: feeAsset.precision,
+      }).toBaseUnit()
     : '0'
 
   // Always a single step
   const step = {
     rate,
-    buyAmountBeforeFeesCryptoBaseUnit: toBaseUnit(outputAmount, buyAsset.precision),
+    buyAmountBeforeFeesCryptoBaseUnit: BigAmount.fromPrecision({
+      value: outputAmount,
+      precision: buyAsset.precision,
+    }).toBaseUnit(),
     buyAmountAfterFeesCryptoBaseUnit,
     sellAmountIncludingProtocolFeesCryptoBaseUnit,
     feeData: {

packages/swapper/src/swappers/ButterSwap/xhr.ts

@@ -33,7 +33,7 @@ type ButterSwapPromise<T> = Promise<Result<T, SwapErrorRight>>
 export type GetButterRouteArgs = {
   sellAsset: Asset
   buyAsset: Asset
-  sellAmountCryptoBaseUnit: string
+  sellAmountCryptoPrecision: string
   slippage: string
   affiliate?: string
 }
@@ -44,7 +44,7 @@ const TRON_NATIVE_ADDRESS = 'T9yD14Nj9j7xAB4dbGeiX9h8unkKHxuWwb'
 export const getButterRoute = async ({
   sellAsset,
   buyAsset,
-  sellAmountCryptoBaseUnit,
+  sellAmountCryptoPrecision,
   slippage,
   affiliate,
 }: GetButterRouteArgs): ButterSwapPromise<RouteResponse> => {
@@ -88,7 +88,7 @@ export const getButterRoute = async ({
     tokenInAddress: sellAssetAddress,
     toChainId: butterToChainId,
     tokenOutAddress: buyAssetAddress,
-    amount: sellAmountCryptoBaseUnit,
+    amount: sellAmountCryptoPrecision,
     type: 'exactIn',
     slippage,
     entrance: 'shapeshift',

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, bnOrZero, toBaseUnit } from '@shapeshiftoss/utils'
+import { assertUnreachable, BigAmount, bnOrZero } from '@shapeshiftoss/utils'
 import type { Result } from '@sniptt/monads'
 import { Err, Ok } from '@sniptt/monads'
 import type { AxiosError } from 'axios'
@@ -309,12 +309,12 @@ export const getQuoteOrRate = async (
 
       // 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(
+      const buyAmountBeforeFeesCryptoBaseUnit = BigAmount.fromPrecision({
+        value: bnOrZero(singleQuoteResponse.boostQuote.ingressAmount).times(
           bnOrZero(singleQuoteResponse.estimatedPrice),
         ),
-        buyAsset.precision,
-      )
+        precision: buyAsset.precision,
+      }).toBaseUnit()
 
       const boostTradeRateOrQuote = {
         id: uuid(),
@@ -372,12 +372,12 @@ export const getQuoteOrRate = async (
 
     // 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(
+    const buyAmountBeforeFeesCryptoBaseUnit = BigAmount.fromPrecision({
+      value: bnOrZero(singleQuoteResponse.ingressAmount).times(
         bnOrZero(singleQuoteResponse.estimatedPrice),
       ),
-      buyAsset.precision,
-    )
+      precision: buyAsset.precision,
+    }).toBaseUnit()
 
     const tradeRateOrQuote = {
       id: uuid(),

packages/swapper/src/swappers/ChainflipSwapper/utils/helpers.ts

@@ -1,7 +1,7 @@
 import type { AssetId, ChainId } from '@shapeshiftoss/caip'
 import { fromAssetId } from '@shapeshiftoss/caip'
 import type { Asset } from '@shapeshiftoss/types'
-import { bn, bnOrZero, fromBaseUnit, isToken } from '@shapeshiftoss/utils'
+import { BigAmount, bn, bnOrZero, isToken } from '@shapeshiftoss/utils'
 import type { Result } from '@sniptt/monads'
 import { Err, Ok } from '@sniptt/monads'
 import type { AxiosResponse } from 'axios'
@@ -73,15 +73,15 @@ export const calculateChainflipMinPrice = ({
   sellAsset: Asset
   buyAsset: Asset
 }): string => {
-  const sellAmountCryptoPrecision = fromBaseUnit(
-    sellAmountIncludingProtocolFeesCryptoBaseUnit,
-    sellAsset.precision,
-  )
-
-  const buyAmountCryptoPrecision = fromBaseUnit(
-    buyAmountAfterFeesCryptoBaseUnit,
-    buyAsset.precision,
-  )
+  const sellAmountCryptoPrecision = BigAmount.fromBaseUnit({
+    value: sellAmountIncludingProtocolFeesCryptoBaseUnit,
+    precision: sellAsset.precision,
+  }).toPrecision()
+
+  const buyAmountCryptoPrecision = BigAmount.fromBaseUnit({
+    value: buyAmountAfterFeesCryptoBaseUnit,
+    precision: buyAsset.precision,
+  }).toPrecision()
 
   const estimatedPrice = bn(buyAmountCryptoPrecision).div(sellAmountCryptoPrecision)
 

packages/swapper/src/swappers/CowSwapper/utils/helpers/helpers.ts

@@ -2,11 +2,11 @@ import type { ChainId } from '@shapeshiftoss/caip'
 import { fromAssetId } from '@shapeshiftoss/caip'
 import type { Asset, OrderQuoteResponse } from '@shapeshiftoss/types'
 import {
+  BigAmount,
   bn,
   bnOrZero,
   convertBasisPointsToDecimalPercentage,
   convertPrecision,
-  fromBaseUnit,
 } from '@shapeshiftoss/utils'
 import type { Result } from '@sniptt/monads'
 import { Err, Ok } from '@sniptt/monads'
@@ -138,15 +138,15 @@ export const getValuesFromQuoteResponse = ({
     slippageTolerancePercentageDecimal,
   })
 
-  const buyAmountAfterAffiliateFeesCryptoPrecision = fromBaseUnit(
-    buyAmountAfterAffiliateFeesCryptoBaseUnit,
-    buyAsset.precision,
-  )
+  const buyAmountAfterAffiliateFeesCryptoPrecision = BigAmount.fromBaseUnit({
+    value: buyAmountAfterAffiliateFeesCryptoBaseUnit,
+    precision: buyAsset.precision,
+  }).toPrecision()
 
-  const sellAmountCryptoPrecision = fromBaseUnit(
-    sellAmountAfterFeesCryptoBaseUnit,
-    sellAsset.precision,
-  )
+  const sellAmountCryptoPrecision = BigAmount.fromBaseUnit({
+    value: sellAmountAfterFeesCryptoBaseUnit,
+    precision: sellAsset.precision,
+  }).toPrecision()
 
   const rate = bnOrZero(buyAmountAfterAffiliateFeesCryptoPrecision)
     .div(sellAmountCryptoPrecision)

packages/swapper/src/swappers/SunioSwapper/utils/getQuoteOrRate.ts

@@ -1,5 +1,5 @@
 import { tronChainId } from '@shapeshiftoss/caip'
-import { bn, contractAddressOrUndefined } from '@shapeshiftoss/utils'
+import { BigAmount, bn, contractAddressOrUndefined } from '@shapeshiftoss/utils'
 import type { Result } from '@sniptt/monads'
 import { Err, Ok } from '@sniptt/monads'
 import { TronWeb } from 'tronweb'
@@ -198,9 +198,10 @@ export async function getQuoteOrRate(
       }
     }
 
-    const buyAmountCryptoBaseUnit = bn(bestRoute.amountOut)
-      .times(bn(10).pow(buyAsset.precision))
-      .toFixed(0)
+    const buyAmountCryptoBaseUnit = BigAmount.fromPrecision({
+      value: bestRoute.amountOut,
+      precision: buyAsset.precision,
+    }).toBaseUnit()
 
     // Calculate protocol fees only for quotes
     const protocolFeeCryptoBaseUnit = isQuote