Merge master into type-hints

6 years ago · 187285a6f3
parent 3ceec9dee0 0638fd6a7f
commit 187285a6f3
34 changed files with 123 additions and 87 deletions
--- a/16
+++ b/16
@ -1,7 +1,5 @@
 FROM ubuntu:bionic

-COPY . /opt/mythril
-
 RUN apt-get update \
  && apt-get install -y \
     build-essential \
@ -18,14 +16,20 @@ RUN apt-get update \
     python3-dev \
     pandoc \
     git \
-  && ln -s /usr/bin/python3 /usr/local/bin/python \
-  && cd /opt/mythril \
-  && pip3 install -r requirements.txt \
-  && python setup.py install
+  && ln -s /usr/bin/python3 /usr/local/bin/python
+
+COPY ./requirements.txt /opt/mythril/requirements.txt
+
+RUN cd /opt/mythril \
+  && pip3 install -r requirements.txt

 RUN locale-gen en_US.UTF-8
 ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US.en
 ENV LC_ALL en_US.UTF-8

+COPY . /opt/mythril
+RUN cd /opt/mythril \
+  && python setup.py install
+
 ENTRYPOINT ["/usr/local/bin/myth"]
--- a/mythril/analysis/modules/deprecated_ops.py
+++ b/mythril/analysis/modules/deprecated_ops.py
@ -24,7 +24,7 @@ def execute(statespace):
            instruction = state.get_current_instruction()

            if instruction['opcode'] == "ORIGIN":
-                description = "Function %s retrieves the transaction origin (tx.origin) using the ORIGIN opcode. " \
+                description = "The function `{}` retrieves the transaction origin (tx.origin) using the ORIGIN opcode. " \
                              "Use msg.sender instead.\nSee also: " \
                              "https://solidity.readthedocs.io/en/develop/security-considerations.html#tx-origin".format(node.function_name)

--- a/mythril/analysis/modules/multiple_sends.py
+++ b/mythril/analysis/modules/multiple_sends.py
@ -25,8 +25,8 @@ def execute(statespace):
                          swc_id=MULTIPLE_SENDS, title="Multiple Calls", _type="Informational")

            issue.description = \
-                "Multiple sends exist in one transaction, try to isolate each external call into its own transaction." \
-                " As external calls can fail accidentally or deliberately.\nConsecutive calls: \n"
+                "Multiple sends exist in one transaction. Try to isolate each external call into its own transaction," \
+                " as external calls can fail accidentally or deliberately.\nConsecutive calls: \n"

            for finding in findings:
                issue.description += \
--- a/mythril/analysis/modules/transaction_order_dependence.py
+++ b/mythril/analysis/modules/transaction_order_dependence.py
@ -112,7 +112,7 @@ def _get_influencing_sstores(statespace, interesting_storages):
        index, value = sstore_state.mstate.stack[-1], sstore_state.mstate.stack[-2]
        try:
            index = util.get_concrete_int(index)
-        except AttributeError:
+        except TypeError:
            index = str(index)
        if "storage_{}".format(index) not in interesting_storages:
            continue
--- a/mythril/analysis/ops.py
+++ b/mythril/analysis/ops.py
@ -21,7 +21,7 @@ class Variable:
 def get_variable(i):
    try:
        return Variable(util.get_concrete_int(i), VarType.CONCRETE)
-    except AttributeError:
+    except TypeError:
        return Variable(simplify(i), VarType.SYMBOLIC)


--- a/mythril/analysis/templates/callgraph.html
+++ b/mythril/analysis/templates/callgraph.html
@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title> Laser - Call Graph</title>
+    <title>Call Graph</title>
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/vis/4.21.0/vis.min.css" integrity="sha256-iq5ygGJ7021Pi7H5S+QAUXCPUfaBzfqeplbg/KlEssg=" crossorigin="anonymous" />
    <script src="https://cdnjs.cloudflare.com/ajax/libs/vis/4.21.0/vis.min.js" integrity="sha256-JuQeAGbk9rG/EoRMixuy5X8syzICcvB0dj3KindZkY0=" crossorigin="anonymous"></script>

--- a/mythril/disassembler/disassembly.py
+++ b/mythril/disassembler/disassembly.py
@ -20,10 +20,16 @@ class Disassembly(object):

        # Parse jump table & resolve function names

-        jmptable_indices = asm.find_opcode_sequence(["PUSH4", "EQ"], self.instruction_list)
+        # Need to take from PUSH1 to PUSH4 because solc seems to remove excess 0s at the beginning for optimizing
+        jmptable_indices = asm.find_opcode_sequence([("PUSH1", "PUSH2", "PUSH3", "PUSH4"), ("EQ",)],
+                                                    self.instruction_list)

        for i in jmptable_indices:
            func_hash = self.instruction_list[i]['argument']
+
+            # Append with missing 0s at the beginning
+            func_hash = "0x" + func_hash[2:].rjust(8, "0")
+
            self.func_hashes.append(func_hash)
            try:
                # tries local cache, file and optional online lookup
--- a/mythril/ether/asm.py
+++ b/mythril/ether/asm.py
@ -70,13 +70,13 @@ def find_opcode_sequence(pattern, instruction_list):

    for i in range(0, len(instruction_list) - pattern_length + 1):

-        if instruction_list[i]['opcode'] == pattern[0]:
+        if instruction_list[i]['opcode'] in pattern[0]:

            matched = True

            for j in range(1, len(pattern)):

-                if not (instruction_list[i + j]['opcode'] == pattern[j]):
+                if not (instruction_list[i + j]['opcode'] in pattern[j]):
                    matched = False
                    break

--- a/mythril/ether/ethcontract.py
+++ b/mythril/ether/ethcontract.py
@ -12,8 +12,8 @@ class ETHContract(persistent.Persistent):
        # Dynamic contract addresses of the format __[contract-name]_____________ are replaced with a generic address
        # Apply this for creation_code & code

-        creation_code = re.sub(r'(_+.*_+)', 'aa' * 20, creation_code)
-        code = re.sub(r'(_+.*_+)', 'aa' * 20, code)
+        creation_code = re.sub(r'(_{2}.{38})', 'aa' * 20, creation_code)
+        code = re.sub(r'(_{2}.{38})', 'aa' * 20, code)

        self.creation_code = creation_code
        self.name = name
--- a/mythril/laser/ethereum/call.py
+++ b/mythril/laser/ethereum/call.py
@ -49,7 +49,7 @@ def get_callee_address(global_state: GlobalState, dynamic_loader: DynLoader, sym

    try:
        callee_address = hex(util.get_concrete_int(symbolic_to_address))
-    except AttributeError:
+    except TypeError:
        logging.debug("Symbolic call encountered")

        match = re.search(r'storage_(\d+)', str(simplify(symbolic_to_address)))
@ -64,6 +64,7 @@ def get_callee_address(global_state: GlobalState, dynamic_loader: DynLoader, sym
        # attempt to read the contract address from instance storage
        try:
            callee_address = dynamic_loader.read_storage(environment.active_account.address, index)
+        # TODO: verify whether this happens or not
        except:
            logging.debug("Error accessing contract storage.")
            raise ValueError
@ -136,7 +137,7 @@ def get_call_data(
            call_data += [0] * (32 - len(call_data))
        call_data_type = CalldataType.CONCRETE
        logging.debug("Calldata: " + str(call_data))
-    except AttributeError:
+    except TypeError:
        logging.info("Unsupported symbolic calldata offset")
        call_data_type = CalldataType.SYMBOLIC
        call_data = []
--- a/mythril/laser/ethereum/instructions.py
+++ b/mythril/laser/ethereum/instructions.py
@ -177,7 +177,7 @@ class Instruction:
                result = simplify(Concat(BitVecVal(0, 248), Extract(offset + 7, offset, op1)))
            else:
                result = 0
-        except AttributeError:
+        except TypeError:
            logging.debug("BYTE: Unsupported symbolic byte offset")
            result = global_state.new_bitvec(str(simplify(op1)) + "[" + str(simplify(op0)) + "]", 256)

@ -267,6 +267,8 @@ class Instruction:
        try:
            s0 = util.get_concrete_int(s0)
            s1 = util.get_concrete_int(s1)
+        except TypeError:
+            return []

        if s0 <= 31:
            testbit = s0 * 8 + 7
@ -276,9 +278,6 @@ class Instruction:
                state.stack.append(s1 & ((1 << testbit) - 1))
        else:
            state.stack.append(s1)
-            # TODO: broad exception handler
-        except:
-            return []

        return [global_state]

@ -358,7 +357,7 @@ class Instruction:
        try:
            offset = util.get_concrete_int(simplify(op0))
            b = environment.calldata[offset]
-        except AttributeError:
+        except TypeError:
            logging.debug("CALLDATALOAD: Unsupported symbolic index")
            state.stack.append(global_state.new_bitvec(
                "calldata_" + str(environment.active_account.contract_name) + "[" + str(simplify(op0)) + "]", 256))
@ -370,16 +369,15 @@ class Instruction:
            return [global_state]

        if type(b) == int:
-            val = b''

            try:
-                for i in range(offset, offset + 32):
-                    val += environment.calldata[i].to_bytes(1, byteorder='big')
+                val = b''.join([calldata.to_bytes(1, byteorder='big') for calldata in
+                                environment.calldata[offset:offset+32]])

                logging.debug("Final value: " + str(int.from_bytes(val, byteorder='big')))
                state.stack.append(BitVecVal(int.from_bytes(val, byteorder='big'), 256))
-            # FIXME: broad exception catch
-            except:
+
+            except (TypeError, AttributeError):
                state.stack.append(global_state.new_bitvec(
                    "calldata_" + str(environment.active_account.contract_name) + "[" + str(simplify(op0)) + "]", 256))
        else:
@ -407,16 +405,14 @@ class Instruction:

        try:
            mstart = util.get_concrete_int(op0)
-            # FIXME: broad exception catch
-        except:
+        except TypeError:
            logging.debug("Unsupported symbolic memory offset in CALLDATACOPY")
            return [global_state]

        dstart_sym = False
        try:
            dstart = util.get_concrete_int(op1)
-            # FIXME: broad exception catch
-        except:
+        except TypeError:
            logging.debug("Unsupported symbolic calldata offset in CALLDATACOPY")
            dstart = simplify(op1)
            dstart_sym = True
@ -424,8 +420,7 @@ class Instruction:
        size_sym = False
        try:
            size = util.get_concrete_int(op2)
-            # FIXME: broad exception catch
-        except:
+        except TypeError:
            logging.debug("Unsupported symbolic size in CALLDATACOPY")
            size = simplify(op2)
            size_sym = True
@ -440,8 +435,7 @@ class Instruction:
        if size > 0:
            try:
                state.mem_extend(mstart, size)
-            # FIXME: broad exception catch
-            except:
+            except TypeError:
                logging.debug("Memory allocation error: mstart = " + str(mstart) + ", size = " + str(size))
                state.mem_extend(mstart, 1)
                state.memory[mstart] = global_state.new_bitvec(
@ -455,7 +449,7 @@ class Instruction:
                for i in range(mstart, mstart + size):
                    state.memory[i] = environment.calldata[i_data]
                    i_data += 1
-            except:
+            except IndexError:
                logging.debug("Exception copying calldata to memory")

                state.memory[mstart] = global_state.new_bitvec(
@ -510,8 +504,7 @@ class Instruction:

        try:
            index, length = util.get_concrete_int(op0), util.get_concrete_int(op1)
-        # FIXME: broad exception catch
-        except:
+        except TypeError:
            # Can't access symbolic memory offsets
            if is_expr(op0):
                op0 = simplify(op0)
@ -523,7 +516,7 @@ class Instruction:
            data = b''.join([util.get_concrete_int(i).to_bytes(1, byteorder='big')
                             for i in state.memory[index: index + length]])

-        except AttributeError:
+        except TypeError:
            argument = str(state.memory[index]).replace(" ", "_")

            result = BitVec("KECCAC[{}]".format(argument), 256)
@ -548,14 +541,14 @@ class Instruction:

        try:
            concrete_memory_offset = helper.get_concrete_int(memory_offset)
-        except AttributeError:
+        except TypeError:
            logging.debug("Unsupported symbolic memory offset in CODECOPY")
            return [global_state]

        try:
            concrete_size = helper.get_concrete_int(size)
            global_state.mstate.mem_extend(concrete_memory_offset, concrete_size)
-        except:
+        except TypeError:
            # except both attribute error and Exception
            global_state.mstate.mem_extend(concrete_memory_offset, 1)
            global_state.mstate.memory[concrete_memory_offset] = \
@ -564,7 +557,7 @@ class Instruction:

        try:
            concrete_code_offset = helper.get_concrete_int(code_offset)
-        except AttributeError:
+        except TypeError:
            logging.debug("Unsupported symbolic code offset in CODECOPY")
            global_state.mstate.mem_extend(concrete_memory_offset, concrete_size)
            for i in range(concrete_size):
@ -598,7 +591,7 @@ class Instruction:
        environment = global_state.environment
        try:
            addr = hex(helper.get_concrete_int(addr))
-        except AttributeError:
+        except TypeError:
            logging.info("unsupported symbolic address for EXTCODESIZE")
            state.stack.append(global_state.new_bitvec("extcodesize_" + str(addr), 256))
            return [global_state]
@ -672,7 +665,7 @@ class Instruction:

        try:
            offset = util.get_concrete_int(op0)
-        except AttributeError:
+        except TypeError:
            logging.debug("Can't MLOAD from symbolic index")
            data = global_state.new_bitvec("mem[" + str(simplify(op0)) + "]", 256)
            state.stack.append(data)
@ -697,7 +690,7 @@ class Instruction:

        try:
            mstart = util.get_concrete_int(op0)
-        except AttributeError:
+        except TypeError:
            logging.debug("MSTORE to symbolic index. Not supported")
            return [global_state]

@ -710,17 +703,15 @@ class Instruction:

        try:
            # Attempt to concretize value
+
            _bytes = util.concrete_int_to_bytes(value)

-            i = 0
+            state.memory[mstart:mstart+len(_bytes)] = _bytes

-            for b in _bytes:
-                state.memory[mstart + i] = _bytes[i]
-                i += 1
-        except:
+        except (AttributeError, TypeError):
            try:
                state.memory[mstart] = value
-            except:
+            except TypeError:
                logging.debug("Invalid memory access")

        return [global_state]
@ -732,7 +723,7 @@ class Instruction:

        try:
            offset = util.get_concrete_int(op0)
-        except AttributeError:
+        except TypeError:
            logging.debug("MSTORE to symbolic index. Not supported")
            return [global_state]

@ -753,7 +744,7 @@ class Instruction:
            index = util.get_concrete_int(index)
            return self._sload_helper(global_state, index)

-        except AttributeError:
+        except TypeError:
            if not keccak_function_manager.is_keccak(index):
                return self._sload_helper(global_state, str(index))

@ -815,7 +806,7 @@ class Instruction:
        try:
            index = util.get_concrete_int(index)
            return self._sstore_helper(global_state, index, value)
-        except AttributeError:
+        except TypeError:
            is_keccak = keccak_function_manager.is_keccak(index)
            if not is_keccak:
                return self._sstore_helper(global_state, str(index), value)
@ -869,7 +860,7 @@ class Instruction:
        disassembly = global_state.environment.code
        try:
            jump_addr = util.get_concrete_int(state.stack.pop())
-        except AttributeError:
+        except TypeError:
            raise InvalidJumpDestination("Invalid jump argument (symbolic address)")
        except IndexError:
            raise StackUnderflowException()
@ -899,8 +890,7 @@ class Instruction:

        try:
            jump_addr = util.get_concrete_int(op0)
-            # FIXME: to broad exception handler
-        except:
+        except TypeError:
            logging.debug("Skipping JUMPI to invalid destination.")
            global_state.mstate.pc += 1
            return [global_state]
@ -980,7 +970,7 @@ class Instruction:
        return_data = [global_state.new_bitvec("return_data", 256)]
        try:
            return_data = state.memory[util.get_concrete_int(offset):util.get_concrete_int(offset + length)]
-        except AttributeError:
+        except TypeError:
            logging.debug("Return with symbolic length or offset. Not supported")
        global_state.current_transaction.end(global_state, return_data)

@ -1013,7 +1003,7 @@ class Instruction:
        return_data = [global_state.new_bitvec("return_data", 256)]
        try:
            return_data = state.memory[util.get_concrete_int(offset):util.get_concrete_int(offset + length)]
-        except AttributeError:
+        except TypeError:
            logging.debug("Return with symbolic length or offset. Not supported")
        global_state.current_transaction.end(global_state, return_data=return_data, revert=True)

@ -1057,7 +1047,7 @@ class Instruction:
            try:
                mem_out_start = helper.get_concrete_int(memory_out_offset)
                mem_out_sz = memory_out_size.as_long()
-            except AttributeError:
+            except TypeError:
                logging.debug("CALL with symbolic start or offset not supported")
                return [global_state]

@ -1114,7 +1104,7 @@ class Instruction:
        try:
            memory_out_offset = util.get_concrete_int(memory_out_offset) if isinstance(memory_out_offset, ExprRef) else memory_out_offset
            memory_out_size = util.get_concrete_int(memory_out_size) if isinstance(memory_out_size, ExprRef) else memory_out_size
-        except AttributeError:
+        except TypeError:
            global_state.mstate.stack.append(global_state.new_bitvec("retval_" + str(instr['address']), 256))
            return [global_state]

@ -1182,7 +1172,7 @@ class Instruction:
        try:
            memory_out_offset = util.get_concrete_int(memory_out_offset) if isinstance(memory_out_offset, ExprRef) else memory_out_offset
            memory_out_size = util.get_concrete_int(memory_out_size) if isinstance(memory_out_size, ExprRef) else memory_out_size
-        except AttributeError:
+        except TypeError:
            global_state.mstate.stack.append(global_state.new_bitvec("retval_" + str(instr['address']), 256))
            return [global_state]

@ -1254,7 +1244,7 @@ class Instruction:
                                                                                       ExprRef) else memory_out_offset
            memory_out_size = util.get_concrete_int(memory_out_size) if isinstance(memory_out_size,
                                                                                   ExprRef) else memory_out_size
-        except AttributeError:
+        except TypeError:
            global_state.mstate.stack.append(global_state.new_bitvec("retval_" + str(instr['address']), 256))
            return [global_state]

--- a/mythril/laser/ethereum/taint_analysis.py
+++ b/mythril/laser/ethereum/taint_analysis.py
@ -224,7 +224,7 @@ class TaintRunner:
        _ = record.stack.pop()
        try:
            index = helper.get_concrete_int(op0)
-        except AttributeError:
+        except TypeError:
            logging.debug("Can't MLOAD taint track symbolically")
            record.stack.append(False)
            return
@ -236,7 +236,7 @@ class TaintRunner:
        _, value_taint = record.stack.pop(), record.stack.pop()
        try:
            index = helper.get_concrete_int(op0)
-        except AttributeError:
+        except TypeError:
            logging.debug("Can't mstore taint track symbolically")
            return

@ -247,7 +247,7 @@ class TaintRunner:
        _ = record.stack.pop()
        try:
            index = helper.get_concrete_int(op0)
-        except AttributeError:
+        except TypeError:
            logging.debug("Can't MLOAD taint track symbolically")
            record.stack.append(False)
            return
@ -259,7 +259,7 @@ class TaintRunner:
        _, value_taint = record.stack.pop(), record.stack.pop()
        try:
            index = helper.get_concrete_int(op0)
-        except AttributeError:
+        except TypeError:
            logging.debug("Can't mstore taint track symbolically")
            return

--- a/mythril/laser/ethereum/transaction/transaction_models.py
+++ b/mythril/laser/ethereum/transaction/transaction_models.py
@ -133,7 +133,7 @@ class ContractCreationTransaction:
        return global_state

    def end(self, global_state: GlobalState, return_data=None, revert=False) -> None:
-        if not all([isinstance(element, int) for element in return_data]):
+        if not all([isinstance(element, int) for element in return_data]) or len(return_data) == 0:
            self.return_data = None
            raise TransactionEndSignal(global_state)

@ -141,5 +141,6 @@ class ContractCreationTransaction:

        global_state.environment.active_account.code = Disassembly(contract_code)
        self.return_data = global_state.environment.active_account.address
+        assert global_state.environment.active_account.code.instruction_list != []

        raise TransactionEndSignal(global_state, revert=revert)
--- a/mythril/laser/ethereum/util.py
+++ b/mythril/laser/ethereum/util.py
@ -74,9 +74,12 @@ def get_concrete_int(item: Union[int, BitVecNumRef, BoolRef]) -> int:
        elif is_true(simplified):
            return 1
        else:
-            raise ValueError("Symbolic boolref encountered")
+            raise TypeError("Symbolic boolref encountered")

+    try:
        return simplify(item).as_long()
+    except AttributeError:
+        raise TypeError("Got a symbolic BitVecRef")


 def concrete_int_from_bytes(_bytes: bytes, start_index: int) -> int:
--- a/mythril/support/truffle.py
+++ b/mythril/support/truffle.py
@ -40,7 +40,7 @@ def analyze_truffle_project(sigs, args):
            if len(bytecode) < 4:
                continue

-            sigs.import_from_solidity_source(contractdata['sourcePath'])
+            sigs.import_from_solidity_source(contractdata['sourcePath'], solc_args=args.solc_args)
            sigs.write()

            ethcontract = ETHContract(bytecode, name=name)
--- a/static/Ownable.html
+++ b/static/Ownable.html
@ -1,5 +1,7 @@
+<!DOCTYPE html>
 <html>
 <head>
+  <title>Call Graph</title>
  <style type="text/css">
   #mynetwork {
    background-color: #232625;
--- a/static/assertions.html
+++ b/static/assertions.html
@ -1,6 +1,7 @@
+<!DOCTYPE html>
 <html>
 <head>
-
+  <title>Call Graph</title>

  <style type="text/css">
   #mynetwork {
--- a/static/mythril.html
+++ b/static/mythril.html
@ -1,5 +1,7 @@
+<!DOCTYPE html>
 <html>
 <head>
+  <title>Call Graph</title>
  <style type="text/css">
   #mynetwork {
    background-color: #232625;
--- a/tests/testdata/outputs_expected/calls.sol.o.graph.html
+++ b/tests/testdata/outputs_expected/calls.sol.o.graph.html
@ -1,5 +1,7 @@
+<!DOCTYPE html>
 <html>
 <head>
+    <title>Call Graph</title>
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/vis/4.21.0/vis.min.css" integrity="sha256-iq5ygGJ7021Pi7H5S+QAUXCPUfaBzfqeplbg/KlEssg=" crossorigin="anonymous" />
    <script src="https://cdnjs.cloudflare.com/ajax/libs/vis/4.21.0/vis.min.js" integrity="sha256-JuQeAGbk9rG/EoRMixuy5X8syzICcvB0dj3KindZkY0=" crossorigin="anonymous"></script>

--- a/tests/testdata/outputs_expected/environments.sol.o.graph.html
+++ b/tests/testdata/outputs_expected/environments.sol.o.graph.html
@ -1,5 +1,7 @@
+<!DOCTYPE html>
 <html>
 <head>
+    <title>Call Graph</title>
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/vis/4.21.0/vis.min.css" integrity="sha256-iq5ygGJ7021Pi7H5S+QAUXCPUfaBzfqeplbg/KlEssg=" crossorigin="anonymous" />
    <script src="https://cdnjs.cloudflare.com/ajax/libs/vis/4.21.0/vis.min.js" integrity="sha256-JuQeAGbk9rG/EoRMixuy5X8syzICcvB0dj3KindZkY0=" crossorigin="anonymous"></script>

--- a/tests/testdata/outputs_expected/ether_send.sol.o.graph.html
+++ b/tests/testdata/outputs_expected/ether_send.sol.o.graph.html
@ -1,5 +1,7 @@
+<!DOCTYPE html>
 <html>
 <head>
+    <title>Call Graph</title>
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/vis/4.21.0/vis.min.css" integrity="sha256-iq5ygGJ7021Pi7H5S+QAUXCPUfaBzfqeplbg/KlEssg=" crossorigin="anonymous" />
    <script src="https://cdnjs.cloudflare.com/ajax/libs/vis/4.21.0/vis.min.js" integrity="sha256-JuQeAGbk9rG/EoRMixuy5X8syzICcvB0dj3KindZkY0=" crossorigin="anonymous"></script>

--- a/tests/testdata/outputs_expected/exceptions.sol.o.graph.html
+++ b/tests/testdata/outputs_expected/exceptions.sol.o.graph.html
@ -1,5 +1,7 @@
+<!DOCTYPE html>
 <html>
 <head>
+    <title>Call Graph</title>
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/vis/4.21.0/vis.min.css" integrity="sha256-iq5ygGJ7021Pi7H5S+QAUXCPUfaBzfqeplbg/KlEssg=" crossorigin="anonymous" />
    <script src="https://cdnjs.cloudflare.com/ajax/libs/vis/4.21.0/vis.min.js" integrity="sha256-JuQeAGbk9rG/EoRMixuy5X8syzICcvB0dj3KindZkY0=" crossorigin="anonymous"></script>

--- a/tests/testdata/outputs_expected/kinds_of_calls.sol.o.graph.html
+++ b/tests/testdata/outputs_expected/kinds_of_calls.sol.o.graph.html
@ -1,5 +1,7 @@
+<!DOCTYPE html>
 <html>
 <head>
+    <title>Call Graph</title>
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/vis/4.21.0/vis.min.css" integrity="sha256-iq5ygGJ7021Pi7H5S+QAUXCPUfaBzfqeplbg/KlEssg=" crossorigin="anonymous" />
    <script src="https://cdnjs.cloudflare.com/ajax/libs/vis/4.21.0/vis.min.js" integrity="sha256-JuQeAGbk9rG/EoRMixuy5X8syzICcvB0dj3KindZkY0=" crossorigin="anonymous"></script>

--- a/tests/testdata/outputs_expected/metacoin.sol.o.graph.html
+++ b/tests/testdata/outputs_expected/metacoin.sol.o.graph.html
@ -1,5 +1,7 @@
+<!DOCTYPE html>
 <html>
 <head>
+    <title>Call Graph</title>
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/vis/4.21.0/vis.min.css" integrity="sha256-iq5ygGJ7021Pi7H5S+QAUXCPUfaBzfqeplbg/KlEssg=" crossorigin="anonymous" />
    <script src="https://cdnjs.cloudflare.com/ajax/libs/vis/4.21.0/vis.min.js" integrity="sha256-JuQeAGbk9rG/EoRMixuy5X8syzICcvB0dj3KindZkY0=" crossorigin="anonymous"></script>

--- a/tests/testdata/outputs_expected/multi_contracts.sol.o.graph.html
+++ b/tests/testdata/outputs_expected/multi_contracts.sol.o.graph.html
@ -1,5 +1,7 @@
+<!DOCTYPE html>
 <html>
 <head>
+    <title>Call Graph</title>
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/vis/4.21.0/vis.min.css" integrity="sha256-iq5ygGJ7021Pi7H5S+QAUXCPUfaBzfqeplbg/KlEssg=" crossorigin="anonymous" />
    <script src="https://cdnjs.cloudflare.com/ajax/libs/vis/4.21.0/vis.min.js" integrity="sha256-JuQeAGbk9rG/EoRMixuy5X8syzICcvB0dj3KindZkY0=" crossorigin="anonymous"></script>

--- a/tests/testdata/outputs_expected/nonascii.sol.o.graph.html
+++ b/tests/testdata/outputs_expected/nonascii.sol.o.graph.html
@ -1,5 +1,7 @@
+<!DOCTYPE html>
 <html>
 <head>
+    <title>Call Graph</title>
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/vis/4.21.0/vis.min.css" integrity="sha256-iq5ygGJ7021Pi7H5S+QAUXCPUfaBzfqeplbg/KlEssg=" crossorigin="anonymous" />
    <script src="https://cdnjs.cloudflare.com/ajax/libs/vis/4.21.0/vis.min.js" integrity="sha256-JuQeAGbk9rG/EoRMixuy5X8syzICcvB0dj3KindZkY0=" crossorigin="anonymous"></script>

--- a/tests/testdata/outputs_expected/origin.sol.o.graph.html
+++ b/tests/testdata/outputs_expected/origin.sol.o.graph.html
@ -1,5 +1,7 @@
+<!DOCTYPE html>
 <html>
 <head>
+    <title>Call Graph</title>
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/vis/4.21.0/vis.min.css" integrity="sha256-iq5ygGJ7021Pi7H5S+QAUXCPUfaBzfqeplbg/KlEssg=" crossorigin="anonymous" />
    <script src="https://cdnjs.cloudflare.com/ajax/libs/vis/4.21.0/vis.min.js" integrity="sha256-JuQeAGbk9rG/EoRMixuy5X8syzICcvB0dj3KindZkY0=" crossorigin="anonymous"></script>

--- a/tests/testdata/outputs_expected/origin.sol.o.json
+++ b/tests/testdata/outputs_expected/origin.sol.o.json
@ -1 +1 @@
-{"error": null, "issues": [{"address": 317, "contract": "Unknown", "debug": "<DEBUG-DATA>", "description": "Function %s retrieves the transaction origin (tx.origin) using the ORIGIN opcode. Use msg.sender instead.\nSee also: https://solidity.readthedocs.io/en/develop/security-considerations.html#tx-origin", "function": "transferOwnership(address)", "swc_id": "115", "title": "Use of tx.origin", "type": "Warning"}], "success": true}
+{"error": null, "issues": [{"address": 317, "contract": "Unknown", "debug": "<DEBUG-DATA>", "description": "The function `transferOwnership(address)` retrieves the transaction origin (tx.origin) using the ORIGIN opcode. Use msg.sender instead.\nSee also: https://solidity.readthedocs.io/en/develop/security-considerations.html#tx-origin", "function": "transferOwnership(address)", "swc_id": "115", "title": "Use of tx.origin", "type": "Warning"}], "success": true}
--- a/tests/testdata/outputs_expected/origin.sol.o.markdown
+++ b/tests/testdata/outputs_expected/origin.sol.o.markdown
@ -9,5 +9,5 @@

 ### Description

-Function %s retrieves the transaction origin (tx.origin) using the ORIGIN opcode. Use msg.sender instead.
+The function `transferOwnership(address)` retrieves the transaction origin (tx.origin) using the ORIGIN opcode. Use msg.sender instead.
 See also: https://solidity.readthedocs.io/en/develop/security-considerations.html#tx-origin
--- a/tests/testdata/outputs_expected/origin.sol.o.text
+++ b/tests/testdata/outputs_expected/origin.sol.o.text
@ -4,7 +4,7 @@ Type: Warning
 Contract: Unknown
 Function name: transferOwnership(address)
 PC address: 317
-Function %s retrieves the transaction origin (tx.origin) using the ORIGIN opcode. Use msg.sender instead.
+The function `transferOwnership(address)` retrieves the transaction origin (tx.origin) using the ORIGIN opcode. Use msg.sender instead.
 See also: https://solidity.readthedocs.io/en/develop/security-considerations.html#tx-origin
 --------------------

--- a/tests/testdata/outputs_expected/overflow.sol.o.graph.html
+++ b/tests/testdata/outputs_expected/overflow.sol.o.graph.html
@ -1,5 +1,7 @@
+<!DOCTYPE html>
 <html>
 <head>
+    <title>Call Graph</title>
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/vis/4.21.0/vis.min.css" integrity="sha256-iq5ygGJ7021Pi7H5S+QAUXCPUfaBzfqeplbg/KlEssg=" crossorigin="anonymous" />
    <script src="https://cdnjs.cloudflare.com/ajax/libs/vis/4.21.0/vis.min.js" integrity="sha256-JuQeAGbk9rG/EoRMixuy5X8syzICcvB0dj3KindZkY0=" crossorigin="anonymous"></script>

--- a/tests/testdata/outputs_expected/returnvalue.sol.o.graph.html
+++ b/tests/testdata/outputs_expected/returnvalue.sol.o.graph.html
@ -1,5 +1,7 @@
+<!DOCTYPE html>
 <html>
 <head>
+    <title>Call Graph</title>
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/vis/4.21.0/vis.min.css" integrity="sha256-iq5ygGJ7021Pi7H5S+QAUXCPUfaBzfqeplbg/KlEssg=" crossorigin="anonymous" />
    <script src="https://cdnjs.cloudflare.com/ajax/libs/vis/4.21.0/vis.min.js" integrity="sha256-JuQeAGbk9rG/EoRMixuy5X8syzICcvB0dj3KindZkY0=" crossorigin="anonymous"></script>

--- a/tests/testdata/outputs_expected/suicide.sol.o.graph.html
+++ b/tests/testdata/outputs_expected/suicide.sol.o.graph.html
@ -1,5 +1,7 @@
+<!DOCTYPE html>
 <html>
 <head>
+    <title>Call Graph</title>
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/vis/4.21.0/vis.min.css" integrity="sha256-iq5ygGJ7021Pi7H5S+QAUXCPUfaBzfqeplbg/KlEssg=" crossorigin="anonymous" />
    <script src="https://cdnjs.cloudflare.com/ajax/libs/vis/4.21.0/vis.min.js" integrity="sha256-JuQeAGbk9rG/EoRMixuy5X8syzICcvB0dj3KindZkY0=" crossorigin="anonymous"></script>

--- a/tests/testdata/outputs_expected/underflow.sol.o.graph.html
+++ b/tests/testdata/outputs_expected/underflow.sol.o.graph.html
@ -1,5 +1,7 @@
+<!DOCTYPE html>
 <html>
 <head>
+    <title>Call Graph</title>
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/vis/4.21.0/vis.min.css" integrity="sha256-iq5ygGJ7021Pi7H5S+QAUXCPUfaBzfqeplbg/KlEssg=" crossorigin="anonymous" />
    <script src="https://cdnjs.cloudflare.com/ajax/libs/vis/4.21.0/vis.min.js" integrity="sha256-JuQeAGbk9rG/EoRMixuy5X8syzICcvB0dj3KindZkY0=" crossorigin="anonymous"></script>