gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Add native loader entry points (#9275)" Breaks genesis_config abi (#9377)

Browse Source 
This reverts commit ed86d8d1fc.
This commit is contained in:
Jack May
2020-04-08 14:36:18 -07:00
committed by GitHub
parent 4522e85ac4
commit ad0482be73
24 changed files with 157 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
local-cluster/src/local_cluster.rs
View File

@ -20,7 +20,6 @@ use solana_sdk::{
epoch_schedule::EpochSchedule,
genesis_config::{GenesisConfig, OperatingMode},
message::Message,
native_loader,
poh_config::PohConfig,
pubkey::Pubkey,
signature::{Keypair, Signer},
@ -82,7 +81,7 @@ pub struct ClusterConfig {
pub slots_per_epoch: u64,
pub slots_per_segment: u64,
pub stakers_slot_offset: u64,
pub native_instruction_processors: Vec<(native_loader::Info, Pubkey)>,
pub native_instruction_processors: Vec<(String, Pubkey)>,
pub operating_mode: OperatingMode,
pub poh_config: PohConfig,
}
@ -180,13 +179,14 @@ impl LocalCluster {
.push(solana_storage_program!());
}
}
genesis_config
.native_instruction_processors
.extend_from_slice(&config.native_instruction_processors);
genesis_config.inflation =
solana_genesis_programs::get_inflation(genesis_config.operating_mode, 0).unwrap();
genesis_config
.native_instruction_processors
.extend_from_slice(&config.native_instruction_processors);
let storage_keypair = Keypair::new();
genesis_config.add_account(
storage_keypair.pubkey(),