use std::str::FromStr;
use std::sync::Arc;
use std::time::Duration;
-use tokio::sync::mpsc;
pub(crate) struct LdkUserInfo {
pub(crate) bitcoind_rpc_username: String,
keys_manager: Arc<KeysManager>,
router: Arc<NetGraphMsgHandler<Arc<dyn chain::Access + Send + Sync>, Arc<FilesystemLogger>>>,
inbound_payments: PaymentInfoStorage, outbound_payments: PaymentInfoStorage,
- event_notifier: mpsc::Sender<()>, ldk_data_dir: String, logger: Arc<FilesystemLogger>,
- network: Network,
+ ldk_data_dir: String, logger: Arc<FilesystemLogger>, network: Network,
) {
println!("LDK startup successful. To view available commands: \"help\".");
println!("LDK logs are available at <your-supplied-ldk-data-dir-path>/.ldk/logs");
print!("> ");
io::stdout().flush().unwrap(); // Without flushing, the `>` doesn't print
for line in stdin.lock().lines() {
- let _ = event_notifier.try_send(());
let line = line.unwrap();
let mut words = line.split_whitespace();
if let Some(word) = words.next() {
continue;
}
- if connect_peer_if_necessary(
- pubkey,
- peer_addr,
- peer_manager.clone(),
- event_notifier.clone(),
- )
- .await
- .is_err()
+ if connect_peer_if_necessary(pubkey, peer_addr, peer_manager.clone())
+ .await
+ .is_err()
{
print!("> ");
io::stdout().flush().unwrap();
continue;
}
};
- if connect_peer_if_necessary(
- pubkey,
- peer_addr,
- peer_manager.clone(),
- event_notifier.clone(),
- )
- .await
- .is_ok()
+ if connect_peer_if_necessary(pubkey, peer_addr, peer_manager.clone())
+ .await
+ .is_ok()
{
println!("SUCCESS: connected to peer {}", pubkey);
}
}
fn help() {
- println!("openchannel pubkey@host:port <channel_amt_satoshis>");
+ println!("openchannel pubkey@host:port <amt_satoshis>");
println!("sendpayment <invoice>");
- println!("getinvoice <amt_in_millisatoshis>");
+ println!("getinvoice <amt_millisatoshis>");
println!("connectpeer pubkey@host:port");
println!("listchannels");
println!("listpayments");
println!("closechannel <channel_id>");
println!("forceclosechannel <channel_id>");
+ println!("nodeinfo");
+ println!("listpeers");
}
fn node_info(channel_manager: Arc<ChannelManager>, peer_manager: Arc<PeerManager>) {
println!("\t\tavailable_balance_for_recv_msat: {},", chan_info.inbound_capacity_msat);
}
println!("\t\tchannel_can_send_payments: {},", chan_info.is_usable);
+ println!("\t\tpublic: {},", chan_info.is_public);
println!("\t}},");
}
println!("]");
pub(crate) async fn connect_peer_if_necessary(
pubkey: PublicKey, peer_addr: SocketAddr, peer_manager: Arc<PeerManager>,
- event_notifier: mpsc::Sender<()>,
) -> Result<(), ()> {
for node_pubkey in peer_manager.get_peer_node_ids() {
if node_pubkey == pubkey {
return Ok(());
}
}
- match lightning_net_tokio::connect_outbound(
- Arc::clone(&peer_manager),
- event_notifier,
- pubkey,
- peer_addr,
- )
- .await
+ match lightning_net_tokio::connect_outbound(Arc::clone(&peer_manager), pubkey, peer_addr).await
{
Some(conn_closed_fut) => {
let mut closed_fut_box = Box::pin(conn_closed_fut);
}
// lnd's max to_self_delay is 2016, so we want to be compatible.
config.peer_channel_config_limits.their_to_self_delay = 2016;
- match channel_manager.create_channel(peer_pubkey, channel_amt_sat, 0, 0, None) {
+ match channel_manager.create_channel(peer_pubkey, channel_amt_sat, 0, 0, Some(config)) {
Ok(_) => {
println!("EVENT: initiated channel with peer {}. ", peer_pubkey);
return Ok(());
if peer_addr_str.is_none() || peer_addr_str.is_none() {
return Err(std::io::Error::new(
std::io::ErrorKind::Other,
- "ERROR: incorrectly formatted peer
- info. Should be formatted as: `pubkey@host:port`",
+ "ERROR: incorrectly formatted peer info. Should be formatted as: `pubkey@host:port`",
));
}