blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename native programs to native instruction processors

This commit is contained in:
Greg Fitzgerald 2019-04-02 08:57:00 -06:00
parent 947cdd8748
commit fa1c1e3734
5 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/fullnode.rs
View File

@ -369,7 +369,7 @@ pub fn new_fullnode_for_tests() -> (Fullnode, ContactInfo, Keypair, String) {
let (mut genesis_block, mint_keypair) = let (mut genesis_block, mint_keypair) =
GenesisBlock::new_with_leader(10_000, &contact_info.id, 42); GenesisBlock::new_with_leader(10_000, &contact_info.id, 42);
genesis_block genesis_block
.native_programs .native_instruction_processors
.push(("solana_budget_program".to_string(), solana_budget_api::id())); .push(("solana_budget_program".to_string(), solana_budget_api::id()));
let (ledger_path, _blockhash) = create_new_tmp_ledger!(&genesis_block); let (ledger_path, _blockhash) = create_new_tmp_ledger!(&genesis_block);

2
core/src/rpc_pubsub.rs
View File

@ -336,7 +336,7 @@ mod tests {
// This test depends on the budget program // This test depends on the budget program
genesis_block genesis_block
.native_programs .native_instruction_processors
.push(("solana_budget_program".to_string(), solana_budget_api::id())); .push(("solana_budget_program".to_string(), solana_budget_api::id()));
let bob_pubkey = Pubkey::new_rand(); let bob_pubkey = Pubkey::new_rand();

28
genesis/src/main.rs
View File

@ -71,19 +71,21 @@ fn main() -> Result<(), Box<dyn error::Error>> {
); );
genesis_block.mint_id = mint_keypair.pubkey(); genesis_block.mint_id = mint_keypair.pubkey();
genesis_block.bootstrap_leader_vote_account_id = bootstrap_leader_vote_account_keypair.pubkey(); genesis_block.bootstrap_leader_vote_account_id = bootstrap_leader_vote_account_keypair.pubkey();
genesis_block.native_programs.extend_from_slice(&[ genesis_block
("solana_budget_program".to_string(), solana_budget_api::id()), .native_instruction_processors
( .extend_from_slice(&[
"solana_storage_program".to_string(), ("solana_budget_program".to_string(), solana_budget_api::id()),
solana_storage_api::id(), (
), "solana_storage_program".to_string(),
("solana_token_program".to_string(), solana_token_api::id()), solana_storage_api::id(),
("solana_config_program".to_string(), solana_config_api::id()), ),
( ("solana_token_program".to_string(), solana_token_api::id()),
"solana_exchange_program".to_string(), ("solana_config_program".to_string(), solana_config_api::id()),
solana_exchange_api::id(), (
), "solana_exchange_program".to_string(),
]); solana_exchange_api::id(),
),
]);
create_new_ledger(ledger_path, &genesis_block)?; create_new_ledger(ledger_path, &genesis_block)?;
Ok(()) Ok(())

2
runtime/src/bank.rs
View File

@ -358,7 +358,7 @@ impl Bank {
self.register_native_instruction_processor("solana_vote_program", &solana_vote_api::id()); self.register_native_instruction_processor("solana_vote_program", &solana_vote_api::id());
// Add additional native programs specified in the genesis block // 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); self.register_native_instruction_processor(name, program_id);
} }
} }

4
sdk/src/genesis_block.rs
View File

@ -24,7 +24,7 @@ pub struct GenesisBlock {
pub slots_per_epoch: u64, pub slots_per_epoch: u64,
pub stakers_slot_offset: u64, pub stakers_slot_offset: u64,
pub epoch_warmup: bool, pub epoch_warmup: bool,
pub native_programs: Vec<(String, Pubkey)>, pub native_instruction_processors: Vec<(String, Pubkey)>,
} }
impl GenesisBlock { impl GenesisBlock {
@ -54,7 +54,7 @@ impl GenesisBlock {
slots_per_epoch: DEFAULT_SLOTS_PER_EPOCH, slots_per_epoch: DEFAULT_SLOTS_PER_EPOCH,
stakers_slot_offset: DEFAULT_SLOTS_PER_EPOCH, stakers_slot_offset: DEFAULT_SLOTS_PER_EPOCH,
epoch_warmup: true, epoch_warmup: true,
native_programs: vec![], native_instruction_processors: vec![],
}, },
mint_keypair, mint_keypair,
) )