Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

slot 0 is a valid argument value for "wait for supermajority" when starting Agave validator #3494

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
8 changes: 4 additions & 4 deletions src/app/fdctl/config/default.toml
Original file line number Diff line number Diff line change
Expand Up @@ -487,12 +487,12 @@ dynamic_port_range = "8900-9000"
# `--expected-genesis-hash` argument.
expected_genesis_hash = ""

# If nonzero, after processing the ledger, and the next slot is the
# If set, after processing the ledger, and the next slot is the
# provided value, wait until a supermajority of stake is visible on
# gossip before starting proof of history. This option is passed to
# the Agave client with the `--wait-for-supermajority`
# argument.
wait_for_supermajority_at_slot = 0
# the Agave client with the `--wait-for-supermajority` argument.
#
# wait_for_supermajority_at_slot = 0

# If there is a hard fork, it might be required to provide an
# expected bank hash to ensure the correct fork is being selected.
Expand Down
8 changes: 3 additions & 5 deletions src/app/fdctl/run/run_agave.c
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,9 @@ agave_boot( config_t * config ) {
if( !config->consensus.poh_speed_test ) ADD1( "--no-poh-speed-test" );
if( strcmp( config->consensus.expected_genesis_hash, "" ) )
ADD( "--expected-genesis-hash", config->consensus.expected_genesis_hash );
if( config->consensus.wait_for_supermajority_at_slot ) {
ADDU( "--wait-for-supermajority", config->consensus.wait_for_supermajority_at_slot );
if( strcmp( config->consensus.expected_bank_hash, "" ) )
ADD( "--expected-bank-hash", config->consensus.expected_bank_hash );
}
ADDU( "--wait-for-supermajority", config->consensus.wait_for_supermajority_at_slot );
if( strcmp( config->consensus.expected_bank_hash, "" ) )
ADD( "--expected-bank-hash", config->consensus.expected_bank_hash );
if( config->consensus.expected_shred_version )
ADDH( "--expected-shred-version", config->consensus.expected_shred_version );
if( !config->consensus.wait_for_vote_to_start_leader )
Expand Down