Key Management and Config File for Validator Onboarding

config/ValidatorConfigExample

@@ -0,0 +1,28 @@
+ValidatorConfig { 
+    public_key: BLSPubKey { 
+        pub_key: VerKey(
+            (
+                QuadExtField(
+                    2264797523581107490935262917175769123227923636811928330606075281145117212394
+                     + 15807017392833049888165434456991157794698032464874424842715555348468160607934 * u
+                     ), 
+                QuadExtField(
+                    7996517616082121122160563552650547601395271017260499735456299700133762512689
+                     + 7504045709281061282278228438613345070383424761478787301859187055302953740948 * u
+                     ), 
+                QuadExtField(
+                    1515973040548822760825076242090160370742046237881440422068330135941139244581
+                     + 20251846261653098602911417004145145971080304248810966341160788194007704966108 * u
+                     )
+                )
+        ) 
+    },
+    private_key: BLSPrivKey { 
+        priv_key: SignKey(
+            BigInt(
+                [3505488234151006356, 6655477166151225138, 3291219027844407676, 2153641080015542578]
+            )
+        ) 
+    },
+    stake_value: 1
+}

config/ValidatorConfigFile.toml

@@ -0,0 +1,2 @@
+seed = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+node_id = 0

config/ValidatorConfigOutput

@@ -0,0 +1 @@
+ValidatorConfig { public_key: BLSPubKey { pub_key: VerKey((QuadExtField(2264797523581107490935262917175769123227923636811928330606075281145117212394 + 15807017392833049888165434456991157794698032464874424842715555348468160607934 * u), QuadExtField(7996517616082121122160563552650547601395271017260499735456299700133762512689 + 7504045709281061282278228438613345070383424761478787301859187055302953740948 * u), QuadExtField(1515973040548822760825076242090160370742046237881440422068330135941139244581 + 20251846261653098602911417004145145971080304248810966341160788194007704966108 * u))) }, private_key: BLSPrivKey { priv_key: SignKey(BigInt([3505488234151006356, 6655477166151225138, 3291219027844407676, 2153641080015542578])) }, stake_value: 1 }

crates/hotshot-signature-key/src/bn254/bn254_priv.rs

@@ -6,7 +6,7 @@ use serde::{Deserialize, Serialize};
 use std::cmp::Ordering;
 
 /// Private key type for a bn254 keypair
-#[derive(PartialEq, Eq, Clone, Serialize, Deserialize, Debug)]
+#[derive(PartialEq, Eq, Clone, Serialize, Deserialize, Debug, Hash)]
 pub struct BLSPrivKey {
     /// The private key for  this keypair
     pub(super) priv_key: QCSignKey,
@@ -54,12 +54,9 @@ impl BLSPrivKey {
     }
 }
 
-#[allow(clippy::incorrect_partial_ord_impl_on_ord_type)]
 impl PartialOrd for BLSPrivKey {
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        let self_bytes = &self.priv_key.to_string();
-        let other_bytes = &other.priv_key.to_string();
-        self_bytes.partial_cmp(other_bytes)
+        Some(self.cmp(other))
     }
 }
 

crates/hotshot-signature-key/src/bn254/bn254_pub.rs

@@ -27,12 +27,9 @@ pub struct BLSPubKey {
     pub_key: VerKey,
 }
 
-#[allow(clippy::incorrect_partial_ord_impl_on_ord_type)]
 impl PartialOrd for BLSPubKey {
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        let self_bytes = &self.pub_key.to_string();
-        let other_bytes = &other.pub_key.to_string();
-        self_bytes.partial_cmp(other_bytes)
+        Some(self.cmp(other))
     }
 }
 

crates/hotshot/examples/infra/mod.rs

@@ -94,38 +94,14 @@ pub struct OrchestratorArgs {
 /// Reads a network configuration from a given filepath
 pub fn load_config_from_file<TYPES: NodeType>(
     config_file: String,
-) -> NetworkConfig<
-    TYPES::SignatureKey,
-    <TYPES::SignatureKey as SignatureKey>::StakeTableEntry,
-    TYPES::ElectionConfigType,
-> {
+) -> NetworkConfig<TYPES::SignatureKey, TYPES::ElectionConfigType> {
     let config_file_as_string: String = fs::read_to_string(config_file.as_str())
         .unwrap_or_else(|_| panic!("Could not read config file located at {config_file}"));
-    let config_toml: NetworkConfigFile =
-        toml::from_str::<NetworkConfigFile>(&config_file_as_string)
+    let config_toml: NetworkConfigFile<TYPES::SignatureKey> =
+        toml::from_str::<NetworkConfigFile<TYPES::SignatureKey>>(&config_file_as_string)
             .expect("Unable to convert config file to TOML");
 
-    let mut config: NetworkConfig<
-        TYPES::SignatureKey,
-        <TYPES::SignatureKey as SignatureKey>::StakeTableEntry,
-        TYPES::ElectionConfigType,
-    > = config_toml.into();
-
-    // Generate network's public keys
-    let known_nodes: Vec<_> = (0..config.config.total_nodes.get())
-        .map(|node_id| {
-            TYPES::SignatureKey::generated_from_seed_indexed(
-                config.seed,
-                node_id.try_into().unwrap(),
-            )
-            .0
-        })
-        .collect();
-
-    config.config.known_nodes_with_stake = (0..config.config.total_nodes.get())
-        .map(|node_id| known_nodes[node_id].get_stake_table_entry(1u64))
-        .collect();
-
+    let config: NetworkConfig<TYPES::SignatureKey, TYPES::ElectionConfigType> = config_toml.into();
     config
 }
 
@@ -238,11 +214,7 @@ pub trait RunDA<
 {
     /// Initializes networking, returns self
     async fn initialize_networking(
-        config: NetworkConfig<
-            TYPES::SignatureKey,
-            <TYPES::SignatureKey as SignatureKey>::StakeTableEntry,
-            TYPES::ElectionConfigType,
-        >,
+        config: NetworkConfig<TYPES::SignatureKey, TYPES::ElectionConfigType>,
     ) -> Self;
 
     /// Initializes the genesis state and HotShot instance; does not start HotShot consensus
@@ -258,8 +230,8 @@ pub trait RunDA<
         let config = self.get_config();
 
         // Get KeyPair for certificate Aggregation
-        let (pk, sk) =
-            TYPES::SignatureKey::generated_from_seed_indexed(config.seed, config.node_index);
+        let pk = config.config.my_own_validator_config.public_key.clone();
+        let sk = config.config.my_own_validator_config.private_key.clone();
         let known_nodes_with_stake = config.config.known_nodes_with_stake.clone();
         let entry = pk.get_stake_table_entry(1u64);
 
@@ -426,13 +398,7 @@ pub trait RunDA<
     fn get_vid_network(&self) -> VIDNETWORK;
 
     /// Returns the config for this run
-    fn get_config(
-        &self,
-    ) -> NetworkConfig<
-        TYPES::SignatureKey,
-        <TYPES::SignatureKey as SignatureKey>::StakeTableEntry,
-        TYPES::ElectionConfigType,
-    >;
+    fn get_config(&self) -> NetworkConfig<TYPES::SignatureKey, TYPES::ElectionConfigType>;
 }
 
 // WEB SERVER
@@ -443,11 +409,7 @@ pub struct WebServerDARun<
     I: NodeImplementation<TYPES>,
     MEMBERSHIP: Membership<TYPES>,
 > {
-    config: NetworkConfig<
-        TYPES::SignatureKey,
-        <TYPES::SignatureKey as SignatureKey>::StakeTableEntry,
-        TYPES::ElectionConfigType,
-    >,
+    config: NetworkConfig<TYPES::SignatureKey, TYPES::ElectionConfigType>,
     quorum_network: WebCommChannel<TYPES, I, MEMBERSHIP>,
     da_network: WebCommChannel<TYPES, I, MEMBERSHIP>,
     view_sync_network: WebCommChannel<TYPES, I, MEMBERSHIP>,
@@ -516,18 +478,10 @@ where
     Self: Sync,
 {
     async fn initialize_networking(
-        config: NetworkConfig<
-            TYPES::SignatureKey,
-            <TYPES::SignatureKey as SignatureKey>::StakeTableEntry,
-            TYPES::ElectionConfigType,
-        >,
+        config: NetworkConfig<TYPES::SignatureKey, TYPES::ElectionConfigType>,
     ) -> WebServerDARun<TYPES, NODE, MEMBERSHIP> {
-        // Generate our own key
-        let (pub_key, _priv_key) =
-            <<TYPES as NodeType>::SignatureKey as SignatureKey>::generated_from_seed_indexed(
-                config.seed,
-                config.node_index,
-            );
+        // Get our own key
+        let pub_key = config.config.my_own_validator_config.public_key.clone();
 
         // Get the configuration for the web server
         let WebServerConfig {
@@ -599,13 +553,7 @@ where
         self.vid_network.clone()
     }
 
-    fn get_config(
-        &self,
-    ) -> NetworkConfig<
-        TYPES::SignatureKey,
-        <TYPES::SignatureKey as SignatureKey>::StakeTableEntry,
-        TYPES::ElectionConfigType,
-    > {
+    fn get_config(&self) -> NetworkConfig<TYPES::SignatureKey, TYPES::ElectionConfigType> {
         self.config.clone()
     }
 }
@@ -615,11 +563,7 @@ where
 /// Represents a libp2p-based run
 pub struct Libp2pDARun<TYPES: NodeType, I: NodeImplementation<TYPES>, MEMBERSHIP: Membership<TYPES>>
 {
-    config: NetworkConfig<
-        TYPES::SignatureKey,
-        <TYPES::SignatureKey as SignatureKey>::StakeTableEntry,
-        TYPES::ElectionConfigType,
-    >,
+    config: NetworkConfig<TYPES::SignatureKey, TYPES::ElectionConfigType>,
     quorum_network: Libp2pCommChannel<TYPES, I, MEMBERSHIP>,
     da_network: Libp2pCommChannel<TYPES, I, MEMBERSHIP>,
     view_sync_network: Libp2pCommChannel<TYPES, I, MEMBERSHIP>,
@@ -688,17 +632,9 @@ where
     Self: Sync,
 {
     async fn initialize_networking(
-        config: NetworkConfig<
-            TYPES::SignatureKey,
-            <TYPES::SignatureKey as SignatureKey>::StakeTableEntry,
-            TYPES::ElectionConfigType,
-        >,
+        config: NetworkConfig<TYPES::SignatureKey, TYPES::ElectionConfigType>,
     ) -> Libp2pDARun<TYPES, NODE, MEMBERSHIP> {
-        let (pubkey, _privkey) =
-            <<TYPES as NodeType>::SignatureKey as SignatureKey>::generated_from_seed_indexed(
-                config.seed,
-                config.node_index,
-            );
+        let pubkey = config.config.my_own_validator_config.public_key.clone();
         let mut config = config;
         let libp2p_config = config
             .libp2p_config
@@ -779,8 +715,13 @@ where
         let mut all_keys = BTreeSet::new();
         let mut da_keys = BTreeSet::new();
         for i in 0..config.config.total_nodes.get() as u64 {
-            let privkey = TYPES::SignatureKey::generated_from_seed_indexed([0u8; 32], i).1;
-            let pubkey = TYPES::SignatureKey::from_private(&privkey);
+            let pubkey = <<TYPES as NodeType>::SignatureKey>::get_public_key(
+                config
+                    .config
+                    .known_nodes_with_stake
+                    .get(i as usize)
+                    .expect("node_id should be within the range of known_nodes"),
+            );
             if i < config.config.da_committee_size as u64 {
                 da_keys.insert(pubkey.clone());
             }
@@ -848,13 +789,7 @@ where
         self.vid_network.clone()
     }
 
-    fn get_config(
-        &self,
-    ) -> NetworkConfig<
-        TYPES::SignatureKey,
-        <TYPES::SignatureKey as SignatureKey>::StakeTableEntry,
-        TYPES::ElectionConfigType,
-    > {
+    fn get_config(&self) -> NetworkConfig<TYPES::SignatureKey, TYPES::ElectionConfigType> {
         self.config.clone()
     }
 }

crates/hotshot/src/lib.rs

@@ -117,10 +117,7 @@ pub struct SystemContextInner<TYPES: NodeType, I: NodeImplementation<TYPES>> {
     private_key: <TYPES::SignatureKey as SignatureKey>::PrivateKey,
 
     /// Configuration items for this hotshot instance
-    config: HotShotConfig<
-        <TYPES::SignatureKey as SignatureKey>::StakeTableEntry,
-        TYPES::ElectionConfigType,
-    >,
+    config: HotShotConfig<TYPES::SignatureKey, TYPES::ElectionConfigType>,
 
     /// Networking interface for this hotshot instance
     // networking: I::Networking,
@@ -172,10 +169,7 @@ impl<TYPES: NodeType, I: NodeImplementation<TYPES>> SystemContext<TYPES, I> {
         public_key: TYPES::SignatureKey,
         private_key: <TYPES::SignatureKey as SignatureKey>::PrivateKey,
         nonce: u64,
-        config: HotShotConfig<
-            <TYPES::SignatureKey as SignatureKey>::StakeTableEntry,
-            TYPES::ElectionConfigType,
-        >,
+        config: HotShotConfig<TYPES::SignatureKey, TYPES::ElectionConfigType>,
         storage: I::Storage,
         exchanges: I::Exchanges,
         initializer: HotShotInitializer<TYPES, I::Leaf>,
@@ -380,10 +374,7 @@ impl<TYPES: NodeType, I: NodeImplementation<TYPES>> SystemContext<TYPES, I> {
         public_key: TYPES::SignatureKey,
         private_key: <TYPES::SignatureKey as SignatureKey>::PrivateKey,
         node_id: u64,
-        config: HotShotConfig<
-            <TYPES::SignatureKey as SignatureKey>::StakeTableEntry,
-            TYPES::ElectionConfigType,
-        >,
+        config: HotShotConfig<TYPES::SignatureKey, TYPES::ElectionConfigType>,
         storage: I::Storage,
         exchanges: I::Exchanges,
         initializer: HotShotInitializer<TYPES, I::Leaf>,

crates/hotshot/src/traits/networking/libp2p_network.rs

@@ -152,6 +152,7 @@ where
             "DA committee size must be less than or equal to total # nodes"
         );
         let bootstrap_addrs: PeerInfoVec = Arc::default();
+        // We assign known_nodes' public key and stake value rather than read from config file since it's a test
         let mut all_keys = BTreeSet::new();
         let mut da_keys = BTreeSet::new();
 
@@ -176,6 +177,7 @@ where
                 let addr =
                     // Multiaddr::from_str(&format!("/ip4/127.0.0.1/udp/0/quic-v1")).unwrap();
                     Multiaddr::from_str(&format!("/ip4/127.0.0.1/udp/{}{}/quic-v1", 5000 + node_id, network_id)).unwrap();
+                // We assign node's public key and stake value rather than read from config file since it's a test
                 let privkey =
                     TYPES::SignatureKey::generated_from_seed_indexed([0u8; 32], node_id).1;
                 let pubkey = TYPES::SignatureKey::from_private(&privkey);

crates/hotshot/src/traits/networking/memory_network.rs

@@ -254,6 +254,7 @@ impl<TYPES: NodeType, I: NodeImplementation<TYPES>>
         _is_da: bool,
     ) -> Box<dyn Fn(u64) -> Self + 'static> {
         let master: Arc<_> = MasterMap::new();
+        // We assign known_nodes' public key and stake value rather than read from config file since it's a test
         Box::new(move |node_id| {
             let privkey = TYPES::SignatureKey::generated_from_seed_indexed([0u8; 32], node_id).1;
             let pubkey = TYPES::SignatureKey::from_private(&privkey);

crates/hotshot/src/traits/networking/web_server_network.rs

@@ -1226,6 +1226,7 @@ impl<TYPES: NodeType, I: NodeImplementation<TYPES>>
             port,
         ));
 
+        // We assign known_nodes' public key and stake value rather than read from config file since it's a test
         let known_nodes = (0..expected_node_count as u64)
             .map(|id| {
                 TYPES::SignatureKey::from_private(

crates/orchestrator/Cargo.toml

@@ -15,6 +15,7 @@ libp2p = { workspace = true }
 blake3 = { workspace = true, features = ["traits-preview"] }
 hotshot-types = { version = "0.1.0", path = "../types", default-features = false }
 hotshot-utils = { path = "../utils" }
+hotshot-signature-key = { path = "../hotshot-signature-key" }
 libp2p-networking = { workspace = true }
 tide-disco = { git = "https://github.com/EspressoSystems/tide-disco.git", tag = "v0.4.1" }
 surf-disco = { workspace = true }