Merge pull request #415 from ethereum/eip150tests

EIP150 for `develop` branch / release

Author: ulope

.travis.yml

@@ -28,8 +28,6 @@ script:
 after_success:
   - travis_retry pip install coveralls
   - cd .tox/$TOX_ENV && coveralls
-after_script:
-  - cat .tox/$TOX_ENV/log/*.log; true
 notifications:
   slack:
     secure: W/UAhQ/GgYwMWrl3aiVAVOWr4WGdWrxUOX/rTB3ZgwDwGqDYLzQO5UqbsQlo1JXPZ6JOWfIPMURhHu7DSfue9dBW6xQ+NL+bFHe9lSXG4nqFK3IjezYyTBzNRJRDbGUvSSqgj6D5cwhJ8BjfUIRPbJz3CxL64KmsNXezEaMY60w=

ethereum/config.py

@@ -63,6 +63,9 @@
     DAO_FORK_BLKNUM=1920000,
     CHILD_DAO_LIST=map(utils.normalize_address, child_dao_list),
     DAO_WITHDRAWER=utils.normalize_address('0xbf4ed7b27f1d666546e30d74d50d173d20bca754'),
+    # Anti-DoS fork
+    ANTI_DOS_FORK_BLKNUM=2457000,
+    CLEARING_FORK_BLKNUM=2 ** 98,
 )
 assert default_config['NEPHEW_REWARD'] == \
     default_config['BLOCK_REWARD'] // 32

ethereum/opcodes.py

@@ -111,3 +111,12 @@
 
 GCALLNEWACCOUNT = 25000
 GSUICIDEREFUND = 24000
+
+# Anti-DoS HF changes
+SLOAD_SUPPLEMENTAL_GAS = 150
+CALL_SUPPLEMENTAL_GAS = 660
+EXTCODELOAD_SUPPLEMENTAL_GAS = 680
+BALANCE_SUPPLEMENTAL_GAS = 380
+CALL_CHILD_LIMIT_NUM = 63
+CALL_CHILD_LIMIT_DENOM = 64
+SUICIDE_SUPPLEMENTAL_GAS = 5000

ethereum/processblock.py

@@ -248,7 +248,8 @@ def __init__(self, block, tx):
         self.create = lambda msg: create_contract(self, msg)
         self.msg = lambda msg: _apply_msg(self, msg, self.get_code(msg.code_address))
         self.account_exists = block.account_exists
-        self.post_homestead_hardfork = lambda: block.number >= block.config['HOMESTEAD_FORK_BLKNUM']
+        self.post_homestead_hardfork = block.number >= block.config['HOMESTEAD_FORK_BLKNUM']
+        self.post_anti_dos_hardfork = block.number >= block.config['ANTI_DOS_FORK_BLKNUM']
 
 
 def apply_msg(ext, msg):

ethereum/tests/test_blocks.py

@@ -5,6 +5,7 @@
 from rlp import DecodingError, DeserializationError
 import sys
 import ethereum.testutils as testutils
+from ethereum.testutils import get_config_overrides
 import copy
 
 from ethereum.slogging import get_logger
@@ -69,47 +70,47 @@ def run_block_test(params, config_overrides={}):
     blockmap = {b.hash: b}
     env.db.put(b.hash, rlp.encode(b))
     old_config = copy.deepcopy(env.config)
-    for k, v in config_overrides.items():
-        env.config[k] = v
-    b2 = None
-    for blk in params["blocks"]:
-        if 'blockHeader' not in blk:
-            try:
+    try:
+        for k, v in config_overrides.items():
+            env.config[k] = v
+        b2 = None
+        for blk in params["blocks"]:
+            if 'blockHeader' not in blk:
+                try:
+                    rlpdata = decode_hex(blk["rlp"][2:])
+                    blkparent = rlp.decode(
+                        rlp.encode(rlp.decode(rlpdata)[0]), blocks.BlockHeader).prevhash
+                    b2 = rlp.decode(rlpdata, blocks.Block, parent=blockmap[blkparent], env=env)
+                    success = b2.validate_uncles()
+                except (ValueError, TypeError, AttributeError, VerificationFailed,
+                        DecodingError, DeserializationError, InvalidTransaction, KeyError):
+                    success = False
+                assert not success
+            else:
                 rlpdata = decode_hex(blk["rlp"][2:])
-                blkparent = rlp.decode(
-                    rlp.encode(rlp.decode(rlpdata)[0]), blocks.BlockHeader).prevhash
+                blkparent = rlp.decode(rlp.encode(rlp.decode(rlpdata)[0]), blocks.BlockHeader).prevhash
                 b2 = rlp.decode(rlpdata, blocks.Block, parent=blockmap[blkparent], env=env)
-                success = b2.validate_uncles()
-            except (ValueError, TypeError, AttributeError, VerificationFailed,
-                    DecodingError, DeserializationError, InvalidTransaction, KeyError):
-                success = False
-            assert not success
-        else:
-            rlpdata = decode_hex(blk["rlp"][2:])
-            blkparent = rlp.decode(rlp.encode(rlp.decode(rlpdata)[0]), blocks.BlockHeader).prevhash
-            b2 = rlp.decode(rlpdata, blocks.Block, parent=blockmap[blkparent], env=env)
-            assert b2.validate_uncles()
-            blockmap[b2.hash] = b2
-            env.db.put(b2.hash, rlp.encode(b2))
-        if b2:
-            print('Block %d with state root %s' % (b2.number, encode_hex(b2.state.root_hash)))
-        # blkdict = b.to_dict(False, True, False, True)
-        # assert blk["blockHeader"] == \
-        #     translate_keys(blkdict["header"], translator_list, lambda y, x: x, [])
-        # assert blk["transactions"] == \
-        #     [translate_keys(t, translator_list, valueconv, ['hash'])
-        #      for t in blkdict["transactions"]]
-        # assert blk["uncleHeader"] == \
-        #     [translate_keys(u, translator_list, lambda x: x, [])
-        #      for u in blkdict["uncles"]]
-    env.config = old_config
+                assert b2.validate_uncles()
+                blockmap[b2.hash] = b2
+                env.db.put(b2.hash, rlp.encode(b2))
+            if b2:
+                print('Block %d with state root %s' % (b2.number, encode_hex(b2.state.root_hash)))
+            # blkdict = b.to_dict(False, True, False, True)
+            # assert blk["blockHeader"] == \
+            #     translate_keys(blkdict["header"], translator_list, lambda y, x: x, [])
+            # assert blk["transactions"] == \
+            #     [translate_keys(t, translator_list, valueconv, ['hash'])
+            #      for t in blkdict["transactions"]]
+            # assert blk["uncleHeader"] == \
+            #     [translate_keys(u, translator_list, lambda x: x, [])
+            #      for u in blkdict["uncles"]]
+    finally:
+        env.config = old_config
 
 
 def test_block(filename, testname, testdata):
-    run_block_test(testdata, {
-        'HOMESTEAD_FORK_BLKNUM': 0 if 'Homestead' in filename else 5 if 'TestNetwork' in filename else 1000000,
-        'DAO_FORK_BLKNUM': 8 if 'bcTheDaoTest' in filename else 1920000
-    })
+    config_overrides = get_config_overrides(filename)
+    run_block_test(testdata, config_overrides=config_overrides)
 
 
 excludes = {
@@ -135,18 +136,15 @@ def main():
             for testname, testdata in list(tests.items()):
                 if testname == sys.argv[2]:
                     print("Testing: %s %s" % (filename, testname))
-                    run_block_test(testdata, {
-                        'HOMESTEAD_FORK_BLKNUM': 0 if 'Homestead' in filename else 5 if 'TestNetwork' in filename
-                        else 1000000,
-                        'DAO_FORK_BLKNUM': 8 if 'bcTheDaoTest' in filename else 1920000})
+                    config_overrides = get_config_overrides(filename)
+                    run_block_test(testdata, config_overrides=config_overrides)
     else:
         for filename, tests in list(fixtures.items()):
             for testname, testdata in list(tests.items()):
                 if (filename.split('/')[-1], testname) not in excludes:
                     print("Testing: %s %s" % (filename, testname))
-                    run_block_test(testdata, {
-                        'HOMESTEAD_FORK_BLKNUM': 0 if 'Homestead' in filename else 5 if 'TestNetwork' in filename else 1000000,
-                        'DAO_FORK_BLKNUM': 8 if 'bcTheDaoTest' in filename else 1920000})
+                    config_overrides = get_config_overrides(filename)
+                    run_block_test(testdata, config_overrides=config_overrides)
 
 
 if __name__ == '__main__':

ethereum/tests/test_opcodes.py

@@ -0,0 +1,21 @@
+from ethereum import opcodes
+
+opcode_gas = {
+    opcode: gas for (opcode, ins, outs, gas) in opcodes.opcodes.values()
+}
+
+
+def test_eip150_opcode_gascost():
+    """Ensure gas prices specified in
+    https://github.com/ethereum/eips/issues/150
+    """
+    assert opcode_gas['EXTCODESIZE'] + opcodes.EXTCODELOAD_SUPPLEMENTAL_GAS == 700
+    assert opcode_gas['EXTCODECOPY'] + opcodes.EXTCODELOAD_SUPPLEMENTAL_GAS == 700
+    assert opcode_gas['BALANCE'] + opcodes.BALANCE_SUPPLEMENTAL_GAS == 400
+    assert opcode_gas['SLOAD'] + opcodes.SLOAD_SUPPLEMENTAL_GAS == 200
+
+    assert opcode_gas['CALL'] + opcodes.CALL_SUPPLEMENTAL_GAS == 700
+    assert opcode_gas['DELEGATECALL'] + opcodes.CALL_SUPPLEMENTAL_GAS == 700
+    assert opcode_gas['CALLCODE'] + opcodes.CALL_SUPPLEMENTAL_GAS == 700
+
+    assert opcode_gas['SUICIDE'] + opcodes.SUICIDE_SUPPLEMENTAL_GAS == 5000

ethereum/testutils.py

@@ -396,6 +396,8 @@ def blkhash(n):
                   'out', 'gas', 'logs', 'postStateRoot']:
             _shouldbe = params1.get(k, None)
             _reallyis = params2.get(k, None)
+            if str_to_bytes(k) == b'out' and _shouldbe[:1] in ('#', b'#'):
+                _reallyis = str_to_bytes('#%s' % ((len(_reallyis) - 2) // 2))
             if _shouldbe != _reallyis:
                 print(('Mismatch {key}: shouldbe {shouldbe_key} != reallyis {reallyis_key}.\n'
                        'post: {shouldbe_post} != {reallyis_post}').format(
@@ -575,6 +577,23 @@ def fixture_to_bytes(value):
         return value
 
 
+def get_config_overrides(filename):
+    override = {}
+    if os.path.join('BlockchainTests', 'Homestead') in filename:
+        override['HOMESTEAD_FORK_BLKNUM'] = 0
+    elif os.path.join('BlockchainTests', 'TestNetwork') in filename:
+        override['HOMESTEAD_FORK_BLKNUM'] = 5
+        override['DAO_FORK_BLKNUM'] = 8
+        override['ANTI_DOS_FORK_BLKNUM'] = 10
+    elif os.path.join('BlockchainTests', 'EIP150') in filename:
+        override['HOMESTEAD_FORK_BLKNUM'] = 0
+        override['ANTI_DOS_FORK_BLKNUM'] = 0
+        override['DAO_FORK_BLKNUM'] = 2 ** 99  # not applicable
+    if 'bcTheDaoTest' in filename:
+        override['DAO_FORK_BLKNUM'] = 8
+    return override
+
+
 def generate_test_params(testsource, metafunc, skip_func=None, exclude_func=None):
     if ['filename', 'testname', 'testdata'] != metafunc.fixturenames:
         return