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

Revert "Revert "Add inflation to epoch phases (#6787)" (#6802)" (#6806)

Browse Source 
automerge
This commit is contained in:
Sagar Dhawan
2019-11-07 18:33:14 -08:00
committed by Grimes
parent b64b54f48f
commit 80a89b5e6d
5 changed files with 127 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
local_cluster/src/local_cluster.rs
View File

@@ -151,13 +151,16 @@ impl LocalCluster {
match genesis_block.operating_mode {
OperatingMode::SoftLaunch => {
genesis_block.native_instruction_processors =
solana_genesis_programs::get(genesis_block.operating_mode, 0).unwrap()
solana_genesis_programs::get_programs(genesis_block.operating_mode, 0).unwrap()
}
// create_genesis_block_with_leader() assumes OperatingMode::Development so do
// nothing...
OperatingMode::Development => (),
}
genesis_block.inflation =
solana_genesis_programs::get_inflation(genesis_block.operating_mode, 0).unwrap();
genesis_block
.native_instruction_processors
.extend_from_slice(&config.native_instruction_processors);