grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
* ethcore: use Machine::verify_transaction on parent block

also fixes off-by-one activation of transaction permission contract

* ethcore: clarify call to verify_transaction
This commit is contained in:
André Silva 2018-11-13 11:58:53 +00:00 committed by Andronik Ordian
parent 5cbe834024
commit 5f3ae4dee3
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ethcore/src/machine.rs
View File

@ -371,11 +371,11 @@ impl EthereumMachine {
} }
/// Does verification of the transaction against the parent state. /// 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> -> Result<(), transaction::Error>
{ {
if let Some(ref filter) = self.tx_filter.as_ref() { 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()) return Err(transaction::Error::NotAllowed.into())
} }
} }

4
ethcore/src/verification/verification.rs
View File

@ -147,7 +147,9 @@ pub fn verify_block_family<C: BlockInfo + CallContract>(header: &Header, parent:
verify_uncles(params.block, params.block_provider, engine)?; verify_uncles(params.block, params.block_provider, engine)?;
for tx in &params.block.transactions { for tx in &params.block.transactions {
engine.machine().verify_transaction(tx, header, params.client)?; // transactions are verified against the parent header since the current
// state wasn't available when the tx was created
engine.machine().verify_transaction(tx, parent, params.client)?;
} }
Ok(()) Ok(())