Update to sneed 0.22.0

Author: Ash-L2L

Cargo.lock

@@ -33,7 +33,7 @@ fallible-iterator = "0.3.0"
 futures = { version = "0.3.30", default-features = false }
 governor = { version = "0.8.1", default-features = false }
 hashlink = "0.10.0"
-heed = "0.21.0"
+heed = "0.22.0"
 hex = "0.4.3"
 http = "1.2.0"
 human-size = "0.4.3"
@@ -60,7 +60,7 @@ serde_json = "1.0.113"
 serde_with = "3.4.0"
 shlex = "1.3.0"
 smallvec = "1.13.2"
-sneed = "0.0.11"
+sneed = "0.0.22"
 strum = { version = "0.27.2", features = ["derive"] }
 temp-dir = "0.2.0"
 thiserror = "2.0.11"

Cargo.toml

@@ -154,7 +154,7 @@ pub struct Archive {
 impl Archive {
     pub const NUM_DBS: u32 = 15;
 
-    pub fn new(env: &sneed::Env) -> Result<Self, Error> {
+    pub fn new<Tls>(env: &sneed::Env<Tls>) -> Result<Self, Error> {
         let mut rwtxn = env.write_txn().map_err(EnvError::from)?;
         let version =
             DatabaseUnique::create(env, &mut rwtxn, "archive_version")

lib/archive.rs

@@ -38,7 +38,7 @@ pub struct MemPool {
 impl MemPool {
     pub const NUM_DBS: u32 = 3;
 
-    pub fn new(env: &sneed::Env) -> Result<Self, Error> {
+    pub fn new<Tls>(env: &sneed::Env<Tls>) -> Result<Self, Error> {
         let mut rwtxn = env.write_txn().map_err(EnvError::from)?;
         let transactions =
             DatabaseUnique::create(env, &mut rwtxn, "transactions")

lib/mempool.rs

@@ -1,7 +1,5 @@
 use std::{
-    collections::{HashMap, HashSet, hash_map},
-    net::SocketAddr,
-    sync::Arc,
+    collections::{HashMap, HashSet, hash_map}, net::SocketAddr, sync::Arc,
 };
 
 use fallible_iterator::FallibleIterator;
@@ -10,8 +8,7 @@ use heed::types::{SerdeBincode, Unit};
 use parking_lot::RwLock;
 use quinn::{ClientConfig, Endpoint, ServerConfig};
 use sneed::{
-    DatabaseUnique, EnvError, RwTxn, RwTxnError, UnitKey,
-    db::error::Error as DbError,
+    DatabaseUnique, EnvError, RwTxn, RwTxnError, UnitKey, db::error::Error as DbError,
 };
 use tokio_stream::StreamNotifyClose;
 use tracing::instrument;
@@ -269,7 +266,7 @@ impl Net {
     #[instrument(skip_all, fields(addr), err(Debug))]
     pub fn connect_peer(
         &self,
-        env: sneed::Env,
+        env: sneed::Env<heed::WithoutTls>,
         addr: SocketAddr,
     ) -> Result<(), Error> {
         if self.active_peers.read().contains_key(&addr) {
@@ -329,7 +326,7 @@ impl Net {
     }
 
     pub fn new(
-        env: &sneed::Env,
+        env: &sneed::Env<heed::WithoutTls>,
         archive: Archive,
         network: Network,
         state: State,
@@ -412,7 +409,7 @@ impl Net {
     /// and a new peer was added.
     pub async fn accept_incoming(
         &self,
-        env: sneed::Env,
+        env: sneed::Env<heed::WithoutTls>,
     ) -> Result<Option<SocketAddr>, error::AcceptConnection> {
         tracing::debug!(
             "accept incoming: listening for connections on `{}`",

lib/net/mod.rs

@@ -365,7 +365,7 @@ impl Connection {
 }
 
 pub struct ConnectionContext {
-    pub env: sneed::Env,
+    pub env: sneed::Env<heed::WithoutTls>,
     pub archive: Archive,
     pub network: Network,
     pub state: State,

lib/net/peer/mod.rs

@@ -71,7 +71,7 @@ enum Error {
 }
 
 struct MainchainTask<Transport = tonic::transport::Channel> {
-    env: sneed::Env,
+    env: sneed::Env<heed::WithoutTls>,
     archive: Archive,
     mainchain: proto::mainchain::ValidatorClient<Transport>,
     // receive a request, and optional oneshot sender to send the result to
@@ -88,7 +88,7 @@ where
     /// including the specified header.
     /// Returns `false` if the specified block was not available.
     async fn request_ancestor_infos(
-        env: &sneed::Env,
+        env: &sneed::Env<heed::WithoutTls>,
         archive: &Archive,
         cusf_mainchain: &mut proto::mainchain::ValidatorClient<Transport>,
         block_hash: bitcoin::BlockHash,
@@ -213,7 +213,7 @@ pub(super) struct MainchainTaskHandle {
 
 impl MainchainTaskHandle {
     pub fn new<Transport>(
-        env: sneed::Env,
+        env: sneed::Env<heed::WithoutTls>,
         archive: Archive,
         mainchain: mainchain::ValidatorClient<Transport>,
     ) -> (Self, mpsc::UnboundedReceiver<Response>)

lib/node/mainchain_task.rs

@@ -104,7 +104,7 @@ pub struct Node<MainchainTransport = Channel> {
     cusf_mainchain: Arc<Mutex<mainchain::ValidatorClient<MainchainTransport>>>,
     cusf_mainchain_wallet:
         Option<Arc<Mutex<mainchain::WalletClient<MainchainTransport>>>>,
-    env: sneed::Env,
+    env: sneed::Env<heed::WithoutTls>,
     mainchain_task: MainchainTaskHandle,
     mempool: MemPool,
     net: Net,
@@ -138,7 +138,8 @@ where
         std::fs::create_dir_all(&env_path)?;
         let env = {
             use heed::EnvFlags;
-            let mut env_open_opts = heed::EnvOpenOptions::new();
+            let mut env_open_opts =
+                heed::EnvOpenOptions::new().read_txn_without_tls();
             env_open_opts
                 .map_size(128 * 1024 * 1024 * 1024) // 128 GB
                 .max_dbs(
@@ -166,8 +167,7 @@ where
                 | EnvFlags::MAP_ASYNC
                 | EnvFlags::NO_SYNC
                 | EnvFlags::NO_META_SYNC
-                | EnvFlags::NO_READ_AHEAD
-                | EnvFlags::NO_TLS;
+                | EnvFlags::NO_READ_AHEAD;
             unsafe { env_open_opts.flags(fast_flags) };
             unsafe { Env::open(&env_open_opts, &env_path) }
                 .map_err(EnvError::from)?
@@ -210,7 +210,7 @@ where
         })
     }
 
-    pub fn env(&self) -> &Env {
+    pub fn env(&self) -> &Env<heed::WithoutTls> {
         &self.env
     }
 

lib/node/mod.rs

@@ -263,8 +263,8 @@ fn is_fatal_reorg_error(err: &Error) -> bool {
     !matches!(err, Error::State(_))
 }
 
-fn reorg_to_tip(
-    env: &sneed::Env,
+fn reorg_to_tip<ThreadLocalStorage>(
+    env: &sneed::Env<ThreadLocalStorage>,
     archive: &Archive,
     mempool: &MemPool,
     state: &State,
@@ -447,7 +447,7 @@ fn reorg_to_tip(
 
 #[derive(Clone)]
 struct NetTaskContext {
-    env: sneed::Env,
+    env: sneed::Env<heed::WithoutTls>,
     archive: Archive,
     mainchain_task: MainchainTaskHandle,
     mempool: MemPool,
@@ -1213,7 +1213,7 @@ impl NetTaskHandle {
     #[allow(clippy::too_many_arguments)]
     pub fn new(
         runtime: &tokio::runtime::Runtime,
-        env: sneed::Env,
+        env: sneed::Env<heed::WithoutTls>,
         archive: Archive,
         mainchain_task: MainchainTaskHandle,
         mainchain_task_response_rx: UnboundedReceiver<mainchain_task::Response>,

lib/node/net_task.rs

@@ -99,7 +99,7 @@ pub struct State {
 impl State {
     pub const NUM_DBS: u32 = 11;
 
-    pub fn new(env: &sneed::Env) -> Result<Self, Error> {
+    pub fn new<Tls>(env: &sneed::Env<Tls>) -> Result<Self, Error> {
         let mut rwtxn = env.write_txn().map_err(EnvError::from)?;
         let tip = DatabaseUnique::create(env, &mut rwtxn, "tip")
             .map_err(EnvError::from)?;