Merge pull request #241 from pipermerriam/piper/solidity-0.4.9

Backport some utilities from 2.0 line

Author: pipermerriam

.travis.yml

@@ -5,21 +5,20 @@ dist: trusty
 sudo: required
 env:
   matrix:
-    # Solc 0.4.6 py35
-    - TOX_ENV=py27-stdlib SOLC_BINARY=$TRAVIS_BUILD_DIR/solc-versions/solc-0.4.6/solc SOLC_INSTALL_SCRIPT=$TRAVIS_BUILD_DIR/bin/install_solc-0.4.6.sh LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/solc-versions/solc-0.4.6
-    - TOX_ENV=py27-gevent SOLC_BINARY=$TRAVIS_BUILD_DIR/solc-versions/solc-0.4.6/solc SOLC_INSTALL_SCRIPT=$TRAVIS_BUILD_DIR/bin/install_solc-0.4.6.sh LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/solc-versions/solc-0.4.6
-    # Solc 0.4.6 py34
-    - TOX_ENV=py34-stdlib SOLC_BINARY=$TRAVIS_BUILD_DIR/solc-versions/solc-0.4.6/solc SOLC_INSTALL_SCRIPT=$TRAVIS_BUILD_DIR/bin/install_solc-0.4.6.sh LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/solc-versions/solc-0.4.6
-    - TOX_ENV=py34-gevent SOLC_BINARY=$TRAVIS_BUILD_DIR/solc-versions/solc-0.4.6/solc SOLC_INSTALL_SCRIPT=$TRAVIS_BUILD_DIR/bin/install_solc-0.4.6.sh LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/solc-versions/solc-0.4.6
-    # Solc 0.4.6 py35
-    - TOX_ENV=py35-stdlib SOLC_BINARY=$TRAVIS_BUILD_DIR/solc-versions/solc-0.4.6/solc SOLC_INSTALL_SCRIPT=$TRAVIS_BUILD_DIR/bin/install_solc-0.4.6.sh LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/solc-versions/solc-0.4.6
-    - TOX_ENV=py35-gevent SOLC_BINARY=$TRAVIS_BUILD_DIR/solc-versions/solc-0.4.6/solc SOLC_INSTALL_SCRIPT=$TRAVIS_BUILD_DIR/bin/install_solc-0.4.6.sh LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/solc-versions/solc-0.4.6
-    # Solc 0.4.1 py35
-    #- TOX_ENV=py35 SOLC_BINARY=$TRAVIS_BUILD_DIR/solc-versions/solc-0.4.1/solc SOLC_INSTALL_SCRIPT=$TRAVIS_BUILD_DIR/bin/install_solc-0.4.1.sh LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/solc-versions/solc-0.4.1
-    # Solc 0.4.2 py35
-    #- TOX_ENV=py35-stdlib SOLC_BINARY=$TRAVIS_BUILD_DIR/solc-versions/solc-0.4.2/solc SOLC_INSTALL_SCRIPT=$TRAVIS_BUILD_DIR/bin/install_solc-0.4.2.sh LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/solc-versions/solc-0.4.2
-    #- TOX_ENV=py35-gevent SOLC_BINARY=$TRAVIS_BUILD_DIR/solc-versions/solc-0.4.2/solc SOLC_INSTALL_SCRIPT=$TRAVIS_BUILD_DIR/bin/install_solc-0.4.2.sh LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/solc-versions/solc-0.4.2
-    - TOX_ENV=flake8 SOLC_BINARY=ls SOLC_INSTALL_SCRIPT=/bin/ls
+    #
+    # Solc 0.4.8
+    #
+    # py27
+    - TOX_ENV=py27-stdlib SOLC_VERSION=0.4.8
+    - TOX_ENV=py27-gevent SOLC_VERSION=0.4.8
+    # py34
+    - TOX_ENV=py34-stdlib SOLC_VERSION=0.4.8
+    - TOX_ENV=py34-gevent SOLC_VERSION=0.4.8
+    # py35
+    - TOX_ENV=py35-stdlib SOLC_VERSION=0.4.8
+    - TOX_ENV=py35-gevent SOLC_VERSION=0.4.8
+    # Linting
+    - TOX_ENV=flake8
   global:
     - CHAIN_SYNC_BLOCK_DELTA=100
 cache:
@@ -28,16 +27,18 @@ cache:
     - $HOME/.ethash/
     - $TRAVIS_BUILD_DIR/.tox --recreate
 before_install:
+  - if [ -n "$SOLC_VERSION" ]; then export SOLC_BINARY="$TRAVIS_BUILD_DIR/solc-versions/solc-$SOLC_VERSION/solc"; fi
+  - if [ -n "$SOLC_VERSION" ]; then export LD_LIBRARY_PATH="$TRAVIS_BUILD_DIR/solc-versions/solc-$SOLC_VERSION"; fi
+  - if [ -n "$SOLC_VERSION" ]; then sudo apt-get install -y tree unzip; fi
   - sudo add-apt-repository -y ppa:ethereum/ethereum
   - sudo apt-get update
 install:
-  - sudo apt-get install -y tree unzip
-  - /.$SOLC_INSTALL_SCRIPT
+  - if [ -n "$SOLC_VERSION" ]; then /.$TRAVIS_BUILD_DIR/bin/install_solc.sh; fi
   - travis_retry sudo apt-get install -y ethereum
   - travis_retry pip install setuptools --upgrade
   - travis_retry pip install tox
 before_script:
-  - $SOLC_BINARY --version
+  - if [ -n "$SOLC_BINARY" ]; then $SOLC_BINARY --version; fi
   - mkdir -p $HOME/.ethash
   - geth makedag 0 $HOME/.ethash
 script:

bin/install_solc-0.4.1.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+#
+# Install solc 
+#
+
+set -e
+set -u
+
+mkdir -p solc-versions/solc-$SOLC_VERSION
+cd solc-versions/solc-$SOLC_VERSION
+git clone --recurse-submodules --branch v$SOLC_VERSION --depth 50 https://github.com/ethereum/solidity.git
+./solidity/scripts/install_deps.sh
+wget https://github.com/ethereum/solidity/releases/download/v$SOLC_VERSION/solidity-ubuntu-trusty.zip
+unzip solidity-ubuntu-trusty.zip
+echo "Solidity installed at $TRAVIS_BUILD_DIR/solc-versions/solc-$SOLC_VERSION/solc"
+tree $TRAVIS_BUILD_DIR/solc-versions/solc-$SOLC_VERSION

bin/install_solc-0.4.2.sh

@@ -63,6 +63,13 @@ Enable or disable compile optimization.
 * default: ``True``
 
 
+Determine compiler output.
+
+* key: ``compilation.settings.output_values``
+* value: List of strings
+* default: ``['bin', 'bin-runtime', 'abi']``
+
+
 Chains
 ^^^^^^
 

bin/install_solc-0.4.6.sh

@@ -40,6 +40,13 @@
       "properties": {
         "optimize": {
           "type": "boolean"
+        },
+        "output_values": {
+          "title": "Determines which compiler values will be output by the solc compiler",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
         }
       }
     },

bin/install_solc.sh

@@ -21,6 +21,10 @@
     HTTPProvider,
 )
 
+from populus.legacy.contracts import (
+    get_contract_library_dependencies,
+)
+
 from populus.utils.functional import (
     cached_property,
 )
@@ -37,11 +41,12 @@
     get_blockchains_dir,
     tempdir,
 )
+from populus.utils.linking import (
+    link_bytecode_by_name,
+)
 from populus.utils.contracts import (
     construct_contract_factories,
     package_contracts,
-    get_contract_library_dependencies,
-    link_bytecode,
 )
 from populus.utils.chains import (
     get_chaindata_dir,
@@ -307,7 +312,7 @@ def _link_code(self, bytecodes,
         }
 
         linked_bytecodes = [
-            link_bytecode(bytecode, **all_link_dependencies)
+            link_bytecode_by_name(bytecode, **all_link_dependencies)
             for bytecode in bytecodes
         ]
         return linked_bytecodes

docs/config.rst

@@ -15,7 +15,7 @@
     DEFAULT_CONTRACTS_DIR
 )
 from populus.utils.compile import (
-    normalize_contract_data,
+    process_compiler_output,
     get_contract_meta,
 )
 
@@ -41,11 +41,14 @@ def write_compiled_sources(project_dir, compiled_sources):
     return compiled_contract_path
 
 
+DEFAULT_COMPILER_OUTPUT_VALUES = ['bin', 'bin-runtime', 'abi']
+
+
 def compile_project_contracts(project_dir, contracts_dir, compiler_settings=None):
     if compiler_settings is None:
         compiler_settings = {}
 
-    compiler_settings.setdefault('output_values', ['bin', 'bin-runtime', 'abi'])
+    compiler_settings.setdefault('output_values', DEFAULT_COMPILER_OUTPUT_VALUES)
     contract_source_paths = find_project_contracts(project_dir, contracts_dir)
     try:
         compiled_contracts = compile_files(contract_source_paths, **compiler_settings)
@@ -55,11 +58,11 @@ def compile_project_contracts(project_dir, contracts_dir, compiler_settings=None
     solc_version = get_solc_version()
     contract_meta = get_contract_meta(compiler_settings, solc_version)
 
-    normalized_compiled_contracts = {
-        contract_name: normalize_contract_data(contract_data, contract_meta)
+    normalized_compiled_contracts = dict(
+        process_compiler_output(contract_name, contract_data, contract_meta)
         for contract_name, contract_data
         in compiled_contracts.items()
-    }
+    )
 
     return contract_source_paths, normalized_compiled_contracts
 

populus/assets/config.schema.json

@@ -0,0 +1,16 @@
+from populus.utils.linking import (
+    find_link_references,
+)
+
+
+def get_contract_library_dependencies(bytecode, full_contract_names):
+    """
+    Given a contract bytecode and an iterable of all of the known full names of
+    contracts, returns a set of the contract names that this contract bytecode
+    depends on.
+    To get the full dependency graph use the `get_recursive_contract_dependencies`
+    function.
+    """
+    return {
+        ref.full_name for ref in find_link_references(bytecode, full_contract_names)
+    }

populus/chain.py

@@ -4,9 +4,10 @@
     force_text,
 )
 
-from populus.utils.contracts import (
+from populus.legacy.contracts import (
     get_contract_library_dependencies,
 )
+
 from populus.utils.deploy import (
     deploy_contract,
 )

populus/compilation.py

@@ -8,8 +8,8 @@
 from populus.utils.compile import (
     normalize_contract_data,
 )
-from populus.utils.contracts import (
-    link_bytecode,
+from populus.utils.linking import (
+    link_bytecode_by_name,
 )
 
 
@@ -34,14 +34,15 @@ def is_solc_04x():
 
 def get_compiled_registrar_contract():
     if is_solc_03x():
-        compiled_contracts = compile_files([REGISTRAR_V3_SOURCE_PATH])
+        registrar_source_path = REGISTRAR_V3_SOURCE_PATH
     elif is_solc_04x():
-        compiled_contracts = compile_files([REGISTRAR_V4_SOURCE_PATH])
+        registrar_source_path = REGISTRAR_V4_SOURCE_PATH
     else:
         raise ValueError(
             "Unsupported version of solc.  Found: {0}.  Only 0.3.x and 0.4.x "
             "are supported".format(get_solc_version())
         )
+    compiled_contracts = compile_files([registrar_source_path])
     contract_data = compiled_contracts['Registrar']
     normalized_data = normalize_contract_data(contract_data, {})
     return normalized_data
@@ -73,7 +74,7 @@ def get_contract_from_registrar(chain,
 
     contract_address = registrar.call().getAddress(registrar_key)
 
-    expected_runtime = link_bytecode(
+    expected_runtime = link_bytecode_by_name(
         contract_factory.code_runtime,
         **link_dependencies
     )

populus/legacy/contracts.py

@@ -7,6 +7,13 @@
 )
 
 
+def process_compiler_output(name_from_compiler, data_from_compiler, contract_meta):
+    # TODO: use the source path.
+    _, _, contract_name = name_from_compiler.rpartition(':')
+    contract_data = normalize_contract_data(data_from_compiler, contract_meta)
+    return contract_name, contract_data
+
+
 @cast_return_to_dict
 def normalize_contract_data(contract_data, contract_meta):
     yield 'meta', contract_meta