From ba3e447c928303de0a008a47ba237145f436b8aa Mon Sep 17 00:00:00 2001 From: DanConwayDev Date: Sun, 21 May 2023 12:51:54 +0000 Subject: bump nostr-sdk --- Cargo.lock | 108 +++++++++++++++++++++++++++++++++--------------- Cargo.toml | 8 +--- src/sub_commands/prs.rs | 2 +- 3 files changed, 77 insertions(+), 41 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a37e592..9fccfbe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -79,12 +79,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - [[package]] name = "base64" version = "0.21.0" @@ -311,6 +305,12 @@ dependencies = [ "typenum", ] +[[package]] +name = "data-encoding" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" + [[package]] name = "dialoguer" version = "0.10.4" @@ -676,9 +676,9 @@ checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" dependencies = [ "http", "hyper", - "rustls", + "rustls 0.20.8", "tokio", - "tokio-rustls", + "tokio-rustls 0.23.4", ] [[package]] @@ -897,11 +897,12 @@ dependencies = [ [[package]] name = "nostr" -version = "0.21.0" -source = "git+https://github.com/DanConwayDev/nostr.git#d2caf5521e06849ecf1b5663a4b70e3cc6c34a69" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a38ff6fec17be97b6ea1e30a4913618c8e02b2e555b5188d01668f2e4fa09507" dependencies = [ "aes", - "base64 0.21.0", + "base64", "bech32", "bip39", "bitcoin", @@ -914,15 +915,14 @@ dependencies = [ "secp256k1", "serde", "serde_json", - "thiserror", "url", ] [[package]] name = "nostr-sdk" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d60df29fc0725e362c26e8b776dfa41ca23dc157fbb41ca81fdd6705268838c" +checksum = "f424ef65e24900885e4ec03b5dddb97baa7ead89ce5ef30820cc186350711fe7" dependencies = [ "gloo-timers", "log", @@ -936,19 +936,19 @@ dependencies = [ [[package]] name = "nostr-sdk-net" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5669dfdfeae7c85cfafa59bca1fadedbd8e494450a7e7249d6ccdcd4c41dcd2a" +checksum = "0d9a530ec3e9998f207e1a2a06ddadded76e716b3082c5c7aad6555a6f4099a9" dependencies = [ "futures-util", "thiserror", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.0", "tokio-socks", "tokio-tungstenite", "url", "webpki", - "webpki-roots", + "webpki-roots 0.23.0", "ws_stream_wasm", ] @@ -1130,7 +1130,7 @@ version = "0.11.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13293b639a097af28fc8a90f22add145a9c954e49d77da06263d58cf44d5fb91" dependencies = [ - "base64 0.21.0", + "base64", "bytes", "encoding_rs", "futures-core", @@ -1147,20 +1147,20 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls", + "rustls 0.20.8", "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", "tokio", - "tokio-rustls", + "tokio-rustls 0.23.4", "tokio-socks", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots", + "webpki-roots 0.22.6", "winreg", ] @@ -1214,13 +1214,35 @@ dependencies = [ "webpki", ] +[[package]] +name = "rustls" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c911ba11bc8433e811ce56fde130ccf32f5127cab0e0194e9c68c5a5b671791e" +dependencies = [ + "log", + "ring", + "rustls-webpki", + "sct", +] + [[package]] name = "rustls-pemfile" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" dependencies = [ - "base64 0.21.0", + "base64", +] + +[[package]] +name = "rustls-webpki" +version = "0.100.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +dependencies = [ + "ring", + "untrusted", ] [[package]] @@ -1467,11 +1489,21 @@ version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ - "rustls", + "rustls 0.20.8", "tokio", "webpki", ] +[[package]] +name = "tokio-rustls" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0d409377ff5b1e3ca6437aa86c1eb7d40c134bfec254e44c830defa92669db5" +dependencies = [ + "rustls 0.21.1", + "tokio", +] + [[package]] name = "tokio-socks" version = "0.5.1" @@ -1486,18 +1518,17 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54319c93411147bced34cb5609a80e0a8e44c5999c93903a81cd866630ec0bfd" +checksum = "ec509ac96e9a0c43427c74f003127d953a265737636129424288d27cb5c4b12c" dependencies = [ "futures-util", "log", - "rustls", + "rustls 0.21.1", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.0", "tungstenite", - "webpki", - "webpki-roots", + "webpki-roots 0.23.0", ] [[package]] @@ -1557,18 +1588,18 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "tungstenite" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30ee6ab729cd4cf0fd55218530c4522ed30b7b6081752839b68fcec8d0960788" +checksum = "15fba1a6d6bb030745759a9a2a588bfe8490fc8b4751a277db3a0be1c9ebbf67" dependencies = [ - "base64 0.13.1", "byteorder", "bytes", + "data-encoding", "http", "httparse", "log", "rand", - "rustls", + "rustls 0.21.1", "sha1", "thiserror", "url", @@ -1762,6 +1793,15 @@ dependencies = [ "webpki", ] +[[package]] +name = "webpki-roots" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa54963694b65584e170cf5dc46aeb4dcaa5584e652ff5f3952e56d66aff0125" +dependencies = [ + "rustls-webpki", +] + [[package]] name = "winapi" version = "0.3.9" diff --git a/Cargo.toml b/Cargo.toml index ac3e916..b913583 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,8 +13,8 @@ categories = ["command-line-utilities","git"] [dependencies] clap = { version = "4.1.6", features = ["derive"] } -nostr = { version = "0.21" } -nostr-sdk = { version = "0.21", features = ["blocking"] } +nostr = { version = "0.22" } +nostr-sdk = { version = "0.22", features = ["blocking"] } serde = { version = "1.0.147", features = ["derive"] } serde_json = "1.0.91" dialoguer = "0.10.4" @@ -22,7 +22,3 @@ indicatif = "0.17.3" thiserror = "1.0" confy = "0.5.1" git2 = "0.17.1" - -[patch.crates-io] -nostr = { git = 'https://github.com/DanConwayDev/nostr.git', features = ["blocking"] } - diff --git a/src/sub_commands/prs.rs b/src/sub_commands/prs.rs index beafea4..e6619fd 100644 --- a/src/sub_commands/prs.rs +++ b/src/sub_commands/prs.rs @@ -75,7 +75,7 @@ pub fn prs( println!( "{}\n raised: {}", outstanding_prs[i].content, - outstanding_prs[i].created_at, //.to_human_datetime(), in v0.22 + outstanding_prs[i].created_at.to_human_datetime(), ); let branch_id = tag_extract_value( -- cgit v1.2.3