* Runtime feature activation framework (cherry picked from commit93259f0bae
) # Conflicts: # runtime/src/bank.rs * Add feature set identifier to gossiped version information (cherry picked from commit35f5f9fc7b
) # Conflicts: # Cargo.lock # version/Cargo.toml * Port instructions sysvar and secp256k1 program activation to FeatureSet (cherry picked from commitc10da16d7b
) # Conflicts: # runtime/src/bank.rs # runtime/src/message_processor.rs * Add feature management commands (cherry picked from commit93ed0ab2bb
) # Conflicts: # Cargo.lock # cli/Cargo.toml * Make test_process_rest_api less fragile (cherry picked from commit7526bb96f3
) * Remove id field (cherry picked from commitcc6ba1e131
) * FeatureSet test (cherry picked from commit92406cf9a0
) * cargo fmt (cherry picked from commit199940d683
) * cli review feedback (cherry picked from commit3a2b8c5e5b
) * Rename active() to is_active() (cherry picked from commite39fac9f01
) * Resolve merge conflicts * Remove continues from compute_active_feature_set() Co-authored-by: Michael Vines <mvines@gmail.com>
This commit is contained in:
@@ -17,7 +17,7 @@ use solana_client::{
|
||||
pubsub_client::PubsubClient,
|
||||
rpc_client::{GetConfirmedSignaturesForAddress2Config, RpcClient},
|
||||
rpc_config::{RpcLargestAccountsConfig, RpcLargestAccountsFilter},
|
||||
rpc_response::{RpcVersionInfo, SlotInfo},
|
||||
rpc_response::SlotInfo,
|
||||
};
|
||||
use solana_remote_wallet::remote_wallet::RemoteWalletManager;
|
||||
use solana_sdk::{
|
||||
@@ -1314,12 +1314,9 @@ pub fn process_show_validators(
|
||||
for contact_info in rpc_client.get_cluster_nodes()? {
|
||||
node_version.insert(
|
||||
contact_info.pubkey,
|
||||
RpcVersionInfo {
|
||||
solana_core: contact_info
|
||||
.version
|
||||
.unwrap_or_else(|| unknown_version.clone()),
|
||||
}
|
||||
.to_string(),
|
||||
contact_info
|
||||
.version
|
||||
.unwrap_or_else(|| unknown_version.clone()),
|
||||
);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user