bs-p2p, bs-peer, all the bs

.cargo/config.toml

@@ -0,0 +1,2 @@
+[target.wasm32-unknown-unknown]
+rustflags = ["--cfg", "getrandom_backend=\"wasm_js\""]

.gitignore

@@ -13,3 +13,4 @@ Cargo.lock
 # MSVC Windows builds of rustc generate these, which store debugging information
 *.pdb
 .idea/
+crates/bs-p2p/local_keypair

Cargo.toml

@@ -6,6 +6,10 @@ members = [
   "crates/bs",
   "crates/bs-p2p",
   "crates/bs-traits",
+  "crates/comrade",
+  "crates/comrade-component",
+  "crates/comrade-reference",
+  "crates/bs-p2p",
   "crates/content-addressable",
   "crates/multibase",
   "crates/multicid",
@@ -17,13 +21,19 @@ members = [
   "crates/multiutil",
   "crates/provenance-log",
   "crates/rng",
-  "crates/wacc",
+  "crates/bs-peer",
+  "crates/interop-tests",
+  "crates/bs-wallets",
+  "crates/bs-server",
 ]
 
 [workspace.package]
 version = "1.0.0"
 edition = "2021"
-authors = ["Dave Grantham <[email protected]>"]
+authors = [
+  "Dave Grantham <[email protected]>",
+  "Doug Anderson <[email protected]>",
+]
 description = "The BetterSign Provenance-Based Identity Solution"
 readme = "README.md"
 license = "FSL-1.1 OR Apache-2.0"
@@ -32,13 +42,17 @@ license = "FSL-1.1 OR Apache-2.0"
 unexpected_cfgs = { level = "warn", check-cfg = [
   'cfg(feature, values("cargo-clippy"))',
   'cfg(fuzzing)',
-]}
+] }
 
 [workspace.dependencies]
 # Crate ependencies
 bs = { path = "crates/bs" }
 bs-p2p = { path = "crates/bs-p2p" }
+bs-peer = { path = "crates/bs-peer" }
 bs-traits = { path = "crates/bs-traits" }
+bs-wallets = { path = "crates/bs-wallets" }
+comrade = { path = "crates/comrade" }
+comrade-reference = { path = "crates/comrade-reference" }
 multibase = { path = "crates/multibase" }
 multicid = { path = "crates/multicid" }
 multicodec = { path = "crates/multicodec" }
@@ -49,29 +63,41 @@ multitrait = { path = "crates/multitrait" }
 multiutil = { path = "crates/multiutil" }
 provenance-log = { path = "crates/provenance-log" }
 rng = { path = "crates/rng" }
-wacc = { path = "crates/wacc" }
 
 # Core dependencies
 best-practices = { version = "0.1.0", git = "https://github.com/cryptidtech/best-practices.git" }
+blockstore = "0.7.1"
+cid = "0.11.0"
 criterion = "0.5.1"
 elliptic-curve = "0.13.8"
 hex = "0.4.3"
+libp2p = { version = "0.54.1" }
+multihash-codetable = { version = "0.1.4" }
 rand = { version = "0.9.0", features = ["os_rng"] }
 rand_core = "0.9.3"
 rand_6 = { version = "0.6.4", package = "rand" }
 rand_core_6 = { version = "0.6.4", package = "rand_core" }
-serde = { version = "1.0.219", default-features = false, features = ["alloc", "derive"]}
-serde_cbor = { version = "0.11.2", features = ["tags"]}
-serde_json = { version = "1.0.104"}
-serde_test = { version = "1.0.104"}
+serde = { version = "1.0.219", default-features = false, features = [
+  "alloc",
+  "derive",
+] }
+serde_cbor = { version = "0.11.2", features = ["tags"] }
+serde_json = { version = "1.0.104" }
+serde_test = { version = "1.0.104" }
 sha3 = "0.10.8"
 test-log = { version = "0.2.17", features = ["trace", "color"] }
 thiserror = "2.0.12"
-tokio = { version = "1.44.2", features = ["fs", "io-util", "macros", "rt", "test-util"] }
+tokio = { version = "1.44.2" }
 tracing = "0.1.41"
 tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
 unsigned-varint = { version = "0.8.0", features = ["std"] }
+web-sys = { version = "0.3.77" }
+wasm-bindgen-futures = "0.4.50"
 
 [profile.bench]
 opt-level = 3
 debug = false
+
+# until lands: https://github.com/libp2p/rust-libp2p/issues/5877
+[patch.crates-io]
+libp2p-webrtc-utils = { git = "https://github.com/DougAnderson444/rust-libp2p.git", branch = "core-v0.42-webrtc-utils-0.3.0" }

README.md

@@ -8,6 +8,14 @@
 
 [<img src="https://img.youtube.com/vi/LxU4wG4ryFo/hqdefault.jpg" width="100%" />](https://www.youtube.com/watch?v=LxU4wG4ryFo)
 
+## Tests 
+
+Run the [just command](https://just.systems/man/en/) in the root of the repository to run the tests:
+
+```
+just test
+```
+
 ## Introduction
 
 BetterSign (`bs`) is a new signing tool designed to use provenance based

cli/Cargo.toml

@@ -20,6 +20,7 @@ anyhow = "1.0"
 async-trait = "0.1"
 best-practices.workspace = true
 bs.workspace = true
+bs-traits.workspace = true
 clap = { version = "4.5.36", features = ["cargo"] }
 colored = "3.0.0"
 csv = "1.3.1"
@@ -42,15 +43,15 @@ rustyline = { version = "15.0.0", features = ["derive"] }
 serde = { workspace = true, optional = true }
 serde_cbor.workspace = true
 serde_json.workspace = true
-ssh-key = { version = "0.6.2", features = ["crypto", "ed25519"]}
+ssh-key = { version = "0.6.2", features = ["crypto", "ed25519"] }
 ssh-agent-client-rs = "1.0.0"
 structopt = "0.3.26"
 thiserror.workspace = true
-tokio = { version = "1.44.2", features = ["full"] }
+tokio = { workspace = true, features = ["full"] }
 toml = "0.8.20"
 tracing.workspace = true
 tracing-subscriber.workspace = true
-wacc.workspace = true
+comrade.workspace = true
 
 [dev-dependencies]
 tokio-test = "0.4.4"

cli/src/error.rs

@@ -1,4 +1,6 @@
 // SPDX-License-Identifier: FSL-1.1
+use provenance_log::Key;
+
 /// Errors generated from this crate
 #[derive(Debug, thiserror::Error)]
 #[non_exhaustive]
@@ -29,6 +31,15 @@ pub enum Error {
     /// Bs errors
     #[error(transparent)]
     Bs(#[from] bs::Error),
+
+    /// Error opening a provenance log
+    #[error(transparent)]
+    Open(#[from] bs::error::OpenError),
+
+    /// Error updating a provenance log
+    #[error(transparent)]
+    Update(#[from] bs::error::UpdateError),
+
     /// Multicid error
     #[error(transparent)]
     Multicid(#[from] multicid::Error),
@@ -98,6 +109,10 @@ pub enum Error {
     /// Invalid backend type
     #[error("Invalid backend type {0}")]
     InvalidBackendType(String),
+
+    /// From<std::string::FromUtf8Error>
+    #[error(transparent)]
+    FromUtf8Error(#[from] std::string::FromUtf8Error),
 }
 
 /// SshAgent error
@@ -158,4 +173,8 @@ pub enum PlogError {
     /// No string value given
     #[error("No string value given")]
     NoStringValue,
+
+    /// No key present for that KeyPath
+    #[error("No key present for that KeyPath {0}")]
+    NoKeyPresent(Key),
 }