Added changes to rlp decoder:

Author: vub

ethereum/rlp_decoder_contract.py

@@ -54,10 +54,11 @@ def any():
             ~invalid()
         if dataPos > 1024 or positionIndex > 32:
             ~invalid()
+    positions[positionIndex] = dataPos
     output = string(2048)
     i = 0
-    while i < positionIndex:
-        output[i] = positions[i] + positionIndex * 32
+    while i <= positionIndex:
+        output[i] = positions[i] + positionIndex * 32 + 32
         i += 1
-    mcopy(output + positionIndex * 32, data, dataPos)
-    ~return(output, positionIndex * 32 + dataPos)
+    mcopy(output + positionIndex * 32 + 32, data, dataPos)
+    ~return(output, positionIndex * 32 + dataPos + 32)

ethereum/state.py

@@ -337,7 +337,7 @@ def to_dict(self):
             acct_trie = SecureTrie(Trie(self.db))
             acct_trie.root_hash = acct.storage
             for key, v in acct_trie.to_dict().items():
-                storage_dump['0x'+encode_hex(key.lstrip('\x00') or '\x00')] = '0x'+encode_hex(rlp.decode(v))
+                storage_dump['0x'+encode_hex(key.lstrip(b'\x00') or b'\x00')] = '0x'+encode_hex(rlp.decode(v))
             acct_dump = {"storage": storage_dump}
             for c in ACCOUNT_OUTPUTTABLE_PARAMS:
                 acct_dump[c] = snapshot_form(getattr(acct, c))