Merge branch 'develop' of github.com:ConsenSys/mythril into bugfix/873

mythril/analysis/report.py

@@ -205,13 +205,15 @@ class Report:
                 }
             )
 
-        result = {
-            "issues": _issues,
-            "sourceType": "raw-bytecode",
-            "sourceFormat": "evm-byzantium-bytecode",
-            "sourceList": source_list,
-            "meta": {},
-        }
+        result = [
+            {
+                "issues": _issues,
+                "sourceType": "raw-bytecode",
+                "sourceFormat": "evm-byzantium-bytecode",
+                "sourceList": source_list,
+                "meta": {},
+            }
+        ]
 
         return json.dumps(result, sort_keys=True)
 

mythril/analysis/symbolic.py

@@ -34,6 +34,7 @@ class SymExecWrapper:
         transaction_count=2,
         modules=(),
         compulsory_statespace=True,
+        enable_iprof=False,
     ):
         """
 
@@ -78,6 +79,7 @@ class SymExecWrapper:
             create_timeout=create_timeout,
             transaction_count=transaction_count,
             requires_statespace=requires_statespace,
+            enable_iprof=enable_iprof,
         )
         self.laser.register_hooks(
             hook_type="pre",

mythril/interfaces/cli.py

@@ -210,6 +210,9 @@ def main():
         action="store_true",
         help="Lookup function signatures through www.4byte.directory",
     )
+    options.add_argument(
+        "--enable-iprof", action="store_true", help="enable the instruction profiler"
+    )
 
     rpc = parser.add_argument_group("RPC options")
 
@@ -283,6 +286,18 @@ def main():
                 "The --query-signature function requires the python package ethereum-input-decoder",
             )
 
+    if args.enable_iprof:
+        if args.v < 4:
+            exit_with_error(
+                args.outform,
+                "--enable-iprof must be used with -v LOG_LEVEL where LOG_LEVEL >= 4",
+            )
+        elif not (args.graph or args.fire_lasers or args.statespace_json):
+            exit_with_error(
+                args.outform,
+                "--enable-iprof must be used with one of -g, --graph, -x, --fire-lasers, -j and --statespace-json",
+            )
+
     # -- commands --
     if args.hash:
         print(Mythril.hash_for_function_signature(args.hash))
@@ -407,6 +422,7 @@ def main():
                     max_depth=args.max_depth,
                     execution_timeout=args.execution_timeout,
                     create_timeout=args.create_timeout,
+                    enable_iprof=args.enable_iprof,
                 )
 
                 try:
@@ -428,6 +444,7 @@ def main():
                         execution_timeout=args.execution_timeout,
                         create_timeout=args.create_timeout,
                         transaction_count=args.transaction_count,
+                        enable_iprof=args.enable_iprof,
                     )
                     outputs = {
                         "json": report.as_json(),
@@ -455,6 +472,7 @@ def main():
                 max_depth=args.max_depth,
                 execution_timeout=args.execution_timeout,
                 create_timeout=args.create_timeout,
+                enable_iprof=args.enable_iprof,
             )
 
             try:

mythril/laser/ethereum/instructions.py

@@ -5,6 +5,7 @@ import logging
 
 from copy import copy, deepcopy
 from typing import Callable, List, Union
+from datetime import datetime
 
 from ethereum import utils
 
@@ -154,14 +155,16 @@ class Instruction:
     """Instruction class is used to mutate a state according to the current
     instruction."""
 
-    def __init__(self, op_code: str, dynamic_loader: DynLoader):
+    def __init__(self, op_code: str, dynamic_loader: DynLoader, iprof=None):
         """
 
         :param op_code:
         :param dynamic_loader:
+        :param iprof:
         """
         self.dynamic_loader = dynamic_loader
         self.op_code = op_code.upper()
+        self.iprof = iprof
 
     def evaluate(self, global_state: GlobalState, post=False) -> List[GlobalState]:
         """Performs the mutation for this instruction.
@@ -191,7 +194,15 @@ class Instruction:
         if instruction_mutator is None:
             raise NotImplementedError
 
-        return instruction_mutator(global_state)
+        if self.iprof is None:
+            result = instruction_mutator(global_state)
+        else:
+            start_time = datetime.now()
+            result = instruction_mutator(global_state)
+            end_time = datetime.now()
+            self.iprof.record(op, start_time, end_time)
+
+        return result
 
     @StateTransition()
     def jumpdest_(self, global_state: GlobalState) -> List[GlobalState]:

mythril/laser/ethereum/iprof.py

@@ -0,0 +1,79 @@
+from collections import namedtuple
+from datetime import datetime
+from typing import Dict, List, Tuple
+
+# Type annotations:
+#   start_time: datetime
+#   end_time: datetime
+_InstrExecRecord = namedtuple("_InstrExecRecord", ["start_time", "end_time"])
+
+# Type annotations:
+#   total_time: float
+#   total_nr: float
+#   min_time: float
+#   max_time: float
+_InstrExecStatistic = namedtuple(
+    "_InstrExecStatistic", ["total_time", "total_nr", "min_time", "max_time"]
+)
+
+# Map the instruction opcode to its records if all execution times
+_InstrExecRecords = Dict[str, List[_InstrExecRecord]]
+
+# Map the instruction opcode to the statistic of its execution times
+_InstrExecStatistics = Dict[str, _InstrExecStatistic]
+
+
+class InstructionProfiler:
+    """Performance profile for the execution of each instruction.
+    """
+
+    def __init__(self):
+        self.records = dict()
+
+    def record(self, op: int, start_time: datetime, end_time: datetime):
+        try:
+            self.records[op].append(_InstrExecRecord(start_time, end_time))
+        except KeyError:
+            self.records[op] = [_InstrExecRecord(start_time, end_time)]
+
+    def _make_stats(self) -> Tuple[float, _InstrExecStatistics]:
+        periods = {
+            op: list(
+                map(lambda r: r.end_time.timestamp() - r.start_time.timestamp(), rs)
+            )
+            for op, rs in self.records.items()
+        }
+
+        stats = dict()
+        total_time = 0
+
+        for _, (op, times) in enumerate(periods.items()):
+            stat = _InstrExecStatistic(
+                total_time=sum(times),
+                total_nr=len(times),
+                min_time=min(times),
+                max_time=max(times),
+            )
+            total_time += stat.total_time
+            stats[op] = stat
+
+        return total_time, stats
+
+    def __str__(self):
+        total, stats = self._make_stats()
+
+        s = "Total: {} s\n".format(total)
+
+        for op in sorted(stats):
+            stat = stats[op]
+            s += "[{:12s}] {:>8.4f} %,  nr {:>6},  total {:>8.4f} s,  avg {:>8.4f} s,  min {:>8.4f} s,  max {:>8.4f} s\n".format(
+                op,
+                stat.total_time * 100 / total,
+                stat.total_nr,
+                stat.total_time,
+                stat.total_time / stat.total_nr,
+                stat.min_time,
+                stat.max_time,
+            )
+
+        return s

mythril/laser/ethereum/svm.py

@@ -23,6 +23,7 @@ from mythril.laser.ethereum.transaction import (
     execute_contract_creation,
     execute_message_call,
 )
+from mythril.laser.ethereum.iprof import InstructionProfiler
 
 log = logging.getLogger(__name__)
 
@@ -54,6 +55,7 @@ class LaserEVM:
         strategy=DepthFirstSearchStrategy,
         transaction_count=2,
         requires_statespace=True,
+        enable_iprof=False,
     ):
         """
 
@@ -94,6 +96,8 @@ class LaserEVM:
         self.pre_hooks = defaultdict(list)
         self.post_hooks = defaultdict(list)
 
+        self.iprof = InstructionProfiler() if enable_iprof else None
+
         log.info("LASER EVM initialized with dynamic loader: " + str(dynamic_loader))
 
     def register_hooks(self, hook_type: str, hook_dict: Dict[str, List[Callable]]):
@@ -180,6 +184,9 @@ class LaserEVM:
             )
             log.info("Achieved {:.2f}% coverage for code: {}".format(cov, code))
 
+        if self.iprof is not None:
+            log.info("Instruction Statistics:\n{}".format(self.iprof))
+
     def _execute_transactions(self, address):
         """This function executes multiple transactions on the address based on
         the coverage.
@@ -269,9 +276,9 @@ class LaserEVM:
         self._execute_pre_hook(op_code, global_state)
         try:
             self._measure_coverage(global_state)
-            new_global_states = Instruction(op_code, self.dynamic_loader).evaluate(
-                global_state
-            )
+            new_global_states = Instruction(
+                op_code, self.dynamic_loader, self.iprof
+            ).evaluate(global_state)
 
         except VmException as e:
             transaction, return_global_state = global_state.transaction_stack.pop()
@@ -320,9 +327,8 @@ class LaserEVM:
             else:
                 # First execute the post hook for the transaction ending instruction
                 self._execute_post_hook(op_code, [end_signal.global_state])
-
                 new_global_states = self._end_message_call(
-                    return_global_state,
+                    copy(return_global_state),
                     global_state,
                     revert_changes=False or end_signal.revert,
                     return_data=transaction.return_data,
@@ -347,6 +353,8 @@ class LaserEVM:
         :param return_data:
         :return:
         """
+
+        return_global_state.mstate.constraints += global_state.mstate.constraints
         # Resume execution of the transaction initializing instruction
         op_code = return_global_state.environment.code.instruction_list[
             return_global_state.mstate.pc
@@ -361,9 +369,9 @@ class LaserEVM:
             ]
 
         # Execute the post instruction handler
-        new_global_states = Instruction(op_code, self.dynamic_loader).evaluate(
-            return_global_state, True
-        )
+        new_global_states = Instruction(
+            op_code, self.dynamic_loader, self.iprof
+        ).evaluate(return_global_state, True)
 
         # In order to get a nice call graph we need to set the nodes here
         for state in new_global_states:

mythril/mythril.py

@@ -477,6 +477,7 @@ class Mythril(object):
         max_depth=None,
         execution_timeout=None,
         create_timeout=None,
+        enable_iprof=False,
     ):
         """
 
@@ -500,6 +501,7 @@ class Mythril(object):
             max_depth=max_depth,
             execution_timeout=execution_timeout,
             create_timeout=create_timeout,
+            enable_iprof=enable_iprof,
         )
 
         return get_serializable_statespace(sym)
@@ -514,6 +516,7 @@ class Mythril(object):
         phrackify=False,
         execution_timeout=None,
         create_timeout=None,
+        enable_iprof=False,
     ):
         """
 
@@ -539,6 +542,7 @@ class Mythril(object):
             max_depth=max_depth,
             execution_timeout=execution_timeout,
             create_timeout=create_timeout,
+            enable_iprof=enable_iprof,
         )
         return generate_graph(sym, physics=enable_physics, phrackify=phrackify)
 
@@ -553,6 +557,7 @@ class Mythril(object):
         execution_timeout=None,
         create_timeout=None,
         transaction_count=None,
+        enable_iprof=False,
     ):
         """
 
@@ -585,6 +590,7 @@ class Mythril(object):
                     transaction_count=transaction_count,
                     modules=modules,
                     compulsory_statespace=False,
+                    enable_iprof=enable_iprof,
                 )
                 issues = fire_lasers(sym, modules)
             except KeyboardInterrupt:

mythril/support/loader.py

@@ -70,6 +70,11 @@ class DynLoader:
 
         log.debug("Dynld at contract " + contract_address + ": " + dependency_address)
 
+        # Ensure that dependency_address is the correct length, with 0s prepended as needed.
+        dependency_address = (
+            "0x" + "0" * (42 - len(dependency_address)) + dependency_address[2:]
+        )
+
         m = re.match(r"^(0x[0-9a-fA-F]{40})$", dependency_address)
 
         if m:

tests/report_test.py

@@ -103,7 +103,7 @@ def _assert_empty_json(changed_files, postfix=".json"):
             (TESTDATA_OUTPUTS_CURRENT / (input_file.name + postfix)).read_text()
         )
 
-        if not ordered(output_expected.items()) == ordered(output_current.items()):
+        if not ordered(output_expected) == ordered(output_current):
             expected.append(output_expected)
             actual.append(output_current)
             print("Found difference in {}".format(str(input_file)))

tests/testdata/outputs_expected/calls.sol.o.jsonv2

@@ -1 +1,132 @@
-{"issues": [{"description": {"head": "The contract executes an external message call.", "tail": "An external function call to a fixed contract address is executed. Make sure that the callee contract has been reviewed carefully."}, "extra": {}, "locations": [{"sourceMap": "661:1:0"}], "severity": "Low", "swcID": "SWC-107", "swcTitle": "Reentrancy"}, {"description": {"head": "The contract executes an external message call.", "tail": "An external function call to a fixed contract address is executed. Make sure that the callee contract has been reviewed carefully."}, "extra": {}, "locations": [{"sourceMap": "779:1:0"}], "severity": "Low", "swcID": "SWC-107", "swcTitle": "Reentrancy"}, {"description": {"head": "The contract executes an external message call.", "tail": "An external function call to a fixed contract address is executed. Make sure that the callee contract has been reviewed carefully."}, "extra": {}, "locations": [{"sourceMap": "858:1:0"}], "severity": "Low", "swcID": "SWC-107", "swcTitle": "Reentrancy"}, {"description": {"head": "A call to a user-supplied address is executed.", "tail": "The callee address of an external message call can be set by the caller. Note that the callee can contain arbitrary code and may re-enter any function in this contract. Review the business logic carefully to prevent averse effects on thecontract state."}, "extra": {}, "locations": [{"sourceMap": "912:1:0"}], "severity": "Medium", "swcID": "SWC-107", "swcTitle": "Reentrancy"}, {"description": {"head": "The return value of a message call is not checked.", "tail": "External calls return a boolean value. If the callee contract halts with an exception, 'false' is returned and execution continues in the caller. It is usually recommended to wrap external calls into a require statement to prevent unexpected states."}, "extra": {}, "locations": [{"sourceMap": "661:1:0"}], "severity": "Low", "swcID": "SWC-104", "swcTitle": "Unchecked Call Return Value"}, {"description": {"head": "The return value of a message call is not checked.", "tail": "External calls return a boolean value. If the callee contract halts with an exception, 'false' is returned and execution continues in the caller. It is usually recommended to wrap external calls into a require statement to prevent unexpected states."}, "extra": {}, "locations": [{"sourceMap": "779:1:0"}], "severity": "Low", "swcID": "SWC-104", "swcTitle": "Unchecked Call Return Value"}, {"description": {"head": "The return value of a message call is not checked.", "tail": "External calls return a boolean value. If the callee contract halts with an exception, 'false' is returned and execution continues in the caller. It is usually recommended to wrap external calls into a require statement to prevent unexpected states."}, "extra": {}, "locations": [{"sourceMap": "858:1:0"}], "severity": "Low", "swcID": "SWC-104", "swcTitle": "Unchecked Call Return Value"}, {"description": {"head": "The return value of a message call is not checked.", "tail": "External calls return a boolean value. If the callee contract halts with an exception, 'false' is returned and execution continues in the caller. It is usually recommended to wrap external calls into a require statement to prevent unexpected states."}, "extra": {}, "locations": [{"sourceMap": "912:1:0"}], "severity": "Low", "swcID": "SWC-104", "swcTitle": "Unchecked Call Return Value"}], "meta": {}, "sourceFormat": "evm-byzantium-bytecode", "sourceList": ["0x7cbb77986c6b1bf6e945cd3fba06d3ea3d28cfc49cdfdc9571ec30703ac5862f"], "sourceType": "raw-bytecode"}
+[
+    {
+        "issues": [
+            {
+                "description": {
+                    "head": "The contract executes an external message call.",
+                    "tail": "An external function call to a fixed contract address is executed. Make sure that the callee contract has been reviewed carefully."
+                },
+                "extra": {},
+                "locations": [
+                    {
+                        "sourceMap": "661:1:0"
+                    }
+                ],
+                "severity": "Low",
+                "swcID": "SWC-107",
+                "swcTitle": "Reentrancy"
+            },
+            {
+                "description": {
+                    "head": "The contract executes an external message call.",
+                    "tail": "An external function call to a fixed contract address is executed. Make sure that the callee contract has been reviewed carefully."
+                },
+                "extra": {},
+                "locations": [
+                    {
+                        "sourceMap": "779:1:0"
+                    }
+                ],
+                "severity": "Low",
+                "swcID": "SWC-107",
+                "swcTitle": "Reentrancy"
+            },
+            {
+                "description": {
+                    "head": "The contract executes an external message call.",
+                    "tail": "An external function call to a fixed contract address is executed. Make sure that the callee contract has been reviewed carefully."
+                },
+                "extra": {},
+                "locations": [
+                    {
+                        "sourceMap": "858:1:0"
+                    }
+                ],
+                "severity": "Low",
+                "swcID": "SWC-107",
+                "swcTitle": "Reentrancy"
+            },
+            {
+                "description": {
+                    "head": "A call to a user-supplied address is executed.",
+                    "tail": "The callee address of an external message call can be set by the caller. Note that the callee can contain arbitrary code and may re-enter any function in this contract. Review the business logic carefully to prevent averse effects on thecontract state."
+                },
+                "extra": {},
+                "locations": [
+                    {
+                        "sourceMap": "912:1:0"
+                    }
+                ],
+                "severity": "Medium",
+                "swcID": "SWC-107",
+                "swcTitle": "Reentrancy"
+            },
+            {
+                "description": {
+                    "head": "The return value of a message call is not checked.",
+                    "tail": "External calls return a boolean value. If the callee contract halts with an exception, 'false' is returned and execution continues in the caller. It is usually recommended to wrap external calls into a require statement to prevent unexpected states."
+                },
+                "extra": {},
+                "locations": [
+                    {
+                        "sourceMap": "661:1:0"
+                    }
+                ],
+                "severity": "Low",
+                "swcID": "SWC-104",
+                "swcTitle": "Unchecked Call Return Value"
+            },
+            {
+                "description": {
+                    "head": "The return value of a message call is not checked.",
+                    "tail": "External calls return a boolean value. If the callee contract halts with an exception, 'false' is returned and execution continues in the caller. It is usually recommended to wrap external calls into a require statement to prevent unexpected states."
+                },
+                "extra": {},
+                "locations": [
+                    {
+                        "sourceMap": "779:1:0"
+                    }
+                ],
+                "severity": "Low",
+                "swcID": "SWC-104",
+                "swcTitle": "Unchecked Call Return Value"
+            },
+            {
+                "description": {
+                    "head": "The return value of a message call is not checked.",
+                    "tail": "External calls return a boolean value. If the callee contract halts with an exception, 'false' is returned and execution continues in the caller. It is usually recommended to wrap external calls into a require statement to prevent unexpected states."
+                },
+                "extra": {},
+                "locations": [
+                    {
+                        "sourceMap": "858:1:0"
+                    }
+                ],
+                "severity": "Low",
+                "swcID": "SWC-104",
+                "swcTitle": "Unchecked Call Return Value"
+            },
+            {
+                "description": {
+                    "head": "The return value of a message call is not checked.",
+                    "tail": "External calls return a boolean value. If the callee contract halts with an exception, 'false' is returned and execution continues in the caller. It is usually recommended to wrap external calls into a require statement to prevent unexpected states."
+                },
+                "extra": {},
+                "locations": [
+                    {
+                        "sourceMap": "912:1:0"
+                    }
+                ],
+                "severity": "Low",
+                "swcID": "SWC-104",
+                "swcTitle": "Unchecked Call Return Value"
+            }
+        ],
+        "meta": {},
+        "sourceFormat": "evm-byzantium-bytecode",
+        "sourceList": [
+            "0x7cbb77986c6b1bf6e945cd3fba06d3ea3d28cfc49cdfdc9571ec30703ac5862f"
+        ],
+        "sourceType": "raw-bytecode"
+    }
+]

tests/testdata/outputs_expected/ether_send.sol.o.jsonv2

@@ -1 +1,9 @@
-{"issues": [], "meta": {}, "sourceFormat": "evm-byzantium-bytecode", "sourceList": [], "sourceType": "raw-bytecode"}
+[
+    {
+        "issues": [],
+        "meta": {},
+        "sourceFormat": "evm-byzantium-bytecode",
+        "sourceList": [],
+        "sourceType": "raw-bytecode"
+    }
+]

tests/testdata/outputs_expected/exceptions.sol.o.jsonv2

@@ -1 +1,72 @@
-{"issues": [{"description": {"head": "A reachable exception has been detected.", "tail": "It is possible to trigger an exception (opcode 0xfe). Exceptions can be caused by type errors, division by zero, out-of-bounds array access, or assert violations. Note that explicit `assert()` should only be used to check invariants. Use `require()` for regular input checking."}, "extra": {}, "locations": [{"sourceMap": "446:1:0"}], "severity": "Low", "swcID": "SWC-110", "swcTitle": "Assert Violation"}, {"description": {"head": "A reachable exception has been detected.", "tail": "It is possible to trigger an exception (opcode 0xfe). Exceptions can be caused by type errors, division by zero, out-of-bounds array access, or assert violations. Note that explicit `assert()` should only be used to check invariants. Use `require()` for regular input checking."}, "extra": {}, "locations": [{"sourceMap": "484:1:0"}], "severity": "Low", "swcID": "SWC-110", "swcTitle": "Assert Violation"}, {"description": {"head": "A reachable exception has been detected.", "tail": "It is possible to trigger an exception (opcode 0xfe). Exceptions can be caused by type errors, division by zero, out-of-bounds array access, or assert violations. Note that explicit `assert()` should only be used to check invariants. Use `require()` for regular input checking."}, "extra": {}, "locations": [{"sourceMap": "506:1:0"}], "severity": "Low", "swcID": "SWC-110", "swcTitle": "Assert Violation"}, {"description": {"head": "A reachable exception has been detected.", "tail": "It is possible to trigger an exception (opcode 0xfe). Exceptions can be caused by type errors, division by zero, out-of-bounds array access, or assert violations. Note that explicit `assert()` should only be used to check invariants. Use `require()` for regular input checking."}, "extra": {}, "locations": [{"sourceMap": "531:1:0"}], "severity": "Low", "swcID": "SWC-110", "swcTitle": "Assert Violation"}], "meta": {}, "sourceFormat": "evm-byzantium-bytecode", "sourceList": ["0x4a773a86bc6fb269f88bf09bb3094de29b6073cf13b1760e9d01d957f50a9dfd"], "sourceType": "raw-bytecode"}
+[
+    {
+        "issues": [
+            {
+                "description": {
+                    "head": "A reachable exception has been detected.",
+                    "tail": "It is possible to trigger an exception (opcode 0xfe). Exceptions can be caused by type errors, division by zero, out-of-bounds array access, or assert violations. Note that explicit `assert()` should only be used to check invariants. Use `require()` for regular input checking."
+                },
+                "extra": {},
+                "locations": [
+                    {
+                        "sourceMap": "446:1:0"
+                    }
+                ],
+                "severity": "Low",
+                "swcID": "SWC-110",
+                "swcTitle": "Assert Violation"
+            },
+            {
+                "description": {
+                    "head": "A reachable exception has been detected.",
+                    "tail": "It is possible to trigger an exception (opcode 0xfe). Exceptions can be caused by type errors, division by zero, out-of-bounds array access, or assert violations. Note that explicit `assert()` should only be used to check invariants. Use `require()` for regular input checking."
+                },
+                "extra": {},
+                "locations": [
+                    {
+                        "sourceMap": "484:1:0"
+                    }
+                ],
+                "severity": "Low",
+                "swcID": "SWC-110",
+                "swcTitle": "Assert Violation"
+            },
+            {
+                "description": {
+                    "head": "A reachable exception has been detected.",
+                    "tail": "It is possible to trigger an exception (opcode 0xfe). Exceptions can be caused by type errors, division by zero, out-of-bounds array access, or assert violations. Note that explicit `assert()` should only be used to check invariants. Use `require()` for regular input checking."
+                },
+                "extra": {},
+                "locations": [
+                    {
+                        "sourceMap": "506:1:0"
+                    }
+                ],
+                "severity": "Low",
+                "swcID": "SWC-110",
+                "swcTitle": "Assert Violation"
+            },
+            {
+                "description": {
+                    "head": "A reachable exception has been detected.",
+                    "tail": "It is possible to trigger an exception (opcode 0xfe). Exceptions can be caused by type errors, division by zero, out-of-bounds array access, or assert violations. Note that explicit `assert()` should only be used to check invariants. Use `require()` for regular input checking."
+                },
+                "extra": {},
+                "locations": [
+                    {
+                        "sourceMap": "531:1:0"
+                    }
+                ],
+                "severity": "Low",
+                "swcID": "SWC-110",
+                "swcTitle": "Assert Violation"
+            }
+        ],
+        "meta": {},
+        "sourceFormat": "evm-byzantium-bytecode",
+        "sourceList": [
+            "0x4a773a86bc6fb269f88bf09bb3094de29b6073cf13b1760e9d01d957f50a9dfd"
+        ],
+        "sourceType": "raw-bytecode"
+    }
+]

tests/testdata/outputs_expected/kinds_of_calls.sol.o.jsonv2

@@ -1 +1,87 @@
-{"issues": [{"description": {"head": "Use of callcode is deprecated.", "tail": "The callcode method executes code of another contract in the context of the caller account. Due to a bug in the implementation it does not persist sender and value over the call. It was therefore deprecated and may be removed in the future. Use the delegatecall method instead."}, "extra": {}, "locations": [{"sourceMap": "618:1:0"}], "severity": "Medium", "swcID": "SWC-111", "swcTitle": "Use of Deprecated Solidity Functions"}, {"description": {"head": "A call to a user-supplied address is executed.", "tail": "The callee address of an external message call can be set by the caller. Note that the callee can contain arbitrary code and may re-enter any function in this contract. Review the business logic carefully to prevent averse effects on thecontract state."}, "extra": {}, "locations": [{"sourceMap": "1038:1:0"}], "severity": "Medium", "swcID": "SWC-107", "swcTitle": "Reentrancy"}, {"description": {"head": "The return value of a message call is not checked.", "tail": "External calls return a boolean value. If the callee contract halts with an exception, 'false' is returned and execution continues in the caller. It is usually recommended to wrap external calls into a require statement to prevent unexpected states."}, "extra": {}, "locations": [{"sourceMap": "618:1:0"}], "severity": "Low", "swcID": "SWC-104", "swcTitle": "Unchecked Call Return Value"}, {"description": {"head": "The return value of a message call is not checked.", "tail": "External calls return a boolean value. If the callee contract halts with an exception, 'false' is returned and execution continues in the caller. It is usually recommended to wrap external calls into a require statement to prevent unexpected states."}, "extra": {}, "locations": [{"sourceMap": "849:1:0"}], "severity": "Low", "swcID": "SWC-104", "swcTitle": "Unchecked Call Return Value"}, {"description": {"head": "The return value of a message call is not checked.", "tail": "External calls return a boolean value. If the callee contract halts with an exception, 'false' is returned and execution continues in the caller. It is usually recommended to wrap external calls into a require statement to prevent unexpected states."}, "extra": {}, "locations": [{"sourceMap": "1038:1:0"}], "severity": "Low", "swcID": "SWC-104", "swcTitle": "Unchecked Call Return Value"}], "meta": {}, "sourceFormat": "evm-byzantium-bytecode", "sourceList": ["0x6daec61d05d8f1210661e7e7d1ed6d72bd6ade639398fac1e867aff50abfc1c1"], "sourceType": "raw-bytecode"}
+[
+    {
+        "issues": [
+            {
+                "description": {
+                    "head": "Use of callcode is deprecated.",
+                    "tail": "The callcode method executes code of another contract in the context of the caller account. Due to a bug in the implementation it does not persist sender and value over the call. It was therefore deprecated and may be removed in the future. Use the delegatecall method instead."
+                },
+                "extra": {},
+                "locations": [
+                    {
+                        "sourceMap": "618:1:0"
+                    }
+                ],
+                "severity": "Medium",
+                "swcID": "SWC-111",
+                "swcTitle": "Use of Deprecated Solidity Functions"
+            },
+            {
+                "description": {
+                    "head": "A call to a user-supplied address is executed.",
+                    "tail": "The callee address of an external message call can be set by the caller. Note that the callee can contain arbitrary code and may re-enter any function in this contract. Review the business logic carefully to prevent averse effects on thecontract state."
+                },
+                "extra": {},
+                "locations": [
+                    {
+                        "sourceMap": "1038:1:0"
+                    }
+                ],
+                "severity": "Medium",
+                "swcID": "SWC-107",
+                "swcTitle": "Reentrancy"
+            },
+            {
+                "description": {
+                    "head": "The return value of a message call is not checked.",
+                    "tail": "External calls return a boolean value. If the callee contract halts with an exception, 'false' is returned and execution continues in the caller. It is usually recommended to wrap external calls into a require statement to prevent unexpected states."
+                },
+                "extra": {},
+                "locations": [
+                    {
+                        "sourceMap": "618:1:0"
+                    }
+                ],
+                "severity": "Low",
+                "swcID": "SWC-104",
+                "swcTitle": "Unchecked Call Return Value"
+            },
+            {
+                "description": {
+                    "head": "The return value of a message call is not checked.",
+                    "tail": "External calls return a boolean value. If the callee contract halts with an exception, 'false' is returned and execution continues in the caller. It is usually recommended to wrap external calls into a require statement to prevent unexpected states."
+                },
+                "extra": {},
+                "locations": [
+                    {
+                        "sourceMap": "849:1:0"
+                    }
+                ],
+                "severity": "Low",
+                "swcID": "SWC-104",
+                "swcTitle": "Unchecked Call Return Value"
+            },
+            {
+                "description": {
+                    "head": "The return value of a message call is not checked.",
+                    "tail": "External calls return a boolean value. If the callee contract halts with an exception, 'false' is returned and execution continues in the caller. It is usually recommended to wrap external calls into a require statement to prevent unexpected states."
+                },
+                "extra": {},
+                "locations": [
+                    {
+                        "sourceMap": "1038:1:0"
+                    }
+                ],
+                "severity": "Low",
+                "swcID": "SWC-104",
+                "swcTitle": "Unchecked Call Return Value"
+            }
+        ],
+        "meta": {},
+        "sourceFormat": "evm-byzantium-bytecode",
+        "sourceList": [
+            "0x6daec61d05d8f1210661e7e7d1ed6d72bd6ade639398fac1e867aff50abfc1c1"
+        ],
+        "sourceType": "raw-bytecode"
+    }
+]

tests/testdata/outputs_expected/metacoin.sol.o.jsonv2

@@ -1 +1,9 @@
-{"issues": [], "meta": {}, "sourceFormat": "evm-byzantium-bytecode", "sourceList": [], "sourceType": "raw-bytecode"}
+[
+    {
+        "issues": [],
+        "meta": {},
+        "sourceFormat": "evm-byzantium-bytecode",
+        "sourceList": [],
+        "sourceType": "raw-bytecode"
+    }
+]

tests/testdata/outputs_expected/multi_contracts.sol.o.jsonv2

@@ -1 +1,27 @@
-{"issues": [{"description": {"head": "Anyone can withdraw ETH from the contract account.", "tail": "Arbitrary senders other than the contract creator can withdraw ETH from the contract account without previously having sent an equivalent amount of ETH to it. This is likely to be a vulnerability."}, "extra": {}, "locations": [{"sourceMap": "142:1:0"}], "severity": "High", "swcID": "SWC-105", "swcTitle": "Unprotected Ether Withdrawal"}], "meta": {}, "sourceFormat": "evm-byzantium-bytecode", "sourceList": ["0xbc9c3d9db56d20cf4ca3b6fd88ff9215cf728a092cca1ed8edb83272b933ff5b"], "sourceType": "raw-bytecode"}
+[
+    {
+        "issues": [
+            {
+                "description": {
+                    "head": "Anyone can withdraw ETH from the contract account.",
+                    "tail": "Arbitrary senders other than the contract creator can withdraw ETH from the contract account without previously having sent an equivalent amount of ETH to it. This is likely to be a vulnerability."
+                },
+                "extra": {},
+                "locations": [
+                    {
+                        "sourceMap": "142:1:0"
+                    }
+                ],
+                "severity": "High",
+                "swcID": "SWC-105",
+                "swcTitle": "Unprotected Ether Withdrawal"
+            }
+        ],
+        "meta": {},
+        "sourceFormat": "evm-byzantium-bytecode",
+        "sourceList": [
+            "0xbc9c3d9db56d20cf4ca3b6fd88ff9215cf728a092cca1ed8edb83272b933ff5b"
+        ],
+        "sourceType": "raw-bytecode"
+    }
+]

tests/testdata/outputs_expected/nonascii.sol.o.jsonv2

@@ -1 +1,9 @@
-{"issues": [], "meta": {}, "sourceFormat": "evm-byzantium-bytecode", "sourceList": [], "sourceType": "raw-bytecode"}
+[
+    {
+        "issues": [],
+        "meta": {},
+        "sourceFormat": "evm-byzantium-bytecode",
+        "sourceList": [],
+        "sourceType": "raw-bytecode"
+    }
+]

tests/testdata/outputs_expected/origin.sol.o.jsonv2

@@ -1 +1,27 @@
-{"issues": [{"description": {"head": "Use of tx.origin is deprecated.", "tail": "The smart contract retrieves the transaction origin (tx.origin) using msg.origin. Use of msg.origin is deprecated and the instruction may be removed in the  future. Use msg.sender instead.\nSee also: https://solidity.readthedocs.io/en/develop/security-considerations.html#tx-origin"}, "extra": {}, "locations": [{"sourceMap": "317:1:0"}], "severity": "Medium", "swcID": "SWC-111", "swcTitle": "Use of Deprecated Solidity Functions"}], "meta": {}, "sourceFormat": "evm-byzantium-bytecode", "sourceList": ["0x25b20ef097dfc0aa56a932c4e09f06ee02a69c005767df86877f48c6c2412f03"], "sourceType": "raw-bytecode"}
+[
+    {
+        "issues": [
+            {
+                "description": {
+                    "head": "Use of tx.origin is deprecated.",
+                    "tail": "The smart contract retrieves the transaction origin (tx.origin) using msg.origin. Use of msg.origin is deprecated and the instruction may be removed in the  future. Use msg.sender instead.\nSee also: https://solidity.readthedocs.io/en/develop/security-considerations.html#tx-origin"
+                },
+                "extra": {},
+                "locations": [
+                    {
+                        "sourceMap": "317:1:0"
+                    }
+                ],
+                "severity": "Medium",
+                "swcID": "SWC-111",
+                "swcTitle": "Use of Deprecated Solidity Functions"
+            }
+        ],
+        "meta": {},
+        "sourceFormat": "evm-byzantium-bytecode",
+        "sourceList": [
+            "0x25b20ef097dfc0aa56a932c4e09f06ee02a69c005767df86877f48c6c2412f03"
+        ],
+        "sourceType": "raw-bytecode"
+    }
+]

tests/testdata/outputs_expected/overflow.sol.o.jsonv2

@@ -1,40 +1,42 @@
-{
-    "issues": [
-        {
-            "description": {
-                "head": "The binary subtraction can underflow.",
-                "tail": "The operands of the subtraction operation are not sufficiently constrained. The subtraction could therefore result in an integer underflow. Prevent the underflow by checking inputs or ensure sure that the underflow is caught by an assertion."
+[
+    {
+        "issues": [
+            {
+                "description": {
+                    "head": "The binary subtraction can underflow.",
+                    "tail": "The operands of the subtraction operation are not sufficiently constrained. The subtraction could therefore result in an integer underflow. Prevent the underflow by checking inputs or ensure sure that the underflow is caught by an assertion."
+                },
+                "extra": {},
+                "locations": [
+                    {
+                        "sourceMap": "567:1:0"
+                    }
+                ],
+                "severity": "High",
+                "swcID": "SWC-101",
+                "swcTitle": "Integer Overflow and Underflow"
             },
-            "extra": {},
-            "locations": [
-                {
-                    "sourceMap": "567:1:0"
-                }
-            ],
-            "severity": "High",
-            "swcID": "SWC-101",
-            "swcTitle": "Integer Overflow and Underflow"
-        },
-        {
-            "description": {
-                "head": "The binary subtraction can underflow.",
-                "tail": "The operands of the subtraction operation are not sufficiently constrained. The subtraction could therefore result in an integer underflow. Prevent the underflow by checking inputs or ensure sure that the underflow is caught by an assertion."
-            },
-            "extra": {},
-            "locations": [
-                {
-                    "sourceMap": "649:1:0"
-                }
-            ],
-            "severity": "High",
-            "swcID": "SWC-101",
-            "swcTitle": "Integer Overflow and Underflow"
-        }
-    ],
-    "meta": {},
-    "sourceFormat": "evm-byzantium-bytecode",
-    "sourceList": [
-        "0xf230bec502569e8b7e7737616d0ad0f200c436624e3c223e5398c0615cd2d6b9"
-    ],
-    "sourceType": "raw-bytecode"
-}
+            {
+                "description": {
+                    "head": "The binary subtraction can underflow.",
+                    "tail": "The operands of the subtraction operation are not sufficiently constrained. The subtraction could therefore result in an integer underflow. Prevent the underflow by checking inputs or ensure sure that the underflow is caught by an assertion."
+                },
+                "extra": {},
+                "locations": [
+                    {
+                        "sourceMap": "649:1:0"
+                    }
+                ],
+                "severity": "High",
+                "swcID": "SWC-101",
+                "swcTitle": "Integer Overflow and Underflow"
+            }
+        ],
+        "meta": {},
+        "sourceFormat": "evm-byzantium-bytecode",
+        "sourceList": [
+            "0xf230bec502569e8b7e7737616d0ad0f200c436624e3c223e5398c0615cd2d6b9"
+        ],
+        "sourceType": "raw-bytecode"
+    }
+]

tests/testdata/outputs_expected/returnvalue.sol.o.jsonv2

@@ -1 +1,57 @@
-{"issues": [{"description": {"head": "The contract executes an external message call.", "tail": "An external function call to a fixed contract address is executed. Make sure that the callee contract has been reviewed carefully."}, "extra": {}, "locations": [{"sourceMap": "196:1:0"}], "severity": "Low", "swcID": "SWC-107", "swcTitle": "Reentrancy"}, {"description": {"head": "The contract executes an external message call.", "tail": "An external function call to a fixed contract address is executed. Make sure that the callee contract has been reviewed carefully."}, "extra": {}, "locations": [{"sourceMap": "285:1:0"}], "severity": "Low", "swcID": "SWC-107", "swcTitle": "Reentrancy"}, {"description": {"head": "The return value of a message call is not checked.", "tail": "External calls return a boolean value. If the callee contract halts with an exception, 'false' is returned and execution continues in the caller. It is usually recommended to wrap external calls into a require statement to prevent unexpected states."}, "extra": {}, "locations": [{"sourceMap": "285:1:0"}], "severity": "Low", "swcID": "SWC-104", "swcTitle": "Unchecked Call Return Value"}], "meta": {}, "sourceFormat": "evm-byzantium-bytecode", "sourceList": ["0xb191cf6cc0d8cc37a91c9d88019cc011b932169fb5776df616e2bb9cd93b4039"], "sourceType": "raw-bytecode"}
+[
+    {
+        "issues": [
+            {
+                "description": {
+                    "head": "The contract executes an external message call.",
+                    "tail": "An external function call to a fixed contract address is executed. Make sure that the callee contract has been reviewed carefully."
+                },
+                "extra": {},
+                "locations": [
+                    {
+                        "sourceMap": "196:1:0"
+                    }
+                ],
+                "severity": "Low",
+                "swcID": "SWC-107",
+                "swcTitle": "Reentrancy"
+            },
+            {
+                "description": {
+                    "head": "The contract executes an external message call.",
+                    "tail": "An external function call to a fixed contract address is executed. Make sure that the callee contract has been reviewed carefully."
+                },
+                "extra": {},
+                "locations": [
+                    {
+                        "sourceMap": "285:1:0"
+                    }
+                ],
+                "severity": "Low",
+                "swcID": "SWC-107",
+                "swcTitle": "Reentrancy"
+            },
+            {
+                "description": {
+                    "head": "The return value of a message call is not checked.",
+                    "tail": "External calls return a boolean value. If the callee contract halts with an exception, 'false' is returned and execution continues in the caller. It is usually recommended to wrap external calls into a require statement to prevent unexpected states."
+                },
+                "extra": {},
+                "locations": [
+                    {
+                        "sourceMap": "285:1:0"
+                    }
+                ],
+                "severity": "Low",
+                "swcID": "SWC-104",
+                "swcTitle": "Unchecked Call Return Value"
+            }
+        ],
+        "meta": {},
+        "sourceFormat": "evm-byzantium-bytecode",
+        "sourceList": [
+            "0xb191cf6cc0d8cc37a91c9d88019cc011b932169fb5776df616e2bb9cd93b4039"
+        ],
+        "sourceType": "raw-bytecode"
+    }
+]

tests/testdata/outputs_expected/suicide.sol.o.jsonv2

@@ -1 +1,27 @@
-{"issues": [{"description": {"head": "The contract can be killed by anyone.", "tail": "Arbitrary senders can kill this contract and withdraw its balance to their own account."}, "extra": {}, "locations": [{"sourceMap": "146:1:0"}], "severity": "High", "swcID": "SWC-106", "swcTitle": "Unprotected SELFDESTRUCT Instruction"}], "meta": {}, "sourceFormat": "evm-byzantium-bytecode", "sourceList": ["0x2fb801366b61a05b30550481a1c8f7d5f20de0b93d9f2f2ce2b28c4e322033c9"], "sourceType": "raw-bytecode"}
+[
+    {
+        "issues": [
+            {
+                "description": {
+                    "head": "The contract can be killed by anyone.",
+                    "tail": "Arbitrary senders can kill this contract and withdraw its balance to their own account."
+                },
+                "extra": {},
+                "locations": [
+                    {
+                        "sourceMap": "146:1:0"
+                    }
+                ],
+                "severity": "High",
+                "swcID": "SWC-106",
+                "swcTitle": "Unprotected SELFDESTRUCT Instruction"
+            }
+        ],
+        "meta": {},
+        "sourceFormat": "evm-byzantium-bytecode",
+        "sourceList": [
+            "0x2fb801366b61a05b30550481a1c8f7d5f20de0b93d9f2f2ce2b28c4e322033c9"
+        ],
+        "sourceType": "raw-bytecode"
+    }
+]

tests/testdata/outputs_expected/underflow.sol.o.jsonv2

@@ -1,40 +1,42 @@
-{
-    "issues": [
-        {
-            "description": {
-                "head": "The binary subtraction can underflow.",
-                "tail": "The operands of the subtraction operation are not sufficiently constrained. The subtraction could therefore result in an integer underflow. Prevent the underflow by checking inputs or ensure sure that the underflow is caught by an assertion."
+[
+    {
+        "issues": [
+            {
+                "description": {
+                    "head": "The binary subtraction can underflow.",
+                    "tail": "The operands of the subtraction operation are not sufficiently constrained. The subtraction could therefore result in an integer underflow. Prevent the underflow by checking inputs or ensure sure that the underflow is caught by an assertion."
+                },
+                "extra": {},
+                "locations": [
+                    {
+                        "sourceMap": "567:1:0"
+                    }
+                ],
+                "severity": "High",
+                "swcID": "SWC-101",
+                "swcTitle": "Integer Overflow and Underflow"
             },
-            "extra": {},
-            "locations": [
-                {
-                    "sourceMap": "567:1:0"
-                }
-            ],
-            "severity": "High",
-            "swcID": "SWC-101",
-            "swcTitle": "Integer Overflow and Underflow"
-        },
-        {
-            "description": {
-                "head": "The binary subtraction can underflow.",
-                "tail": "The operands of the subtraction operation are not sufficiently constrained. The subtraction could therefore result in an integer underflow. Prevent the underflow by checking inputs or ensure sure that the underflow is caught by an assertion."
-            },
-            "extra": {},
-            "locations": [
-                {
-                    "sourceMap": "649:1:0"
-                }
-            ],
-            "severity": "High",
-            "swcID": "SWC-101",
-            "swcTitle": "Integer Overflow and Underflow"
-        }
-    ],
-    "meta": {},
-    "sourceFormat": "evm-byzantium-bytecode",
-    "sourceList": [
-        "0xabef56740bf7795a9f8732e4781ebd27f2977f8a4997e3ff11cee79a4ba6c0ce"
-    ],
-    "sourceType": "raw-bytecode"
-}
+            {
+                "description": {
+                    "head": "The binary subtraction can underflow.",
+                    "tail": "The operands of the subtraction operation are not sufficiently constrained. The subtraction could therefore result in an integer underflow. Prevent the underflow by checking inputs or ensure sure that the underflow is caught by an assertion."
+                },
+                "extra": {},
+                "locations": [
+                    {
+                        "sourceMap": "649:1:0"
+                    }
+                ],
+                "severity": "High",
+                "swcID": "SWC-101",
+                "swcTitle": "Integer Overflow and Underflow"
+            }
+        ],
+        "meta": {},
+        "sourceFormat": "evm-byzantium-bytecode",
+        "sourceList": [
+            "0xabef56740bf7795a9f8732e4781ebd27f2977f8a4997e3ff11cee79a4ba6c0ce"
+        ],
+        "sourceType": "raw-bytecode"
+    }
+]