Merge branch 'main' into landing-page

dapp/.env

@@ -12,3 +12,5 @@ VITE_REFERRAL=123
 
 # TODO: Pass this value as an environment variable during the build process.
 VITE_DEFENDER_RELAYER_WEBHOOK_URL="https://api.defender.openzeppelin.com/actions/a0d6d2e2-ce9c-4619-aa2b-6c874fe97af7/runs/webhook/b1f17c89-8230-46e3-866f-a3213887974c/Sbddsy54cJ6sPg2bLPyuHJ"
+
+VITE_ACRE_SUBGRAPH_URL="https://api.studio.thegraph.com/query/73600/acre/version/latest"

dapp/src/acre-react/contexts/AcreSdkContext.tsx

@@ -2,6 +2,8 @@ import React, { useCallback, useMemo, useState } from "react"
 import { LedgerLiveEthereumSigner } from "#/web3"
 import { Acre, EthereumNetwork } from "@acre-btc/sdk"
 
+const TBTC_API_ENDPOINT = import.meta.env.VITE_TBTC_API_ENDPOINT
+
 type AcreSdkContextValue = {
   acre?: Acre
   init: (ethereumAddress: string, network: EthereumNetwork) => Promise<void>
@@ -25,6 +27,7 @@ export function AcreSdkProvider({ children }: { children: React.ReactNode }) {
       const sdk = await Acre.initializeEthereum(
         await LedgerLiveEthereumSigner.fromAddress(ethereumAddress),
         network,
+        TBTC_API_ENDPOINT,
       )
       setAcre(sdk)
       setIsInitialized(true)

dapp/src/acre-react/hooks/useStakeFlow.ts

@@ -2,7 +2,6 @@ import { useCallback, useState } from "react"
 import {
   StakeInitialization,
   EthereumAddress,
-  DepositorProxy,
   DepositReceipt,
 } from "@acre-btc/sdk"
 import { useAcreContext } from "./useAcreContext"
@@ -12,7 +11,6 @@ export type UseStakeFlowReturn = {
     bitcoinRecoveryAddress: string,
     ethereumAddress: string,
     referral: number,
-    depositor?: DepositorProxy,
   ) => Promise<void>
   btcAddress?: string
   depositReceipt?: DepositReceipt
@@ -36,15 +34,13 @@ export function useStakeFlow(): UseStakeFlowReturn {
       bitcoinRecoveryAddress: string,
       ethereumAddress: string,
       referral: number,
-      depositor?: DepositorProxy,
     ) => {
       if (!acre || !isInitialized) throw new Error("Acre SDK not defined")
 
       const initializedStakeFlow = await acre.staking.initializeStake(
         bitcoinRecoveryAddress,
         EthereumAddress.from(ethereumAddress),
         referral,
-        depositor,
       )
 
       const btcDepositAddress = await initializedStakeFlow.getBitcoinAddress()

dapp/src/contexts/StakeFlowContext.tsx

@@ -5,8 +5,6 @@ import {
   useStakeFlow,
 } from "#/acre-react/hooks"
 import { REFERRAL } from "#/constants"
-import { RelayerDepositorProxy } from "#/web3"
-import { EthereumBitcoinDepositor } from "@acre-btc/sdk"
 
 type StakeFlowContextValue = Omit<UseStakeFlowReturn, "initStake"> & {
   initStake: (
@@ -35,14 +33,7 @@ export function StakeFlowProvider({ children }: { children: React.ReactNode }) {
     async (bitcoinRecoveryAddress: string, ethereumAddress: string) => {
       if (!acre) throw new Error("Acre SDK not defined")
 
-      await acreInitStake(
-        bitcoinRecoveryAddress,
-        ethereumAddress,
-        REFERRAL,
-        RelayerDepositorProxy.fromEthereumBitcoinDepositor(
-          acre.contracts.bitcoinDepositor as EthereumBitcoinDepositor,
-        ),
-      )
+      await acreInitStake(bitcoinRecoveryAddress, ethereumAddress, REFERRAL)
     },
     [acreInitStake, acre],
   )

dapp/src/hooks/index.ts

@@ -1,6 +1,7 @@
 export * from "./store"
 export * from "./toasts"
 export * from "./sdk"
+export * from "./subgraph"
 export * from "./useDetectThemeMode"
 export * from "./useRequestBitcoinAccount"
 export * from "./useRequestEthereumAccount"

dapp/src/hooks/store/index.ts

@@ -3,3 +3,5 @@ export * from "./useAppSelector"
 export * from "./useEstimatedBTCBalance"
 export * from "./useSharesBalance"
 export * from "./useMinDepositAmount"
+// TODO: Rename when the old hook is deleted.
+export { useActivities as useActivitiesNEW } from "./useActivities"

dapp/src/hooks/store/useActivities.ts

@@ -0,0 +1,6 @@
+import { selectActivities } from "#/store/wallet"
+import { useAppSelector } from "./useAppSelector"
+
+export function useActivities() {
+  return useAppSelector(selectActivities)
+}

dapp/src/hooks/subgraph/index.ts

@@ -0,0 +1,2 @@
+export * from "./useInitDataFromSubgraph"
+export * from "./useFetchActivities"

dapp/src/hooks/subgraph/useFetchActivities.ts

@@ -0,0 +1,24 @@
+import { useCallback } from "react"
+import { subgraphAPI } from "#/utils"
+import { setActivities } from "#/store/wallet"
+import { useAppDispatch } from "../store/useAppDispatch"
+import { useWalletContext } from "../useWalletContext"
+
+// TODO: Use the correct function from SDK
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const calculateEthAddress = (btcAddress: string) =>
+  "0x4c9e39e5ff458a811708c03aea21b8327118cf13"
+
+export function useFetchActivities() {
+  const dispatch = useAppDispatch()
+  const { btcAccount } = useWalletContext()
+
+  return useCallback(async () => {
+    if (!btcAccount) return
+
+    const ethAddress = calculateEthAddress(btcAccount.address)
+    const result = await subgraphAPI.fetchActivityData(ethAddress)
+
+    dispatch(setActivities(result))
+  }, [btcAccount, dispatch])
+}

dapp/src/hooks/subgraph/useInitDataFromSubgraph.ts

@@ -0,0 +1,15 @@
+import { useEffect } from "react"
+import { logPromiseFailure } from "#/utils"
+import { useFetchActivities } from "./useFetchActivities"
+import { useWalletContext } from "../useWalletContext"
+
+export function useInitDataFromSubgraph() {
+  const { btcAccount } = useWalletContext()
+  const fetchActivities = useFetchActivities()
+
+  useEffect(() => {
+    if (btcAccount) {
+      logPromiseFailure(fetchActivities())
+    }
+  }, [btcAccount, fetchActivities])
+}

dapp/src/hooks/useInitApp.ts

@@ -2,13 +2,16 @@ import { useInitDataFromSdk, useInitializeAcreSdk } from "./sdk"
 import { useSentry } from "./sentry"
 import { useFetchBTCPriceUSD } from "./useFetchBTCPriceUSD"
 import { useInitGlobalToasts } from "./toasts/useInitGlobalToasts"
+import { useInitDataFromSubgraph } from "./subgraph"
 
 export function useInitApp() {
   // TODO: Let's uncomment when dark mode is ready
   // useDetectThemeMode()
   useSentry()
   useInitializeAcreSdk()
-  useInitDataFromSdk()
   useFetchBTCPriceUSD()
   useInitGlobalToasts()
+
+  useInitDataFromSdk()
+  useInitDataFromSubgraph()
 }

dapp/src/store/reducer.ts

@@ -1,6 +1,8 @@
 import { combineReducers } from "@reduxjs/toolkit"
 import { btcSlice } from "./btc/btcSlice"
+import { walletSlice } from "./wallet/walletSlice"
 
 export const reducer = combineReducers({
   btc: btcSlice.reducer,
+  wallet: walletSlice.reducer,
 })

dapp/src/store/wallet/index.ts

@@ -0,0 +1,2 @@
+export * from "./walletSelector"
+export * from "./walletSlice"

dapp/src/store/wallet/walletSelector.ts

@@ -0,0 +1,5 @@
+import { Activity } from "#/types"
+import { RootState } from ".."
+
+export const selectActivities = (state: RootState): Activity[] =>
+  state.wallet.activities

dapp/src/store/wallet/walletSlice.ts

@@ -0,0 +1,22 @@
+import { Activity } from "#/types"
+import { PayloadAction, createSlice } from "@reduxjs/toolkit"
+
+type WalletState = {
+  activities: Activity[]
+}
+
+const initialState: WalletState = {
+  activities: [],
+}
+
+export const walletSlice = createSlice({
+  name: "wallet",
+  initialState,
+  reducers: {
+    setActivities(state, action: PayloadAction<Activity[]>) {
+      state.activities = action.payload
+    },
+  },
+})
+
+export const { setActivities } = walletSlice.actions

dapp/src/types/activity.ts

@@ -12,3 +12,10 @@ export type ActivityInfo = {
   txHash: string
   status: ActivityInfoStatus
 }
+
+export type Activity = {
+  txHash: string
+  amount: bigint
+  type: "deposit" | "withdraw"
+  status: "completed" | "pending"
+}

dapp/src/types/index.ts

@@ -16,3 +16,4 @@ export * from "./toast"
 export * from "./core"
 export * from "./fee"
 export * from "./navigation"
+export * from "./subgraphAPI"

dapp/src/types/subgraphAPI.ts

@@ -0,0 +1,6 @@
+export type ActivityDataResponse = {
+  id: string
+  bitcoinTransactionId: string
+  amountToDeposit: string
+  events: { type: "Initialized" | "Finalized" }[]
+}

dapp/src/utils/index.ts

@@ -9,3 +9,4 @@ export * from "./promise"
 export * from "./exchangeApi"
 export * from "./verifyDepositAddress"
 export * from "./json"
+export * from "./subgraphAPI"

dapp/src/utils/subgraphAPI.ts

@@ -0,0 +1,58 @@
+import axios from "axios"
+import { Activity, ActivityDataResponse } from "#/types"
+
+const ACRE_SUBGRAPH_URL = import.meta.env.VITE_ACRE_SUBGRAPH_URL
+
+const mapToActivity = (activityData: ActivityDataResponse): Activity => {
+  const { bitcoinTransactionId: txHash, amountToDeposit, events } = activityData
+
+  const status = events.some(({ type }) => type === "Finalized")
+    ? "completed"
+    : "pending"
+
+  return {
+    txHash,
+    amount: BigInt(amountToDeposit),
+    type: "deposit",
+    status,
+  }
+}
+
+// TODO: Fetch transactions for withdrawals
+/**
+ * Returns the activities for a given account.
+ * @param account The Ethereum address for which the activities will be fetched.
+ */
+async function fetchActivityData(account: string): Promise<Activity[]> {
+  const response = await axios.post<{
+    errors?: unknown
+    data: { activityDatas: ActivityDataResponse[] }
+  }>(ACRE_SUBGRAPH_URL, {
+    query: `query {
+            activityDatas(
+              where: {depositOwner_: {id: "${account}"}}
+            ) {
+              id
+              bitcoinTransactionId
+              events {
+                type
+              }
+              ... on Deposit {
+                amountToDeposit
+              }
+            }
+          }`,
+  })
+
+  if (response.data && response.data.errors) {
+    const errorMsg = "Failed to fetch data from Acre subgraph API."
+    console.error(errorMsg, response.data.errors)
+    throw new Error(errorMsg)
+  }
+
+  return response.data.data.activityDatas.map(mapToActivity)
+}
+
+export const subgraphAPI = {
+  fetchActivityData,
+}

dapp/src/vite-env.d.ts

@@ -4,7 +4,8 @@ interface ImportMetaEnv {
   readonly VITE_SENTRY_DSN: string
   readonly VITE_ETH_HOSTNAME_HTTP: string
   readonly VITE_REFERRAL: number
-  readonly VITE_DEFENDER_RELAYER_WEBHOOK_URL: string
+  readonly VITE_TBTC_API_ENDPOINT: string
+  readonly VITE_ACRE_SUBGRAPH_URL: string
 }
 
 interface ImportMeta {

dapp/src/web3/index.ts

@@ -1,2 +1 @@
 export * from "./ledger-live-signer"
-export * from "./relayer-depositor-proxy"