mono-repo re-org

Signed-off-by: Dave Grantham <[email protected]>

Author: dhuseby

Cargo.toml

@@ -1,28 +1,53 @@
-[package]
-name = "bs"
-version = "1.0.5"
+[workspace]
+resolver = "2"
+default-members = ["crates/bs"]
+members = [
+  "crates/*",
+  "cli",
+]
+
+[workspace.package]
+version = "1.0.0"
+edition = "2021"
 authors = ["Dave Grantham <[email protected]>"]
-edition = "2018"
-description = "BetterSign signing tool"
-repository = "https://github.com/cryptidtech/bs"
+description = "The BetterSign Provenance-Based Identity Solution"
 readme = "README.md"
-keywords = ["provenance logs", "decentralized identity"]
-license = "Functional Source License 1.1"
+license = "FSL-1.1 OR Apache-2.0"
 
-[dependencies]
-best-practices = { version = "0.1", git = "https://github.com/cryptidtech/best-practices.git" }
-log = "0.4"
-multibase = { version = "1.0", git = "https://github.com/cryptidtech/rust-multibase.git" }
-multicid = { version = "1.0", git = "https://github.com/cryptidtech/multicid.git" }
-multicodec = { version = "1.0", git = "https://github.com/cryptidtech/rust-multicodec.git" }
-multihash = { version = "1.0", git = "https://github.com/cryptidtech/multihash.git" }
-multikey = { version = "1.0", git = "https://github.com/cryptidtech/multikey.git" }
-multisig = { version = "1.0", git = "https://github.com/cryptidtech/multisig.git" }
-provenance-log = { version = "1.0", git = "ssh://[email protected]/cryptidtech/provenance-log.git" }
-rand = "0.8"
-serde_cbor = "0.11.2"
-thiserror = "1.0"
-wacc = { version = "1.0", git = "ssh://[email protected]/cryptidtech/wacc.git" }
+[workspace.lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = [
+  'cfg(feature, values("cargo-clippy"))',
+  'cfg(fuzzing)',
+]}
 
-[workspace]
-members = ["cli"]
+[workspace.dependencies]
+# Crate ependencies
+bs = { path = "crates/bs" }
+multibase = { path = "crates/multibase" }
+multicid = { path = "crates/multicid" }
+multicodec = { path = "crates/multicodec" }
+multihash = { path = "crates/multihash" }
+multikey = { path = "crates/multikey" }
+multisig = { path = "crates/multisig" }
+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" }
+elliptic-curve = "0.13.8"
+hex = "0.4.3"
+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"}
+thiserror = "2.0.12"
+tracing = "0.1.41"
+tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
+unsigned-varint = { version = "0.8.0", features = ["std"] }

LICENSE-APACHE.txt

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2019 David Huseby <[email protected]>
+   Copyright [yyyy] [name of copyright owner]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

cli/Cargo.toml

@@ -1,47 +1,53 @@
 [package]
 name = "bs-cli"
-version = "1.0.5"
+version.workspace = true
+edition.workspace = true
 authors = ["Dave Grantham <[email protected]>"]
-edition = "2018"
-description = "BetterSign Provenance Tool"
-repository = "https://github.com/cryptidtech/bs"
+description = "BetterSign Provenance-Identity Tool"
 readme = "README.md"
 keywords = ["signing", "provenance logs", "decentralized identity"]
 license = "Functional Source License 1.1"
 
+[[bin]]
+name = "bs"
+path = "src/bin/bs.rs"
+
 [features]
 default = ["serde"]
 
 [dependencies]
 anyhow = "1.0"
 async-trait = "0.1"
-best-practices = { version = "0.1", git = "https://github.com/cryptidtech/best-practices.git" }
-bs = { path = ".." }
-clap = { version = "4.5.6", features = ["cargo"] }
-directories = "5.0"
-ed25519-dalek = "2.0"
-log = "0.4"
-multibase = { version = "1.0", git = "https://github.com/cryptidtech/rust-multibase.git" }
-multicid = { version = "1.0", git = "https://github.com/cryptidtech/multicid.git" }
-multicodec = { version = "1.0", git = "https://github.com/cryptidtech/rust-multicodec.git" }
-multihash = { version = "1.0", git = "https://github.com/cryptidtech/multihash.git" }
-multikey = { version = "1.0", git = "https://github.com/cryptidtech/multikey.git" }
-multisig = { version = "1.0", git = "https://github.com/cryptidtech/multisig.git" }
-multitrait = { version = "1.0", git = "https://github.com/cryptidtech/multitrait.git" }
-multiutil = { version = "1.0", git = "https://github.com/cryptidtech/multiutil.git" }
-provenance-log = { version = "1.0", git = "ssh://[email protected]/cryptidtech/provenance-log.git" }
-rand = "0.8"
-serde = { version = "1.0", default-features = false, features = ["alloc", "derive"], optional = true }
-serde_cbor = "0.11"
-serde_json = "1.0"
+best-practices.workspace = true
+bs.workspace = true
+clap = { version = "4.5.36", features = ["cargo"] }
+directories = "6.0.0"
+ed25519-dalek = "2.1.1"
+elliptic-curve.workspace = true
+multibase.workspace = true
+multicid.workspace = true
+multicodec.workspace = true
+multihash.workspace = true
+multikey.workspace = true
+multisig.workspace = true
+multitrait.workspace = true
+multiutil.workspace = true
+provenance-log.workspace = true
+rand.workspace = true
+rand_core_6.workspace = true
+rng.workspace = true
+serde = { workspace = true, optional = true }
+serde_cbor.workspace = true
+serde_json.workspace = true
 ssh-key = { version = "0.6.2", features = ["crypto", "ed25519"]}
-ssh-agent-client-rs = "0.9"
-structopt = "0.3"
-stderrlog = "0.6"
-thiserror = "1.0"
-tokio = { version = "1.37", features = ["full"] }
-toml = "0.8"
-wacc = { version = "1.0", git = "ssh://[email protected]/cryptidtech/wacc.git" }
+ssh-agent-client-rs = "1.0.0"
+structopt = "0.3.26"
+thiserror.workspace = true
+tokio = { version = "1.44.2", features = ["full"] }
+toml = "0.8.20"
+tracing.workspace = true
+tracing-subscriber.workspace = true
+wacc.workspace = true
 
 [dev-dependencies]
-tokio-test = "0.4"
+tokio-test = "0.4.4"

cli/src/bin/bs.rs

@@ -6,7 +6,7 @@
 //use bs::prelude::*;
 use bs_cli::prelude::*;
 //use commands::prelude::*;
-//use log::debug;
+//use tracing::debug;
 //use multicodec::Codec;
 //use multihash::EncodedMultihash;
 //use multikey::{mk, EncodedMultikey, Views};
@@ -80,7 +80,7 @@ enum Command {
     Plog {
         /// Provenance log subcommand
         #[structopt(subcommand)]
-        cmd: subcmds::plog::Command,
+        cmd: Box<subcmds::plog::Command>,
     },
 }
 
@@ -99,10 +99,15 @@ async fn main() -> Result<(), Error> {
     let opt = Opt::from_args();
 
     // set up the logger
-    stderrlog::new()
-        .quiet(opt.quiet)
-        .verbosity(opt.verbosity)
-        .init()
+    tracing_subscriber::fmt()
+        .with_env_filter(tracing_subscriber::EnvFilter::from_default_env())
+        .with_target(false)
+        .with_writer(std::io::stderr)
+        .with_ansi(true)
+        .with_line_number(true)
+        .with_file(true)
+        .without_time()
+        .try_init()
         .map_err(bs_cli::Error::Log)?;
 
     // load the config
@@ -112,7 +117,7 @@ async fn main() -> Result<(), Error> {
         // process a config command
         Command::Config { cmd } => subcmds::config::go(cmd, &config).await,
         // process a plog command
-        Command::Plog { cmd } => subcmds::plog::go(cmd, &config).await,
+        Command::Plog { cmd } => subcmds::plog::go(*cmd, &config).await,
     };
 
     if let Err(ref e) = ret {