Merge branch 'master' into chore--update-merod-command-instructions

.gitignore

@@ -14,3 +14,4 @@ dist/
 lib/
 node_modules/
 certs/
+output/*

crates/meroctl/Cargo.toml

@@ -20,6 +20,7 @@ eyre.workspace = true
 futures-util.workspace = true
 libp2p.workspace = true
 notify.workspace = true
+rand.workspace = true
 reqwest = { workspace = true, features = ["json"] }
 serde = { workspace = true, features = ["derive"] }
 serde_json.workspace = true

crates/meroctl/src/cli.rs

@@ -1,5 +1,6 @@
 use std::process::ExitCode;
 
+use bootstrap::BootstrapCommand;
 use camino::Utf8PathBuf;
 use clap::{Parser, Subcommand};
 use const_format::concatcp;
@@ -11,6 +12,7 @@ use crate::defaults;
 use crate::output::{Format, Output, Report};
 
 mod app;
+mod bootstrap;
 mod call;
 mod context;
 mod identity;
@@ -53,6 +55,7 @@ pub enum SubCommands {
     Identity(IdentityCommand),
     Proxy(ProxyCommand),
     Call(CallCommand),
+    Bootstrap(BootstrapCommand),
 }
 
 #[derive(Debug, Parser)]
@@ -70,6 +73,16 @@ pub struct RootArgs {
     pub output_format: Format,
 }
 
+impl RootArgs {
+    pub const fn new(home: Utf8PathBuf, node_name: String, output_format: Format) -> Self {
+        Self {
+            home,
+            node_name,
+            output_format,
+        }
+    }
+}
+
 pub struct Environment {
     pub args: RootArgs,
     pub output: Output,
@@ -92,6 +105,7 @@ impl RootCommand {
             SubCommands::Identity(identity) => identity.run(&environment).await,
             SubCommands::Proxy(proxy) => proxy.run(&environment).await,
             SubCommands::Call(call) => call.run(&environment).await,
+            SubCommands::Bootstrap(call) => call.run(&environment).await,
         };
 
         if let Err(err) = result {

crates/meroctl/src/cli/app.rs

@@ -10,7 +10,7 @@ use crate::cli::Environment;
 use crate::output::Report;
 
 mod get;
-mod install;
+pub mod install;
 mod list;
 
 pub const EXAMPLES: &str = r"

crates/meroctl/src/cli/app/install.rs

@@ -1,3 +1,4 @@
+use calimero_primitives::application::ApplicationId;
 use calimero_primitives::hash::Hash;
 use calimero_server_primitives::admin::{
     InstallApplicationRequest, InstallApplicationResponse, InstallDevApplicationRequest,
@@ -36,6 +37,12 @@ impl Report for InstallApplicationResponse {
 
 impl InstallCommand {
     pub async fn run(self, environment: &Environment) -> Result<()> {
+        let _ignored = self.install_app(environment).await?;
+
+        Ok(())
+    }
+
+    pub async fn install_app(self, environment: &Environment) -> Result<ApplicationId> {
         let config = load_config(&environment.args.home, &environment.args.node_name)?;
         let mut is_dev_installation = false;
         let metadata = self.metadata.map(String::into_bytes).unwrap_or_default();
@@ -76,6 +83,6 @@ impl InstallCommand {
 
         environment.output.write(&response);
 
-        Ok(())
+        Ok(response.data.application_id)
     }
 }

crates/meroctl/src/cli/bootstrap.rs

@@ -0,0 +1,41 @@
+use clap::{Parser, Subcommand};
+use const_format::concatcp;
+use eyre::Result as EyreResult;
+use start::StartBootstrapCommand;
+
+use super::Environment;
+
+mod start;
+
+pub const EXAMPLES: &str = r"
+  # Setup and run 2 nodes with demo app
+  $ meroctl -- --node-name node1 bootstrap start --merod-path /path/to/merod
+
+# Setup and run 2 nodes with provided app
+  $ meroctl -- --node-name node1 bootstrap start --merod-path /path/to/merod --app-path /path/to/app
+
+";
+
+#[derive(Debug, Parser)]
+#[command(about = "Command for starting bootstrap")]
+#[command(after_help = concatcp!(
+    "Examples:",
+    EXAMPLES
+))]
+pub struct BootstrapCommand {
+    #[command(subcommand)]
+    pub subcommand: BootstrapSubCommands,
+}
+
+#[derive(Debug, Subcommand)]
+pub enum BootstrapSubCommands {
+    Start(StartBootstrapCommand),
+}
+
+impl BootstrapCommand {
+    pub async fn run(self, environment: &Environment) -> EyreResult<()> {
+        match self.subcommand {
+            BootstrapSubCommands::Start(generate) => generate.run(environment).await,
+        }
+    }
+}