cli: find-program-derived-address prints bump seed in verbose display

anza-xyz · Sep 30, 2024 · 2d6d007 · 2d6d007
1 parent 489f483
commit 2d6d007
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/cli-output/src/cli_output.rs b/cli-output/src/cli_output.rs
@@ -3196,11 +3196,19 @@ impl fmt::Display for CliBalance {
 #[serde(rename_all = "camelCase")]
 pub struct CliFindProgramDerivedAddress {
     pub address: String,
+    pub seeds: Vec<Vec<u8>>,
     pub bump_seed: u8,
 }
 
 impl QuietDisplay for CliFindProgramDerivedAddress {}
-impl VerboseDisplay for CliFindProgramDerivedAddress {}
+impl VerboseDisplay for CliFindProgramDerivedAddress {
+    fn write_str(&self, w: &mut dyn std::fmt::Write) -> std::fmt::Result {
+        writeln!(w, "Seeds: {:?}", self.seeds)?;
+        writeln!(w, "Bump: {}", self.bump_seed)?;
+        write!(w, "{}", self.address)?;
+        Ok(())
+    }
+}
 
 impl fmt::Display for CliFindProgramDerivedAddress {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {

diff --git a/cli/src/wallet.rs b/cli/src/wallet.rs
@@ -849,13 +849,11 @@ pub fn process_find_program_derived_address(
     seeds: &Vec<Vec<u8>>,
     program_id: &Pubkey,
 ) -> ProcessResult {
-    if config.verbose {
-        println!("Seeds: {seeds:?}");
-    }
     let seeds_slice = seeds.iter().map(|x| &x[..]).collect::<Vec<_>>();
     let (address, bump_seed) = Pubkey::find_program_address(&seeds_slice[..], program_id);
     let result = CliFindProgramDerivedAddress {
         address: address.to_string(),
+        seeds: seeds.clone(),
         bump_seed,
     };
     Ok(config.output_format.formatted_string(&result))