Merge pull request #22 from movementlabsxyz/l-monninger/re-fix-12

Makes 12 more ergonomic

Author: l-monninger

Cargo.lock

@@ -9,6 +9,7 @@ members = [
   "protocol/mcr/clients/*",
   "protocol/mcr/manager",
   "protocol/mcr/cli/*",
+  "protocol/mcr/dlu/eth/deployer-core",
 
   # pcp
   ## protocol
@@ -39,6 +40,7 @@ members = [
   # util
   "util/signing/eth",
   "util/environment",
+  "util/commander",
 ]
 
 [workspace.package]
@@ -52,7 +54,7 @@ publish = false
 rust-version = "1.81.0"
 
 [workspace.dependencies]
-alloy = { git = "https://github.com/alloy-rs/alloy.git", package = "alloy", rev = "83343b172585fe4e040fb104b4d1421f58cbf9a2", features = [
+alloy = { git = "https://github.com/alloy-rs/alloy.git", package = "alloy", rev = "bc190c61f1bee74271a29ea6275ab674fcfe73d5", features = [
   "node-bindings",
   "rpc-types-trace",
   "json-rpc",
@@ -63,22 +65,22 @@ alloy = { git = "https://github.com/alloy-rs/alloy.git", package = "alloy", rev
   "pubsub",
   "providers",
 ] }
-alloy-rpc-types-eth = "0.1.3"
-alloy-eips = { git = "https://github.com/alloy-rs/alloy.git", rev = "83343b172585fe4e040fb104b4d1421f58cbf9a2" }
-alloy-contract = { git = "https://github.com/alloy-rs/alloy.git", rev = "83343b172585fe4e040fb104b4d1421f58cbf9a2" }
-alloy-network = { git = "https://github.com/alloy-rs/alloy.git", rev = "83343b172585fe4e040fb104b4d1421f58cbf9a2" }
-alloy-primitives = { version = "0.7.2", default-features = false }
-alloy-consensus = { git = "https://github.com/alloy-rs/alloy.git", rev = "83343b172585fe4e040fb104b4d1421f58cbf9a2" }
-alloy-provider = { git = "https://github.com/alloy-rs/alloy.git", rev = "83343b172585fe4e040fb104b4d1421f58cbf9a2", features = [
+alloy-rpc-types-eth = "0.12"
+alloy-eips = { git = "https://github.com/alloy-rs/alloy.git", rev = "bc190c61f1bee74271a29ea6275ab674fcfe73d5" }
+alloy-contract = { git = "https://github.com/alloy-rs/alloy.git", rev = "bc190c61f1bee74271a29ea6275ab674fcfe73d5" }
+alloy-network = { git = "https://github.com/alloy-rs/alloy.git", rev = "bc190c61f1bee74271a29ea6275ab674fcfe73d5" }
+alloy-primitives = { version = "0.8.22", default-features = false }
+alloy-consensus = { git = "https://github.com/alloy-rs/alloy.git", rev = "bc190c61f1bee74271a29ea6275ab674fcfe73d5" }
+alloy-provider = { git = "https://github.com/alloy-rs/alloy.git", rev = "bc190c61f1bee74271a29ea6275ab674fcfe73d5", features = [
   "ws",
 ] }
-alloy-rlp = "0.3.5"
-alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy.git", rev = "83343b172585fe4e040fb104b4d1421f58cbf9a2" }
-alloy-sol-types = { version = "0.7.2", features = ["json"] }
-alloy-signer = { git = "https://github.com/alloy-rs/alloy.git", rev = "83343b172585fe4e040fb104b4d1421f58cbf9a2" }
-alloy-transport = { git = "https://github.com/alloy-rs/alloy.git", rev = "83343b172585fe4e040fb104b4d1421f58cbf9a2" }
-alloy-transport-http = { git = "https://github.com/alloy-rs/alloy.git", rev = "83343b172585fe4e040fb104b4d1421f58cbf9a2", features = ["reqwest-rustls-tls"] }
-alloy-transport-ws = { git = "https://github.com/alloy-rs/alloy.git", rev = "83343b172585fe4e040fb104b4d1421f58cbf9a2" }
+alloy-rlp = "0.3.9"
+alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy.git", rev = "bc190c61f1bee74271a29ea6275ab674fcfe73d5" }
+alloy-sol-types = { version = "0.8.22", features = ["json"] }
+alloy-signer = { git = "https://github.com/alloy-rs/alloy.git", rev = "bc190c61f1bee74271a29ea6275ab674fcfe73d5" }
+alloy-transport = { git = "https://github.com/alloy-rs/alloy.git", rev = "bc190c61f1bee74271a29ea6275ab674fcfe73d5" }
+alloy-transport-http = { git = "https://github.com/alloy-rs/alloy.git", rev = "bc190c61f1bee74271a29ea6275ab674fcfe73d5", features = ["reqwest-rustls-tls"] }
+alloy-transport-ws = { git = "https://github.com/alloy-rs/alloy.git", rev = "bc190c61f1bee74271a29ea6275ab674fcfe73d5" }
 anyhow = "1.0"
 async-stream = "0.3.0"
 async-trait = "0.1.71"
@@ -95,6 +97,14 @@ tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 tracing-test = "0.2.5"
 tokio = { version = "1.35.1", features = ["full", "tracing"] }
 tokio-stream = "0.1.15"
+hex = { version = "0.4.3", default-features = false, features = [
+  "alloc",
+  "serde",
+] }
+zip = { version = "2.4.2", features = ["flate2"] }
+walkdir = "2.3.2"
+tempfile = "3.5.0"
+itertools = "0.14.0"
 
 # model checking and verification
 
@@ -114,6 +124,7 @@ mcr-protocol-client-core-eth = { path = "protocol/mcr/clients/eth" }
 mcr-protocol-client-core-mock = { path = "protocol/mcr/clients/mock" }
 mcr-protocol-client = { path = "protocol/mcr/cli/client" }
 mcr-protocol = { path = "protocol/mcr/cli"}
+mcr-protocol-deployer-core-eth = { path = "protocol/mcr/dlu/eth/deployer-core" }
 ### network
 mcr-network-client = { path = "network/mcr/cli/client" }
 mcr-network-coordinator = { path = "network/mcr/cli/coordinator" }
@@ -122,6 +133,7 @@ mcr-network = { path = "network/mcr/cli/network" }
 # util
 secure-signer-eth = { path = "util/signing/eth" }
 ffs-environment = { path = "util/environment" }
+commander = { path = "util/commander" }
 
 [workspace.lints.clippy]
 debug_assert_with_mut_call = "deny"

Cargo.toml

@@ -6,6 +6,7 @@ use mcr_types::block_commitment::BlockCommitment;
 use serde::{Deserialize, Serialize};
 
 #[derive(Parser, Serialize, Deserialize, Debug, Clone)]
+#[clap(help_expected = true)]
 pub struct PostAdminCommitment {
 	#[clap(flatten)]
 	pub config: Option<Config>,

protocol/mcr/cli/client/src/cli/eth/post_admin_commitment.rs

@@ -0,0 +1,21 @@
+[package]
+name = "mcr-protocol-deployer"
+version = { workspace = true }
+edition = { workspace = true }
+license = { workspace = true }
+authors = { workspace = true }
+homepage = { workspace = true }
+publish = { workspace = true }
+rust-version = { workspace = true }
+
+[dependencies]
+tokio = { workspace = true }
+serde = { workspace = true, features = ["derive"] }
+clap = { workspace = true}
+dotenv = { workspace = true }
+anyhow = { workspace = true }
+mcr-protocol-deployer-core-eth = { workspace = true }
+mcr-types = { workspace = true }
+
+[lints]
+workspace = true

protocol/mcr/cli/deployer/Cargo.toml

@@ -0,0 +1,20 @@
+use anyhow::Context;
+use clap::Parser;
+use mcr_protocol_deployer_core_eth::dev::config::Config;
+use serde::{Deserialize, Serialize};
+
+#[derive(Parser, Serialize, Deserialize, Debug, Clone)]
+#[clap(help_expected = true)]
+pub struct Deploy {
+	#[clap(flatten)]
+	pub config: Option<Config>,
+}
+
+impl Deploy {
+	pub async fn execute(&self) -> Result<(), anyhow::Error> {
+		let config = self.config.clone().context("no config provided")?;
+		let deployer = config.build()?;
+		deployer.deploy().await?;
+		Ok(())
+	}
+}

protocol/mcr/cli/deployer/src/cli/eth/deploy.rs

@@ -0,0 +1,18 @@
+pub mod deploy;
+
+use clap::Subcommand;
+
+#[derive(Subcommand)]
+#[clap(rename_all = "kebab-case")]
+pub enum Eth {
+	Deploy(deploy::Deploy),
+}
+
+impl Eth {
+	pub async fn execute(&self) -> Result<(), anyhow::Error> {
+		match self {
+			Eth::Deploy(cmd) => cmd.execute().await?,
+		}
+		Ok(())
+	}
+}

protocol/mcr/cli/deployer/src/cli/eth/mod.rs

@@ -0,0 +1,48 @@
+pub mod eth;
+use clap::{Parser, Subcommand};
+
+/// The `mcr-protocol-client` CLI.
+#[derive(Parser)]
+#[clap(rename_all = "kebab-case")]
+pub struct McrProtocolDeployer {
+	#[clap(subcommand)]
+	command: Option<McrProtocolDeployerSubcommand>,
+}
+
+/// The subcommands of the `mcr-protocol-client` CLI.
+#[derive(Subcommand)]
+#[clap(rename_all = "kebab-case")]
+pub enum McrProtocolDeployerSubcommand {
+	Run,
+	#[clap(subcommand)]
+	Eth(eth::Eth),
+}
+
+/// Implement the `From` trait for `McrProtocolDeployer` to convert it into a `McrProtocolDeployerSubcommand`.
+impl From<McrProtocolDeployer> for McrProtocolDeployerSubcommand {
+	fn from(client: McrProtocolDeployer) -> Self {
+		client.command.unwrap_or(McrProtocolDeployerSubcommand::Run)
+	}
+}
+
+/// Implement the `McrProtocolDeployer` CLI.
+impl McrProtocolDeployer {
+	pub async fn execute(self) -> Result<(), anyhow::Error> {
+		let subcommand: McrProtocolDeployerSubcommand = self.into();
+		subcommand.execute().await
+	}
+}
+
+/// Implement the `McrProtocolDeployerSubcommand` CLI.
+/// This is where the actual logic of the CLI is implemented.
+impl McrProtocolDeployerSubcommand {
+	pub async fn execute(&self) -> Result<(), anyhow::Error> {
+		match self {
+			McrProtocolDeployerSubcommand::Run => {
+				println!("mcr-protocol-client is under development. Please check back later.");
+			}
+			McrProtocolDeployerSubcommand::Eth(eth) => eth.execute().await?,
+		}
+		Ok(())
+	}
+}

protocol/mcr/cli/deployer/src/cli/mod.rs

@@ -0,0 +1 @@
+pub mod cli;

protocol/mcr/cli/deployer/src/lib.rs

@@ -0,0 +1,14 @@
+use clap::*;
+use dotenv::dotenv;
+use mcr_protocol_deployer::cli;
+
+#[tokio::main]
+async fn main() -> Result<(), anyhow::Error> {
+	// Load environment variables from .env file.
+	dotenv().ok();
+
+	// Run the CLI.
+	let mcr_protocol_deployer = cli::McrProtocolDeployer::parse();
+	mcr_protocol_deployer.execute().await?;
+	Ok(())
+}

protocol/mcr/cli/deployer/src/main.rs

@@ -38,6 +38,7 @@ tokio = { workspace = true }
 tokio-stream = { workspace = true }
 tracing = { workspace = true }
 serde = { workspace = true }
+hex = { workspace = true }
 
 alloy-rpc-types = { workspace = true }
 futures = { workspace = true }