Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

ethcore: use Machine::verify_transaction on parent block #9900

Merged
merged 2 commits into from
Nov 13, 2018
Merged

ethcore: use Machine::verify_transaction on parent block #9900

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0281923
ethcore: use Machine::verify_transaction on parent block
andresilva Nov 13, 2018
135c2a5
ethcore: clarify call to verify_transaction
andresilva Nov 13, 2018
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
4 changes: 2 additions & 2 deletions ethcore/src/machine.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,11 +371,11 @@ impl EthereumMachine {
}

/// Does verification of the transaction against the parent state.
pub fn verify_transaction<C: BlockInfo + CallContract>(&self, t: &SignedTransaction, header: &Header, client: &C)
pub fn verify_transaction<C: BlockInfo + CallContract>(&self, t: &SignedTransaction, parent: &Header, client: &C)
-> Result<(), transaction::Error>
{
if let Some(ref filter) = self.tx_filter.as_ref() {
if !filter.transaction_allowed(header.parent_hash(), header.number(), t, client) {
if !filter.transaction_allowed(&parent.hash(), parent.number() + 1, t, client) {
return Err(transaction::Error::NotAllowed.into())
}
}
Expand Down
2 changes: 1 addition & 1 deletion ethcore/src/verification/verification.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ pub fn verify_block_family<C: BlockInfo + CallContract>(header: &Header, parent:
verify_uncles(params.block, params.block_provider, engine)?;

for tx in &params.block.transactions {
engine.machine().verify_transaction(tx, header, params.client)?;
engine.machine().verify_transaction(tx, parent, params.client)?;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you add a comment here why we validate against parent? I guess it might be obvious that current state is not yet available, but I think it's best to mention that explicitly.

}

Ok(())
Expand Down