@mezo-org/passport 0.5.2-dev.4 → 0.5.2-dev.5

package/dist/src/hooks/useAssetsConversionRates.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useAssetsConversionRates.d.ts","sourceRoot":"","sources":["../../../src/hooks/useAssetsConversionRates.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,wBAAwB,KAAK,CAAA;AAK1C,eAAO,MAAM,SAAS,mCAAmC,CAAA;AAEzD;;;;;;;GAOG;AACH,wBAAgB,wBAAwB;;;;;;UA4BvC"}
+{"version":3,"file":"useAssetsConversionRates.d.ts","sourceRoot":"","sources":["../../../src/hooks/useAssetsConversionRates.ts"],"names":[],"mappings":"AA8BA,eAAO,MAAM,wBAAwB,KAAK,CAAA;AAK1C,eAAO,MAAM,SAAS,mCAAmC,CAAA;AAEzD;;;;;;;GAOG;AACH,wBAAgB,wBAAwB;;;;;;UAoEvC"}

package/dist/src/hooks/useAssetsConversionRates.js

@@ -1,8 +1,28 @@
 import { useQuery } from "@tanstack/react-query";
+import { useConfig } from "wagmi";
+import { readContract } from "wagmi/actions";
 import { parseUnits } from "viem";
 import { ONE_SECOND_MS } from "../utils/time";
 import { usePortalApiClient } from "./usePortalApiClient";
-import { useCollateralPrice } from "./useCollateralPrice";
+import { mainnetBorrowContracts, testnetBorrowContracts, } from "../lib/contracts";
+import { CHAIN_ID } from "../constants";
+import { usePassportContext } from "./usePassportContext";
+import { normalizePrecision } from "../utils/numbers";
+const PRICE_FEED_ABI = [
+    {
+        inputs: [],
+        name: "fetchPrice",
+        outputs: [
+            {
+                internalType: "uint256",
+                name: "",
+                type: "uint256",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+];
 export const CONVERSION_RATE_DECIMALS = 18;
 // If the oracle has not been updated in at least 60 seconds, it is stale.
 const MAX_PRICE_DELAY = 60 * ONE_SECOND_MS;
@@ -17,24 +37,56 @@ export const QUERY_KEY = "passport.assetsConversionRates";
  */
 export function useAssetsConversionRates() {
     const portalApiClient = usePortalApiClient();
-    const { data: collateralPriceData } = useCollateralPrice();
-    const collateralPrice = collateralPriceData?.toString();
+    const { environment = "mainnet" } = usePassportContext();
+    const config = useConfig();
     return useQuery({
-        queryKey: [QUERY_KEY, collateralPrice],
-        queryFn: async () => Promise.all([portalApiClient.getPortalStatistics()]),
-        enabled: !!collateralPrice,
-        select: ([portalStatistics]) => {
+        queryKey: [QUERY_KEY],
+        queryFn: async () => {
+            const { chainId } = config.state;
+            const isMainnet = chainId === CHAIN_ID.mainnet;
+            const { address: priceFeedAddress } = isMainnet
+                ? mainnetBorrowContracts.PriceFeed
+                : testnetBorrowContracts.PriceFeed;
+            return Promise.all([
+                portalApiClient.getPortalStatistics(),
+                readContract(config, {
+                    address: priceFeedAddress,
+                    abi: PRICE_FEED_ABI,
+                    functionName: "fetchPrice",
+                    chainId: CHAIN_ID[environment],
+                }),
+            ]);
+        },
+        select: ([portalStatistics, fetchedPriceFeed]) => {
             const tTokenConversionRate = portalStatistics.tTokenPrice;
+            const btcConversionRate = fetchedPriceFeed;
             const tPrice = parseUnits(tTokenConversionRate.toString(), CONVERSION_RATE_DECIMALS);
+            const btcPrice = normalizePrecision(btcConversionRate, CONVERSION_RATE_DECIMALS);
             return {
                 rates: {
                     mT: tPrice,
-                    BTC: BigInt(collateralPrice),
+                    BTC: btcPrice,
                 },
                 decimals: CONVERSION_RATE_DECIMALS,
             };
         },
+        // TODO: Investigate optimised strategy for calculating refetch interval as
+        // done with price oracle contract. Left previous implementation for
+        // reference.
         refetchInterval: MAX_PRICE_DELAY,
+        // refetchInterval: ({ state }) => {
+        //   if (!state.data) return MAX_PRICE_DELAY
+        //   const [, btcPriceData] = state.data
+        //   const [, , , updatedAt] = btcPriceData
+        //   if (!updatedAt) return MAX_PRICE_DELAY
+        //   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
+        // },
     });
 }
 //# sourceMappingURL=useAssetsConversionRates.js.map

package/dist/src/hooks/useAssetsConversionRates.js.map

@@ -1 +1 @@
-{"version":3,"file":"useAssetsConversionRates.js","sourceRoot":"","sources":["../../../src/hooks/useAssetsConversionRates.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAA;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAEzD,MAAM,CAAC,MAAM,wBAAwB,GAAG,EAAE,CAAA;AAE1C,0EAA0E;AAC1E,MAAM,eAAe,GAAG,EAAE,GAAG,aAAa,CAAA;AAE1C,MAAM,CAAC,MAAM,SAAS,GAAG,gCAAgC,CAAA;AAEzD;;;;;;;GAOG;AACH,MAAM,UAAU,wBAAwB;IACtC,MAAM,eAAe,GAAG,kBAAkB,EAAE,CAAA;IAC5C,MAAM,EAAE,IAAI,EAAE,mBAAmB,EAAE,GAAG,kBAAkB,EAAE,CAAA;IAE1D,MAAM,eAAe,GAAG,mBAAmB,EAAE,QAAQ,EAAE,CAAA;IAEvD,OAAO,QAAQ,CAAC;QACd,QAAQ,EAAE,CAAC,SAAS,EAAE,eAAe,CAAC;QACtC,OAAO,EAAE,KAAK,IAAI,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,eAAe,CAAC,mBAAmB,EAAE,CAAC,CAAC;QACzE,OAAO,EAAE,CAAC,CAAC,eAAe;QAC1B,MAAM,EAAE,CAAC,CAAC,gBAAgB,CAAC,EAAE,EAAE;YAC7B,MAAM,oBAAoB,GAAG,gBAAgB,CAAC,WAAW,CAAA;YAEzD,MAAM,MAAM,GAAG,UAAU,CACvB,oBAAoB,CAAC,QAAQ,EAAE,EAC/B,wBAAwB,CACzB,CAAA;YAED,OAAO;gBACL,KAAK,EAAE;oBACL,EAAE,EAAE,MAAM;oBACV,GAAG,EAAE,MAAM,CAAC,eAAgB,CAAC;iBAC9B;gBACD,QAAQ,EAAE,wBAAwB;aACnC,CAAA;QACH,CAAC;QACD,eAAe,EAAE,eAAe;KACjC,CAAC,CAAA;AACJ,CAAC"}
+{"version":3,"file":"useAssetsConversionRates.js","sourceRoot":"","sources":["../../../src/hooks/useAssetsConversionRates.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACjC,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAA;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AACzD,OAAO,EACL,sBAAsB,EACtB,sBAAsB,GACvB,MAAM,kBAAkB,CAAA;AACzB,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AACvC,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AAErD,MAAM,cAAc,GAAG;IACrB;QACE,MAAM,EAAE,EAAE;QACV,IAAI,EAAE,YAAY;QAClB,OAAO,EAAE;YACP;gBACE,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,EAAE;gBACR,IAAI,EAAE,SAAS;aAChB;SACF;QACD,eAAe,EAAE,MAAM;QACvB,IAAI,EAAE,UAAU;KACjB;CACO,CAAA;AAEV,MAAM,CAAC,MAAM,wBAAwB,GAAG,EAAE,CAAA;AAE1C,0EAA0E;AAC1E,MAAM,eAAe,GAAG,EAAE,GAAG,aAAa,CAAA;AAE1C,MAAM,CAAC,MAAM,SAAS,GAAG,gCAAgC,CAAA;AAEzD;;;;;;;GAOG;AACH,MAAM,UAAU,wBAAwB;IACtC,MAAM,eAAe,GAAG,kBAAkB,EAAE,CAAA;IAC5C,MAAM,EAAE,WAAW,GAAG,SAAS,EAAE,GAAG,kBAAkB,EAAE,CAAA;IACxD,MAAM,MAAM,GAAG,SAAS,EAAE,CAAA;IAE1B,OAAO,QAAQ,CAAC;QACd,QAAQ,EAAE,CAAC,SAAS,CAAC;QACrB,OAAO,EAAE,KAAK,IAAI,EAAE;YAClB,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,KAAK,CAAA;YAChC,MAAM,SAAS,GAAG,OAAO,KAAK,QAAQ,CAAC,OAAO,CAAA;YAC9C,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,GAAG,SAAS;gBAC7C,CAAC,CAAC,sBAAsB,CAAC,SAAS;gBAClC,CAAC,CAAC,sBAAsB,CAAC,SAAS,CAAA;YAEpC,OAAO,OAAO,CAAC,GAAG,CAAC;gBACjB,eAAe,CAAC,mBAAmB,EAAE;gBACrC,YAAY,CAAC,MAAM,EAAE;oBACnB,OAAO,EAAE,gBAAgB;oBACzB,GAAG,EAAE,cAAc;oBACnB,YAAY,EAAE,YAAY;oBAC1B,OAAO,EAAE,QAAQ,CAAC,WAAW,CAAC;iBAC/B,CAAC;aACH,CAAC,CAAA;QACJ,CAAC;QACD,MAAM,EAAE,CAAC,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,EAAE,EAAE;YAC/C,MAAM,oBAAoB,GAAG,gBAAgB,CAAC,WAAW,CAAA;YACzD,MAAM,iBAAiB,GAAG,gBAAgB,CAAA;YAE1C,MAAM,MAAM,GAAG,UAAU,CACvB,oBAAoB,CAAC,QAAQ,EAAE,EAC/B,wBAAwB,CACzB,CAAA;YAED,MAAM,QAAQ,GAAG,kBAAkB,CACjC,iBAAiB,EACjB,wBAAwB,CACzB,CAAA;YAED,OAAO;gBACL,KAAK,EAAE;oBACL,EAAE,EAAE,MAAM;oBACV,GAAG,EAAE,QAAQ;iBACd;gBACD,QAAQ,EAAE,wBAAwB;aACnC,CAAA;QACH,CAAC;QACD,2EAA2E;QAC3E,oEAAoE;QACpE,aAAa;QACb,eAAe,EAAE,eAAe;QAChC,oCAAoC;QACpC,4CAA4C;QAE5C,wCAAwC;QACxC,2CAA2C;QAE3C,2CAA2C;QAE3C,sDAAsD;QAEtD,iCAAiC;QACjC,6EAA6E;QAC7E,yEAAyE;QACzE,+DAA+D;QAC/D,uDAAuD;QACvD,8BAA8B;QAC9B,KAAK;KACN,CAAC,CAAA;AACJ,CAAC"}

package/dist/src/hooks/useBorrowData.d.ts

@@ -58,6 +58,21 @@ export declare function useBorrowData(queryOptions?: {}): import("wagmi").UseRea
     readonly address: `0x${string}`;
     readonly functionName: "MUSD_GAS_COMPENSATION";
     readonly chainId: number;
+}, {
+    readonly abi: readonly [{
+        readonly inputs: readonly [];
+        readonly name: "fetchPrice";
+        readonly outputs: readonly [{
+            readonly internalType: "uint256";
+            readonly name: "";
+            readonly type: "uint256";
+        }];
+        readonly stateMutability: "view";
+        readonly type: "function";
+    }];
+    readonly address: `0x${string}`;
+    readonly functionName: "fetchPrice";
+    readonly chainId: number;
 }], true, {
     collateral: {
         value: bigint;

package/dist/src/hooks/useBorrowData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useBorrowData.d.ts","sourceRoot":"","sources":["../../../src/hooks/useBorrowData.ts"],"names":[],"mappings":"AAwFA;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,YAAY,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0F9C;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB;;EAatC;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB;;EAajC"}
+{"version":3,"file":"useBorrowData.d.ts","sourceRoot":"","sources":["../../../src/hooks/useBorrowData.ts"],"names":[],"mappings":"AAuGA;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,YAAY,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiG9C;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB;;EAatC;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB;;EAajC"}

package/dist/src/hooks/useBorrowData.js

@@ -10,7 +10,6 @@ import { bigIntMax, normalizePrecision } from "../utils/numbers";
 import useWalletAccount from "./useWalletAccount";
 import { getAsset } from "../utils/assets";
 import { convertToUsd } from "../utils/currency";
-import { useCollateralPrice } from "./useCollateralPrice";
 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
@@ -78,6 +77,21 @@ const BORROWER_OPERATIONS_ABI = [
         type: "function",
     },
 ];
+const PRICE_FEED_ABI = [
+    {
+        inputs: [],
+        name: "fetchPrice",
+        outputs: [
+            {
+                internalType: "uint256",
+                name: "",
+                type: "uint256",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+];
 /**
  * Query hook for getting borrow data. Returns collateral and trove debt for the
  * connected account, based on it's evm address.
@@ -86,17 +100,18 @@ const BORROWER_OPERATIONS_ABI = [
 export function useBorrowData(queryOptions = {}) {
     const { environment = "mainnet" } = usePassportContext();
     const walletAccount = useWalletAccount();
-    const { data: collateralPrice } = useCollateralPrice();
     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]);
     const chainId = CHAIN_ID[environment];
@@ -117,9 +132,15 @@ export function useBorrowData(queryOptions = {}) {
                 functionName: "MUSD_GAS_COMPENSATION",
                 chainId,
             },
+            {
+                abi: PRICE_FEED_ABI,
+                address: contractAddress.priceFeed,
+                functionName: "fetchPrice",
+                chainId,
+            },
         ],
         query: {
-            enabled: !!walletAccount.accountAddress && !!collateralPrice?.toString,
+            enabled: !!walletAccount.accountAddress,
             staleTime: 5 * ONE_MINUTE_MS,
             retry: 1,
             select: (data) => {
@@ -127,6 +148,7 @@ export function useBorrowData(queryOptions = {}) {
                     throw new Error("No borrow data available");
                 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,

package/dist/src/hooks/useBorrowData.js.map

@@ -1 +1 @@
-{"version":3,"file":"useBorrowData.js","sourceRoot":"","sources":["../../../src/hooks/useBorrowData.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useBorrowData.js","sourceRoot":"","sources":["../../../src/hooks/useBorrowData.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mezo-org/passport",
-  "version": "0.5.2-dev.4",
+  "version": "0.5.2-dev.5",
   "main": "dist/src/index.js",
   "license": "GPL-3.0-only",
   "scripts": {

package/src/hooks/useAssetsConversionRates.ts

@@ -1,8 +1,32 @@
 import { useQuery } from "@tanstack/react-query"
+import { useConfig } from "wagmi"
+import { readContract } from "wagmi/actions"
 import { parseUnits } from "viem"
 import { ONE_SECOND_MS } from "../utils/time"
 import { usePortalApiClient } from "./usePortalApiClient"
-import { useCollateralPrice } from "./useCollateralPrice"
+import {
+  mainnetBorrowContracts,
+  testnetBorrowContracts,
+} from "../lib/contracts"
+import { CHAIN_ID } from "../constants"
+import { usePassportContext } from "./usePassportContext"
+import { normalizePrecision } from "../utils/numbers"
+
+const PRICE_FEED_ABI = [
+  {
+    inputs: [],
+    name: "fetchPrice",
+    outputs: [
+      {
+        internalType: "uint256",
+        name: "",
+        type: "uint256",
+      },
+    ],
+    stateMutability: "view",
+    type: "function",
+  },
+] as const
 
 export const CONVERSION_RATE_DECIMALS = 18
 
@@ -21,30 +45,70 @@ export const QUERY_KEY = "passport.assetsConversionRates"
  */
 export function useAssetsConversionRates() {
   const portalApiClient = usePortalApiClient()
-  const { data: collateralPriceData } = useCollateralPrice()
-
-  const collateralPrice = collateralPriceData?.toString()
+  const { environment = "mainnet" } = usePassportContext()
+  const config = useConfig()
 
   return useQuery({
-    queryKey: [QUERY_KEY, collateralPrice],
-    queryFn: async () => Promise.all([portalApiClient.getPortalStatistics()]),
-    enabled: !!collateralPrice,
-    select: ([portalStatistics]) => {
+    queryKey: [QUERY_KEY],
+    queryFn: async () => {
+      const { chainId } = config.state
+      const isMainnet = chainId === CHAIN_ID.mainnet
+      const { address: priceFeedAddress } = isMainnet
+        ? mainnetBorrowContracts.PriceFeed
+        : testnetBorrowContracts.PriceFeed
+
+      return Promise.all([
+        portalApiClient.getPortalStatistics(),
+        readContract(config, {
+          address: priceFeedAddress,
+          abi: PRICE_FEED_ABI,
+          functionName: "fetchPrice",
+          chainId: CHAIN_ID[environment],
+        }),
+      ])
+    },
+    select: ([portalStatistics, fetchedPriceFeed]) => {
       const tTokenConversionRate = portalStatistics.tTokenPrice
+      const btcConversionRate = fetchedPriceFeed
 
       const tPrice = parseUnits(
         tTokenConversionRate.toString(),
         CONVERSION_RATE_DECIMALS,
       )
 
+      const btcPrice = normalizePrecision(
+        btcConversionRate,
+        CONVERSION_RATE_DECIMALS,
+      )
+
       return {
         rates: {
           mT: tPrice,
-          BTC: BigInt(collateralPrice!),
+          BTC: btcPrice,
         },
         decimals: CONVERSION_RATE_DECIMALS,
       }
     },
+    // TODO: Investigate optimised strategy for calculating refetch interval as
+    // done with price oracle contract. Left previous implementation for
+    // reference.
     refetchInterval: MAX_PRICE_DELAY,
+    // refetchInterval: ({ state }) => {
+    //   if (!state.data) return MAX_PRICE_DELAY
+
+    //   const [, btcPriceData] = state.data
+    //   const [, , , updatedAt] = btcPriceData
+
+    //   if (!updatedAt) return MAX_PRICE_DELAY
+
+    //   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
+    // },
   })
 }

package/src/hooks/useBorrowData.ts

@@ -13,7 +13,6 @@ import { bigIntMax, normalizePrecision } from "../utils/numbers"
 import useWalletAccount from "./useWalletAccount"
 import { getAsset } from "../utils/assets"
 import { convertToUsd } from "../utils/currency"
-import { useCollateralPrice } from "./useCollateralPrice"
 
 const DEBT_AND_COLL_PRECISION = 18
 
@@ -86,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.
@@ -95,18 +110,18 @@ export function useBorrowData(queryOptions = {}) {
   const { environment = "mainnet" } = usePassportContext()
   const walletAccount = useWalletAccount()
 
-  const { data: collateralPrice } = useCollateralPrice()
-
   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])
 
@@ -129,9 +144,15 @@ export function useBorrowData(queryOptions = {}) {
         functionName: "MUSD_GAS_COMPENSATION",
         chainId,
       },
+      {
+        abi: PRICE_FEED_ABI,
+        address: contractAddress.priceFeed,
+        functionName: "fetchPrice",
+        chainId,
+      },
     ],
     query: {
-      enabled: !!walletAccount.accountAddress && !!collateralPrice?.toString,
+      enabled: !!walletAccount.accountAddress,
       staleTime: 5 * ONE_MINUTE_MS,
       retry: 1,
       select: (data) => {
@@ -140,6 +161,7 @@ export function useBorrowData(queryOptions = {}) {
 
         const [rawCollateral, principal, interest] = data[0].result!
         const gasCompensation = data[1].result!
+        const collateralPrice = data[2].result!
 
         const btcDetails = getAsset("BTC")
 
@@ -151,7 +173,7 @@ export function useBorrowData(queryOptions = {}) {
           usd: convertToUsd(
             rawCollateral,
             DEBT_AND_COLL_PRECISION,
-            collateralPrice!,
+            collateralPrice,
             DEBT_AND_COLL_PRECISION,
           ),
         }

package/dist/src/hooks/useCollateralPrice.d.ts

@@ -1,17 +0,0 @@
-/**
- * Query hook for getting borrow data. Returns collateral and trove debt for the
- * connected account, based on it's evm address.
- * @param queryOptions Query options passed to the underlying `useQuery` hook.
- */
-export declare function useCollateralPrice(queryOptions?: {}): import("wagmi").UseReadContractReturnType<readonly [{
-    readonly inputs: readonly [];
-    readonly name: "fetchPrice";
-    readonly outputs: readonly [{
-        readonly internalType: "uint256";
-        readonly name: "";
-        readonly type: "uint256";
-    }];
-    readonly stateMutability: "view";
-    readonly type: "function";
-}], "fetchPrice", readonly [], bigint>;
-//# sourceMappingURL=useCollateralPrice.d.ts.map

package/dist/src/hooks/useCollateralPrice.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"useCollateralPrice.d.ts","sourceRoot":"","sources":["../../../src/hooks/useCollateralPrice.ts"],"names":[],"mappings":"AAiCA;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,YAAY,KAAK;;;;;;;;;;uCAyBnD"}

package/dist/src/hooks/useCollateralPrice.js

@@ -1,56 +0,0 @@
-import { useReadContract } from "wagmi";
-import { useMemo } from "react";
-import { ONE_MINUTE_MS } from "../utils/time";
-import { mainnetBorrowContracts, testnetBorrowContracts, } from "../lib/contracts";
-import { usePassportContext } from "./usePassportContext";
-import { CHAIN_ID } from "../constants";
-import useWalletAccount from "./useWalletAccount";
-// Wagmi handles typesafety with ABI const assertions. TypeScript doesn't
-// support importing JSON as const yet so types cannot be inferred from the
-// imported contract. As a workaround there is minimal ABI definition that can
-// be asserted types from.
-// Ref: https://wagmi.sh/core/typescript#const-assert-abis-typed-data
-const PRICE_FEED_ABI = [
-    {
-        inputs: [],
-        name: "fetchPrice",
-        outputs: [
-            {
-                internalType: "uint256",
-                name: "",
-                type: "uint256",
-            },
-        ],
-        stateMutability: "view",
-        type: "function",
-    },
-];
-/**
- * Query hook for getting borrow data. Returns collateral and trove debt for the
- * connected account, based on it's evm address.
- * @param queryOptions Query options passed to the underlying `useQuery` hook.
- */
-export function useCollateralPrice(queryOptions = {}) {
-    const { environment = "mainnet" } = usePassportContext();
-    const walletAccount = useWalletAccount();
-    const priceFeedContractAddress = useMemo(() => {
-        if (environment === "mainnet") {
-            return mainnetBorrowContracts.PriceFeed.address;
-        }
-        return testnetBorrowContracts.PriceFeed.address;
-    }, [environment]);
-    const chainId = CHAIN_ID[environment];
-    return useReadContract({
-        abi: PRICE_FEED_ABI,
-        address: priceFeedContractAddress,
-        functionName: "fetchPrice",
-        chainId,
-        query: {
-            enabled: !!walletAccount.accountAddress,
-            staleTime: 5 * ONE_MINUTE_MS,
-            retry: 1,
-            ...queryOptions,
-        },
-    });
-}
-//# sourceMappingURL=useCollateralPrice.js.map

package/dist/src/hooks/useCollateralPrice.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"useCollateralPrice.js","sourceRoot":"","sources":["../../../src/hooks/useCollateralPrice.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,OAAO,CAAA;AACvC,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAC/B,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAC7C,OAAO,EACL,sBAAsB,EACtB,sBAAsB,GACvB,MAAM,kBAAkB,CAAA;AACzB,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AACvC,OAAO,gBAAgB,MAAM,oBAAoB,CAAA;AAEjD,yEAAyE;AACzE,2EAA2E;AAC3E,8EAA8E;AAC9E,0BAA0B;AAC1B,qEAAqE;AAErE,MAAM,cAAc,GAAG;IACrB;QACE,MAAM,EAAE,EAAE;QACV,IAAI,EAAE,YAAY;QAClB,OAAO,EAAE;YACP;gBACE,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,EAAE;gBACR,IAAI,EAAE,SAAS;aAChB;SACF;QACD,eAAe,EAAE,MAAM;QACvB,IAAI,EAAE,UAAU;KACjB;CACO,CAAA;AAEV;;;;GAIG;AACH,MAAM,UAAU,kBAAkB,CAAC,YAAY,GAAG,EAAE;IAClD,MAAM,EAAE,WAAW,GAAG,SAAS,EAAE,GAAG,kBAAkB,EAAE,CAAA;IACxD,MAAM,aAAa,GAAG,gBAAgB,EAAE,CAAA;IAExC,MAAM,wBAAwB,GAAG,OAAO,CAAC,GAAG,EAAE;QAC5C,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;YAC9B,OAAO,sBAAsB,CAAC,SAAS,CAAC,OAAO,CAAA;QACjD,CAAC;QACD,OAAO,sBAAsB,CAAC,SAAS,CAAC,OAAO,CAAA;IACjD,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAA;IAEjB,MAAM,OAAO,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAA;IAErC,OAAO,eAAe,CAAC;QACrB,GAAG,EAAE,cAAc;QACnB,OAAO,EAAE,wBAAwB;QACjC,YAAY,EAAE,YAAY;QAC1B,OAAO;QACP,KAAK,EAAE;YACL,OAAO,EAAE,CAAC,CAAC,aAAa,CAAC,cAAc;YACvC,SAAS,EAAE,CAAC,GAAG,aAAa;YAC5B,KAAK,EAAE,CAAC;YACR,GAAG,YAAY;SAChB;KACF,CAAC,CAAA;AACJ,CAAC"}

package/src/hooks/useCollateralPrice.ts

@@ -1,64 +0,0 @@
-import { useReadContract } from "wagmi"
-import { useMemo } from "react"
-import { ONE_MINUTE_MS } from "../utils/time"
-import {
-  mainnetBorrowContracts,
-  testnetBorrowContracts,
-} from "../lib/contracts"
-import { usePassportContext } from "./usePassportContext"
-import { CHAIN_ID } from "../constants"
-import useWalletAccount from "./useWalletAccount"
-
-// Wagmi handles typesafety with ABI const assertions. TypeScript doesn't
-// support importing JSON as const yet so types cannot be inferred from the
-// imported contract. As a workaround there is minimal ABI definition that can
-// be asserted types from.
-// Ref: https://wagmi.sh/core/typescript#const-assert-abis-typed-data
-
-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.
- * @param queryOptions Query options passed to the underlying `useQuery` hook.
- */
-export function useCollateralPrice(queryOptions = {}) {
-  const { environment = "mainnet" } = usePassportContext()
-  const walletAccount = useWalletAccount()
-
-  const priceFeedContractAddress = useMemo(() => {
-    if (environment === "mainnet") {
-      return mainnetBorrowContracts.PriceFeed.address
-    }
-    return testnetBorrowContracts.PriceFeed.address
-  }, [environment])
-
-  const chainId = CHAIN_ID[environment]
-
-  return useReadContract({
-    abi: PRICE_FEED_ABI,
-    address: priceFeedContractAddress,
-    functionName: "fetchPrice",
-    chainId,
-    query: {
-      enabled: !!walletAccount.accountAddress,
-      staleTime: 5 * ONE_MINUTE_MS,
-      retry: 1,
-      ...queryOptions,
-    },
-  })
-}