From 423937fa736119b8da7a51cef3d2da117d168366 Mon Sep 17 00:00:00 2001 From: Dr Maxim Orlovsky Date: Wed, 26 Apr 2023 14:45:04 +0200 Subject: [PATCH] chore: update to released crate versions --- Cargo.lock | 71 ++++++++++++++++++++++---------------------------- Cargo.toml | 14 +++------- doc/INSTALL.md | 6 ++--- 3 files changed, 38 insertions(+), 53 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b65ff13..0ee6c2f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -147,8 +147,9 @@ dependencies = [ [[package]] name = "bitcoin_blockchain" -version = "0.10.0-alpha.2" -source = "git+https://github.com/BP-WG/bp-foundation#164eb2f20767f33bbbc0da5bad580fc4ff83161f" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90f2d44b94b4add196f2f8bfa314873b9ff767dd16c7879c8d99c8a5eaeb242a" dependencies = [ "amplify", "chrono", @@ -167,8 +168,9 @@ dependencies = [ [[package]] name = "bitcoin_hd" -version = "0.10.0-alpha.2" -source = "git+https://github.com/BP-WG/descriptor-wallet#c6336c79b0003c547b35500b17912b4751a30631" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dae6bc05feed3ae9f379f5be383d28a0cefda41c12307e7940e4a17a4775957a" dependencies = [ "amplify", "bitcoin", @@ -181,15 +183,16 @@ dependencies = [ [[package]] name = "bitcoin_onchain" -version = "0.10.0-alpha.2" -source = "git+https://github.com/BP-WG/descriptor-wallet#c6336c79b0003c547b35500b17912b4751a30631" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a797b9174676cc3a3567f3bc3fb640536e2443c804b78f622cf8514089bf01c8" dependencies = [ "amplify", "bitcoin", "bitcoin_hd", "chrono", "descriptors", - "electrum-client 0.13.0", + "electrum-client", "miniscript", "serde", "strict_encoding", @@ -197,8 +200,9 @@ dependencies = [ [[package]] name = "bitcoin_scripts" -version = "0.10.0-alpha.2" -source = "git+https://github.com/BP-WG/bp-foundation#164eb2f20767f33bbbc0da5bad580fc4ff83161f" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d4ab9af39abb9d9dfb52c3926bde921da7e2289a2a8a7fca35369ecc0148054" dependencies = [ "amplify", "bitcoin", @@ -217,8 +221,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bpro" -version = "0.3.0" -source = "git+https://github.com/pandora-prime/bpro#09abd92751e8ebbbd431f3b4dd57e8a62dc42e9b" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2747117bec775ab564dab81768610723c1fc231bf1f9a919cbce040d6446019a" dependencies = [ "amplify", "bitcoin", @@ -226,7 +231,7 @@ dependencies = [ "chrono", "clap", "descriptor-wallet", - "electrum-client 0.14.0", + "electrum-client", "hwi", "lnpbp", "miniscript", @@ -510,8 +515,9 @@ dependencies = [ [[package]] name = "descriptor-wallet" -version = "0.10.0-alpha.2" -source = "git+https://github.com/BP-WG/descriptor-wallet#bb346754a87f95c93374b8057cc92cdd5abbafea" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "251cff72bc98b4b96b99bee9f31e8eef264fed881c99d70dc11320ab31d53219" dependencies = [ "amplify", "bitcoin", @@ -521,7 +527,7 @@ dependencies = [ "bitcoin_scripts", "chrono", "descriptors", - "electrum-client 0.13.0", + "electrum-client", "hwi", "psbt", "slip132", @@ -530,8 +536,9 @@ dependencies = [ [[package]] name = "descriptors" -version = "0.10.0-alpha.2" -source = "git+https://github.com/BP-WG/descriptor-wallet#c6336c79b0003c547b35500b17912b4751a30631" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4b4337ad272d5393d191ba0fae719992b5906efe94661902079c546daca7e49" dependencies = [ "amplify", "bitcoin", @@ -545,24 +552,6 @@ dependencies = [ "strict_encoding", ] -[[package]] -name = "electrum-client" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43224a43201a58034759d2682c603607d98ea0ff459a8d3622e0616b2badcd5c" -dependencies = [ - "bitcoin", - "byteorder", - "libc", - "log", - "rustls", - "serde", - "serde_json", - "webpki", - "webpki-roots", - "winapi", -] - [[package]] name = "electrum-client" version = "0.14.0" @@ -1217,7 +1206,7 @@ dependencies = [ "clap", "colored", "descriptor-wallet", - "electrum-client 0.14.0", + "electrum-client", "embed-resource", "gladis", "gtk", @@ -1421,8 +1410,9 @@ dependencies = [ [[package]] name = "psbt" -version = "0.10.0-alpha.2" -source = "git+https://github.com/BP-WG/descriptor-wallet#c6336c79b0003c547b35500b17912b4751a30631" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b1ec8cb789ff3f2029bb3aa0e9eed8344bf1c066e53b99111cfedab40cc82e" dependencies = [ "amplify", "bitcoin", @@ -1777,8 +1767,9 @@ dependencies = [ [[package]] name = "slip132" -version = "0.10.0-alpha.2" -source = "git+https://github.com/BP-WG/descriptor-wallet#c6336c79b0003c547b35500b17912b4751a30631" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "890b12cf298c4548739d6b1e53286576e43014ff1d3421751f2c26c80cc7a639" dependencies = [ "amplify", "bitcoin", diff --git a/Cargo.toml b/Cargo.toml index 59fdd44..16a145f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -39,10 +39,10 @@ ureq = { version = "2.4.0", features = ["json"] } amplify = "3.14.2" bitcoin = "0.29.2" miniscript = "9.0.1" -bitcoin_scripts = "0.10.0-alpha.2" -bitcoin_blockchain = "0.10.0-alpha.2" -descriptor-wallet = { version = "0.10.0-alpha.2", features = ["miniscript", "keygen", "hwi", "construct"] } -bpro = "0.3.0" +bitcoin_scripts = "0.10.0" +bitcoin_blockchain = "0.10.0" +descriptor-wallet = { version = "0.10.0", features = ["miniscript", "keygen", "hwi", "construct"] } +bpro = "0.4.0" hwi = "0.6.0" electrum-client = "0.14.0" @@ -62,9 +62,3 @@ ui = [] cli = ["clap", "serde", "colored"] serde = ["serde_with", "serde_yaml", "amplify/serde", "chrono/serde", "bitcoin/serde", "miniscript/serde", "descriptor-wallet/serde"] - -[patch.crates-io] -bitcoin_scripts = { git = "https://github.com/BP-WG/bp-foundation" } -bitcoin_blockchain = { git = "https://github.com/BP-WG/bp-foundation" } -descriptor-wallet = { git = "https://github.com/BP-WG/descriptor-wallet" } -bpro = { git = "https://github.com/pandora-prime/bpro" } diff --git a/doc/INSTALL.md b/doc/INSTALL.md index b470289..7fde7c0 100644 --- a/doc/INSTALL.md +++ b/doc/INSTALL.md @@ -36,10 +36,10 @@ Using package managers This is the recommended way of installing MyCitadel for Debian systems. You need to pick up a proper deb file matching your distribution. For -instance, for distributions based on the current Debian stable please -use `mycitadel_*_debian11_amd64.deb` files; for more frequently updated +instance, for distributions based on the current Debian stable (like PureOS) +please use `mycitadel_*_debian11_amd64.deb` files; for more frequently updated distributions (like Ubuntu) try `mycitadel_*_ubuntu_amd64.deb`. The -difference is that `debian11` version depends on Python 3.9, which is no +difference is that `debian11` version depends on Python 3.9, which is no longer available on more recent Ubuntu releases. Download deb package from the release files matching your platform and run