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

fix for verify_block_basic crashing on invalid transaction rlp (#8032)

Browse Source
This commit is contained in:
Marek Kotewicz 2018-03-01 19:55:24 +01:00 committed by Rando
parent d4205da484
commit 87f893265d
1 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,7 +37,7 @@ use client::BlockChainClient;
use engines::EthEngine; use engines::EthEngine;
use error::{BlockError, Error}; use error::{BlockError, Error};
use header::{BlockNumber, Header}; use header::{BlockNumber, Header};
use transaction::SignedTransaction; use transaction::{SignedTransaction, UnverifiedTransaction};
use views::BlockView; use views::BlockView;
/// Preprocessed block data gathered in `verify_block_unordered` call /// Preprocessed block data gathered in `verify_block_unordered` call
@ -68,11 +68,9 @@ pub fn verify_block_basic(header: &Header, bytes: &[u8], engine: &EthEngine) ->
verify_header_params(&u, engine, false)?; verify_header_params(&u, engine, false)?;
engine.verify_block_basic(&u)?; engine.verify_block_basic(&u)?;
} }
// Verify transactions.
// TODO: either use transaction views or cache the decoded transactions. for t in UntrustedRlp::new(bytes).at(1)?.iter().map(|rlp| rlp.as_val::<UnverifiedTransaction>()) {
let v = BlockView::new(bytes); engine.verify_transaction_basic(&t?, &header)?;
for t in v.transactions() {
engine.verify_transaction_basic(&t, &header)?;
} }
Ok(()) Ok(())
} }
@ -348,6 +346,8 @@ mod tests {
use time::get_time; use time::get_time;
use transaction::{SignedTransaction, Transaction, UnverifiedTransaction, Action}; use transaction::{SignedTransaction, Transaction, UnverifiedTransaction, Action};
use types::log_entry::{LogEntry, LocalizedLogEntry}; use types::log_entry::{LogEntry, LocalizedLogEntry};
use rlp;
use triehash::ordered_trie_root;
fn check_ok(result: Result<(), Error>) { fn check_ok(result: Result<(), Error>) {
result.unwrap_or_else(|e| panic!("Block verification failed: {:?}", e)); result.unwrap_or_else(|e| panic!("Block verification failed: {:?}", e));
@ -501,6 +501,27 @@ mod tests {
Ok(()) Ok(())
} }
#[test]
fn test_verify_block_basic_with_invalid_transactions() {
let spec = Spec::new_test();
let engine = &*spec.engine;
let block = {
let mut rlp = rlp::RlpStream::new_list(3);
let mut header = Header::default();
// that's an invalid transaction list rlp
let invalid_transactions = vec![vec![0u8]];
header.set_transactions_root(ordered_trie_root(&invalid_transactions));
header.set_gas_limit(engine.params().min_gas_limit);
rlp.append(&header);
rlp.append_list::<Vec<u8>, _>(&invalid_transactions);
rlp.append_raw(&rlp::EMPTY_LIST_RLP, 1);
rlp.out()
};
assert!(basic_test(&block, engine).is_err());
}
#[test] #[test]
fn test_verify_block() { fn test_verify_block() {
use rlp::RlpStream; use rlp::RlpStream;