use lightning::util::persist::KVStore;
use lightning::util::ser::{Writeable, Writer};
use lightning_invoice::payment::payment_parameters_from_invoice;
+use lightning_invoice::payment::payment_parameters_from_zero_amount_invoice;
use lightning_invoice::{utils, Bolt11Invoice, Currency};
use lightning_persister::fs_store::FilesystemStore;
use std::env;
Err(e) => {
println!("{:?}", e.into_inner().unwrap());
continue;
- }
+ },
};
let chan_amt_sat: Result<u64, _> = channel_value_sat.unwrap().parse();
_ => {
println!("ERROR: invalid boolean flag format. Valid formats: `--option`, `--option=true` `--option=false`");
continue;
- }
+ },
}
}
peer_pubkey_and_ip_addr,
);
}
- }
+ },
"sendpayment" => {
let invoice_str = words.next();
if invoice_str.is_none() {
continue;
}
+ let mut user_provided_amt: Option<u64> = None;
+ if let Some(amt_msat_str) = words.next() {
+ match amt_msat_str.parse() {
+ Ok(amt) => user_provided_amt = Some(amt),
+ Err(e) => {
+ println!("ERROR: couldn't parse amount_msat: {}", e);
+ continue;
+ },
+ };
+ }
+
if let Ok(offer) = Offer::from_str(invoice_str.unwrap()) {
- let offer_hash = Sha256::hash(invoice_str.unwrap().as_bytes());
- let payment_id = PaymentId(*offer_hash.as_ref());
-
- let amt_msat =
- match offer.amount() {
- Some(offer::Amount::Bitcoin { amount_msats }) => *amount_msats,
- amt => {
- println!("ERROR: Cannot process non-Bitcoin-denominated offer value {:?}", amt);
- continue;
- }
- };
-
- loop {
+ let random_bytes = keys_manager.get_secure_random_bytes();
+ let payment_id = PaymentId(random_bytes);
+
+ let amt_msat = match (offer.amount(), user_provided_amt) {
+ (Some(offer::Amount::Bitcoin { amount_msats }), _) => *amount_msats,
+ (_, Some(amt)) => amt,
+ (amt, _) => {
+ println!("ERROR: Cannot process non-Bitcoin-denominated offer value {:?}", amt);
+ continue;
+ },
+ };
+ if user_provided_amt.is_some() && user_provided_amt != Some(amt_msat) {
+ println!("Amount didn't match offer of {}msat", amt_msat);
+ continue;
+ }
+
+ while user_provided_amt.is_none() {
print!("Paying offer for {} msat. Continue (Y/N)? >", amt_msat);
io::stdout().flush().unwrap();
.unwrap();
let retry = Retry::Timeout(Duration::from_secs(10));
+ let amt = Some(amt_msat);
let pay = channel_manager
- .pay_for_offer(&offer, None, None, None, payment_id, retry, None);
+ .pay_for_offer(&offer, None, amt, None, payment_id, retry, None);
if pay.is_err() {
println!("ERROR: Failed to pay: {:?}", pay);
}
Ok(invoice) => send_payment(
&channel_manager,
&invoice,
+ user_provided_amt,
&mut outbound_payments.lock().unwrap(),
Arc::clone(&fs_store),
),
Err(e) => {
println!("ERROR: invalid invoice: {:?}", e);
- }
+ },
}
}
- }
+ },
"keysend" => {
let dest_pubkey = match words.next() {
Some(dest) => match hex_utils::to_compressed_pubkey(dest) {
None => {
println!("ERROR: couldn't parse destination pubkey");
continue;
- }
+ },
},
None => {
println!("ERROR: keysend requires a destination pubkey: `keysend <dest_pubkey> <amt_msat>`");
continue;
- }
+ },
};
let amt_msat_str = match words.next() {
Some(amt) => amt,
None => {
println!("ERROR: keysend requires an amount in millisatoshis: `keysend <dest_pubkey> <amt_msat>`");
continue;
- }
+ },
};
let amt_msat: u64 = match amt_msat_str.parse() {
Ok(amt) => amt,
Err(e) => {
println!("ERROR: couldn't parse amount_msat: {}", e);
continue;
- }
+ },
};
keysend(
&channel_manager,
&mut outbound_payments.lock().unwrap(),
Arc::clone(&fs_store),
);
- }
+ },
"getoffer" => {
let offer_builder = channel_manager.create_offer_builder(String::new());
if let Err(e) = offer_builder {
// correspond with individual payments.
println!("{}", offer.unwrap());
}
- }
+ },
"getinvoice" => {
let amt_str = words.next();
if amt_str.is_none() {
fs_store
.write("", "", INBOUND_PAYMENTS_FNAME, &inbound_payments.encode())
.unwrap();
- }
+ },
"connectpeer" => {
let peer_pubkey_and_ip_addr = words.next();
if peer_pubkey_and_ip_addr.is_none() {
Err(e) => {
println!("{:?}", e.into_inner().unwrap());
continue;
- }
+ },
};
if tokio::runtime::Handle::current()
.block_on(connect_peer_if_necessary(
{
println!("SUCCESS: connected to peer {}", pubkey);
}
- }
+ },
"disconnectpeer" => {
let peer_pubkey = words.next();
if peer_pubkey.is_none() {
Err(e) => {
println!("ERROR: {}", e.to_string());
continue;
- }
+ },
};
if do_disconnect_peer(
{
println!("SUCCESS: disconnected from peer {}", peer_pubkey);
}
- }
+ },
"listchannels" => list_channels(&channel_manager, &network_graph),
"listpayments" => list_payments(
&inbound_payments.lock().unwrap(),
None => {
println!("ERROR: couldn't parse peer_pubkey");
continue;
- }
+ },
};
let peer_pubkey = match PublicKey::from_slice(&peer_pubkey_vec) {
Ok(peer_pubkey) => peer_pubkey,
Err(_) => {
println!("ERROR: couldn't parse peer_pubkey");
continue;
- }
+ },
};
close_channel(channel_id, peer_pubkey, channel_manager.clone());
- }
+ },
"forceclosechannel" => {
let channel_id_str = words.next();
if channel_id_str.is_none() {
None => {
println!("ERROR: couldn't parse peer_pubkey");
continue;
- }
+ },
};
let peer_pubkey = match PublicKey::from_slice(&peer_pubkey_vec) {
Ok(peer_pubkey) => peer_pubkey,
Err(_) => {
println!("ERROR: couldn't parse peer_pubkey");
continue;
- }
+ },
};
force_close_channel(channel_id, peer_pubkey, channel_manager.clone());
- }
+ },
"nodeinfo" => node_info(&channel_manager, &peer_manager),
"listpeers" => list_peers(peer_manager.clone()),
"signmessage" => {
&keys_manager.get_node_secret_key()
)
);
- }
+ },
"sendonionmessage" => {
let path_pks_str = words.next();
if path_pks_str.is_none() {
println!("ERROR: couldn't parse peer_pubkey");
errored = true;
break;
- }
+ },
};
let node_pubkey = match PublicKey::from_slice(&node_pubkey_vec) {
Ok(peer_pubkey) => peer_pubkey,
println!("ERROR: couldn't parse peer_pubkey");
errored = true;
break;
- }
+ },
};
intermediate_nodes.push(node_pubkey);
}
_ => {
println!("Need an integral message type above 64");
continue;
- }
+ },
};
let data = match words.next().map(|s| hex_utils::to_vec(s)) {
Some(Some(data)) => data,
_ => {
println!("Need a hex data string");
continue;
- }
+ },
};
let destination = Destination::Node(intermediate_nodes.pop().unwrap());
match onion_messenger.send_onion_message(
) {
Ok(success) => {
println!("SUCCESS: forwarded onion message to first hop {:?}", success)
- }
+ },
Err(e) => println!("ERROR: failed to send onion message: {:?}", e),
}
- }
+ },
"quit" | "exit" => break,
_ => println!("Unknown command. See `\"help\" for available commands."),
}
println!(" disconnectpeer <peer_pubkey>");
println!(" listpeers");
println!("\n Payments:");
- println!(" sendpayment <invoice|offer>");
+ println!(" sendpayment <invoice|offer> [<amount_msat>]");
println!(" keysend <dest_pubkey> <amt_msats>");
println!(" listpayments");
println!("\n Invoices:");
return Ok(());
}
}
- }
+ },
None => Err(()),
}
}
Ok(_) => {
println!("EVENT: initiated channel with peer {}. ", peer_pubkey);
return Ok(());
- }
+ },
Err(e) => {
println!("ERROR: failed to open channel: {:?}", e);
return Err(());
- }
+ },
}
}
fn send_payment(
- channel_manager: &ChannelManager, invoice: &Bolt11Invoice,
+ channel_manager: &ChannelManager, invoice: &Bolt11Invoice, required_amount_msat: Option<u64>,
outbound_payments: &mut OutboundPaymentInfoStorage, fs_store: Arc<FilesystemStore>,
) {
let payment_id = PaymentId((*invoice.payment_hash()).to_byte_array());
let payment_secret = Some(*invoice.payment_secret());
- let (payment_hash, recipient_onion, route_params) =
- match payment_parameters_from_invoice(invoice) {
- Ok(res) => res,
- Err(e) => {
- println!("Failed to parse invoice");
- print!("> ");
- return;
- }
- };
+ let zero_amt_invoice =
+ invoice.amount_milli_satoshis().is_none() || invoice.amount_milli_satoshis() == Some(0);
+ let pay_params_opt = if zero_amt_invoice {
+ if let Some(amt_msat) = required_amount_msat {
+ payment_parameters_from_zero_amount_invoice(invoice, amt_msat)
+ } else {
+ println!("Need an amount for the given 0-value invoice");
+ print!("> ");
+ return;
+ }
+ } else {
+ if required_amount_msat.is_some() && invoice.amount_milli_satoshis() != required_amount_msat
+ {
+ println!(
+ "Amount didn't match invoice value of {}msat",
+ invoice.amount_milli_satoshis().unwrap_or(0)
+ );
+ print!("> ");
+ return;
+ }
+ payment_parameters_from_invoice(invoice)
+ };
+ let (payment_hash, recipient_onion, route_params) = match pay_params_opt {
+ Ok(res) => res,
+ Err(e) => {
+ println!("Failed to parse invoice: {:?}", e);
+ print!("> ");
+ return;
+ },
+ };
outbound_payments.payments.insert(
payment_id,
PaymentInfo {
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_id).unwrap().status = HTLCStatus::Failed;
fs_store.write("", "", OUTBOUND_PAYMENTS_FNAME, &outbound_payments.encode()).unwrap();
- }
+ },
};
}
Ok(_payment_hash) => {
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_id).unwrap().status = HTLCStatus::Failed;
fs_store.write("", "", OUTBOUND_PAYMENTS_FNAME, &outbound_payments.encode()).unwrap();
- }
+ },
};
}
Ok(inv) => {
println!("SUCCESS: generated invoice: {}", inv);
inv
- }
+ },
Err(e) => {
println!("ERROR: failed to create invoice: {:?}", e);
return;
- }
+ },
};
let payment_hash = PaymentHash(invoice.payment_hash().to_byte_array());
projects / ldk-sample / blobdiff