Black

mythril/analysis/symbolic.py

@@ -176,6 +176,7 @@ class SymExecWrapper:
                 contract.disassembly,
                 dynamic_loader=dynloader,
                 contract_name=contract.name,
+                balances=world_state.balances,
                 concrete_storage=True
                 if (dynloader is not None and dynloader.storage_loading)
                 else False,

mythril/ethereum/interface/rpc/client.py

@@ -52,12 +52,7 @@ class EthJsonRpc(BaseClient):
         :return:
         """
         params = params or []
-        data = {
+        data = {"jsonrpc": "2.0", "method": method, "params": params, "id": _id}
-            "jsonrpc": "2.0",
-            "method": method,
-            "params": params,
-            "id": _id,
-        }
         scheme = "http"
         if self.tls:
             scheme += "s"

mythril/interfaces/cli.py

@@ -387,9 +387,7 @@ def create_analyzer_parser(analyzer_parser: ArgumentParser):
         action="store_true",
         help="analyze a truffle project (run from project dir)",
     )
-    commands.add_argument(
+    commands.add_argument("--infura-id", help="set infura id for onchain analysis")
-        "--infura-id", help="set infura id for onchain analysis",
-    )
 
     options = analyzer_parser.add_argument_group("options")
     options.add_argument(

mythril/laser/ethereum/state/account.py

@@ -112,10 +112,12 @@ class Account:
             concrete_storage, address=self.address, dynamic_loader=dynamic_loader
         )
 
+        formatted_address = "{0:#0{1}x}".format(self.address.value, 42);
+
         # Metadata
         if contract_name is None:
             self.contract_name = (
-                "{0:#0{1}x}".format(self.address.value, 40)
+                formatted_address
                 if not self.address.symbolic
                 else "unknown"
             )
@@ -127,6 +129,12 @@ class Account:
         self._balances = balances
         self.balance = lambda: self._balances[self.address]
 
+        if not self.address.symbolic and dynamic_loader is not None:
+            _balance = dynamic_loader.read_balance(formatted_address)
+            self.set_balance(
+                _balance
+            )
+
     def __str__(self) -> str:
         return str(self.as_dict)
 

mythril/support/loader.py

@@ -47,6 +47,22 @@ class DynLoader:
             contract_address, position=index, block="latest"
         )
 
+    @functools.lru_cache(LRU_CACHE_SIZE)
+    def read_balance(self, address: str) -> str:
+        """
+
+        :param address:
+        :return:
+        """
+        if not self.storage_loading:
+            raise ValueError(
+                "Cannot load from the storage when the storage_loading flag is false"
+            )
+        if not self.eth:
+            raise ValueError("Cannot load from the storage when eth is None")
+
+        return self.eth.eth_getBalance(address)
+
     @functools.lru_cache(LRU_CACHE_SIZE)
     def dynld(self, dependency_address: str) -> Optional[Disassembly]:
         """