Merge branch 'develop' of github.com:ethereum/pyethereum into develop

Author: vub

ethereum/abi.py

@@ -8,7 +8,7 @@
 
 from ethereum import utils
 from ethereum.utils import encode_int, zpad, big_endian_to_int, is_numeric, is_string, ceil32
-from ethereum.utils import isnumeric, TT256, TT255
+from ethereum.utils import TT256, TT255
 
 
 def json_decode(data):
@@ -327,7 +327,7 @@ def encode_single(typ, arg):
     elif base == 'hash':
         if not (int(sub) and int(sub) <= 32):
             raise EncodingError("too long: %r" % arg)
-        if isnumeric(arg):
+        if is_numeric(arg):
             return zpad(encode_int(arg), 32)
         elif len(arg) == int(sub):
             return zpad(arg, 32)
@@ -338,13 +338,13 @@ def encode_single(typ, arg):
     # Addresses: address (== hash160)
     elif base == 'address':
         assert sub == ''
-        if isnumeric(arg):
+        if is_numeric(arg):
             return zpad(encode_int(arg), 32)
         elif len(arg) == 20:
             return zpad(arg, 32)
         elif len(arg) == 40:
             return zpad(decode_hex(arg), 32)
-        elif len(arg) == 42 and arg[:2] == '0x':
+        elif len(arg) == 42 and arg[:2] in {'0x', b'0x'}:
             return zpad(decode_hex(arg[2:]), 32)
         else:
             raise EncodingError("Could not parse address: %r" % arg)

ethereum/blocks.py

@@ -793,7 +793,7 @@ def _delta_item(self, address, param, value):
     def mk_transaction_receipt(self, tx):
         """Create a receipt for a transaction."""
         if self.number >= self.config["METROPOLIS_FORK_BLKNUM"]:
-            return Receipt('\x00' * 32, self.gas_used, self.logs)
+            return Receipt(b'\x00' * 32, self.gas_used, self.logs)
         else:
             return Receipt(self.state_root, self.gas_used, self.logs)
 
@@ -983,7 +983,7 @@ def get_storage_bytes(self, address, index):
         if storage:
             return rlp.decode(storage)
         else:
-            return ''
+            return b''
 
     def get_storage_data(self, address, index):
         bytez = self.get_storage_bytes(address, index)
@@ -1111,7 +1111,7 @@ def account_to_dict(self, address, with_storage_root=False,
                 v2 = subcache.get(utils.big_endian_to_int(k), None)
                 hexkey = b'0x' + encode_hex(utils.zunpad(k))
                 if v2 is not None:
-                    if v2 != '':
+                    if v2 != b'':
                         med_dict['storage'][hexkey] = \
                             b'0x' + encode_hex(v2)
                 elif v is not None:
@@ -1454,8 +1454,9 @@ def genesis(env, **kwargs):
             block.set_nonce(addr, utils.parse_int_or_hex(data['nonce']))
         if 'storage' in data:
             for k, v in data['storage'].items():
-                block.set_storage_data(addr, utils.big_endian_to_int(decode_hex(k[2:])),
-                                       utils.big_endian_to_int(decode_hex(v[2:])))
+                block.set_storage_data(addr,
+                                       utils.big_endian_to_int(decode_hex(k[2:])),
+                                       decode_hex(v[2:]))
     block.commit_state()
     block.state.db.commit()
     # genesis block has predefined state root (so no additional finalization

ethereum/config.py

@@ -1,3 +1,5 @@
+from rlp.utils import decode_hex
+
 from ethereum import utils
 from ethereum.db import BaseDB
 
@@ -52,7 +54,7 @@
     METROPOLIS_STATEROOT_STORE=0x10,
     METROPOLIS_BLOCKHASH_STORE=0x20,
     METROPOLIS_WRAPAROUND=65536,
-    METROPOLIS_GETTER_CODE='6000355460205260206020f3'.decode('hex'),
+    METROPOLIS_GETTER_CODE=decode_hex('6000355460205260206020f3'),
     METROPOLIS_DIFF_ADJUSTMENT_CUTOFF=9,
     # DAO fork
     DAO_FORK_BLKNUM = 9999998,

ethereum/ethpow.py

@@ -107,7 +107,7 @@ def mine(self, rounds=1000, start_nonce=0):
 
 
 def mine(block_number, difficulty, mining_hash, start_nonce=0, rounds=1000):
-    assert utils.isnumeric(start_nonce)
+    assert utils.is_numeric(start_nonce)
     cache = get_cache(block_number)
     nonce = start_nonce
     target = utils.zpad(utils.int_to_big_endian(2**256 // (difficulty or 1)), 32)

ethereum/processblock.py

@@ -146,7 +146,7 @@ def rp(what, actual, target):
         return '%r: %r actual:%r target:%r' % (tx, what, actual, target)
 
     intrinsic_gas = tx.intrinsic_gas_used
-    print 'b1', block.get_balance(tx.sender)
+    print('b1', block.get_balance(tx.sender))
     if block.number >= block.config['HOMESTEAD_FORK_BLKNUM']:
         assert tx.s * 2 < transactions.secpk1n
         if not tx.to or tx.to == CREATE_CONTRACT_ADDRESS:
@@ -165,7 +165,7 @@ def rp(what, actual, target):
     message_data = vm.CallData([safe_ord(x) for x in tx.data], 0, len(tx.data))
     message = vm.Message(tx.sender, tx.to, tx.value, message_gas, message_data, code_address=tx.to)
 
-    print 'b2', block.get_balance(tx.sender)
+    print('b2', block.get_balance(tx.sender))
     # MESSAGE
     ext = VMExt(block, tx)
     if tx.to and tx.to != CREATE_CONTRACT_ADDRESS:
@@ -215,7 +215,7 @@ def rp(what, actual, target):
         block.del_account(s)
     block.add_transaction_to_list(tx)
     block.logs = []
-    print 'b3', block.get_balance(tx.sender), success
+    print('b3', block.get_balance(tx.sender), success)
     return success, output
 
 

ethereum/slogging.py

@@ -1,9 +1,9 @@
+import sys
 import logging
 import json
 import textwrap
 from json.encoder import JSONEncoder
 from logging import StreamHandler, Formatter, FileHandler
-from ethereum.utils import bcolors, isnumeric
 
 
 DEFAULT_LOGLEVEL = 'INFO'
@@ -20,6 +20,33 @@
 log_listeners = []
 
 
+if sys.version_info.major == 2:
+    integer_types = (int, long)
+    number_types = (int, long, float, complex)
+else:
+    integer_types = (int,)
+    number_types = (int, float, complex)
+
+
+def is_integer(value):
+    return isinstance(value, integer_types)
+
+
+def is_number(value):
+    return isinstance(value, number_types)
+
+
+class bcolors:
+    HEADER = '\033[95m'
+    OKBLUE = '\033[94m'
+    OKGREEN = '\033[92m'
+    WARNING = '\033[91m'
+    FAIL = '\033[91m'
+    ENDC = '\033[0m'
+    BOLD = '\033[1m'
+    UNDERLINE = '\033[4m'
+
+
 def _inject_into_logger(name, code, namespace=None):
     # This is a hack to fool the logging module into reporting correct source files.
     # It determines the actual source of a logging call by inspecting the stack frame's
@@ -190,7 +217,7 @@ def format_message(self, msg, kwargs, highlight, level):
                     msg = json.dumps(message, cls=_LogJSONEncoder)
             except UnicodeDecodeError:
                 message.update({
-                    k: v if isnumeric(v) or isinstance(v, (float, complex)) else repr(v)
+                    k: v if is_number(v) else repr(v)
                     for k, v in kwargs.items()
                 })
                 msg = json.dumps(message, cls=_LogJSONEncoder)
@@ -260,7 +287,7 @@ def _stringify_dict_keys(input_):
         res = {}
         for k, v in input_.items():
             v = _stringify_dict_keys(v)
-            if not isinstance(k, (int, long, bool, None.__class__)):
+            if not is_integer(k) and not isinstance(k, (bool, None.__class__)):
                 k = str(k)
             res[k] = v
     elif isinstance(input_, (list, tuple)):

ethereum/tester.py

@@ -98,9 +98,16 @@ class ContractCreationFailed(Exception):
 
 class ABIContract(object):  # pylint: disable=too-few-public-methods
 
-    def __init__(self, test_state, abi_translator, address, listen=True, log_listener=None, default_key=None):  # pylint: disable=too-many-arguments
+    def __init__(self, _state, _abi, address, listen=True,  # pylint: disable=too-many-arguments
+                 log_listener=None, default_key=None):
         self.address = address
         self.default_key = default_key or DEFAULT_KEY
+
+        if isinstance(_abi, ContractTranslator):
+            abi_translator = _abi
+        else:
+            abi_translator = ContractTranslator(_abi)
+
         self.translator = abi_translator
 
         def listener(log):
@@ -110,10 +117,10 @@ def listener(log):
                 log_listener(result)
 
         if listen:
-            test_state.block.log_listeners.append(listener)
+            _state.block.log_listeners.append(listener)
 
         for function_name in self.translator.function_data:
-            function = self.method_factory(test_state, function_name)
+            function = self.method_factory(_state, function_name)
             method = types.MethodType(function, self)
             setattr(self, function_name, method)
 
@@ -377,10 +384,13 @@ def trace(self, sender, to, value, data=None):
         return recorder.pop_records()
 
     def mine(self, number_of_blocks=1, coinbase=DEFAULT_ACCOUNT, **kwargs):
-        if 'n' in kwargs: # compatibility 
+        if 'n' in kwargs:  # compatibility
             number_of_blocks = kwargs['n']
-            warnings.warn('The argument \'n\' is deprecated and its support will be removed '\
-                'in the future versions. Please use the name \'number_of_blocks\'.')
+            warnings.warn(
+                "The argument 'n' is deprecated and its support will be removed "
+                "in the future versions. Please use the name 'number_of_blocks'."
+            )
+
         for _ in range(number_of_blocks):
             self.block.finalize()
             self.block.commit_state()

ethereum/tests/contracts/simple_contract.sol

@@ -0,0 +1,5 @@
+contract Simple {
+    function test() returns (int256) {
+        return 1;
+    }
+}

ethereum/tests/test_tester.py

@@ -0,0 +1,35 @@
+# -*- coding: utf8 -*-
+import json
+from os import path
+
+import pytest
+
+from ethereum.tester import state, ABIContract
+from ethereum._solidity import get_solidity, compile_file
+
+SOLIDITY_AVAILABLE = get_solidity() is not None
+CONTRACTS_DIR = path.join(path.dirname(__file__), 'contracts')
+
+
+@pytest.mark.skipif(not SOLIDITY_AVAILABLE, reason='solc compiler not available')
+def test_abicontract_interface():
+    """ Test for issue #370. """
+    tester_state = state()
+
+    contract_path = path.join(CONTRACTS_DIR, 'simple_contract.sol')
+    simple_compiled = compile_file(contract_path)
+    simple_address = tester_state.evm(simple_compiled['Simple']['bin'])
+
+    # ABIContract class must accept json_abi
+    abi_json = json.dumps(simple_compiled['Simple']['abi'])
+
+    abi = ABIContract(
+        _state=tester_state,
+        _abi=abi_json,
+        address=simple_address,
+        listen=False,
+        log_listener=None,
+        default_key=None,
+    )
+
+    assert abi.test() == 1  # pylint: disable=no-member

ethereum/testutils.py

@@ -535,8 +535,8 @@ def blkhash(n):
             _shouldbe = params1.get(k, None)
             _reallyis = params2.get(k, None)
             if _shouldbe != _reallyis:
-                print 's', shouldbe
-                print 'r', reallyis
+                print('s', shouldbe)
+                print('r', reallyis)
                 raise Exception("Mismatch: " + k + ':\n shouldbe %r\n reallyis %r' %
                                 (_shouldbe, _reallyis))