X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fcli.rs;fp=src%2Fcli.rs;h=f896721cdfef415d06600a34ac38695bfc4ee007;hb=bd7121e4cacd1f8e1b47bb3fe2d184ebda623ab0;hp=cba62559166d02a35b95e1356a720de947711eaa;hpb=6621d7965d85861f958571f5cb29f6946c57aa57;p=ldk-sample diff --git a/src/cli.rs b/src/cli.rs index cba6255..f896721 100644 --- a/src/cli.rs +++ b/src/cli.rs @@ -1,4 +1,4 @@ -use crate::disk; +use crate::disk::{self, INBOUND_PAYMENTS_FNAME, OUTBOUND_PAYMENTS_FNAME}; use crate::hex_utils; use crate::{ ChannelManager, HTLCStatus, MillisatAmount, NetworkGraph, OnionMessenger, PaymentInfo, @@ -16,17 +16,18 @@ use lightning::onion_message::{CustomOnionMessageContents, Destination, OnionMes use lightning::routing::gossip::NodeId; use lightning::routing::router::{PaymentParameters, RouteParameters}; use lightning::util::config::{ChannelHandshakeConfig, ChannelHandshakeLimits, UserConfig}; +use lightning::util::persist::KVStorePersister; use lightning::util::ser::{Writeable, Writer}; use lightning_invoice::payment::pay_invoice; use lightning_invoice::{utils, Currency, Invoice}; +use lightning_persister::FilesystemPersister; use std::env; use std::io; use std::io::Write; use std::net::{SocketAddr, ToSocketAddrs}; -use std::ops::Deref; use std::path::Path; use std::str::FromStr; -use std::sync::Arc; +use std::sync::{Arc, Mutex}; use std::time::Duration; pub(crate) struct LdkUserInfo { @@ -61,9 +62,9 @@ impl Writeable for UserOnionMessageContents { pub(crate) async fn poll_for_user_input( peer_manager: Arc, channel_manager: Arc, keys_manager: Arc, network_graph: Arc, - onion_messenger: Arc, inbound_payments: PaymentInfoStorage, - outbound_payments: PaymentInfoStorage, ldk_data_dir: String, network: Network, - logger: Arc, + onion_messenger: Arc, inbound_payments: Arc>, + outbound_payments: Arc>, ldk_data_dir: String, network: Network, + logger: Arc, persister: Arc, ) { println!( "LDK startup successful. Enter \"help\" to view available commands. Press Ctrl-D to quit." @@ -157,7 +158,12 @@ pub(crate) async fn poll_for_user_input( } }; - send_payment(&*channel_manager, &invoice, outbound_payments.clone()); + send_payment( + &channel_manager, + &invoice, + &mut outbound_payments.lock().unwrap(), + persister.clone(), + ); } "keysend" => { let dest_pubkey = match words.next() { @@ -188,11 +194,12 @@ pub(crate) async fn poll_for_user_input( } }; keysend( - &*channel_manager, + &channel_manager, dest_pubkey, amt_msat, &*keys_manager, - outbound_payments.clone(), + &mut outbound_payments.lock().unwrap(), + persister.clone(), ); } "getinvoice" => { @@ -220,15 +227,17 @@ pub(crate) async fn poll_for_user_input( continue; } + let mut inbound_payments = inbound_payments.lock().unwrap(); get_invoice( amt_msat.unwrap(), - Arc::clone(&inbound_payments), - &*channel_manager, + &mut inbound_payments, + &channel_manager, Arc::clone(&keys_manager), network, expiry_secs.unwrap(), Arc::clone(&logger), ); + persister.persist(INBOUND_PAYMENTS_FNAME, &*inbound_payments).unwrap(); } "connectpeer" => { let peer_pubkey_and_ip_addr = words.next(); @@ -278,9 +287,10 @@ pub(crate) async fn poll_for_user_input( } } "listchannels" => list_channels(&channel_manager, &network_graph), - "listpayments" => { - list_payments(inbound_payments.clone(), outbound_payments.clone()) - } + "listpayments" => list_payments( + &inbound_payments.lock().unwrap(), + &outbound_payments.lock().unwrap(), + ), "closechannel" => { let channel_id_str = words.next(); if channel_id_str.is_none() { @@ -527,11 +537,9 @@ fn list_channels(channel_manager: &Arc, network_graph: &Arc, ) { - let status = - match pay_invoice(invoice, Retry::Timeout(Duration::from_secs(10)), channel_manager) { - Ok(_payment_id) => { - let payee_pubkey = invoice.recover_payee_pub_key(); - let amt_msat = invoice.amount_milli_satoshis().unwrap(); - println!("EVENT: initiated sending {} msats to {}", amt_msat, payee_pubkey); - print!("> "); - HTLCStatus::Pending - } - Err(e) => { - println!("ERROR: failed to send payment: {:?}", e); - print!("> "); - HTLCStatus::Failed - } - }; - let payment_hash = PaymentHash(invoice.payment_hash().clone().into_inner()); - let payment_secret = Some(invoice.payment_secret().clone()); - - let mut payments = payment_storage.lock().unwrap(); - payments.insert( + let payment_hash = PaymentHash((*invoice.payment_hash()).into_inner()); + let payment_secret = Some(*invoice.payment_secret()); + outbound_payments.payments.insert( payment_hash, PaymentInfo { preimage: None, secret: payment_secret, - status, + status: HTLCStatus::Pending, amt_msat: MillisatAmount(invoice.amount_milli_satoshis()), }, ); + persister.persist(OUTBOUND_PAYMENTS_FNAME, &*outbound_payments).unwrap(); + match pay_invoice(invoice, Retry::Timeout(Duration::from_secs(10)), channel_manager) { + Ok(_payment_id) => { + let payee_pubkey = invoice.recover_payee_pub_key(); + let amt_msat = invoice.amount_milli_satoshis().unwrap(); + println!("EVENT: initiated sending {} msats to {}", amt_msat, payee_pubkey); + print!("> "); + } + Err(e) => { + println!("ERROR: failed to send payment: {:?}", e); + print!("> "); + outbound_payments.payments.get_mut(&payment_hash).unwrap().status = HTLCStatus::Failed; + persister.persist(OUTBOUND_PAYMENTS_FNAME, &*outbound_payments).unwrap(); + } + }; } fn keysend( channel_manager: &ChannelManager, payee_pubkey: PublicKey, amt_msat: u64, entropy_source: &E, - payment_storage: PaymentInfoStorage, + outbound_payments: &mut PaymentInfoStorage, persister: Arc, ) { let payment_preimage = PaymentPreimage(entropy_source.get_secure_random_bytes()); let payment_hash = PaymentHash(Sha256::hash(&payment_preimage.0[..]).into_inner()); @@ -701,7 +708,17 @@ fn keysend( payment_params: PaymentParameters::for_keysend(payee_pubkey, 40), final_value_msat: amt_msat, }; - let status = match channel_manager.send_spontaneous_payment_with_retry( + outbound_payments.payments.insert( + payment_hash, + PaymentInfo { + preimage: None, + secret: None, + status: HTLCStatus::Pending, + amt_msat: MillisatAmount(Some(amt_msat)), + }, + ); + persister.persist(OUTBOUND_PAYMENTS_FNAME, &*outbound_payments).unwrap(); + match channel_manager.send_spontaneous_payment_with_retry( Some(payment_preimage), RecipientOnionFields::spontaneous_empty(), PaymentId(payment_hash.0), @@ -711,33 +728,21 @@ fn keysend( Ok(_payment_hash) => { println!("EVENT: initiated sending {} msats to {}", amt_msat, payee_pubkey); print!("> "); - HTLCStatus::Pending } Err(e) => { println!("ERROR: failed to send payment: {:?}", e); print!("> "); - HTLCStatus::Failed + outbound_payments.payments.get_mut(&payment_hash).unwrap().status = HTLCStatus::Failed; + persister.persist(OUTBOUND_PAYMENTS_FNAME, &*outbound_payments).unwrap(); } }; - - let mut payments = payment_storage.lock().unwrap(); - payments.insert( - payment_hash, - PaymentInfo { - preimage: None, - secret: None, - status, - amt_msat: MillisatAmount(Some(amt_msat)), - }, - ); } fn get_invoice( - amt_msat: u64, payment_storage: PaymentInfoStorage, channel_manager: &ChannelManager, + amt_msat: u64, inbound_payments: &mut PaymentInfoStorage, channel_manager: &ChannelManager, keys_manager: Arc, network: Network, expiry_secs: u32, logger: Arc, ) { - let mut payments = payment_storage.lock().unwrap(); let currency = match network { Network::Bitcoin => Currency::Bitcoin, Network::Testnet => Currency::BitcoinTestnet, @@ -765,7 +770,7 @@ fn get_invoice( }; let payment_hash = PaymentHash(invoice.payment_hash().clone().into_inner()); - payments.insert( + inbound_payments.payments.insert( payment_hash, PaymentInfo { preimage: None,