diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c837b6..099421d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,21 @@ Change Log ========== +v0.1.0-alpha.4 +-------------- + +- Daemon management with LNPd +- Connection initialisation cycle +- Much better reporting in console tool +- Completed set of command-line management & information commands +- Improved channel creation lifecycle +- Multiple improvements to debugging information representation + v0.1.0-alpha.3 -------------- - Channel negotiation between nodes -- Reworked service buses +- Reworked service buses; added inter-daemon routing - Separated general service runtime functionality v0.1.0-alpha.2 diff --git a/Cargo.lock b/Cargo.lock index fb8dc15..cb7e749 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -876,7 +876,8 @@ checksum = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614" [[package]] name = "lightning-invoice" version = "0.3.0" -source = "git+git://github.com/LNP-BP/rust-lightning-invoice?branch=fix/error#fb82978b39e2d237be9d7caabc594ae427598b3a" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e0a8e3f3dcb1bf88550e6d2cc2b831779f8f4f7b2462573c2be0a1b28a59e82" dependencies = [ "bech32", "bitcoin_hashes 0.7.6", @@ -902,7 +903,7 @@ checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a" [[package]] name = "lnp_node" -version = "0.1.0-alpha.3" +version = "0.1.0-alpha.4" dependencies = [ "amplify", "amplify_derive", @@ -940,7 +941,8 @@ dependencies = [ [[package]] name = "lnpbp" version = "0.2.0-beta.1" -source = "git+git://github.com/LNP-BP/rust-lnpbp#d05e9b3bf01b23ecb66066a08deabf15116a3a48" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95dee9e61c3d20c401ede8d5c32e865a2cdbf4687a3ef20ffc29d8d3a93e2cd3" dependencies = [ "amplify", "amplify_derive", @@ -971,7 +973,8 @@ dependencies = [ [[package]] name = "lnpbp_derive" version = "0.2.0-beta.1" -source = "git+git://github.com/LNP-BP/rust-lnpbp#d05e9b3bf01b23ecb66066a08deabf15116a3a48" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "280d91ec1ed2a26f8307380647d97e861b3a6f1d72accc0e55b7f64ff11d7c73" dependencies = [ "amplify", "quote 1.0.7", @@ -981,7 +984,8 @@ dependencies = [ [[package]] name = "lnpbp_services" version = "0.2.0-beta.1" -source = "git+git://github.com/LNP-BP/rust-lnpbp#d05e9b3bf01b23ecb66066a08deabf15116a3a48" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f6c0525cdbde2d99de5817ebfd0daaed28cbaa656b997ea17aaebd0d7aacd2e" dependencies = [ "amplify", "amplify_derive", diff --git a/Cargo.toml b/Cargo.toml index 374cc3b..e616a3b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "lnp_node" description = "LNP node" -version = "0.1.0-alpha.3" +version = "0.1.0-alpha.4" authors = ["Dr. Maxim Orlovsky "] license = "MIT" keywords = ["bitcoin", "node", "lightning-network", "smart-contracts", "rgb"] @@ -37,9 +37,9 @@ required-features = ["cli"] # LNP/BP crates amplify = "~2.2.1" amplify_derive = "~2.2.2" -lnpbp = { git = "git://github.com/LNP-BP/rust-lnpbp", features = ["lnp", "url", "websockets"] } -lnpbp_derive = { git = "git://github.com/LNP-BP/rust-lnpbp" } -lnpbp_services = { git = "git://github.com/LNP-BP/rust-lnpbp" } +lnpbp = { version = "~0.2.0-beta.1", features = ["lnp", "url", "websockets"] } +lnpbp_derive = "=0.2.0-beta.1" +lnpbp_services = "=0.2.0-beta.1" lazy_static = "~1.4.0" # Rust language nix = { version = "~0.19.0", optional = true } @@ -73,8 +73,8 @@ zmq = { version = "~0.9.2", optional = true } [build-dependencies] amplify = "~2.2.1" amplify_derive = "~2.2.2" -lnpbp = { git = "git://github.com/LNP-BP/rust-lnpbp", features = ["lnp", "url", "websockets"] } -lnpbp_services = { git = "git://github.com/LNP-BP/rust-lnpbp" } +lnpbp = { version = "=0.2.0-beta.1", features = ["lnp", "url", "websockets"] } +lnpbp_services = "=0.2.0-beta.1" clap = "=3.0.0-beta.2" clap_generate = "=3.0.0-beta.2" log = { version = "~0.4.8", features = ["max_level_trace", "release_max_level_debug"] } @@ -86,11 +86,6 @@ configure_me_codegen = "~0.3.14" # Remove this once https://github.com/jean-airoldie/zeromq-src-rs/pull/15 got merged # zeromq-src = { git = "https://github.com/LNP-BP/zeromq-src-rs", branch = "fix/cmake" } -# This fixing Display implementation for ParseOrSemanticError and must be -# removed once the corresponding PR will be merged: -# -lightning-invoice = { git = "git://github.com/LNP-BP/rust-lightning-invoice", branch = "fix/error" } - # Recommended set of features: # 1. Standalone node: `server` (=`node`+`shell`) # 2. Cli to remote node: `cli` (auto includes `shell` and `integration`) diff --git a/src/cli/opts.rs b/src/cli/opts.rs index 9065c69..3d5afad 100644 --- a/src/cli/opts.rs +++ b/src/cli/opts.rs @@ -16,7 +16,7 @@ use clap::{AppSettings, Clap}; use std::net::IpAddr; use std::str::FromStr; -use lnpbp::lnp::{ChannelId, FramingProtocol, Invoice, PartialNodeAddr}; +use lnpbp::lnp::{ChannelId, FramingProtocol, PartialNodeAddr}; /// Command-line tool for working with LNP node #[derive(Clap, Clone, PartialEq, Eq, Debug)] @@ -140,7 +140,9 @@ pub enum Command { Pay { /// Invoice bech32 string #[clap()] - invoice: Invoice, + // TODO: Replace with `Invoice` type once our fix will get merged: + // <> + invoice: String, /// Channel from which the payment should happen #[clap()]