Bake stake into genesis #68

gregcusack · 2024-08-16T22:03:37Z

Current deployment forces user to wait for stakes to warmup for multiple epochs. This lets the user bake the validator stakes into genesis so the cluster has stakes fully warmed up upon deployment.

Baking stakes into genesis is set as the default. If you want the original method that requires stake warmup, pass in --skip-primordial-stakes

Requires Agave PR anza-xyz/agave#2704 to be merged before this one

CriesofCarrots · 2024-08-19T18:20:36Z

src/main.rs

+                .help("Do not bake validator stake accounts into genesis. \
+                Validators will be funded and staked after the cluster boots. \
+                This will result in several epochs for all of the stake to warm up"),


Huh. I was going to suggest that in the future (not in this PR), we could have rustfmt format these long help strings by adding format_strings = true to the rustfmt.toml and running cargo +nightly fmt. But it is not touching these strings when I run it locally, for some reason...

Either way, fyi that rustfmt is not styling this long command/arg list as a result of those strings.

src/genesis.rs

CriesofCarrots

I'm going to hold off reviewing this until anza-xyz/agave#2704 is finished and merged. It's helpful to see what the interface looks like from this side, though.

…ual validator

CriesofCarrots

Here are a few comments from a quick pass. I need to make a more careful read after I remind myself of the setup flow 😅

CriesofCarrots · 2025-01-16T03:31:26Z

src/genesis.rs

+#[derive(Serialize, Deserialize)]
+struct ValidatorAccountsFile {
+    validator_accounts: Vec<StakedValidatorAccountInfo>,
+}
+
+/// Info needed to create a staked validator account,
+/// including relevant balances and vote- and stake-account addresses
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct StakedValidatorAccountInfo {
+    pub balance_lamports: u64,
+    pub stake_lamports: u64,
+    pub identity_account: String,
+    pub vote_account: String,
+    pub stake_account: String,
+}


Can we import these types from solana-genesis now?

what is the best way to do that? There is no release yet that includes ValidatorAccountsFile and StakedValidatorAccountInfo? For now I could just patch it in to use solana-genesis from master if that sound good:

solana-genesis = { git = "https://github.com/anza-xyz/agave.git", package = "solana-genesis" }

^ I can then update this to the specific release when release comes out

actually let's just wait on this PR maybe until a v2.2.0 gets tagged and released. using the github link causes a ton of dependency issues because the master agave branch just changed to use a different Pubkey (solana_program::pubkey::Pubkey instead of solana_sdk::pubkey::Pubkey). Dependencies like spl-token-2022 will pull dependencies from crates.io which only has solana-* up to v2.1.9, so I'd have to individually patch all solana-* crates to agave github master. so probably just makes sense to wait

There also may be another way to do this but I am not sure

Oh duh, sorry, I forgot we haven't released those types yet. Yeah, holding off on this until v2.2.0 is probably a-okay.

CriesofCarrots · 2025-01-16T03:33:25Z

src/genesis.rs

+            }
+        }
+
+        self.write_validator_genesis_accouts_to_file()?;


Suggested change

self.write_validator_genesis_accouts_to_file()?;

self.write_validator_genesis_accounts_to_file()?;

CriesofCarrots · 2025-01-16T03:33:54Z

README.md

+v0:
+  balances_lamports: <balance0>
+  stake_lamports: <stake0>
+v1: 
+  balances_lamports: <balance1>
+  stake_lamports: <stake1>
+...
+vN:
+  balances_lamports: <balanceN>
+  stake_lamports: <stakeN>


Suggested change

v0:

balances_lamports: <balance0>

stake_lamports: <stake0>

v1:

balances_lamports: <balance1>

stake_lamports: <stake1>

...

vN:

balances_lamports: <balanceN>

stake_lamports: <stakeN>

v0:

balance_lamports: <balance0>

stake_lamports: <stake0>

v1:

balance_lamports: <balance1>

stake_lamports: <stake1>

...

vN:

balance_lamports: <balanceN>

stake_lamports: <stakeN>

CriesofCarrots · 2025-01-16T03:36:25Z

README.md

    # kubernetes config
    --cpu-requests <cores>
    --memory-requests <memory>
    # deploy with clients
+    bench-tps


This looks out of place. Is it correct?

bench-tps is a subcommand so should be passed in like this

CriesofCarrots · 2025-01-16T03:40:58Z

src/genesis.rs

+    // Creates yaml file solana-genesis can read in for `--validator-stakes-file <FILE>`
+    // Yaml file created with the following format dictated in agave/genesis/README.md
+    // See: https://github.com/anza-xyz/agave/blob/master/genesis/README.md#3-through-the-validator-accounts-file-flag
+    fn write_validator_genesis_accouts_to_file(&mut self) -> std::io::Result<()> {


Suggested change

fn write_validator_genesis_accouts_to_file(&mut self) -> std::io::Result<()> {

fn write_validator_genesis_accounts_to_file(&mut self) -> std::io::Result<()> {

add primordial stakes into genesis. set as default

3505f2e

gregcusack marked this pull request as ready for review August 16, 2024 22:04

gregcusack requested a review from CriesofCarrots August 19, 2024 17:34

CriesofCarrots reviewed Aug 19, 2024

View reviewed changes

gregcusack force-pushed the bake-stake-into-genesis branch from 4bde184 to b4d4fc8 Compare August 22, 2024 20:33

gregcusack requested a review from CriesofCarrots August 23, 2024 18:32

CriesofCarrots reviewed Aug 23, 2024

View reviewed changes

gregcusack force-pushed the bake-stake-into-genesis branch from 336d715 to 28e51d7 Compare October 4, 2024 01:07

gregcusack force-pushed the bake-stake-into-genesis branch 3 times, most recently from 1d79dd1 to ec7a6ed Compare January 15, 2025 20:58

gregcusack added 4 commits January 15, 2025 21:00

reformat and update readme

2b17dc6

bake internal node stakes into genesis

c16f6b2

switch to --validator-balances-file instead of flags for each individ…

a5587aa

…ual validator

update to match agave genesis file format

ae8d479

gregcusack force-pushed the bake-stake-into-genesis branch from ec7a6ed to ae8d479 Compare January 15, 2025 21:00

gregcusack requested a review from CriesofCarrots January 15, 2025 21:34

CriesofCarrots reviewed Jan 16, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bake stake into genesis #68

Bake stake into genesis #68

gregcusack commented Aug 16, 2024 •

edited

Loading

CriesofCarrots Aug 19, 2024

CriesofCarrots left a comment

CriesofCarrots left a comment

CriesofCarrots Jan 16, 2025

gregcusack Jan 16, 2025

gregcusack Jan 16, 2025 •

edited

Loading

CriesofCarrots Jan 17, 2025

CriesofCarrots Jan 16, 2025

CriesofCarrots Jan 16, 2025

CriesofCarrots Jan 16, 2025

gregcusack Jan 16, 2025

CriesofCarrots Jan 16, 2025

	self.write_validator_genesis_accouts_to_file()?;
	self.write_validator_genesis_accounts_to_file()?;

	fn write_validator_genesis_accouts_to_file(&mut self) -> std::io::Result<()> {
	fn write_validator_genesis_accounts_to_file(&mut self) -> std::io::Result<()> {

Bake stake into genesis #68

Are you sure you want to change the base?

Bake stake into genesis #68

Conversation

gregcusack commented Aug 16, 2024 • edited Loading

Choose a reason for hiding this comment

CriesofCarrots left a comment

Choose a reason for hiding this comment

CriesofCarrots left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gregcusack Jan 16, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gregcusack commented Aug 16, 2024 •

edited

Loading

gregcusack Jan 16, 2025 •

edited

Loading