Few small bug fixes

Author: vub

ethereum/abi.py

@@ -295,7 +295,7 @@ def encode_single(typ, arg):
         i = decint(arg, True)
         if not -2**(sub - 1) <= i < 2**(sub - 1):
             raise ValueOutOfBounds(repr(arg))
-        return zpad(encode_int(i % 2**sub), 32)
+        return zpad(encode_int(i % 2**256), 32)
     # Unsigned reals: ureal<high>x<low>
     elif base == 'ureal':
         high, low = [int(x) for x in sub.split('x')]

ethereum/tester.py

@@ -4,13 +4,18 @@
 import time
 import types
 import warnings
+import copy
 
 import rlp
 from rlp.utils import ascii_chr
 
 from ethereum import db, opcodes, processblock, transactions
 from ethereum.abi import ContractTranslator
-from ethereum.config import Env
+from ethereum.config import Env, default_config
+konfig = copy.copy(default_config)
+konfig['HOMESTEAD_FORK_BLKNUM'] = 0
+konfig['ANTI_DOS_FORK_BLKNUM'] = 0
+konfig['CLEARING_FORK_BLKNUM'] = 0
 from ethereum.slogging import LogRecorder
 from ethereum._solidity import get_solidity
 from ethereum.utils import to_string, sha3, privtoaddr, int_to_addr, encode_hex
@@ -162,7 +167,7 @@ class state(object):
 
     def __init__(self, num_accounts=len(keys)):
         self.temp_data_dir = tempfile.mkdtemp()
-        self.env = Env()
+        self.env = Env(config=konfig)
         self.last_tx = None
         self.log_listeners = []
 

ethereum/vm.py

@@ -237,7 +237,7 @@ def vm_execute(ext, msg, code):
                     trace_data['sha3memory'] = \
                         encode_hex(utils.sha3(b''.join([ascii_chr(x) for
                                               x in compustate.memory])))
-            if _prevop in ('SSTORE', 'SLOAD') or steps == 0:
+            if _prevop in ('SSTORE',) or steps == 0:
                 trace_data['storage'] = ext.log_storage(msg.to)
             trace_data['gas'] = to_string(compustate.gas + fee)
             trace_data['inst'] = opcode