use solc --combined and robustness

Author: heikoheiko

ethereum/_solidity.py

@@ -1,5 +1,6 @@
 import subprocess
 import os
+import yaml  # use yaml instead of json to get non unicode
 
 
 class CompileError(Exception):
@@ -35,7 +36,8 @@ def split_contracts(cls, code):
         contracts = []
         contract = None
         for line in code.split('\n'):
-            if line.lstrip().startswith('contract '):  # FIXME
+            line = line.lstrip()
+            if line.startswith('contract '):  # FIXME
                 if contract:
                     contracts.append('\n'.join(contract))
                 contract = [line]
@@ -46,25 +48,38 @@ def split_contracts(cls, code):
         return contracts
 
     @classmethod
-    def compile(cls, code):
-        p = subprocess.Popen(['solc', '--binary', 'stdout'],
-                             stdin=subprocess.PIPE, stdout=subprocess.PIPE)
-        stdoutdata, stderrdata = p.communicate(input=code)
-        if p.returncode:
-            raise CompileError('compilation failed')
+    def contract_names(cls, code):
+        names = []
+        for contract in cls.split_contracts(code):
+            keyword, name, _ = contract.split(' ', 2)
+            assert keyword == 'contract' and len(name)
+            names.append(name)
+        return names
 
-        hex_code = stdoutdata.rsplit('Binary: \n')[-1].strip()
-        return hex_code.decode('hex')
+    @classmethod
+    def compile(cls, code):
+        "returns binary of last contract in code"
+        contracts = cls.combined(code)
+        return contracts[cls.contract_names(code)[-1]]['binary'].decode('hex')
 
     @classmethod
     def mk_full_signature(cls, code):
-        p = subprocess.Popen(['solc', '--json-abi', 'stdout'],
+        "returns signature of last contract in code"
+        contracts = cls.combined(code)
+        return contracts[cls.contract_names(code)[-1]]['json-abi']
+
+    @classmethod
+    def combined(cls, code):
+        p = subprocess.Popen(['solc', '--combined-json', 'json-abi,binary'],
                              stdin=subprocess.PIPE, stdout=subprocess.PIPE)
         stdoutdata, stderrdata = p.communicate(input=code)
         if p.returncode:
             raise CompileError('compilation failed')
-        jsonabi = stdoutdata.rsplit('Contract JSON ABI\n')[-1].strip()
-        return jsonabi
+        # contracts = json.loads(stdoutdata)['contracts']
+        contracts = yaml.safe_load(stdoutdata)['contracts']
+        for contract_name, data in contracts.items():
+            data['json-abi'] = yaml.safe_load(data['json-abi'])
+        return contracts
 
 
 def get_solidity():

ethereum/abi.py

@@ -1,26 +1,13 @@
 import sys
 import re
-import json
+import yaml  # use yaml instead of json to get non unicode (works with ascii only data)
 from ethereum import utils
 from rlp.utils import decode_hex, encode_hex
 from ethereum.utils import encode_int, zpad, big_endian_to_int, is_numeric, is_string
 
-if sys.version_info.major == 2:
-    def json_decode(x):
-        return json_non_unicode(json.loads(x))
 
-    def json_non_unicode(x):
-        if isinstance(x, unicode):
-            return str(x)
-        elif isinstance(x, list):
-            return [json_non_unicode(y) for y in x]
-        elif isinstance(x, dict):
-            return {x: json_non_unicode(y) for x, y in x.items()}
-        else:
-            return x
-else:
-    def json_decode(x):
-        return json.loads(x)
+def json_decode(x):
+    return yaml.safe_load(x)
 
 
 class ContractTranslator():
@@ -38,9 +25,9 @@ def __init__(self, full_signature):
                 name = name[:name.find('(')]
             if name in v:
                 i = 2
-                while name + to_string(i) in v:
+                while name + utils.to_string(i) in v:
                     i += 1
-                name += to_string(i)
+                name += utils.to_string(i)
                 sys.stderr.write("Warning: multiple methods with the same "
                                  " name. Use %s to call %s with types %r"
                                  % (name, sig_item['name'], encode_types))

ethereum/tests/test_solidity.py

@@ -21,11 +21,12 @@ def sub1():
         y = 7;
     }
 }
-
 """
 
 
 def test_interop():
+    if 'solidity' not in tester.languages:
+        return
     s = tester.state()
     c1 = s.abi_contract(serpent_contract)
     c2 = s.abi_contract(solidity_contract, language='solidity')  # should be zoo