Fixes and improvements for json logging

There are still some places where data/adresses were not hex'ed. My
approach here is to use 'lazy' encoding for all trace-/debug-only
log messages.

Author: konradkonrad

ethereum/blocks.py

@@ -34,6 +34,16 @@
 Log = processblock.Log
 
 
+class lazy_encode(object):
+    def __init__(self, data):
+        self.data = data
+
+    def __repr__(self):
+        return repr([[k, encode_hex(a), v if k != 'code' else encode_hex(v)] for k, a, v in self.data])
+
+    def __str__(self):
+        return str(repr(self))
+
 
 # Difficulty adjustment algo
 def calc_difficulty(parent, timestamp):
@@ -1019,7 +1029,7 @@ def commit_state(self):
                     t.delete(enckey)
             acct.storage = t.root_hash
             self.state.update(addr, rlp.encode(acct))
-        log_state.trace('delta', changes=changes)
+        log_state.trace('delta', changes=lazy_encode(changes))
         self.reset_cache()
         self.db.put_temporarily(b'validated:' + self.hash, '1')
 

ethereum/processblock.py

@@ -125,10 +125,13 @@ def __init__(self, data):
 
     def __str__(self):
         if not isinstance(self.data, (str, unicode)):
-            return self.data
+            return repr(self.data)
         else:
             return encode_hex(self.data)
 
+    def __repr__(self):
+        return str(self)
+
 
 def apply_transaction(block, tx):
     validate_transaction(block, tx)
@@ -276,7 +279,7 @@ def _apply_msg(ext, msg, code):
     # assert utils.is_numeric(gas)
     if trace_msg:
         log_msg.debug('MSG APPLIED', gas_remained=gas,
-                      sender=msg.sender, to=msg.to, data=dat)
+                      sender=encode_hex(msg.sender), to=encode_hex(msg.to), data=dat)
         if log_state.is_active('trace'):
             log_state.trace('MSG POST STATE SENDER', account=msg.sender.encode('hex'),
                             bal=ext.get_balance(msg.sender),

ethereum/slogging.py

@@ -130,14 +130,21 @@ def is_active(self, level_name='trace'):
 
     def format_message(self, msg, kwargs, highlight, level):
         if getattr(self, 'log_json', False):
-            message = {
-                k: v if isnumeric(v) or isinstance(v, (float, complex)) else repr(v)
-                for k, v in kwargs.items()
-            }
-
+            message = dict()
             message['event'] = '{}.{}'.format(self.name, msg.lower().replace(' ', '_'))
             message['level'] = logging.getLevelName(level)
-            msg = json.dumps(message)
+            try:
+                message.update({
+                    k: v if isnumeric(v) or isinstance(v, (float, complex, list, str, dict)) else repr(v)
+                    for k, v in kwargs.items()
+                })
+                msg = json.dumps(message)
+            except UnicodeDecodeError:
+                message.update({
+                    k: v if isnumeric(v) or isinstance(v, (float, complex)) else repr(v)
+                    for k, v in kwargs.items()
+                })
+                msg = json.dumps(message)
         else:
             msg = "{}{} {}{}".format(
                 bcolors.WARNING if highlight else "",