Merge pull request #983 from ConsenSys/features/plugin_loader_sym

Use plugin loader and factory

mythril/analysis/symbolic.py

@@ -12,9 +12,9 @@ from mythril.laser.ethereum.strategy.basic import (
     ReturnWeightedRandomStrategy,
 )
 
-from mythril.laser.ethereum.plugins.implementations.mutation_pruner import (
-    MutationPruner,
-)
+from mythril.laser.ethereum.plugins.plugin_factory import PluginFactory
+from mythril.laser.ethereum.plugins.plugin_loader import LaserPluginLoader
+
 
 from mythril.solidity.soliditycontract import EVMContract, SolidityContract
 from .ops import Call, SStore, VarType, get_variable
@@ -86,9 +86,9 @@ class SymExecWrapper:
             requires_statespace=requires_statespace,
             enable_iprof=enable_iprof,
         )
-        mutation_plugin = MutationPruner()
 
-        mutation_plugin.initialize(self.laser)
+        plugin_loader = LaserPluginLoader(self.laser)
+        plugin_loader.load(PluginFactory.build_mutation_pruner_plugin())
 
         self.laser.register_hooks(
             hook_type="pre",

mythril/laser/ethereum/plugins/plugin_factory.py

@@ -1,11 +1,4 @@
 from mythril.laser.ethereum.plugins.plugin import LaserPlugin
-from mythril.laser.ethereum.plugins.implementations.benchmark import BenchmarkPlugin
-from mythril.laser.ethereum.plugins.implementations.mutation_pruner import (
-    MutationPruner,
-)
-from mythril.laser.ethereum.plugins.implementations.coverage import (
-    InstructionCoveragePlugin,
-)
 
 
 class PluginFactory:
@@ -14,14 +7,26 @@ class PluginFactory:
     @staticmethod
     def build_benchmark_plugin(name: str) -> LaserPlugin:
         """ Creates an instance of the benchmark plugin with the given name """
+        from mythril.laser.ethereum.plugins.implementations.benchmark import (
+            BenchmarkPlugin,
+        )
+
         return BenchmarkPlugin(name)
 
     @staticmethod
     def build_mutation_pruner_plugin() -> LaserPlugin:
         """ Creates an instance of the mutation pruner plugin"""
+        from mythril.laser.ethereum.plugins.implementations.mutation_pruner import (
+            MutationPruner,
+        )
+
         return MutationPruner()
 
     @staticmethod
     def build_instruction_coverage_plugin() -> LaserPlugin:
         """ Creates an instance of the instruction coverage plugin"""
+        from mythril.laser.ethereum.plugins.implementations.coverage import (
+            InstructionCoveragePlugin,
+        )
+
         return InstructionCoveragePlugin()

mythril/laser/ethereum/plugins/plugin_loader.py

@@ -2,6 +2,9 @@ from mythril.laser.ethereum.svm import LaserEVM
 from mythril.laser.ethereum.plugins.plugin import LaserPlugin
 
 from typing import List
+import logging
+
+log = logging.getLogger(__name__)
 
 
 class LaserPluginLoader:
@@ -16,13 +19,14 @@ class LaserPluginLoader:
         :param symbolic_vm: symbolic virtual machine to load plugins for
         """
         self.symbolic_vm = symbolic_vm
-        self.laser_plugins: List[LaserPlugin] = []
+        self.laser_plugins = []  # type: List[LaserPlugin]
 
     def load(self, laser_plugin: LaserPlugin) -> None:
         """ Loads the plugin
 
         :param laser_plugin: plugin that will be loaded in the symbolic virtual machine
         """
+        log.info("Loading plugin: {}".format(str(laser_plugin)))
         laser_plugin.initialize(self.symbolic_vm)
         self.laser_plugins.append(laser_plugin)
 

requirements.txt

@@ -27,3 +27,4 @@ rlp>=1.0.1
 transaction>=2.2.1
 z3-solver-mythril>=4.8.4.1
 pysha3
+matplotlib

setup.py

@@ -97,6 +97,7 @@ setup(
         "configparser>=3.5.0",
         "persistent>=4.2.0",
         "ethereum-input-decoder>=0.2.2",
+        "matplotlib",
     ],
     tests_require=["mypy", "pytest>=3.6.0", "pytest_mock", "pytest-cov"],
     python_requires=">=3.5",