@mezo-org/passport 0.4.0-dev.82 → 0.4.0-dev.84

package/src/hooks/useAssetsConversionRates.ts

@@ -1,36 +1,20 @@
 import { useQuery } from "@tanstack/react-query"
-import { useReadContract } from "wagmi"
+import { useConfig } from "wagmi"
+import { readContract } from "wagmi/actions"
+import { parseUnits } from "viem"
 import { ONE_SECOND_MS } from "../utils/time"
-import { QUERY_KEYS } from "./constants"
 import { usePortalApiClient } from "./usePortalApiClient"
 import { priceOracleContract } from "../lib/contracts"
-import { fromFloatToBigInt } from "../utils/numbers"
-import { getCryptoAsset } from "../utils/cryptoAssets"
 import { CHAIN_ID } from "../constants"
 import { usePassportContext } from "./usePassportContext"
+import { normalizePrecision } from "../utils/numbers"
+
+export const CONVERSION_RATE_DECIMALS = 18
 
-const BTC_TARGET_DIGITS = getCryptoAsset("BTC").decimals
-const T_TARGET_DIGITS = getCryptoAsset("mT").decimals
 // If the oracle has not been updated in at least 60 seconds, it is stale.
 const MAX_PRICE_DELAY = 60 * ONE_SECOND_MS
 
-/**
- * Scales the price by the number of digits.
- * @dev Oracles returns prices with variable number of digits. This function
- *      scales the price to a fixed number of digits ensuring consistency.
- * @param price - The price to scale.
- * @param priceDigits - The number of digits in the price.
- * @returns The scaled price.
- */
-function scalePriceByDigits(price: bigint, priceDigits: number): bigint {
-  if (priceDigits > BTC_TARGET_DIGITS) {
-    return price / 10n ** BigInt(priceDigits - BTC_TARGET_DIGITS)
-  }
-  if (priceDigits < BTC_TARGET_DIGITS) {
-    return price * 10n ** BigInt(BTC_TARGET_DIGITS - priceDigits)
-  }
-  return price
-}
+export const QUERY_KEY = "passport.assetsConversionRates"
 
 /**
  * Hook to fetch assets conversion rates.
@@ -43,55 +27,53 @@ function scalePriceByDigits(price: bigint, priceDigits: number): bigint {
 export function useAssetsConversionRates() {
   const portalApiClient = usePortalApiClient()
   const { environment = "mainnet" } = usePassportContext()
+  const config = useConfig()
 
-  const btcPrice = useReadContract({
-    ...priceOracleContract,
-    functionName: "latestRoundData",
-    query: {
-      refetchInterval: ({ state }) => {
-        if (!state.data) return MAX_PRICE_DELAY
-
-        const [, , , updatedAt] = state.data ?? []
-        if (!updatedAt) return MAX_PRICE_DELAY
+  return useQuery({
+    queryKey: [QUERY_KEY],
+    queryFn: async () =>
+      Promise.all([
+        portalApiClient.getPortalStatistics(),
+        readContract(config, {
+          ...priceOracleContract,
+          functionName: "latestRoundData",
+          chainId: CHAIN_ID[environment],
+        }),
+      ]),
+    select: ([portalStatistics, btcPriceData]) => {
+      const tTokenConversionRate = portalStatistics.currentUsdPerTToken
+      const [, btcConversionRate] = btcPriceData
 
-        const age = Date.now() - Number(updatedAt) * 1000
+      const tPrice = parseUnits(tTokenConversionRate, CONVERSION_RATE_DECIMALS)
+      const btcPrice = normalizePrecision(
+        btcConversionRate,
+        CONVERSION_RATE_DECIMALS,
+      )
 
-        return age > MAX_PRICE_DELAY
-          ? // If the data is stale, we want to refetch as soon as possible, but
-            // not faster than once per second, to avoid excessive requests.
-            // Math.max ensures the interval is at least 1 second.
-            Math.max(ONE_SECOND_MS, MAX_PRICE_DELAY - age)
-          : MAX_PRICE_DELAY - age
-      },
-      select: (data) => {
-        const [, answer] = data
-        return scalePriceByDigits(answer, BTC_TARGET_DIGITS)
-      },
+      return {
+        rates: {
+          mT: tPrice,
+          BTC: btcPrice,
+        },
+        decimals: CONVERSION_RATE_DECIMALS,
+      }
     },
-    chainId: CHAIN_ID[environment],
-  })
+    refetchInterval: ({ state }) => {
+      if (!state.data) return MAX_PRICE_DELAY
 
-  const tPrice = useQuery({
-    queryKey: [QUERY_KEYS.ASSETS_USD_CONVERSION],
-    queryFn: () => portalApiClient.getPortalStatistics(),
-    select: (data) =>
-      fromFloatToBigInt(data.currentUsdPerTToken, T_TARGET_DIGITS),
-    refetchInterval: MAX_PRICE_DELAY,
-    throwOnError: true,
-  })
+      const [, btcPriceData] = state.data
+      const [, , , updatedAt] = btcPriceData
+
+      if (!updatedAt) return MAX_PRICE_DELAY
 
-  return {
-    data: {
-      t: {
-        price: tPrice.data ?? 0n,
-        decimals: T_TARGET_DIGITS,
-      },
-      btc: {
-        price: btcPrice.data ?? 0n,
-        decimals: BTC_TARGET_DIGITS,
-      },
+      const age = Date.now() - Number(updatedAt) * 1000
+
+      return age > MAX_PRICE_DELAY
+        ? // If the data is stale, we want to refetch as soon as possible, but
+          // not faster than once per second, to avoid excessive requests.
+          // Math.max ensures the interval is at least 1 second.
+          Math.max(ONE_SECOND_MS, MAX_PRICE_DELAY - age)
+        : MAX_PRICE_DELAY - age
     },
-    isPending: tPrice.isPending || btcPrice.isPending,
-    isError: tPrice.isError || btcPrice.isError,
-  }
+  })
 }

package/src/hooks/useAuthenticateWithWallet.ts

@@ -23,10 +23,12 @@ function useAuthenticateWithWallet(
   > = {},
 ) {
   const {
-    walletAddress,
-    chainId: walletChainId,
-    connector,
-    networkFamily,
+    data: {
+      walletAddress,
+      chainId: walletChainId,
+      connector,
+      networkFamily,
+    } = {},
   } = useWalletAccount()
   const { ensureNoSessionAndFetchNonce } = useEnsureNoSessionAndFetchNonce()
   const { createSessionAsync } = useCreateSession()
@@ -52,7 +54,7 @@ function useAuthenticateWithWallet(
       const messageResult = createSignInWithWalletMessage(
         walletAddress,
         nonce,
-        networkFamily,
+        networkFamily!,
         chainId ?? walletChainId,
       )
       const signatureResult = await signMessageAsync({

package/src/hooks/useBorrowData.ts

@@ -1,6 +1,7 @@
-import { useAccount, useReadContracts } from "wagmi"
+import { useReadContracts } from "wagmi"
 import { useCallback, useMemo } from "react"
 import { useQueryClient } from "@tanstack/react-query"
+import { formatUnits } from "viem"
 import { ONE_MINUTE_MS } from "../utils/time"
 import {
   mainnetBorrowContracts,
@@ -8,7 +9,12 @@ import {
 } from "../lib/contracts"
 import { usePassportContext } from "./usePassportContext"
 import { CHAIN_ID } from "../constants"
-import { bigIntMax } from "../utils/numbers"
+import { bigIntMax, normalizePrecision } from "../utils/numbers"
+import useWalletAccount from "./useWalletAccount"
+import { getAsset } from "../utils/assets"
+import { convertToUsd } from "../utils/currency"
+
+const DEBT_AND_COLL_PRECISION = 18
 
 // Wagmi handles typesafety with ABI const assertions. TypeScript doesn't
 // support importing JSON as const yet so types cannot be inferred from the
@@ -79,6 +85,22 @@ const BORROWER_OPERATIONS_ABI = [
   },
 ] as const
 
+const PRICE_FEED_ABI = [
+  {
+    inputs: [],
+    name: "fetchPrice",
+    outputs: [
+      {
+        internalType: "uint256",
+        name: "",
+        type: "uint256",
+      },
+    ],
+    stateMutability: "view",
+    type: "function",
+  },
+] as const
+
 /**
  * Query hook for getting borrow data. Returns collateral and trove debt for the
  * connected account, based on it's evm address.
@@ -86,18 +108,20 @@ const BORROWER_OPERATIONS_ABI = [
  */
 export function useBorrowData(queryOptions = {}) {
   const { environment = "mainnet" } = usePassportContext()
-  const { address } = useAccount()
+  const { data: walletAccountData } = useWalletAccount()
 
   const contractAddress = useMemo(() => {
     if (environment === "mainnet") {
       return {
         troveManager: mainnetBorrowContracts.TroveManager.address,
         borrowerOperations: mainnetBorrowContracts.BorrowerOperations.address,
+        priceFeed: mainnetBorrowContracts.PriceFeed.address,
       }
     }
     return {
       troveManager: testnetBorrowContracts.TroveManager.address,
       borrowerOperations: testnetBorrowContracts.BorrowerOperations.address,
+      priceFeed: testnetBorrowContracts.PriceFeed.address,
     }
   }, [environment])
 
@@ -109,36 +133,71 @@ export function useBorrowData(queryOptions = {}) {
         abi: TROVE_MANAGER_ABI,
         address: contractAddress.troveManager,
         functionName: "getEntireDebtAndColl",
-        args: [address || "0x"],
+        args: walletAccountData.accountAddress
+          ? [walletAccountData.accountAddress]
+          : ["0x" as `0x${string}}`],
         chainId,
       },
       {
         abi: BORROWER_OPERATIONS_ABI,
         address: contractAddress.borrowerOperations,
         functionName: "MUSD_GAS_COMPENSATION",
-        args: [],
+        chainId,
+      },
+      {
+        abi: PRICE_FEED_ABI,
+        address: contractAddress.priceFeed,
+        functionName: "fetchPrice",
         chainId,
       },
     ],
     query: {
-      enabled: !!address,
+      enabled: !!walletAccountData,
       staleTime: 5 * ONE_MINUTE_MS,
       retry: 1,
       select: (data) => {
-        if (!data || data.some((item) => !item.result)) return undefined
+        if (!data || data.some((item) => !item.result))
+          throw new Error("No borrow data available")
 
-        const [collateral, principal, interest] = data[0].result!
+        const [rawCollateral, principal, interest] = data[0].result!
         const gasCompensation = data[1].result!
+        const collateralPrice = data[2].result!
+
+        const btcDetails = getAsset("BTC")
+
+        const collateral = {
+          value: rawCollateral,
+          decimals: btcDetails.decimals,
+          symbol: btcDetails.symbol,
+          formatted: formatUnits(rawCollateral, DEBT_AND_COLL_PRECISION),
+          usd: convertToUsd(
+            rawCollateral,
+            DEBT_AND_COLL_PRECISION,
+            collateralPrice,
+            DEBT_AND_COLL_PRECISION,
+          ),
+        }
 
-        const troveDebt = bigIntMax(
-          principal + interest - gasCompensation,
+        const debtInUsdValue = bigIntMax(
+          normalizePrecision(
+            principal + interest - gasCompensation,
+            DEBT_AND_COLL_PRECISION,
+          ),
           0n, // Ensure that debt is not negative
         )
+        const formattedDebtInUsd = formatUnits(
+          debtInUsdValue,
+          DEBT_AND_COLL_PRECISION,
+        )
+
+        const debtInUsd = {
+          value: debtInUsdValue,
+          formatted: formattedDebtInUsd,
+        }
 
         return {
           collateral,
-          // Principal includes gas compensation value which is not
-          troveDebt,
+          debtInUsd,
         }
       },
       ...queryOptions,

package/src/hooks/useCreateAccount.ts

@@ -18,7 +18,7 @@ export function useCreateAccount(
 ) {
   const queryClient = useQueryClient()
   const authApiClient = useAuthApiClient()
-  const { connector } = useWalletAccount()
+  const walletAccount = useWalletAccount()
 
   const { onSuccess: customOnSuccess, ...restMutationOptions } = mutationOptions
 
@@ -27,12 +27,13 @@ export function useCreateAccount(
       createAccountMutationFnParameters: CreateAccountRequest,
     ) => {
       if (createAccountMutationFnParameters.type === "wallet") {
-        if (!connector) {
+        if (!walletAccount.data?.connector) {
           throw new Error("Connector not defined.")
         }
 
-        const bitcoinPublicKey =
-          await getBitcoinPublicKeyFromConnector(connector)
+        const bitcoinPublicKey = await getBitcoinPublicKeyFromConnector(
+          walletAccount.data.connector,
+        )
 
         // Creating bitcoin mezo account
         if (bitcoinPublicKey) {

package/src/hooks/useGetCurrentAccount.ts

@@ -24,16 +24,15 @@ export function useGetCurrentAccount(
     queryKey: [QUERY_KEYS.ACCOUNT, QUERY_KEYS.CURRENT],
     queryFn: async () => {
       const currentAccount = await authApiClient.getCurrentAccount()
+      if (!currentAccount) {
+        throw new Error("No current account found")
+      }
+
       const linkedWallets = currentAccount?.linkedAccounts?.filter(
         (account) => account.type === "wallet",
       )
       if (!linkedWallets || linkedWallets.length === 0) {
-        return {
-          ...currentAccount,
-          mats: {
-            totalMats: 0,
-          },
-        }
+        throw new Error("No linked wallets found for the current account")
       }
 
       const addresses = linkedWallets.map(
@@ -42,7 +41,6 @@ export function useGetCurrentAccount(
       const mats = await Promise.all(
         addresses.map((address) => portalApiClient.getPortalMats(address)),
       )
-
       const totalMats = mats.reduce(
         (sumMats, currentMats) => sumMats + currentMats.totalMats,
         0,

package/src/hooks/useLinkAccount.ts

@@ -26,7 +26,7 @@ export function useLinkAccount(
 ) {
   const queryClient = useQueryClient()
   const authApiClient = useAuthApiClient()
-  const { connector } = useWalletAccount()
+  const walletAccount = useWalletAccount()
 
   const { onSuccess: customOnSuccess, ...restMutationOptions } = mutationOptions
 
@@ -35,12 +35,13 @@ export function useLinkAccount(
       linkAccountMutationFnParameters: LinkAccountMutationFnParameters,
     ) => {
       if (linkAccountMutationFnParameters.type === "wallet") {
-        if (!connector) {
+        if (!walletAccount.data?.connector) {
           throw new Error("Connector not defined.")
         }
 
-        const bitcoinPublicKey =
-          await getBitcoinPublicKeyFromConnector(connector)
+        const bitcoinPublicKey = await getBitcoinPublicKeyFromConnector(
+          walletAccount.data.connector,
+        )
 
         // Linking bitcoin account
         if (bitcoinPublicKey) {