blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ledger-tool: Relax ledger requirements for program subcommand (#32770) 

Several of the program command subcommands do not require a ledger as
they act solely on the program object. So, defer checking the ledger
path until we know we need to load. Additionally, remove genesis arg
from these commands that do not load a genesis.bin
This commit is contained in:
steviez 2023-08-09 14:13:25 -05:00 committed by GitHub
parent 31b6b64070
commit b97c451200
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2172,6 +2172,8 @@ fn main() {
if let ("bigtable", Some(arg_matches)) = matches.subcommand() {
bigtable_process_command(&ledger_path, arg_matches)
} else if let ("program", Some(arg_matches)) = matches.subcommand() {
program(&ledger_path, arg_matches)
} else {
let ledger_path = canonicalize_ledger_path(&ledger_path);
@ -4198,9 +4200,6 @@ fn main() {
eprintln!("{err}");
}
}
("program", Some(arg_matches)) => {
program(&ledger_path, arg_matches);
}
("", _) => {
eprintln!("{}", matches.usage());
exit(1);

7
ledger-tool/src/program.rs
View File

@ -1,5 +1,5 @@
use {
crate::{args::*, ledger_utils::*},
crate::{args::*, canonicalize_ledger_path, ledger_utils::*},
clap::{value_t, App, AppSettings, Arg, ArgMatches, SubCommand},
log::*,
serde::{Deserialize, Serialize},
@ -162,13 +162,11 @@ impl ProgramSubCommand for App<'_, '_> {
.subcommand(
SubCommand::with_name("cfg")
.about("generates Control Flow Graph of the program.")
.arg(&max_genesis_arg)
.arg(&program_arg)
)
.subcommand(
SubCommand::with_name("disassemble")
.about("dumps disassembled code of the program.")
.arg(&max_genesis_arg)
.arg(&program_arg)
)
.subcommand(
@ -435,7 +433,8 @@ pub fn program(ledger_path: &Path, matches: &ArgMatches<'_>) {
("run", Some(arg_matches)) => arg_matches,
_ => unreachable!(),
};
let bank = load_blockstore(ledger_path, matches);
let ledger_path = canonicalize_ledger_path(ledger_path);
let bank = load_blockstore(&ledger_path, matches);
let loader_id = bpf_loader_upgradeable::id();
let mut transaction_accounts = Vec::new();
let mut instruction_accounts = Vec::new();