* 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:
@@ -11,16 +11,6 @@ crate::declare_sysvar_id!("Sysvar1nstructions1111111111111111111111111", Instruc
|
||||
|
||||
impl Sysvar for Instructions {}
|
||||
|
||||
#[cfg(not(feature = "program"))]
|
||||
use crate::clock::Epoch;
|
||||
#[cfg(not(feature = "program"))]
|
||||
use crate::genesis_config::ClusterType;
|
||||
|
||||
#[cfg(not(feature = "program"))]
|
||||
pub fn is_enabled(_epoch: Epoch, cluster_type: ClusterType) -> bool {
|
||||
cluster_type == ClusterType::Development
|
||||
}
|
||||
|
||||
pub fn load_current_index(data: &[u8]) -> u16 {
|
||||
let mut instr_fixed_data = [0u8; 2];
|
||||
let len = data.len();
|
||||
|
||||
Reference in New Issue
Block a user