Merge pull request #773 from NIC619/develop

fix bytes/str type mismatch

Author: joeykrug

ethereum/pow/chain.py

@@ -365,8 +365,8 @@ def add_block(self, block):
         self.add_child(block)
         self.db.put('head_hash', self.head_hash)
         self.db.put(block.hash, rlp.encode(block))
-        self.db.put(b'changed:'+block.hash, b''.join(list(changed.keys())))
-        log.debug('Saved %d address change logs' % len(changed.keys()))
+        self.db.put(b'changed:'+block.hash, b''.join([k.encode() if isinstance(k, str) else k for k in list(changed.keys())]))
+        print('Saved %d address change logs' % len(changed.keys()))
         self.db.put(b'deletes:'+block.hash, b''.join(deletes))
         log.debug('Saved %d trie node deletes for block %d (%s)' % (len(deletes), block.number, utils.encode_hex(block.hash)))
         # Delete old junk data