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

Revert "Revert "add genesis stake placeholders (#6969)" (#7109)" (#7124)

Browse Source 
This reverts commit 702f7cc51d.
This commit is contained in:
Rob Walker
2019-11-25 15:11:55 -08:00
committed by GitHub
parent acbe89a159
commit ef64f00cbb
18 changed files with 1322 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
runtime/src/bank.rs
View File

@ -41,7 +41,7 @@ use solana_sdk::{
slot_hashes::SlotHashes,
system_transaction,
sysvar::{self, Sysvar},
timing::duration_as_ns,
timing::years_as_slots,
transaction::{Result, Transaction, TransactionError},
};
use std::{
@ -699,12 +699,11 @@ impl Bank {
self.ticks_per_slot = genesis_config.ticks_per_slot;
self.slots_per_segment = genesis_config.slots_per_segment;
self.max_tick_height = (self.slot + 1) * self.ticks_per_slot;
// ticks/year = seconds/year ...
self.slots_per_year = SECONDS_PER_YEAR
// * (ns/s)/(ns/tick) / ticks/slot = 1/s/1/tick = ticks/s
*(1_000_000_000.0 / duration_as_ns(&genesis_config.poh_config.target_tick_duration) as f64)
// / ticks/slot
/ self.ticks_per_slot as f64;
self.slots_per_year = years_as_slots(
1.0,
&genesis_config.poh_config.target_tick_duration,
self.ticks_per_slot,
);
self.epoch_schedule = genesis_config.epoch_schedule;
@ -1685,7 +1684,6 @@ mod tests {
signature::{Keypair, KeypairUtil},
system_instruction,
sysvar::{fees::Fees, rewards::Rewards},
timing::years_as_slots,
};
use solana_stake_program::stake_state::{Delegation, Stake};
use solana_vote_program::{