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

Push back activation epochs

Browse Source 
Effects:
- Re-enabling inflation
- Nonce FeeCalculator overwrite / RecentBlockhashes sysvar inconsistency fix
This commit is contained in:
Trent Nelson
2020-07-22 13:54:17 -06:00
committed by Trent Nelson
parent 5118825fa4
commit 1f8df36b7d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
genesis-programs/src/lib.rs
View File

@ -30,7 +30,7 @@ pub fn get_inflation(operating_mode: OperatingMode, epoch: Epoch) -> Option<Infl
68 => Some(Inflation::new_disabled()), 68 => Some(Inflation::new_disabled()),
// Enable again after the inflation fix has landed: // Enable again after the inflation fix has landed:
// https://github.com/solana-labs/solana/commit/7cc2a6801bed29a816ef509cfc26a6f2522e46ff // https://github.com/solana-labs/solana/commit/7cc2a6801bed29a816ef509cfc26a6f2522e46ff
72 => Some(Inflation::default()), 74 => Some(Inflation::default()),
_ => None, _ => None,
}, },
OperatingMode::Stable => match epoch { OperatingMode::Stable => match epoch {

2
runtime/src/bank.rs
View File

@ -3065,7 +3065,7 @@ impl Bank {
fn fix_recent_blockhashes_sysvar_delay(&self) -> bool { fn fix_recent_blockhashes_sysvar_delay(&self) -> bool {
let activation_slot = match self.operating_mode() { let activation_slot = match self.operating_mode() {
OperatingMode::Development => 0, OperatingMode::Development => 0,
OperatingMode::Stable => Slot::MAX / 2, OperatingMode::Stable => 26_444_256, // Epoch 74
OperatingMode::Preview => Slot::MAX / 2, OperatingMode::Preview => Slot::MAX / 2,
}; };