fix: restructure admin commitment.

Author: l-monninger

Cargo.lock

@@ -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(())
 	}

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

@@ -31,6 +31,7 @@ alloy-transport-ws = { workspace = true }
 anyhow = { workspace = true }
 async-stream = { workspace = true }
 async-trait = { workspace = true }
+clap = { workspace = true }
 serde_json = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true }

protocol/mcr/clients/eth/Cargo.toml

@@ -17,13 +17,15 @@ use alloy_primitives::Address;
 use alloy_transport::BoxTransport;
 use alloy_transport_ws::WsConnect;
 use anyhow::Context;
+use clap::Parser;
 use secure_signer::cryptography::secp256k1::Secp256k1;
+use secure_signer::key::TryFromCanonicalString;
 use secure_signer_eth::Signer;
 use secure_signer_loader::{identifiers::SignerIdentifier, Load};
 use serde::{Deserialize, Serialize};
 use tracing::info;
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Parser, Debug, Serialize, Deserialize, Clone)]
 pub struct Config {
 	/// The address of the MCR settlement contract.
 	pub mcr_contract_address: String,
@@ -34,6 +36,7 @@ pub struct Config {
 	/// The Ethereum chain ID.
 	pub chain_id: u64,
 	/// The signer identifier.
+	#[arg(value_parser = SignerIdentifier::try_from_canonical_string)]
 	pub signer_identifier: SignerIdentifier,
 	/// Whether to run in settlement admin mode.
 	pub run_commitment_admin_mode: bool,