commit b8177459ab3c163d357dad1a1e396d15b6a66be6
parent 3e1acfa9cfe37c2f18399f9fa5a10755d6967199
Author: kernelkind <kernelkind@gmail.com>
Date: Tue, 7 May 2024 19:57:39 -0400
use nostr in enostr
Signed-off-by: kernelkind <kernelkind@gmail.com>
Signed-off-by: William Casarin <jb55@jb55.com>
Diffstat:
2 files changed, 135 insertions(+), 13 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
@@ -410,6 +410,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d86b93f97252c47b41663388e6d155714a9d0c398b99f1005cbc5f978b29f445"
[[package]]
+name = "bech32"
+version = "0.10.0-beta"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "98f7eed2b2781a6f0b5c903471d48e15f56fb4e1165df8a9a2337fd1a59d45ea"
+
+[[package]]
name = "bincode"
version = "1.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -479,11 +485,35 @@ version = "0.30.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1945a5048598e4189e239d3f809b19bdad4845c4b2ba400d304d2dcf26d2c462"
dependencies = [
- "bech32",
+ "bech32 0.9.1",
"bitcoin-private",
"bitcoin_hashes 0.12.0",
"hex_lit",
- "secp256k1",
+ "secp256k1 0.27.0",
+ "serde",
+]
+
+[[package]]
+name = "bitcoin"
+version = "0.31.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c85783c2fe40083ea54a33aa2f0ba58831d90fcd190f5bdc47e74e84d2a96ae"
+dependencies = [
+ "bech32 0.10.0-beta",
+ "bitcoin-internals",
+ "bitcoin_hashes 0.13.0",
+ "hex-conservative",
+ "hex_lit",
+ "secp256k1 0.28.2",
+ "serde",
+]
+
+[[package]]
+name = "bitcoin-internals"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9425c3bf7089c983facbae04de54513cce73b41c7f9ff8c845b54e7bc64ebbfb"
+dependencies = [
"serde",
]
@@ -510,6 +540,17 @@ dependencies = [
]
[[package]]
+name = "bitcoin_hashes"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1930a4dabfebb8d7d9992db18ebe3ae2876f0a305fab206fd168df931ede293b"
+dependencies = [
+ "bitcoin-internals",
+ "hex-conservative",
+ "serde",
+]
+
+[[package]]
name = "bitflags"
version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1221,6 +1262,7 @@ dependencies = [
"ewebsock",
"hex",
"log",
+ "nostr 0.30.0",
"serde",
"serde_derive",
"serde_json",
@@ -1880,6 +1922,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
[[package]]
+name = "hex-conservative"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30ed443af458ccb6d81c1e7e661545f94d3176752fb1df2f543b902a1e0f51e2"
+
+[[package]]
name = "hex_lit"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2042,6 +2090,23 @@ dependencies = [
]
[[package]]
+name = "hyper-rustls"
+version = "0.26.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c"
+dependencies = [
+ "futures-util",
+ "http 1.1.0",
+ "hyper 1.3.1",
+ "hyper-util",
+ "rustls 0.22.2",
+ "rustls-pki-types",
+ "tokio",
+ "tokio-rustls 0.25.0",
+ "tower-service",
+]
+
+[[package]]
name = "hyper-tls"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2335,7 +2400,7 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b628658116d331c9567f6cb22415d726125ff6e328d1fb1b422b1b58afeaec21"
dependencies = [
- "bech32",
+ "bech32 0.9.1",
"reqwest 0.11.27",
"serde",
"serde_json",
@@ -2613,7 +2678,7 @@ dependencies = [
"aes",
"base64 0.21.7",
"bip39",
- "bitcoin",
+ "bitcoin 0.30.2",
"cbc",
"chacha20",
"chacha20poly1305",
@@ -2635,6 +2700,36 @@ dependencies = [
]
[[package]]
+name = "nostr"
+version = "0.30.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a27223888faca0c4ba9b97c2b7dc776e9a33d5f54e3558887471cf17798b5fbf"
+dependencies = [
+ "aes",
+ "base64 0.21.7",
+ "bip39",
+ "bitcoin 0.31.2",
+ "cbc",
+ "chacha20",
+ "chacha20poly1305",
+ "getrandom",
+ "instant",
+ "js-sys",
+ "negentropy",
+ "once_cell",
+ "reqwest 0.12.4",
+ "scrypt",
+ "serde",
+ "serde_json",
+ "tracing",
+ "unicode-normalization",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
+[[package]]
name = "nostr-database"
version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2642,7 +2737,7 @@ checksum = "8e15ab55f96ea5e560af0c75f1d942b1064266d443d11b2afbe51ca9ad78a018"
dependencies = [
"async-trait",
"lru",
- "nostr",
+ "nostr 0.29.0",
"thiserror",
"tokio",
"tracing",
@@ -2657,7 +2752,7 @@ dependencies = [
"async-utility",
"async-wsocket",
"atomic-destructor",
- "nostr",
+ "nostr 0.29.0",
"nostr-database",
"thiserror",
"tokio",
@@ -2672,7 +2767,7 @@ checksum = "81ed0ab9cbc3b20d3dba99337f2e0739f052ebe32133d690e212022a06a22044"
dependencies = [
"async-utility",
"lnurl-pay",
- "nostr",
+ "nostr 0.29.0",
"nostr-database",
"nostr-relay-pool",
"nostr-signer",
@@ -2690,7 +2785,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "307bdc7c26887d7e65632e66872989a19892dfe9f2c6dbd9a1d3f959c5c524d5"
dependencies = [
"async-utility",
- "nostr",
+ "nostr 0.29.0",
"nostr-relay-pool",
"thiserror",
"tokio",
@@ -2703,7 +2798,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "061d5eb00b430747a984ea9e41cd82c849832151b4263d8230c9c220dc2c62f8"
dependencies = [
"async-trait",
- "nostr",
+ "nostr 0.29.0",
"thiserror",
]
@@ -2864,7 +2959,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d1894ffe54a1e5adf8dbb22b5a290c0748ec4a88aa07fa69c4359010edea49ed"
dependencies = [
"async-utility",
- "nostr",
+ "nostr 0.29.0",
"nostr-relay-pool",
"nostr-zapper",
"thiserror",
@@ -3444,7 +3539,7 @@ dependencies = [
"http 0.2.11",
"http-body 0.4.6",
"hyper 0.14.28",
- "hyper-rustls",
+ "hyper-rustls 0.24.2",
"ipnet",
"js-sys",
"log",
@@ -3487,6 +3582,7 @@ dependencies = [
"http-body 1.0.0",
"http-body-util",
"hyper 1.3.1",
+ "hyper-rustls 0.26.0",
"hyper-tls",
"hyper-util",
"ipnet",
@@ -3497,7 +3593,9 @@ dependencies = [
"once_cell",
"percent-encoding",
"pin-project-lite",
+ "rustls 0.22.2",
"rustls-pemfile 2.1.2",
+ "rustls-pki-types",
"serde",
"serde_json",
"serde_urlencoded",
@@ -3505,11 +3603,14 @@ dependencies = [
"system-configuration",
"tokio",
"tokio-native-tls",
+ "tokio-rustls 0.25.0",
+ "tokio-socks",
"tower-service",
"url",
"wasm-bindgen",
"wasm-bindgen-futures",
"web-sys",
+ "webpki-roots 0.26.1",
"winreg 0.52.0",
]
@@ -3783,7 +3884,19 @@ checksum = "25996b82292a7a57ed3508f052cfff8640d38d32018784acd714758b43da9c8f"
dependencies = [
"bitcoin_hashes 0.12.0",
"rand",
- "secp256k1-sys",
+ "secp256k1-sys 0.8.1",
+ "serde",
+]
+
+[[package]]
+name = "secp256k1"
+version = "0.28.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d24b59d129cdadea20aea4fb2352fa053712e5d713eee47d700cd4b2bc002f10"
+dependencies = [
+ "bitcoin_hashes 0.12.0",
+ "rand",
+ "secp256k1-sys 0.9.2",
"serde",
]
@@ -3797,6 +3910,15 @@ dependencies = [
]
[[package]]
+name = "secp256k1-sys"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5d1746aae42c19d583c3c1a8c646bfad910498e2051c551a7f2e3c0c9fbb7eb"
+dependencies = [
+ "cc",
+]
+
+[[package]]
name = "security-framework"
version = "2.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/enostr/Cargo.toml b/enostr/Cargo.toml
@@ -12,7 +12,7 @@ serde = { version = "1", features = ["derive"] } # You only need this if you wan
serde_json = "1.0.89"
tracing = "0.1.37"
shatter = "0.1.1"
-#nostr = { version = "0.27.0", features = ["blocking"] }
+nostr = { version = "0.30.0" }
hex = "0.4.3"
log = "0.4.20"
env_logger = "0.11.1"
