Merge pull request #383 from norhh/bugfix/377

Send a list for functions

mythril/mythril.py

@@ -332,6 +332,9 @@ class Mythril(object):
                 # import signatures from solidity source
                 with open(file, encoding="utf-8") as f:
                     self.sigs.import_from_solidity_source(f.read())
+                # Save updated function signatures
+                self.sigs.write()  # dump signatures to disk (previously opened file or default location)
+
                 if contract_name is not None:
                     contract = SolidityContract(file, contract_name, solc_args=self.solc_args)
                     self.contracts.append(contract)
@@ -341,6 +344,7 @@ class Mythril(object):
                         self.contracts.append(contract)
                         contracts.append(contract)
 
+
             except FileNotFoundError:
                 raise CriticalError("Input file not found: " + file)
             except CompilerError as e:
@@ -348,8 +352,6 @@ class Mythril(object):
             except NoContractFoundError:
                 logging.info("The file " + file + " does not contain a compilable contract.")
 
-        # Save updated function signatures
-        self.sigs.write()  # dump signatures to disk (previously opened file or default location)
 
         return address, contracts
 

mythril/support/signatures.py

@@ -154,7 +154,6 @@ class SignatureDb(object):
         """
         if not sighash.startswith("0x"):
             sighash = "0x%s" % sighash  # normalize sighash format
-
         if self.enable_online_lookup and not self.signatures.get(sighash) and sighash not in self.online_lookup_miss and time.time() > self.online_directory_unavailable_until:
             # online lookup enabled, and signature not in cache, sighash was not a miss earlier, and online directory not down
             logging.debug("Signatures: performing online lookup for sighash %r" % sighash)
@@ -169,8 +168,11 @@ class SignatureDb(object):
             except FourByteDirectoryOnlineLookupError as fbdole:
                 self.online_directory_unavailable_until = time.time() + 2 * 60  # wait at least 2 mins to try again
                 logging.warning("online function signature lookup not available. will not try to lookup hash for the next 2 minutes. exception: %r" % fbdole)
+        if type(self.signatures[sighash]) != list:
+            return [self.signatures[sighash]]
         return self.signatures[sighash]  # raise keyerror
 
+
     def __getitem__(self, item):
         """
         Provide dict interface Signatures()[sighash]