Changes to normalize address

Author: vub

ethereum/abi.py

@@ -236,6 +236,8 @@ def encode_single(typ, arg):
             return zpad(arg, 32)
         elif len(arg) == 40:
             return zpad(decode_hex(arg), 32)
+        elif len(arg) == 42 and arg[2:] == '0x':
+            return zpad(decode_hex(arg[2:]), 32)
         else:
             raise EncodingError("Could not parse address: %r" % arg)
     raise EncodingError("Unhandled type: %r %r" % (base, sub))

ethereum/utils.py

@@ -128,7 +128,9 @@ def check_and_strip_checksum(x):
     return x[:20]
 
 
-def normalize_address(x):
+def normalize_address(x, allow_blank=False):
+    if allow_blank and x == '':
+        return ''
     if len(x) in (42, 50) and x[:2] == '0x':
         x = x[2:]
     if len(x) in (40, 48):