Restructure codebase

Cargo.toml

@@ -1,11 +1,16 @@
-[package]
-name = "anchor"
-version = "0.1.0"
+[workspace]
+# Extra tooling projects will be added.
+members = [
+    "anchor",
+    "anchor/client",
+]
+resolver = "2"
+
+[workspace.package]
 edition = "2021"
-authors = ["Sigma Prime <contact@sigmaprime.io>"]
-rust-version = "1.80.0"
 
-[dependencies]
+[workspace.dependencies]
+client = { path = "anchor/client" }
 task_executor = { git = "https://github.com/sigp/lighthouse", branch = "anchor", default-features = false,  features = ["tracing"] }
 sensitive_url = { git = "https://github.com/sigp/lighthouse", branch = "anchor"}
 async-channel = "1.9"
@@ -20,5 +25,8 @@ tracing = "0.1.40"
 git-version = "0.3.9"
 target_info = "0.1.0"
 
-[dev-dependencies]
-regex = "1.10.6"
+[profile.maxperf]
+inherits = "release"
+lto = "fat"
+codegen-units = 1
+incremental = false

anchor/Cargo.toml

@@ -0,0 +1,24 @@
+[package]
+name = "anchor"
+version = "0.1.0"
+edition = { workspace = true }
+authors = ["Sigma Prime <contact@sigmaprime.io>"]
+rust-version = "1.80.0"
+
+[dependencies]
+task_executor = { workspace = true }
+sensitive_url = { workspace = true }
+async-channel = { workspace = true }
+clap = { workspace = true }
+dirs = { workspace = true }
+ethereum_hashing =  { workspace = true }
+futures =  { workspace = true }
+serde =  { workspace = true }
+tokio =  { workspace = true }
+tracing =  { workspace = true }
+git-version =  { workspace = true }
+target_info = { workspace = true }
+client = { workspace = true }
+
+[dev-dependencies]
+regex = "1.10.6"

anchor/client/Cargo.toml

@@ -0,0 +1,17 @@
+[package]
+name = "client"
+version = "0.1.0"
+authors = ["Sigma Prime <contact@sigmaprime.io"]
+edition = { workspace = true }
+
+[lib]
+name = "client"
+path = "src/lib.rs"
+
+[dependencies]
+task_executor = { workspace = true }
+clap = { workspace = true }
+serde = { workspace = true }
+sensitive_url = { workspace = true }
+dirs = { workspace = true }
+

src/client/mod.rs → anchor/client/src/lib.rs

@@ -1,5 +1,8 @@
 // use tracing::{debug, info};
-use crate::config::Config;
+
+pub mod config;
+
+use config::Config;
 use task_executor::TaskExecutor;
 
 pub struct Client {}

src/cli.rs → anchor/src/cli.rs

@@ -47,9 +47,8 @@ pub fn cli_app() -> Command {
         .styles(get_color_style())
         .next_line_help(true)
         .term_width(80)
-        .disable_help_flag(true)
         .about(
-            "Anchor client. Maintained by Sigma Prime",
+            "Anchor is a rust-based SSV client. Currently under active developement and should not be used for production."
         )
         .long_version(LONG_VERSION.as_str())
         .display_order(0)
@@ -71,8 +70,8 @@ pub fn cli_app() -> Command {
                 .value_name("DIR")
                 .global(true)
                 .help(
-                    "Used to specify a custom root data directory for lighthouse keys and databases. \
-                    Defaults to $HOME/.lighthouse/{network} where network is the value of the `network` flag \
+                    "Used to specify a custom root data directory for anchor keys and databases. \
+                    Defaults to $HOME/.anchor/{network} where network is the value of the `network` flag \
                     Note: Users should specify separate custom datadirs for different networks.")
                 .action(ArgAction::Set)
                 .display_order(0)

src/main.rs → anchor/src/main.rs

@@ -1,8 +1,6 @@
 use tracing::{error, info};
 
 mod cli;
-mod client;
-mod config;
 mod environment;
 mod version;
 
@@ -20,8 +18,11 @@ fn main() {
     // Obtain the CLI and build the config
     let cli = cli::cli_app();
     let matches = cli.get_matches();
-    // Build the config
-    let config = match config::from_cli(&matches) {
+
+    // Currently the only binary is the client. We build the client config, but later this will
+    // generalise to other sub commands
+    // Build the client config
+    let config = match client::config::from_cli(&matches) {
         Ok(config) => config,
         Err(e) => {
             error!(e, "Unable to initialize configuration");