[wip] jit channels

Cargo.toml

@@ -8,13 +8,14 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-lightning = { version = "0.0.115", features = ["max_level_trace"] }
-lightning-block-sync = { version = "0.0.115", features = [ "rpc-client" ] }
-lightning-invoice = { version = "0.23" }
-lightning-net-tokio = { version = "0.0.115" }
-lightning-persister = { version = "0.0.115" }
-lightning-background-processor = { version = "0.0.115", features = [ "futures" ] }
-lightning-rapid-gossip-sync = { version = "0.0.115" }
+lightning = { git = "https://github.com/lightningdevkit/rust-lightning.git", rev = "498f2331459d8031031ef151a44c90d700aa8c7e", features = ["max_level_trace"] }
+lightning-block-sync = { git = "https://github.com/lightningdevkit/rust-lightning.git", rev = "498f2331459d8031031ef151a44c90d700aa8c7e", features = [ "rpc-client" ] }
+lightning-invoice = { git = "https://github.com/lightningdevkit/rust-lightning.git", rev = "498f2331459d8031031ef151a44c90d700aa8c7e" }
+lightning-net-tokio = { git = "https://github.com/lightningdevkit/rust-lightning.git", rev = "498f2331459d8031031ef151a44c90d700aa8c7e" }
+lightning-persister = { git = "https://github.com/lightningdevkit/rust-lightning.git", rev = "498f2331459d8031031ef151a44c90d700aa8c7e" }
+lightning-background-processor = { git = "https://github.com/lightningdevkit/rust-lightning.git", rev = "498f2331459d8031031ef151a44c90d700aa8c7e", features = [ "futures" ] }
+lightning-rapid-gossip-sync = { git = "https://github.com/lightningdevkit/rust-lightning.git", rev = "498f2331459d8031031ef151a44c90d700aa8c7e" }
+ldk-lsp-client = { git = "https://github.com/johncantrell97/ldk-lsp-client", rev = "a7313e645c46a79c3ff91dab228a9f98790263c6" }
 
 base64 = "0.13.0"
 bitcoin = "0.29.0"

src/cli.rs

@@ -1,3 +1,4 @@
+use crate::SampleLiquidityManager;
 use crate::disk;
 use crate::hex_utils;
 use crate::{
@@ -8,7 +9,8 @@ use bitcoin::hashes::sha256::Hash as Sha256;
 use bitcoin::hashes::Hash;
 use bitcoin::network::constants::Network;
 use bitcoin::secp256k1::PublicKey;
-use lightning::chain::keysinterface::{EntropySource, KeysManager};
+use ldk_lsp_client::LiquidityManager;
+use lightning::sign::{EntropySource, KeysManager};
 use lightning::ln::channelmanager::{PaymentId, RecipientOnionFields, Retry};
 use lightning::ln::msgs::NetAddress;
 use lightning::ln::{PaymentHash, PaymentPreimage};
@@ -63,7 +65,7 @@ pub(crate) async fn poll_for_user_input(
 	keys_manager: Arc<KeysManager>, network_graph: Arc<NetworkGraph>,
 	onion_messenger: Arc<OnionMessenger>, inbound_payments: PaymentInfoStorage,
 	outbound_payments: PaymentInfoStorage, ldk_data_dir: String, network: Network,
-	logger: Arc<disk::FilesystemLogger>,
+	logger: Arc<disk::FilesystemLogger>, liquidity_manager: Arc<SampleLiquidityManager>,
 ) {
 	println!(
 		"LDK startup successful. Enter \"help\" to view available commands. Press Ctrl-D to quit."
@@ -87,6 +89,45 @@ pub(crate) async fn poll_for_user_input(
 		if let Some(word) = words.next() {
 			match word {
 				"help" => help(),
+				"getjitchannelinvoice" => {
+					let peer_pubkey_and_ip_addr = words.next();
+
+					if peer_pubkey_and_ip_addr.is_none() {
+						println!("ERROR: getjitchannelinvoice has 1 required argument: `getjitchannelinvoice pubkey@host:port [payment_amount_msat]`");
+						continue;
+					}
+					let peer_pubkey_and_ip_addr = peer_pubkey_and_ip_addr.unwrap();
+					let (pubkey, peer_addr) =
+						match parse_peer_info(peer_pubkey_and_ip_addr.to_string()) {
+							Ok(info) => info,
+							Err(e) => {
+								println!("{:?}", e.into_inner().unwrap());
+								continue;
+							}
+						};
+
+					if connect_peer_if_necessary(pubkey, peer_addr, peer_manager.clone())
+						.await
+						.is_err()
+					{
+						continue;
+					};
+
+					let mut payment_amount_msat = None;
+
+					if let Some(n) = words.next() {
+						let n: Result<u64, _> = n.parse();
+						if n.is_err() {
+							println!("ERROR: payment_amount_msat must be a number");
+							continue;
+						}
+						payment_amount_msat = Some(n.unwrap());
+					}
+
+					if let Err(e) = liquidity_manager.create_invoice(pubkey, payment_amount_msat, None, 0) {
+						println!("{:?}", e);
+					}
+				}
 				"openchannel" => {
 					let peer_pubkey_and_ip_addr = words.next();
 					let channel_value_sat = words.next();

src/disk.rs

@@ -2,7 +2,7 @@ use crate::{cli, NetworkGraph};
 use bitcoin::secp256k1::PublicKey;
 use bitcoin::Network;
 use chrono::Utc;
-use lightning::routing::scoring::{ProbabilisticScorer, ProbabilisticScoringParameters};
+use lightning::routing::scoring::{ProbabilisticScorer, ProbabilisticScoringDecayParameters};
 use lightning::util::logger::{Logger, Record};
 use lightning::util::ser::{ReadableArgs, Writer};
 use std::collections::HashMap;
@@ -86,9 +86,9 @@ pub(crate) fn read_network(
 pub(crate) fn read_scorer(
 	path: &Path, graph: Arc<NetworkGraph>, logger: Arc<FilesystemLogger>,
 ) -> ProbabilisticScorer<Arc<NetworkGraph>, Arc<FilesystemLogger>> {
-	let params = ProbabilisticScoringParameters::default();
+	let params = ProbabilisticScoringDecayParameters::default();
 	if let Ok(file) = File::open(path) {
-		let args = (params.clone(), Arc::clone(&graph), Arc::clone(&logger));
+		let args = (params, Arc::clone(&graph), Arc::clone(&logger));
 		if let Ok(scorer) = ProbabilisticScorer::read(&mut BufReader::new(file), args) {
 			return scorer;
 		}