working fix stake delegations

anza-xyz · Aug 22, 2024 · 4bde184 · 4bde184
1 parent 58543d8
commit 4bde184
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 16 deletions.
diff --git a/src/docker.rs b/src/docker.rs
@@ -141,7 +141,7 @@ impl DockerConfig {
             "docker build -t {docker_image} -f {} {context_path}",
             dockerfile.display()
         );
-        debug!("docker command: {command}");
+        info!("docker command: {command}");
 
         let output = Command::new("sh")
             .arg("-c")

diff --git a/src/genesis.rs b/src/genesis.rs
@@ -5,11 +5,11 @@ use {
     solana_core::gen_keys::GenKeys,
     solana_sdk::{
         native_token::sol_to_lamports,
-        signature::{write_keypair_file, Keypair, Signer},
+        signature::{write_keypair_file, Keypair},
     },
     std::{
         error::Error,
-        fs::{self, File, OpenOptions},
+        fs::{File, OpenOptions},
         io::{self, BufRead, BufWriter, Read, Write},
         path::{Path, PathBuf},
         process::{Child, Command, Stdio},
@@ -350,7 +350,7 @@ impl Genesis {
 
         if !self.flags.skip_primordial_stakes {
             for i in 0..num_validators {
-                args.push("--validator".to_string());
+                args.push("--internal-validator".to_string());
                 for account_type in ["identity", "vote-account", "stake-account"].iter() {
                     let path = self
                         .config_dir
@@ -362,10 +362,13 @@ impl Genesis {
                 }
             }
 
-            args.push("--validator-lamports".to_string());
-            args.push(sol_to_lamports(self.flags.internal_node_sol).to_string());
+            // stake delegated from internal_node_sol
+            let internal_node_lamports =
+                self.flags.internal_node_sol - self.flags.internal_node_stake_sol;
+            args.push("--internal-validator-lamports".to_string());
+            args.push(sol_to_lamports(internal_node_lamports).to_string());
 
-            args.push("--validator-stake-lamports".to_string());
+            args.push("--internal-validator-stake-lamports".to_string());
             args.push(sol_to_lamports(self.flags.internal_node_stake_sol).to_string());
         }
 
@@ -406,9 +409,9 @@ impl Genesis {
         let progress_bar = new_spinner_progress_bar();
         progress_bar.set_message(format!("{SUN}Building Genesis..."));
 
-        info!("genesis args:");
+        debug!("genesis args:");
         for arg in &args {
-            info!("{arg}");
+            debug!("{arg}");
         }
         let executable_path = exec_path.join("solana-genesis");
         let output = Command::new(executable_path)

diff --git a/src/main.rs b/src/main.rs
@@ -558,11 +558,6 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let internal_node_sol =
         value_t_or_exit!(matches, "internal_node_sol", f64) + internal_node_stake_sol;
 
-    let bootstrap_validator_stake_sol =
-        value_t_or_exit!(matches, "bootstrap_validator_stake_sol", f64);
-    let bootstrap_validator_sol =
-        value_t_or_exit!(matches, "bootstrap_validator_sol", f64) + bootstrap_validator_stake_sol;
-
     let skip_primordial_stakes = matches.is_present("skip_primordial_stakes");
 
     let genesis_flags = GenesisFlags {
@@ -599,8 +594,12 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
             .value_of("cluster_type")
             .unwrap_or_default()
             .to_string(),
-        bootstrap_validator_sol,
-        bootstrap_validator_stake_sol,
+        bootstrap_validator_sol: value_t_or_exit!(matches, "bootstrap_validator_sol", f64),
+        bootstrap_validator_stake_sol: value_t_or_exit!(
+            matches,
+            "bootstrap_validator_stake_sol",
+            f64
+        ),
         commission,
         internal_node_sol,
         internal_node_stake_sol,