Minor stylistic changes

Author: vub

ethereum/chain.py

@@ -85,7 +85,6 @@ def head(self):
             return None
 
     def mk_poststate_of_blockhash(self, blockhash):
-        print 'Making poststate from blockhash'
         if blockhash not in self.db:
             raise Exception("Block hash %s not found" % encode_hex(blockhash))
         if self.db.get(blockhash) == 'GENESIS':

ethereum/config.py

@@ -62,7 +62,7 @@
     CHILD_DAO_LIST = map(utils.normalize_address, child_dao_list),
     DAO_WITHDRAWER = utils.normalize_address('0xbf4ed7b27f1d666546e30d74d50d173d20bca754'),
     # Anti-DoS fork
-    ANTI_DOS_FORK_BLKNUM = 9999999,
+    ANTI_DOS_FORK_BLKNUM = 2457000,
     # Default consensus strategy: ethash, poa, casper, pbft
     CONSENSUS_STRATEGY = 'ethash',
     # Serenity fork

ethereum/state_transition.py

@@ -136,8 +136,9 @@ def validate_transactions(state, block):
 def verify_execution_results(state, block):
     if not SKIP_RECEIPT_ROOT_VALIDATION:
         if block.header.receipts_root != mk_receipt_sha(state.receipts):
-            raise ValueError("Receipt root mismatch: header %s computed %s, %d receipts" %
-                             (encode_hex(block.header.receipts_root), encode_hex(mk_receipt_sha(state.receipts)), len(state.receipts)))
+            raise ValueError("Receipt root mismatch: header %s computed %s, gas used header %d computed %d, %d receipts" %
+                             (encode_hex(block.header.receipts_root), encode_hex(mk_receipt_sha(state.receipts)),
+                             block.header.gas_used, state.gas_used, len(state.receipts)))
     if block.header.state_root != state.trie.root_hash:
         raise ValueError("State root mismatch: header %s computed %s" %
                          (encode_hex(block.header.state_root), encode_hex(state.trie.root_hash)))

ethereum/tester.py

@@ -276,7 +276,7 @@ def call(*args, **kwargs):  # pylint: disable=unused-argument,no-method-argument
         )
 
     def _send(self, sender, to, value, evmdata='', funid=None, abi=None,  # pylint: disable=too-many-arguments
-              profiling=0):
+              profiling=0, gas=None):
         # pylint: disable=too-many-locals
 
         if funid is not None or abi is not None:
@@ -286,9 +286,10 @@ def _send(self, sender, to, value, evmdata='', funid=None, abi=None,  # pylint:
 
         start_time = time.time()
         gas_used = self.state.gas_used
+        _gas_limit = gas_limit if gas is None else gas
 
         sendnonce = self.state.get_nonce(privtoaddr(sender))
-        transaction = transactions.Transaction(sendnonce, gas_price, gas_limit, to, value, evmdata)
+        transaction = transactions.Transaction(sendnonce, gas_price, _gas_limit, to, value, evmdata)
         self.last_tx = transaction
         transaction.sign(sender)
         recorder = None

ethereum/tests/test_blocks.py

@@ -96,12 +96,15 @@ def get_config_overrides(filename):
         o['HOMESTEAD_FORK_BLKNUM'] = 0
     if 'TestNetwork' in filename:
         o['HOMESTEAD_FORK_BLKNUM'] = 5
+        if 'EIP150' in filename:
+            o['DAO_FORK_BLKNUM'] = 8
+            o['ANTI_DOS_FORK_BLKNUM'] = 10
+    elif 'EIP150' in filename:
+        o['HOMESTEAD_FORK_BLKNUM'] = 0
+        o['DAO_FORK_BLKNUM'] = 2**99
+        o['ANTI_DOS_FORK_BLKNUM'] = 0
     if 'bcTheDaoTest' in filename:
         o['DAO_FORK_BLKNUM'] = 8
-    if 'EIP150' in filename:
-        o['HOMESTEAD_FORK_BLKNUM'] = 5
-        o['DAO_FORK_BLKNUM'] = 8
-        o['ANTI_DOS_FORK_BLKNUM'] = 10
     return o
 
 

ethereum/testutils.py

@@ -34,9 +34,9 @@
     "previousHash": b"5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
 }
 
-from ethereum.slogging import LogRecorder, configure_logging, set_level
-config_string = ':info,eth.vm.log:trace,eth.vm.op:trace,eth.vm.stack:trace,eth.vm.exit:trace,eth.pb.msg:trace,eth.pb.tx:debug'
-configure_logging(config_string=config_string)
+# from ethereum.slogging import LogRecorder, configure_logging, set_level
+# config_string = ':info,eth.vm.log:trace,eth.vm.op:trace,eth.vm.stack:trace,eth.vm.exit:trace,eth.pb.msg:trace,eth.pb.tx:debug'
+# configure_logging(config_string=config_string)
 
 FILL = 1
 VERIFY = 2

ethereum/vm.py

@@ -25,6 +25,8 @@
 TT256M1 = 2 ** 256 - 1
 TT255 = 2 ** 255
 
+MAX_DEPTH = 1024
+
 
 class CallData(object):
 
@@ -137,7 +139,8 @@ def data_copy(compustate, size):
 
 def eat_gas(compustate, amount):
     if compustate.gas < amount:
-        return vm_exception("OUT OF GAS")
+        compustate.gas = 0
+        return False
     else:
         compustate.gas -= amount
         return True
@@ -551,7 +554,7 @@ def vm_execute(ext, msg, code):
             value, mstart, msz = stk.pop(), stk.pop(), stk.pop()
             if not mem_extend(mem, compustate, op, mstart, msz):
                 return vm_exception('OOG EXTENDING MEMORY')
-            if ext.get_balance(msg.to) >= value and msg.depth < 1024:
+            if ext.get_balance(msg.to) >= value and msg.depth < MAX_DEPTH:
                 cd = CallData(mem, mstart, msz)
                 ingas = compustate.gas
                 if ext.post_anti_dos_hardfork():
@@ -586,7 +589,7 @@ def vm_execute(ext, msg, code):
                 if compustate.gas < gas + extra_gas:
                     return vm_exception('OUT OF GAS', needed=gas+extra_gas)
             submsg_gas = gas + opcodes.GSTIPEND * (value > 0)
-            if ext.get_balance(msg.to) >= value and msg.depth < 1024:
+            if ext.get_balance(msg.to) >= value and msg.depth < MAX_DEPTH:
                 compustate.gas -= (gas + extra_gas)
                 assert compustate.gas >= 0
                 cd = CallData(mem, meminstart, meminsz)
@@ -624,7 +627,7 @@ def vm_execute(ext, msg, code):
                 if compustate.gas < gas + extra_gas:
                     return vm_exception('OUT OF GAS', needed=gas+extra_gas)
             submsg_gas = gas + opcodes.GSTIPEND * (value > 0)
-            if ext.get_balance(msg.to) >= value and msg.depth < 1024:
+            if ext.get_balance(msg.to) >= value and msg.depth < MAX_DEPTH:
                 compustate.gas -= (gas + extra_gas)
                 assert compustate.gas >= 0
                 to = utils.encode_int(to)