Tweak timeboost-config.

Author: twittner

timeboost-config/src/binaries/mkconfig.rs

@@ -13,8 +13,8 @@ use multisig::x25519;
 use secp256k1::rand::SeedableRng as _;
 use timeboost_config::{ChainConfig, ParentChain};
 use timeboost_config::{
-    CommitteeConfig, CommitteeMember, InternalNet, NodeConfig, NodeKeyConfig, NodeKeypairConfig,
-    NodeNetConfig, PublicNet,
+    CommitteeConfig, CommitteeMember, InternalNet, NodeConfig, NodeKeypair, NodeKeys, NodeNet,
+    PublicNet,
 };
 use timeboost_crypto::prelude::{DkgDecKey, DkgEncKey};
 use url::Url;
@@ -129,7 +129,7 @@ impl Args {
             };
 
             let config = NodeConfig {
-                net: NodeNetConfig {
+                net: NodeNet {
                     public: PublicNet {
                         address: public_addr,
                     },
@@ -138,32 +138,30 @@ impl Args {
                         nitro: nitro_addr,
                     },
                 },
-                keys: NodeKeyConfig {
-                    signing: NodeKeypairConfig {
+                keys: NodeKeys {
+                    signing: NodeKeypair {
                         secret: signing_keypair.secret_key(),
                         public: signing_keypair.public_key(),
                     },
-                    dh: NodeKeypairConfig {
+                    dh: NodeKeypair {
                         secret: dh_keypair.secret_key(),
                         public: dh_keypair.public_key(),
                     },
-                    dkg: NodeKeypairConfig {
+                    dkg: NodeKeypair {
                         secret: dkg_dec_key.clone(),
                         public: DkgEncKey::from(&dkg_dec_key),
                     },
                 },
-                chain: ChainConfig::builder()
-                    .namespace(self.chain_namespace)
-                    .parent(
-                        ParentChain::builder()
-                            .id(self.parent_chain_id)
-                            .rpc_url(self.parent_rpc_url.clone())
-                            .ibox_contract(self.parent_ibox_contract)
-                            .key_manager_contract(self.key_manager_contract)
-                            .block_tag(self.parent_block_tag)
-                            .build(),
-                    )
-                    .build(),
+                chain: ChainConfig {
+                    namespace: self.chain_namespace,
+                    parent: ParentChain {
+                        id: self.parent_chain_id,
+                        rpc_url: self.parent_rpc_url.clone(),
+                        ibox_contract: self.parent_ibox_contract,
+                        block_tag: self.parent_block_tag,
+                        key_manager_contract: self.key_manager_contract,
+                    },
+                },
             };
 
             members.push(CommitteeMember {

timeboost-config/src/chain.rs

@@ -6,47 +6,15 @@ use url::Url;
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Builder)]
 pub struct ChainConfig {
-    namespace: u64,
-    parent: ParentChain,
+    pub namespace: u64,
+    pub parent: ParentChain,
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Builder)]
 pub struct ParentChain {
-    id: u64,
-    rpc_url: Url,
-    ibox_contract: Address,
-    block_tag: BlockNumberOrTag,
-    key_manager_contract: Address,
-}
-
-impl ChainConfig {
-    pub fn namespace(&self) -> u64 {
-        self.namespace
-    }
-
-    pub fn parent(&self) -> &ParentChain {
-        &self.parent
-    }
-}
-
-impl ParentChain {
-    pub fn chain_id(&self) -> u64 {
-        self.id
-    }
-
-    pub fn rpc_url(&self) -> &Url {
-        &self.rpc_url
-    }
-
-    pub fn ibox_contract(&self) -> &Address {
-        &self.ibox_contract
-    }
-
-    pub fn block_tag(&self) -> BlockNumberOrTag {
-        self.block_tag
-    }
-
-    pub fn key_manager_contract(&self) -> &Address {
-        &self.key_manager_contract
-    }
+    pub id: u64,
+    pub rpc_url: Url,
+    pub ibox_contract: Address,
+    pub block_tag: BlockNumberOrTag,
+    pub key_manager_contract: Address,
 }

timeboost-config/src/committee.rs

@@ -0,0 +1,48 @@
+use core::fmt;
+use std::{path::Path, str::FromStr};
+
+use cliquenet::Address;
+use multisig::x25519;
+use serde::{Deserialize, Serialize};
+use timeboost_crypto::prelude::DkgEncKey;
+
+use crate::ConfigError;
+
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub struct CommitteeConfig {
+    pub effective_timestamp: jiff::Timestamp,
+    #[serde(default)]
+    pub members: Vec<CommitteeMember>,
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub struct CommitteeMember {
+    pub signing_key: multisig::PublicKey,
+    pub dh_key: x25519::PublicKey,
+    pub dkg_enc_key: DkgEncKey,
+    pub public_address: Address,
+}
+
+impl CommitteeConfig {
+    pub async fn read<P: AsRef<Path>>(path: P) -> Result<Self, ConfigError> {
+        tokio::fs::read_to_string(path.as_ref())
+            .await
+            .map_err(|e| ConfigError(Box::new(e)))?
+            .parse()
+    }
+}
+
+impl FromStr for CommitteeConfig {
+    type Err = ConfigError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        toml::from_str(s).map_err(|e| ConfigError(Box::new(e)))
+    }
+}
+
+impl fmt::Display for CommitteeConfig {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let s = toml::to_string_pretty(self).map_err(|_| fmt::Error)?;
+        f.write_str(&s)
+    }
+}

timeboost-config/src/lib.rs

@@ -1,150 +1,12 @@
-use anyhow::Result;
-use cliquenet::Address;
-use multisig::x25519;
-use serde::{Deserialize, Serialize};
-use timeboost_crypto::prelude::{DkgDecKey, DkgEncKey};
-use tracing::error;
-
 mod chain;
+mod committee;
+mod node;
 
 pub use chain::{ChainConfig, ChainConfigBuilder, ParentChain, ParentChainBuilder};
-
-pub const DECRYPTER_PORT_OFFSET: u16 = 1;
-pub const CERTIFIER_PORT_OFFSET: u16 = 2;
-
-/// Config for each node, containing private keys, public keys, chain_config, network addresses etc
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct NodeConfig {
-    pub net: NodeNetConfig,
-    pub keys: NodeKeyConfig,
-    pub chain: ChainConfig,
-}
-
-/// Network addresses in [`NodeConfig`]
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct NodeNetConfig {
-    pub public: PublicNet,
-    pub internal: InternalNet,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct PublicNet {
-    pub address: Address,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct InternalNet {
-    pub address: Address,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub nitro: Option<Address>,
-}
-
-/// Key materials in [`NodeConfig`]
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct NodeKeyConfig {
-    pub signing: NodeKeypairConfig<multisig::SecretKey, multisig::PublicKey>,
-    pub dh: NodeKeypairConfig<x25519::SecretKey, x25519::PublicKey>,
-    pub dkg: NodeKeypairConfig<DkgDecKey, DkgEncKey>,
-}
-
-/// A keypair
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct NodeKeypairConfig<SK, PK> {
-    pub secret: SK,
-    pub public: PK,
-}
-
-/// Config for the new committee info to be updated to the KeyManager contract.
-/// This file is written during per-node run of `mkconfig`
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct CommitteeConfig {
-    pub effective_timestamp: jiff::Timestamp,
-    #[serde(default)]
-    pub members: Vec<CommitteeMember>,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct CommitteeMember {
-    pub signing_key: multisig::PublicKey,
-    pub dh_key: x25519::PublicKey,
-    pub dkg_enc_key: DkgEncKey,
-    pub public_address: Address,
-}
+pub use committee::{CommitteeConfig, CommitteeMember};
+pub use node::{CERTIFIER_PORT_OFFSET, DECRYPTER_PORT_OFFSET};
+pub use node::{InternalNet, NodeConfig, NodeKeypair, NodeKeys, NodeNet, PublicNet};
 
 #[derive(Debug, thiserror::Error)]
 #[error("config error: {0}")]
 pub struct ConfigError(#[source] Box<dyn std::error::Error + Send + Sync>);
-
-macro_rules! ConfigImpls {
-    ($t:ty) => {
-        impl core::str::FromStr for $t {
-            type Err = ConfigError;
-
-            fn from_str(s: &str) -> Result<Self, Self::Err> {
-                toml::from_str(s).map_err(|e| ConfigError(Box::new(e)))
-            }
-        }
-
-        impl core::fmt::Display for $t {
-            fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
-                let s = toml::to_string_pretty(self).map_err(|_| core::fmt::Error)?;
-                f.write_str(&s)
-            }
-        }
-
-        impl $t {
-            pub async fn read<P: AsRef<std::path::Path>>(path: P) -> Result<Self, ConfigError> {
-                tokio::fs::read_to_string(path.as_ref())
-                    .await
-                    .map_err(|e| ConfigError(Box::new(e)))?
-                    .parse()
-            }
-        }
-    };
-}
-
-ConfigImpls!(NodeConfig);
-ConfigImpls!(CommitteeConfig);
-
-#[cfg(test)]
-mod tests {
-    // generated via `just mkconfig 1`
-    const CONFIG: &str = r#"
-[net.public]
-address = "127.0.0.1:8001"
-
-[net.internal]
-address = "127.0.0.1:11001"
-
-[keys.signing]
-secret = "AS9HxHVwMNyAYsdGntcD56iBbobBn7RPBi32qEBGDSSb"
-public = "23as9Uo6W2AeGronB6nMpcbs8Nxo6CoJ769uePw9sf6Ud"
-
-[keys.dh]
-secret = "HeTQaTvq1337kSEd5jt4cdF35Touns1WB7xfs24sKxqM"
-public = "3V1LzAgCwubtAb1MT1YgTH2scXg6d2bQEhhsAMeyNo6X"
-
-[keys.dkg]
-secret = "Cab231aFJTQYmZV7Qw4qa2x49K58fbyTEsM4Tz2CKi1"
-public = "7jdMG9MUWoN4avAc3mbf2tTTGdKSmmGZWTgR3NJ9hJPn6dHj9Vdqspcs3j6zTThfjC"
-
-[chain]
-namespace = 10101
-
-[chain.parent]
-id = 31337
-rpc_url = "http://127.0.0.1:8545/"
-ibox_contract = "0x4dbd4fc535ac27206064b68ffcf827b0a60bab3f"
-block_tag = "finalized"
-key_manager_contract = "0x2bbf15bc655c4cc157b769cfcb1ea9924b9e1a35"
-"#;
-
-    use super::NodeConfig;
-
-    #[test]
-    fn serialisation_roundtrip() {
-        let a: NodeConfig = CONFIG.parse().unwrap();
-        let b: NodeConfig = a.to_string().parse().unwrap();
-        assert_eq!(a, b);
-    }
-}