Rebased/fixed merge conflicts

mev_inspect/schemas/classified_traces.py

@@ -62,7 +62,6 @@ class CallTrace(ClassifiedTrace):
 
 
 class DecodedCallTrace(CallTrace):
-
     inputs: Dict[str, Any]
     abi_name: str
 

mev_inspect/swaps.py

@@ -5,6 +5,7 @@ from mev_inspect.schemas.classified_traces import (
     Classification,
 )
 
+
 from mev_inspect.schemas.swaps import Swap
 from mev_inspect.schemas.transfers import ERC20Transfer
 from mev_inspect.traces import get_traces_by_transaction_hash

mev_inspect/transfers.py

@@ -7,6 +7,7 @@ from mev_inspect.schemas.classified_traces import (
     ClassifiedTrace,
 )
 
+
 from mev_inspect.traces import is_child_trace_address, get_child_traces
 
 

tests/helpers.py

@@ -50,6 +50,7 @@ def make_swap_trace(
     action: dict = {},
     subtraces: int = 0,
 ):
+
     return DecodedCallTrace(
         action=action,
         subtraces=subtraces,