fix: clean up secure signing.

Author: l-monninger

Cargo.lock

@@ -10,6 +10,8 @@ members = [
   "protocol-units/post-confirmations/*",
   "protocol-units/fast-confirmations/*",
   "protocol-units/ffs/*",
+  "util/signing/eth",
+  "util/environment",
 ]
 
 [workspace.package]
@@ -65,11 +67,19 @@ tracing-test = "0.2.5"
 tokio = { version = "1.35.1", features = ["full", "tracing"] }
 tokio-stream = "0.1.15"
 
+# 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"  }
+secure-signer-aws-kms = { git = "https://github.com/movementlabsxyz/secure-signing.git", rev = "62d9ae5fd098d2c0d2a2da2004ada91681e0df53"  }
+
 # internal
 ## mcr
 mcr-types = { path = "protocol-units/mcr/util/types" }
+mcr-config = { path = "protocol-units/mcr/util/config" }
 mcr-client-util = { path = "protocol-units/mcr/clients/util" }
 mcr-settlement-client = { path = "protocol-units/mcr/client" }
+secure-signing-eth = { path = "util/signing/eth" }
+ffs-environment = { path = "util/environment" }
 
 [workspace.lints.clippy]
 debug_assert_with_mut_call = "deny"

Cargo.toml

@@ -43,12 +43,17 @@ tokio = { workspace = true }
 tokio-stream = { workspace = true }
 tracing = { workspace = true }
 serde = { workspace = true }
-
+secure-signer = { workspace = true }
+secure-signer-loader = { workspace = true }
+secure-signing-eth = { workspace = true }
 
 alloy-rpc-types = { workspace = true }
 futures = { workspace = true }
 tracing-subscriber = { workspace = true }
 
+mcr-types = { workspace = true }
+mcr-config = { workspace = true }
+
 [features]
 default = ["eth"]
 e2e = ["eth"]

protocol-units/mcr/client/Cargo.toml

@@ -4,12 +4,12 @@ use alloy_network::EthereumWallet;
 use alloy_primitives::Address;
 use alloy_primitives::U256;
 use anyhow::Context;
-use godfig::{backend::config_file::ConfigFile, Godfig};
+use ffs_environment::{backend::config_file::ConfigFile, ffs_environment};
+use mcr_config::Config;
 use mcr_settlement_client::eth_client::Client;
 use mcr_settlement_client::eth_client::{MOVEToken, MovementStaking, MCR};
 use mcr_settlement_client::McrSettlementClientOperations;
-use mcr_settlement_config::Config;
-use movement_types::block::{BlockCommitment, Commitment, Id};
+use mcr_types::block_commitment::{BlockCommitment, Commitment, Id};
 use std::str::FromStr;
 use tokio_stream::StreamExt;
 use tracing::info;
@@ -219,10 +219,10 @@ pub async fn main() -> Result<(), anyhow::Error> {
 	let dot_movement = dot_movement::DotMovement::try_from_env()?;
 	let config_file = dot_movement.try_get_or_create_config_file().await?;
 
-	// get a matching godfig object
-	let godfig: Godfig<Config, ConfigFile> =
-		Godfig::new(ConfigFile::new(config_file), vec!["mcr_settlement".to_string()]);
-	let config: Config = godfig.try_wait_for_ready().await?;
+	// get a matching ffs_environment object
+	let ffs_environment: ffs_environment<Config, ConfigFile> =
+		ffs_environment::new(ConfigFile::new(config_file), vec!["mcr_settlement".to_string()]);
+	let config: Config = ffs_environment.try_wait_for_ready().await?;
 	let rpc_url = config.eth_rpc_connection_url();
 
 	let testing_config = config.testing.as_ref().context("Testing config not defined.")?;
@@ -239,7 +239,7 @@ pub async fn main() -> Result<(), anyhow::Error> {
 	// Build client 1 and send the first commitment.
 	//let settlement_config =
 	let config1 = Config {
-		settle: mcr_settlement_config::common::settlement::Config {
+		settle: mcr_config::common::settlement::Config {
 			signer_private_key: testing_config
 				.well_known_account_private_keys
 				.get(1)
@@ -265,7 +265,7 @@ pub async fn main() -> Result<(), anyhow::Error> {
 
 	// Build client 2 and send the second commitment.
 	let config2 = Config {
-		settle: mcr_settlement_config::common::settlement::Config {
+		settle: mcr_config::common::settlement::Config {
 			signer_private_key: testing_config
 				.well_known_account_private_keys
 				.get(2)

protocol-units/mcr/client/src/bin/e2e/test_client_settlement.rs

@@ -20,11 +20,11 @@ use alloy_sol_types::sol;
 use alloy_transport::BoxTransport;
 use alloy_transport_ws::WsConnect;
 use anyhow::Context;
-use mcr_settlement_config::Config;
-use movement_signer::cryptography::secp256k1::Secp256k1;
-use movement_signer_loader::Load;
-use movement_signing_eth::HsmSigner;
-use movement_types::block::{BlockCommitment, Commitment, Id};
+use mcr_config::Config;
+use mcr_types::block_commitment::{BlockCommitment, Commitment, Id};
+use secure_signer::cryptography::secp256k1::Secp256k1;
+use secure_signer_loader::Load;
+use secure_signing_eth::HsmSigner;
 use serde_json::Value as JsonValue;
 use std::array::TryFromSliceError;
 use std::fs;

protocol-units/mcr/client/src/eth_client.rs

@@ -1,4 +1,4 @@
-use movement_types::block::BlockCommitment;
+use mcr_types::block_commitment::BlockCommitment;
 use tokio_stream::Stream;
 pub mod mock;
 

protocol-units/mcr/client/src/lib.rs

@@ -1,6 +1,6 @@
 use crate::{CommitmentStream, McrSettlementClientOperations};
-use mcr_settlement_config::Config;
-use movement_types::block::BlockCommitment;
+use mcr_config::Config;
+use mcr_types::block_commitment::BlockCommitment;
 use std::collections::BTreeMap;
 use std::sync::{Arc, Mutex};
 use tokio::sync::{mpsc, RwLock};
@@ -153,7 +153,7 @@ impl McrSettlementClientOperations for McrSettlementClient {
 pub mod test {
 
 	use super::*;
-	use movement_types::block::Commitment;
+	use mcr_types::block_commitment::Commitment;
 
 	use futures::future;
 	use tokio::select;

protocol-units/mcr/client/src/mock.rs

@@ -21,9 +21,8 @@ futures = { workspace = true }
 tokio = { workspace = true }
 tokio-stream = { workspace = true }
 serde_json = { workspace = true }
-
-[dev-dependencies]
-mcr-settlement-client = { workspace = true, features = ["mock"] }
+mcr-types = { workspace = true }
+mcr-config = { workspace = true }
 
 [features]
 default = ["stub"]

protocol-units/mcr/manager/Cargo.toml

@@ -1,4 +1,4 @@
-use movement_types::block::{BlockCommitment, BlockCommitmentEvent};
+use mcr_types::block_commitment::{BlockCommitment, BlockCommitmentEvent};
 use tokio_stream::Stream;
 
 mod manager;

protocol-units/mcr/manager/src/lib.rs

@@ -1,8 +1,8 @@
 use crate::{BlockCommitmentEvent, CommitmentEventStream, McrSettlementManagerOperations};
 
+use mcr_config::Config;
 use mcr_settlement_client::McrSettlementClientOperations;
-use mcr_settlement_config::Config;
-use movement_types::block::{BlockCommitment, BlockCommitmentRejectionReason};
+use mcr_types::block_commitment::{BlockCommitment, BlockCommitmentRejectionReason};
 
 use async_stream::stream;
 use async_trait::async_trait;
@@ -147,7 +147,7 @@ fn process_commitments<C: McrSettlementClientOperations + Send + 'static>(
 mod tests {
 	use super::*;
 	use mcr_settlement_client::mock::McrSettlementClient;
-	use movement_types::block::{BlockCommitment, Commitment};
+	use mcr_types::block_commitment::{BlockCommitment, Commitment};
 
 	#[tokio::test]
 	async fn test_block_commitment_accepted() -> Result<(), anyhow::Error> {