Merge branch 'main' into dkg_nodesigs

Author: mskrzypkows

crates/cli/Cargo.toml

@@ -18,13 +18,13 @@ hex.workspace = true
 humantime.workspace = true
 tokio.workspace = true
 pluto-app.workspace = true
+pluto-eth1wrap.workspace = true
 pluto-cluster.workspace = true
 pluto-crypto.workspace = true
 pluto-relay-server.workspace = true
 pluto-tracing.workspace = true
 pluto-core.workspace = true
 pluto-p2p.workspace = true
-pluto-eth1wrap.workspace = true
 pluto-eth2api.workspace = true
 pluto-eth2util.workspace = true
 pluto-k1util.workspace = true

crates/cli/src/cli.rs

@@ -4,6 +4,7 @@ use clap::{Parser, Subcommand};
 
 use crate::commands::{
     create_cluster::CreateClusterArgs,
+    create_dkg::CreateDkgArgs,
     create_enr::CreateEnrArgs,
     enr::EnrArgs,
     relay::RelayArgs,
@@ -133,6 +134,10 @@ pub struct CreateArgs {
 /// Create subcommands
 #[derive(Subcommand)]
 pub enum CreateCommands {
+    /// Create a cluster definition file for a new Distributed Key Generation
+    /// ceremony
+    Dkg(Box<CreateDkgArgs>),
+
     /// Create an Ethereum Node Record (ENR) private key to identify this charon
     /// client
     Enr(CreateEnrArgs),

crates/cli/src/commands/address_validation.rs

@@ -0,0 +1,78 @@
+#[derive(thiserror::Error, Debug)]
+pub enum AddressValidationError {
+    /// Value exceeds usize::MAX.
+    #[error("Value {value} exceeds usize::MAX")]
+    ValueExceedsUsize {
+        /// The value that exceeds usize::MAX.
+        value: u64,
+    },
+
+    /// Mismatching number of fee recipient addresses.
+    #[error(
+        "mismatching --num-validators and --fee-recipient-addresses: num_validators={num_validators}, addresses={addresses}"
+    )]
+    MismatchingFeeRecipientAddresses {
+        /// Number of validators.
+        num_validators: u64,
+        /// Number of addresses.
+        addresses: usize,
+    },
+
+    /// Mismatching number of withdrawal addresses.
+    #[error(
+        "mismatching --num-validators and --withdrawal-addresses: num_validators={num_validators}, addresses={addresses}"
+    )]
+    MismatchingWithdrawalAddresses {
+        /// Number of validators.
+        num_validators: u64,
+        /// Number of addresses.
+        addresses: usize,
+    },
+}
+
+type Result<T> = std::result::Result<T, AddressValidationError>;
+
+/// Validates that addresses match the number of validators.
+/// If only one address is provided, it fills the slice to match num_validators.
+///
+/// Returns an error if the number of addresses doesn't match and isn't exactly
+/// 1.
+pub(super) fn validate_addresses(
+    num_validators: u64,
+    fee_recipient_addrs: &[String],
+    withdrawal_addrs: &[String],
+) -> Result<(Vec<String>, Vec<String>)> {
+    let num_validators_usize =
+        usize::try_from(num_validators).map_err(|_| AddressValidationError::ValueExceedsUsize {
+            value: num_validators,
+        })?;
+
+    if fee_recipient_addrs.len() != num_validators_usize && fee_recipient_addrs.len() != 1 {
+        return Err(AddressValidationError::MismatchingFeeRecipientAddresses {
+            num_validators,
+            addresses: fee_recipient_addrs.len(),
+        });
+    }
+
+    if withdrawal_addrs.len() != num_validators_usize && withdrawal_addrs.len() != 1 {
+        return Err(AddressValidationError::MismatchingWithdrawalAddresses {
+            num_validators,
+            addresses: withdrawal_addrs.len(),
+        });
+    }
+
+    let mut fee_addrs = fee_recipient_addrs.to_vec();
+    let mut withdraw_addrs = withdrawal_addrs.to_vec();
+
+    if fee_addrs.len() == 1 {
+        let addr = fee_addrs[0].clone();
+        fee_addrs = vec![addr; num_validators_usize];
+    }
+
+    if withdraw_addrs.len() == 1 {
+        let addr = withdraw_addrs[0].clone();
+        withdraw_addrs = vec![addr; num_validators_usize];
+    }
+
+    Ok((fee_addrs, withdraw_addrs))
+}

crates/cli/src/commands/constants.rs

@@ -0,0 +1,4 @@
+pub(super) const DEFAULT_NETWORK: &str = "mainnet";
+pub(super) const ZERO_ADDRESS: &str = "0x0000000000000000000000000000000000000000";
+pub(crate) const MIN_NODES: u64 = 3;
+pub(crate) const MIN_THRESHOLD: u64 = 2;

crates/cli/src/commands/create_cluster.rs

@@ -46,19 +46,17 @@ use rand::rngs::OsRng;
 use tracing::{debug, info, warn};
 
 use crate::{
-    commands::create_dkg,
+    commands::{
+        address_validation::validate_addresses,
+        constants::{MIN_NODES, MIN_THRESHOLD},
+        create_dkg,
+    },
     error::{
         CliError, CreateClusterError, InvalidNetworkConfigError, Result as CliResult,
         ThresholdError,
     },
 };
 
-/// Minimum number of nodes required in a cluster.
-pub const MIN_NODES: u64 = 3;
-/// Minimum threshold value.
-pub const MIN_THRESHOLD: u64 = 2;
-/// Zero ethereum address (not allowed on mainnet/gnosis).
-pub const ZERO_ADDRESS: &str = "0x0000000000000000000000000000000000000000";
 /// HTTP scheme.
 const HTTP_SCHEME: &str = "http";
 /// HTTPS scheme.
@@ -1210,52 +1208,6 @@ async fn load_definition(
     Ok(def)
 }
 
-/// Validates that addresses match the number of validators.
-/// If only one address is provided, it fills the slice to match num_validators.
-///
-/// Returns an error if the number of addresses doesn't match and isn't exactly
-/// 1.
-fn validate_addresses(
-    num_validators: u64,
-    fee_recipient_addrs: &[String],
-    withdrawal_addrs: &[String],
-) -> Result<(Vec<String>, Vec<String>)> {
-    let num_validators_usize =
-        usize::try_from(num_validators).map_err(|_| CreateClusterError::ValueExceedsUsize {
-            value: num_validators,
-        })?;
-
-    if fee_recipient_addrs.len() != num_validators_usize && fee_recipient_addrs.len() != 1 {
-        return Err(CreateClusterError::MismatchingFeeRecipientAddresses {
-            num_validators,
-            addresses: fee_recipient_addrs.len(),
-        });
-    }
-
-    if withdrawal_addrs.len() != num_validators_usize && withdrawal_addrs.len() != 1 {
-        return Err(CreateClusterError::MismatchingWithdrawalAddresses {
-            num_validators,
-            addresses: withdrawal_addrs.len(),
-        });
-    }
-
-    let mut fee_addrs = fee_recipient_addrs.to_vec();
-    let mut withdraw_addrs = withdrawal_addrs.to_vec();
-
-    // Expand single address to match num_validators
-    if fee_addrs.len() == 1 {
-        let addr = fee_addrs[0].clone();
-        fee_addrs = vec![addr; num_validators_usize];
-    }
-
-    if withdraw_addrs.len() == 1 {
-        let addr = withdraw_addrs[0].clone();
-        withdraw_addrs = vec![addr; num_validators_usize];
-    }
-
-    Ok((fee_addrs, withdraw_addrs))
-}
-
 /// Returns the safe threshold, logging a warning if a non-standard threshold is
 /// provided.
 fn safe_threshold(num_nodes: u64, threshold: Option<u64>) -> u64 {