Merge branch 'main' of github.com:thesis/acre into validate-deposit-a…

…ddress
thesis · Feb 26, 2024 · 26de39d · 26de39d
2 parents 3135d99 + e23ae29
commit 26de39d
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/dapp/src/acre-react/hooks/useStakeFlow.ts b/dapp/src/acre-react/hooks/useStakeFlow.ts
@@ -16,6 +16,7 @@ export type UseStakeFlowReturn = {
   depositReceipt?: DepositReceipt
   signMessage: () => Promise<void>
   stake: () => Promise<void>
+  depositReceipt?: DepositReceipt
 }
 
 export function useStakeFlow(): UseStakeFlowReturn {
@@ -29,6 +30,10 @@ export function useStakeFlow(): UseStakeFlowReturn {
     DepositReceipt | undefined
   >(undefined)
 
+  const [depositReceipt, setDepositReceipt] = useState<
+    DepositReceipt | undefined
+  >(undefined)
+
   const initStake = useCallback(
     async (
       bitcoinRecoveryAddress: string,
@@ -73,5 +78,6 @@ export function useStakeFlow(): UseStakeFlowReturn {
     depositReceipt,
     signMessage,
     stake,
+    depositReceipt,
   }
 }
diff --git a/dapp/src/components/TransactionModal/ActiveStakingStep/DepositBTCModal.tsx b/dapp/src/components/TransactionModal/ActiveStakingStep/DepositBTCModal.tsx
@@ -6,6 +6,7 @@ import {
   useModalFlowContext,
   useStakeFlowContext,
   useTransactionContext,
+  useWalletContext,
 } from "#/hooks"
 import Alert from "#/components/shared/Alert"
 import { TextMd } from "#/components/shared/Typography"
@@ -14,6 +15,7 @@ import { PROCESS_STATUSES } from "#/types"
 import StakingStepsModalContent from "./StakingStepsModalContent"
 
 export default function DepositBTCModal() {
+  const { ethAccount } = useWalletContext()
   const { tokenAmount } = useTransactionContext()
   const { setStatus } = useModalFlowContext()
   const { btcAddress, depositReceipt, stake } = useStakeFlowContext()
@@ -48,14 +50,18 @@ export default function DepositBTCModal() {
     useDepositBTCTransaction(onDepositBTCSuccess)
 
   const handledDepositBTC = useCallback(() => {
-    if (!tokenAmount?.amount || !btcAddress || !depositReceipt) return
+    if (!tokenAmount?.amount || !btcAddress || !depositReceipt || !ethAccount)
+      return
 
-    asyncWrapper(depositTelemetry(depositReceipt, btcAddress))
+    asyncWrapper(
+      depositTelemetry(depositReceipt, btcAddress, ethAccount?.address),
+    )
     asyncWrapper(sendBitcoinTransaction(tokenAmount?.amount, btcAddress))
   }, [
     btcAddress,
     depositReceipt,
     depositTelemetry,
+    ethAccount,
     sendBitcoinTransaction,
     tokenAmount?.amount,
   ])

diff --git a/dapp/src/hooks/useDepositTelemetry.ts b/dapp/src/hooks/useDepositTelemetry.ts
@@ -8,7 +8,11 @@ export function useDepositTelemetry() {
   const captureMessage = useCaptureMessage()
 
   return useCallback(
-    async (deposit: DepositReceipt, depositAddress: string) => {
+    async (
+      deposit: DepositReceipt,
+      depositAddress: string,
+      ethAddress: string,
+    ) => {
       const { status, response } = await verifyDepositAddress(
         deposit,
         depositAddress,
@@ -21,6 +25,7 @@ export function useDepositTelemetry() {
         walletPublicKeyHash,
         refundPublicKeyHash,
         refundLocktime,
+        extraData,
       } = deposit
 
       captureMessage(
@@ -31,10 +36,12 @@ export function useDepositTelemetry() {
           walletPublicKeyHash: walletPublicKeyHash.toString(),
           refundPublicKeyHash: refundPublicKeyHash.toString(),
           refundLocktime: refundLocktime.toString(),
+          extraData: extraData?.toString(),
           verificationStatus: status,
           verificationResponse: response,
         },
         {
+          ethAddress,
           "verification.status": status,
         },
       )