Skip to content

Commit

Permalink
v1.18: scheduler optimization - worker precompile verification (backp…
Browse files Browse the repository at this point in the history
…ort of solana-labs#1531) (solana-labs#1535)

* scheduler optimization - worker precompile verification (solana-labs#1531)

(cherry picked from commit 0d34a1a)

# Conflicts:
#	core/src/banking_stage/consumer.rs

* resolve conflicts

---------

Co-authored-by: Andrew Fitzgerald <[email protected]>
  • Loading branch information
mergify[bot] and apfitzge authored May 30, 2024
1 parent e44764f commit c751abd
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 5 deletions.
16 changes: 14 additions & 2 deletions core/src/banking_stage/consumer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -403,12 +403,20 @@ impl Consumer {
let pre_results = vec![Ok(()); txs.len()];
let check_results =
bank.check_transactions(txs, &pre_results, MAX_PROCESSING_AGE, &mut error_counters);
let check_results = check_results.into_iter().map(|(result, _nonce)| result);
// If checks passed, verify pre-compiles and continue processing on success.
let check_results: Vec<_> = txs
.iter()
.zip(check_results)
.map(|(tx, (result, _nonce))| match result {
Ok(_) => tx.verify_precompiles(&bank.feature_set),
Err(err) => Err(err),
})
.collect();
let mut output = self.process_and_record_transactions_with_pre_results(
bank,
txs,
chunk_offset,
check_results,
check_results.into_iter(),
);

// Accumulate error counters from the initial checks into final results
Expand All @@ -425,11 +433,13 @@ impl Consumer {
txs: &[SanitizedTransaction],
max_slot_ages: &[Slot],
) -> ProcessTransactionBatchOutput {
// Verify pre-compiles.
// Need to filter out transactions since they were sanitized earlier.
// This means that the transaction may cross and epoch boundary (not allowed),
// or account lookup tables may have been closed.
let pre_results = txs.iter().zip(max_slot_ages).map(|(tx, max_slot_age)| {
if *max_slot_age < bank.slot() {
// Pre-compiles are verified here.
// Attempt re-sanitization after epoch-cross.
// Re-sanitized transaction should be equal to the original transaction,
// but whether it will pass sanitization needs to be checked.
Expand All @@ -440,6 +450,8 @@ impl Consumer {
return Err(TransactionError::ResanitizationNeeded);
}
} else {
// Verify pre-compiles.
tx.verify_precompiles(&bank.feature_set)?;
// Any transaction executed between sanitization time and now may have closed the lookup table(s).
// Above re-sanitization already loads addresses, so don't need to re-check in that case.
let lookup_tables = tx.message().message_address_table_lookups();
Expand Down
5 changes: 2 additions & 3 deletions core/src/banking_stage/immutable_deserialized_packet.rs
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,10 @@ impl ImmutableDeserializedPacket {
}

// This function deserializes packets into transactions, computes the blake3 hash of transaction
// messages, and verifies secp256k1 instructions.
// messages.
pub fn build_sanitized_transaction(
&self,
feature_set: &Arc<feature_set::FeatureSet>,
_feature_set: &Arc<feature_set::FeatureSet>,
votes_only: bool,
address_loader: impl AddressLoader,
) -> Option<SanitizedTransaction> {
Expand All @@ -121,7 +121,6 @@ impl ImmutableDeserializedPacket {
address_loader,
)
.ok()?;
tx.verify_precompiles(feature_set).ok()?;
Some(tx)
}
}
Expand Down

0 comments on commit c751abd

Please sign in to comment.