@ -103,9 +103,14 @@ async fn main() -> Result<()> {
)
}
let bitcoin_wallet =
init_bitcoin_wallet ( bitcoin_network , electrum_rpc_url , seed , data_dir . clone ( ) )
. await ? ;
let bitcoin_wallet = init_bitcoin_wallet (
bitcoin_network ,
electrum_rpc_url ,
seed ,
data_dir . clone ( ) ,
execution_params ,
)
. await ? ;
let ( monero_wallet , _process ) = init_monero_wallet (
monero_network ,
data_dir ,
@ -191,9 +196,14 @@ async fn main() -> Result<()> {
bail ! ( "The given monero address is on network {:?}, expected address of network {:?}." , receive_monero_address . network , monero_network )
}
let bitcoin_wallet =
init_bitcoin_wallet ( bitcoin_network , electrum_rpc_url , seed , data_dir . clone ( ) )
. await ? ;
let bitcoin_wallet = init_bitcoin_wallet (
bitcoin_network ,
electrum_rpc_url ,
seed ,
data_dir . clone ( ) ,
execution_params ,
)
. await ? ;
let ( monero_wallet , _process ) = init_monero_wallet (
monero_network ,
data_dir ,
@ -237,8 +247,14 @@ async fn main() -> Result<()> {
force ,
electrum_rpc_url ,
} = > {
let bitcoin_wallet =
init_bitcoin_wallet ( bitcoin_network , electrum_rpc_url , seed , data_dir ) . await ? ;
let bitcoin_wallet = init_bitcoin_wallet (
bitcoin_network ,
electrum_rpc_url ,
seed ,
data_dir ,
execution_params ,
)
. await ? ;
let resume_state = db . get_state ( swap_id ) ? . try_into_bob ( ) ? . into ( ) ;
let cancel =
@ -262,20 +278,18 @@ async fn main() -> Result<()> {
force ,
electrum_rpc_url ,
} = > {
let bitcoin_wallet =
init_bitcoin_wallet ( bitcoin_network , electrum_rpc_url , seed , data_dir ) . await ? ;
let bitcoin_wallet = init_bitcoin_wallet (
bitcoin_network ,
electrum_rpc_url ,
seed ,
data_dir ,
execution_params ,
)
. await ? ;
let resume_state = db . get_state ( swap_id ) ? . try_into_bob ( ) ? . into ( ) ;
bob ::refund (
swap_id ,
resume_state ,
execution_params ,
Arc ::new ( bitcoin_wallet ) ,
db ,
force ,
)
. await ? ? ;
bob ::refund ( swap_id , resume_state , Arc ::new ( bitcoin_wallet ) , db , force ) . await ? ? ;
}
} ;
Ok ( ( ) )
@ -286,12 +300,14 @@ async fn init_bitcoin_wallet(
electrum_rpc_url : Url ,
seed : Seed ,
data_dir : PathBuf ,
execution_params : ExecutionParams ,
) -> Result < bitcoin ::Wallet > {
let wallet_dir = data_dir . join ( "wallet" ) ;
let wallet = bitcoin ::Wallet ::new (
electrum_rpc_url . clone ( ) ,
network ,
execution_params . bitcoin_finality_confirmations ,
& wallet_dir ,
seed . derive_extended_private_key ( network ) ? ,
)