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

enha: make save_pending_execution cheaper #1911

Merged
merged 2 commits into from
Dec 12, 2024
Merged

enha: make save_pending_execution cheaper #1911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e4bb04
enha: make save_pending_execution cheaper
carneiro-cw Dec 12, 2024
b8d2b43
lint
carneiro-cw Dec 12, 2024
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
13 changes: 13 additions & 0 deletions src/eth/executor/evm_input.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,3 +157,16 @@ impl EvmInput {
self.to.is_some() && not(self.data.is_empty())
}
}

impl PartialEq<(&TransactionInput, &PendingBlockHeader)> for EvmInput {
fn eq(&self, other: &(&TransactionInput, &PendingBlockHeader)) -> bool {
self.block_number == other.1.number
&& self.block_timestamp == *other.1.timestamp
&& self.chain_id == other.0.chain_id
&& self.data == other.0.input
&& self.from == other.0.signer
&& self.nonce.is_some_and(|inner| inner == other.0.nonce)
&& self.value == other.0.value
&& self.to == other.0.to
}
}
10 changes: 6 additions & 4 deletions src/eth/storage/temporary/inmemory.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
use std::collections::HashMap;

use parking_lot::RwLock;
use parking_lot::RwLockUpgradableReadGuard;

use crate::eth::executor::EvmInput;
use crate::eth::primitives::Account;
Expand Down Expand Up @@ -121,18 +122,19 @@ impl TemporaryStorage for InMemoryTemporaryStorage {

fn save_pending_execution(&self, tx: TransactionExecution, check_conflicts: bool) -> Result<(), StratusError> {
// check conflicts
let mut pending_block = self.pending_block.write();
let pending_block = self.pending_block.upgradable_read();
if let TransactionExecution::Local(tx) = &tx {
let expected_input = EvmInput::from_eth_transaction(&tx.input, &pending_block.block.header);

if expected_input != tx.evm_input {
if tx.evm_input != (&tx.input, &pending_block.block.header) {
let expected_input = EvmInput::from_eth_transaction(&tx.input, &pending_block.block.header);
return Err(StratusError::TransactionEvmInputMismatch {
expected: Box::new(expected_input),
actual: Box::new(tx.evm_input.clone()),
});
}
}

let mut pending_block = RwLockUpgradableReadGuard::<InMemoryTemporaryStorageState>::upgrade(pending_block);

if check_conflicts {
if let Some(conflicts) = self.check_conflicts(tx.execution())? {
return Err(StratusError::TransactionConflict(conflicts.into()));
Expand Down
Loading