actually fix address bug

ethereum · Dec 23, 2015 · 0c29f2c · 0c29f2c
1 parent 65bed5b
commit 0c29f2c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/populus/contracts/utils.py b/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))

diff --git a/tests/contracts/test_decode_single_type.py b/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',