Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: extract transaction_validity_check function #10519

Merged
merged 1 commit into from
Jan 29, 2024
Merged

refactor: extract transaction_validity_check function #10519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions chain/chain/src/chain.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2873,6 +2873,21 @@ impl Chain {
Ok(())
}

pub fn transaction_validity_check<'a>(
&'a self,
prev_block_header: BlockHeader,
) -> impl FnMut(&SignedTransaction) -> bool + 'a {
move |tx: &SignedTransaction| -> bool {
self.chain_store()
.check_transaction_validity_period(
&prev_block_header,
&tx.transaction.block_hash,
self.transaction_validity_period,
)
.is_ok()
}
}

/// For given pair of block headers and shard id, return information about
/// block necessary for processing shard update.
pub fn get_apply_chunk_block_context(
Expand Down
14 changes: 3 additions & 11 deletions chain/client/src/chunk_validation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,23 +225,15 @@ fn validate_prepared_transactions(
storage_config: RuntimeStorageConfig,
transactions: &[SignedTransaction],
) -> Result<PreparedTransactions, Error> {
let store = chain.chain_store();
let parent_block_header = store.get_block_header(chunk_header.prev_block_hash())?;
let parent_block_header =
chain.chain_store().get_block_header(chunk_header.prev_block_hash())?;

runtime_adapter.prepare_transactions(
storage_config,
chunk_header.into(),
(&parent_block_header).into(),
&mut TransactionGroupIteratorWrapper::new(transactions),
&mut |tx: &SignedTransaction| -> bool {
store
.check_transaction_validity_period(
&parent_block_header,
&tx.transaction.block_hash,
chain.transaction_validity_period,
)
.is_ok()
},
&mut chain.transaction_validity_check(parent_block_header),
None,
)
}
Expand Down
22 changes: 6 additions & 16 deletions chain/client/src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -820,9 +820,8 @@ impl Client {
.get_chunk_extra(&prev_block_hash, &shard_uid)
.map_err(|err| Error::ChunkProducer(format!("No chunk extra available: {}", err)))?;

let prev_block_header = self.chain.get_block_header(&prev_block_hash)?;
let prepared_transactions =
self.prepare_transactions(shard_uid, chunk_extra.as_ref(), &prev_block_header)?;
self.prepare_transactions(shard_uid, prev_block_hash, chunk_extra.as_ref())?;
#[cfg(feature = "test_features")]
let prepared_transactions = PreparedTransactions {
transactions: Self::maybe_insert_invalid_transaction(
Expand Down Expand Up @@ -943,22 +942,22 @@ impl Client {
fn prepare_transactions(
&mut self,
shard_uid: ShardUId,
prev_block_hash: CryptoHash,
chunk_extra: &ChunkExtra,
prev_block_header: &BlockHeader,
) -> Result<PreparedTransactions, Error> {
let Self { chain, sharded_tx_pool, runtime_adapter: runtime, .. } = self;
let shard_id = shard_uid.shard_id as ShardId;
let prev_block_header = chain.get_block_header(&prev_block_hash)?;

let prepared_transactions = if let Some(mut iter) =
sharded_tx_pool.get_pool_iterator(shard_uid)
{
let transaction_validity_period = chain.transaction_validity_period;
let me = self
.validator_signer
.as_ref()
.map(|validator_signer| validator_signer.validator_id().clone());
let record_storage = chain
.should_produce_state_witness_for_this_or_next_epoch(&me, prev_block_header)?;
.should_produce_state_witness_for_this_or_next_epoch(&me, &prev_block_header)?;
let storage_config = RuntimeStorageConfig {
state_root: *chunk_extra.state_root(),
use_flat_storage: true,
Expand All @@ -969,18 +968,9 @@ impl Client {
runtime.prepare_transactions(
storage_config,
PrepareTransactionsChunkContext { shard_id, gas_limit: chunk_extra.gas_limit() },
prev_block_header.into(),
(&prev_block_header).into(),
&mut iter,
&mut |tx: &SignedTransaction| -> bool {
chain
.chain_store()
.check_transaction_validity_period(
prev_block_header,
&tx.transaction.block_hash,
transaction_validity_period,
)
.is_ok()
},
&mut chain.transaction_validity_check(prev_block_header),
self.config.produce_chunk_add_transactions_time_limit.get(),
)?
} else {
Expand Down
Loading