blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Blockstore: only return block times for rooted slots (#33871) 

* Add Blockstore::get_rooted_block_time method and use in RPC

* Un-pub get_block_time
This commit is contained in:
Tyera 2023-10-26 11:38:58 -06:00 committed by GitHub
parent 22503f0ae9
commit 7048e72d81
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ledger/src/blockstore.rs
View File

@ -1962,12 +1962,23 @@ impl Blockstore {
} }
} }
pub fn get_block_time(&self, slot: Slot) -> Result<Option<UnixTimestamp>> { fn get_block_time(&self, slot: Slot) -> Result<Option<UnixTimestamp>> {
datapoint_info!("blockstore-rpc-api", ("method", "get_block_time", String));
let _lock = self.check_lowest_cleanup_slot(slot)?; let _lock = self.check_lowest_cleanup_slot(slot)?;
self.blocktime_cf.get(slot) self.blocktime_cf.get(slot)
} }
pub fn get_rooted_block_time(&self, slot: Slot) -> Result<Option<UnixTimestamp>> {
datapoint_info!(
"blockstore-rpc-api",
("method", "get_rooted_block_time", String)
);
let _lock = self.check_lowest_cleanup_slot(slot)?;
if self.is_root(slot) {
return self.blocktime_cf.get(slot);
}
Err(BlockstoreError::SlotNotRooted)
}
pub fn cache_block_time(&self, slot: Slot, timestamp: UnixTimestamp) -> Result<()> { pub fn cache_block_time(&self, slot: Slot, timestamp: UnixTimestamp) -> Result<()> {
self.blocktime_cf.put(slot, &timestamp) self.blocktime_cf.put(slot, &timestamp)
} }

2
rpc/src/rpc.rs
View File

@ -1321,7 +1321,7 @@ impl JsonRpcRequestProcessor {
.unwrap() .unwrap()
.highest_super_majority_root() .highest_super_majority_root()
{ {
let result = self.blockstore.get_block_time(slot); let result = self.blockstore.get_rooted_block_time(slot);
self.check_blockstore_root(&result, slot)?; self.check_blockstore_root(&result, slot)?;
if result.is_err() || matches!(result, Ok(None)) { if result.is_err() || matches!(result, Ok(None)) {
if let Some(bigtable_ledger_storage) = &self.bigtable_ledger_storage { if let Some(bigtable_ledger_storage) = &self.bigtable_ledger_storage {