Merge branch 'develop' into state_revamp_with_p62

Author: Jan Xie

.travis.yml

@@ -2,10 +2,6 @@ language: python
 python: 3.5
 sudo: required
 dist: trusty
-before_install:
-- sudo add-apt-repository -y ppa:ethereum/ethereum
-- sudo apt-get update
-- sudo apt-get install -y solc
 env:
   matrix:
   - TOX_ENV=py27
@@ -15,7 +11,18 @@ env:
     - COVERAGE_APPEND="--append"
     - secure: cKbIgpTJ1yjKLBxpCEiT6IH7NShDWZUE+BvnrAfc+ujCsR6LyLJcKxFQmKnWryJCqg7fp82Ep2bF2oDKzanAROar2xDY1SFGbai42seYMaFCw53YPGJ6u3VNCcfT0rN9BWgE7el/m4fjcD6CRsZYKArNNJbMX8csRt3uXXCFLso=
     - secure: "QyFPrxQHd2LlNQ6zNeTFYhgPmZaOHoWuywcgn8qaSOh6PklyFxHbexkwg0bl23JvtgNEZ1mCD8j0x1/ydSdtxgCFwK9SEL0h7aYuAq+OAIa/G18OPeTJMf7ASsb2QZdfkt9reFpUnjbadzHkuv+rqqb4bFnTJBKwB2LWzHPLhWg="
+    - SOLC_VERSION=0.4.9
+cache:
+  directories:
+    - $HOME/.bin
+    - $HOME/solc-versions
+before_install:
+  - mkdir -p $HOME/.bin
+  - export PATH=$PATH:$HOME/.bin
+  - if [ -n "$SOLC_VERSION" ]; then export LD_LIBRARY_PATH="$HOME/solc-versions/solc-$SOLC_VERSION"; fi
+  - if [ -n "$SOLC_VERSION" ]; then sudo apt-get install -y tree unzip; fi
 install:
+  - if [ -n "$SOLC_VERSION" ]; then /.$TRAVIS_BUILD_DIR/.travis/install_solc.sh; fi
   - travis_retry pip install setuptools --upgrade
   - travis_retry pip install tox
   - travis_retry pip install coverage

.travis/install_solc.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+#
+# Install solc 
+#
+
+set -e
+set -u
+
+mkdir -p $HOME/solc-versions/solc-$SOLC_VERSION
+cd $HOME/solc-versions/solc-$SOLC_VERSION
+
+if [ ! -f solc ]
+then
+    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 $HOME/solc-versions/solc-$SOLC_VERSION/solc"
+    tree $HOME/solc-versions/solc-$SOLC_VERSION
+else
+    ./solidity/scripts/install_deps.sh
+fi
+
+if [ -f $HOME/.bin/solc ]
+then
+    rm $HOME/.bin/solc
+fi
+
+ln -s $HOME/solc-versions/solc-$SOLC_VERSION/solc $HOME/.bin/solc
+# Check path is correctly set up and echo version
+cd
+echo $PATH
+ls -al $HOME/.bin
+ls -al $(readlink -f $HOME/.bin/solc)
+solc --version

ethereum/_solidity.py

@@ -17,6 +17,10 @@ class CompileError(Exception):
     pass
 
 
+class SolcMissing(Exception):
+    pass
+
+
 def get_compiler_path():
     """ Return the path to the solc compiler.
 
@@ -261,6 +265,34 @@ def compile_file(filepath, libraries=None, combined='bin,abi', optimize=True, ex
     return solc_parse_output(output)
 
 
+def solidity_get_contract_data(all_contracts, filepath, contract_name):
+    """ A backwards compatible method of getting the contract data out
+    of a solc --combined-json output"""
+    try:
+        contract_data = all_contracts[contract_name]
+    except:
+        if filepath is None:
+            filename = '<stdin>'
+        else:
+            _, filename = os.path.split(filepath)
+        contract_data = all_contracts[filename + ":" + contract_name]
+    return contract_data
+
+
+def solidity_get_contract_key(all_contracts, filepath, contract_name):
+    """ A backwards compatible method of getting the key to the all_contracts
+    dictionary for a particular contract"""
+    if contract_name in all_contracts:
+        return contract_name
+    else:
+        if filepath is None:
+            filename = '<stdin>'
+        else:
+            _, filename = os.path.split(filepath)
+        contract_key = filename + ":" + contract_name
+        return contract_key if contract_key in all_contracts else None
+
+
 def compile_contract(filepath, contract_name, libraries=None, combined='bin,abi', optimize=True, extra_args=None):
     all_contracts = compile_file(
         filepath,
@@ -269,8 +301,7 @@ def compile_contract(filepath, contract_name, libraries=None, combined='bin,abi'
         optimize=optimize,
         extra_args=extra_args
     )
-
-    return all_contracts[contract_name]
+    return solidity_get_contract_data(all_contracts, filepath, contract_name)
 
 
 def compile_last_contract(filepath, libraries=None, combined='bin,abi', optimize=True, extra_args=None):
@@ -296,7 +327,10 @@ def compile_last_contract(filepath, libraries=None, combined='bin,abi', optimize
 
 def compile_code(sourcecode, libraries=None, combined='bin,abi', optimize=True, extra_args=None):
     args = solc_arguments(libraries=libraries, combined=combined, optimize=optimize, extra_args=extra_args)
-    args.insert(0, get_compiler_path())
+    compiler = get_compiler_path()
+    if compiler is None:
+        raise SolcMissing("solc not found")
+    args.insert(0, compiler)
 
     process = subprocess.Popen(args, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     stdoutdata, stderrdata = process.communicate(input=utils.to_string(sourcecode))
@@ -335,7 +369,7 @@ def _code_or_path(sourcecode, path, contract_name, libraries, combined, extra_ar
         last_contract = all_contract_names[-1]
 
         result = compile_code(sourcecode, libraries=libraries, combined=combined, extra_args=extra_args)
-        return result[last_contract]
+        return solidity_get_contract_data(result, path, last_contract)
 
     @classmethod
     def compile(cls, code, path=None, libraries=None, contract_name='', extra_args=None):
@@ -378,7 +412,12 @@ def combined(cls, code, path=None, extra_args=None):
 
         sorted_contracts = []
         for name in solidity_names(code):
-            sorted_contracts.append((name[1], contracts[name[1]]))
+            sorted_contracts.append(
+                (
+                    name[1],
+                    solidity_get_contract_data(contracts, path, name[1])
+                )
+            )
         return sorted_contracts
 
     @classmethod

ethereum/abi.py

@@ -1,12 +1,13 @@
-# -*- coding: utf8 -*-
+# -*- coding: utf-8 -*-
 from __future__ import print_function
 
 import ast
 import re
 import warnings
 
 import yaml  # use yaml instead of json to get non unicode (works with ascii only data)
-from rlp.utils import decode_hex, encode_hex
+from rlp.utils import decode_hex
+from ethereum.utils import encode_hex
 
 from ethereum import utils
 from ethereum.utils import (

ethereum/bloom.py

@@ -6,7 +6,7 @@
 component (except data) of each log entry of each transaction.
 
 We set the bits of a 2048-bit value whose indices are given by
-the low order 9-bits
+the low order 11-bits
 of the first three double-bytes
 of the SHA3
 of each value.

ethereum/chain.py

@@ -3,7 +3,6 @@
 import time
 
 import rlp
-from rlp.utils import encode_hex
 
 from ethereum import parse_genesis_declaration
 from ethereum.block import Block, BlockHeader, FakeHeader, BLANK_UNCLES_HASH
@@ -12,7 +11,7 @@
 from ethereum.state import State, dict_to_prev_header
 from ethereum.state_transition import apply_block, initialize, \
     update_block_env_variables
-from ethereum.utils import parse_as_bin, big_endian_to_int
+from ethereum.utils import encode_hex, parse_as_bin, big_endian_to_int
 
 log = get_logger('eth.chain')
 

ethereum/ethash_utils.py

@@ -6,7 +6,8 @@
     import sha3 as _sha3
     sha3_256 = lambda x: _sha3.sha3_256(x).digest()
     sha3_512 = lambda x: _sha3.sha3_512(x).digest()
-from rlp.utils import decode_hex, encode_hex
+from rlp.utils import decode_hex
+from ethereum.utils import encode_hex
 import sys
 
 WORD_BYTES = 4                    # bytes in word

ethereum/ethpow.py

@@ -1,9 +1,9 @@
 from ethereum import ethash, ethash_utils, utils
 import time
 import sys
-import sha3
 import warnings
 from collections import OrderedDict
+from ethereum import utils
 from ethereum.slogging import get_logger
 import rlp
 
@@ -41,7 +41,7 @@
 
 def get_cache(block_number):
     while len(cache_seeds) <= block_number // EPOCH_LENGTH:
-        cache_seeds.append(sha3.sha3_256(cache_seeds[-1]).digest())
+        cache_seeds.append(utils.sha3(cache_seeds[-1]))
     seed = cache_seeds[block_number // EPOCH_LENGTH]
     if seed in cache_by_seed:
         c = cache_by_seed.pop(seed)  # pop and append at end

ethereum/fastvm.py

@@ -12,7 +12,8 @@
 from ethereum import opcodes
 import time
 from ethereum.slogging import get_logger
-from rlp.utils import encode_hex, ascii_chr
+from rlp.utils import ascii_chr
+from ethereum.utils import encode_hex
 from ethereum.utils import to_string
 
 if sys.version_info.major == 2:

ethereum/keys.py

@@ -2,7 +2,8 @@
 import pbkdf2
 import sys
 
-from rlp.utils import encode_hex, decode_hex
+from rlp.utils import decode_hex
+from ethereum.utils import encode_hex
 
 try:
     scrypt = __import__('scrypt')