From 1a476efd7c365e771c25ce3aac694015c024afe6 Mon Sep 17 00:00:00 2001 From: DanConwayDev Date: Fri, 22 Mar 2024 15:51:19 +0000 Subject: chore: bump rust-nostr to v0.29.0 both nostr and nostr-sdk packages and also in test_utils --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index 7793a8c..e07e1a4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,8 +23,8 @@ futures = "0.3.28" git2 = "0.18.1" indicatif = "0.17.7" keyring = "2.0.5" -nostr = "0.27.0" -nostr-sdk = "0.27.0" +nostr = "0.29.0" +nostr-sdk = "0.29.0" passwords = "3.1.13" scrypt = "0.11.0" serde = { version = "1.0.181", features = ["derive"] } -- cgit v1.2.3 From dfc31c40c9f941e55a5130d334d6383462a6fc85 Mon Sep 17 00:00:00 2001 From: DanConwayDev Date: Tue, 26 Mar 2024 14:34:42 +0000 Subject: use patched nostr-rust v0.29 to address send_event_to spurious timeout error --- Cargo.lock | 21 +++++++-------------- Cargo.toml | 4 ++-- test_utils/Cargo.toml | 4 ++-- 3 files changed, 11 insertions(+), 18 deletions(-) (limited to 'Cargo.toml') diff --git a/Cargo.lock b/Cargo.lock index 22927d7..ba12e87 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1766,8 +1766,7 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" [[package]] name = "nostr" version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "255485c2f41cf8f39d4e4a1901199549f54e32def81a71a8afe05f75809f441d" +source = "git+https://github.com/DanConwayDev/nostr?branch=v0-29-with-send-events-fix#20901408c61ba3977e4927bc069f3870a9174b1b" dependencies = [ "aes 0.8.4", "base64", @@ -1796,8 +1795,7 @@ dependencies = [ [[package]] name = "nostr-database" version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e15ab55f96ea5e560af0c75f1d942b1064266d443d11b2afbe51ca9ad78a018" +source = "git+https://github.com/DanConwayDev/nostr?branch=v0-29-with-send-events-fix#20901408c61ba3977e4927bc069f3870a9174b1b" dependencies = [ "async-trait", "lru", @@ -1810,8 +1808,7 @@ dependencies = [ [[package]] name = "nostr-relay-pool" version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83b39b3dc3f1fe912a0f530ad8bd2e71c55608679c8c427952f71c13f0a4c545" +source = "git+https://github.com/DanConwayDev/nostr?branch=v0-29-with-send-events-fix#20901408c61ba3977e4927bc069f3870a9174b1b" dependencies = [ "async-utility", "async-wsocket", @@ -1826,8 +1823,7 @@ dependencies = [ [[package]] name = "nostr-sdk" version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81ed0ab9cbc3b20d3dba99337f2e0739f052ebe32133d690e212022a06a22044" +source = "git+https://github.com/DanConwayDev/nostr?branch=v0-29-with-send-events-fix#20901408c61ba3977e4927bc069f3870a9174b1b" dependencies = [ "async-utility", "lnurl-pay", @@ -1845,8 +1841,7 @@ dependencies = [ [[package]] name = "nostr-signer" version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "307bdc7c26887d7e65632e66872989a19892dfe9f2c6dbd9a1d3f959c5c524d5" +source = "git+https://github.com/DanConwayDev/nostr?branch=v0-29-with-send-events-fix#20901408c61ba3977e4927bc069f3870a9174b1b" dependencies = [ "async-utility", "nostr", @@ -1858,8 +1853,7 @@ dependencies = [ [[package]] name = "nostr-zapper" version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "061d5eb00b430747a984ea9e41cd82c849832151b4263d8230c9c220dc2c62f8" +source = "git+https://github.com/DanConwayDev/nostr?branch=v0-29-with-send-events-fix#20901408c61ba3977e4927bc069f3870a9174b1b" dependencies = [ "async-trait", "nostr", @@ -1960,8 +1954,7 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "nwc" version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1894ffe54a1e5adf8dbb22b5a290c0748ec4a88aa07fa69c4359010edea49ed" +source = "git+https://github.com/DanConwayDev/nostr?branch=v0-29-with-send-events-fix#20901408c61ba3977e4927bc069f3870a9174b1b" dependencies = [ "async-utility", "nostr", diff --git a/Cargo.toml b/Cargo.toml index e07e1a4..3484e25 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,8 +23,8 @@ futures = "0.3.28" git2 = "0.18.1" indicatif = "0.17.7" keyring = "2.0.5" -nostr = "0.29.0" -nostr-sdk = "0.29.0" +nostr = { git = "https://github.com/DanConwayDev/nostr", branch="v0-29-with-send-events-fix" } +nostr-sdk = { git = "https://github.com/DanConwayDev/nostr", branch="v0-29-with-send-events-fix" } passwords = "3.1.13" scrypt = "0.11.0" serde = { version = "1.0.181", features = ["derive"] } diff --git a/test_utils/Cargo.toml b/test_utils/Cargo.toml index e07e411..10900fd 100644 --- a/test_utils/Cargo.toml +++ b/test_utils/Cargo.toml @@ -9,8 +9,8 @@ assert_cmd = "2.0.12" dialoguer = "0.10.4" directories = "5.0.1" git2 = "0.18.1" -nostr = "0.29.0" -nostr-sdk = "0.29.0" +nostr = { git = "https://github.com/DanConwayDev/nostr", branch="v0-29-with-send-events-fix" } +nostr-sdk = { git = "https://github.com/DanConwayDev/nostr", branch="v0-29-with-send-events-fix" } once_cell = "1.18.0" rand = "0.8" rexpect = { git = "https://github.com/rust-cli/rexpect.git", rev = "9eb61dd" } -- cgit v1.2.3 From 53bbbbf5d5b9bbdbb0a8598705e7ee8fe3087c11 Mon Sep 17 00:00:00 2001 From: DanConwayDev Date: Tue, 26 Mar 2024 16:41:30 +0000 Subject: bump nostr-relay-pool to v0.29.1 as patch accepted into package --- Cargo.lock | 25 ++++++++++++++++--------- Cargo.toml | 4 ++-- test_utils/Cargo.toml | 4 ++-- 3 files changed, 20 insertions(+), 13 deletions(-) (limited to 'Cargo.toml') diff --git a/Cargo.lock b/Cargo.lock index ba12e87..29bf716 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1324,7 +1324,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.5.6", + "socket2 0.4.10", "tokio", "tower-service", "tracing", @@ -1766,7 +1766,8 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" [[package]] name = "nostr" version = "0.29.0" -source = "git+https://github.com/DanConwayDev/nostr?branch=v0-29-with-send-events-fix#20901408c61ba3977e4927bc069f3870a9174b1b" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "255485c2f41cf8f39d4e4a1901199549f54e32def81a71a8afe05f75809f441d" dependencies = [ "aes 0.8.4", "base64", @@ -1795,7 +1796,8 @@ dependencies = [ [[package]] name = "nostr-database" version = "0.29.0" -source = "git+https://github.com/DanConwayDev/nostr?branch=v0-29-with-send-events-fix#20901408c61ba3977e4927bc069f3870a9174b1b" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e15ab55f96ea5e560af0c75f1d942b1064266d443d11b2afbe51ca9ad78a018" dependencies = [ "async-trait", "lru", @@ -1807,8 +1809,9 @@ dependencies = [ [[package]] name = "nostr-relay-pool" -version = "0.29.0" -source = "git+https://github.com/DanConwayDev/nostr?branch=v0-29-with-send-events-fix#20901408c61ba3977e4927bc069f3870a9174b1b" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4c3431820082c850315218193c7e33a328b4b2cd0129d4fd5446a4dab87ddc4" dependencies = [ "async-utility", "async-wsocket", @@ -1823,7 +1826,8 @@ dependencies = [ [[package]] name = "nostr-sdk" version = "0.29.0" -source = "git+https://github.com/DanConwayDev/nostr?branch=v0-29-with-send-events-fix#20901408c61ba3977e4927bc069f3870a9174b1b" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81ed0ab9cbc3b20d3dba99337f2e0739f052ebe32133d690e212022a06a22044" dependencies = [ "async-utility", "lnurl-pay", @@ -1841,7 +1845,8 @@ dependencies = [ [[package]] name = "nostr-signer" version = "0.29.0" -source = "git+https://github.com/DanConwayDev/nostr?branch=v0-29-with-send-events-fix#20901408c61ba3977e4927bc069f3870a9174b1b" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "307bdc7c26887d7e65632e66872989a19892dfe9f2c6dbd9a1d3f959c5c524d5" dependencies = [ "async-utility", "nostr", @@ -1853,7 +1858,8 @@ dependencies = [ [[package]] name = "nostr-zapper" version = "0.29.0" -source = "git+https://github.com/DanConwayDev/nostr?branch=v0-29-with-send-events-fix#20901408c61ba3977e4927bc069f3870a9174b1b" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "061d5eb00b430747a984ea9e41cd82c849832151b4263d8230c9c220dc2c62f8" dependencies = [ "async-trait", "nostr", @@ -1954,7 +1960,8 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "nwc" version = "0.29.0" -source = "git+https://github.com/DanConwayDev/nostr?branch=v0-29-with-send-events-fix#20901408c61ba3977e4927bc069f3870a9174b1b" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1894ffe54a1e5adf8dbb22b5a290c0748ec4a88aa07fa69c4359010edea49ed" dependencies = [ "async-utility", "nostr", diff --git a/Cargo.toml b/Cargo.toml index 3484e25..67706a9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,8 +23,8 @@ futures = "0.3.28" git2 = "0.18.1" indicatif = "0.17.7" keyring = "2.0.5" -nostr = { git = "https://github.com/DanConwayDev/nostr", branch="v0-29-with-send-events-fix" } -nostr-sdk = { git = "https://github.com/DanConwayDev/nostr", branch="v0-29-with-send-events-fix" } +nostr = "0.29" +nostr-sdk = "0.29" passwords = "3.1.13" scrypt = "0.11.0" serde = { version = "1.0.181", features = ["derive"] } diff --git a/test_utils/Cargo.toml b/test_utils/Cargo.toml index 10900fd..c4e1b1a 100644 --- a/test_utils/Cargo.toml +++ b/test_utils/Cargo.toml @@ -9,8 +9,8 @@ assert_cmd = "2.0.12" dialoguer = "0.10.4" directories = "5.0.1" git2 = "0.18.1" -nostr = { git = "https://github.com/DanConwayDev/nostr", branch="v0-29-with-send-events-fix" } -nostr-sdk = { git = "https://github.com/DanConwayDev/nostr", branch="v0-29-with-send-events-fix" } +nostr = "0.29" +nostr-sdk = "0.29" once_cell = "1.18.0" rand = "0.8" rexpect = { git = "https://github.com/rust-cli/rexpect.git", rev = "9eb61dd" } -- cgit v1.2.3