X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fcli.rs;h=10dce9283657345c110cbb47d1e4b85a576e5627;hb=0be8a1b35092b7ff8f1ac0a2efb8708e5a18a80c;hp=a53a0200e2b36e448f1a5b0f7ced31cdd08fc1d2;hpb=d69af92ec08c03204796cecb35f6905374af785e;p=ldk-sample

diff --git a/src/cli.rs b/src/cli.rs
index a53a020..10dce92 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -93,7 +93,7 @@ pub(crate) async fn poll_for_user_input(
 					let peer_pubkey_and_ip_addr = words.next();
 					let channel_value_sat = words.next();
 					if peer_pubkey_and_ip_addr.is_none() || channel_value_sat.is_none() {
-						println!("ERROR: openchannel has 2 required arguments: `openchannel pubkey@host:port channel_amt_satoshis` [--public]");
+						println!("ERROR: openchannel has 2 required arguments: `openchannel pubkey@host:port channel_amt_satoshis` [--public] [--with-anchors]");
 						continue;
 					}
 					let peer_pubkey_and_ip_addr = peer_pubkey_and_ip_addr.unwrap();
@@ -119,20 +119,25 @@ pub(crate) async fn poll_for_user_input(
 						continue;
 					};
 
-					let announce_channel = match words.next() {
-						Some("--public") | Some("--public=true") => true,
-						Some("--public=false") => false,
-						Some(_) => {
-							println!("ERROR: invalid `--public` command format. Valid formats: `--public`, `--public=true` `--public=false`");
-							continue;
+					let (mut announce_channel, mut with_anchors) = (false, false);
+					while let Some(word) = words.next() {
+						match word {
+							"--public" | "--public=true" => announce_channel = true,
+							"--public=false" => announce_channel = false,
+							"--with-anchors" | "--with-anchors=true" => with_anchors = true,
+							"--with-anchors=false" => with_anchors = false,
+							_ => {
+								println!("ERROR: invalid boolean flag format. Valid formats: `--option`, `--option=true` `--option=false`");
+								continue;
+							}
 						}
-						None => false,
-					};
+					}
 
 					if open_channel(
 						pubkey,
 						chan_amt_sat.unwrap(),
 						announce_channel,
+						with_anchors,
 						channel_manager.clone(),
 					)
 					.is_ok()
@@ -455,7 +460,7 @@ fn help() {
 	println!("  help\tShows a list of commands.");
 	println!("  quit\tClose the application.");
 	println!("\n  Channels:");
-	println!("      openchannel pubkey@host:port <amt_satoshis> [--public]");
+	println!("      openchannel pubkey@host:port <amt_satoshis> [--public] [--with-anchors]");
 	println!("      closechannel <channel_id> <peer_pubkey>");
 	println!("      forceclosechannel <channel_id> <peer_pubkey>");
 	println!("      listchannels");
@@ -638,7 +643,7 @@ fn do_disconnect_peer(
 }
 
 fn open_channel(
-	peer_pubkey: PublicKey, channel_amt_sat: u64, announced_channel: bool,
+	peer_pubkey: PublicKey, channel_amt_sat: u64, announced_channel: bool, with_anchors: bool,
 	channel_manager: Arc<ChannelManager>,
 ) -> Result<(), ()> {
 	let config = UserConfig {
@@ -649,6 +654,7 @@ fn open_channel(
 		},
 		channel_handshake_config: ChannelHandshakeConfig {
 			announced_channel,
+			negotiate_anchors_zero_fee_htlc_tx: with_anchors,
 			..Default::default()
 		},
 		..Default::default()