feat(testing): deterministic libp2p keypair used for ocaml node

binier · binier · commit 2c9a336f2a3f · 2024-01-29T10:01:23.000+04:00
re: #188
diff --git a/node/testing/src/cluster/mod.rs b/node/testing/src/cluster/mod.rs
@@ -64,6 +64,7 @@ pub struct Cluster {
     ocaml_nodes: Vec<Option<OcamlNode>>,
 
     rpc_counter: usize,
+    ocaml_libp2p_keypair_i: usize,
 
     verifier_srs: Arc<VerifierSRS>,
     block_verifier_index: Arc<VerifierIndex>,
@@ -102,6 +103,7 @@ impl Cluster {
             ocaml_nodes: Vec::new(),
 
             rpc_counter: 0,
+            ocaml_libp2p_keypair_i: 0,
 
             verifier_srs: VERIFIER_SRS.clone(),
             block_verifier_index: BLOCK_VERIFIER_INDEX.clone(),
@@ -322,15 +324,17 @@ impl Cluster {
         let node = OcamlNode::start(OcamlNodeConfig {
             executable: self.config.ocaml_node_executable().clone(),
             dir: temp_dir,
+            libp2p_keypair_i: self.ocaml_libp2p_keypair_i,
             libp2p_port: next_port().unwrap(),
             graphql_port: next_port().unwrap(),
             client_port: next_port().unwrap(),
             initial_peers: testing_config.initial_peers,
             daemon_json: testing_config.daemon_json,
-            daemon_json_update_timestamp: testing_config.daemon_json_update_timestamp,
         })
         .expect("failed to start ocaml node");
 
+        self.ocaml_libp2p_keypair_i += 1;
+
         self.ocaml_nodes.push(Some(node));
         ClusterOcamlNodeId::new_unchecked(node_i)
     }
diff --git a/node/testing/src/node/ocaml/config.rs b/node/testing/src/node/ocaml/config.rs
@@ -9,7 +9,6 @@ use serde::{Deserialize, Serialize};
 pub struct OcamlNodeTestingConfig {
     pub initial_peers: Vec<P2pConnectionOutgoingInitOpts>,
     pub daemon_json: DaemonJson,
-    pub daemon_json_update_timestamp: bool,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
@@ -30,12 +29,12 @@ pub struct OcamlNodeConfig {
     /// Command for mina executable.
     pub executable: OcamlNodeExecutable,
     pub dir: temp_dir::TempDir,
+    pub libp2p_keypair_i: usize,
     pub libp2p_port: u16,
     pub graphql_port: u16,
     pub client_port: u16,
     pub initial_peers: Vec<P2pConnectionOutgoingInitOpts>,
     pub daemon_json: DaemonJson,
-    pub daemon_json_update_timestamp: bool,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
diff --git a/node/testing/src/node/ocaml/mod.rs b/node/testing/src/node/ocaml/mod.rs
@@ -55,29 +55,25 @@ impl OcamlNode {
         };
         let peer_id = peer_id.parse()?;
 
-        if config.daemon_json_update_timestamp {
-            todo!()
-        } else {
-            match &config.daemon_json {
-                DaemonJson::Custom(path) => {
-                    std::fs::copy(path, &daemon_json_path).map_err(|err| {
-                        anyhow::anyhow!(
-                            "failed to copy daemon_json from: '{}', to: '{}'; error: {}",
-                            path,
-                            daemon_json_path.display(),
-                            err
-                        )
-                    })?;
-                }
-                DaemonJson::InMem(json) => {
-                    std::fs::write(&daemon_json_path, json.to_string()).map_err(|err| {
-                        anyhow::anyhow!(
-                            "failed to write InMem daemon.json to {}; error: {}",
-                            daemon_json_path.display(),
-                            err
-                        )
-                    })?;
-                }
+        match &config.daemon_json {
+            DaemonJson::Custom(path) => {
+                std::fs::copy(path, &daemon_json_path).map_err(|err| {
+                    anyhow::anyhow!(
+                        "failed to copy daemon_json from: '{}', to: '{}'; error: {}",
+                        path,
+                        daemon_json_path.display(),
+                        err
+                    )
+                })?;
+            }
+            DaemonJson::InMem(json) => {
+                std::fs::write(&daemon_json_path, json.to_string()).map_err(|err| {
+                    anyhow::anyhow!(
+                        "failed to write InMem daemon.json to {}; error: {}",
+                        daemon_json_path.display(),
+                        err
+                    )
+                })?;
             }
         }
 
@@ -164,6 +160,48 @@ impl OcamlNode {
     }
 
     const PRIVKEY_PATH: &'static str = ".libp2p/key";
+    const LIBP2P_KEYS: [(&'static str, &'static str); 10] = [
+        (
+            "12D3KooWKG1ZakBYEirEWdFYSstTEvxzTxCyuyaebojKthiESfWi",
+            r#"{"box_primitive":"xsalsa20poly1305","pw_primitive":"argon2i","nonce":"7fZJwAwzGgwFGipwjVBTiinHt5NfjTFjSnhk8rA","pwsalt":"9Gz996pkoUjJ8docbT7fJvJg16iL","pwdiff":[134217728,6],"ciphertext":"7oHFyFJd9kWTfH6R7GvbHD4WXBw5JQeiQYBGUpFhiPuiAyEgi1BVbczrzS6njWJ9FkRdNgZqwmSo23GPX4Zs27m3U66dJvyahendHCndG3Wu9wi8yaees78AQpbsU7JRa7U5DyCs9d34QLwpsgrGC2CqtDHJD3K3YncxVDjk4CCKeHseukZXUvkFToqY9CZRLHgYXR29hiB8JyTgoQ4maDDBdqBpFRb6Rjfb3LX8WEat6NpTjWi4A9uvNyDqk68a2aAo8ofjP811SBYxjZY3PMdD4hs5UAAZqbUNA"}"#,
+        ),
+        (
+            "12D3KooWQoSDqpenkrjCnKCCLnwEMRVRqUfZJXqD8Y8awEnBAJZX",
+            r#"{"box_primitive":"xsalsa20poly1305","pw_primitive":"argon2i","nonce":"8psKzkQReBbhoWYriYSNGFVKsb7GMARxfSZLWDF","pwsalt":"9MdeSxJxE33e5sxYhnmPQNTDxbKj","pwdiff":[134217728,6],"ciphertext":"6YnXZjwJue344VEkLnFJ62VY9E2QxZPEtDoZSBXnNzJUEEK5MVjcC63GeM37kVXTVvoj8r9C9i4mUbTiwjpL9wg4NqxkcJpTMVBe6WDsYYrtt7S9o6p4xWAjm1hvbxXcsTzPN361amo2ZNCAuMGpCWQPnxeZ69bwLQkn4vKeGkdiUMdnziNfhKRaFcya4C1dNNoz8kAWFRexzZrjvSBymzZCvZPgof1mApyzcoWuYtAdENqbNURg2DBv53nLetmqA9zLTcDbXYE5hTgkVzMHa6qiia4xAhDbrax4r"}"#,
+        ),
+        (
+            "12D3KooWEHSJwkn5ZdYVAcULpb3D3k6U2K4sU2BFh5xhoig1J4NK",
+            r#"{"box_primitive":"xsalsa20poly1305","pw_primitive":"argon2i","nonce":"84F8XwEf5k2yPqgC8NSTdf5wQEw7kmRgEdyss91","pwsalt":"BeSN6EXqWBCx9fndvnib5BYnNNdc","pwdiff":[134217728,6],"ciphertext":"7ECwoC7vK5QRKrPZvrBmaWrTKJiHKq9fCZr8YyVPgfHFS2VQ1BeKgQPvoc5JHNhy2Yju8PDDKzS3zHCdRSGaVRX49VrxjSU9wg4Fj7EWPGEs6VNCQahudCovGFd69iqS8WvcDSSw6acaEstSssTFYV3mUviDbkRA5HM9fUvE8SBkg9rHeeghCQ4qLK7cFRywCx9P6nronv5b5yy15xJDjAp6h7fwNxA7daXGa3E8dhtsE6FaPCtefkLBKJFXzuo3CMdRcBMZTt2XVGHS27rxtn1j5jeT9y34EMA5t"}"#,
+        ),
+        (
+            "12D3KooWA1qcHYLWKZ7EUBMh3KKWbwys1DhH35WmH4y96scpntmv",
+            r#"{"box_primitive":"xsalsa20poly1305","pw_primitive":"argon2i","nonce":"6ifkqZVQ8MXHP5StG5umfJ2HhuSEpwxx33bRD4e","pwsalt":"9qREDkkiXgKV7VtryRcAkrzGY41p","pwdiff":[134217728,6],"ciphertext":"6uYbsTw56Vzaj4Jb9vWVQLTNHk92Qv6kFgZrqit8gUBya1M76U4wuNqQ1XMk5iKFSXFxf9hjtKN1NAbruUTnoySaCdCuLfjVJwUpDJFWwjRV3vmFjmZch9YjAL4H81z89V52BZkGpSantUxqGMLSrJjz8z5Rrr3C7ZCvooZddFieFkFfDtLBfhAsB3U2usMh83L6VMPg5Hawn7krdznSVzagiS1ENDPR92LfsCvxVVGxSNvUbBbjFCdroDb7eYi8mshiC3nGQWDYRQu9kQkHC6xsgarTsumkXnYpd"}"#,
+        ),
+        (
+            "12D3KooWC14WLzaCT6fkR5WzzrayXDhmBpox7yWkif7Pg6Sk4uz1",
+            r#"{"box_primitive":"xsalsa20poly1305","pw_primitive":"argon2i","nonce":"7rGH8gCM5UL9LvatyUP6Lka8b4Ev2o5Mbe5ou7L","pwsalt":"BKcQuXkYx6H4xfcLLGM8ykJP5a3D","pwdiff":[134217728,6],"ciphertext":"7tZEvuCoXyXRVxh9NNrMCRLXgXj8MHxNgwoesztLQTagMzKhf48EepzUReYEViNC2EpWb2h7yoJdXMUbDGUuSQdoM1eF3qum9rHtmU4xdv8SGBEP9q9YHb1n8YS2SEr7WNcN3DsX7cqrzfnSjDsXNZaGzR5CbrK7g3NGv8RVyT1uZF2VHHeapDY6nFCyKN9nUJKpizbbRguR25QwWyx2nzcKF3mGq2iuCNVN5Z6gqzk7fhD8XFayxj57MqwvWTRD6pLRBJcmqCF5L9ZqpKEHAjXMcv3nwkKBHJaAF"}"#,
+        ),
+        (
+            "12D3KooWRJEo19dU5eWgab1YrBPnK9HQA4SqDeQwx9NrankTcfSi",
+            r#"{"box_primitive":"xsalsa20poly1305","pw_primitive":"argon2i","nonce":"6VMHa83xqvbDzAppmfe9B8wn7dzzdAC1fyP5bXs","pwsalt":"9cXcTqJGi651tpA1ZBKSPVBP2h3q","pwdiff":[134217728,6],"ciphertext":"783EDXabmg2PmWhrSqcDog82NhWNMWasKC4o2d1oxVDTDxhmH5yGcjY74wV8HH16DpJw4ZxzW8gUCyC7Mhx1hEG8kc7wn38yBsoAqGfkA34g9n4FYJzwHvAB7on7zK3cveh2jXF3TTt3Etg4advpM7LvbY2eE9pz95TU1pCagu7haB83JHn2qSnfSCcMUTjS9copfJgkVD6YQYUxJmVi9erYUufjJqiF9p4ciCSuicU5SaJVB3rpSaRt1VgWMXeg47qWXVg98byNadHi8PgQZNnFifJc4FUDPtHDj"}"#,
+        ),
+        (
+            "12D3KooWPTtAt3LXFqs8vbGL9VACn5wgcBm1jvaHZTGHnHzFq7c4",
+            r#"{"box_primitive":"xsalsa20poly1305","pw_primitive":"argon2i","nonce":"8q2jNrxkiwzvk8LWuU8zWy93APjitkaZUKr3fDP","pwsalt":"B5YVY1p2yFfGRsjs2us7WnmhWqPq","pwdiff":[134217728,6],"ciphertext":"7xxCXkAf3DokjZQ6CtwbuuXMBeYB5p6KxQAqaFLx96yBAsqQaK3EprR3xDKVR78x7Zrzj4NXWrFow2cg4xtze12SS43t46E3QhSsYPohcuZzKJe4agGJMDZVHaqd1aAPtJd2CX1fZCrWmxpa3hB72H2EKYPFSG1FYv77cYxU45aJx3V1XQAEQtoYKP9FmL95xogJHVHQSe2xWrvga8CLY4qtshJWkwHP1mV59xam9WhhZZjZkSThYTJMW9f4NTQ2EwRuud9zReLkh8fGEvfoxFjMsw8NCVxrtdTi5"}"#,
+        ),
+        (
+            "12D3KooWLrjE3v7wZSCT4HsnXYmRsQnCWsaGcmU9mSJfPDRyjvpd",
+            r#"{"box_primitive":"xsalsa20poly1305","pw_primitive":"argon2i","nonce":"7zKo7kmPLjoJdvgxyMp2jguDnGDnyZ49TWfajiZ","pwsalt":"ARyFY4GSnyTC8ZjhvEaCSq3QeGsU","pwdiff":[134217728,6],"ciphertext":"7FfzcAPsEM7Lv5JzL7rYqgrHGV5bBDVVTEukULpDaCMGbHJDRFkgjxx6c6gbxCRbMJKma9yMrr5zxHsT9tfYCU7PAzqgVqa87TfphNXmqdSrNKWZVTS5SGMXAqku6vfJ19PA7TzJdr7oHZSjoim5Lh8r2x9iUTto7tdCBy4xWJQXE7aQYQ2ybB95DjzA3CtK7ypjxnZJDnvYq8zgXx9netbAX3NdTtsRDKQwNmjBzoQiKWd5jrqMigfFNcRTnJdpEn8jYMfa4fmXsnUe9ziXvjYdH9DJQA1354UQq"}"#,
+        ),
+        (
+            "12D3KooWKPaZfwU42A9SDxyuDGWsLYiedudJvDAHY81UMXLLEgTe",
+            r#"{"box_primitive":"xsalsa20poly1305","pw_primitive":"argon2i","nonce":"7QAvnHnfp1MMJgEYN8VVwLuwWF3GEMUG5DA2KWP","pwsalt":"9YP8yrJRfF6w4efUSTZrPRhoV8xZ","pwdiff":[134217728,6],"ciphertext":"6i8Efh1z9AZi2ExYLFBLsPGSAXQT72pgQNP9yPBfDwqr8dtQxvqdh6V8qXwjyVSiWLGs6zbUFQj1mJ17F9irLzUTFLQ9WG98HveuUJLxv2WPoEekb2AUntAYNkbgVEmtWEYytWqYZnJUx5g1cnLo5ENzrcDTDcbHbQnYVkyH2GNpNrH4WqjK3TyDS2PzKwTwBFVMyhK4BUDVtjJWxfHnQNSaxT7gsGFNQTJjizxpqaqFk7Nc11GPaJmJFJKoVYD4ozCkeR2RKM9Dk7ct49vTQvULqqETwJmK1yMTf"}"#,
+        ),
+        (
+            "12D3KooWKrWvpCzTJs45HS8c8Hbo9sfe65wBVCLWW2gyJDmnDDif",
+            r#"{"box_primitive":"xsalsa20poly1305","pw_primitive":"argon2i","nonce":"8QEpCE7a48EdYXQ44ff9PXWDKw2AMmHMxc3nUaq","pwsalt":"8UUffeMbTFAwUwkamE1xWoVTJqDi","pwdiff":[134217728,6],"ciphertext":"93Wdv4Xq9794GWuZPZUPug2gfPpXD2dnLxSx9jGjtr7rTGv14W7JPieGJJ4zTw6T54x1NwyhH9HcDwsQxmUT364KibpbczuA9bnTFcp6ahoYpetrHB8FJTk7TprkmazqprJm7QDqJ97jyE7PuVNWg9NSbMRzet1c5Jxk2qfUYVdtSNgcQB5J5oUTibL6fc5UKZmfBoSixw3E3QFPnBRN8W7X3nfcHykK9eck2u5YJrv1gRYoupp2EX1CjWwKp3ebDa9bLLZiWTTSBKsj7uhLh5aCxgHpoPCyNcnaq"}"#,
+        ),
+    ];
 
     fn privkey_path(dir: &Path) -> PathBuf {
         dir.join(Self::PRIVKEY_PATH)
@@ -178,18 +216,31 @@ impl OcamlNode {
     }
 
     fn generate_libp2p_keypair(config: &OcamlNodeConfig, dir: &Path) -> anyhow::Result<String> {
-        let mut child = config
-            .cmd([("MINA_LIBP2P_PASS", ""), ("UMASK", "0700")])
-            .args(["libp2p", "generate-keypair", "--privkey-path"])
-            .arg(Self::privkey_path(dir))
-            .spawn()?;
-        if child.wait()?.success() {
-            config.executable.kill(&config.dir);
-            let peer_id = Self::read_peer_id(dir)?;
-            Ok(peer_id)
-        } else {
-            anyhow::bail!("error generating keypair");
-        }
+        use std::{
+            fs::OpenOptions,
+            io::Write,
+            os::unix::fs::{DirBuilderExt, OpenOptionsExt},
+        };
+
+        let (peer_id, key) = Self::LIBP2P_KEYS[config.libp2p_keypair_i];
+        let privkey_path = Self::privkey_path(dir);
+        let privkey_parent_dir = privkey_path.as_path().parent().unwrap();
+        std::fs::DirBuilder::new()
+            .recursive(true)
+            .mode(0o700)
+            .create(privkey_parent_dir)?;
+
+        let mut file = OpenOptions::new()
+            .create(true)
+            .write(true)
+            .mode(0o600)
+            .open(&privkey_path)?;
+        file.write_all(key.as_bytes())?;
+        std::fs::write(
+            privkey_path.with_extension("peerid"),
+            format!("peerid:{peer_id}"),
+        )?;
+        Ok(peer_id.to_owned())
     }
 
     fn read_stream<R: std::io::Read, W: std::io::Write>(
@@ -316,12 +367,12 @@ fn run_ocaml() {
     let mut node = OcamlNode::start(OcamlNodeConfig {
         executable: OcamlNodeExecutable::find_working().unwrap(),
         dir: temp_dir::TempDir::new().unwrap(),
+        libp2p_keypair_i: 0,
         libp2p_port: 8302,
         graphql_port: 3086,
         client_port: 8301,
         initial_peers: Vec::new(),
         daemon_json: DaemonJson::Custom("/var/lib/coda/berkeley.json".to_owned()),
-        daemon_json_update_timestamp: false,
     })
     .unwrap();
     let stdout = node.child.stdout.take().unwrap();
diff --git a/node/testing/src/scenarios/multi_node/basic_connectivity_peer_discovery.rs b/node/testing/src/scenarios/multi_node/basic_connectivity_peer_discovery.rs
@@ -32,7 +32,6 @@ impl MultiNodeBasicConnectivityPeerDiscovery {
         let ocaml_seed_config = OcamlNodeTestingConfig {
             initial_peers: Vec::new(),
             daemon_json: DaemonJson::Custom("/var/lib/coda/berkeley.json".to_owned()),
-            daemon_json_update_timestamp: false,
         };
 
         let seed_a = runner.add_ocaml_node(ocaml_seed_config.clone());
diff --git a/node/testing/src/scenarios/multi_node/connection_discovery.rs b/node/testing/src/scenarios/multi_node/connection_discovery.rs
@@ -30,7 +30,6 @@ impl RustNodeAsSeed {
         let ocaml_node_config = OcamlNodeTestingConfig {
             initial_peers: vec![rust_node_dial_addr],
             daemon_json: DaemonJson::Custom("/var/lib/coda/berkeley.json".to_owned()),
-            daemon_json_update_timestamp: false,
         };
 
         let ocaml_node0 = runner.add_ocaml_node(ocaml_node_config.clone());
@@ -127,7 +126,6 @@ impl OCamlToRust {
         let ocaml_node_config = OcamlNodeTestingConfig {
             initial_peers: vec![rust_node_dial_addr],
             daemon_json: DaemonJson::Custom("/var/lib/coda/berkeley.json".to_owned()),
-            daemon_json_update_timestamp: false,
         };
 
         let ocaml_node = runner.add_ocaml_node(ocaml_node_config.clone());
@@ -187,7 +185,6 @@ impl RustToOCaml {
         let ocaml_seed_config = OcamlNodeTestingConfig {
             initial_peers: Vec::new(),
             daemon_json: DaemonJson::Custom("/var/lib/coda/berkeley.json".to_owned()),
-            daemon_json_update_timestamp: false,
         };
 
         let seed_node = runner.add_ocaml_node(ocaml_seed_config);
@@ -264,7 +261,6 @@ impl OCamlToRustViaSeed {
         let ocaml_seed_config = OcamlNodeTestingConfig {
             initial_peers: Vec::new(),
             daemon_json: DaemonJson::Custom("/var/lib/coda/berkeley.json".to_owned()),
-            daemon_json_update_timestamp: false,
         };
 
         let seed_node = runner.add_ocaml_node(ocaml_seed_config.clone());
@@ -370,7 +366,6 @@ impl RustToOCamlViaSeed {
         let ocaml_seed_config = OcamlNodeTestingConfig {
             initial_peers: Vec::new(),
             daemon_json: DaemonJson::Custom("/var/lib/coda/berkeley.json".to_owned()),
-            daemon_json_update_timestamp: false,
         };
 
         let seed_node = runner.add_ocaml_node(ocaml_seed_config.clone());
diff --git a/node/testing/src/scenarios/solo_node/basic_connectivity_accept_incoming.rs b/node/testing/src/scenarios/solo_node/basic_connectivity_accept_incoming.rs
@@ -115,7 +115,6 @@ impl SoloNodeBasicConnectivityAcceptIncoming {
                     let node_id = runner.add_ocaml_node(OcamlNodeTestingConfig {
                         initial_peers: vec![node_addr.clone()],
                         daemon_json: DaemonJson::Custom("/var/lib/coda/berkeley.json".to_owned()),
-                        daemon_json_update_timestamp: false,
                     });
                     let node = runner.ocaml_node(node_id).unwrap();
                     eprintln!("launching OCaml node {}", node.dial_addr());
diff --git a/node/testing/src/scenarios/solo_node/sync_to_genesis.rs b/node/testing/src/scenarios/solo_node/sync_to_genesis.rs
@@ -27,7 +27,6 @@ impl SoloNodeSyncToGenesis {
         let ocaml_node_config = OcamlNodeTestingConfig {
             initial_peers: Vec::new(),
             daemon_json: runner.daemon_json_gen_with_counts("2023-12-25T09:00:00Z", 2, 2),
-            daemon_json_update_timestamp: false,
         };
 
         let ocaml_node = runner.add_ocaml_node(ocaml_node_config);
diff --git a/node/testing/src/simulator/mod.rs b/node/testing/src/simulator/mod.rs
@@ -79,7 +79,6 @@ impl Simulator {
         let ocaml_node_config = OcamlNodeTestingConfig {
             initial_peers: Vec::new(),
             daemon_json: runner.daemon_json_gen_with_counts("2023-12-25T09:00:00Z", 2, 2),
-            daemon_json_update_timestamp: false,
         };
 
         let ocaml_node = runner.add_ocaml_node(ocaml_node_config);
