Fixed STATICCALL bug, and changed modexp gas calculation

Author: vbuterin

ethereum/child_dao_list.py

@@ -7,6 +7,6 @@
 # DAO extrabalance
 L.append('0x807640a13483f8ac783c557fcdf27be11ea4ac7a')
 # child DAOs (created by DAO creator)
-L.extend([b'0x' + encode_hex(mk_contract_address(source, i)) for i in range(1, 58)])
+L.extend(['0x' + encode_hex(mk_contract_address(source, i)) for i in range(1, 58)])
 # child extrabalances
-L.extend([b'0x' + encode_hex(mk_contract_address(mk_contract_address(source, i), 0)) for i in range(1, 58)])
+L.extend(['0x' + encode_hex(mk_contract_address(mk_contract_address(source, i), 0)) for i in range(1, 58)])

ethereum/messages.py

@@ -16,7 +16,7 @@
 from ethereum import opcodes
 from ethereum.transactions import Transaction
 from ethereum.consensus_strategy import get_consensus_strategy
-from ethereum import vm
+from ethereum import new_vm as vm
 from ethereum.specials import specials as default_specials
 from ethereum.config import Env, default_config
 from ethereum.db import BaseDB, EphemDB
@@ -323,7 +323,8 @@ def _apply_msg(ext, msg, code):
         log_msg.debug("MSG APPLY", sender=encode_hex(msg.sender), to=encode_hex(msg.to),
                       gas=msg.gas, value=msg.value,
                       data=encode_hex(msg.data.extract_all()) if msg.data.size < 2500 else ("data<%d>" % msg.data.size),
-                      pre_storage=ext.log_storage(msg.to))
+                      pre_storage=ext.log_storage(msg.to),
+                      static=msg.static, depth=msg.depth)
 
     # Transfer value, instaquit if not enough
     snapshot = ext.snapshot()

ethereum/opcodes.py

@@ -70,6 +70,7 @@
     0xf3: ['RETURN', 2, 0, 0],
     0xf4: ['DELEGATECALL', 6, 1, 40], # 700 now
     0xf5: ['CALLBLACKBOX', 7, 1, 40],
+    0xfa: ['STATICCALL', 6, 1, 40],
     0xfd: ['REVERT', 2, 0, 0],
     0xff: ['SUICIDE', 1, 0, 0], # 5000 now
 }
@@ -125,7 +126,7 @@
 GSTORAGEMOD = 5000
 GSTORAGEADD = 20000
 
-GMODEXPQUADDIVISOR = 20
+GMODEXPQUADDIVISOR = 100
 GECADD = 500
 GECMUL = 2000
 

ethereum/specials.py

@@ -30,7 +30,7 @@ def proc_ecrecover(ext, msg):
         return 1, msg.gas - opcodes.GECRECOVER, []
     try:
         pub = utils.ecrecover_to_pub(message_hash, v, r, s)
-    except:
+    except Exception as e:
         return 1, msg.gas - gas_cost, []
     o = [0] * 12 + [safe_ord(x) for x in utils.sha3(pub)[-20:]]
     return 1, msg.gas - gas_cost, o
@@ -78,7 +78,13 @@ def proc_modexp(ext, msg):
     baselen = msg.data.extract32(0)
     explen = msg.data.extract32(32)
     modlen = msg.data.extract32(64)
-    gas_cost = (max(modlen, baselen) ** 2 * max(explen, 1)) // opcodes.GMODEXPQUADDIVISOR
+    first_exp_bytes = msg.data.extract32(96 + baselen)
+    bitlength = -1
+    while first_exp_bytes:
+        bitlength += 1
+        first_exp_bytes >>= 1
+    adjusted_explen = max(bitlength, 0) + 8 * max(explen - 32, 0)
+    gas_cost = (max(modlen, baselen) ** 2 * max(adjusted_explen, 1)) // opcodes.GMODEXPQUADDIVISOR
     print(baselen, explen, modlen, 'expected gas cost', gas_cost)
     if msg.gas < gas_cost:
         return 0, 0, []

ethereum/tests/test_state.py

@@ -17,7 +17,10 @@
 
 def test_state(filename, testname, testdata):
     logger.debug('running test:%r in %r' % (testname, filename))
-    checker(testdata)
+    try:
+        checker(testdata)
+    except new_statetest_utils.EnvNotFoundException:
+        pass
 
 
 def pytest_generate_tests(metafunc):
@@ -49,7 +52,10 @@ def main():
         for testname, testdata in list(tests.items()):
             if len(sys.argv) < 3 or testname == sys.argv[2]:
                 print("Testing: %s %s" % (filename, testname))
-                checker(testdata)
+                try:
+                    checker(testdata)
+                except new_statetest_utils.EnvNotFoundException:
+                    pass
 
 
 if __name__ == '__main__':

ethereum/tools/new_statetest_utils.py

@@ -135,8 +135,13 @@ def init_state(env, pre):
     # state.commit()
     return state
 
+class EnvNotFoundException(Exception):
+    pass
+
 def verify_state_test(test):
     print("Verifying state test")
+    if "env" not in test:
+        raise EnvNotFoundException("Env not found")
     _state = init_state(test["env"], test["pre"])
     for config_name, results in test["post"].items():
         # Old protocol versions may not be supported

ethereum/utils.py

@@ -4,13 +4,14 @@
 except ImportError:
     import sha3 as _sha3
     sha3_256 = lambda x: _sha3.keccak_256(x).digest()
-from bitcoin import privtopub
+from bitcoin import privtopub, ecdsa_raw_sign, ecdsa_raw_recover, encode_pubkey
 import sys
 import rlp
 from rlp.sedes import big_endian_int, BigEndianInt, Binary
 from rlp.utils import decode_hex, encode_hex, ascii_chr, str_to_bytes
 import random
 
+
 try:
     import secp256k1
 except ImportError:

ethereum/vm.py

@@ -602,14 +602,14 @@ def vm_execute(ext, msg, code):
                 elif ext.post_homestead_hardfork() and op == 'DELEGATECALL':
                     call_msg = Message(msg.sender, msg.to, msg.value, submsg_gas, cd,
                                        msg.depth + 1, code_address=to, transfers_value=False, static=msg.static)
-                elif op == 'DELEGATECALL':
-                    return vm_exception('OPCODE INACTIVE')
+                elif ext.post_metropolis_hardfork() and op == 'STATICCALL':
+                    call_msg = Message(msg.to, to, value, submsg_gas, cd,
+                                       msg.depth + 1, code_address=to, static=True)
+                elif op in ('DELEGATECALL', 'STATICCALL'):
+                    return vm_exception('OPCODE %s INACTIVE' % op)
                 elif op == 'CALLCODE':
                     call_msg = Message(msg.to, msg.to, value, submsg_gas, cd,
                                        msg.depth + 1, code_address=to, static=msg.static)
-                elif op == 'STATICCALL':
-                    call_msg = Message(msg.to, to, value, submsg_gas, cd,
-                                       msg.depth + 1, code_address=to, static=True)
                 else:
                     raise Exception("Lolwut")
                 # Get result