actually fix address bug

Author: pipermerriam

populus/contracts/utils.py

@@ -9,7 +9,9 @@ def decode_single(typ, data):
     base, sub, _ = abi.process_type(typ)
 
     if base == 'address':
-        return '0x' + data[-40:]
+        if data == "0x":
+            return "0x" + "0" * 40
+        return '0x' + strip_0x_prefix(data[-40:])
     elif base == 'string' or base == 'bytes' or base == 'hash':
         if sub:
             bytes = ethereum_utils.int_to_32bytearray(int(data, 16))

tests/contracts/test_decode_single_type.py

@@ -76,6 +76,14 @@ def test_decode_bytes():
 @pytest.mark.parametrize(
     'input,expected',
     (
+        (
+            '0x',
+            '0x0000000000000000000000000000000000000000',
+        ),
+        (
+            '0x0000000000000000000000000000000000000000000000000000000000000000',
+            '0x0000000000000000000000000000000000000000',
+        ),
         (
             '0x000000000000000000000000c305c901078781c232a2a521c2af7980f8385ee9',
             '0xc305c901078781c232a2a521c2af7980f8385ee9',