Loading your session...
++ Near-instant confirmations with high throughput +
++ Your BTC deposit unlocks sBTC via Clarity's direct Bitcoin + state reading. No intermediaries or multi-signature scheme needed. + Trustless. Fast. Secure. +
++ Connect your wallet to continue +
+Total Deposits
++ {allDepositsHistory.aggregateData.totalDeposits} +
+Total Volume
++ {Number.parseFloat( + allDepositsHistory.aggregateData.totalVolume + ).toFixed(8)} +
+BTC
+Unique Users
++ {allDepositsHistory.aggregateData.uniqueUsers} +
++ Loading network activity... +
+Updating history...
+No network activity found
++ Network activity will appear here once deposits are made +
++ Fast, secure, and trustless +
++ Please connect your wallet to access the deposit feature +
++ Fast, secure, and trustless +
+ {btcUsdPrice && ( ++ Current BTC price: ${btcUsdPrice.toLocaleString()} +
+ )} ++ Loading deposit data... +
++ Error loading BTC price data. Please try again later. +
++ Connect your wallet to view your deposit history +
++ Loading deposit history... +
+Updating history...
+No deposit history found
++ Make your first deposit to see it here +
+- Checking your sBTC status... + Checking your BTC status...
)} @@ -115,7 +115,7 @@ const AssetTracker = () => { className="text-center text-primary font-medium cursor-pointer hover:underline" onClick={openDepositModal} > - You have sBTC in your wallet! Click here to deposit it in your smart + You have BTC in your wallet! Click here to deposit it in your smart wallet. )} @@ -129,13 +129,13 @@ const AssetTracker = () => { > Bitflow or Velar {" "} - to deposite sBTC in your wallet. + to deposite BTC in your wallet. )} {isLoaded && hasSbtc === null && currentAddress && (- Unable to check your sBTC status. Visit{" "} + Unable to check your BTC status. Visit{" "} Bitflow {" "} @@ -145,7 +145,7 @@ const AssetTracker = () => { {isLoaded && !currentAddress && (
- No wallet connected. Connect your wallet to check for sBTC. + No wallet connected. Connect your wallet to check for BTC.
)}Feature Coming Soon
- The ability to deposit sBTC into your smart wallet will be + The ability to deposit BTC into your smart wallet will be available in a future update.
diff --git a/src/hooks/deposit/useResolveBnsOrAddress.ts b/src/hooks/deposit/useResolveBnsOrAddress.ts new file mode 100644 index 00000000..9b74766c --- /dev/null +++ b/src/hooks/deposit/useResolveBnsOrAddress.ts @@ -0,0 +1,19 @@ +// hooks/useResolveBnsOrAddress.ts +import { useQuery } from "@tanstack/react-query"; + +// In a real application, this would call an API to resolve BNS names +const useResolveBnsOrAddress = (address: string) => { + return useQuery({ + queryKey: ["resolveAddress", address], + queryFn: async () => { + // Mock implementation + return { + resolvedValue: address.startsWith("SP") ? address : null, + }; + }, + enabled: !!address, + staleTime: 1000 * 60 * 60, // 1 hour + }); +}; + +export default useResolveBnsOrAddress; diff --git a/src/hooks/deposit/useSdkAllDepositsHistory.ts b/src/hooks/deposit/useSdkAllDepositsHistory.ts new file mode 100644 index 00000000..371395f4 --- /dev/null +++ b/src/hooks/deposit/useSdkAllDepositsHistory.ts @@ -0,0 +1,18 @@ +// hooks/useSdkAllDepositsHistory.ts +import { useQuery } from "@tanstack/react-query"; +import { styxSDK } from "@faktoryfun/styx-sdk"; + +const useSdkAllDepositsHistory = () => { + return useQuery({ + queryKey: ["allDepositsHistory"], + queryFn: async () => { + console.log("Fetching all deposits history..."); + const data = await styxSDK.getAllDepositsHistory(); + console.log("Received all deposits history:", data); + return data || []; + }, + staleTime: 60000, // 1 minute + }); +}; + +export default useSdkAllDepositsHistory; diff --git a/src/hooks/deposit/useSdkBtcPrice.ts b/src/hooks/deposit/useSdkBtcPrice.ts new file mode 100644 index 00000000..1ee937ae --- /dev/null +++ b/src/hooks/deposit/useSdkBtcPrice.ts @@ -0,0 +1,28 @@ +// hooks/useSdkBtcPrice.ts +import { useQuery } from "@tanstack/react-query"; +import { styxSDK } from "@faktoryfun/styx-sdk"; + +export const useSdkBtcPrice = () => { + return useQuery({ + queryKey: ["btcPrice"], + queryFn: async () => { + console.log("Fetching BTC price from SDK..."); + const price = await styxSDK.getBTCPrice(); + console.log("Received BTC price:", price); + return price; + }, + staleTime: 5 * 60 * 1000, // 5 minutes + }); +}; + +export const useFormattedBtcPrice = () => { + const query = useSdkBtcPrice(); + return { + price: query.data, + error: query.error, + isLoading: query.isLoading, + refetch: query.refetch, + }; +}; + +export default useSdkBtcPrice; diff --git a/src/hooks/deposit/useSdkDepositHistory.ts b/src/hooks/deposit/useSdkDepositHistory.ts new file mode 100644 index 00000000..b57782e1 --- /dev/null +++ b/src/hooks/deposit/useSdkDepositHistory.ts @@ -0,0 +1,20 @@ +// hooks/useSdkDepositHistory.ts +import { useQuery } from "@tanstack/react-query"; +import { styxSDK } from "@faktoryfun/styx-sdk"; + +const useSdkDepositHistory = (userAddress: string | null) => { + return useQuery({ + queryKey: ["depositHistory", userAddress], + queryFn: async () => { + if (!userAddress) return []; + console.log("Fetching deposit history for:", userAddress); + const data = await styxSDK.getDepositHistory(userAddress); + console.log("Received deposit history:", data); + return data || []; + }, + enabled: !!userAddress, + staleTime: 60000, // 1 minute + }); +}; + +export default useSdkDepositHistory; diff --git a/src/hooks/deposit/useSdkPoolStatus.ts b/src/hooks/deposit/useSdkPoolStatus.ts new file mode 100644 index 00000000..77d8c240 --- /dev/null +++ b/src/hooks/deposit/useSdkPoolStatus.ts @@ -0,0 +1,18 @@ +// hooks/useSdkPoolStatus.ts +import { useQuery } from "@tanstack/react-query"; +import { styxSDK } from "@faktoryfun/styx-sdk"; + +const useSdkPoolStatus = () => { + return useQuery({ + queryKey: ["poolStatus"], + queryFn: async () => { + console.log("Fetching pool status from SDK..."); + const data = await styxSDK.getPoolStatus(); + console.log("Received pool status:", data); + return data; + }, + staleTime: 60000, // 1 minute + }); +}; + +export default useSdkPoolStatus; diff --git a/src/lib/address.ts b/src/lib/address.ts index 73d39424..70a7d1e2 100644 --- a/src/lib/address.ts +++ b/src/lib/address.ts @@ -13,15 +13,31 @@ export function getStacksAddress(): string | null { return address || null } -export function getBitcoinAddress(): string | null { +export function getBitcoinAddress(network: "mainnet" | "testnet" = "mainnet"): string | null { if (typeof window === "undefined") { return null } const blockstackSession = JSON.parse(localStorage.getItem("blockstack-session") || "{}") - - // Access the Bitcoin address from the profile const btcAddress = blockstackSession.userData?.profile?.btcAddress - return btcAddress || null -} \ No newline at end of file + if (!btcAddress) { + // Check if there's a stored address in localStorage as fallback + const storedBtcAddress = localStorage.getItem("btcAddress") + return storedBtcAddress || null + } + + // Handle Leather wallet's structured address format + if (typeof btcAddress === "object") { + // Leather wallet stores addresses in a structured object + if (network === "mainnet") { + // Try p2wpkh (segwit) first, then p2tr (taproot), then p2pkh (legacy) + return btcAddress.p2wpkh?.mainnet || btcAddress.p2tr?.mainnet || btcAddress.p2pkh?.mainnet || null + } else { + // For testnet, try the same address types but for testnet + return btcAddress.p2wpkh?.testnet || btcAddress.p2tr?.testnet || btcAddress.p2pkh?.testnet || null + } + } + + return typeof btcAddress === "string" ? btcAddress : null +}