Merge branch 'main' into points-estimation-update

dapp/.env

@@ -17,8 +17,6 @@ VITE_ACRE_API_ENDPOINT="http://localhost:8788/api/v1/"
 VITE_GELATO_RELAY_API_KEY="htaJCy_XHj8WsE3w53WBMurfySDtjLP_TrNPPa6IPIc_"  # this key should not be used on production
 # Get the API key from: https://thegraph.com/studio/apikeys/.
 VITE_SUBGRAPH_API_KEY=""
-# Get the API key from: 1Password.
-VITE_MEZO_PORTAL_API_KEY=""
 
 # Feature flags
 VITE_FEATURE_FLAG_GAMIFICATION_ENABLED="false"

dapp/src/constants/env.ts

@@ -16,8 +16,6 @@ const GELATO_RELAY_API_KEY = import.meta.env.VITE_GELATO_RELAY_API_KEY
 
 const SUBGRAPH_API_KEY = import.meta.env.VITE_SUBGRAPH_API_KEY
 
-const MEZO_PORTAL_API_KEY = import.meta.env.VITE_MEZO_PORTAL_API_KEY
-
 const NETWORK_TYPE = USE_TESTNET ? "testnet" : "mainnet"
 
 const LATEST_COMMIT_HASH = import.meta.env.VITE_LATEST_COMMIT_HASH
@@ -34,7 +32,6 @@ export default {
   TBTC_API_ENDPOINT,
   GELATO_RELAY_API_KEY,
   SUBGRAPH_API_KEY,
-  MEZO_PORTAL_API_KEY,
   NETWORK_TYPE,
   LATEST_COMMIT_HASH,
   ACRE_API_ENDPOINT,

dapp/src/hooks/useMats.ts

@@ -1,13 +1,13 @@
 import { useQuery } from "@tanstack/react-query"
 import { REFETCH_INTERVAL_IN_MILLISECONDS, queryKeysFactory } from "#/constants"
-import { mezoPortalAPI } from "#/utils"
+import { acreApi } from "#/utils"
 
 const { acreKeys } = queryKeysFactory
 
 export default function useMats() {
   return useQuery({
     queryKey: [...acreKeys.mats()],
-    queryFn: async () => mezoPortalAPI.getMats(),
+    queryFn: async () => acreApi.getMats(),
     refetchInterval: REFETCH_INTERVAL_IN_MILLISECONDS,
   })
 }

dapp/src/store/btc/btcThunk.ts

@@ -1,17 +1,7 @@
 import { createAsyncThunk } from "@reduxjs/toolkit"
-import { fetchCryptoCurrencyPriceUSD } from "#/utils/exchangeApi"
-import sentry from "#/sentry"
+import { acreApi } from "#/utils"
 
 export const fetchBTCPriceUSD = createAsyncThunk(
   "btc/fetchBTCPriceUSD",
-  async () => {
-    try {
-      const priceUSD = await fetchCryptoCurrencyPriceUSD("bitcoin")
-      return priceUSD
-    } catch (error) {
-      sentry.captureException(error)
-      console.error(error)
-      return 0
-    }
-  },
+  async () => acreApi.getBtcUsdPrice(),
 )

dapp/src/types/index.ts

@@ -4,7 +4,6 @@ export * from "./callback"
 export * from "./chain"
 export * from "./action-flow"
 export * from "./activity"
-export * from "./coingecko"
 export * from "./time"
 export * from "./core"
 export * from "./fee"

dapp/src/utils/acreApi.ts

@@ -82,11 +82,29 @@ const claimPoints = async (address: string) => {
   }
 }
 
+async function getMats() {
+  const response = await axios.get<{ totalMats: number; dailyMats: number }>(
+    "mezo/points",
+  )
+
+  return {
+    totalMats: response.data.totalMats,
+    dailyMats: response.data.dailyMats,
+  }
+}
+
+async function getBtcUsdPrice(): Promise<number> {
+  const response = await axios.get<{ btcUsdPrice: number }>("currency/btc")
+  return response.data.btcUsdPrice
+}
+
 export default {
   createSession,
   getSession,
   deleteSession,
   getPointsData,
   getPointsDataByUser,
   claimPoints,
+  getMats,
+  getBtcUsdPrice,
 }

dapp/src/utils/index.ts

@@ -6,7 +6,6 @@ export * from "./chain"
 export * from "./text"
 export * from "./time"
 export * from "./promise"
-export * from "./exchangeApi"
 export * from "./verifyDepositAddress"
 export * from "./json"
 export * from "./activities"
@@ -15,6 +14,5 @@ export { default as eip1193 } from "./eip1193"
 export { default as orangeKit } from "./orangeKit"
 export { default as userAgent } from "./userAgent"
 export { default as referralProgram } from "./referralProgram"
-export { default as mezoPortalAPI } from "./mezoPortalApi"
 export { default as acreApi } from "./acreApi"
 export { default as router } from "./router"

dapp/src/vite-env.d.ts

@@ -15,7 +15,6 @@ interface ImportMetaEnv {
   readonly VITE_FEATURE_FLAG_ACRE_POINTS_ENABLED: string
   readonly VITE_FEATURE_FLAG_TVL_ENABLED: string
   readonly VITE_SUBGRAPH_API_KEY: string
-  readonly VITE_MEZO_PORTAL_API_KEY: string
   readonly VITE_LATEST_COMMIT_HASH: string
   readonly VITE_ACRE_API_ENDPOINT: string
 }