feat: add bitcoind RPC back-end as alternative for Electrum

Cargo.toml

@@ -30,6 +30,7 @@ members = [
 [workspace.dependencies]
 # Bitcoin Dev Kit
 bdk = "0.28"
+bdk_bitcoind_rpc = "0.22"
 bdk_chain = "0.23.0"
 bdk_core = "0.6.0"
 bdk_electrum = { version = "0.23.0", default-features = false }

dev-docs/cli/README.md

@@ -67,7 +67,8 @@ OPTIONS:
         --receive-address <monero-receive-address>          The monero address where you would like to receive monero
         --seller <seller>                                   The seller's address. Must include a peer ID part, i.e. `/p2p/`
 
-        --electrum-rpc <bitcoin-electrum-rpc-url>           Provide the Bitcoin Electrum RPC URL
+        --electrum-rpc <bitcoin-electrum-rpc-url>           Provide the Bitcoin Electrum RPC URL. Supersedes --bitcoind-rpc
+        --bitcoind-rpc <bitcoind-rpc-url>                   Provide the bitcoind RPC URL. Superseded by --electrum-rpc
         --bitcoin-target-block <bitcoin-target-block>       Estimate Bitcoin fees such that transactions are confirmed within the specified number of blocks
         --monero-daemon-address <monero-daemon-address>     Specify to connect to a monero daemon of your choice: <host>:<port>
         --tor-socks5-port <tor-socks5-port>                 Your local Tor socks5 proxy port [default: 9050]

docs/pages/becoming_a_maker/overview.mdx

@@ -145,14 +145,15 @@ Below an explanation of what each option does:
 ### Bitcoin Section
 
 The `bitcoin` section specifies a few details about the asb's interaction with the Bitcoin blockchain.
-We do not recommend changing these settings, however we document them for completeness sake.
+We do not recommend changing these settings, however we document them for completeness' sake.
 
 ```toml filename="config_mainnet.toml"
 # ...
 
 [bitcoin]
 target_block = 1
 electrum_rpc_urls = ["tcp://mainnet_electrs:50001"]
+# bitcoind_rpc_urls = ["http://user:[email protected]:8332"]
 use_mempool_space_fee_estimation = true
 network = "Mainnet"
 

monero-sys/src/lib.rs

@@ -2395,7 +2395,7 @@ impl FfiWallet {
         let history_handle = TransactionHistoryHandle(history_ptr);
         let count = history_handle.count();
 
-        let mut transactions = Vec::new();
+        let mut transactions = Vec::with_capacity(count as _);
         for i in 0..count {
             if let Some(tx_info_handle) = history_handle.transaction(i) {
                 if let Some(serialized_tx) = tx_info_handle.serialize() {

src-gui/src/models/tauriModelExt.ts

@@ -7,6 +7,7 @@ import {
   TauriBackgroundProgress,
   TauriSwapProgressEvent,
   SendMoneroDetails,
+  WithdrawBitcoinDetails,
   ContextStatus,
   QuoteWithAddress,
   ExportBitcoinWalletResponse,
@@ -319,6 +320,10 @@ export type PendingSendMoneroApprovalRequest = PendingApprovalRequest & {
   request: { type: "SendMonero"; content: SendMoneroDetails };
 };
 
+export type PendingWithdrawBitcoinApprovalRequest = PendingApprovalRequest & {
+  request: { type: "WithdrawBitcoin"; content: WithdrawBitcoinDetails };
+};
+
 export type PendingPasswordApprovalRequest = PendingApprovalRequest & {
   request: { type: "PasswordRequest"; content: { wallet_path: string } };
 };
@@ -335,16 +340,21 @@ export function isPendingSelectMakerApprovalEvent(
   return event.request.type === "SelectMaker";
 }
 
-export function isPendingSendMoneroApprovalEvent(
+export function isPendingSendCurrencyApprovalEvent(
   event: ApprovalRequest,
-): event is PendingSendMoneroApprovalRequest {
+  currency: "monero" | "bitcoin",
+): event is
+  | PendingSendMoneroApprovalRequest
+  | PendingWithdrawBitcoinApprovalRequest {
   // Check if the request is pending
   if (event.request_status.state !== "Pending") {
     return false;
   }
 
+  const type = currency === "monero" ? "SendMonero" : "WithdrawBitcoin";
+
   // Check if the request is a SendMonero request
-  return event.request.type === "SendMonero";
+  return event.request.type === type;
 }
 
 export function isPendingPasswordApprovalEvent(

src-gui/src/renderer/background.ts

@@ -7,7 +7,10 @@ import {
   approvalEventReceived,
   backgroundProgressEventReceived,
 } from "store/features/rpcSlice";
-import { setBitcoinBalance } from "store/features/bitcoinWalletSlice";
+import {
+  setBitcoinBalance,
+  setBitcoinHistory,
+} from "store/features/bitcoinWalletSlice";
 import { receivedCliLog } from "store/features/logsSlice";
 import { poolStatusReceived } from "store/features/poolSlice";
 import { swapProgressEventReceived } from "store/features/swapSlice";
@@ -135,6 +138,7 @@ listen<TauriEvent>(TAURI_UNIFIED_EVENT_CHANNEL_NAME, (event) => {
 
     case "BalanceChange":
       store.dispatch(setBitcoinBalance(eventData.balance));
+      store.dispatch(setBitcoinHistory(eventData.transactions));
       break;
 
     case "SwapDatabaseStateUpdate":

src-gui/src/renderer/components/PromiseInvokeButton.tsx

@@ -132,11 +132,11 @@ export default function PromiseInvokeButton<T>({
           <IconButton
             onClick={handleClick}
             disabled={isDisabled}
-            {...(rest as IconButtonProps)}
-            size="large"
             sx={{
               padding: "0.25rem",
             }}
+            size="large"
+            {...(rest as IconButtonProps)}
           >
             {isLoading
               ? resolvedLoadingIcon

src-gui/src/renderer/components/inputs/BitcoinAddressTextField.tsx

@@ -3,22 +3,22 @@ import { useEffect } from "react";
 import { isTestnet } from "store/config";
 import { isBtcAddressValid } from "utils/conversionUtils";
 
-type BitcoinAddressTextFieldProps = {
+type BitcoinAddressTextFieldProps = TextFieldProps & {
   address: string;
   onAddressChange: (address: string) => void;
-  helperText: string;
   onAddressValidityChange?: (valid: boolean) => void;
+  helperText?: string;
   allowEmpty?: boolean;
 };
 
 export default function BitcoinAddressTextField({
   address,
   onAddressChange,
+  onAddressValidityChange,
   helperText,
   allowEmpty = true,
-  onAddressValidityChange,
   ...props
-}: BitcoinAddressTextFieldProps & TextFieldProps) {
+}: BitcoinAddressTextFieldProps) {
   const placeholder = isTestnet() ? "tb1q4aelwalu..." : "bc18ociqZ9mZ...";
 
   function errorText() {

src-gui/src/renderer/components/inputs/MoneroAddressTextField.tsx

@@ -8,8 +8,8 @@ import {
   List,
   ListItemText,
   TextField,
+  TextFieldProps,
 } from "@mui/material";
-import { TextFieldProps } from "@mui/material";
 import { useEffect, useState } from "react";
 import { getMoneroAddresses } from "renderer/rpc";
 import { isTestnet } from "store/config";