diff --git a/Cargo.lock b/Cargo.lock index 39d4679..86a9c6b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -642,9 +642,9 @@ checksum = "55248b47b0caf0546f7988906588779981c43bb1bc9d0c44087278f80cdb44ba" [[package]] name = "bech32" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d965446196e3b7decd44aa7ee49e31d630118f90ef12f97900f262eb915c951d" +checksum = "32637268377fc7b10a8c6d51de3e7fba1ce5dd371a96e342b34e6078db558e7f" [[package]] name = "bindgen" @@ -668,11 +668,11 @@ dependencies = [ [[package]] name = "bip39" -version = "2.2.0" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43d193de1f7487df1914d3a568b772458861d33f9c54249612cc2893d6915054" +checksum = "90dbd31c98227229239363921e60fcf5e558e43ec69094d46fc4996f08d1d5bc" dependencies = [ - "bitcoin_hashes 0.13.0", + "bitcoin_hashes", "serde", "unicode-normalization", ] @@ -698,36 +698,20 @@ version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e4b40c7323adcfc0a41c4b88143ed58346ff65a288fc144329c5c45e05d70c6" -[[package]] -name = "bitcoin-internals" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9425c3bf7089c983facbae04de54513cce73b41c7f9ff8c845b54e7bc64ebbfb" - [[package]] name = "bitcoin-io" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b47c4ab7a93edb0c7198c5535ed9b52b63095f4e9b45279c6736cec4b856baf" +checksum = "2dee39a0ee5b4095224a0cfc6bf4cc1baf0f9624b96b367e53b66d974e51d953" [[package]] name = "bitcoin_hashes" -version = "0.13.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1930a4dabfebb8d7d9992db18ebe3ae2876f0a305fab206fd168df931ede293b" -dependencies = [ - "bitcoin-internals", - "hex-conservative 0.1.2", -] - -[[package]] -name = "bitcoin_hashes" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb18c03d0db0247e147a21a6faafd5a7eb851c743db062de72018b6b7e8e4d16" +checksum = "26ec84b80c482df901772e931a9a681e26a1b9ee2302edeff23cb30328745c8b" dependencies = [ "bitcoin-io", - "hex-conservative 0.2.2", + "hex-conservative", "serde", ] @@ -1226,7 +1210,7 @@ dependencies = [ [[package]] name = "collections" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#007904465378d3f28def22c041d75e81722205b9" +source = "git+https://github.com/zed-industries/zed#42583c1141b68f655335769f4770b3ceea84c263" dependencies = [ "indexmap", "rustc-hash 2.1.1", @@ -1658,7 +1642,7 @@ dependencies = [ [[package]] name = "derive_refineable" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#007904465378d3f28def22c041d75e81722205b9" +source = "git+https://github.com/zed-industries/zed#42583c1141b68f655335769f4770b3ceea84c263" dependencies = [ "proc-macro2", "quote", @@ -2503,9 +2487,9 @@ dependencies = [ [[package]] name = "gif" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f954a9e9159ec994f73a30a12b96a702dde78f5547bcb561174597924f7d4162" +checksum = "f5df2ba84018d80c213569363bdcd0c64e6933c67fe4c1d60ecf822971a3c35e" dependencies = [ "color_quant", "weezl", @@ -2598,7 +2582,7 @@ dependencies = [ [[package]] name = "gpui" version = "0.2.2" -source = "git+https://github.com/zed-industries/zed#007904465378d3f28def22c041d75e81722205b9" +source = "git+https://github.com/zed-industries/zed#42583c1141b68f655335769f4770b3ceea84c263" dependencies = [ "anyhow", "as-raw-xcb-connection", @@ -2697,7 +2681,7 @@ dependencies = [ [[package]] name = "gpui_macros" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#007904465378d3f28def22c041d75e81722205b9" +source = "git+https://github.com/zed-industries/zed#42583c1141b68f655335769f4770b3ceea84c263" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -2708,7 +2692,7 @@ dependencies = [ [[package]] name = "gpui_tokio" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#007904465378d3f28def22c041d75e81722205b9" +source = "git+https://github.com/zed-industries/zed#42583c1141b68f655335769f4770b3ceea84c263" dependencies = [ "anyhow", "gpui", @@ -2841,12 +2825,6 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -[[package]] -name = "hex-conservative" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212ab92002354b4819390025006c897e8140934349e8635c9b077f47b4dcbd20" - [[package]] name = "hex-conservative" version = "0.2.2" @@ -2936,7 +2914,7 @@ dependencies = [ [[package]] name = "http_client" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#007904465378d3f28def22c041d75e81722205b9" +source = "git+https://github.com/zed-industries/zed#42583c1141b68f655335769f4770b3ceea84c263" dependencies = [ "anyhow", "async-compression", @@ -2962,7 +2940,7 @@ dependencies = [ [[package]] name = "http_client_tls" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#007904465378d3f28def22c041d75e81722205b9" +source = "git+https://github.com/zed-industries/zed#42583c1141b68f655335769f4770b3ceea84c263" dependencies = [ "rustls", "rustls-platform-verifier", @@ -3031,9 +3009,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52e9a2a24dc5c6821e71a7030e1e14b7b632acac55c40e9d2e082c621261bb56" +checksum = "727805d60e7938b76b826a6ef209eb70eaa1812794f9424d4a4e2d740662df5f" dependencies = [ "base64", "bytes", @@ -3513,9 +3491,9 @@ checksum = "7a79a3332a6609480d7d0c9eab957bca6b455b91bb84e66d19f5ff66294b85b8" [[package]] name = "libc" -version = "0.2.177" +version = "0.2.178" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976" +checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091" [[package]] name = "libfuzzer-sys" @@ -3617,11 +3595,11 @@ dependencies = [ [[package]] name = "log" -version = "0.4.28" +version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" +checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" dependencies = [ - "serde", + "serde_core", "value-bag", ] @@ -3758,7 +3736,7 @@ dependencies = [ [[package]] name = "media" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#007904465378d3f28def22c041d75e81722205b9" +source = "git+https://github.com/zed-industries/zed#42583c1141b68f655335769f4770b3ceea84c263" dependencies = [ "anyhow", "bindgen", @@ -3858,9 +3836,9 @@ checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff" [[package]] name = "mio" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873" +checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc" dependencies = [ "libc", "wasi", @@ -4008,13 +3986,13 @@ dependencies = [ [[package]] name = "nostr" version = "0.44.1" -source = "git+https://github.com/rust-nostr/nostr#9a93b7112f556d37a52c8db6fb25d178eff7dc0e" +source = "git+https://github.com/rust-nostr/nostr#5183ecded8d0649ff8e88315e459033228490ec3" dependencies = [ "aes", "base64", "bech32", "bip39", - "bitcoin_hashes 0.14.0", + "bitcoin_hashes", "cbc", "chacha20", "chacha20poly1305", @@ -4032,7 +4010,7 @@ dependencies = [ [[package]] name = "nostr-connect" version = "0.44.0" -source = "git+https://github.com/rust-nostr/nostr#9a93b7112f556d37a52c8db6fb25d178eff7dc0e" +source = "git+https://github.com/rust-nostr/nostr#5183ecded8d0649ff8e88315e459033228490ec3" dependencies = [ "async-utility", "nostr", @@ -4044,7 +4022,7 @@ dependencies = [ [[package]] name = "nostr-database" version = "0.44.0" -source = "git+https://github.com/rust-nostr/nostr#9a93b7112f556d37a52c8db6fb25d178eff7dc0e" +source = "git+https://github.com/rust-nostr/nostr#5183ecded8d0649ff8e88315e459033228490ec3" dependencies = [ "btreecap", "flatbuffers", @@ -4056,7 +4034,7 @@ dependencies = [ [[package]] name = "nostr-gossip" version = "0.44.0" -source = "git+https://github.com/rust-nostr/nostr#9a93b7112f556d37a52c8db6fb25d178eff7dc0e" +source = "git+https://github.com/rust-nostr/nostr#5183ecded8d0649ff8e88315e459033228490ec3" dependencies = [ "nostr", ] @@ -4064,7 +4042,7 @@ dependencies = [ [[package]] name = "nostr-lmdb" version = "0.44.0" -source = "git+https://github.com/rust-nostr/nostr#9a93b7112f556d37a52c8db6fb25d178eff7dc0e" +source = "git+https://github.com/rust-nostr/nostr#5183ecded8d0649ff8e88315e459033228490ec3" dependencies = [ "async-utility", "flume", @@ -4078,7 +4056,7 @@ dependencies = [ [[package]] name = "nostr-relay-pool" version = "0.44.0" -source = "git+https://github.com/rust-nostr/nostr#9a93b7112f556d37a52c8db6fb25d178eff7dc0e" +source = "git+https://github.com/rust-nostr/nostr#5183ecded8d0649ff8e88315e459033228490ec3" dependencies = [ "async-utility", "async-wsocket", @@ -4095,7 +4073,7 @@ dependencies = [ [[package]] name = "nostr-sdk" version = "0.44.1" -source = "git+https://github.com/rust-nostr/nostr#9a93b7112f556d37a52c8db6fb25d178eff7dc0e" +source = "git+https://github.com/rust-nostr/nostr#5183ecded8d0649ff8e88315e459033228490ec3" dependencies = [ "async-utility", "nostr", @@ -4612,7 +4590,7 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "perf" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#007904465378d3f28def22c041d75e81722205b9" +source = "git+https://github.com/zed-industries/zed#42583c1141b68f655335769f4770b3ceea84c263" dependencies = [ "collections", "serde", @@ -5238,7 +5216,7 @@ dependencies = [ [[package]] name = "refineable" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#007904465378d3f28def22c041d75e81722205b9" +source = "git+https://github.com/zed-industries/zed#42583c1141b68f655335769f4770b3ceea84c263" dependencies = [ "derive_refineable", ] @@ -5336,7 +5314,7 @@ dependencies = [ [[package]] name = "reqwest_client" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#007904465378d3f28def22c041d75e81722205b9" +source = "git+https://github.com/zed-industries/zed#42583c1141b68f655335769f4770b3ceea84c263" dependencies = [ "anyhow", "bytes", @@ -5390,7 +5368,7 @@ dependencies = [ [[package]] name = "rope" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#007904465378d3f28def22c041d75e81722205b9" +source = "git+https://github.com/zed-industries/zed#42583c1141b68f655335769f4770b3ceea84c263" dependencies = [ "arrayvec", "log", @@ -6306,7 +6284,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "sum_tree" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#007904465378d3f28def22c041d75e81722205b9" +source = "git+https://github.com/zed-industries/zed#42583c1141b68f655335769f4770b3ceea84c263" dependencies = [ "arrayvec", "log", @@ -7177,9 +7155,9 @@ checksum = "7df058c713841ad818f1dc5d3fd88063241cc61f49f5fbea4b951e8cf5a8d71d" [[package]] name = "unicode-script" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb421b350c9aff471779e262955939f565ec18b86c15364e6bdf0d662ca7c1f" +checksum = "383ad40bb927465ec0ce7720e033cb4ca06912855fc35db31b5755d0de75b1ee" [[package]] name = "unicode-segmentation" @@ -7275,7 +7253,7 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] name = "util" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#007904465378d3f28def22c041d75e81722205b9" +source = "git+https://github.com/zed-industries/zed#42583c1141b68f655335769f4770b3ceea84c263" dependencies = [ "anyhow", "async-fs", @@ -7311,7 +7289,7 @@ dependencies = [ [[package]] name = "util_macros" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#007904465378d3f28def22c041d75e81722205b9" +source = "git+https://github.com/zed-industries/zed#42583c1141b68f655335769f4770b3ceea84c263" dependencies = [ "perf", "quote", @@ -7320,13 +7298,13 @@ dependencies = [ [[package]] name = "uuid" -version = "1.18.1" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2" +checksum = "e2e054861b4bd027cd373e18e8d8d8e6548085000e41290d95ce0c373a654b4a" dependencies = [ "getrandom 0.3.4", "js-sys", - "serde", + "serde_core", "sha1_smol", "wasm-bindgen", ] @@ -8703,18 +8681,18 @@ checksum = "6df3dc4292935e51816d896edcd52aa30bc297907c26167fec31e2b0c6a32524" [[package]] name = "zerocopy" -version = "0.8.30" +version = "0.8.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea879c944afe8a2b25fef16bb4ba234f47c694565e97383b36f3a878219065c" +checksum = "fd74ec98b9250adb3ca554bdde269adf631549f51d8a8f8f0a10b50f1cb298c3" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.30" +version = "0.8.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf955aa904d6040f70dc8e9384444cb1030aed272ba3cb09bbc4ab9e7c1f34f5" +checksum = "d8a8d209fdf45cf5138cbb5a506f6b52522a25afccc534d1475dad8e31105c6a" dependencies = [ "proc-macro2", "quote", diff --git a/crates/state/src/lib.rs b/crates/state/src/lib.rs index 9c1d14e..36d75ee 100644 --- a/crates/state/src/lib.rs +++ b/crates/state/src/lib.rs @@ -5,7 +5,7 @@ use std::time::Duration; use anyhow::{anyhow, Context as AnyhowContext, Error}; use common::{config_dir, BOOTSTRAP_RELAYS, SEARCH_RELAYS}; use gpui::{App, AppContext, Context, Entity, Global, Task}; -use nostr_lmdb::NostrLMDB; +use nostr_lmdb::NostrLmdb; use nostr_sdk::prelude::*; use smallvec::{smallvec, SmallVec}; use smol::lock::RwLock; @@ -72,7 +72,7 @@ impl NostrRegistry { // Construct the lmdb let lmdb = cx.background_executor().block(async move { let path = config_dir().join("nostr"); - NostrLMDB::open(path) + NostrLmdb::open(path) .await .expect("Failed to initialize database") });