* Introduce automatic ABI maintenance mechanism (2/2; rollout) * Fix stable clippy * Change to symlink * Freeze abi of Tower * fmt... * Improve dev-experience! * Update BankSlotDelta $ diff -u /tmp/abi8/*7dg6BreYxTuxiVz6aLvk3p2Z7GQk2cJqfGvC9h4FAoSj* /tmp/abi8/*9chBcbXVJ4fK7uGgydQzam5aHipaAKFw6V4LDFpjbE4w* --- /tmp/abi8/bank__BankSlotDelta_frozen_abi__test_abi_digest_7dg6BreYxTuxiVz6aLvk3p2Z7GQk2cJqfGvC9h4FAoSj 2020-06-18 18:01:22.831228087 +0900 +++ /tmp/abi8/bank__BankSlotDelta_frozen_abi__test_abi_digest_9chBcbXVJ4fK7uGgydQzam5aHipaAKFw6V4LDFpjbE4w 2020-07-03 15:59:58.430695244 +0900 @@ -140,7 +140,7 @@ field u8 primitive u8 field solana_sdk::instruction::InstructionError - enum InstructionError (variants = 34) + enum InstructionError (variants = 35) variant(0) GenericError (unit) variant(1) InvalidArgument (unit) variant(2) InvalidInstructionData (unit) @@ -176,6 +176,7 @@ variant(31) CallDepth (unit) variant(32) MissingAccount (unit) variant(33) ReentrancyNotAllowed (unit) + variant(34) MaxSeedLengthExceeded (unit) variant(9) CallChainTooDeep (unit) variant(10) MissingSignatureForFee (unit) variant(11) InvalidAccountIndex (unit) * Fix some merge conflicts...
89 lines
2.8 KiB
Rust
89 lines
2.8 KiB
Rust
//! The `hard_forks` module is used to maintain the list of slot boundaries for when a hard fork
|
|
//! should occur.
|
|
|
|
use byteorder::{ByteOrder, LittleEndian};
|
|
use solana_sdk::clock::Slot;
|
|
|
|
#[derive(Default, Clone, Deserialize, Serialize, AbiExample)]
|
|
pub struct HardForks {
|
|
hard_forks: Vec<(Slot, usize)>,
|
|
}
|
|
impl HardForks {
|
|
// Register a fork to occur at all slots >= `slot` with a parent slot < `slot`
|
|
pub fn register(&mut self, new_slot: Slot) {
|
|
if let Some(i) = self
|
|
.hard_forks
|
|
.iter()
|
|
.position(|(slot, _)| *slot == new_slot)
|
|
{
|
|
self.hard_forks[i] = (new_slot, self.hard_forks[i].1 + 1);
|
|
} else {
|
|
self.hard_forks.push((new_slot, 1));
|
|
}
|
|
self.hard_forks.sort();
|
|
}
|
|
|
|
// Returns a sorted-by-slot iterator over the registered hark forks
|
|
pub fn iter(&self) -> std::slice::Iter<(Slot, usize)> {
|
|
self.hard_forks.iter()
|
|
}
|
|
|
|
// Returns data to include in the bank hash for the given slot if a hard fork is scheduled
|
|
pub fn get_hash_data(&self, slot: Slot, parent_slot: Slot) -> Option<[u8; 8]> {
|
|
// The expected number of hard forks in a cluster is small.
|
|
// If this turns out to be false then a more efficient data
|
|
// structure may be needed here to avoid this linear search
|
|
let fork_count: usize = self
|
|
.hard_forks
|
|
.iter()
|
|
.map(|(fork_slot, fork_count)| {
|
|
if parent_slot < *fork_slot && slot >= *fork_slot {
|
|
*fork_count
|
|
} else {
|
|
0
|
|
}
|
|
})
|
|
.sum();
|
|
|
|
if fork_count > 0 {
|
|
let mut buf = [0u8; 8];
|
|
LittleEndian::write_u64(&mut buf[..], fork_count as u64);
|
|
Some(buf)
|
|
} else {
|
|
None
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn iter_is_sorted() {
|
|
let mut hf = HardForks::default();
|
|
hf.register(30);
|
|
hf.register(20);
|
|
hf.register(10);
|
|
hf.register(20);
|
|
|
|
assert_eq!(hf.hard_forks, vec![(10, 1), (20, 2), (30, 1)]);
|
|
}
|
|
|
|
#[test]
|
|
fn multiple_hard_forks_since_parent() {
|
|
let mut hf = HardForks::default();
|
|
hf.register(10);
|
|
hf.register(20);
|
|
|
|
assert_eq!(hf.get_hash_data(9, 0), None);
|
|
assert_eq!(hf.get_hash_data(10, 0), Some([1, 0, 0, 0, 0, 0, 0, 0,]));
|
|
assert_eq!(hf.get_hash_data(19, 0), Some([1, 0, 0, 0, 0, 0, 0, 0,]));
|
|
assert_eq!(hf.get_hash_data(20, 0), Some([2, 0, 0, 0, 0, 0, 0, 0,]));
|
|
assert_eq!(hf.get_hash_data(20, 10), Some([1, 0, 0, 0, 0, 0, 0, 0,]));
|
|
assert_eq!(hf.get_hash_data(20, 11), Some([1, 0, 0, 0, 0, 0, 0, 0,]));
|
|
assert_eq!(hf.get_hash_data(21, 11), Some([1, 0, 0, 0, 0, 0, 0, 0,]));
|
|
assert_eq!(hf.get_hash_data(21, 20), None);
|
|
}
|
|
}
|