X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fcli.rs;h=9bc2ef1584d80acaea947d42c9223c63cc1f09a7;hb=68a95c0646810ed7afe5022ac211c1f214d950c5;hp=f8597e33a19439b94c4c7516bce42671fe8eda81;hpb=d3112a612f8f830520ad01e533e3aac3a701c55e;p=ldk-sample

diff --git a/src/cli.rs b/src/cli.rs
index f8597e3..9bc2ef1 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -8,13 +8,14 @@ use bitcoin::hashes::Hash;
 use bitcoin::network::constants::Network;
 use bitcoin::secp256k1::key::PublicKey;
 use lightning::chain;
-use lightning::chain::keysinterface::KeysManager;
+use lightning::chain::keysinterface::{KeysInterface, KeysManager};
 use lightning::ln::features::InvoiceFeatures;
 use lightning::ln::msgs::NetAddress;
 use lightning::ln::{PaymentHash, PaymentSecret};
 use lightning::routing::network_graph::NetGraphMsgHandler;
 use lightning::routing::router;
 use lightning::routing::router::RouteHint;
+use lightning::routing::scorer::Scorer;
 use lightning::util::config::{ChannelConfig, ChannelHandshakeLimits, UserConfig};
 use lightning_invoice::{utils, Currency, Invoice};
 use std::env;
@@ -70,7 +71,10 @@ pub(crate) fn parse_startup_args() -> Result<LdkUserInfo, ()> {
 	let mut ldk_peer_port_set = true;
 	let ldk_peer_listening_port: u16 = match env::args().skip(3).next().map(|p| p.parse()) {
 		Some(Ok(p)) => p,
-		Some(Err(e)) => panic!("{}", e),
+		Some(Err(_)) => {
+			ldk_peer_port_set = false;
+			9735
+		}
 		None => {
 			ldk_peer_port_set = false;
 			9735
@@ -84,7 +88,9 @@ pub(crate) fn parse_startup_args() -> Result<LdkUserInfo, ()> {
 	let network: Network = match env::args().skip(arg_idx).next().as_ref().map(String::as_str) {
 		Some("testnet") => Network::Testnet,
 		Some("regtest") => Network::Regtest,
-		Some(_) => panic!("Unsupported network provided. Options are: `regtest`, `testnet`"),
+		Some(net) => {
+			panic!("Unsupported network provided. Options are: `regtest`, `testnet`. Got {}", net);
+		}
 		None => Network::Testnet,
 	};
 
@@ -250,7 +256,7 @@ pub(crate) async fn poll_for_user_input(
 					let payee_pubkey = invoice.recover_payee_pub_key();
 					let final_cltv = invoice.min_final_cltv_expiry() as u32;
 					let payment_hash = PaymentHash(invoice.payment_hash().clone().into_inner());
-					let payment_secret = invoice.payment_secret().cloned();
+					let payment_secret = Some(invoice.payment_secret().clone());
 					let invoice_features = invoice.features().cloned();
 
 					send_payment(
@@ -406,6 +412,24 @@ pub(crate) async fn poll_for_user_input(
 				}
 				"nodeinfo" => node_info(channel_manager.clone(), peer_manager.clone()),
 				"listpeers" => list_peers(peer_manager.clone()),
+				"signmessage" => {
+					const MSG_STARTPOS: usize = "signmsg".len() + 1;
+					if line.as_bytes().len() <= MSG_STARTPOS {
+						println!("ERROR: signmsg requires a message");
+						print!("> ");
+						io::stdout().flush().unwrap();
+						continue;
+					}
+					println!(
+						"{:?}",
+						lightning::util::message_signing::sign(
+							&line.as_bytes()[MSG_STARTPOS..],
+							&keys_manager.get_node_secret()
+						)
+					);
+					print!("> ");
+					io::stdout().flush().unwrap();
+				}
 				_ => println!("Unknown command. See `\"help\" for available commands."),
 			}
 		}
@@ -425,6 +449,7 @@ fn help() {
 	println!("forceclosechannel <channel_id>");
 	println!("nodeinfo");
 	println!("listpeers");
+	println!("signmessage <message>");
 }
 
 fn node_info(channel_manager: Arc<ChannelManager>, peer_manager: Arc<PeerManager>) {
@@ -462,6 +487,11 @@ fn list_channels(channel_manager: Arc<ChannelManager>) {
 		}
 		println!("\t\tis_confirmed_onchain: {},", chan_info.is_funding_locked);
 		println!("\t\tchannel_value_satoshis: {},", chan_info.channel_value_satoshis);
+		println!(
+			"\t\tlocal_balance_msat: {},",
+			chan_info.outbound_capacity_msat
+				+ chan_info.unspendable_punishment_reserve.unwrap_or(0) * 1000
+		);
 		if chan_info.is_usable {
 			println!("\t\tavailable_balance_for_send_msat: {},", chan_info.outbound_capacity_msat);
 			println!("\t\tavailable_balance_for_recv_msat: {},", chan_info.inbound_capacity_msat);
@@ -584,7 +614,7 @@ fn send_payment(
 	channel_manager: Arc<ChannelManager>, payment_storage: PaymentInfoStorage,
 	logger: Arc<FilesystemLogger>,
 ) {
-	let network_graph = router.network_graph.read().unwrap();
+	let network_graph = &router.network_graph;
 	let first_hops = channel_manager.list_usable_channels();
 	let payer_pubkey = channel_manager.get_our_node_id();
 
@@ -598,6 +628,7 @@ fn send_payment(
 		amt_msat,
 		final_cltv,
 		logger,
+		&Scorer::default(),
 	);
 	if let Err(e) = route {
 		println!("ERROR: failed to find route: {}", e.err);
@@ -605,7 +636,7 @@ fn send_payment(
 	}
 	let status = match channel_manager.send_payment(&route.unwrap(), payment_hash, &payment_secret)
 	{
-		Ok(()) => {
+		Ok(_payment_id) => {
 			println!("EVENT: initiated sending {} msats to {}", amt_msat, payee);
 			HTLCStatus::Pending
 		}
@@ -632,7 +663,7 @@ fn keysend(
 	channel_manager: Arc<ChannelManager>, payment_storage: PaymentInfoStorage,
 	logger: Arc<FilesystemLogger>,
 ) {
-	let network_graph = router.network_graph.read().unwrap();
+	let network_graph = &router.network_graph;
 	let first_hops = channel_manager.list_usable_channels();
 	let payer_pubkey = channel_manager.get_our_node_id();
 
@@ -645,6 +676,7 @@ fn keysend(
 		amt_msat,
 		40,
 		logger,
+		&Scorer::default(),
 	) {
 		Ok(r) => r,
 		Err(e) => {
@@ -654,7 +686,7 @@ fn keysend(
 	};
 
 	let mut payments = payment_storage.lock().unwrap();
-	let payment_hash = channel_manager.send_spontaneous_payment(&route, None).unwrap();
+	let payment_hash = channel_manager.send_spontaneous_payment(&route, None).unwrap().0;
 	payments.insert(
 		payment_hash,
 		PaymentInfo {
@@ -699,7 +731,7 @@ fn get_invoice(
 		payment_hash,
 		PaymentInfo {
 			preimage: None,
-			secret: invoice.payment_secret().cloned(),
+			secret: Some(invoice.payment_secret().clone()),
 			status: HTLCStatus::Pending,
 			amt_msat: MillisatAmount(Some(amt_msat)),
 		},