Improvements to gas reporting

brownie/data/default-config.yaml

@@ -50,6 +50,7 @@ console:
 reports:
     exclude_paths: null
     exclude_contracts: null
+    only_include_project: true
 
 hypothesis:
     deadline: null

brownie/network/state.py

@@ -148,24 +148,30 @@ def of_address(self, account: str) -> List:
         """Returns a list of transactions where account is the sender or receiver"""
         return [i for i in self._list if i.receiver == account or i.sender == account]
 
-    def _gas(self, fn_name: str, gas_used: int) -> None:
-        if fn_name not in self.gas_profile:
-            self.gas_profile[fn_name] = {
-                "avg": gas_used,
-                "high": gas_used,
-                "low": gas_used,
-                "count": 1,
-            }
+    def _gas(self, fn_name: str, gas_used: int, is_success: bool) -> None:
+        gas = self.gas_profile.setdefault(fn_name, {})
+        if not gas:
+            gas.update(
+                avg=gas_used, high=gas_used, low=gas_used, count=1, count_success=0, avg_success=0
+            )
+            if is_success:
+                gas["count_success"] = 1
+                gas["avg_success"] = gas_used
             return
-        gas = self.gas_profile[fn_name]
         gas.update(
-            {
-                "avg": (gas["avg"] * gas["count"] + gas_used) // (gas["count"] + 1),
-                "high": max(gas["high"], gas_used),
-                "low": min(gas["low"], gas_used),
-            }
+            avg=(gas["avg"] * gas["count"] + gas_used) // (gas["count"] + 1),
+            high=max(gas["high"], gas_used),
+            low=min(gas["low"], gas_used),
         )
         gas["count"] += 1
+        if is_success:
+            count = gas["count_success"]
+            gas["count_success"] += 1
+            if not gas["avg_success"]:
+                gas["avg_success"] = gas_used
+            else:
+                avg = gas["avg_success"]
+                gas["avg_success"] = (avg * count + gas_used) // (count + 1)
 
 
 class Chain(metaclass=_Singleton):

brownie/network/transaction.py

@@ -540,7 +540,7 @@ def _set_from_receipt(self, receipt: Dict) -> None:
         self.coverage_hash = sha1(base.encode()).hexdigest()
 
         if self.fn_name:
-            state.TxHistory()._gas(self._full_name(), receipt["gasUsed"])
+            state.TxHistory()._gas(self._full_name(), receipt["gasUsed"], self.status == Status(1))
 
     def _confirm_output(self) -> str:
         status = ""

brownie/test/output.py

@@ -74,6 +74,7 @@ def _build_gas_profile_output():
 
     lines = [""]
 
+    only_include_project = CONFIG.settings["reports"]["only_include_project"]
     for full_name, values in sorted_gas:
         contract, function = full_name.split(".", 1)
 
@@ -82,7 +83,8 @@ def _build_gas_profile_output():
                 continue
         except (AttributeError, KeyError):
             # filters contracts that are not part of the project
-            continue
+            if only_include_project:
+                continue
         if contract in exclude_contracts:
             continue
 
@@ -108,8 +110,8 @@ def _build_gas_profile_output():
             values["avg"] = int(values["avg"])
             values = {k: str(v).rjust(padding[k]) for k, v in values.items()}
             lines.append(
-                f"   {prefix} {fn_name} -  avg: {values['avg']}"
-                f"  low: {values['low']}  high: {values['high']}"
+                f"   {prefix} {fn_name} -  avg: {values['avg']}  avg (confirmed):"
+                f" {values['avg_success']}  low: {values['low']}  high: {values['high']}"
             )
 
     return lines + [""]

docs/config.rst

@@ -267,6 +267,12 @@ Settings related to reports such as coverage data and gas profiles.
                 - SafeMath
                 - Owned
 
+.. py:attribute:: only_include_project
+
+    If ``false``, reports also include contracts imported from outside the active project (such as those compiled via :func:`compile_source <main.compile_source>`).
+
+    default value: ``true``
+
 .. _config-hypothesis:
 
 Hypothesis