Push back activation epochs redux
Effects: - Re-enabling inflation - Nonce FeeCalculator overwrite / RecentBlockhashes sysvar inconsistency fix
This commit is contained in:
committed by
mergify[bot]
parent
f9fd4bd24c
commit
1fe0b1e516
@ -31,7 +31,7 @@ pub fn get_inflation(operating_mode: OperatingMode, epoch: Epoch) -> Option<Infl
|
||||
68 => Some(Inflation::new_disabled()),
|
||||
// Enable again after the inflation fix has landed:
|
||||
// https://github.com/solana-labs/solana/commit/7cc2a6801bed29a816ef509cfc26a6f2522e46ff
|
||||
73 => Some(Inflation::default()),
|
||||
74 => Some(Inflation::default()),
|
||||
_ => None,
|
||||
},
|
||||
OperatingMode::Stable => match epoch {
|
||||
|
@ -2832,7 +2832,7 @@ impl Bank {
|
||||
fn fix_recent_blockhashes_sysvar_delay(&self) -> bool {
|
||||
let activation_slot = match self.operating_mode() {
|
||||
OperatingMode::Development => 0,
|
||||
OperatingMode::Stable => 26_012_256, // Epoch 73
|
||||
OperatingMode::Stable => 26_444_256, // Epoch 74
|
||||
OperatingMode::Preview => Slot::MAX / 2,
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user