[config] Allow network config to be loaded from genesis setup

config/Cargo.toml

@@ -10,6 +10,7 @@ publish = false
 edition = "2018"
 
 [dependencies]
+anyhow = "1.0.57"
 bcs = "0.1.3"
 get_if_addrs = { version = "0.5.3", default-features = false }
 mirai-annotations = "1.12.0"

config/src/config/mod.rs

@@ -42,6 +42,8 @@ mod test_config;
 pub use test_config::*;
 mod api_config;
 pub use api_config::*;
+use aptos_crypto::{ed25519::Ed25519PrivateKey, x25519};
+use aptos_types::account_address::AccountAddress;
 
 /// Represents a deprecated config that provides no field verification.
 #[derive(Clone, Debug, Default, Deserialize, PartialEq, Serialize)]
@@ -158,6 +160,26 @@ impl WaypointConfig {
     }
 }
 
+#[derive(Deserialize, Serialize)]
+pub struct IdentityBlob {
+    account_address: AccountAddress,
+    account_key: Ed25519PrivateKey,
+    /// Optional consensus key.  Only used for validators
+    consensus_key: Option<Ed25519PrivateKey>,
+    network_key: x25519::PrivateKey,
+}
+
+impl IdentityBlob {
+    pub fn from_file(path: &Path) -> anyhow::Result<IdentityBlob> {
+        Ok(serde_yaml::from_str(&fs::read_to_string(path)?)?)
+    }
+
+    pub fn to_file(&self, path: &Path) -> anyhow::Result<()> {
+        let mut file = File::open(path)?;
+        Ok(file.write_all(serde_yaml::to_string(self)?.as_bytes())?)
+    }
+}
+
 #[derive(Clone, Copy, Deserialize, Eq, PartialEq, Serialize)]
 #[serde(rename_all = "snake_case")]
 pub enum RoleType {

config/src/config/network_config.rs

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{
-    config::{Error, SecureBackend},
+    config::{Error, IdentityBlob, SecureBackend},
     keys::ConfigKey,
     network_id::NetworkId,
     utils,
@@ -148,6 +148,10 @@ impl NetworkConfig {
                     .expect("Unable to convert key");
                 Some(key)
             }
+            Identity::FromFile(config) => {
+                let identity_blob: IdentityBlob = IdentityBlob::from_file(&config.path).unwrap();
+                Some(identity_blob.network_key)
+            }
             Identity::None => None,
         };
         key.expect("identity key should be present")
@@ -212,6 +216,10 @@ impl NetworkConfig {
                     .value;
                 Some(peer_id)
             }
+            Identity::FromFile(config) => {
+                let identity_blob: IdentityBlob = IdentityBlob::from_file(&config.path).unwrap();
+                Some(identity_blob.account_address)
+            }
             Identity::None => None,
         }
         .expect("peer id should be present")
@@ -234,6 +242,7 @@ impl NetworkConfig {
                     config.peer_id = peer_id;
                 }
             }
+            Identity::FromFile(_) => (),
         };
     }
 
@@ -300,6 +309,7 @@ pub enum DiscoveryMethod {
 pub enum Identity {
     FromConfig(IdentityFromConfig),
     FromStorage(IdentityFromStorage),
+    FromFile(IdentityFromFile),
     None,
 }
 
@@ -316,6 +326,10 @@ impl Identity {
             peer_id_name,
         })
     }
+
+    pub fn from_file(path: PathBuf) -> Self {
+        Identity::FromFile(IdentityFromFile { path })
+    }
 }
 
 /// The identity is stored within the config.
@@ -336,6 +350,12 @@ pub struct IdentityFromStorage {
     pub peer_id_name: String,
 }
 
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
+#[serde(deny_unknown_fields)]
+pub struct IdentityFromFile {
+    pub path: PathBuf,
+}
+
 #[derive(Copy, Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
 #[serde(deny_unknown_fields)]
 pub struct RateLimitConfig {