Merge branch 'develop' into feature/import-custom-modules

mythril/laser/ethereum/evm_exceptions.py

@@ -35,3 +35,9 @@ class OutOfGasException(VmException):
     """A VM exception denoting the current execution has run out of gas."""
 
     pass
+
+
+class ProgramCounterException(VmException):
+    """A VM exception denoting an invalid PC value (No stop instruction is reached)."""
+
+    pass

mythril/laser/ethereum/state/global_state.py

@@ -9,6 +9,7 @@ from mythril.laser.ethereum.cfg import Node
 from mythril.laser.ethereum.state.environment import Environment
 from mythril.laser.ethereum.state.machine_state import MachineState
 from mythril.laser.ethereum.state.annotation import StateAnnotation
+from mythril.laser.ethereum.evm_exceptions import ProgramCounterException
 
 if TYPE_CHECKING:
     from mythril.laser.ethereum.state.world_state import WorldState
@@ -88,6 +89,10 @@ class GlobalState:
         """
 
         instructions = self.environment.code.instruction_list
+        if self.mstate.pc >= len(instructions):
+            raise ProgramCounterException(
+                "PC: {} can not be reached.".format(self.mstate.pc)
+            )
         return instructions[self.mstate.pc]
 
     @property

requirements.txt

@@ -12,7 +12,6 @@ eth-keys>=0.2.0b3,<0.3.0
 eth-rlp>=0.1.0
 eth-tester==0.1.0b32
 eth-typing>=2.0.0
-eth-utils>=1.0.1
 jinja2>=2.9
 mock
 persistent>=4.2.0

setup.py

@@ -32,7 +32,6 @@ REQUIRED = [
     "py-solc",
     "plyvel",
     "eth_abi==1.3.0",
-    "eth-utils>=1.0.1",
     "eth-account>=0.1.0a2,<=0.3.0",
     "eth-hash>=0.1.0",
     "eth-keyfile>=0.5.1",