This commit is contained in:
Gui Heise 2022-01-06 15:08:44 -05:00
parent 8bb92aa87e
commit 73a29a667b
2 changed files with 30 additions and 9 deletions

View File

@ -23,7 +23,6 @@ AAVE_CONTRACT_ADDRESSES: List[str] = [
"0x030ba81f1c18d280636f32af80b9aad02cf0854e",
# AAVE AMM Market DAI
"0x79be75ffc64dd58e66787e4eae470c8a1fd08ba4",
# AAVE i
"0x030ba81f1c18d280636f32af80b9aad02cf0854e",
"0xbcca60bb61934080951369a648fb03df4f96263c",
]
@ -52,18 +51,20 @@ def get_aave_liquidations(
child_traces = get_child_traces(
trace.transaction_hash, trace.trace_address, traces
)
(debt_token_address, debt_purchase_amount) = _get_debt_data(
trace, child_traces, liquidator
)
(
received_token_address,
received_amount,
) = _get_payback_token_and_amount(trace, child_traces, liquidator)
(received_token_address, received_amount) = _get_received_data(
trace, child_traces, liquidator
)
liquidations.append(
Liquidation(
liquidated_user=trace.inputs["_user"],
debt_token_address=trace.inputs["_reserve"],
debt_token_address=debt_token_address,
liquidator_user=liquidator,
debt_purchase_amount=trace.inputs["_purchaseAmount"],
debt_purchase_amount=debt_purchase_amount,
protocol=Protocol.aave,
received_amount=received_amount,
received_token_address=received_token_address,
@ -77,7 +78,7 @@ def get_aave_liquidations(
return liquidations
def _get_payback_token_and_amount(
def _get_received_data(
liquidation: DecodedCallTrace, child_traces: List[ClassifiedTrace], liquidator: str
) -> Tuple[str, int]:
@ -99,3 +100,23 @@ def _get_payback_token_and_amount(
return child_transfer.token_address, child_transfer.amount
return liquidation.inputs["_collateral"], 0
def _get_debt_data(
liquidation: DecodedCallTrace, child_traces: List[ClassifiedTrace], liquidator: str
) -> Tuple[str, int]:
"""Get transfer from liquidator to AAVE"""
for child in child_traces:
if isinstance(child, CallTrace):
child_transfer: Optional[Transfer] = get_transfer(child)
if child_transfer is not None:
if child_transfer.from_address == liquidator:
return child_transfer.token_address, child_transfer.amount
return liquidation.inputs["_reserve"], 0

View File

@ -102,7 +102,7 @@ def test_multiple_liquidations_in_block(trace_classifier: TraceClassifier):
liquidated_user="0x6c6541ae8a7c6a6f968124a5ff2feac8f0c7875b",
liquidator_user="0x7185e240d8e9e2d692cbc68d30eecf965e9a7feb",
debt_token_address="0x4fabb145d64652a948d72533023f6e7a623c7c53",
debt_purchase_amount=457700000000000000000,
debt_purchase_amount=228905512631913119672,
received_amount=10111753901939162887,
received_token_address="0x514910771af9ca656af840dff83e8264ecf986ca",
protocol=Protocol.aave,