chore(node): Upgrade blockstore and beetswap

Cargo.toml

@@ -3,7 +3,8 @@ resolver = "2"
 members = ["cli", "node", "node-wasm", "proto", "rpc", "types"]
 
 [workspace.dependencies]
-blockstore = "0.3"
+beetswap = { git = "https://github.com/eigerco/beetswap", rev = "1cdfff8" }
+blockstore = "0.4"
 lumina-node = { version = "0.1.0", path = "node" }
 lumina-node-wasm = { version = "0.1.0", path = "node-wasm" }
 celestia-proto = { version = "0.1.0", path = "proto" }
@@ -15,11 +16,11 @@ celestia-tendermint = { version = "0.32.1", default-features = false }
 celestia-tendermint-proto = "0.32.1"
 
 [patch.crates-io]
-# This is a workaround.
-# `lumina-node` depends on `beetswap`, which depends on `blockstore`.
-# Because `beetswap` is outside of this workspace, cargo thinks that
-# it depends on a different `blockstore` crate.
 # Uncomment to apply local changes
+#blockstore = { path = "../blockstore" }
 #celestia-tendermint = { path = "../celestia-tendermint-rs/tendermint" }
 #celestia-tendermint-proto = { path = "../celestia-tendermint-rs/proto" }
 #nmt-rs = { path = "../nmt-rs" }
+
+#[patch."https://github.com/eigerco/beetswap"]
+#beetswap = { path = "../beetswap" }

node/Cargo.toml

@@ -33,7 +33,7 @@ libp2p = { workspace = true, features = [
 ] }
 
 async-trait = "0.1.73"
-beetswap = { git = "https://github.com/eigerco/beetswap", rev = "13f1a08" }
+beetswap = { workspace = true }
 cid = { version = "0.11.0", features = ["serde-codec"] }
 dashmap = "5.5.3"
 futures = "0.3.28"
@@ -67,6 +67,7 @@ libp2p = { workspace = true, features = [
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 backoff = { version = "0.4.0", features = ["wasm-bindgen"] }
+beetswap = { workspace = true, features = ["wasm-bindgen"] }
 blockstore = { workspace = true, features = ["indexeddb"] }
 celestia-types = { workspace = true, features = ["wasm-bindgen"] }
 getrandom = { version = "0.2.10", features = ["js"] }

node/src/p2p/shwap.rs

@@ -1,6 +1,5 @@
 use std::sync::Arc;
 
-use async_trait::async_trait;
 use beetswap::multihasher::{Multihasher, MultihasherError};
 use blockstore::block::CidError;
 use celestia_tendermint_proto::Protobuf;
@@ -33,7 +32,6 @@ where
     }
 }
 
-#[async_trait]
 impl<S> Multihasher<MAX_MH_SIZE> for ShwapMultihasher<S>
 where
     S: Store + 'static,