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.

Sign up for GitHub

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

ledger-tool: Make verify --print-bank-hash support json #1745

Merged
merged 8 commits into from
Jun 20, 2024
Merged

ledger-tool: Make verify --print-bank-hash support json #1745

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8d2d1e1
ledger-tool: Print only the bank-hash for --print-bank-hash
steviez Jun 14, 2024
2af3939
Make --print-bank-hash support json via --output json
steviez Jun 17, 2024
12faa6a
Make cluster setup nodes install jq
steviez Jun 17, 2024
f0227cc
Update script to use jq to parse bank-hash from ledger-tool command
steviez Jun 17, 2024
a99cd89
Make install-jq.sh executable
steviez Jun 17, 2024
089c5c5
Make hash a string so it serializes as a base58 string and not bytes
steviez Jun 17, 2024
ca7a098
Forgot to specify --output json
steviez Jun 18, 2024
ddb78bb
Use quotation marks for jq query
steviez Jun 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions ledger-tool/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1817,11 +1817,7 @@ fn main() {
working_bank.print_accounts_stats();
steviez marked this conversation as resolved.
Show resolved Hide resolved
}
if print_bank_hash {
println!(
"Bank hash for slot {}: {}",
working_bank.slot(),
working_bank.hash()
);
println!("{}", working_bank.hash());
steviez marked this conversation as resolved.
Show resolved Hide resolved
}
if write_bank_file {
bank_hash_details::write_bank_hash_details_file(&working_bank)
Expand Down
2 changes: 1 addition & 1 deletion net/remote/remote-node.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ EOF
agave-ledger-tool -l config/bootstrap-validator shred-version --max-genesis-archive-unpacked-size 1073741824 | tee config/shred-version

if [[ -n "$maybeWaitForSupermajority" ]]; then
bankHash=$(agave-ledger-tool -l config/bootstrap-validator bank-hash --halt-at-slot 0)
bankHash=$(agave-ledger-tool -l config/bootstrap-validator verify --halt-at-slot 0 --print-bank-hash)
shredVersion="$(cat "$SOLANA_CONFIG_DIR"/shred-version)"
extraNodeArgs="$extraNodeArgs --expected-bank-hash $bankHash --expected-shred-version $shredVersion"
echo "$bankHash" > config/bank-hash
Expand Down