Merge pull request #20 from movementlabsxyz/fix/12

Fixes Deployment Script Bugs

Author: l-monninger

Cargo.lock

@@ -7,7 +7,6 @@ members = [
   # mcr
   "protocol/mcr/util/*",
   "protocol/mcr/clients/*",
-  "protocol/mcr/client",
   "protocol/mcr/manager",
   "protocol/mcr/cli/*",
 
@@ -97,6 +96,9 @@ tracing-test = "0.2.5"
 tokio = { version = "1.35.1", features = ["full", "tracing"] }
 tokio-stream = "0.1.15"
 
+# model checking and verification
+
+
 # secure-signing
 secure-signer = { git = "https://github.com/movementlabsxyz/secure-signing.git", rev = "62d9ae5fd098d2c0d2a2da2004ada91681e0df53" }
 secure-signer-loader = { git = "https://github.com/movementlabsxyz/secure-signing.git", rev = "62d9ae5fd098d2c0d2a2da2004ada91681e0df53"  }
@@ -107,8 +109,9 @@ secure-signer-aws-kms = { git = "https://github.com/movementlabsxyz/secure-signi
 ### protocol
 mcr-types = { path = "protocol/mcr/util/types" }
 mcr-config = { path = "protocol/mcr/util/config" }
-mcr-client-util = { path = "protocol/mcr/clients/util" }
-mcr-settlement-client = { path = "protocol/mcr/client" }
+mcr-protocol-client-core-util = { path = "protocol/mcr/clients/util" }
+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"}
 ### network
@@ -117,7 +120,7 @@ mcr-network-coordinator = { path = "network/mcr/cli/coordinator" }
 mcr-network = { path = "network/mcr/cli/network" }
 
 # util
-secure-signing-eth = { path = "util/signing/eth" }
+secure-signer-eth = { path = "util/signing/eth" }
 ffs-environment = { path = "util/environment" }
 
 [workspace.lints.clippy]

Cargo.toml

@@ -14,6 +14,9 @@ serde = { workspace = true, features = ["derive"] }
 clap = { workspace = true}
 dotenv = { workspace = true }
 anyhow = { workspace = true }
+mcr-protocol-client-core-util = { workspace = true }
+mcr-protocol-client-core-eth = { workspace = true }
+mcr-types = { workspace = true }
 
 [lints]
 workspace = true

protocol/mcr/cli/client/Cargo.toml

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

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

@@ -0,0 +1,22 @@
+use anyhow::Context;
+use clap::Parser;
+use mcr_protocol_client_core_eth::config::Config;
+use mcr_protocol_client_core_util::McrClientOperations;
+use mcr_types::block_commitment::BlockCommitment;
+use serde::{Deserialize, Serialize};
+
+#[derive(Parser, Serialize, Deserialize, Debug, Clone)]
+pub struct PostAdminCommitment {
+	#[clap(flatten)]
+	pub config: Option<Config>,
+}
+
+impl PostAdminCommitment {
+	pub async fn execute(&self) -> Result<(), anyhow::Error> {
+		let config = self.config.clone().context("no config provided")?;
+		let client = config.build().await?;
+		client.force_block_commitment(BlockCommitment::test()).await?;
+
+		Ok(())
+	}
+}

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

@@ -1,3 +1,4 @@
+pub mod eth;
 use clap::{Parser, Subcommand};
 
 /// The `mcr-protocol-client` CLI.
@@ -13,6 +14,8 @@ pub struct McrProtocolClient {
 #[clap(rename_all = "kebab-case")]
 pub enum McrProtocolClientSubcommand {
 	Run,
+	#[clap(subcommand)]
+	Eth(eth::Eth),
 }
 
 /// Implement the `From` trait for `McrProtocolClient` to convert it into a `McrProtocolClientSubcommand`.
@@ -38,6 +41,7 @@ impl McrProtocolClientSubcommand {
 			McrProtocolClientSubcommand::Run => {
 				println!("mcr-protocol-client is under development. Please check back later.");
 			}
+			McrProtocolClientSubcommand::Eth(eth) => eth.execute().await?,
 		}
 		Ok(())
 	}