(cherry picked from commit 0812931c38
)
Co-authored-by: Tyera Eulberg <teulberg@gmail.com>
This commit is contained in:
@ -30,6 +30,7 @@ use solana_sdk::{
|
|||||||
genesis_config::GenesisConfig,
|
genesis_config::GenesisConfig,
|
||||||
hash::Hash,
|
hash::Hash,
|
||||||
pubkey::Pubkey,
|
pubkey::Pubkey,
|
||||||
|
sanitize::Sanitize,
|
||||||
signature::{Keypair, Signature, Signer},
|
signature::{Keypair, Signature, Signer},
|
||||||
timing::timestamp,
|
timing::timestamp,
|
||||||
transaction::Transaction,
|
transaction::Transaction,
|
||||||
@ -1707,7 +1708,18 @@ impl Blockstore {
|
|||||||
let slot_transaction_iterator = slot_entries
|
let slot_transaction_iterator = slot_entries
|
||||||
.iter()
|
.iter()
|
||||||
.cloned()
|
.cloned()
|
||||||
.flat_map(|entry| entry.transactions);
|
.flat_map(|entry| entry.transactions)
|
||||||
|
.map(|transaction| {
|
||||||
|
if let Err(err) = transaction.sanitize() {
|
||||||
|
warn!(
|
||||||
|
"Blockstore::get_confirmed_block sanitize failed: {:?}, \
|
||||||
|
slot: {:?}, \
|
||||||
|
{:?}",
|
||||||
|
err, slot, transaction,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
transaction
|
||||||
|
});
|
||||||
let parent_slot_entries = self
|
let parent_slot_entries = self
|
||||||
.get_slot_entries(slot_meta.parent_slot, 0)
|
.get_slot_entries(slot_meta.parent_slot, 0)
|
||||||
.unwrap_or_default();
|
.unwrap_or_default();
|
||||||
@ -1963,6 +1975,17 @@ impl Blockstore {
|
|||||||
.iter()
|
.iter()
|
||||||
.cloned()
|
.cloned()
|
||||||
.flat_map(|entry| entry.transactions)
|
.flat_map(|entry| entry.transactions)
|
||||||
|
.map(|transaction| {
|
||||||
|
if let Err(err) = transaction.sanitize() {
|
||||||
|
warn!(
|
||||||
|
"Blockstore::find_transaction_in_slot sanitize failed: {:?}, \
|
||||||
|
slot: {:?}, \
|
||||||
|
{:?}",
|
||||||
|
err, slot, transaction,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
transaction
|
||||||
|
})
|
||||||
.find(|transaction| transaction.signatures[0] == signature))
|
.find(|transaction| transaction.signatures[0] == signature))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user