Merge branch 'develop' into better_bounds

mythril/laser/smt/expression.py

@@ -54,6 +54,9 @@ class Expression(Generic[T]):
     def __hash__(self) -> int:
         return self.raw.__hash__()
 
+    def get_annotations(self, annotation: Any):
+        return list(filter(lambda x: isinstance(x, annotation), self.annotations))
+
 
 G = TypeVar("G", bound=Expression)
 

tests/cmd_line_test.py

@@ -63,13 +63,16 @@ class CommandLineToolTestCase(BaseTestCase):
         # Just check for crashes
         output_of(command)
 
+    ''''
     def test_storage(self):
         command = """python3 {} read-storage "438767356, 3" 0x76799f77587738bfeef09452df215b63d2cfb08a """.format(
             MYTH
         )
         self.assertIn("0x1a270efc", output_of(command))
+    '''
 
 
+"""
 class InfuraTestCase(BaseTestCase):
     def test_infura_mainnet(self):
         command = "python3 {} disassemble --rpc infura-mainnet  -a 0x2a0c0dbecc7e4d658f48e01e3fa353f44050c208".format(
@@ -99,3 +102,4 @@ class InfuraTestCase(BaseTestCase):
         )
         output = output_of(command)
         self.assertIn("1821 PUSH1 0x01\n1823 PUSH2 0x070c", output)
+"""

tests/instructions/create2_test.py

@@ -0,0 +1,61 @@
+import pytest
+from mythril.disassembler.disassembly import Disassembly
+from mythril.laser.ethereum.state.environment import Environment
+from mythril.laser.ethereum.state.machine_state import MachineState
+from mythril.laser.ethereum.state.global_state import GlobalState
+from mythril.laser.ethereum.state.world_state import WorldState
+from mythril.laser.ethereum.instructions import Instruction
+from mythril.laser.ethereum.transaction.transaction_models import (
+    MessageCallTransaction,
+    TransactionStartSignal,
+)
+from mythril.laser.ethereum.state.calldata import ConcreteCalldata
+from mythril.support.support_utils import get_code_hash
+
+last_state = None
+created_contract_account = None
+
+
+def generate_salted_address(code_str, salt, caller):
+    addr = hex(caller.value)[2:]
+    addr = "0" * (40 - len(addr)) + addr
+
+    salt = hex(salt)[2:]
+    salt = "0" * (64 - len(salt)) + salt
+
+    contract_address = int(
+        get_code_hash("0xff" + addr + salt + get_code_hash(code_str)[2:])[26:], 16,
+    )
+    return contract_address
+
+
+def test_create2():
+    world_state = WorldState()
+    account = world_state.create_account(balance=10, address=101)
+    account.code = Disassembly("60606040")
+    environment = Environment(account, None, None, None, None, None)
+    og_state = GlobalState(
+        world_state, environment, None, MachineState(gas_limit=8000000)
+    )
+    code_raw = []
+    code = "606060406060"
+    for i in range(len(code) // 2):
+        code_raw.append(int(code[2 * i : 2 * (i + 1)], 16))
+    calldata = ConcreteCalldata("1", code_raw)
+    environment.calldata = calldata
+    og_state.transaction_stack.append(
+        (MessageCallTransaction(world_state=WorldState(), gas_limit=8000000), None)
+    )
+    value = 3
+    salt = 10
+    og_state.mstate.stack = [salt, 6, 0, value]
+    instruction = Instruction("create2", dynamic_loader=None)
+
+    # Act + Assert
+    with pytest.raises(TransactionStartSignal) as t:
+        _ = instruction.evaluate(og_state)[0]
+    assert t.value.transaction.call_value == value
+    assert t.value.transaction.code.bytecode == code
+    assert t.value.transaction.callee_account.address == generate_salted_address(
+        code, salt, account.address
+    )

tests/instructions/create_test.py

@@ -0,0 +1,50 @@
+import pytest
+
+from mythril.disassembler.disassembly import Disassembly
+from mythril.laser.ethereum.state.environment import Environment
+from mythril.laser.ethereum.state.machine_state import MachineState
+from mythril.laser.ethereum.state.global_state import GlobalState
+from mythril.laser.ethereum.state.world_state import WorldState
+from mythril.laser.ethereum.instructions import Instruction
+from mythril.laser.ethereum.transaction.transaction_models import (
+    MessageCallTransaction,
+    TransactionStartSignal,
+)
+from mythril.laser.ethereum.state.calldata import ConcreteCalldata
+
+
+last_state = None
+created_contract_account = None
+
+
+def test_create():
+    world_state = WorldState()
+    account = world_state.create_account(balance=10, address=101)
+    account.code = Disassembly("60606040")
+    environment = Environment(account, None, None, None, None, None)
+    og_state = GlobalState(
+        world_state, environment, None, MachineState(gas_limit=8000000)
+    )
+    code_raw = []
+    code = "606060406060"
+    for i in range(len(code) // 2):
+        code_raw.append(int(code[2 * i : 2 * (i + 1)], 16))
+    calldata = ConcreteCalldata("1", code_raw)
+    environment.calldata = calldata
+    og_state.transaction_stack.append(
+        (MessageCallTransaction(world_state=WorldState(), gas_limit=8000000), None)
+    )
+    value = 3
+    og_state.mstate.stack = [6, 0, value]
+    instruction = Instruction("create", dynamic_loader=None)
+
+    # Act + Assert
+    with pytest.raises(TransactionStartSignal) as t:
+        _ = instruction.evaluate(og_state)[0]
+
+    assert t.value.transaction.call_value == value
+    assert t.value.transaction.code.bytecode == code
+    assert (
+        t.value.transaction.callee_account.address
+        == world_state._generate_new_address(account.address.value)
+    )

tests/laser/state/world_state_account_exist_load_test.py

@@ -10,7 +10,7 @@ from mythril.support.loader import DynLoader
 from mythril.ethereum.interface.rpc.client import EthJsonRpc
 from mythril.laser.ethereum.instructions import Instruction
 
-
+"""
 def _get_global_state():
     active_account = Account("0x0", code=Disassembly("60606040"))
     passive_account = Account(
@@ -50,3 +50,4 @@ def test_extraction(addr, eth, code_len):
         addr, dynamic_loader
     ).code.bytecode
     assert len(code) == code_len
+"""

tests/mythril/mythril_disassembler_test.py

@@ -36,7 +36,7 @@ storage_test = [
     ),
 ]
 
-
+"""
 @pytest.mark.parametrize("params,ans", storage_test)
 def test_get_data_from_storage(params, ans):
     config = MythrilConfig()
@@ -64,6 +64,7 @@ def test_get_data_from_storage_incorrect_params(params):
         disassembler.get_state_variable_from_storage(
             "0x76799f77587738bfeef09452df215b63d2cfb08a", params
         )
+"""
 
 
 def test_solc_install():