diff --git a/blockchainetl/jobs/exporters/google_pubsub_item_exporter.py b/blockchainetl/jobs/exporters/google_pubsub_item_exporter.py
index d96a28e..b2a898e 100644
--- a/blockchainetl/jobs/exporters/google_pubsub_item_exporter.py
+++ b/blockchainetl/jobs/exporters/google_pubsub_item_exporter.py
@@ -29,9 +29,10 @@ from timeout_decorator import timeout_decorator
 
 class GooglePubSubItemExporter:
 
-    def __init__(self, item_type_to_topic_mapping):
+    def __init__(self, item_type_to_topic_mapping, message_attributes=('item_id')):
         self.item_type_to_topic_mapping = item_type_to_topic_mapping
         self.publisher = create_publisher()
+        self.message_attributes = message_attributes
 
     def open(self):
         pass
@@ -64,11 +65,21 @@ class GooglePubSubItemExporter:
         if item_type is not None and item_type in self.item_type_to_topic_mapping:
             topic_path = self.item_type_to_topic_mapping.get(item_type)
             data = json.dumps(item).encode('utf-8')
-            message_future = self.publisher.publish(topic_path, data=data)
+
+            message_future = self.publisher.publish(topic_path, data=data, **self.get_message_attributes(item))
             return message_future
         else:
             logging.warning('Topic for item type "{}" is not configured.'.format(item_type))
 
+    def get_message_attributes(self, item):
+        attributes = {}
+
+        for attr_name in self.message_attributes:
+            if item.get(attr_name) is not None:
+                attributes[attr_name] = item.get(attr_name)
+
+        return attributes
+
     def close(self):
         pass
 
diff --git a/ethereumetl/domain/trace.py b/ethereumetl/domain/trace.py
index 99f9b61..85b305d 100644
--- a/ethereumetl/domain/trace.py
+++ b/ethereumetl/domain/trace.py
@@ -40,3 +40,4 @@ class EthTrace(object):
         self.trace_address = None
         self.error = None
         self.status = None
+        self.trace_id = None
diff --git a/ethereumetl/jobs/export_traces_job.py b/ethereumetl/jobs/export_traces_job.py
index 61764b2..be9d41e 100644
--- a/ethereumetl/jobs/export_traces_job.py
+++ b/ethereumetl/jobs/export_traces_job.py
@@ -25,6 +25,8 @@ from blockchainetl.jobs.base_job import BaseJob
 from ethereumetl.mainnet_daofork_state_changes import DAOFORK_BLOCK_NUMBER
 from ethereumetl.mappers.trace_mapper import EthTraceMapper
 from ethereumetl.service.eth_special_trace_service import EthSpecialTraceService
+
+from ethereumetl.service.trace_id_calculator import calculate_trace_ids
 from ethereumetl.service.trace_status_calculator import calculate_trace_statuses
 from ethereumetl.utils import validate_range
 
@@ -72,15 +74,15 @@ class ExportTracesJob(BaseJob):
         assert len(block_number_batch) == 1
         block_number = block_number_batch[0]
 
+        all_traces = []
+
         if self.include_genesis_traces and 0 in block_number_batch:
             genesis_traces = self.special_trace_service.get_genesis_traces()
-            for trace in genesis_traces:
-                self.item_exporter.export_item(self.trace_mapper.trace_to_dict(trace))
+            all_traces.extend(genesis_traces)
 
         if self.include_daofork_traces and DAOFORK_BLOCK_NUMBER in block_number_batch:
             daofork_traces = self.special_trace_service.get_daofork_traces()
-            for trace in daofork_traces:
-                self.item_exporter.export_item(self.trace_mapper.trace_to_dict(trace))
+            all_traces.extend(daofork_traces)
 
         # TODO: Change to traceFilter when this issue is fixed
         # https://github.com/paritytech/parity-ethereum/issues/9822
@@ -90,10 +92,12 @@ class ExportTracesJob(BaseJob):
             raise ValueError('Response from the node is None. Is the node fully synced?')
 
         traces = [self.trace_mapper.json_dict_to_trace(json_trace) for json_trace in json_traces]
+        all_traces.extend(traces)
 
-        calculate_trace_statuses(traces)
+        calculate_trace_statuses(all_traces)
+        calculate_trace_ids(all_traces)
 
-        for trace in traces:
+        for trace in all_traces:
             self.item_exporter.export_item(self.trace_mapper.trace_to_dict(trace))
 
     def _end(self):
diff --git a/ethereumetl/jobs/exporters/traces_item_exporter.py b/ethereumetl/jobs/exporters/traces_item_exporter.py
index 01c8386..e4a20a0 100644
--- a/ethereumetl/jobs/exporters/traces_item_exporter.py
+++ b/ethereumetl/jobs/exporters/traces_item_exporter.py
@@ -41,6 +41,7 @@ FIELDS_TO_EXPORT = [
     'trace_address',
     'error',
     'status',
+    'trace_id',
 ]
 
 
diff --git a/ethereumetl/mappers/trace_mapper.py b/ethereumetl/mappers/trace_mapper.py
index dd8e9d3..6781146 100644
--- a/ethereumetl/mappers/trace_mapper.py
+++ b/ethereumetl/mappers/trace_mapper.py
@@ -189,4 +189,5 @@ class EthTraceMapper(object):
             'trace_address': trace.trace_address,
             'error': trace.error,
             'status': trace.status,
+            'trace_id': trace.trace_id,
         }
diff --git a/ethereumetl/service/trace_id_calculator.py b/ethereumetl/service/trace_id_calculator.py
new file mode 100644
index 0000000..9145e58
--- /dev/null
+++ b/ethereumetl/service/trace_id_calculator.py
@@ -0,0 +1,75 @@
+# MIT License
+#
+# Copyright (c) 2018 Evgeny Medvedev, evge.medvedev@gmail.com
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+from collections import defaultdict
+
+
+def calculate_trace_ids(traces):
+    # group by block
+    traces_grouped_by_block = defaultdict(list)
+    for trace in traces:
+        traces_grouped_by_block[trace.block_number].append(trace)
+
+    # calculate ids for each block number
+    for block_traces in traces_grouped_by_block.values():
+        transaction_scoped_traces = [trace for trace in block_traces if trace.transaction_hash]
+        calculate_transaction_scoped_trace_ids(transaction_scoped_traces)
+
+        block_scoped_traces = [trace for trace in block_traces if not trace.transaction_hash]
+        calculate_block_scoped_trace_ids(block_scoped_traces)
+
+    return traces
+
+
+def calculate_transaction_scoped_trace_ids(traces):
+    for trace in traces:
+        trace.trace_id = concat(trace.trace_type, trace.transaction_hash, trace_address_to_str(trace.trace_address))
+
+
+def calculate_block_scoped_trace_ids(traces):
+    # group by trace_type
+    grouped_traces = defaultdict(list)
+    for trace in traces:
+        grouped_traces[trace.trace_type].append(trace)
+
+    # calculate ids
+    for type_traces in grouped_traces.values():
+        calculate_trace_indexes_for_single_type(type_traces)
+
+
+def calculate_trace_indexes_for_single_type(traces):
+    sorted_traces = sorted(traces,
+                           key=lambda trace: (trace.reward_type, trace.from_address, trace.to_address, trace.value))
+
+    for index, trace in enumerate(sorted_traces):
+        trace.trace_id = concat(trace.trace_type, trace.block_number, index)
+
+
+def trace_address_to_str(trace_address):
+    if trace_address is None or len(trace_address) == 0:
+        return ''
+
+    return '_'.join([str(address_point) for address_point in trace_address])
+
+
+def concat(*elements):
+    return '_'.join([str(elem) for elem in elements])
diff --git a/ethereumetl/streaming/enrich.py b/ethereumetl/streaming/enrich.py
index 6b0f54f..b0479d8 100644
--- a/ethereumetl/streaming/enrich.py
+++ b/ethereumetl/streaming/enrich.py
@@ -158,7 +158,8 @@ def enrich_traces(blocks, traces):
             'error',
             'status',
             'transaction_hash',
-            'block_number'
+            'block_number',
+            'trace_id'
         ],
         [
             ('timestamp', 'block_timestamp'),
diff --git a/ethereumetl/streaming/eth_item_id_calculator.py b/ethereumetl/streaming/eth_item_id_calculator.py
new file mode 100644
index 0000000..9355ba7
--- /dev/null
+++ b/ethereumetl/streaming/eth_item_id_calculator.py
@@ -0,0 +1,57 @@
+# MIT License
+#
+# Copyright (c) 2018 Evgeny Medvedev, evge.medvedev@gmail.com
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+import json
+import logging
+
+
+class EthItemIdCalculator:
+
+    def calculate(self, item):
+        if item is None or not isinstance(item, dict):
+            return None
+
+        item_type = item.get('type')
+
+        if item_type == 'block' and item.get('hash') is not None:
+            return concat(item_type, item.get('hash'))
+        elif item_type == 'transaction' and item.get('hash') is not None:
+            return concat(item_type, item.get('hash'))
+        elif item_type == 'log' and item.get('transaction_hash') is not None and item.get('log_index') is not None:
+            return concat(item_type, item.get('transaction_hash'), item.get('log_index'))
+        elif item_type == 'token_transfer' and item.get('transaction_hash') is not None \
+                and item.get('log_index') is not None:
+            return concat(item_type, item.get('transaction_hash'), item.get('log_index'))
+        elif item_type == 'trace' and item.get('trace_id') is not None:
+            return concat(item_type, item.get('trace_id'))
+        elif item_type == 'contract' and item.get('block_number') is not None and item.get('address') is not None:
+            return concat(item_type, item.get('block_number'), item.get('address'))
+        elif item_type == 'token' and item.get('block_number') is not None and item.get('address') is not None:
+            return concat(item_type, item.get('block_number'), item.get('address'))
+
+        logging.warning('item_id for item {} is None'.format(json.dumps(item)))
+
+        return None
+
+
+def concat(*elements):
+    return '_'.join([str(elem) for elem in elements])
diff --git a/ethereumetl/streaming/eth_streamer_adapter.py b/ethereumetl/streaming/eth_streamer_adapter.py
index 477bc27..4df9336 100644
--- a/ethereumetl/streaming/eth_streamer_adapter.py
+++ b/ethereumetl/streaming/eth_streamer_adapter.py
@@ -11,6 +11,7 @@ from ethereumetl.jobs.extract_token_transfers_job import ExtractTokenTransfersJo
 from ethereumetl.jobs.extract_tokens_job import ExtractTokensJob
 from ethereumetl.streaming.enrich import enrich_transactions, enrich_logs, enrich_token_transfers, enrich_traces, \
     enrich_contracts, enrich_tokens
+from ethereumetl.streaming.eth_item_id_calculator import EthItemIdCalculator
 from ethereumetl.thread_local_proxy import ThreadLocalProxy
 from web3 import Web3
 
@@ -28,6 +29,7 @@ class EthStreamerAdapter:
         self.batch_size = batch_size
         self.max_workers = max_workers
         self.entity_types = entity_types
+        self.item_id_calculator = EthItemIdCalculator()
 
     def open(self):
         self.item_exporter.open()
@@ -83,15 +85,17 @@ class EthStreamerAdapter:
 
         logging.info('Exporting with ' + type(self.item_exporter).__name__)
 
-        self.item_exporter.export_items(
-            enriched_blocks +
-            enriched_transactions +
-            enriched_logs +
-            enriched_token_transfers +
-            enriched_traces +
-            enriched_contracts +
+        all_items = enriched_blocks + \
+            enriched_transactions + \
+            enriched_logs + \
+            enriched_token_transfers + \
+            enriched_traces + \
+            enriched_contracts + \
             enriched_tokens
-        )
+
+        self.calculate_item_ids(all_items)
+
+        self.item_exporter.export_items(all_items)
 
     def _export_blocks_and_transactions(self, start_block, end_block):
         blocks_and_transactions_item_exporter = InMemoryItemExporter(item_types=['block', 'transaction'])
@@ -202,5 +206,9 @@ class EthStreamerAdapter:
 
         raise ValueError('Unexpected entity type ' + entity_type)
 
+    def calculate_item_ids(self, items):
+        for item in items:
+            item['item_id'] = self.item_id_calculator.calculate(item)
+
     def close(self):
         self.item_exporter.close()
diff --git a/tests/ethereumetl/job/test_extract_geth_traces_job.py b/tests/ethereumetl/job/test_extract_geth_traces_job.py
index 6be73dd..e4a2239 100644
--- a/tests/ethereumetl/job/test_extract_geth_traces_job.py
+++ b/tests/ethereumetl/job/test_extract_geth_traces_job.py
@@ -56,6 +56,8 @@ def test_extract_traces_job(tmpdir, resource_group):
     )
     job.run()
 
+    print('=====================')
+    print(read_file(output_file))
     compare_lines_ignore_order(
         read_resource(resource_group, 'expected_traces.csv'), read_file(output_file)
     )
diff --git a/tests/ethereumetl/streaming/test_stream.py b/tests/ethereumetl/streaming/test_stream.py
index b23f438..f22c328 100644
--- a/tests/ethereumetl/streaming/test_stream.py
+++ b/tests/ethereumetl/streaming/test_stream.py
@@ -95,7 +95,7 @@ def test_stream(tmpdir, start_block, end_block, batch_size, resource_group, enti
             read_resource(resource_group, 'expected_blocks.json'), read_file(blocks_output_file)
         )
 
-    if 'transactions' in entity_types:
+    if 'transaction' in entity_types:
         print('=====================')
         print(read_file(transactions_output_file))
         compare_lines_ignore_order(
diff --git a/tests/resources/test_export_traces_job/block_with_create/expected_traces.csv b/tests/resources/test_export_traces_job/block_with_create/expected_traces.csv
index d196f1b..c96be7c 100644
--- a/tests/resources/test_export_traces_job/block_with_create/expected_traces.csv
+++ b/tests/resources/test_export_traces_job/block_with_create/expected_traces.csv
@@ -1,4 +1,4 @@
-block_number,transaction_hash,transaction_index,from_address,to_address,value,input,output,trace_type,call_type,reward_type,gas,gas_used,subtraces,trace_address,error,status
-1000690,0x2c3cfb8d7f3039fcad64bd231beb0229af55f9114d74aef12a6f228ad1dac100,0,0xaf21e07e5a929d16026a7b4d88f3906a8d2e4942,0x5b3c526b152b1f3d8eabe2ec27f49b904ad51cad,64655529900000002048,0x,0x,call,call,,0,0,0,,,1
-1000690,0xe4de004685c7b5fe48854cfb54cd59686f3f7cbf95e68c3984dfd672fe677871,1,0xacdee28d8ca76187883831a37f551a5904cdf191,0xa7e3cf952ea8d9438a26ee346c295f1ada328ae1,0,0x606060405260026101086000505560405161015638038061015683398101604052805160805160a051919092019190808383815160019081018155600090600160a060020a0332169060029060038390559183525061010260205260408220555b82518110156100eb57828181518110156100025790602001906020020151600160a060020a03166002600050826002016101008110156100025790900160005081905550806002016101026000506000858481518110156100025790602001906020020151600160a060020a0316815260200190815260200160002060005081905550600101610060565b81600060005081905550505050806101056000508190555061010f62015180420490565b61010755505050506031806101256000396000f3003660008037602060003660003473273930d21e01ee25e4c219b63259d214872220a261235a5a03f21560015760206000f30000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000052b7d2dcc80cd2e40000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000acdee28d8ca76187883831a37f551a5904cdf191,0x3660008037602060003660003473273930d21e01ee25e4c219b63259d214872220a261235a5a03f21560015760206000f3,create,,,954720,160631,0,,,1
-1000690,,,,0xf8b483dba2c3b7176a3da549ad41a48bb3121069,5000000000000000000,,,reward,,block,,,0,,,1
+block_number,transaction_hash,transaction_index,from_address,to_address,value,input,output,trace_type,call_type,reward_type,gas,gas_used,subtraces,trace_address,error,status,trace_id
+1000690,0x2c3cfb8d7f3039fcad64bd231beb0229af55f9114d74aef12a6f228ad1dac100,0,0xaf21e07e5a929d16026a7b4d88f3906a8d2e4942,0x5b3c526b152b1f3d8eabe2ec27f49b904ad51cad,64655529900000002048,0x,0x,call,call,,0,0,0,,,1,call_0x2c3cfb8d7f3039fcad64bd231beb0229af55f9114d74aef12a6f228ad1dac100_
+1000690,0xe4de004685c7b5fe48854cfb54cd59686f3f7cbf95e68c3984dfd672fe677871,1,0xacdee28d8ca76187883831a37f551a5904cdf191,0xa7e3cf952ea8d9438a26ee346c295f1ada328ae1,0,0x606060405260026101086000505560405161015638038061015683398101604052805160805160a051919092019190808383815160019081018155600090600160a060020a0332169060029060038390559183525061010260205260408220555b82518110156100eb57828181518110156100025790602001906020020151600160a060020a03166002600050826002016101008110156100025790900160005081905550806002016101026000506000858481518110156100025790602001906020020151600160a060020a0316815260200190815260200160002060005081905550600101610060565b81600060005081905550505050806101056000508190555061010f62015180420490565b61010755505050506031806101256000396000f3003660008037602060003660003473273930d21e01ee25e4c219b63259d214872220a261235a5a03f21560015760206000f30000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000052b7d2dcc80cd2e40000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000acdee28d8ca76187883831a37f551a5904cdf191,0x3660008037602060003660003473273930d21e01ee25e4c219b63259d214872220a261235a5a03f21560015760206000f3,create,,,954720,160631,0,,,1,create_0xe4de004685c7b5fe48854cfb54cd59686f3f7cbf95e68c3984dfd672fe677871_
+1000690,,,,0xf8b483dba2c3b7176a3da549ad41a48bb3121069,5000000000000000000,,,reward,,block,,,0,,,1,reward_1000690_0
diff --git a/tests/resources/test_export_traces_job/block_with_error/expected_traces.csv b/tests/resources/test_export_traces_job/block_with_error/expected_traces.csv
index 68d456e..b8319c3 100644
--- a/tests/resources/test_export_traces_job/block_with_error/expected_traces.csv
+++ b/tests/resources/test_export_traces_job/block_with_error/expected_traces.csv
@@ -1,4 +1,4 @@
-block_number,transaction_hash,transaction_index,from_address,to_address,value,input,output,trace_type,call_type,reward_type,gas,gas_used,subtraces,trace_address,error,status
-1000895,0xa2f089480e6fd907e786a88d928ba20feeca2ca37ffa84c2d54bae42f5d989c9,0,0xad9253df75b066c67aff5cdd9d6d2b9245444726,0x627da06356442122f08e2203c749978151e55800,1000000000000000000,0x,,call,call,,0,,0,,Out of gas,0
-1000895,0xc7fec96b2dd4cadaade2721dc9b5386a39ab00e96e7c1060e441f273801b39de,1,0x9288fe5be3be048b5c7a68bfd4b9a0746b7e4a00,0xe05ff93a9978bbb48356accc74088f3841fc5d72,1100000000000000000,0x,0x,call,call,,100000,0,0,,,1
-1000895,,,,0x63a9975ba31b0b9626b34300f7f627147df1f526,5000000000000000000,,,reward,,block,,,0,,,1
+block_number,transaction_hash,transaction_index,from_address,to_address,value,input,output,trace_type,call_type,reward_type,gas,gas_used,subtraces,trace_address,error,status,trace_id
+1000895,0xa2f089480e6fd907e786a88d928ba20feeca2ca37ffa84c2d54bae42f5d989c9,0,0xad9253df75b066c67aff5cdd9d6d2b9245444726,0x627da06356442122f08e2203c749978151e55800,1000000000000000000,0x,,call,call,,0,,0,,Out of gas,0,call_0xa2f089480e6fd907e786a88d928ba20feeca2ca37ffa84c2d54bae42f5d989c9_
+1000895,0xc7fec96b2dd4cadaade2721dc9b5386a39ab00e96e7c1060e441f273801b39de,1,0x9288fe5be3be048b5c7a68bfd4b9a0746b7e4a00,0xe05ff93a9978bbb48356accc74088f3841fc5d72,1100000000000000000,0x,0x,call,call,,100000,0,0,,,1,call_0xc7fec96b2dd4cadaade2721dc9b5386a39ab00e96e7c1060e441f273801b39de_
+1000895,,,,0x63a9975ba31b0b9626b34300f7f627147df1f526,5000000000000000000,,,reward,,block,,,0,,,1,reward_1000895_0
diff --git a/tests/resources/test_export_traces_job/block_with_subtraces/expected_traces.csv b/tests/resources/test_export_traces_job/block_with_subtraces/expected_traces.csv
index caf4070..faefe8b 100644
--- a/tests/resources/test_export_traces_job/block_with_subtraces/expected_traces.csv
+++ b/tests/resources/test_export_traces_job/block_with_subtraces/expected_traces.csv
@@ -1,5 +1,5 @@
-block_number,transaction_hash,transaction_index,from_address,to_address,value,input,output,trace_type,call_type,reward_type,gas,gas_used,subtraces,trace_address,error,status
-1000000,0xea1093d492a1dcb1bef708f771a99a96ff05dcab81ca76c31940300177fcf49f,0,0x39fa8c5f2793459d6622857e7d9fbb4bd91766d3,0xc083e9947cf02b8ffc7d3090ae9aea72df98fd47,100000000000000000000,0x,0x0000000000000000000000000000000000000000000000000000000000000000,call,call,,108244,8244,1,,,1
-1000000,0xea1093d492a1dcb1bef708f771a99a96ff05dcab81ca76c31940300177fcf49f,0,0xc083e9947cf02b8ffc7d3090ae9aea72df98fd47,0xc083e9947cf02b8ffc7d3090ae9aea72df98fd47,100000000000000000000,0x,0x,call,callcode,,101462,1444,0,0,,1
-1000000,0xe9e91f1ee4b56c0df2e9f06c2b8c27c6076195a88a7b8537ba8313d80e6f124e,1,0x32be343b94f860124dc4fee278fdcbd38c102d88,0xdf190dc7190dfba737d7777a163445b7fff16133,437194980000000000,0x,0x,call,call,,29000,0,0,,,1
-1000000,,,,0x2a65aca4d5fc5b5c859090a6c34d164135398226,5000000000000000000,,,reward,,block,,,0,,,1
+block_number,transaction_hash,transaction_index,from_address,to_address,value,input,output,trace_type,call_type,reward_type,gas,gas_used,subtraces,trace_address,error,status,trace_id
+1000000,0xea1093d492a1dcb1bef708f771a99a96ff05dcab81ca76c31940300177fcf49f,0,0x39fa8c5f2793459d6622857e7d9fbb4bd91766d3,0xc083e9947cf02b8ffc7d3090ae9aea72df98fd47,100000000000000000000,0x,0x0000000000000000000000000000000000000000000000000000000000000000,call,call,,108244,8244,1,,,1,call_0xea1093d492a1dcb1bef708f771a99a96ff05dcab81ca76c31940300177fcf49f_
+1000000,0xea1093d492a1dcb1bef708f771a99a96ff05dcab81ca76c31940300177fcf49f,0,0xc083e9947cf02b8ffc7d3090ae9aea72df98fd47,0xc083e9947cf02b8ffc7d3090ae9aea72df98fd47,100000000000000000000,0x,0x,call,callcode,,101462,1444,0,0,,1,call_0xea1093d492a1dcb1bef708f771a99a96ff05dcab81ca76c31940300177fcf49f_0
+1000000,0xe9e91f1ee4b56c0df2e9f06c2b8c27c6076195a88a7b8537ba8313d80e6f124e,1,0x32be343b94f860124dc4fee278fdcbd38c102d88,0xdf190dc7190dfba737d7777a163445b7fff16133,437194980000000000,0x,0x,call,call,,29000,0,0,,,1,call_0xe9e91f1ee4b56c0df2e9f06c2b8c27c6076195a88a7b8537ba8313d80e6f124e_
+1000000,,,,0x2a65aca4d5fc5b5c859090a6c34d164135398226,5000000000000000000,,,reward,,block,,,0,,,1,reward_1000000_0
diff --git a/tests/resources/test_export_traces_job/block_with_suicide/expected_traces.csv b/tests/resources/test_export_traces_job/block_with_suicide/expected_traces.csv
index 926844a..a88e7d5 100644
--- a/tests/resources/test_export_traces_job/block_with_suicide/expected_traces.csv
+++ b/tests/resources/test_export_traces_job/block_with_suicide/expected_traces.csv
@@ -1,4 +1,4 @@
-block_number,transaction_hash,transaction_index,from_address,to_address,value,input,output,trace_type,call_type,reward_type,gas,gas_used,subtraces,trace_address,error,status
-1011973,0x91acb43c5f141c393a189e091c190c9ffb20e4e8a502e4cc3087be9587bdbc89,0,0x83973747eec131bf9a08ac64fb1a518e891bdf4b,0x474faa5018639791952fae334e2911700ac7fe9b,0,0x41c0e1b5,0x,call,call,,68728,232,1,,,1
-1011973,0x91acb43c5f141c393a189e091c190c9ffb20e4e8a502e4cc3087be9587bdbc89,0,0x474faa5018639791952fae334e2911700ac7fe9b,0x83973747eec131bf9a08ac64fb1a518e891bdf4b,50000000000000000,,,suicide,,,,,0,0,,1
-1011973,,,,0x738db714c08b8a32a29e0e68af00215079aa9c5c,5000000000000000000,,,reward,,block,,,0,,,1
+block_number,transaction_hash,transaction_index,from_address,to_address,value,input,output,trace_type,call_type,reward_type,gas,gas_used,subtraces,trace_address,error,status,trace_id
+1011973,0x91acb43c5f141c393a189e091c190c9ffb20e4e8a502e4cc3087be9587bdbc89,0,0x83973747eec131bf9a08ac64fb1a518e891bdf4b,0x474faa5018639791952fae334e2911700ac7fe9b,0,0x41c0e1b5,0x,call,call,,68728,232,1,,,1,call_0x91acb43c5f141c393a189e091c190c9ffb20e4e8a502e4cc3087be9587bdbc89_
+1011973,0x91acb43c5f141c393a189e091c190c9ffb20e4e8a502e4cc3087be9587bdbc89,0,0x474faa5018639791952fae334e2911700ac7fe9b,0x83973747eec131bf9a08ac64fb1a518e891bdf4b,50000000000000000,,,suicide,,,,,0,0,,1,suicide_0x91acb43c5f141c393a189e091c190c9ffb20e4e8a502e4cc3087be9587bdbc89_0
+1011973,,,,0x738db714c08b8a32a29e0e68af00215079aa9c5c,5000000000000000000,,,reward,,block,,,0,,,1,reward_1011973_0
diff --git a/tests/resources/test_extract_geth_traces_job/block_with_create/expected_traces.csv b/tests/resources/test_extract_geth_traces_job/block_with_create/expected_traces.csv
index b2b7033..ba5b128 100644
--- a/tests/resources/test_extract_geth_traces_job/block_with_create/expected_traces.csv
+++ b/tests/resources/test_extract_geth_traces_job/block_with_create/expected_traces.csv
@@ -1,3 +1,3 @@
-block_number,transaction_hash,transaction_index,from_address,to_address,value,input,output,trace_type,call_type,reward_type,gas,gas_used,subtraces,trace_address,error,status
-1000690,,0,0xaf21e07e5a929d16026a7b4d88f3906a8d2e4942,0x5b3c526b152b1f3d8eabe2ec27f49b904ad51cad,64655529900000002048,0x,0x,call,call,,0,0,0,,,
-1000690,,1,0xacdee28d8ca76187883831a37f551a5904cdf191,0xa7e3cf952ea8d9438a26ee346c295f1ada328ae1,0,0x606060405260026101086000505560405161015638038061015683398101604052805160805160a051919092019190808383815160019081018155600090600160a060020a0332169060029060038390559183525061010260205260408220555b82518110156100eb57828181518110156100025790602001906020020151600160a060020a03166002600050826002016101008110156100025790900160005081905550806002016101026000506000858481518110156100025790602001906020020151600160a060020a0316815260200190815260200160002060005081905550600101610060565b81600060005081905550505050806101056000508190555061010f62015180420490565b61010755505050506031806101256000396000f3003660008037602060003660003473273930d21e01ee25e4c219b63259d214872220a261235a5a03f21560015760206000f30000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000052b7d2dcc80cd2e40000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000acdee28d8ca76187883831a37f551a5904cdf191,0x3660008037602060003660003473273930d21e01ee25e4c219b63259d214872220a261235a5a03f21560015760206000f3,create,,,954720,160631,0,,,
+block_number,transaction_hash,transaction_index,from_address,to_address,value,input,output,trace_type,call_type,reward_type,gas,gas_used,subtraces,trace_address,error,status,trace_id
+1000690,,0,0xaf21e07e5a929d16026a7b4d88f3906a8d2e4942,0x5b3c526b152b1f3d8eabe2ec27f49b904ad51cad,64655529900000002048,0x,0x,call,call,,0,0,0,,,,
+1000690,,1,0xacdee28d8ca76187883831a37f551a5904cdf191,0xa7e3cf952ea8d9438a26ee346c295f1ada328ae1,0,0x606060405260026101086000505560405161015638038061015683398101604052805160805160a051919092019190808383815160019081018155600090600160a060020a0332169060029060038390559183525061010260205260408220555b82518110156100eb57828181518110156100025790602001906020020151600160a060020a03166002600050826002016101008110156100025790900160005081905550806002016101026000506000858481518110156100025790602001906020020151600160a060020a0316815260200190815260200160002060005081905550600101610060565b81600060005081905550505050806101056000508190555061010f62015180420490565b61010755505050506031806101256000396000f3003660008037602060003660003473273930d21e01ee25e4c219b63259d214872220a261235a5a03f21560015760206000f30000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000052b7d2dcc80cd2e40000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000acdee28d8ca76187883831a37f551a5904cdf191,0x3660008037602060003660003473273930d21e01ee25e4c219b63259d214872220a261235a5a03f21560015760206000f3,create,,,954720,160631,0,,,,
diff --git a/tests/resources/test_extract_geth_traces_job/block_with_error/expected_traces.csv b/tests/resources/test_extract_geth_traces_job/block_with_error/expected_traces.csv
index 2b351ce..6dee638 100644
--- a/tests/resources/test_extract_geth_traces_job/block_with_error/expected_traces.csv
+++ b/tests/resources/test_extract_geth_traces_job/block_with_error/expected_traces.csv
@@ -1,3 +1,3 @@
-block_number,transaction_hash,transaction_index,from_address,to_address,value,input,output,trace_type,call_type,reward_type,gas,gas_used,subtraces,trace_address,error,status
-1000895,,0,0xad9253df75b066c67aff5cdd9d6d2b9245444726,0x627da06356442122f08e2203c749978151e55800,1000000000000000000,0x,,call,call,,0,0,0,,out of gas,
-1000895,,1,0x9288fe5be3be048b5c7a68bfd4b9a0746b7e4a00,0xe05ff93a9978bbb48356accc74088f3841fc5d72,1100000000000000000,0x,0x,call,call,,100000,0,0,,,
+block_number,transaction_hash,transaction_index,from_address,to_address,value,input,output,trace_type,call_type,reward_type,gas,gas_used,subtraces,trace_address,error,status,trace_id
+1000895,,0,0xad9253df75b066c67aff5cdd9d6d2b9245444726,0x627da06356442122f08e2203c749978151e55800,1000000000000000000,0x,,call,call,,0,0,0,,out of gas,,
+1000895,,1,0x9288fe5be3be048b5c7a68bfd4b9a0746b7e4a00,0xe05ff93a9978bbb48356accc74088f3841fc5d72,1100000000000000000,0x,0x,call,call,,100000,0,0,,,,
diff --git a/tests/resources/test_extract_geth_traces_job/block_with_subtraces/expected_traces.csv b/tests/resources/test_extract_geth_traces_job/block_with_subtraces/expected_traces.csv
index 263fa01..2d2bc1f 100644
--- a/tests/resources/test_extract_geth_traces_job/block_with_subtraces/expected_traces.csv
+++ b/tests/resources/test_extract_geth_traces_job/block_with_subtraces/expected_traces.csv
@@ -1,4 +1,4 @@
-block_number,transaction_hash,transaction_index,from_address,to_address,value,input,output,trace_type,call_type,reward_type,gas,gas_used,subtraces,trace_address,error,status
-1000000,,0,0x39fa8c5f2793459d6622857e7d9fbb4bd91766d3,0xc083e9947cf02b8ffc7d3090ae9aea72df98fd47,100000000000000000000,0x,0x0000000000000000000000000000000000000000000000000000000000000000,call,call,,108244,8244,1,,,
-1000000,,0,0xc083e9947cf02b8ffc7d3090ae9aea72df98fd47,0x273930d21e01ee25e4c219b63259d214872220a2,100000000000000000000,0x,0x0000000000000000000000000000000000000000000000000000000000000000,call,callcode,,101462,1444,0,0,,
-1000000,,1,0x32be343b94f860124dc4fee278fdcbd38c102d88,0xdf190dc7190dfba737d7777a163445b7fff16133,437194980000000000,0x,0x,call,call,,29000,0,0,,,
+block_number,transaction_hash,transaction_index,from_address,to_address,value,input,output,trace_type,call_type,reward_type,gas,gas_used,subtraces,trace_address,error,status,trace_id
+1000000,,0,0x39fa8c5f2793459d6622857e7d9fbb4bd91766d3,0xc083e9947cf02b8ffc7d3090ae9aea72df98fd47,100000000000000000000,0x,0x0000000000000000000000000000000000000000000000000000000000000000,call,call,,108244,8244,1,,,,
+1000000,,0,0xc083e9947cf02b8ffc7d3090ae9aea72df98fd47,0x273930d21e01ee25e4c219b63259d214872220a2,100000000000000000000,0x,0x0000000000000000000000000000000000000000000000000000000000000000,call,callcode,,101462,1444,0,0,,,
+1000000,,1,0x32be343b94f860124dc4fee278fdcbd38c102d88,0xdf190dc7190dfba737d7777a163445b7fff16133,437194980000000000,0x,0x,call,call,,29000,0,0,,,,
diff --git a/tests/resources/test_extract_geth_traces_job/block_with_suicide/expected_traces.csv b/tests/resources/test_extract_geth_traces_job/block_with_suicide/expected_traces.csv
index 750a837..37c17f4 100644
--- a/tests/resources/test_extract_geth_traces_job/block_with_suicide/expected_traces.csv
+++ b/tests/resources/test_extract_geth_traces_job/block_with_suicide/expected_traces.csv
@@ -1,3 +1,3 @@
-block_number,transaction_hash,transaction_index,from_address,to_address,value,input,output,trace_type,call_type,reward_type,gas,gas_used,subtraces,trace_address,error,status
-1011973,,0,0x83973747eec131bf9a08ac64fb1a518e891bdf4b,0x474faa5018639791952fae334e2911700ac7fe9b,0,0x41c0e1b5,0x,call,call,,68728,232,1,,,
-1011973,,0,,,,,,suicide,,,,,0,0,,
+block_number,transaction_hash,transaction_index,from_address,to_address,value,input,output,trace_type,call_type,reward_type,gas,gas_used,subtraces,trace_address,error,status,trace_id
+1011973,,0,0x83973747eec131bf9a08ac64fb1a518e891bdf4b,0x474faa5018639791952fae334e2911700ac7fe9b,0,0x41c0e1b5,0x,call,call,,68728,232,1,,,,
+1011973,,0,,,,,,suicide,,,,,0,0,,,
diff --git a/tests/resources/test_stream/blocks_1755634_1755635/expected_blocks.json b/tests/resources/test_stream/blocks_1755634_1755635/expected_blocks.json
index a688429..66b164f 100644
--- a/tests/resources/test_stream/blocks_1755634_1755635/expected_blocks.json
+++ b/tests/resources/test_stream/blocks_1755634_1755635/expected_blocks.json
@@ -1,2 +1,2 @@
-{"type": "block", "number": 1755634, "hash": "0xa06fc36a7144c4bbb1f7ab13b541144414fa7808c119e8a4635e392ea544c178", "parent_hash": "0x112aa801c14d16d9b929fd8e1e639a29d79e467334054a111c2f860e462e3ff4", "nonce": "0x803fc62205a3b6bb", "sha3_uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", "logs_bloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "transactions_root": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "state_root": "0x596d5e71f1cbdd30a2111d3b04fabf3390baedc15d3a582b8b0469c508ce30b3", "receipts_root": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "miner": "0x61c808d82a3ac53231750dadc13c777b59310bd9", "difficulty": 52927024787647, "total_difficulty": 30078010444197187424, "size": 532, "extra_data": "0xe4b883e5bda9e7a59ee4bb99e9b1bc", "gas_limit": 4712388, "gas_used": 0, "timestamp": 1466669557, "transaction_count": 0}
-{"type": "block", "number": 1755635, "hash": "0x1dec87ec1ba8e65b7773bb6f62249468948a28a427efd3d896a2ff7d7c591a67", "parent_hash": "0xa06fc36a7144c4bbb1f7ab13b541144414fa7808c119e8a4635e392ea544c178", "nonce": "0xfdaeb738c5a4ef9c", "sha3_uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", "logs_bloom": "0x00000000000000020000000200020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000008000000000000000000000000000000000000000000000000000000000000400001000000040000000000000020000010000000000000000000000000000000000000000000000000000000100000020000001010000000000000000000000000000000000000002000000000000000100000000000000002000000000000000000000200000000000000008000000000000000000000000000000000000000000000001000000002000000000000000000000000", "transactions_root": "0x36854e7b5bedd028c7b2a89829f6269a76e345edc92c6bffaddfdace512a2818", "state_root": "0x7584c6224f7373d95dd2fcb9a29135271b64edf1f785def4f51c446cd4675dc3", "receipts_root": "0xda8b99b6658dbcb71a03a6978d61d5ad6ad3e74961b58fe71e6e75549c701e1a", "miner": "0xa027231f42c80ca4125b5cb962a21cd4f812e88f", "difficulty": 52952868094237, "total_difficulty": 30078063397065281661, "size": 783, "extra_data": "0x6574682e70702e7561", "gas_limit": 4712388, "gas_used": 57418, "timestamp": 1466669562, "transaction_count": 2}
+{"type": "block", "number": 1755634, "hash": "0xa06fc36a7144c4bbb1f7ab13b541144414fa7808c119e8a4635e392ea544c178", "parent_hash": "0x112aa801c14d16d9b929fd8e1e639a29d79e467334054a111c2f860e462e3ff4", "nonce": "0x803fc62205a3b6bb", "sha3_uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", "logs_bloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "transactions_root": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "state_root": "0x596d5e71f1cbdd30a2111d3b04fabf3390baedc15d3a582b8b0469c508ce30b3", "receipts_root": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "miner": "0x61c808d82a3ac53231750dadc13c777b59310bd9", "difficulty": 52927024787647, "total_difficulty": 30078010444197187424, "size": 532, "extra_data": "0xe4b883e5bda9e7a59ee4bb99e9b1bc", "gas_limit": 4712388, "gas_used": 0, "timestamp": 1466669557, "transaction_count": 0, "item_id": "block_0xa06fc36a7144c4bbb1f7ab13b541144414fa7808c119e8a4635e392ea544c178"}
+{"type": "block", "number": 1755635, "hash": "0x1dec87ec1ba8e65b7773bb6f62249468948a28a427efd3d896a2ff7d7c591a67", "parent_hash": "0xa06fc36a7144c4bbb1f7ab13b541144414fa7808c119e8a4635e392ea544c178", "nonce": "0xfdaeb738c5a4ef9c", "sha3_uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", "logs_bloom": "0x00000000000000020000000200020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000008000000000000000000000000000000000000000000000000000000000000400001000000040000000000000020000010000000000000000000000000000000000000000000000000000000100000020000001010000000000000000000000000000000000000002000000000000000100000000000000002000000000000000000000200000000000000008000000000000000000000000000000000000000000000001000000002000000000000000000000000", "transactions_root": "0x36854e7b5bedd028c7b2a89829f6269a76e345edc92c6bffaddfdace512a2818", "state_root": "0x7584c6224f7373d95dd2fcb9a29135271b64edf1f785def4f51c446cd4675dc3", "receipts_root": "0xda8b99b6658dbcb71a03a6978d61d5ad6ad3e74961b58fe71e6e75549c701e1a", "miner": "0xa027231f42c80ca4125b5cb962a21cd4f812e88f", "difficulty": 52952868094237, "total_difficulty": 30078063397065281661, "size": 783, "extra_data": "0x6574682e70702e7561", "gas_limit": 4712388, "gas_used": 57418, "timestamp": 1466669562, "transaction_count": 2, "item_id": "block_0x1dec87ec1ba8e65b7773bb6f62249468948a28a427efd3d896a2ff7d7c591a67"}
diff --git a/tests/resources/test_stream/blocks_1755634_1755635/expected_logs.json b/tests/resources/test_stream/blocks_1755634_1755635/expected_logs.json
index 5f8bb33..c28901c 100644
--- a/tests/resources/test_stream/blocks_1755634_1755635/expected_logs.json
+++ b/tests/resources/test_stream/blocks_1755634_1755635/expected_logs.json
@@ -1,2 +1,2 @@
-{"type": "log", "log_index": 0, "transaction_hash": "0x2e3dcd051a91d3a694f6b8de2ac4b5fe7acdba55f58bcf8471ff00d4a430074d", "transaction_index": 0, "address": "0xbb9bc244d798123fde783fcc1c72d3bb8c189413", "data": "0x0000000000000000000000000000000000000000000000004563918244f40000", "topics": ["0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef", "0x0000000000000000000000006498077292a0921c8804924fdf47b5e91e2a215f", "0x0000000000000000000000008b3b3b624c3c0397d3da8fd861512393d51dcbac"], "block_number": 1755635, "block_timestamp": 1466669562, "block_hash": "0x1dec87ec1ba8e65b7773bb6f62249468948a28a427efd3d896a2ff7d7c591a67"}
-{"type": "log", "log_index": 1, "transaction_hash": "0x2e3dcd051a91d3a694f6b8de2ac4b5fe7acdba55f58bcf8471ff00d4a430074d", "transaction_index": 0, "address": "0x8b3b3b624c3c0397d3da8fd861512393d51dcbac", "data": "0x", "topics": ["0xe3e6ac9b8af8d4194beda053cf95abee2ac870c4fb5f26505181ef1d438512bf", "0x0000000000000000000000006498077292a0921c8804924fdf47b5e91e2a215f", "0x0000000000000000000000000000000000000000000000004563918244f40000"], "block_number": 1755635, "block_timestamp": 1466669562, "block_hash": "0x1dec87ec1ba8e65b7773bb6f62249468948a28a427efd3d896a2ff7d7c591a67"}
+{"type": "log", "log_index": 0, "transaction_hash": "0x2e3dcd051a91d3a694f6b8de2ac4b5fe7acdba55f58bcf8471ff00d4a430074d", "transaction_index": 0, "address": "0xbb9bc244d798123fde783fcc1c72d3bb8c189413", "data": "0x0000000000000000000000000000000000000000000000004563918244f40000", "topics": ["0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef", "0x0000000000000000000000006498077292a0921c8804924fdf47b5e91e2a215f", "0x0000000000000000000000008b3b3b624c3c0397d3da8fd861512393d51dcbac"], "block_number": 1755635, "block_timestamp": 1466669562, "block_hash": "0x1dec87ec1ba8e65b7773bb6f62249468948a28a427efd3d896a2ff7d7c591a67", "item_id": "log_0x2e3dcd051a91d3a694f6b8de2ac4b5fe7acdba55f58bcf8471ff00d4a430074d_0"}
+{"type": "log", "log_index": 1, "transaction_hash": "0x2e3dcd051a91d3a694f6b8de2ac4b5fe7acdba55f58bcf8471ff00d4a430074d", "transaction_index": 0, "address": "0x8b3b3b624c3c0397d3da8fd861512393d51dcbac", "data": "0x", "topics": ["0xe3e6ac9b8af8d4194beda053cf95abee2ac870c4fb5f26505181ef1d438512bf", "0x0000000000000000000000006498077292a0921c8804924fdf47b5e91e2a215f", "0x0000000000000000000000000000000000000000000000004563918244f40000"], "block_number": 1755635, "block_timestamp": 1466669562, "block_hash": "0x1dec87ec1ba8e65b7773bb6f62249468948a28a427efd3d896a2ff7d7c591a67", "item_id": "log_0x2e3dcd051a91d3a694f6b8de2ac4b5fe7acdba55f58bcf8471ff00d4a430074d_1"}
diff --git a/tests/resources/test_stream/blocks_1755634_1755635/expected_token_transfers.json b/tests/resources/test_stream/blocks_1755634_1755635/expected_token_transfers.json
index 7b3f5c2..7ebeb13 100644
--- a/tests/resources/test_stream/blocks_1755634_1755635/expected_token_transfers.json
+++ b/tests/resources/test_stream/blocks_1755634_1755635/expected_token_transfers.json
@@ -1 +1 @@
-{"type": "token_transfer", "token_address": "0xbb9bc244d798123fde783fcc1c72d3bb8c189413", "from_address": "0x6498077292a0921c8804924fdf47b5e91e2a215f", "to_address": "0x8b3b3b624c3c0397d3da8fd861512393d51dcbac", "value": 5000000000000000000, "transaction_hash": "0x2e3dcd051a91d3a694f6b8de2ac4b5fe7acdba55f58bcf8471ff00d4a430074d", "log_index": 0, "block_number": 1755635, "block_timestamp": 1466669562, "block_hash": "0x1dec87ec1ba8e65b7773bb6f62249468948a28a427efd3d896a2ff7d7c591a67"}
+{"type": "token_transfer", "token_address": "0xbb9bc244d798123fde783fcc1c72d3bb8c189413", "from_address": "0x6498077292a0921c8804924fdf47b5e91e2a215f", "to_address": "0x8b3b3b624c3c0397d3da8fd861512393d51dcbac", "value": 5000000000000000000, "transaction_hash": "0x2e3dcd051a91d3a694f6b8de2ac4b5fe7acdba55f58bcf8471ff00d4a430074d", "log_index": 0, "block_number": 1755635, "block_timestamp": 1466669562, "block_hash": "0x1dec87ec1ba8e65b7773bb6f62249468948a28a427efd3d896a2ff7d7c591a67", "item_id": "token_transfer_0x2e3dcd051a91d3a694f6b8de2ac4b5fe7acdba55f58bcf8471ff00d4a430074d_0"}
diff --git a/tests/resources/test_stream/blocks_1755634_1755635/expected_transactions.json b/tests/resources/test_stream/blocks_1755634_1755635/expected_transactions.json
index 3bf5021..d289d4f 100644
--- a/tests/resources/test_stream/blocks_1755634_1755635/expected_transactions.json
+++ b/tests/resources/test_stream/blocks_1755634_1755635/expected_transactions.json
@@ -1,2 +1,2 @@
-{"type": "transaction", "hash": "0x2e3dcd051a91d3a694f6b8de2ac4b5fe7acdba55f58bcf8471ff00d4a430074d", "nonce": 34160, "transaction_index": 0, "from_address": "0xed059bc543141c8c93031d545079b3da0233b27f", "to_address": "0x8b3b3b624c3c0397d3da8fd861512393d51dcbac", "value": 0, "gas": 250000, "gas_price": 20000000000, "input": "0x7edae70f0000000000000000000000006498077292a0921c8804924fdf47b5e91e2a215f", "block_number": 1755635, "receipt_cumulative_gas_used": 36418, "receipt_gas_used": 36418, "receipt_contract_address": null, "receipt_root": "0x4db3f06ff4e7283ab1187045ca78f4bd713b0737640180377b4d4a2e9a80c235", "receipt_status": null, "block_timestamp": 1466669562, "block_hash": "0x1dec87ec1ba8e65b7773bb6f62249468948a28a427efd3d896a2ff7d7c591a67"}
-{"type": "transaction", "hash": "0x9a5437ec71b74ecf5930b406908ac6999966d38a86d1534b7190ece7599095eb", "nonce": 3745, "transaction_index": 1, "from_address": "0x3763e6e1228bfeab94191c856412d1bb0a8e6996", "to_address": "0xec1ebac9da3430213281c80fa6d46378341a96ae", "value": 405738107000000000, "gas": 90000, "gas_price": 20000000000, "input": "0x", "block_number": 1755635, "receipt_cumulative_gas_used": 57418, "receipt_gas_used": 21000, "receipt_contract_address": null, "receipt_root": "0x379f143510d5703cf162e37e61d906341b4a6acf4f339d422c656000ccd5898f", "receipt_status": null, "block_timestamp": 1466669562, "block_hash": "0x1dec87ec1ba8e65b7773bb6f62249468948a28a427efd3d896a2ff7d7c591a67"}
+{"type": "transaction", "hash": "0x2e3dcd051a91d3a694f6b8de2ac4b5fe7acdba55f58bcf8471ff00d4a430074d", "nonce": 34160, "transaction_index": 0, "from_address": "0xed059bc543141c8c93031d545079b3da0233b27f", "to_address": "0x8b3b3b624c3c0397d3da8fd861512393d51dcbac", "value": 0, "gas": 250000, "gas_price": 20000000000, "input": "0x7edae70f0000000000000000000000006498077292a0921c8804924fdf47b5e91e2a215f", "block_timestamp": 1466669562, "block_number": 1755635, "block_hash": "0x1dec87ec1ba8e65b7773bb6f62249468948a28a427efd3d896a2ff7d7c591a67", "receipt_cumulative_gas_used": 36418, "receipt_gas_used": 36418, "receipt_contract_address": null, "receipt_root": "0x4db3f06ff4e7283ab1187045ca78f4bd713b0737640180377b4d4a2e9a80c235", "receipt_status": null, "item_id": "transaction_0x2e3dcd051a91d3a694f6b8de2ac4b5fe7acdba55f58bcf8471ff00d4a430074d"}
+{"type": "transaction", "hash": "0x9a5437ec71b74ecf5930b406908ac6999966d38a86d1534b7190ece7599095eb", "nonce": 3745, "transaction_index": 1, "from_address": "0x3763e6e1228bfeab94191c856412d1bb0a8e6996", "to_address": "0xec1ebac9da3430213281c80fa6d46378341a96ae", "value": 405738107000000000, "gas": 90000, "gas_price": 20000000000, "input": "0x", "block_timestamp": 1466669562, "block_number": 1755635, "block_hash": "0x1dec87ec1ba8e65b7773bb6f62249468948a28a427efd3d896a2ff7d7c591a67", "receipt_cumulative_gas_used": 57418, "receipt_gas_used": 21000, "receipt_contract_address": null, "receipt_root": "0x379f143510d5703cf162e37e61d906341b4a6acf4f339d422c656000ccd5898f", "receipt_status": null, "item_id": "transaction_0x9a5437ec71b74ecf5930b406908ac6999966d38a86d1534b7190ece7599095eb"}
diff --git a/tests/resources/test_stream/blocks_2112234_2112234/expected_contracts.json b/tests/resources/test_stream/blocks_2112234_2112234/expected_contracts.json
index aa4b662..20ec7ff 100644
--- a/tests/resources/test_stream/blocks_2112234_2112234/expected_contracts.json
+++ b/tests/resources/test_stream/blocks_2112234_2112234/expected_contracts.json
@@ -1 +1 @@
-{"type": "contract", "address": "0xdbdacfc9eb9d42559ac1efbdb40460c728139e6a", "bytecode": "0x6060604052361561008d5760e060020a600035046306fdde03811461008f578063095ea7b3146100a557806318160ddd1461012457806323b872dd1461012f578063313ce567146101dc578063475a9fa9146101f057806370a0823114610215578063721a37d21461024357806395d89b411461008f578063a9059cbb14610268578063dd62ed3e146102e7575b005b61031d6040805160208101909152600081525b90565b61038b60043560243560007319ee743d2e356d5f0e4d97cc09b96d06e933d0db63c6605267600160005085856040518460e060020a0281526004018084815260200183600160a060020a0316815260200182815260200193505050506020604051808303818660325a03f4156100025750506040515191506103179050565b6102316003546100a2565b61038b60043560243560443560008054604080517fa00bfa1100000000000000000000000000000000000000000000000000000000815260016004820152600160a060020a038781166024830152868116604483015260648201869052929092166084830152517319ee743d2e356d5f0e4d97cc09b96d06e933d0db9163a00bfa119160a482810192602092919082900301818660325a03f4156100025750506040515195945050505050565b604080516000815290519081900360200190f35b61038b6004356024356000805433600160a060020a0390811691161461039f57610002565b600160a060020a03600435166000908152600160205260409020545b60408051918252519081900360200190f35b61038b6004356024356000805433600160a060020a039081169116146103ce57610002565b61038b60043560243560007319ee743d2e356d5f0e4d97cc09b96d06e933d0db6388d5fecb600160005085856040518460e060020a0281526004018084815260200183600160a060020a0316815260200182815260200193505050506020604051808303818660325a03f4156100025750506040515191506103179050565b610231600435602435600160a060020a038281166000908152600260209081526040808320938516835292905220545b92915050565b60405180806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600302600f01f150905090810190601f16801561037d5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b604080519115158252519081900360200190f35b50600160a060020a03821660009081526001602081905260409091208054830190556003805483019055610317565b600160a060020a038316600090815260016020526040902054821161040a57506040600020805482900390556003805482900390556001610317565b50600061031756", "function_sighashes": ["0x06fdde03", "0x095ea7b3", "0x18160ddd", "0x23b872dd", "0x313ce567", "0x475a9fa9", "0x70a08231", "0x721a37d2", "0x95d89b41", "0xa9059cbb", "0xdd62ed3e"], "is_erc20": true, "is_erc721": false, "block_number": 2112234, "block_timestamp": 1471774428, "block_hash": "0xd279067d9852394d6b6c00b13c49696503c9618d3ed3b23c6b1b1321857ddd92"}
+{"type": "contract", "address": "0xdbdacfc9eb9d42559ac1efbdb40460c728139e6a", "bytecode": "0x6060604052361561008d5760e060020a600035046306fdde03811461008f578063095ea7b3146100a557806318160ddd1461012457806323b872dd1461012f578063313ce567146101dc578063475a9fa9146101f057806370a0823114610215578063721a37d21461024357806395d89b411461008f578063a9059cbb14610268578063dd62ed3e146102e7575b005b61031d6040805160208101909152600081525b90565b61038b60043560243560007319ee743d2e356d5f0e4d97cc09b96d06e933d0db63c6605267600160005085856040518460e060020a0281526004018084815260200183600160a060020a0316815260200182815260200193505050506020604051808303818660325a03f4156100025750506040515191506103179050565b6102316003546100a2565b61038b60043560243560443560008054604080517fa00bfa1100000000000000000000000000000000000000000000000000000000815260016004820152600160a060020a038781166024830152868116604483015260648201869052929092166084830152517319ee743d2e356d5f0e4d97cc09b96d06e933d0db9163a00bfa119160a482810192602092919082900301818660325a03f4156100025750506040515195945050505050565b604080516000815290519081900360200190f35b61038b6004356024356000805433600160a060020a0390811691161461039f57610002565b600160a060020a03600435166000908152600160205260409020545b60408051918252519081900360200190f35b61038b6004356024356000805433600160a060020a039081169116146103ce57610002565b61038b60043560243560007319ee743d2e356d5f0e4d97cc09b96d06e933d0db6388d5fecb600160005085856040518460e060020a0281526004018084815260200183600160a060020a0316815260200182815260200193505050506020604051808303818660325a03f4156100025750506040515191506103179050565b610231600435602435600160a060020a038281166000908152600260209081526040808320938516835292905220545b92915050565b60405180806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600302600f01f150905090810190601f16801561037d5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b604080519115158252519081900360200190f35b50600160a060020a03821660009081526001602081905260409091208054830190556003805483019055610317565b600160a060020a038316600090815260016020526040902054821161040a57506040600020805482900390556003805482900390556001610317565b50600061031756", "function_sighashes": ["0x06fdde03", "0x095ea7b3", "0x18160ddd", "0x23b872dd", "0x313ce567", "0x475a9fa9", "0x70a08231", "0x721a37d2", "0x95d89b41", "0xa9059cbb", "0xdd62ed3e"], "is_erc20": true, "is_erc721": false, "block_number": 2112234, "block_timestamp": 1471774428, "block_hash": "0xd279067d9852394d6b6c00b13c49696503c9618d3ed3b23c6b1b1321857ddd92", "item_id": "contract_2112234_0xdbdacfc9eb9d42559ac1efbdb40460c728139e6a"}
diff --git a/tests/resources/test_stream/blocks_2112234_2112234/expected_tokens.json b/tests/resources/test_stream/blocks_2112234_2112234/expected_tokens.json
index ff25dc2..b55914a 100644
--- a/tests/resources/test_stream/blocks_2112234_2112234/expected_tokens.json
+++ b/tests/resources/test_stream/blocks_2112234_2112234/expected_tokens.json
@@ -1 +1 @@
-{"type": "token", "address": "0xdbdacfc9eb9d42559ac1efbdb40460c728139e6a", "symbol": "", "name": "", "decimals": 0, "total_supply": 0, "block_number": 2112234, "block_timestamp": 1471774428, "block_hash": "0xd279067d9852394d6b6c00b13c49696503c9618d3ed3b23c6b1b1321857ddd92"}
+{"type": "token", "address": "0xdbdacfc9eb9d42559ac1efbdb40460c728139e6a", "symbol": "", "name": "", "decimals": 0, "total_supply": 0, "block_number": 2112234, "block_timestamp": 1471774428, "block_hash": "0xd279067d9852394d6b6c00b13c49696503c9618d3ed3b23c6b1b1321857ddd92", "item_id": "token_2112234_0xdbdacfc9eb9d42559ac1efbdb40460c728139e6a"}
diff --git a/tests/resources/test_stream/blocks_2112234_2112234/expected_traces.json b/tests/resources/test_stream/blocks_2112234_2112234/expected_traces.json
index 8ee0fa4..18c60a1 100644
--- a/tests/resources/test_stream/blocks_2112234_2112234/expected_traces.json
+++ b/tests/resources/test_stream/blocks_2112234_2112234/expected_traces.json
@@ -1,2 +1,2 @@
-{"type": "trace", "transaction_index": 0, "from_address": "0x4b638dd891b0669242742bc0f4198a7c60bfbf00", "to_address": "0xdbdacfc9eb9d42559ac1efbdb40460c728139e6a", "value": 0, "input": "0x606060405260008054600160a060020a03191633179055610412806100246000396000f36060604052361561008d5760e060020a600035046306fdde03811461008f578063095ea7b3146100a557806318160ddd1461012457806323b872dd1461012f578063313ce567146101dc578063475a9fa9146101f057806370a0823114610215578063721a37d21461024357806395d89b411461008f578063a9059cbb14610268578063dd62ed3e146102e7575b005b61031d6040805160208101909152600081525b90565b61038b60043560243560007319ee743d2e356d5f0e4d97cc09b96d06e933d0db63c6605267600160005085856040518460e060020a0281526004018084815260200183600160a060020a0316815260200182815260200193505050506020604051808303818660325a03f4156100025750506040515191506103179050565b6102316003546100a2565b61038b60043560243560443560008054604080517fa00bfa1100000000000000000000000000000000000000000000000000000000815260016004820152600160a060020a038781166024830152868116604483015260648201869052929092166084830152517319ee743d2e356d5f0e4d97cc09b96d06e933d0db9163a00bfa119160a482810192602092919082900301818660325a03f4156100025750506040515195945050505050565b604080516000815290519081900360200190f35b61038b6004356024356000805433600160a060020a0390811691161461039f57610002565b600160a060020a03600435166000908152600160205260409020545b60408051918252519081900360200190f35b61038b6004356024356000805433600160a060020a039081169116146103ce57610002565b61038b60043560243560007319ee743d2e356d5f0e4d97cc09b96d06e933d0db6388d5fecb600160005085856040518460e060020a0281526004018084815260200183600160a060020a0316815260200182815260200193505050506020604051808303818660325a03f4156100025750506040515191506103179050565b610231600435602435600160a060020a038281166000908152600260209081526040808320938516835292905220545b92915050565b60405180806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600302600f01f150905090810190601f16801561037d5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b604080519115158252519081900360200190f35b50600160a060020a03821660009081526001602081905260409091208054830190556003805483019055610317565b600160a060020a038316600090815260016020526040902054821161040a57506040600020805482900390556003805482900390556001610317565b50600061031756", "output": "0x6060604052361561008d5760e060020a600035046306fdde03811461008f578063095ea7b3146100a557806318160ddd1461012457806323b872dd1461012f578063313ce567146101dc578063475a9fa9146101f057806370a0823114610215578063721a37d21461024357806395d89b411461008f578063a9059cbb14610268578063dd62ed3e146102e7575b005b61031d6040805160208101909152600081525b90565b61038b60043560243560007319ee743d2e356d5f0e4d97cc09b96d06e933d0db63c6605267600160005085856040518460e060020a0281526004018084815260200183600160a060020a0316815260200182815260200193505050506020604051808303818660325a03f4156100025750506040515191506103179050565b6102316003546100a2565b61038b60043560243560443560008054604080517fa00bfa1100000000000000000000000000000000000000000000000000000000815260016004820152600160a060020a038781166024830152868116604483015260648201869052929092166084830152517319ee743d2e356d5f0e4d97cc09b96d06e933d0db9163a00bfa119160a482810192602092919082900301818660325a03f4156100025750506040515195945050505050565b604080516000815290519081900360200190f35b61038b6004356024356000805433600160a060020a0390811691161461039f57610002565b600160a060020a03600435166000908152600160205260409020545b60408051918252519081900360200190f35b61038b6004356024356000805433600160a060020a039081169116146103ce57610002565b61038b60043560243560007319ee743d2e356d5f0e4d97cc09b96d06e933d0db6388d5fecb600160005085856040518460e060020a0281526004018084815260200183600160a060020a0316815260200182815260200193505050506020604051808303818660325a03f4156100025750506040515191506103179050565b610231600435602435600160a060020a038281166000908152600260209081526040808320938516835292905220545b92915050565b60405180806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600302600f01f150905090810190601f16801561037d5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b604080519115158252519081900360200190f35b50600160a060020a03821660009081526001602081905260409091208054830190556003805483019055610317565b600160a060020a038316600090815260016020526040902054821161040a57506040600020805482900390556003805482900390556001610317565b50600061031756", "trace_type": "create", "call_type": null, "reward_type": null, "gas": 4589988, "gas_used": 228729, "subtraces": 0, "trace_address": [], "error": null, "status": 1, "transaction_hash": "0xa7a876923fdf69617794ea3fd77734bfb46bde6a44a3dc4264c0ca9f9cada30c", "block_number": 2112234, "block_timestamp": 1471774428, "block_hash": "0xd279067d9852394d6b6c00b13c49696503c9618d3ed3b23c6b1b1321857ddd92"}
-{"type": "trace", "transaction_index": null, "from_address": null, "to_address": "0xbcdfc35b86bedf72f0cda046a3c16829a2ef41d1", "value": 5000000000000000000, "input": null, "output": null, "trace_type": "reward", "call_type": null, "reward_type": "block", "gas": null, "gas_used": null, "subtraces": 0, "trace_address": [], "error": null, "status": 1, "transaction_hash": null, "block_number": 2112234, "block_timestamp": 1471774428, "block_hash": "0xd279067d9852394d6b6c00b13c49696503c9618d3ed3b23c6b1b1321857ddd92"}
+{"type": "trace", "transaction_index": 0, "from_address": "0x4b638dd891b0669242742bc0f4198a7c60bfbf00", "to_address": "0xdbdacfc9eb9d42559ac1efbdb40460c728139e6a", "value": 0, "input": "0x606060405260008054600160a060020a03191633179055610412806100246000396000f36060604052361561008d5760e060020a600035046306fdde03811461008f578063095ea7b3146100a557806318160ddd1461012457806323b872dd1461012f578063313ce567146101dc578063475a9fa9146101f057806370a0823114610215578063721a37d21461024357806395d89b411461008f578063a9059cbb14610268578063dd62ed3e146102e7575b005b61031d6040805160208101909152600081525b90565b61038b60043560243560007319ee743d2e356d5f0e4d97cc09b96d06e933d0db63c6605267600160005085856040518460e060020a0281526004018084815260200183600160a060020a0316815260200182815260200193505050506020604051808303818660325a03f4156100025750506040515191506103179050565b6102316003546100a2565b61038b60043560243560443560008054604080517fa00bfa1100000000000000000000000000000000000000000000000000000000815260016004820152600160a060020a038781166024830152868116604483015260648201869052929092166084830152517319ee743d2e356d5f0e4d97cc09b96d06e933d0db9163a00bfa119160a482810192602092919082900301818660325a03f4156100025750506040515195945050505050565b604080516000815290519081900360200190f35b61038b6004356024356000805433600160a060020a0390811691161461039f57610002565b600160a060020a03600435166000908152600160205260409020545b60408051918252519081900360200190f35b61038b6004356024356000805433600160a060020a039081169116146103ce57610002565b61038b60043560243560007319ee743d2e356d5f0e4d97cc09b96d06e933d0db6388d5fecb600160005085856040518460e060020a0281526004018084815260200183600160a060020a0316815260200182815260200193505050506020604051808303818660325a03f4156100025750506040515191506103179050565b610231600435602435600160a060020a038281166000908152600260209081526040808320938516835292905220545b92915050565b60405180806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600302600f01f150905090810190601f16801561037d5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b604080519115158252519081900360200190f35b50600160a060020a03821660009081526001602081905260409091208054830190556003805483019055610317565b600160a060020a038316600090815260016020526040902054821161040a57506040600020805482900390556003805482900390556001610317565b50600061031756", "output": "0x6060604052361561008d5760e060020a600035046306fdde03811461008f578063095ea7b3146100a557806318160ddd1461012457806323b872dd1461012f578063313ce567146101dc578063475a9fa9146101f057806370a0823114610215578063721a37d21461024357806395d89b411461008f578063a9059cbb14610268578063dd62ed3e146102e7575b005b61031d6040805160208101909152600081525b90565b61038b60043560243560007319ee743d2e356d5f0e4d97cc09b96d06e933d0db63c6605267600160005085856040518460e060020a0281526004018084815260200183600160a060020a0316815260200182815260200193505050506020604051808303818660325a03f4156100025750506040515191506103179050565b6102316003546100a2565b61038b60043560243560443560008054604080517fa00bfa1100000000000000000000000000000000000000000000000000000000815260016004820152600160a060020a038781166024830152868116604483015260648201869052929092166084830152517319ee743d2e356d5f0e4d97cc09b96d06e933d0db9163a00bfa119160a482810192602092919082900301818660325a03f4156100025750506040515195945050505050565b604080516000815290519081900360200190f35b61038b6004356024356000805433600160a060020a0390811691161461039f57610002565b600160a060020a03600435166000908152600160205260409020545b60408051918252519081900360200190f35b61038b6004356024356000805433600160a060020a039081169116146103ce57610002565b61038b60043560243560007319ee743d2e356d5f0e4d97cc09b96d06e933d0db6388d5fecb600160005085856040518460e060020a0281526004018084815260200183600160a060020a0316815260200182815260200193505050506020604051808303818660325a03f4156100025750506040515191506103179050565b610231600435602435600160a060020a038281166000908152600260209081526040808320938516835292905220545b92915050565b60405180806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600302600f01f150905090810190601f16801561037d5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b604080519115158252519081900360200190f35b50600160a060020a03821660009081526001602081905260409091208054830190556003805483019055610317565b600160a060020a038316600090815260016020526040902054821161040a57506040600020805482900390556003805482900390556001610317565b50600061031756", "trace_type": "create", "call_type": null, "reward_type": null, "gas": 4589988, "gas_used": 228729, "subtraces": 0, "trace_address": [], "error": null, "status": 1, "transaction_hash": "0xa7a876923fdf69617794ea3fd77734bfb46bde6a44a3dc4264c0ca9f9cada30c", "block_number": 2112234, "trace_id": "create_0xa7a876923fdf69617794ea3fd77734bfb46bde6a44a3dc4264c0ca9f9cada30c_", "block_timestamp": 1471774428, "block_hash": "0xd279067d9852394d6b6c00b13c49696503c9618d3ed3b23c6b1b1321857ddd92", "item_id": "trace_create_0xa7a876923fdf69617794ea3fd77734bfb46bde6a44a3dc4264c0ca9f9cada30c_"}
+{"type": "trace", "transaction_index": null, "from_address": null, "to_address": "0xbcdfc35b86bedf72f0cda046a3c16829a2ef41d1", "value": 5000000000000000000, "input": null, "output": null, "trace_type": "reward", "call_type": null, "reward_type": "block", "gas": null, "gas_used": null, "subtraces": 0, "trace_address": [], "error": null, "status": 1, "transaction_hash": null, "block_number": 2112234, "trace_id": "reward_2112234_0", "block_timestamp": 1471774428, "block_hash": "0xd279067d9852394d6b6c00b13c49696503c9618d3ed3b23c6b1b1321857ddd92", "item_id": "trace_reward_2112234_0"}
diff --git a/tests/resources/test_stream/blocks_508110_508110/expected_contracts.json b/tests/resources/test_stream/blocks_508110_508110/expected_contracts.json
index 6a0b6dc..dd01835 100644
--- a/tests/resources/test_stream/blocks_508110_508110/expected_contracts.json
+++ b/tests/resources/test_stream/blocks_508110_508110/expected_contracts.json
@@ -1 +1 @@
-{"type": "contract", "address": "0xaec3266ebd18361ab1378646e91f0c5c373038da", "bytecode": "0x606060405236156100825760e060020a6000350463013cf08b81146100845780630d61b519146100d9578063173a4b701461020b57806321933be81461031a57806339ce39831461035b578063400e3949146103645780634d853ee51461036d5780635e44daf31461037f5780638160f0b514610479578063fd46146a14610482575b005b61049460043560048054829081101561000257906000526020600020906008020160005060018101546004820154600583015483546002850154600160a060020a039190911695509293600301919060ff1686565b61054c600435600060006000600060006000600460005087815481101561000257508152600887027f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b018150600154600482015491965001421180156101435750600585015460ff165b156109ac5760009350600092505b60068501548310156109b65760068501805484908110156100025790600052602060002090600202016000506040805160025460018401547fbbd39ac0000000000000000000000000000000000000000000000000000000008352600160a060020a03908116600484015292519395509091169163bbd39ac09160248181019260209290919082900301816000876161da5a03f1156100025750506040515183548102909701969485019491505060019290920191610151565b604080516020606435600481810135601f810184900484028501840190955284845261054c94813594602480359560443595608494920191908190840183828082843750949650505050505050600060006000600260009054906101000a9004600160a060020a0316600160a060020a031663bbd39ac0336040518260e060020a0281526004018082600160a060020a031681526020019150506020604051808303816000876161da5a03f1156100025750505060405151111561068c576004805460018101808355909190828015829011610695578285526106959060089081027f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b90810191840201610739565b61008260043560243560443560038054600160a060020a03199081163317909155600280549190911684179055600082141561057b57612710600055610581565b61054c60015481565b61054c60055481565b61055e600354600160a060020a031681565b61054c600435602435600060006000600260009054906101000a9004600160a060020a0316600160a060020a031663bbd39ac0336040518260e060020a0281526004018082600160a060020a031681526020019150506020604051808303816000876161da5a03f115610002575050506040515111801561040d57506000198312158061040d575060018313155b156108f9576004805485908110156100025760009182526008027f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b01905033600160a060020a0316600090815260078201602052604090205490915060ff1660011415610900576108f9565b61054c60005481565b61055e600254600160a060020a031681565b60408051600160a060020a0388168152602081018790529081018590526080810183905260a0810182905260c0606082018181528554600260018216156101000260001901909116049183018290529060e0830190869080156105385780601f1061050d57610100808354040283529160200191610538565b820191906000526020600020905b81548152906001019060200180831161051b57829003601f168201915b505097505050505050505060405180910390f35b60408051918252519081900360200190f35b60408051600160a060020a03929092168252519081900360200190f35b60008290555b80600014156105965762278d0060015561059e565b603c81026001555b505050565b505042816004016000508190555060018160050160006101000a81548160ff021916908302179055507f095779230509156998187c606e5b8a5a734137945aa43da9bf39c5e7f529a86b82878787876040518086815260200185600160a060020a03168152602001848152602001838152602001806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600302600f01f150905090810190601f1680156106735780820380516001836020036101000a031916815260200191505b50965050505050505060405180910390a1600182016005555b50949350505050565b505060048054929450918491508110156100025790600052602060002090600802016000508054600160a060020a03191687178155600181810187905560028281018790558551600384018054600082815260209081902096975091959481161561010002600019011692909204601f908101839004840193919288019083901061080a57805160ff19168380011785555b506105a39291506107f2565b50506001015b80821115610806578054600160a060020a0319168155600060018281018290556002838101839055600384018054848255909281161561010002600019011604601f8190106107d857505b5060006004830181905560058301805460ff191690556006830180548282559082526020909120610733916002028101905b8082111561080657600081556001018054600160a060020a03191681556107b6565b601f01602090049060005260206000209081019061078491905b8082111561080657600081556001016107f2565b5090565b82800160010185558215610727579182015b8281111561072757825182600050559160200191906001019061081c565b505060408051808201909152858152336020820152600684018054939550909290915084908110156100025790600052602060002090600202016000508151815560209182015160019182018054600160a060020a031916909117905533600160a060020a03166000818152600785018452604090819020805460ff1916909317909255815187815292830186905282820152517f0ee65d9041aa0fefb9e13f940fcdce8fb817356542f5024e16208214b26efc099181900360600190a15b5092915050565b6006810180546001810180835590919082801582901161083a5760020281600202836000526020600020918201910161083a91906107b6565b6000548411801561094a5750600086125b1561095c5760058501805460ff191690555b6005850154604080518981526020810189905280820187905260ff929092166060830152517fd220b7272a8b6d0d7d6bcdace67b936a8f175e6d5c1b3ee438b72256b32ab3af9181900360800190a15b5050505050919050565b600054841180156109c75750600086135b15610939576040805186546001880154600289015483529251600160a060020a03919091169291602081810192600092909190829003018185876185025a03f15050505060058501805460ff1916905561095c56", "function_sighashes": ["0x013cf08b", "0x0d61b519", "0x173a4b70", "0x21933be8", "0x39ce3983", "0x400e3949", "0x4d853ee5", "0x5e44daf3", "0x8160f0b5", "0xfd46146a"], "is_erc20": false, "is_erc721": false, "block_number": 508110, "block_timestamp": 1446973196, "block_hash": "0xc881ee96ddf8b5be74d7680ccda437466b14b9d942aa0161f139fe920690f665"}
+{"type": "contract", "address": "0xaec3266ebd18361ab1378646e91f0c5c373038da", "bytecode": "0x606060405236156100825760e060020a6000350463013cf08b81146100845780630d61b519146100d9578063173a4b701461020b57806321933be81461031a57806339ce39831461035b578063400e3949146103645780634d853ee51461036d5780635e44daf31461037f5780638160f0b514610479578063fd46146a14610482575b005b61049460043560048054829081101561000257906000526020600020906008020160005060018101546004820154600583015483546002850154600160a060020a039190911695509293600301919060ff1686565b61054c600435600060006000600060006000600460005087815481101561000257508152600887027f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b018150600154600482015491965001421180156101435750600585015460ff165b156109ac5760009350600092505b60068501548310156109b65760068501805484908110156100025790600052602060002090600202016000506040805160025460018401547fbbd39ac0000000000000000000000000000000000000000000000000000000008352600160a060020a03908116600484015292519395509091169163bbd39ac09160248181019260209290919082900301816000876161da5a03f1156100025750506040515183548102909701969485019491505060019290920191610151565b604080516020606435600481810135601f810184900484028501840190955284845261054c94813594602480359560443595608494920191908190840183828082843750949650505050505050600060006000600260009054906101000a9004600160a060020a0316600160a060020a031663bbd39ac0336040518260e060020a0281526004018082600160a060020a031681526020019150506020604051808303816000876161da5a03f1156100025750505060405151111561068c576004805460018101808355909190828015829011610695578285526106959060089081027f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b90810191840201610739565b61008260043560243560443560038054600160a060020a03199081163317909155600280549190911684179055600082141561057b57612710600055610581565b61054c60015481565b61054c60055481565b61055e600354600160a060020a031681565b61054c600435602435600060006000600260009054906101000a9004600160a060020a0316600160a060020a031663bbd39ac0336040518260e060020a0281526004018082600160a060020a031681526020019150506020604051808303816000876161da5a03f115610002575050506040515111801561040d57506000198312158061040d575060018313155b156108f9576004805485908110156100025760009182526008027f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b01905033600160a060020a0316600090815260078201602052604090205490915060ff1660011415610900576108f9565b61054c60005481565b61055e600254600160a060020a031681565b60408051600160a060020a0388168152602081018790529081018590526080810183905260a0810182905260c0606082018181528554600260018216156101000260001901909116049183018290529060e0830190869080156105385780601f1061050d57610100808354040283529160200191610538565b820191906000526020600020905b81548152906001019060200180831161051b57829003601f168201915b505097505050505050505060405180910390f35b60408051918252519081900360200190f35b60408051600160a060020a03929092168252519081900360200190f35b60008290555b80600014156105965762278d0060015561059e565b603c81026001555b505050565b505042816004016000508190555060018160050160006101000a81548160ff021916908302179055507f095779230509156998187c606e5b8a5a734137945aa43da9bf39c5e7f529a86b82878787876040518086815260200185600160a060020a03168152602001848152602001838152602001806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600302600f01f150905090810190601f1680156106735780820380516001836020036101000a031916815260200191505b50965050505050505060405180910390a1600182016005555b50949350505050565b505060048054929450918491508110156100025790600052602060002090600802016000508054600160a060020a03191687178155600181810187905560028281018790558551600384018054600082815260209081902096975091959481161561010002600019011692909204601f908101839004840193919288019083901061080a57805160ff19168380011785555b506105a39291506107f2565b50506001015b80821115610806578054600160a060020a0319168155600060018281018290556002838101839055600384018054848255909281161561010002600019011604601f8190106107d857505b5060006004830181905560058301805460ff191690556006830180548282559082526020909120610733916002028101905b8082111561080657600081556001018054600160a060020a03191681556107b6565b601f01602090049060005260206000209081019061078491905b8082111561080657600081556001016107f2565b5090565b82800160010185558215610727579182015b8281111561072757825182600050559160200191906001019061081c565b505060408051808201909152858152336020820152600684018054939550909290915084908110156100025790600052602060002090600202016000508151815560209182015160019182018054600160a060020a031916909117905533600160a060020a03166000818152600785018452604090819020805460ff1916909317909255815187815292830186905282820152517f0ee65d9041aa0fefb9e13f940fcdce8fb817356542f5024e16208214b26efc099181900360600190a15b5092915050565b6006810180546001810180835590919082801582901161083a5760020281600202836000526020600020918201910161083a91906107b6565b6000548411801561094a5750600086125b1561095c5760058501805460ff191690555b6005850154604080518981526020810189905280820187905260ff929092166060830152517fd220b7272a8b6d0d7d6bcdace67b936a8f175e6d5c1b3ee438b72256b32ab3af9181900360800190a15b5050505050919050565b600054841180156109c75750600086135b15610939576040805186546001880154600289015483529251600160a060020a03919091169291602081810192600092909190829003018185876185025a03f15050505060058501805460ff1916905561095c56", "function_sighashes": ["0x013cf08b", "0x0d61b519", "0x173a4b70", "0x21933be8", "0x39ce3983", "0x400e3949", "0x4d853ee5", "0x5e44daf3", "0x8160f0b5", "0xfd46146a"], "is_erc20": false, "is_erc721": false, "block_number": 508110, "block_timestamp": 1446973196, "block_hash": "0xc881ee96ddf8b5be74d7680ccda437466b14b9d942aa0161f139fe920690f665", "item_id": "contract_508110_0xaec3266ebd18361ab1378646e91f0c5c373038da"}
diff --git a/tests/resources/test_stream/blocks_508110_508110/expected_traces.json b/tests/resources/test_stream/blocks_508110_508110/expected_traces.json
index d8dfe4f..54416f5 100644
--- a/tests/resources/test_stream/blocks_508110_508110/expected_traces.json
+++ b/tests/resources/test_stream/blocks_508110_508110/expected_traces.json
@@ -1,4 +1,4 @@
-{"type": "trace", "transaction_index": 0, "from_address": "0x52de4b32e40ba930679efeb2214357cdf6fec979", "to_address": "0xaec3266ebd18361ab1378646e91f0c5c373038da", "value": 0, "input": "0x6060604052610a1c806100126000396000f3606060405236156100825760e060020a6000350463013cf08b81146100845780630d61b519146100d9578063173a4b701461020b57806321933be81461031a57806339ce39831461035b578063400e3949146103645780634d853ee51461036d5780635e44daf31461037f5780638160f0b514610479578063fd46146a14610482575b005b61049460043560048054829081101561000257906000526020600020906008020160005060018101546004820154600583015483546002850154600160a060020a039190911695509293600301919060ff1686565b61054c600435600060006000600060006000600460005087815481101561000257508152600887027f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b018150600154600482015491965001421180156101435750600585015460ff165b156109ac5760009350600092505b60068501548310156109b65760068501805484908110156100025790600052602060002090600202016000506040805160025460018401547fbbd39ac0000000000000000000000000000000000000000000000000000000008352600160a060020a03908116600484015292519395509091169163bbd39ac09160248181019260209290919082900301816000876161da5a03f1156100025750506040515183548102909701969485019491505060019290920191610151565b604080516020606435600481810135601f810184900484028501840190955284845261054c94813594602480359560443595608494920191908190840183828082843750949650505050505050600060006000600260009054906101000a9004600160a060020a0316600160a060020a031663bbd39ac0336040518260e060020a0281526004018082600160a060020a031681526020019150506020604051808303816000876161da5a03f1156100025750505060405151111561068c576004805460018101808355909190828015829011610695578285526106959060089081027f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b90810191840201610739565b61008260043560243560443560038054600160a060020a03199081163317909155600280549190911684179055600082141561057b57612710600055610581565b61054c60015481565b61054c60055481565b61055e600354600160a060020a031681565b61054c600435602435600060006000600260009054906101000a9004600160a060020a0316600160a060020a031663bbd39ac0336040518260e060020a0281526004018082600160a060020a031681526020019150506020604051808303816000876161da5a03f115610002575050506040515111801561040d57506000198312158061040d575060018313155b156108f9576004805485908110156100025760009182526008027f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b01905033600160a060020a0316600090815260078201602052604090205490915060ff1660011415610900576108f9565b61054c60005481565b61055e600254600160a060020a031681565b60408051600160a060020a0388168152602081018790529081018590526080810183905260a0810182905260c0606082018181528554600260018216156101000260001901909116049183018290529060e0830190869080156105385780601f1061050d57610100808354040283529160200191610538565b820191906000526020600020905b81548152906001019060200180831161051b57829003601f168201915b505097505050505050505060405180910390f35b60408051918252519081900360200190f35b60408051600160a060020a03929092168252519081900360200190f35b60008290555b80600014156105965762278d0060015561059e565b603c81026001555b505050565b505042816004016000508190555060018160050160006101000a81548160ff021916908302179055507f095779230509156998187c606e5b8a5a734137945aa43da9bf39c5e7f529a86b82878787876040518086815260200185600160a060020a03168152602001848152602001838152602001806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600302600f01f150905090810190601f1680156106735780820380516001836020036101000a031916815260200191505b50965050505050505060405180910390a1600182016005555b50949350505050565b505060048054929450918491508110156100025790600052602060002090600802016000508054600160a060020a03191687178155600181810187905560028281018790558551600384018054600082815260209081902096975091959481161561010002600019011692909204601f908101839004840193919288019083901061080a57805160ff19168380011785555b506105a39291506107f2565b50506001015b80821115610806578054600160a060020a0319168155600060018281018290556002838101839055600384018054848255909281161561010002600019011604601f8190106107d857505b5060006004830181905560058301805460ff191690556006830180548282559082526020909120610733916002028101905b8082111561080657600081556001018054600160a060020a03191681556107b6565b601f01602090049060005260206000209081019061078491905b8082111561080657600081556001016107f2565b5090565b82800160010185558215610727579182015b8281111561072757825182600050559160200191906001019061081c565b505060408051808201909152858152336020820152600684018054939550909290915084908110156100025790600052602060002090600202016000508151815560209182015160019182018054600160a060020a031916909117905533600160a060020a03166000818152600785018452604090819020805460ff1916909317909255815187815292830186905282820152517f0ee65d9041aa0fefb9e13f940fcdce8fb817356542f5024e16208214b26efc099181900360600190a15b5092915050565b6006810180546001810180835590919082801582901161083a5760020281600202836000526020600020918201910161083a91906107b6565b6000548411801561094a5750600086125b1561095c5760058501805460ff191690555b6005850154604080518981526020810189905280820187905260ff929092166060830152517fd220b7272a8b6d0d7d6bcdace67b936a8f175e6d5c1b3ee438b72256b32ab3af9181900360800190a15b5050505050919050565b600054841180156109c75750600086135b15610939576040805186546001880154600289015483529251600160a060020a03919091169291602081810192600092909190829003018185876185025a03f15050505060058501805460ff1916905561095c56", "output": "0x606060405236156100825760e060020a6000350463013cf08b81146100845780630d61b519146100d9578063173a4b701461020b57806321933be81461031a57806339ce39831461035b578063400e3949146103645780634d853ee51461036d5780635e44daf31461037f5780638160f0b514610479578063fd46146a14610482575b005b61049460043560048054829081101561000257906000526020600020906008020160005060018101546004820154600583015483546002850154600160a060020a039190911695509293600301919060ff1686565b61054c600435600060006000600060006000600460005087815481101561000257508152600887027f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b018150600154600482015491965001421180156101435750600585015460ff165b156109ac5760009350600092505b60068501548310156109b65760068501805484908110156100025790600052602060002090600202016000506040805160025460018401547fbbd39ac0000000000000000000000000000000000000000000000000000000008352600160a060020a03908116600484015292519395509091169163bbd39ac09160248181019260209290919082900301816000876161da5a03f1156100025750506040515183548102909701969485019491505060019290920191610151565b604080516020606435600481810135601f810184900484028501840190955284845261054c94813594602480359560443595608494920191908190840183828082843750949650505050505050600060006000600260009054906101000a9004600160a060020a0316600160a060020a031663bbd39ac0336040518260e060020a0281526004018082600160a060020a031681526020019150506020604051808303816000876161da5a03f1156100025750505060405151111561068c576004805460018101808355909190828015829011610695578285526106959060089081027f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b90810191840201610739565b61008260043560243560443560038054600160a060020a03199081163317909155600280549190911684179055600082141561057b57612710600055610581565b61054c60015481565b61054c60055481565b61055e600354600160a060020a031681565b61054c600435602435600060006000600260009054906101000a9004600160a060020a0316600160a060020a031663bbd39ac0336040518260e060020a0281526004018082600160a060020a031681526020019150506020604051808303816000876161da5a03f115610002575050506040515111801561040d57506000198312158061040d575060018313155b156108f9576004805485908110156100025760009182526008027f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b01905033600160a060020a0316600090815260078201602052604090205490915060ff1660011415610900576108f9565b61054c60005481565b61055e600254600160a060020a031681565b60408051600160a060020a0388168152602081018790529081018590526080810183905260a0810182905260c0606082018181528554600260018216156101000260001901909116049183018290529060e0830190869080156105385780601f1061050d57610100808354040283529160200191610538565b820191906000526020600020905b81548152906001019060200180831161051b57829003601f168201915b505097505050505050505060405180910390f35b60408051918252519081900360200190f35b60408051600160a060020a03929092168252519081900360200190f35b60008290555b80600014156105965762278d0060015561059e565b603c81026001555b505050565b505042816004016000508190555060018160050160006101000a81548160ff021916908302179055507f095779230509156998187c606e5b8a5a734137945aa43da9bf39c5e7f529a86b82878787876040518086815260200185600160a060020a03168152602001848152602001838152602001806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600302600f01f150905090810190601f1680156106735780820380516001836020036101000a031916815260200191505b50965050505050505060405180910390a1600182016005555b50949350505050565b505060048054929450918491508110156100025790600052602060002090600802016000508054600160a060020a03191687178155600181810187905560028281018790558551600384018054600082815260209081902096975091959481161561010002600019011692909204601f908101839004840193919288019083901061080a57805160ff19168380011785555b506105a39291506107f2565b50506001015b80821115610806578054600160a060020a0319168155600060018281018290556002838101839055600384018054848255909281161561010002600019011604601f8190106107d857505b5060006004830181905560058301805460ff191690556006830180548282559082526020909120610733916002028101905b8082111561080657600081556001018054600160a060020a03191681556107b6565b601f01602090049060005260206000209081019061078491905b8082111561080657600081556001016107f2565b5090565b82800160010185558215610727579182015b8281111561072757825182600050559160200191906001019061081c565b505060408051808201909152858152336020820152600684018054939550909290915084908110156100025790600052602060002090600202016000508151815560209182015160019182018054600160a060020a031916909117905533600160a060020a03166000818152600785018452604090819020805460ff1916909317909255815187815292830186905282820152517f0ee65d9041aa0fefb9e13f940fcdce8fb817356542f5024e16208214b26efc099181900360600190a15b5092915050565b6006810180546001810180835590919082801582901161083a5760020281600202836000526020600020918201910161083a91906107b6565b6000548411801561094a5750600086125b1561095c5760058501805460ff191690555b6005850154604080518981526020810189905280820187905260ff929092166060830152517fd220b7272a8b6d0d7d6bcdace67b936a8f175e6d5c1b3ee438b72256b32ab3af9181900360800190a15b5050505050919050565b600054841180156109c75750600086135b15610939576040805186546001880154600289015483529251600160a060020a03919091169291602081810192600092909190829003018185876185025a03f15050505060058501805460ff1916905561095c56", "trace_type": "create", "call_type": null, "reward_type": null, "gas": 1718274, "gas_used": 518125, "subtraces": 0, "trace_address": [], "error": null, "status": 1, "transaction_hash": "0xcdfc8283894591201a62fcec43553d446a1ec46aaaacd98f69692d5a3ade317c", "block_number": 508110, "block_timestamp": 1446973196, "block_hash": "0xc881ee96ddf8b5be74d7680ccda437466b14b9d942aa0161f139fe920690f665"}
-{"type": "trace", "transaction_index": 1, "from_address": "0xfecab546498f74591d4f6d448a4a63552850f122", "to_address": "0x32be343b94f860124dc4fee278fdcbd38c102d88", "value": 4949989500000000000, "input": "0x", "output": "0x", "trace_type": "call", "call_type": "call", "reward_type": null, "gas": 0, "gas_used": 0, "subtraces": 0, "trace_address": [], "error": null, "status": 1, "transaction_hash": "0x435f5f71090a14a7eca2d7c14103f9dbaa962777bc959794e5c6d17ed771406e", "block_number": 508110, "block_timestamp": 1446973196, "block_hash": "0xc881ee96ddf8b5be74d7680ccda437466b14b9d942aa0161f139fe920690f665"}
-{"type": "trace", "transaction_index": null, "from_address": null, "to_address": "0x2a65aca4d5fc5b5c859090a6c34d164135398226", "value": 5156250000000000000, "input": null, "output": null, "trace_type": "reward", "call_type": null, "reward_type": "block", "gas": null, "gas_used": null, "subtraces": 0, "trace_address": [], "error": null, "status": 1, "transaction_hash": null, "block_number": 508110, "block_timestamp": 1446973196, "block_hash": "0xc881ee96ddf8b5be74d7680ccda437466b14b9d942aa0161f139fe920690f665"}
-{"type": "trace", "transaction_index": null, "from_address": null, "to_address": "0x2a65aca4d5fc5b5c859090a6c34d164135398226", "value": 3750000000000000000, "input": null, "output": null, "trace_type": "reward", "call_type": null, "reward_type": "uncle", "gas": null, "gas_used": null, "subtraces": 0, "trace_address": [], "error": null, "status": 1, "transaction_hash": null, "block_number": 508110, "block_timestamp": 1446973196, "block_hash": "0xc881ee96ddf8b5be74d7680ccda437466b14b9d942aa0161f139fe920690f665"}
+{"type": "trace", "transaction_index": 0, "from_address": "0x52de4b32e40ba930679efeb2214357cdf6fec979", "to_address": "0xaec3266ebd18361ab1378646e91f0c5c373038da", "value": 0, "input": "0x6060604052610a1c806100126000396000f3606060405236156100825760e060020a6000350463013cf08b81146100845780630d61b519146100d9578063173a4b701461020b57806321933be81461031a57806339ce39831461035b578063400e3949146103645780634d853ee51461036d5780635e44daf31461037f5780638160f0b514610479578063fd46146a14610482575b005b61049460043560048054829081101561000257906000526020600020906008020160005060018101546004820154600583015483546002850154600160a060020a039190911695509293600301919060ff1686565b61054c600435600060006000600060006000600460005087815481101561000257508152600887027f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b018150600154600482015491965001421180156101435750600585015460ff165b156109ac5760009350600092505b60068501548310156109b65760068501805484908110156100025790600052602060002090600202016000506040805160025460018401547fbbd39ac0000000000000000000000000000000000000000000000000000000008352600160a060020a03908116600484015292519395509091169163bbd39ac09160248181019260209290919082900301816000876161da5a03f1156100025750506040515183548102909701969485019491505060019290920191610151565b604080516020606435600481810135601f810184900484028501840190955284845261054c94813594602480359560443595608494920191908190840183828082843750949650505050505050600060006000600260009054906101000a9004600160a060020a0316600160a060020a031663bbd39ac0336040518260e060020a0281526004018082600160a060020a031681526020019150506020604051808303816000876161da5a03f1156100025750505060405151111561068c576004805460018101808355909190828015829011610695578285526106959060089081027f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b90810191840201610739565b61008260043560243560443560038054600160a060020a03199081163317909155600280549190911684179055600082141561057b57612710600055610581565b61054c60015481565b61054c60055481565b61055e600354600160a060020a031681565b61054c600435602435600060006000600260009054906101000a9004600160a060020a0316600160a060020a031663bbd39ac0336040518260e060020a0281526004018082600160a060020a031681526020019150506020604051808303816000876161da5a03f115610002575050506040515111801561040d57506000198312158061040d575060018313155b156108f9576004805485908110156100025760009182526008027f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b01905033600160a060020a0316600090815260078201602052604090205490915060ff1660011415610900576108f9565b61054c60005481565b61055e600254600160a060020a031681565b60408051600160a060020a0388168152602081018790529081018590526080810183905260a0810182905260c0606082018181528554600260018216156101000260001901909116049183018290529060e0830190869080156105385780601f1061050d57610100808354040283529160200191610538565b820191906000526020600020905b81548152906001019060200180831161051b57829003601f168201915b505097505050505050505060405180910390f35b60408051918252519081900360200190f35b60408051600160a060020a03929092168252519081900360200190f35b60008290555b80600014156105965762278d0060015561059e565b603c81026001555b505050565b505042816004016000508190555060018160050160006101000a81548160ff021916908302179055507f095779230509156998187c606e5b8a5a734137945aa43da9bf39c5e7f529a86b82878787876040518086815260200185600160a060020a03168152602001848152602001838152602001806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600302600f01f150905090810190601f1680156106735780820380516001836020036101000a031916815260200191505b50965050505050505060405180910390a1600182016005555b50949350505050565b505060048054929450918491508110156100025790600052602060002090600802016000508054600160a060020a03191687178155600181810187905560028281018790558551600384018054600082815260209081902096975091959481161561010002600019011692909204601f908101839004840193919288019083901061080a57805160ff19168380011785555b506105a39291506107f2565b50506001015b80821115610806578054600160a060020a0319168155600060018281018290556002838101839055600384018054848255909281161561010002600019011604601f8190106107d857505b5060006004830181905560058301805460ff191690556006830180548282559082526020909120610733916002028101905b8082111561080657600081556001018054600160a060020a03191681556107b6565b601f01602090049060005260206000209081019061078491905b8082111561080657600081556001016107f2565b5090565b82800160010185558215610727579182015b8281111561072757825182600050559160200191906001019061081c565b505060408051808201909152858152336020820152600684018054939550909290915084908110156100025790600052602060002090600202016000508151815560209182015160019182018054600160a060020a031916909117905533600160a060020a03166000818152600785018452604090819020805460ff1916909317909255815187815292830186905282820152517f0ee65d9041aa0fefb9e13f940fcdce8fb817356542f5024e16208214b26efc099181900360600190a15b5092915050565b6006810180546001810180835590919082801582901161083a5760020281600202836000526020600020918201910161083a91906107b6565b6000548411801561094a5750600086125b1561095c5760058501805460ff191690555b6005850154604080518981526020810189905280820187905260ff929092166060830152517fd220b7272a8b6d0d7d6bcdace67b936a8f175e6d5c1b3ee438b72256b32ab3af9181900360800190a15b5050505050919050565b600054841180156109c75750600086135b15610939576040805186546001880154600289015483529251600160a060020a03919091169291602081810192600092909190829003018185876185025a03f15050505060058501805460ff1916905561095c56", "output": "0x606060405236156100825760e060020a6000350463013cf08b81146100845780630d61b519146100d9578063173a4b701461020b57806321933be81461031a57806339ce39831461035b578063400e3949146103645780634d853ee51461036d5780635e44daf31461037f5780638160f0b514610479578063fd46146a14610482575b005b61049460043560048054829081101561000257906000526020600020906008020160005060018101546004820154600583015483546002850154600160a060020a039190911695509293600301919060ff1686565b61054c600435600060006000600060006000600460005087815481101561000257508152600887027f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b018150600154600482015491965001421180156101435750600585015460ff165b156109ac5760009350600092505b60068501548310156109b65760068501805484908110156100025790600052602060002090600202016000506040805160025460018401547fbbd39ac0000000000000000000000000000000000000000000000000000000008352600160a060020a03908116600484015292519395509091169163bbd39ac09160248181019260209290919082900301816000876161da5a03f1156100025750506040515183548102909701969485019491505060019290920191610151565b604080516020606435600481810135601f810184900484028501840190955284845261054c94813594602480359560443595608494920191908190840183828082843750949650505050505050600060006000600260009054906101000a9004600160a060020a0316600160a060020a031663bbd39ac0336040518260e060020a0281526004018082600160a060020a031681526020019150506020604051808303816000876161da5a03f1156100025750505060405151111561068c576004805460018101808355909190828015829011610695578285526106959060089081027f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b90810191840201610739565b61008260043560243560443560038054600160a060020a03199081163317909155600280549190911684179055600082141561057b57612710600055610581565b61054c60015481565b61054c60055481565b61055e600354600160a060020a031681565b61054c600435602435600060006000600260009054906101000a9004600160a060020a0316600160a060020a031663bbd39ac0336040518260e060020a0281526004018082600160a060020a031681526020019150506020604051808303816000876161da5a03f115610002575050506040515111801561040d57506000198312158061040d575060018313155b156108f9576004805485908110156100025760009182526008027f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b01905033600160a060020a0316600090815260078201602052604090205490915060ff1660011415610900576108f9565b61054c60005481565b61055e600254600160a060020a031681565b60408051600160a060020a0388168152602081018790529081018590526080810183905260a0810182905260c0606082018181528554600260018216156101000260001901909116049183018290529060e0830190869080156105385780601f1061050d57610100808354040283529160200191610538565b820191906000526020600020905b81548152906001019060200180831161051b57829003601f168201915b505097505050505050505060405180910390f35b60408051918252519081900360200190f35b60408051600160a060020a03929092168252519081900360200190f35b60008290555b80600014156105965762278d0060015561059e565b603c81026001555b505050565b505042816004016000508190555060018160050160006101000a81548160ff021916908302179055507f095779230509156998187c606e5b8a5a734137945aa43da9bf39c5e7f529a86b82878787876040518086815260200185600160a060020a03168152602001848152602001838152602001806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600302600f01f150905090810190601f1680156106735780820380516001836020036101000a031916815260200191505b50965050505050505060405180910390a1600182016005555b50949350505050565b505060048054929450918491508110156100025790600052602060002090600802016000508054600160a060020a03191687178155600181810187905560028281018790558551600384018054600082815260209081902096975091959481161561010002600019011692909204601f908101839004840193919288019083901061080a57805160ff19168380011785555b506105a39291506107f2565b50506001015b80821115610806578054600160a060020a0319168155600060018281018290556002838101839055600384018054848255909281161561010002600019011604601f8190106107d857505b5060006004830181905560058301805460ff191690556006830180548282559082526020909120610733916002028101905b8082111561080657600081556001018054600160a060020a03191681556107b6565b601f01602090049060005260206000209081019061078491905b8082111561080657600081556001016107f2565b5090565b82800160010185558215610727579182015b8281111561072757825182600050559160200191906001019061081c565b505060408051808201909152858152336020820152600684018054939550909290915084908110156100025790600052602060002090600202016000508151815560209182015160019182018054600160a060020a031916909117905533600160a060020a03166000818152600785018452604090819020805460ff1916909317909255815187815292830186905282820152517f0ee65d9041aa0fefb9e13f940fcdce8fb817356542f5024e16208214b26efc099181900360600190a15b5092915050565b6006810180546001810180835590919082801582901161083a5760020281600202836000526020600020918201910161083a91906107b6565b6000548411801561094a5750600086125b1561095c5760058501805460ff191690555b6005850154604080518981526020810189905280820187905260ff929092166060830152517fd220b7272a8b6d0d7d6bcdace67b936a8f175e6d5c1b3ee438b72256b32ab3af9181900360800190a15b5050505050919050565b600054841180156109c75750600086135b15610939576040805186546001880154600289015483529251600160a060020a03919091169291602081810192600092909190829003018185876185025a03f15050505060058501805460ff1916905561095c56", "trace_type": "create", "call_type": null, "reward_type": null, "gas": 1718274, "gas_used": 518125, "subtraces": 0, "trace_address": [], "error": null, "status": 1, "transaction_hash": "0xcdfc8283894591201a62fcec43553d446a1ec46aaaacd98f69692d5a3ade317c", "block_number": 508110, "trace_id": "create_0xcdfc8283894591201a62fcec43553d446a1ec46aaaacd98f69692d5a3ade317c_", "block_timestamp": 1446973196, "block_hash": "0xc881ee96ddf8b5be74d7680ccda437466b14b9d942aa0161f139fe920690f665", "item_id": "trace_create_0xcdfc8283894591201a62fcec43553d446a1ec46aaaacd98f69692d5a3ade317c_"}
+{"type": "trace", "transaction_index": 1, "from_address": "0xfecab546498f74591d4f6d448a4a63552850f122", "to_address": "0x32be343b94f860124dc4fee278fdcbd38c102d88", "value": 4949989500000000000, "input": "0x", "output": "0x", "trace_type": "call", "call_type": "call", "reward_type": null, "gas": 0, "gas_used": 0, "subtraces": 0, "trace_address": [], "error": null, "status": 1, "transaction_hash": "0x435f5f71090a14a7eca2d7c14103f9dbaa962777bc959794e5c6d17ed771406e", "block_number": 508110, "trace_id": "call_0x435f5f71090a14a7eca2d7c14103f9dbaa962777bc959794e5c6d17ed771406e_", "block_timestamp": 1446973196, "block_hash": "0xc881ee96ddf8b5be74d7680ccda437466b14b9d942aa0161f139fe920690f665", "item_id": "trace_call_0x435f5f71090a14a7eca2d7c14103f9dbaa962777bc959794e5c6d17ed771406e_"}
+{"type": "trace", "transaction_index": null, "from_address": null, "to_address": "0x2a65aca4d5fc5b5c859090a6c34d164135398226", "value": 5156250000000000000, "input": null, "output": null, "trace_type": "reward", "call_type": null, "reward_type": "block", "gas": null, "gas_used": null, "subtraces": 0, "trace_address": [], "error": null, "status": 1, "transaction_hash": null, "block_number": 508110, "trace_id": "reward_508110_0", "block_timestamp": 1446973196, "block_hash": "0xc881ee96ddf8b5be74d7680ccda437466b14b9d942aa0161f139fe920690f665", "item_id": "trace_reward_508110_0"}
+{"type": "trace", "transaction_index": null, "from_address": null, "to_address": "0x2a65aca4d5fc5b5c859090a6c34d164135398226", "value": 3750000000000000000, "input": null, "output": null, "trace_type": "reward", "call_type": null, "reward_type": "uncle", "gas": null, "gas_used": null, "subtraces": 0, "trace_address": [], "error": null, "status": 1, "transaction_hash": null, "block_number": 508110, "trace_id": "reward_508110_1", "block_timestamp": 1446973196, "block_hash": "0xc881ee96ddf8b5be74d7680ccda437466b14b9d942aa0161f139fe920690f665", "item_id": "trace_reward_508110_1"}