gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use process_blocktree to verify the ledger

Browse Source
This commit is contained in:
Michael Vines
2019-03-02 08:16:46 -08:00
parent fcbcf000c4
commit d32f5b6cca
1 changed files with 9 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
ledger-tool/src/main.rs
View File

@ -1,7 +1,6 @@
use clap::{crate_version, App, Arg, SubCommand}; use clap::{crate_version, App, Arg, SubCommand};
use solana::blocktree::Blocktree; use solana::blocktree::Blocktree;
use solana::blocktree_processor; use solana::blocktree_processor::process_blocktree;
use solana_runtime::bank::Bank;
use solana_sdk::genesis_block::GenesisBlock; use solana_sdk::genesis_block::GenesisBlock;
use std::io::{stdout, Write}; use std::io::{stdout, Write};
use std::process::exit; use std::process::exit;
@ -25,7 +24,7 @@ fn main() {
.long("head") .long("head")
.value_name("NUM") .value_name("NUM")
.takes_value(true) .takes_value(true)
.help("Limit to at most the first NUM entries in ledger\n (only applies to verify, print, json commands)"), .help("Limit to at most the first NUM entries in ledger\n (only applies to print and json commands)"),
) )
.arg( .arg(
Arg::with_name("min-hashes") Arg::with_name("min-hashes")
@ -112,33 +111,14 @@ fn main() {
} }
stdout().write_all(b"\n]}\n").expect("close array"); stdout().write_all(b"\n]}\n").expect("close array");
} }
("verify", _) => { ("verify", _) => match process_blocktree(&genesis_block, &blocktree, None) {
let bank = Bank::new(&genesis_block); Ok((_bank_forks, bank_forks_info)) => {
let mut last_id = bank.last_id(); println!("{:?}", bank_forks_info);
let mut num_entries = 0;
for (i, entry) in entries.enumerate() {
if i >= head {
break;
}
if !entry.verify(&last_id) {
eprintln!("entry.verify() failed at entry[{}]", i + 2);
if !matches.is_present("continue") {
exit(1);
}
}
last_id = entry.hash;
num_entries += 1;
if let Err(e) = blocktree_processor::process_entry(&bank, &entry) {
eprintln!("verify failed at entry[{}], err: {:?}", i + 2, e);
if !matches.is_present("continue") {
exit(1);
}
}
} }
println!("{} entries. last_id={:?}", num_entries, last_id); Err(err) => {
} eprintln!("Ledger verification failed: {:?}", err);
}
},
("", _) => { ("", _) => {
eprintln!("{}", matches.usage()); eprintln!("{}", matches.usage());
exit(1); exit(1);