From d48786a70f6eb969f2a81da5571e6b56b1f71da5 Mon Sep 17 00:00:00 2001 From: Andrew Fitzgerald Date: Mon, 2 Oct 2023 16:45:02 +0000 Subject: [PATCH 1/2] log signature after successful feature activation --- cli/src/feature.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cli/src/feature.rs b/cli/src/feature.rs index 8c065d78feec91..a882ff75e130d1 100644 --- a/cli/src/feature.rs +++ b/cli/src/feature.rs @@ -957,6 +957,6 @@ fn process_activate( FEATURE_NAMES.get(&feature_id).unwrap(), feature_id ); - rpc_client.send_and_confirm_transaction_with_spinner(&transaction)?; - Ok("".to_string()) + let signature = rpc_client.send_and_confirm_transaction_with_spinner(&transaction)?; + Ok(format!("Signature: {signature}")) } From 3a59417acb080f778d8559b3b34b8d64b769534a Mon Sep 17 00:00:00 2001 From: Andrew Fitzgerald Date: Thu, 5 Oct 2023 17:42:28 +0000 Subject: [PATCH 2/2] log_instruction_custom_error --- cli/src/feature.rs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/cli/src/feature.rs b/cli/src/feature.rs index a882ff75e130d1..d55f3dee88a7d0 100644 --- a/cli/src/feature.rs +++ b/cli/src/feature.rs @@ -1,6 +1,9 @@ use { crate::{ - cli::{CliCommand, CliCommandInfo, CliConfig, CliError, ProcessResult}, + cli::{ + log_instruction_custom_error, CliCommand, CliCommandInfo, CliConfig, CliError, + ProcessResult, + }, spend_utils::{resolve_spend_tx_and_check_account_balance, SpendAmount}, }, clap::{value_t_or_exit, App, AppSettings, Arg, ArgMatches, SubCommand}, @@ -23,6 +26,7 @@ use { message::Message, pubkey::Pubkey, stake_history::Epoch, + system_instruction::SystemError, transaction::Transaction, }, std::{cmp::Ordering, collections::HashMap, fmt, rc::Rc, str::FromStr}, @@ -957,6 +961,6 @@ fn process_activate( FEATURE_NAMES.get(&feature_id).unwrap(), feature_id ); - let signature = rpc_client.send_and_confirm_transaction_with_spinner(&transaction)?; - Ok(format!("Signature: {signature}")) + let result = rpc_client.send_and_confirm_transaction_with_spinner(&transaction); + log_instruction_custom_error::(result, config) }