undone fake blooms,

including real logs and blooms for system transactions now.

crates/db/blooms-db/src/db.rs

@@ -81,14 +81,12 @@ impl DatabaseFiles {
     }
 
     pub fn accrue_bloom(&mut self, pos: Positions, bloom: ethbloom::BloomRef) -> io::Result<()> {
-        let fake_bloom = ethbloom::Bloom::repeat_byte(255);
-        let fake_bloom_ref = ethbloom::BloomRef::from(&fake_bloom);
         self.top
-            .accrue_bloom::<ethbloom::BloomRef>(pos.top, fake_bloom_ref)?;
+            .accrue_bloom::<ethbloom::BloomRef>(pos.top, bloom)?;
         self.mid
-            .accrue_bloom::<ethbloom::BloomRef>(pos.mid, fake_bloom_ref)?;
+            .accrue_bloom::<ethbloom::BloomRef>(pos.mid, bloom)?;
         self.bot
-            .replace_bloom::<ethbloom::BloomRef>(pos.bot, fake_bloom_ref)?;
+            .replace_bloom::<ethbloom::BloomRef>(pos.bot, bloom)?;
         Ok(())
     }
 

crates/ethcore/blockchain/src/blockchain.rs

@@ -1459,20 +1459,9 @@ impl BlockChain {
         }
 
         if let Some((block, blooms)) = update.blocks_blooms {
-            // we fake the blooms and write ff for all bloom fields.
-
-            let mut fake_blooms = Vec::new();
-
-            for _ in blooms.iter() {
-                let fake_bloom = Bloom::repeat_byte(255);
-                fake_blooms.push(fake_bloom);
-            }
-
-            warn!(target: "engine", "Block {} writing fake blooms {}?", block, fake_blooms.len());
-
             self.db
                 .blooms()
-                .insert_blooms(block, fake_blooms.iter())
+                .insert_blooms(block, blooms.iter())
                 .expect("Low level database error when updating blooms. Some issue with disk?");
         }
 

crates/ethcore/src/engines/hbbft/hbbft_engine.rs

@@ -1673,15 +1673,6 @@ impl Engine<EthereumMachine> for HoneyBadgerBFT {
     }
 
     fn on_close_block(&self, block: &mut ExecutedBlock) -> Result<(), Error> {
-
-        let bloom = Bloom::repeat_byte(255);
-        warn!(
-            "faking bloom filter on_close_block for block {} {}",
-            block.header.number(),
-            bloom
-        );
-        block.header.set_log_bloom(bloom);
-
         if let Some(address) = self.params.block_reward_contract_address {
             // only if no block reward skips are defined for this block.
             let header_number = block.header.number();

crates/ethcore/src/machine/impls.rs

@@ -22,9 +22,10 @@ use std::{
     sync::Arc,
 };
 
-use ethereum_types::{Address, H256, U256};
+use ethereum_types::{Address, Bloom, H256, U256};
 use types::{
     header::Header,
+    receipt::TransactionOutcome,
     transaction::{
         self, SignedTransaction, TypedTransaction, UnverifiedTransaction, SYSTEM_ADDRESS,
         UNSIGNED_SENDER,
@@ -210,6 +211,20 @@ impl EthereumMachine {
             .map_err(|e| ::engines::EngineError::FailedSystemCall(format!("{}", e)))?;
         let output = res.return_data.to_vec();
 
+        let logs = substate.logs.clone();
+        let gas_used = gas;
+        let mut log_bloom = Bloom::zero();
+        //log_bloom.accrue(logs);
+
+        for log in substate.logs {
+            let bloom = log.bloom();
+            log_bloom.accrue_bloom(&bloom);
+        }
+
+        block.receipts.push(types::receipt::TypedReceipt::Legacy(
+            types::receipt::LegacyReceipt::new(TransactionOutcome::StatusCode(1), gas_used, logs),
+        ));
+
         Ok(output)
     }
 

crates/ethcore/types/src/header.rs

@@ -260,8 +260,7 @@ impl Header {
 
     /// Set the log bloom field of the header.
     pub fn set_log_bloom(&mut self, a: Bloom) {
-        let fake_bloom = Bloom::repeat_byte(255);
-        change_field(&mut self.hash, &mut self.log_bloom, fake_bloom);
+        change_field(&mut self.hash, &mut self.log_bloom, a);
     }
 
     /// Set the timestamp field of the header.