octo
/
Zebra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Document why we do a UTXO check that looks redundant (#5106) 

Also inline the call stack for the check, so it is efficient.

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
This commit is contained in:
teor 2022-09-08 09:42:52 +10:00 committed by GitHub
parent 463907965a
commit 093d503d22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zebra-state/src/service.rs
View File

@ -669,6 +669,14 @@ impl Service<Request> for StateService {
let timer = CodeTimer::start(); let timer = CodeTimer::start();
// # Consensus
//
// A non-finalized block verification could have called AwaitUtxo
// before this finalized block arrived in the state.
// So we need to check for pending UTXOs here for non-finalized blocks,
// even though it is redundant for most finalized blocks.
// (Finalized blocks are verified using block hash checkpoints
// and transaction merkle tree block header commitments.)
self.pending_utxos.check_against(&finalized.new_outputs); self.pending_utxos.check_against(&finalized.new_outputs);
// # Performance // # Performance

2
zebra-state/src/service/pending_utxos.rs
View File

@ -38,6 +38,7 @@ impl PendingUtxos {
/// Notify all requests waiting for the [`transparent::Utxo`] pointed to by /// Notify all requests waiting for the [`transparent::Utxo`] pointed to by
/// the given [`transparent::OutPoint`] that the [`transparent::Utxo`] has /// the given [`transparent::OutPoint`] that the [`transparent::Utxo`] has
/// arrived. /// arrived.
#[inline]
pub fn respond(&mut self, outpoint: &transparent::OutPoint, utxo: transparent::Utxo) { pub fn respond(&mut self, outpoint: &transparent::OutPoint, utxo: transparent::Utxo) {
if let Some(sender) = self.0.remove(outpoint) { if let Some(sender) = self.0.remove(outpoint) {
// Adding the outpoint as a field lets us cross-reference // Adding the outpoint as a field lets us cross-reference
@ -59,6 +60,7 @@ impl PendingUtxos {
} }
/// Check the list of pending UTXO requests against the supplied [`transparent::Utxo`] index. /// Check the list of pending UTXO requests against the supplied [`transparent::Utxo`] index.
#[inline]
pub fn check_against(&mut self, utxos: &HashMap<transparent::OutPoint, transparent::Utxo>) { pub fn check_against(&mut self, utxos: &HashMap<transparent::OutPoint, transparent::Utxo>) {
for (outpoint, utxo) in utxos.iter() { for (outpoint, utxo) in utxos.iter() {
self.respond(outpoint, utxo.clone()) self.respond(outpoint, utxo.clone())