From 318f784facf808d9b058d834ca1e457c4e97f85f Mon Sep 17 00:00:00 2001 From: Dr Maxim Orlovsky Date: Wed, 16 Dec 2020 12:44:08 +0100 Subject: [PATCH] Modernizing for LNP/BP Core v0.2 release & RGB Node v0.2 RC --- CHANGELOG.md | 6 +++ Cargo.lock | 107 +++++++++++++++++++++++++++++++++++++++++---------- Cargo.toml | 40 +++++++++---------- 3 files changed, 113 insertions(+), 40 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e59cc9..8f55e79 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ Change Log ========== +v0.1.0-beta.2 +------------- +- Fix balances consistency in channeld +- README & build instructions improvements +- Modernizing for LNP/BP Core v0.2 release & RGB Node v0.2 RC + v0.1.0-beta.1 -------------- diff --git a/Cargo.lock b/Cargo.lock index 96f9d06..d920b36 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -26,9 +26,9 @@ dependencies = [ [[package]] name = "amplify" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80882ca8de5dc61f5d6e14788b4c2f65ff0c49527db001817b16ef84c75449a2" +checksum = "90a05a371d467d56ccd699e6f5d412a3e82b09e2a1856fc64124e7a51813ca2b" dependencies = [ "amplify_derive", "ed25519-dalek", @@ -43,9 +43,9 @@ dependencies = [ [[package]] name = "amplify_derive" -version = "2.3.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ba06653cdfce8bfa4faf2c7e5cee3f21adf1bcc1e80ee2e1dec8be764014b0d" +checksum = "3c419e9b8d377ce7930d1bc70812a234be311dd41bb70691db41166767240f5d" dependencies = [ "quote 1.0.7", "syn 1.0.48", @@ -870,6 +870,18 @@ dependencies = [ "zeroize 0.9.3", ] +[[package]] +name = "hammersbald" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba56eabb107827e7365630fbbf38a3928d2422cb305a2ca0acd4bdc34f5fd98e" +dependencies = [ + "bitcoin_hashes 0.7.6", + "byteorder", + "lru-cache", + "rand 0.7.3", +] + [[package]] name = "hashbrown" version = "0.9.1" @@ -1060,7 +1072,7 @@ checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a" [[package]] name = "lnp_node" -version = "0.1.0-beta.1" +version = "0.1.0-beta.2" dependencies = [ "amplify", "amplify_derive", @@ -1090,7 +1102,7 @@ dependencies = [ "serde_with", "serde_yaml", "shellexpand", - "tokio", + "tokio 0.2.22", "toml 0.5.7", "url", "zmq", @@ -1098,9 +1110,9 @@ dependencies = [ [[package]] name = "lnpbp" -version = "0.2.0-beta.2" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42de6988e741d7ba9cbe56e87f053f3afa3efe5b804a964c231c3b6bb0a6f7ca" +checksum = "f111d739c902b3848ac078f1fc3197dfa2539220265c6ff008211a69c868fdff" dependencies = [ "amplify", "amplify_derive", @@ -1108,6 +1120,7 @@ dependencies = [ "bech32", "bitcoin", "bitcoin_hashes 0.9.4", + "cc", "chacha20poly1305", "chrono", "deflate", @@ -1120,19 +1133,23 @@ dependencies = [ "miniscript", "num-derive", "num-traits 0.2.14", + "openssl", "serde 1.0.117", "serde_with", - "tokio", + "serde_with_macros", + "socket2", + "tokio 0.3.6", "torut", "url", + "zeromq-src", "zmq", ] [[package]] name = "lnpbp_derive" -version = "0.2.0-beta.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6633b058816646fffaa4c218bcb26bd9aa7972d5c03be26022e0f9f9b8edd004" +checksum = "ad9186dc830199ea7c6c73ac9be3bd640953c84e7295a96243351724af4aea53" dependencies = [ "amplify", "quote 1.0.7", @@ -1141,9 +1158,9 @@ dependencies = [ [[package]] name = "lnpbp_services" -version = "0.2.0-beta.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c4424ee45a4864d8da19df7e2729d265eaf9da03f595604a1f30aabe573ca9" +checksum = "7c59ef065aaa955202482670dd0a06db4116a7b24f8aaf2d12bb437f014a8167" dependencies = [ "amplify", "amplify_derive", @@ -1156,7 +1173,7 @@ dependencies = [ "log", "serde 1.0.117", "serde_with", - "tokio", + "tokio 0.3.6", "toml 0.5.7", "zmq", ] @@ -1170,6 +1187,15 @@ dependencies = [ "cfg-if 0.1.10", ] +[[package]] +name = "lru-cache" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" +dependencies = [ + "linked-hash-map 0.5.3", +] + [[package]] name = "man" version = "0.1.1" @@ -1414,6 +1440,15 @@ dependencies = [ "openssl-sys", ] +[[package]] +name = "openssl-src" +version = "111.13.0+1.1.1i" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "045e4dc48af57aad93d665885789b43222ae26f4886494da12d1ed58d309dcb6" +dependencies = [ + "cc", +] + [[package]] name = "openssl-sys" version = "0.9.58" @@ -1423,6 +1458,7 @@ dependencies = [ "autocfg 1.0.1", "cc", "libc", + "openssl-src", "pkg-config", "vcpkg", ] @@ -1477,6 +1513,12 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b" +[[package]] +name = "pin-project-lite" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b063f57ec186e6140e2b8b6921e5f1bd89c7356dda5b33acc5401203ca6131c" + [[package]] name = "pin-utils" version = "0.1.0" @@ -1788,9 +1830,9 @@ checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189" [[package]] name = "rgb_node" -version = "0.2.0-beta.2" +version = "0.2.0-rc.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "325a505c0a431425049d464e14f97e33134841f884f3712bd1ecfbf828c7cc83" +checksum = "6374b2b0cd5856f82d1042a602c01267eb3e4e42b179cdc41cea7fb585ebe180" dependencies = [ "amplify", "amplify_derive", @@ -1802,6 +1844,7 @@ dependencies = [ "electrum-client", "env_logger", "futures", + "hammersbald", "lazy_static", "lnpbp", "lnpbp_derive", @@ -1814,7 +1857,7 @@ dependencies = [ "serde_json", "serde_with", "serde_yaml", - "tokio", + "tokio 0.3.6", "toml 0.5.7", "url", "zmq", @@ -2311,13 +2354,26 @@ dependencies = [ "mio-named-pipes", "mio-uds", "num_cpus", - "pin-project-lite", + "pin-project-lite 0.1.11", "signal-hook-registry", "slab", - "tokio-macros", + "tokio-macros 0.2.5", "winapi 0.3.9", ] +[[package]] +name = "tokio" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "720ba21c25078711bf456d607987d95bce90f7c3bea5abe1db587862e7a1e87c" +dependencies = [ + "autocfg 1.0.1", + "num_cpus", + "pin-project-lite 0.2.0", + "slab", + "tokio-macros 0.3.1", +] + [[package]] name = "tokio-macros" version = "0.2.5" @@ -2329,6 +2385,17 @@ dependencies = [ "syn 1.0.48", ] +[[package]] +name = "tokio-macros" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21d30fdbb5dc2d8f91049691aa1a9d4d4ae422a21c334ce8936e5886d30c5c45" +dependencies = [ + "proc-macro2 1.0.24", + "quote 1.0.7", + "syn 1.0.48", +] + [[package]] name = "toml" version = "0.2.1" @@ -2372,7 +2439,7 @@ dependencies = [ "sha1", "sha2 0.8.2", "sha3", - "tokio", + "tokio 0.2.22", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 5541e17..bcb5f8c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "lnp_node" description = "LNP node" -version = "0.1.0-beta.1" +version = "0.1.0-beta.2" authors = ["Dr. Maxim Orlovsky "] license = "MIT" keywords = ["bitcoin", "node", "lightning-network", "smart-contracts", "rgb"] @@ -39,12 +39,12 @@ required-features = ["cli"] [dependencies] # LNP/BP crates -amplify = "~2.3.1" -amplify_derive = "~2.3.1" -lnpbp = { version = "=0.2.0-beta.2", features = ["lnp", "websockets"] } -lnpbp_derive = "=0.2.0-beta.2" -lnpbp_services = "=0.2.0-beta.2" -rgb_node = { version = "~0.2.0-beta.2", features = ["client", "fungibles"] } +amplify = "2.4" +amplify_derive = "2.4.2" +lnpbp = { version = "~0.2.2", features = ["lnp", "websockets"] } +lnpbp_derive = "~0.2.0" +lnpbp_services = "~0.2.0" +rgb_node = { version = "~0.2.0-rc.5", features = ["client", "fungibles"] } # Rust language lazy_static = "~1.4.0" nix = { version = "~0.19.0", optional = true } @@ -52,15 +52,15 @@ chrono = "~0.4.19" # Bitcoin electrum-client = { version = "=0.3.0-beta.1", optional = true } # Serialization & parsing -serde_crate = { package = "serde", version = "~1.0.106", features = ["derive"], optional = true } -serde_with = { version = "~1.5.1", optional = true, features = ["hex"] } -serde_json = { version = "~1.0.55", optional = true } -serde_yaml = { version = "~0.8.13", optional = true } -toml = { version = "~0.5.6", optional = true } -bech32 = { version = "~0.7.2", optional = true } -base64 = { version = "~0.12.1", optional = true } -regex = { version = "~1.3.9", optional = true } -url = { version = "~2.1.1", optional = true } +serde_crate = { package = "serde", version = "1.0", features = ["derive"], optional = true } +serde_with = { version = "1.5", optional = true, features = ["hex"] } +serde_json = { version = "1.0", optional = true } +serde_yaml = { version = "0.8.13", optional = true } +toml = { version = "0.5.6", optional = true } +bech32 = { version = "0.7.2", optional = true } +base64 = { version = "0.12.1", optional = true } +regex = { version = "1.3", optional = true } +url = { version = "2.1", optional = true } # Congig & logging settings = { version = "~0.10.1", package = "config", optional = true } configure_me = { version = "0.3.4", optional = true } @@ -76,10 +76,10 @@ tokio = { version = "~0.2.21", features = ["full"], optional = true } zmq = { version = "~0.9.2", optional = true } [build-dependencies] -amplify = "~2.3.1" -amplify_derive = "~2.3.0" -lnpbp = { version = "=0.2.0-beta.2", features = ["lnp", "url", "websockets"] } -lnpbp_services = "=0.2.0-beta.2" +amplify = "2.4" +amplify_derive = "2.4.2" +lnpbp = { version = "~0.2.2", features = ["lnp", "url", "websockets"] } +lnpbp_services = "~0.2.0" lazy_static = "~1.4.0" clap = "=3.0.0-beta.2" clap_generate = "=3.0.0-beta.2"