From b2b584c05d9c323349b44753e49815d137741e93 Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Fri, 13 Aug 2021 19:35:15 +0000 Subject: [PATCH] Switch to the new closing_signed negotiation branch --- Cargo.lock | 14 ++++++-------- Cargo.toml | 12 ++++++------ src/cli.rs | 2 +- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 15fb18a..05909c5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,7 +1,5 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 - [[package]] name = "autocfg" version = "1.0.1" @@ -252,7 +250,7 @@ checksum = "a7f823d141fe0a24df1e23b4af4e3c7ba9e5966ec514ea068c93024aa7deb765" [[package]] name = "lightning" version = "0.0.99" -source = "git+https://github.com/rust-bitcoin/rust-lightning?branch=main#9d8d24f6906d6fbdc6c02a88e5e2298c1fa50825" +source = "git+https://git.bitcoin.ninja/rust-lightning?branch=2021-07-new-closing-fee#9425aadbb574a1f4b08e3e2929676b45c99b3c69" dependencies = [ "bitcoin", "secp256k1", @@ -261,7 +259,7 @@ dependencies = [ [[package]] name = "lightning-background-processor" version = "0.0.99" -source = "git+https://github.com/rust-bitcoin/rust-lightning?branch=main#9d8d24f6906d6fbdc6c02a88e5e2298c1fa50825" +source = "git+https://git.bitcoin.ninja/rust-lightning?branch=2021-07-new-closing-fee#9425aadbb574a1f4b08e3e2929676b45c99b3c69" dependencies = [ "bitcoin", "lightning", @@ -271,7 +269,7 @@ dependencies = [ [[package]] name = "lightning-block-sync" version = "0.0.99" -source = "git+https://github.com/rust-bitcoin/rust-lightning?branch=main#9d8d24f6906d6fbdc6c02a88e5e2298c1fa50825" +source = "git+https://git.bitcoin.ninja/rust-lightning?branch=2021-07-new-closing-fee#9425aadbb574a1f4b08e3e2929676b45c99b3c69" dependencies = [ "bitcoin", "chunked_transfer", @@ -284,7 +282,7 @@ dependencies = [ [[package]] name = "lightning-invoice" version = "0.7.0" -source = "git+https://github.com/rust-bitcoin/rust-lightning?branch=main#9d8d24f6906d6fbdc6c02a88e5e2298c1fa50825" +source = "git+https://git.bitcoin.ninja/rust-lightning?branch=2021-07-new-closing-fee#9425aadbb574a1f4b08e3e2929676b45c99b3c69" dependencies = [ "bech32", "bitcoin_hashes", @@ -296,7 +294,7 @@ dependencies = [ [[package]] name = "lightning-net-tokio" version = "0.0.99" -source = "git+https://github.com/rust-bitcoin/rust-lightning?branch=main#9d8d24f6906d6fbdc6c02a88e5e2298c1fa50825" +source = "git+https://git.bitcoin.ninja/rust-lightning?branch=2021-07-new-closing-fee#9425aadbb574a1f4b08e3e2929676b45c99b3c69" dependencies = [ "bitcoin", "lightning", @@ -306,7 +304,7 @@ dependencies = [ [[package]] name = "lightning-persister" version = "0.0.99" -source = "git+https://github.com/rust-bitcoin/rust-lightning?branch=main#9d8d24f6906d6fbdc6c02a88e5e2298c1fa50825" +source = "git+https://git.bitcoin.ninja/rust-lightning?branch=2021-07-new-closing-fee#9425aadbb574a1f4b08e3e2929676b45c99b3c69" dependencies = [ "bitcoin", "libc", diff --git a/Cargo.toml b/Cargo.toml index e71926d..e044292 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.99", git = "https://github.com/rust-bitcoin/rust-lightning", branch = "main" } -lightning-block-sync = { version = "0.0.99", git = "https://github.com/rust-bitcoin/rust-lightning", branch = "main", features = [ "rpc-client" ] } -lightning-invoice = { version = "0.7", git = "https://github.com/rust-bitcoin/rust-lightning", branch = "main" } -lightning-net-tokio = { version = "0.0.99", git = "https://github.com/rust-bitcoin/rust-lightning", branch = "main" } -lightning-persister = { version = "0.0.99", git = "https://github.com/rust-bitcoin/rust-lightning", branch = "main" } -lightning-background-processor = { version = "0.0.99", git = "https://github.com/rust-bitcoin/rust-lightning", branch = "main" } +lightning = { version = "0.0.99", git = "https://git.bitcoin.ninja/rust-lightning", branch = "2021-07-new-closing-fee" } +lightning-block-sync = { version = "0.0.99", git = "https://git.bitcoin.ninja/rust-lightning", branch = "2021-07-new-closing-fee", features = [ "rpc-client" ] } +lightning-invoice = { version = "0.7", git = "https://git.bitcoin.ninja/rust-lightning", branch = "2021-07-new-closing-fee" } +lightning-net-tokio = { version = "0.0.99", git = "https://git.bitcoin.ninja/rust-lightning", branch = "2021-07-new-closing-fee" } +lightning-persister = { version = "0.0.99", git = "https://git.bitcoin.ninja/rust-lightning", branch = "2021-07-new-closing-fee" } +lightning-background-processor = { version = "0.0.99", git = "https://git.bitcoin.ninja/rust-lightning", branch = "2021-07-new-closing-fee" } base64 = "0.13.0" bitcoin = "0.27" diff --git a/src/cli.rs b/src/cli.rs index d4d7e9e..33399b9 100644 --- a/src/cli.rs +++ b/src/cli.rs @@ -712,7 +712,7 @@ fn get_invoice( } fn close_channel(channel_id: [u8; 32], channel_manager: Arc) { - match channel_manager.close_channel(&channel_id) { + match channel_manager.close_channel(&channel_id, None) { Ok(()) => println!("EVENT: initiating channel close"), Err(e) => println!("ERROR: failed to close channel: {:?}", e), } -- 2.39.5