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

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

View File

@ -382,12 +382,15 @@ fn main() -> Result<(), Box<dyn error::Error>> {
} else {
OperatingMode::SoftLaunch
};
let native_instruction_processors = solana_genesis_programs::get(operating_mode, 0).unwrap();
let native_instruction_processors =
solana_genesis_programs::get_programs(operating_mode, 0).unwrap();
let inflation = solana_genesis_programs::get_inflation(operating_mode, 0).unwrap();
let mut genesis_block = GenesisBlock {
accounts,
native_instruction_processors,
ticks_per_slot,
epoch_schedule,
inflation,
fee_calculator,
rent,
poh_config,