Switch to the new closing_signed negotiation branch

diff --git a/Cargo.lock b/Cargo.lock
index 15fb18a44b19e43deea62beacc18d039ab3cac2a..05909c5b4b2604e5495567aeb2ec04c7652a532e 100644 (file)
--- 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 e71926de14a8c893fc91e44d399ea45e747bcb4b..e04429208722a2ce8a0dd309711a697ce231f0b3 100644 (file)
--- 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 d4d7e9ed4263079d84f3e3e42d1efc269f8f5404..33399b9b5bc66446bdc421e494f2c2337ca97e59 100644 (file)
--- 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<ChannelManager>) {
-       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),
        }