From 29cd82cd0b64358cb3a191ee47995a11a9632f01 Mon Sep 17 00:00:00 2001 From: Gui Heise Date: Mon, 15 Nov 2021 11:00:39 -0500 Subject: [PATCH 1/9] Parse swap logic inside uniswap classifier --- mev | 2 +- mev_inspect/classifiers/specs/uniswap.py | 129 +++++++++++++++++++++-- 2 files changed, 122 insertions(+), 9 deletions(-) diff --git a/mev b/mev index 7d7f79f..f9feafe 100755 --- a/mev +++ b/mev @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash set -e diff --git a/mev_inspect/classifiers/specs/uniswap.py b/mev_inspect/classifiers/specs/uniswap.py index 97c90a6..8939436 100644 --- a/mev_inspect/classifiers/specs/uniswap.py +++ b/mev_inspect/classifiers/specs/uniswap.py @@ -1,3 +1,5 @@ +from typing import Optional, List + from mev_inspect.schemas.traces import ( DecodedCallTrace, Protocol, @@ -6,7 +8,12 @@ from mev_inspect.schemas.classifiers import ( ClassifierSpec, SwapClassifier, ) - +from mev_inspect.schemas.swaps import Swap +from mev_inspect.schemas.transfers import Transfer +from mev_inspect.transfers import ( + build_eth_transfer, + filter_transfers, +) UNISWAP_V2_PAIR_ABI_NAME = "UniswapV2Pair" UNISWAP_V3_POOL_ABI_NAME = "UniswapV3Pool" @@ -14,20 +21,126 @@ UNISWAP_V3_POOL_ABI_NAME = "UniswapV3Pool" class UniswapV3SwapClassifier(SwapClassifier): @staticmethod - def get_swap_recipient(trace: DecodedCallTrace) -> str: + def parse_swap( + trace: DecodedCallTrace, + prior_transfers: List[Transfer], + child_transfers: List[Transfer], + ) -> Optional[Swap]: + pool_address = trace.to_address + if trace.inputs is not None and "recipient" in trace.inputs: - return trace.inputs["recipient"] + recipient_address = trace.inputs["recipient"] else: - return trace.from_address + recipient_address = trace.from_address + + if recipient_address is None: + return None + + transfers_to_pool = [] + + if trace.value is not None and trace.value > 0: + transfers_to_pool = [build_eth_transfer(trace)] + + if len(transfers_to_pool) == 0: + transfers_to_pool = filter_transfers( + prior_transfers, to_address=pool_address + ) + + if len(transfers_to_pool) == 0: + transfers_to_pool = filter_transfers( + child_transfers, to_address=pool_address + ) + + if len(transfers_to_pool) == 0: + return None + + transfers_from_pool_to_recipient = filter_transfers( + child_transfers, to_address=recipient_address, from_address=pool_address + ) + + if len(transfers_from_pool_to_recipient) != 1: + return None + + transfer_in = transfers_to_pool[-1] + transfer_out = transfers_from_pool_to_recipient[0] + + return Swap( + abi_name=trace.abi_name, + transaction_hash=trace.transaction_hash, + block_number=trace.block_number, + trace_address=trace.trace_address, + pool_address=pool_address, + protocol=trace.protocol, + from_address=transfer_in.from_address, + to_address=transfer_out.to_address, + token_in_address=transfer_in.token_address, + token_in_amount=transfer_in.amount, + token_out_address=transfer_out.token_address, + token_out_amount=transfer_out.amount, + error=trace.error, + ) class UniswapV2SwapClassifier(SwapClassifier): @staticmethod - def get_swap_recipient(trace: DecodedCallTrace) -> str: + def parse_swap( + trace: DecodedCallTrace, + prior_transfers: List[Transfer], + child_transfers: List[Transfer], + ) -> Optional[Swap]: + pool_address = trace.to_address + if trace.inputs is not None and "to" in trace.inputs: - return trace.inputs["to"] + recipient_address = trace.inputs["to"] else: - return trace.from_address + recipient_address = trace.from_address + + if recipient_address is None: + return None + + transfers_to_pool = [] + + if trace.value is not None and trace.value > 0: + transfers_to_pool = [build_eth_transfer(trace)] + + if len(transfers_to_pool) == 0: + transfers_to_pool = filter_transfers( + prior_transfers, to_address=pool_address + ) + + if len(transfers_to_pool) == 0: + transfers_to_pool = filter_transfers( + child_transfers, to_address=pool_address + ) + + if len(transfers_to_pool) == 0: + return None + + transfers_from_pool_to_recipient = filter_transfers( + child_transfers, to_address=recipient_address, from_address=pool_address + ) + + if len(transfers_from_pool_to_recipient) != 1: + return None + + transfer_in = transfers_to_pool[-1] + transfer_out = transfers_from_pool_to_recipient[0] + + return Swap( + abi_name=trace.abi_name, + transaction_hash=trace.transaction_hash, + block_number=trace.block_number, + trace_address=trace.trace_address, + pool_address=pool_address, + protocol=trace.protocol, + from_address=transfer_in.from_address, + to_address=transfer_out.to_address, + token_in_address=transfer_in.token_address, + token_in_amount=transfer_in.amount, + token_out_address=transfer_out.token_address, + token_out_amount=transfer_out.amount, + error=trace.error, + ) UNISWAP_V3_CONTRACT_SPECS = [ @@ -127,7 +240,7 @@ UNISWAPPY_V2_PAIR_SPEC = ClassifierSpec( }, ) -UNISWAP_CLASSIFIER_SPECS = [ +UNISWAP_CLASSIFIER_SPECS: List = [ *UNISWAP_V3_CONTRACT_SPECS, *UNISWAPPY_V2_CONTRACT_SPECS, *UNISWAP_V3_GENERAL_SPECS, From f43df8ffa4508601b96761c61027cf766800593b Mon Sep 17 00:00:00 2001 From: Gui Heise Date: Mon, 15 Nov 2021 13:28:34 -0500 Subject: [PATCH 2/9] Fix circular imports --- mev_inspect/classifiers/specs/uniswap.py | 57 ++++++++++++++++++------ mev_inspect/classifiers/specs/zero_ex.py | 1 - mev_inspect/schemas/classifiers.py | 10 +++++ mev_inspect/swaps.py | 52 +-------------------- 4 files changed, 54 insertions(+), 66 deletions(-) diff --git a/mev_inspect/classifiers/specs/uniswap.py b/mev_inspect/classifiers/specs/uniswap.py index 8939436..a8726a8 100644 --- a/mev_inspect/classifiers/specs/uniswap.py +++ b/mev_inspect/classifiers/specs/uniswap.py @@ -1,6 +1,7 @@ -from typing import Optional, List +from typing import Optional, List, Sequence from mev_inspect.schemas.traces import ( + ClassifiedTrace, DecodedCallTrace, Protocol, ) @@ -8,12 +9,9 @@ from mev_inspect.schemas.classifiers import ( ClassifierSpec, SwapClassifier, ) + from mev_inspect.schemas.swaps import Swap -from mev_inspect.schemas.transfers import Transfer -from mev_inspect.transfers import ( - build_eth_transfer, - filter_transfers, -) +from mev_inspect.schemas.transfers import Transfer, ETH_TOKEN_ADDRESS UNISWAP_V2_PAIR_ABI_NAME = "UniswapV2Pair" UNISWAP_V3_POOL_ABI_NAME = "UniswapV3Pool" @@ -39,22 +37,22 @@ class UniswapV3SwapClassifier(SwapClassifier): transfers_to_pool = [] if trace.value is not None and trace.value > 0: - transfers_to_pool = [build_eth_transfer(trace)] + transfers_to_pool = [_build_eth_transfer(trace)] if len(transfers_to_pool) == 0: - transfers_to_pool = filter_transfers( + transfers_to_pool = _filter_transfers( prior_transfers, to_address=pool_address ) if len(transfers_to_pool) == 0: - transfers_to_pool = filter_transfers( + transfers_to_pool = _filter_transfers( child_transfers, to_address=pool_address ) if len(transfers_to_pool) == 0: return None - transfers_from_pool_to_recipient = filter_transfers( + transfers_from_pool_to_recipient = _filter_transfers( child_transfers, to_address=recipient_address, from_address=pool_address ) @@ -101,22 +99,22 @@ class UniswapV2SwapClassifier(SwapClassifier): transfers_to_pool = [] if trace.value is not None and trace.value > 0: - transfers_to_pool = [build_eth_transfer(trace)] + transfers_to_pool = [_build_eth_transfer(trace)] if len(transfers_to_pool) == 0: - transfers_to_pool = filter_transfers( + transfers_to_pool = _filter_transfers( prior_transfers, to_address=pool_address ) if len(transfers_to_pool) == 0: - transfers_to_pool = filter_transfers( + transfers_to_pool = _filter_transfers( child_transfers, to_address=pool_address ) if len(transfers_to_pool) == 0: return None - transfers_from_pool_to_recipient = filter_transfers( + transfers_from_pool_to_recipient = _filter_transfers( child_transfers, to_address=recipient_address, from_address=pool_address ) @@ -143,6 +141,37 @@ class UniswapV2SwapClassifier(SwapClassifier): ) +def _build_eth_transfer(trace: ClassifiedTrace) -> Transfer: + return Transfer( + block_number=trace.block_number, + transaction_hash=trace.transaction_hash, + trace_address=trace.trace_address, + amount=trace.value, + to_address=trace.to_address, + from_address=trace.from_address, + token_address=ETH_TOKEN_ADDRESS, + ) + + +def _filter_transfers( + transfers: Sequence[Transfer], + to_address: Optional[str] = None, + from_address: Optional[str] = None, +) -> List[Transfer]: + filtered_transfers = [] + + for transfer in transfers: + if to_address is not None and transfer.to_address != to_address: + continue + + if from_address is not None and transfer.from_address != from_address: + continue + + filtered_transfers.append(transfer) + + return filtered_transfers + + UNISWAP_V3_CONTRACT_SPECS = [ ClassifierSpec( abi_name="UniswapV3Factory", diff --git a/mev_inspect/classifiers/specs/zero_ex.py b/mev_inspect/classifiers/specs/zero_ex.py index b983bbc..4157b36 100644 --- a/mev_inspect/classifiers/specs/zero_ex.py +++ b/mev_inspect/classifiers/specs/zero_ex.py @@ -5,7 +5,6 @@ from mev_inspect.schemas.classifiers import ( ClassifierSpec, ) - ZEROX_CONTRACT_SPECS = [ ClassifierSpec( abi_name="exchangeProxy", diff --git a/mev_inspect/schemas/classifiers.py b/mev_inspect/schemas/classifiers.py index ab50271..b257b59 100644 --- a/mev_inspect/schemas/classifiers.py +++ b/mev_inspect/schemas/classifiers.py @@ -5,6 +5,7 @@ from pydantic import BaseModel from .traces import Classification, DecodedCallTrace, Protocol from .transfers import Transfer +from .swaps import Swap class Classifier(ABC): @@ -35,6 +36,15 @@ class SwapClassifier(Classifier): def get_swap_recipient(trace: DecodedCallTrace) -> str: raise NotImplementedError() + @staticmethod + @abstractmethod + def parse_swap( + trace: DecodedCallTrace, + prior_transfers: List[Transfer], + child_transfers: List[Transfer], + ) -> Optional[Swap]: + raise NotImplementedError() + class LiquidationClassifier(Classifier): @staticmethod diff --git a/mev_inspect/swaps.py b/mev_inspect/swaps.py index 2929702..b710044 100644 --- a/mev_inspect/swaps.py +++ b/mev_inspect/swaps.py @@ -11,10 +11,8 @@ from mev_inspect.schemas.swaps import Swap from mev_inspect.schemas.transfers import Transfer from mev_inspect.traces import get_traces_by_transaction_hash from mev_inspect.transfers import ( - build_eth_transfer, get_child_transfers, get_transfer, - filter_transfers, remove_child_transfers_of_transfers, ) @@ -67,56 +65,8 @@ def _parse_swap( prior_transfers: List[Transfer], child_transfers: List[Transfer], ) -> Optional[Swap]: - pool_address = trace.to_address - recipient_address = _get_recipient_address(trace) - if recipient_address is None: - return None - - transfers_to_pool = [] - - if trace.value is not None and trace.value > 0: - transfers_to_pool = [build_eth_transfer(trace)] - - if len(transfers_to_pool) == 0: - transfers_to_pool = filter_transfers(prior_transfers, to_address=pool_address) - - if len(transfers_to_pool) == 0: - transfers_to_pool = filter_transfers(child_transfers, to_address=pool_address) - - if len(transfers_to_pool) == 0: - return None - - transfers_from_pool_to_recipient = filter_transfers( - child_transfers, to_address=recipient_address, from_address=pool_address - ) - - if len(transfers_from_pool_to_recipient) != 1: - return None - - transfer_in = transfers_to_pool[-1] - transfer_out = transfers_from_pool_to_recipient[0] - - return Swap( - abi_name=trace.abi_name, - transaction_hash=trace.transaction_hash, - block_number=trace.block_number, - trace_address=trace.trace_address, - pool_address=pool_address, - protocol=trace.protocol, - from_address=transfer_in.from_address, - to_address=transfer_out.to_address, - token_in_address=transfer_in.token_address, - token_in_amount=transfer_in.amount, - token_out_address=transfer_out.token_address, - token_out_amount=transfer_out.amount, - error=trace.error, - ) - - -def _get_recipient_address(trace: DecodedCallTrace) -> Optional[str]: classifier = get_classifier(trace) if classifier is not None and issubclass(classifier, SwapClassifier): - return classifier.get_swap_recipient(trace) - + return classifier.parse_swap(trace, prior_transfers, child_transfers) return None From 94c5691f016f5e4ba57c96734580075f101d2b31 Mon Sep 17 00:00:00 2001 From: Gui Heise Date: Wed, 17 Nov 2021 07:37:25 -0500 Subject: [PATCH 3/9] Move swap logic into classifiers --- mev_inspect/classifiers/specs/balancer.py | 15 ++- mev_inspect/classifiers/specs/curve.py | 16 ++- mev_inspect/classifiers/specs/uniswap.py | 148 ++-------------------- mev_inspect/classifiers/utils.py | 93 ++++++++++++++ 4 files changed, 126 insertions(+), 146 deletions(-) create mode 100644 mev_inspect/classifiers/utils.py diff --git a/mev_inspect/classifiers/specs/balancer.py b/mev_inspect/classifiers/specs/balancer.py index 2bf0292..b2e57ce 100644 --- a/mev_inspect/classifiers/specs/balancer.py +++ b/mev_inspect/classifiers/specs/balancer.py @@ -1,3 +1,6 @@ +from typing import Optional, List +from mev_inspect.schemas.transfers import Transfer +from mev_inspect.schemas.swaps import Swap from mev_inspect.schemas.traces import ( DecodedCallTrace, Protocol, @@ -6,15 +9,21 @@ from mev_inspect.schemas.classifiers import ( ClassifierSpec, SwapClassifier, ) - +from mev_inspect.classifiers.utils import create_swap_from_transfers BALANCER_V1_POOL_ABI_NAME = "BPool" class BalancerSwapClassifier(SwapClassifier): @staticmethod - def get_swap_recipient(trace: DecodedCallTrace) -> str: - return trace.from_address + def parse_swap( + trace: DecodedCallTrace, + prior_transfers: List[Transfer], + child_transfers: List[Transfer], + ) -> Optional[Swap]: + + swap = create_swap_from_transfers(trace, prior_transfers, child_transfers) + return swap BALANCER_V1_SPECS = [ diff --git a/mev_inspect/classifiers/specs/curve.py b/mev_inspect/classifiers/specs/curve.py index 97ddb85..d1ed717 100644 --- a/mev_inspect/classifiers/specs/curve.py +++ b/mev_inspect/classifiers/specs/curve.py @@ -1,18 +1,28 @@ +from typing import Optional, List +from mev_inspect.schemas.transfers import Transfer +from mev_inspect.schemas.swaps import Swap from mev_inspect.schemas.traces import ( Protocol, + DecodedCallTrace, ) from mev_inspect.schemas.classifiers import ( ClassifierSpec, - DecodedCallTrace, SwapClassifier, ) +from mev_inspect.classifiers.utils import create_swap_from_transfers class CurveSwapClassifier(SwapClassifier): @staticmethod - def get_swap_recipient(trace: DecodedCallTrace) -> str: - return trace.from_address + def parse_swap( + trace: DecodedCallTrace, + prior_transfers: List[Transfer], + child_transfers: List[Transfer], + ) -> Optional[Swap]: + + swap = create_swap_from_transfers(trace, prior_transfers, child_transfers) + return swap CURVE_BASE_POOLS = [ diff --git a/mev_inspect/classifiers/specs/uniswap.py b/mev_inspect/classifiers/specs/uniswap.py index a8726a8..3c35b9e 100644 --- a/mev_inspect/classifiers/specs/uniswap.py +++ b/mev_inspect/classifiers/specs/uniswap.py @@ -1,7 +1,7 @@ -from typing import Optional, List, Sequence - +from typing import Optional, List +from mev_inspect.schemas.transfers import Transfer +from mev_inspect.schemas.swaps import Swap from mev_inspect.schemas.traces import ( - ClassifiedTrace, DecodedCallTrace, Protocol, ) @@ -9,9 +9,8 @@ from mev_inspect.schemas.classifiers import ( ClassifierSpec, SwapClassifier, ) +from mev_inspect.classifiers.utils import create_swap_from_transfers -from mev_inspect.schemas.swaps import Swap -from mev_inspect.schemas.transfers import Transfer, ETH_TOKEN_ADDRESS UNISWAP_V2_PAIR_ABI_NAME = "UniswapV2Pair" UNISWAP_V3_POOL_ABI_NAME = "UniswapV3Pool" @@ -24,59 +23,9 @@ class UniswapV3SwapClassifier(SwapClassifier): prior_transfers: List[Transfer], child_transfers: List[Transfer], ) -> Optional[Swap]: - pool_address = trace.to_address - if trace.inputs is not None and "recipient" in trace.inputs: - recipient_address = trace.inputs["recipient"] - else: - recipient_address = trace.from_address - - if recipient_address is None: - return None - - transfers_to_pool = [] - - if trace.value is not None and trace.value > 0: - transfers_to_pool = [_build_eth_transfer(trace)] - - if len(transfers_to_pool) == 0: - transfers_to_pool = _filter_transfers( - prior_transfers, to_address=pool_address - ) - - if len(transfers_to_pool) == 0: - transfers_to_pool = _filter_transfers( - child_transfers, to_address=pool_address - ) - - if len(transfers_to_pool) == 0: - return None - - transfers_from_pool_to_recipient = _filter_transfers( - child_transfers, to_address=recipient_address, from_address=pool_address - ) - - if len(transfers_from_pool_to_recipient) != 1: - return None - - transfer_in = transfers_to_pool[-1] - transfer_out = transfers_from_pool_to_recipient[0] - - return Swap( - abi_name=trace.abi_name, - transaction_hash=trace.transaction_hash, - block_number=trace.block_number, - trace_address=trace.trace_address, - pool_address=pool_address, - protocol=trace.protocol, - from_address=transfer_in.from_address, - to_address=transfer_out.to_address, - token_in_address=transfer_in.token_address, - token_in_amount=transfer_in.amount, - token_out_address=transfer_out.token_address, - token_out_amount=transfer_out.amount, - error=trace.error, - ) + swap = create_swap_from_transfers(trace, prior_transfers, child_transfers) + return swap class UniswapV2SwapClassifier(SwapClassifier): @@ -86,90 +35,9 @@ class UniswapV2SwapClassifier(SwapClassifier): prior_transfers: List[Transfer], child_transfers: List[Transfer], ) -> Optional[Swap]: - pool_address = trace.to_address - if trace.inputs is not None and "to" in trace.inputs: - recipient_address = trace.inputs["to"] - else: - recipient_address = trace.from_address - - if recipient_address is None: - return None - - transfers_to_pool = [] - - if trace.value is not None and trace.value > 0: - transfers_to_pool = [_build_eth_transfer(trace)] - - if len(transfers_to_pool) == 0: - transfers_to_pool = _filter_transfers( - prior_transfers, to_address=pool_address - ) - - if len(transfers_to_pool) == 0: - transfers_to_pool = _filter_transfers( - child_transfers, to_address=pool_address - ) - - if len(transfers_to_pool) == 0: - return None - - transfers_from_pool_to_recipient = _filter_transfers( - child_transfers, to_address=recipient_address, from_address=pool_address - ) - - if len(transfers_from_pool_to_recipient) != 1: - return None - - transfer_in = transfers_to_pool[-1] - transfer_out = transfers_from_pool_to_recipient[0] - - return Swap( - abi_name=trace.abi_name, - transaction_hash=trace.transaction_hash, - block_number=trace.block_number, - trace_address=trace.trace_address, - pool_address=pool_address, - protocol=trace.protocol, - from_address=transfer_in.from_address, - to_address=transfer_out.to_address, - token_in_address=transfer_in.token_address, - token_in_amount=transfer_in.amount, - token_out_address=transfer_out.token_address, - token_out_amount=transfer_out.amount, - error=trace.error, - ) - - -def _build_eth_transfer(trace: ClassifiedTrace) -> Transfer: - return Transfer( - block_number=trace.block_number, - transaction_hash=trace.transaction_hash, - trace_address=trace.trace_address, - amount=trace.value, - to_address=trace.to_address, - from_address=trace.from_address, - token_address=ETH_TOKEN_ADDRESS, - ) - - -def _filter_transfers( - transfers: Sequence[Transfer], - to_address: Optional[str] = None, - from_address: Optional[str] = None, -) -> List[Transfer]: - filtered_transfers = [] - - for transfer in transfers: - if to_address is not None and transfer.to_address != to_address: - continue - - if from_address is not None and transfer.from_address != from_address: - continue - - filtered_transfers.append(transfer) - - return filtered_transfers + swap = create_swap_from_transfers(trace, prior_transfers, child_transfers) + return swap UNISWAP_V3_CONTRACT_SPECS = [ diff --git a/mev_inspect/classifiers/utils.py b/mev_inspect/classifiers/utils.py new file mode 100644 index 0000000..ff4f101 --- /dev/null +++ b/mev_inspect/classifiers/utils.py @@ -0,0 +1,93 @@ +from typing import Optional, List, Sequence + +from mev_inspect.schemas.swaps import Swap +from mev_inspect.schemas.transfers import Transfer, ETH_TOKEN_ADDRESS + +from mev_inspect.schemas.traces import DecodedCallTrace, ClassifiedTrace + + +def create_swap_from_transfers( + trace: DecodedCallTrace, + prior_transfers: List[Transfer], + child_transfers: List[Transfer], +) -> Optional[Swap]: + pool_address = trace.to_address + + if trace.inputs is not None and "to" in trace.inputs: + recipient_address = trace.inputs["to"] + else: + recipient_address = trace.from_address + + if recipient_address is None: + return None + + transfers_to_pool = [] + + if trace.value is not None and trace.value > 0: + transfers_to_pool = [_build_eth_transfer(trace)] + + if len(transfers_to_pool) == 0: + transfers_to_pool = _filter_transfers(prior_transfers, to_address=pool_address) + + if len(transfers_to_pool) == 0: + transfers_to_pool = _filter_transfers(child_transfers, to_address=pool_address) + + if len(transfers_to_pool) == 0: + return None + + transfers_from_pool_to_recipient = _filter_transfers( + child_transfers, to_address=recipient_address, from_address=pool_address + ) + + if len(transfers_from_pool_to_recipient) != 1: + return None + + transfer_in = transfers_to_pool[-1] + transfer_out = transfers_from_pool_to_recipient[0] + + return Swap( + abi_name=trace.abi_name, + transaction_hash=trace.transaction_hash, + block_number=trace.block_number, + trace_address=trace.trace_address, + pool_address=pool_address, + protocol=trace.protocol, + from_address=transfer_in.from_address, + to_address=transfer_out.to_address, + token_in_address=transfer_in.token_address, + token_in_amount=transfer_in.amount, + token_out_address=transfer_out.token_address, + token_out_amount=transfer_out.amount, + error=trace.error, + ) + + +def _build_eth_transfer(trace: ClassifiedTrace) -> Transfer: + return Transfer( + block_number=trace.block_number, + transaction_hash=trace.transaction_hash, + trace_address=trace.trace_address, + amount=trace.value, + to_address=trace.to_address, + from_address=trace.from_address, + token_address=ETH_TOKEN_ADDRESS, + ) + + +def _filter_transfers( + transfers: Sequence[Transfer], + to_address: Optional[str] = None, + from_address: Optional[str] = None, +) -> List[Transfer]: + filtered_transfers = [] + + for transfer in transfers: + if to_address is not None and transfer.to_address != to_address: + continue + + if from_address is not None and transfer.from_address != from_address: + continue + + filtered_transfers.append(transfer) + + return filtered_transfers From ff9337eb4bb2825779c7e5f709cf746ee6a8c5c2 Mon Sep 17 00:00:00 2001 From: Gui Heise Date: Wed, 17 Nov 2021 10:19:10 -0500 Subject: [PATCH 4/9] Fix UniV3 Classifier --- mev_inspect/classifiers/specs/balancer.py | 6 +++++- mev_inspect/classifiers/specs/curve.py | 6 +++++- mev_inspect/classifiers/specs/uniswap.py | 18 ++++++++++++++++-- mev_inspect/classifiers/utils.py | 6 +----- 4 files changed, 27 insertions(+), 9 deletions(-) diff --git a/mev_inspect/classifiers/specs/balancer.py b/mev_inspect/classifiers/specs/balancer.py index b2e57ce..78ffe43 100644 --- a/mev_inspect/classifiers/specs/balancer.py +++ b/mev_inspect/classifiers/specs/balancer.py @@ -22,7 +22,11 @@ class BalancerSwapClassifier(SwapClassifier): child_transfers: List[Transfer], ) -> Optional[Swap]: - swap = create_swap_from_transfers(trace, prior_transfers, child_transfers) + recipient_address = trace.from_address + + swap = create_swap_from_transfers( + trace, recipient_address, prior_transfers, child_transfers + ) return swap diff --git a/mev_inspect/classifiers/specs/curve.py b/mev_inspect/classifiers/specs/curve.py index d1ed717..688f069 100644 --- a/mev_inspect/classifiers/specs/curve.py +++ b/mev_inspect/classifiers/specs/curve.py @@ -21,7 +21,11 @@ class CurveSwapClassifier(SwapClassifier): child_transfers: List[Transfer], ) -> Optional[Swap]: - swap = create_swap_from_transfers(trace, prior_transfers, child_transfers) + recipient_address = trace.from_address + + swap = create_swap_from_transfers( + trace, recipient_address, prior_transfers, child_transfers + ) return swap diff --git a/mev_inspect/classifiers/specs/uniswap.py b/mev_inspect/classifiers/specs/uniswap.py index 3c35b9e..ed094d8 100644 --- a/mev_inspect/classifiers/specs/uniswap.py +++ b/mev_inspect/classifiers/specs/uniswap.py @@ -24,7 +24,14 @@ class UniswapV3SwapClassifier(SwapClassifier): child_transfers: List[Transfer], ) -> Optional[Swap]: - swap = create_swap_from_transfers(trace, prior_transfers, child_transfers) + if trace.inputs is not None and "recipient" in trace.inputs: + recipient_address = trace.inputs["recipient"] + else: + recipient_address = trace.from_address + + swap = create_swap_from_transfers( + trace, recipient_address, prior_transfers, child_transfers + ) return swap @@ -36,7 +43,14 @@ class UniswapV2SwapClassifier(SwapClassifier): child_transfers: List[Transfer], ) -> Optional[Swap]: - swap = create_swap_from_transfers(trace, prior_transfers, child_transfers) + if trace.inputs is not None and "to" in trace.inputs: + recipient_address = trace.inputs["to"] + else: + recipient_address = trace.from_address + + swap = create_swap_from_transfers( + trace, recipient_address, prior_transfers, child_transfers + ) return swap diff --git a/mev_inspect/classifiers/utils.py b/mev_inspect/classifiers/utils.py index ff4f101..8d99be7 100644 --- a/mev_inspect/classifiers/utils.py +++ b/mev_inspect/classifiers/utils.py @@ -8,16 +8,12 @@ from mev_inspect.schemas.traces import DecodedCallTrace, ClassifiedTrace def create_swap_from_transfers( trace: DecodedCallTrace, + recipient_address: str, prior_transfers: List[Transfer], child_transfers: List[Transfer], ) -> Optional[Swap]: pool_address = trace.to_address - if trace.inputs is not None and "to" in trace.inputs: - recipient_address = trace.inputs["to"] - else: - recipient_address = trace.from_address - if recipient_address is None: return None From 6e25031623bba64f4f4ba07153b09168fd217623 Mon Sep 17 00:00:00 2001 From: Gui Heise Date: Thu, 18 Nov 2021 11:38:09 -0500 Subject: [PATCH 5/9] Rename utils.py to swaps.py --- mev_inspect/classifiers/specs/balancer.py | 2 +- mev_inspect/classifiers/specs/curve.py | 2 +- mev_inspect/classifiers/specs/uniswap.py | 2 +- mev_inspect/classifiers/{utils.py => swaps.py} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename mev_inspect/classifiers/{utils.py => swaps.py} (100%) diff --git a/mev_inspect/classifiers/specs/balancer.py b/mev_inspect/classifiers/specs/balancer.py index 78ffe43..2614002 100644 --- a/mev_inspect/classifiers/specs/balancer.py +++ b/mev_inspect/classifiers/specs/balancer.py @@ -9,7 +9,7 @@ from mev_inspect.schemas.classifiers import ( ClassifierSpec, SwapClassifier, ) -from mev_inspect.classifiers.utils import create_swap_from_transfers +from mev_inspect.classifiers.swaps import create_swap_from_transfers BALANCER_V1_POOL_ABI_NAME = "BPool" diff --git a/mev_inspect/classifiers/specs/curve.py b/mev_inspect/classifiers/specs/curve.py index 688f069..08244ea 100644 --- a/mev_inspect/classifiers/specs/curve.py +++ b/mev_inspect/classifiers/specs/curve.py @@ -10,7 +10,7 @@ from mev_inspect.schemas.classifiers import ( ClassifierSpec, SwapClassifier, ) -from mev_inspect.classifiers.utils import create_swap_from_transfers +from mev_inspect.classifiers.swaps import create_swap_from_transfers class CurveSwapClassifier(SwapClassifier): diff --git a/mev_inspect/classifiers/specs/uniswap.py b/mev_inspect/classifiers/specs/uniswap.py index ed094d8..1b3bb5a 100644 --- a/mev_inspect/classifiers/specs/uniswap.py +++ b/mev_inspect/classifiers/specs/uniswap.py @@ -9,7 +9,7 @@ from mev_inspect.schemas.classifiers import ( ClassifierSpec, SwapClassifier, ) -from mev_inspect.classifiers.utils import create_swap_from_transfers +from mev_inspect.classifiers.swaps import create_swap_from_transfers UNISWAP_V2_PAIR_ABI_NAME = "UniswapV2Pair" diff --git a/mev_inspect/classifiers/utils.py b/mev_inspect/classifiers/swaps.py similarity index 100% rename from mev_inspect/classifiers/utils.py rename to mev_inspect/classifiers/swaps.py From 1e1241cbf5aeb0e196397e665efd8e1563b5f55b Mon Sep 17 00:00:00 2001 From: Gui Heise Date: Thu, 18 Nov 2021 12:22:13 -0500 Subject: [PATCH 6/9] Remove Uni none checks and bash change --- mev | 3 +-- mev_inspect/classifiers/specs/uniswap.py | 4 ++-- mev_inspect/classifiers/swaps.py | 3 --- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/mev b/mev index f9feafe..e3b3178 100755 --- a/mev +++ b/mev @@ -1,5 +1,4 @@ -#!/usr/bin/env bash - +#!/bin/sh set -e DB_NAME=mev_inspect diff --git a/mev_inspect/classifiers/specs/uniswap.py b/mev_inspect/classifiers/specs/uniswap.py index 1b3bb5a..d597f80 100644 --- a/mev_inspect/classifiers/specs/uniswap.py +++ b/mev_inspect/classifiers/specs/uniswap.py @@ -24,7 +24,7 @@ class UniswapV3SwapClassifier(SwapClassifier): child_transfers: List[Transfer], ) -> Optional[Swap]: - if trace.inputs is not None and "recipient" in trace.inputs: + if "recipient" in trace.inputs: recipient_address = trace.inputs["recipient"] else: recipient_address = trace.from_address @@ -43,7 +43,7 @@ class UniswapV2SwapClassifier(SwapClassifier): child_transfers: List[Transfer], ) -> Optional[Swap]: - if trace.inputs is not None and "to" in trace.inputs: + if "to" in trace.inputs: recipient_address = trace.inputs["to"] else: recipient_address = trace.from_address diff --git a/mev_inspect/classifiers/swaps.py b/mev_inspect/classifiers/swaps.py index 8d99be7..601eca7 100644 --- a/mev_inspect/classifiers/swaps.py +++ b/mev_inspect/classifiers/swaps.py @@ -14,9 +14,6 @@ def create_swap_from_transfers( ) -> Optional[Swap]: pool_address = trace.to_address - if recipient_address is None: - return None - transfers_to_pool = [] if trace.value is not None and trace.value > 0: From c5621e0676d335eef427d98edd3c1a8b6f031aed Mon Sep 17 00:00:00 2001 From: Gui Heise Date: Thu, 18 Nov 2021 12:23:09 -0500 Subject: [PATCH 7/9] space --- mev | 1 + 1 file changed, 1 insertion(+) diff --git a/mev b/mev index e3b3178..7d7f79f 100755 --- a/mev +++ b/mev @@ -1,4 +1,5 @@ #!/bin/sh + set -e DB_NAME=mev_inspect From ca0014533a19a35164a4db7f6a34bde49393241b Mon Sep 17 00:00:00 2001 From: Gui Heise Date: Thu, 18 Nov 2021 12:52:48 -0500 Subject: [PATCH 8/9] Add getter method for Uni recipient address --- mev_inspect/classifiers/specs/uniswap.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/mev_inspect/classifiers/specs/uniswap.py b/mev_inspect/classifiers/specs/uniswap.py index d597f80..017668b 100644 --- a/mev_inspect/classifiers/specs/uniswap.py +++ b/mev_inspect/classifiers/specs/uniswap.py @@ -24,10 +24,7 @@ class UniswapV3SwapClassifier(SwapClassifier): child_transfers: List[Transfer], ) -> Optional[Swap]: - if "recipient" in trace.inputs: - recipient_address = trace.inputs["recipient"] - else: - recipient_address = trace.from_address + recipient_address = trace.inputs.get("recipient", trace.from_address) swap = create_swap_from_transfers( trace, recipient_address, prior_transfers, child_transfers @@ -43,10 +40,7 @@ class UniswapV2SwapClassifier(SwapClassifier): child_transfers: List[Transfer], ) -> Optional[Swap]: - if "to" in trace.inputs: - recipient_address = trace.inputs["to"] - else: - recipient_address = trace.from_address + recipient_address = trace.inputs.get("to", trace.from_address) swap = create_swap_from_transfers( trace, recipient_address, prior_transfers, child_transfers From 386eccaeb75b16d77edc7fb0a2e80e400279bf4c Mon Sep 17 00:00:00 2001 From: Gui Heise Date: Thu, 18 Nov 2021 12:58:45 -0500 Subject: [PATCH 9/9] Remove abstract method --- mev_inspect/schemas/classifiers.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/mev_inspect/schemas/classifiers.py b/mev_inspect/schemas/classifiers.py index b257b59..928ef1e 100644 --- a/mev_inspect/schemas/classifiers.py +++ b/mev_inspect/schemas/classifiers.py @@ -31,11 +31,6 @@ class SwapClassifier(Classifier): def get_classification() -> Classification: return Classification.swap - @staticmethod - @abstractmethod - def get_swap_recipient(trace: DecodedCallTrace) -> str: - raise NotImplementedError() - @staticmethod @abstractmethod def parse_swap(