From c3ed7ce32015e718f87d2a018eabddfb5fa4599b Mon Sep 17 00:00:00 2001 From: Valentine Wallace Date: Fri, 11 Jun 2021 15:33:11 -0400 Subject: [PATCH] Update to RL upstream 0.0.98 --- Cargo.lock | 24 ++++++++++++------------ Cargo.toml | 12 ++++++------ src/cli.rs | 12 ++++-------- 3 files changed, 22 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 37e41e6..abb8455 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -256,16 +256,16 @@ checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c" [[package]] name = "lightning" -version = "0.0.14" -source = "git+https://github.com/rust-bitcoin/rust-lightning?branch=main#499d84c165426b6f05bb414f5a49a7423eb9e0c5" +version = "0.0.98" +source = "git+https://github.com/rust-bitcoin/rust-lightning?branch=main#294009969aef617df4184ff41ef6daa5a445f213" dependencies = [ "bitcoin", ] [[package]] name = "lightning-background-processor" -version = "0.0.14" -source = "git+https://github.com/rust-bitcoin/rust-lightning?branch=main#499d84c165426b6f05bb414f5a49a7423eb9e0c5" +version = "0.0.98" +source = "git+https://github.com/rust-bitcoin/rust-lightning?branch=main#294009969aef617df4184ff41ef6daa5a445f213" dependencies = [ "bitcoin", "lightning", @@ -274,8 +274,8 @@ dependencies = [ [[package]] name = "lightning-block-sync" -version = "0.0.14" -source = "git+https://github.com/rust-bitcoin/rust-lightning?branch=main#499d84c165426b6f05bb414f5a49a7423eb9e0c5" +version = "0.0.98" +source = "git+https://github.com/rust-bitcoin/rust-lightning?branch=main#294009969aef617df4184ff41ef6daa5a445f213" dependencies = [ "bitcoin", "chunked_transfer", @@ -287,8 +287,8 @@ dependencies = [ [[package]] name = "lightning-invoice" -version = "0.5.0" -source = "git+https://github.com/rust-bitcoin/rust-lightning?branch=main#499d84c165426b6f05bb414f5a49a7423eb9e0c5" +version = "0.6.0" +source = "git+https://github.com/rust-bitcoin/rust-lightning?branch=main#294009969aef617df4184ff41ef6daa5a445f213" dependencies = [ "bech32 0.7.2", "bitcoin_hashes", @@ -299,8 +299,8 @@ dependencies = [ [[package]] name = "lightning-net-tokio" -version = "0.0.14" -source = "git+https://github.com/rust-bitcoin/rust-lightning?branch=main#499d84c165426b6f05bb414f5a49a7423eb9e0c5" +version = "0.0.98" +source = "git+https://github.com/rust-bitcoin/rust-lightning?branch=main#294009969aef617df4184ff41ef6daa5a445f213" dependencies = [ "bitcoin", "lightning", @@ -309,8 +309,8 @@ dependencies = [ [[package]] name = "lightning-persister" -version = "0.0.14" -source = "git+https://github.com/rust-bitcoin/rust-lightning?branch=main#499d84c165426b6f05bb414f5a49a7423eb9e0c5" +version = "0.0.98" +source = "git+https://github.com/rust-bitcoin/rust-lightning?branch=main#294009969aef617df4184ff41ef6daa5a445f213" dependencies = [ "bitcoin", "libc", diff --git a/Cargo.toml b/Cargo.toml index 2ae52ea..9b4fd9c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,12 +8,12 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -lightning = { version = "0.0.14", git = "https://github.com/rust-bitcoin/rust-lightning", branch = "main" } -lightning-block-sync = { version = "0.0.14", git = "https://github.com/rust-bitcoin/rust-lightning", branch = "main", features = [ "rpc-client" ] } -lightning-invoice = { version = "0.5", git = "https://github.com/rust-bitcoin/rust-lightning", branch = "main" } -lightning-net-tokio = { version = "0.0.14", git = "https://github.com/rust-bitcoin/rust-lightning", branch = "main" } -lightning-persister = { version = "0.0.14", git = "https://github.com/rust-bitcoin/rust-lightning", branch = "main" } -lightning-background-processor = { version = "0.0.14", git = "https://github.com/rust-bitcoin/rust-lightning", branch = "main" } +lightning = { version = "0.0.98", git = "https://github.com/rust-bitcoin/rust-lightning", branch = "main" } +lightning-block-sync = { version = "0.0.98", git = "https://github.com/rust-bitcoin/rust-lightning", branch = "main", features = [ "rpc-client" ] } +lightning-invoice = { version = "0.6", git = "https://github.com/rust-bitcoin/rust-lightning", branch = "main" } +lightning-net-tokio = { version = "0.0.98", git = "https://github.com/rust-bitcoin/rust-lightning", branch = "main" } +lightning-persister = { version = "0.0.98", git = "https://github.com/rust-bitcoin/rust-lightning", branch = "main" } +lightning-background-processor = { version = "0.0.98", git = "https://github.com/rust-bitcoin/rust-lightning", branch = "main" } base64 = "0.13.0" bitcoin = "0.26" diff --git a/src/cli.rs b/src/cli.rs index 5d778e8..7e122c3 100644 --- a/src/cli.rs +++ b/src/cli.rs @@ -13,7 +13,7 @@ use lightning::ln::msgs::NetAddress; use lightning::ln::{PaymentHash, PaymentSecret}; use lightning::routing::network_graph::NetGraphMsgHandler; use lightning::routing::router; -use lightning::routing::router::RouteHintHop; +use lightning::routing::router::RouteHint; use lightning::util::config::UserConfig; use lightning_invoice::{utils, Currency, Invoice}; use std::env; @@ -227,11 +227,7 @@ pub(crate) async fn poll_for_user_input( continue; } }; - let mut route_hints = invoice.routes().clone(); - let mut last_hops = Vec::new(); - for hint in route_hints.drain(..) { - last_hops.push(hint[hint.len() - 1].clone()); - } + let last_hops = invoice.route_hints(); let amt_pico_btc = invoice.amount_pico_btc(); if amt_pico_btc.is_none() { @@ -541,7 +537,7 @@ fn open_channel( fn send_payment( payee: PublicKey, amt_msat: u64, final_cltv: u32, payment_hash: PaymentHash, payment_secret: Option, payee_features: Option, - route_hints: Vec, + route_hints: Vec<&RouteHint>, router: Arc, Arc>>, channel_manager: Arc, payment_storage: PaymentInfoStorage, logger: Arc, @@ -556,7 +552,7 @@ fn send_payment( &payee, payee_features, Some(&first_hops.iter().collect::>()), - &route_hints.iter().collect::>(), + &route_hints, amt_msat, final_cltv, logger, -- 2.39.5