diff --git a/core/src/fullnode.rs b/core/src/fullnode.rs index b509cec2fa..e5c38d34a5 100644 --- a/core/src/fullnode.rs +++ b/core/src/fullnode.rs @@ -369,7 +369,7 @@ pub fn new_fullnode_for_tests() -> (Fullnode, ContactInfo, Keypair, String) { let (mut genesis_block, mint_keypair) = GenesisBlock::new_with_leader(10_000, &contact_info.id, 42); genesis_block - .native_programs + .native_instruction_processors .push(("solana_budget_program".to_string(), solana_budget_api::id())); let (ledger_path, _blockhash) = create_new_tmp_ledger!(&genesis_block); diff --git a/core/src/rpc_pubsub.rs b/core/src/rpc_pubsub.rs index 6e214ab209..27f58a361d 100644 --- a/core/src/rpc_pubsub.rs +++ b/core/src/rpc_pubsub.rs @@ -336,7 +336,7 @@ mod tests { // This test depends on the budget program genesis_block - .native_programs + .native_instruction_processors .push(("solana_budget_program".to_string(), solana_budget_api::id())); let bob_pubkey = Pubkey::new_rand(); diff --git a/genesis/src/main.rs b/genesis/src/main.rs index 6517e98b89..21ba453f9c 100644 --- a/genesis/src/main.rs +++ b/genesis/src/main.rs @@ -71,19 +71,21 @@ fn main() -> Result<(), Box> { ); genesis_block.mint_id = mint_keypair.pubkey(); genesis_block.bootstrap_leader_vote_account_id = bootstrap_leader_vote_account_keypair.pubkey(); - genesis_block.native_programs.extend_from_slice(&[ - ("solana_budget_program".to_string(), solana_budget_api::id()), - ( - "solana_storage_program".to_string(), - solana_storage_api::id(), - ), - ("solana_token_program".to_string(), solana_token_api::id()), - ("solana_config_program".to_string(), solana_config_api::id()), - ( - "solana_exchange_program".to_string(), - solana_exchange_api::id(), - ), - ]); + genesis_block + .native_instruction_processors + .extend_from_slice(&[ + ("solana_budget_program".to_string(), solana_budget_api::id()), + ( + "solana_storage_program".to_string(), + solana_storage_api::id(), + ), + ("solana_token_program".to_string(), solana_token_api::id()), + ("solana_config_program".to_string(), solana_config_api::id()), + ( + "solana_exchange_program".to_string(), + solana_exchange_api::id(), + ), + ]); create_new_ledger(ledger_path, &genesis_block)?; Ok(()) diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs index d46ca3885f..e83d77430b 100644 --- a/runtime/src/bank.rs +++ b/runtime/src/bank.rs @@ -358,7 +358,7 @@ impl Bank { self.register_native_instruction_processor("solana_vote_program", &solana_vote_api::id()); // Add additional native programs specified in the genesis block - for (name, program_id) in &genesis_block.native_programs { + for (name, program_id) in &genesis_block.native_instruction_processors { self.register_native_instruction_processor(name, program_id); } } diff --git a/sdk/src/genesis_block.rs b/sdk/src/genesis_block.rs index e529223a67..a6e77d257b 100644 --- a/sdk/src/genesis_block.rs +++ b/sdk/src/genesis_block.rs @@ -24,7 +24,7 @@ pub struct GenesisBlock { pub slots_per_epoch: u64, pub stakers_slot_offset: u64, pub epoch_warmup: bool, - pub native_programs: Vec<(String, Pubkey)>, + pub native_instruction_processors: Vec<(String, Pubkey)>, } impl GenesisBlock { @@ -54,7 +54,7 @@ impl GenesisBlock { slots_per_epoch: DEFAULT_SLOTS_PER_EPOCH, stakers_slot_offset: DEFAULT_SLOTS_PER_EPOCH, epoch_warmup: true, - native_programs: vec![], + native_instruction_processors: vec![], }, mint_keypair, )