From f21637ea739ad0bcfc0096b8ecd40a286fb6123b Mon Sep 17 00:00:00 2001 From: Peterson_dt <168048103+petersdt@users.noreply.github.com> Date: Fri, 1 Nov 2024 19:02:49 +0000 Subject: [PATCH 1/5] feat: add missing models to Transformzklend --- .../events/zklend/transform_events.py | 203 ++++++++++++++++-- 1 file changed, 180 insertions(+), 23 deletions(-) diff --git a/apps/data_handler/handlers/events/zklend/transform_events.py b/apps/data_handler/handlers/events/zklend/transform_events.py index 07600b3f..250419e5 100644 --- a/apps/data_handler/handlers/events/zklend/transform_events.py +++ b/apps/data_handler/handlers/events/zklend/transform_events.py @@ -12,6 +12,11 @@ from data_handler.db.models.zklend_events import ( AccumulatorsSyncEventModel, LiquidationEventModel, + RepaymentEventModel, + BorrowingEventModel, + DepositEventModel, + WithdrawalEventModel, + CollateralEnabledDisabledEventModel ) from data_handler.db.crud import ZkLendEventDBConnector from data_handler.handler_tools.constants import ProtocolAddresses @@ -24,24 +29,84 @@ EVENT_MAPPING: Dict[str, Tuple[Callable, str, Type[Base]]] = { "AccumulatorsSync": ( ZklendDataParser.parse_accumulators_sync_event, - "create_accumulator_event", + "save_accumulators_sync_event", AccumulatorsSyncEventModel ), - "Liquidation": ( - ZklendDataParser.parse_liquidation_event, - "create_liquidation_event", - LiquidationEventModel - ), "zklend::market::Market::AccumulatorsSync": ( ZklendDataParser.parse_accumulators_sync_event, - "create_accumulator_event", + "save_accumulators_sync_event", AccumulatorsSyncEventModel ), + "Liquidation": ( + ZklendDataParser.parse_liquidation_event, + "save_liquidation_event", + LiquidationEventModel + ), "zklend::market::Market::Liquidation": ( ZklendDataParser.parse_liquidation_event, - "create_liquidation_event", + "save_liquidation_event", LiquidationEventModel ), + "Repayment": ( + ZklendDataParser.parse_repayment_event, + "save_repayment_event", + RepaymentEventModel + ), + "zklend::market::Market::Repayment": ( + ZklendDataParser.parse_repayment_event, + "save_repayment_event", + RepaymentEventModel + ), + "Borrowing": ( + ZklendDataParser.parse_borrowing_event, + "save_borrowing_event", + BorrowingEventModel + ), + "zklend::market::Market::Borrowing": ( + ZklendDataParser.parse_borrowing_event, + "save_borrowing_event", + BorrowingEventModel + ), + "Deposit": ( + ZklendDataParser.parse_deposit_event, + "save_deposit_event", + DepositEventModel + ), + "zklend::market::Market::Deposit": ( + ZklendDataParser.parse_deposit_event, + "save_deposit_event", + DepositEventModel + ), + "Withdrawal": ( + ZklendDataParser.parse_withdrawal_event, + "save_withdrawal_event", + WithdrawalEventModel + ), + "zklend::market::Market::Withdrawal": ( + ZklendDataParser.parse_withdrawal_event, + "save_withdrawal_event", + WithdrawalEventModel + ), + "CollateralEnabled": ( + ZklendDataParser.parse_collateral_enabled_disabled_event, + "save_collateral_enabled_disabled_event", + CollateralEnabledDisabledEventModel + ), + "zklend::market::Market::CollateralEnabled": ( + ZklendDataParser.parse_collateral_enabled_disabled_event, + "save_collateral_enabled_disabled_event", + CollateralEnabledDisabledEventModel + ), + "CollateralDisabled": ( + ZklendDataParser.parse_collateral_enabled_disabled_event, + "save_collateral_enabled_disabled_event", + CollateralEnabledDisabledEventModel + ), + "zklend::market::Market::CollateralDisabled": ( + ZklendDataParser.parse_collateral_enabled_disabled_event, + "save_collateral_enabled_disabled_event", + CollateralEnabledDisabledEventModel + ), } @@ -50,7 +115,7 @@ class ZklendTransformer: A class that is used to transform Zklend events into database models. """ - EVENT_MAPPING: Dict[str, Tuple[Callable, Type[BaseModel], Type[Base]]] = EVENT_MAPPING + EVENT_MAPPING: Dict[str, Tuple[Callable, str, Type[Base]]] = EVENT_MAPPING PROTOCOL_ADDRESSES: str = ProtocolAddresses.ZKLEND_MARKET_ADDRESSES PROTOCOL_TYPE: ProtocolIDs = ProtocolIDs.ZKLEND PAGINATION_SIZE: int = 1000 @@ -82,31 +147,123 @@ def fetch_and_transform_events(self, from_address: str, min_block: int, max_bloc for event in response: event_type = event.get("key_name") if event_type in self.EVENT_MAPPING: - parser_func, method_name, model_class = self.EVENT_MAPPING[event_type] + parser_func, save_to_db_method_name, model_class = self.EVENT_MAPPING[event_type] parsed_data = parser_func(event["data"]) db_model = model_class(**parsed_data.model_dump()) - self.db_connector[method_name](db_model) + getattr(self, save_to_db_method_name)(db_model) else: logger.info(f"Event type {event_type} not supported, yet...") - def save_accumulators_sync_event(self, event: Dict[str, Any]) -> None: + def save_accumulators_sync_event(self, event_model: AccumulatorsSyncEventModel) -> None: """ Save an accumulators sync event to the database. """ - parser_func, _, model_class = self.EVENT_MAPPING["zklend::market::Market::AccumulatorsSync"] - parsed_data = parser_func(event) - db_model = model_class(**parsed_data.model_dump()) - self.db_connector.create_accumulator_event(db_model) + self.db_connector.create_accumulator_event( + protocol_id=self.PROTOCOL_TYPE, + event_name=event_model.event_name, + block_number=event_model.block_number, + event_data={ + "token": event_model.token, + "lending_accumulator": event_model.lending_accumulator, + "debt_accumulator": event_model.debt_accumulator + } + ) - def save_liquidation_event(self, event: Dict[str, Any]) -> None: + def save_liquidation_event(self, event_model: LiquidationEventModel) -> None: """ Save a liquidation event to the database. """ - parser_func, _, model_class = self.EVENT_MAPPING["zklend::market::Market::Liquidation"] - parsed_data = parser_func(event) - db_model = model_class(**parsed_data.model_dump()) - - self.db_connector.create_liquidation_event(db_model) + self.db_connector.create_liquidation_event( + protocol_id=self.PROTOCOL_TYPE, + event_name=event_model.event_name, + block_number=event_model.block_number, + event_data={ + "liquidator": event_model.liquidator, + "user": event_model.user, + "debt_token": event_model.debt_token, + "debt_raw_amount": event_model.debt_raw_amount, + "debt_face_amount": event_model.debt_face_amount, + "collateral_token": event_model.collateral_token, + "collateral_amount": event_model.collateral_amount + } + ) + + def save_borrowing_event(self, event_model: BorrowingEventModel) -> None: + """ + Save a borrowing event to the database. + """ + self.db_connector.create_borrowing_event( + protocol_id=self.PROTOCOL_TYPE, + event_name=event_model.event_name, + block_number=event_model.block_number, + event_data={ + "user": event_model.user, + "token": event_model.token, + "raw_amount": event_model.raw_amount, + "face_amount": event_model.face_amount + } + ) + + def save_deposit_event(self, event_model: DepositEventModel) -> None: + """ + Save a deposit event to the database. + """ + self.db_connector.create_deposit_event( + protocol_id=self.PROTOCOL_TYPE, + event_name=event_model.event_name, + block_number=event_model.block_number, + event_data={ + "user": event_model.user, + "token": event_model.token, + "face_amount": event_model.face_amount + } + ) + + def save_withdrawal_event(self, event_model: WithdrawalEventModel) -> None: + """ + Save a withdrawal event to the database. + """ + self.db_connector.create_withdrawal_event( + protocol_id=self.PROTOCOL_TYPE, + event_name=event_model.event_name, + block_number=event_model.block_number, + event_data={ + "user": event_model.user, + "token": event_model.token, + "face_amount": event_model.face_amount + } + ) + + def save_collateral_enabled_disabled_event(self, event_model: CollateralEnabledDisabledEventModel) -> None: + """ + Save a collateral enabled/disabled event to the database. + """ + self.db_connector.create_collateral_enabled_disabled_event( + protocol_id=self.PROTOCOL_TYPE, + event_name=event_model.event_name, + block_number=event_model.block_number, + event_data={ + "user": event_model.user, + "token": event_model.token + } + ) + + def save_repayment_event(self, event_model: RepaymentEventModel) -> None: + """ + Save a repayment event to the database. + """ + self.db_connector.create_repayment_event( + protocol_id=self.PROTOCOL_TYPE, + event_name=event_model.event_name, + block_number=event_model.block_number, + event_data={ + "repayer": event_model.repayer, + "beneficiary": event_model.beneficiary, + "token": event_model.token, + "raw_amount": event_model.raw_amount, + "face_amount": event_model.face_amount + } + ) def run(self) -> None: """ @@ -131,4 +288,4 @@ def run(self) -> None: This is the init function for when ZklendTransformer class is called directly. """ transformer = ZklendTransformer() - transformer.run() \ No newline at end of file + transformer.run() From 1c208b3d7c28023fd67dd18cd1658c90e1993794 Mon Sep 17 00:00:00 2001 From: Peterson_dt <168048103+petersdt@users.noreply.github.com> Date: Sat, 2 Nov 2024 06:40:26 +0000 Subject: [PATCH 2/5] refact: update zklend transformers --- .../events/zklend/transform_events.py | 176 ++++++++---------- apps/data_handler/tests/conftest.py | 28 ++- 2 files changed, 109 insertions(+), 95 deletions(-) diff --git a/apps/data_handler/handlers/events/zklend/transform_events.py b/apps/data_handler/handlers/events/zklend/transform_events.py index 250419e5..8d87882f 100644 --- a/apps/data_handler/handlers/events/zklend/transform_events.py +++ b/apps/data_handler/handlers/events/zklend/transform_events.py @@ -9,103 +9,87 @@ from typing import Dict, Any, Tuple, Type, Callable from shared.constants import ProtocolIDs from data_handler.handler_tools.data_parser.zklend import ZklendDataParser -from data_handler.db.models.zklend_events import ( - AccumulatorsSyncEventModel, - LiquidationEventModel, - RepaymentEventModel, - BorrowingEventModel, - DepositEventModel, - WithdrawalEventModel, - CollateralEnabledDisabledEventModel + +from data_handler.handler_tools.data_parser.serializers import ( + AccumulatorsSyncEventData, + LiquidationEventData, + WithdrawalEventData, + BorrowingEventData, + RepaymentEventData, + DepositEventData, + CollateralEnabledDisabledEventData, ) + from data_handler.db.crud import ZkLendEventDBConnector from data_handler.handler_tools.constants import ProtocolAddresses - - logger = logging.getLogger(__name__) -EVENT_MAPPING: Dict[str, Tuple[Callable, str, Type[Base]]] = { +EVENT_MAPPING: Dict[str, Tuple[Callable, str]] = { "AccumulatorsSync": ( ZklendDataParser.parse_accumulators_sync_event, - "save_accumulators_sync_event", - AccumulatorsSyncEventModel + "save_accumulators_sync_event" ), "zklend::market::Market::AccumulatorsSync": ( ZklendDataParser.parse_accumulators_sync_event, - "save_accumulators_sync_event", - AccumulatorsSyncEventModel + "save_accumulators_sync_event" ), "Liquidation": ( ZklendDataParser.parse_liquidation_event, - "save_liquidation_event", - LiquidationEventModel + "save_liquidation_event" ), "zklend::market::Market::Liquidation": ( ZklendDataParser.parse_liquidation_event, - "save_liquidation_event", - LiquidationEventModel + "save_liquidation_event" ), "Repayment": ( ZklendDataParser.parse_repayment_event, - "save_repayment_event", - RepaymentEventModel + "save_repayment_event" ), "zklend::market::Market::Repayment": ( ZklendDataParser.parse_repayment_event, - "save_repayment_event", - RepaymentEventModel + "save_repayment_event" ), "Borrowing": ( ZklendDataParser.parse_borrowing_event, - "save_borrowing_event", - BorrowingEventModel + "save_borrowing_event" ), "zklend::market::Market::Borrowing": ( ZklendDataParser.parse_borrowing_event, - "save_borrowing_event", - BorrowingEventModel + "save_borrowing_event" ), "Deposit": ( ZklendDataParser.parse_deposit_event, - "save_deposit_event", - DepositEventModel + "save_deposit_event" ), "zklend::market::Market::Deposit": ( ZklendDataParser.parse_deposit_event, - "save_deposit_event", - DepositEventModel + "save_deposit_event" ), "Withdrawal": ( ZklendDataParser.parse_withdrawal_event, - "save_withdrawal_event", - WithdrawalEventModel + "save_withdrawal_event" ), "zklend::market::Market::Withdrawal": ( ZklendDataParser.parse_withdrawal_event, - "save_withdrawal_event", - WithdrawalEventModel + "save_withdrawal_event" ), "CollateralEnabled": ( ZklendDataParser.parse_collateral_enabled_disabled_event, - "save_collateral_enabled_disabled_event", - CollateralEnabledDisabledEventModel + "save_collateral_enabled_disabled_event" ), "zklend::market::Market::CollateralEnabled": ( ZklendDataParser.parse_collateral_enabled_disabled_event, - "save_collateral_enabled_disabled_event", - CollateralEnabledDisabledEventModel + "save_collateral_enabled_disabled_event" ), "CollateralDisabled": ( ZklendDataParser.parse_collateral_enabled_disabled_event, - "save_collateral_enabled_disabled_event", - CollateralEnabledDisabledEventModel + "save_collateral_enabled_disabled_event" ), "zklend::market::Market::CollateralDisabled": ( ZklendDataParser.parse_collateral_enabled_disabled_event, - "save_collateral_enabled_disabled_event", - CollateralEnabledDisabledEventModel + "save_collateral_enabled_disabled_event" ), } @@ -147,121 +131,125 @@ def fetch_and_transform_events(self, from_address: str, min_block: int, max_bloc for event in response: event_type = event.get("key_name") if event_type in self.EVENT_MAPPING: - parser_func, save_to_db_method_name, model_class = self.EVENT_MAPPING[event_type] + parser_func, save_to_db_method_name = self.EVENT_MAPPING[event_type] parsed_data = parser_func(event["data"]) - db_model = model_class(**parsed_data.model_dump()) - getattr(self, save_to_db_method_name)(db_model) + + getattr(self, save_to_db_method_name)( + event_name=event_type, + block_number=event.get("block_number"), + event_data=parsed_data + ) else: logger.info(f"Event type {event_type} not supported, yet...") - def save_accumulators_sync_event(self, event_model: AccumulatorsSyncEventModel) -> None: + def save_accumulators_sync_event(self, event_name: str, block_number: int, event_data: AccumulatorsSyncEventData) -> None: """ Save an accumulators sync event to the database. """ self.db_connector.create_accumulator_event( protocol_id=self.PROTOCOL_TYPE, - event_name=event_model.event_name, - block_number=event_model.block_number, + event_name=event_name, + block_number=block_number, event_data={ - "token": event_model.token, - "lending_accumulator": event_model.lending_accumulator, - "debt_accumulator": event_model.debt_accumulator + "token": event_data.token, + "lending_accumulator": event_data.lending_accumulator, + "debt_accumulator": event_data.debt_accumulator } ) - def save_liquidation_event(self, event_model: LiquidationEventModel) -> None: + def save_liquidation_event(self, event_name: str, block_number: int, event_data: LiquidationEventData) -> None: """ Save a liquidation event to the database. """ self.db_connector.create_liquidation_event( protocol_id=self.PROTOCOL_TYPE, - event_name=event_model.event_name, - block_number=event_model.block_number, + event_name=event_name, + block_number=block_number, event_data={ - "liquidator": event_model.liquidator, - "user": event_model.user, - "debt_token": event_model.debt_token, - "debt_raw_amount": event_model.debt_raw_amount, - "debt_face_amount": event_model.debt_face_amount, - "collateral_token": event_model.collateral_token, - "collateral_amount": event_model.collateral_amount + "liquidator": event_data.liquidator, + "user": event_data.user, + "debt_token": event_data.debt_token, + "debt_raw_amount": event_data.debt_raw_amount, + "debt_face_amount": event_data.debt_face_amount, + "collateral_token": event_data.collateral_token, + "collateral_amount": event_data.collateral_amount } ) - def save_borrowing_event(self, event_model: BorrowingEventModel) -> None: + def save_borrowing_event(self, event_name: str, block_number: int, event_data: BorrowingEventData) -> None: """ Save a borrowing event to the database. """ self.db_connector.create_borrowing_event( protocol_id=self.PROTOCOL_TYPE, - event_name=event_model.event_name, - block_number=event_model.block_number, + event_name=event_name, + block_number=block_number, event_data={ - "user": event_model.user, - "token": event_model.token, - "raw_amount": event_model.raw_amount, - "face_amount": event_model.face_amount + "user": event_data.user, + "token": event_data.token, + "raw_amount": event_data.raw_amount, + "face_amount": event_data.face_amount } ) - def save_deposit_event(self, event_model: DepositEventModel) -> None: + def save_deposit_event(self, event_name: str, block_number: int, event_data: DepositEventData) -> None: """ Save a deposit event to the database. """ self.db_connector.create_deposit_event( protocol_id=self.PROTOCOL_TYPE, - event_name=event_model.event_name, - block_number=event_model.block_number, + event_name=event_name, + block_number=block_number, event_data={ - "user": event_model.user, - "token": event_model.token, - "face_amount": event_model.face_amount + "user": event_data.user, + "token": event_data.token, + "face_amount": event_data.face_amount } ) - def save_withdrawal_event(self, event_model: WithdrawalEventModel) -> None: + def save_withdrawal_event(self, event_name: str, block_number: int, event_data: WithdrawalEventData) -> None: """ Save a withdrawal event to the database. """ self.db_connector.create_withdrawal_event( protocol_id=self.PROTOCOL_TYPE, - event_name=event_model.event_name, - block_number=event_model.block_number, + event_name=event_name, + block_number=block_number, event_data={ - "user": event_model.user, - "token": event_model.token, - "face_amount": event_model.face_amount + "user": event_data.user, + "token": event_data.token, + "face_amount": event_data.face_amount } ) - def save_collateral_enabled_disabled_event(self, event_model: CollateralEnabledDisabledEventModel) -> None: + def save_collateral_enabled_disabled_event(self, event_name: str, block_number: int, event_data: CollateralEnabledDisabledEventData) -> None: """ Save a collateral enabled/disabled event to the database. """ self.db_connector.create_collateral_enabled_disabled_event( protocol_id=self.PROTOCOL_TYPE, - event_name=event_model.event_name, - block_number=event_model.block_number, + event_name=event_name, + block_number=block_number, event_data={ - "user": event_model.user, - "token": event_model.token + "user": event_data.user, + "token": event_data.token } ) - def save_repayment_event(self, event_model: RepaymentEventModel) -> None: + def save_repayment_event(self, event_name: str, block_number: int, event_data: RepaymentEventData) -> None: """ Save a repayment event to the database. """ self.db_connector.create_repayment_event( protocol_id=self.PROTOCOL_TYPE, - event_name=event_model.event_name, - block_number=event_model.block_number, + event_name=event_name, + block_number=block_number, event_data={ - "repayer": event_model.repayer, - "beneficiary": event_model.beneficiary, - "token": event_model.token, - "raw_amount": event_model.raw_amount, - "face_amount": event_model.face_amount + "repayer": event_data.repayer, + "beneficiary": event_data.beneficiary, + "token": event_data.token, + "raw_amount": event_data.raw_amount, + "face_amount": event_data.face_amount } ) diff --git a/apps/data_handler/tests/conftest.py b/apps/data_handler/tests/conftest.py index 256c8a89..344ffda1 100644 --- a/apps/data_handler/tests/conftest.py +++ b/apps/data_handler/tests/conftest.py @@ -5,8 +5,14 @@ from unittest.mock import MagicMock import pytest -from data_handler.db.crud import DBConnector, InitializerDBConnector +from data_handler.db.crud import ( + DBConnector, + InitializerDBConnector, + ZkLendEventDBConnector +) from data_handler.handler_tools.api_connector import DeRiskAPIConnector +from data_handler.handler_tools.data_parser.zklend import ZklendDataParser + @pytest.fixture(scope="module") def mock_db_connector() -> None: @@ -36,3 +42,23 @@ def mock_api_connector(): """ mock_api_connector = MagicMock(spec=DeRiskAPIConnector) yield mock_api_connector + + +@pytest.fixture(scope="function") +def mock_zklend_event_db_connector(): + """ + Mock for ZkLendEventDBConnector + :return: None + """ + mock_zklend_event_db_connector = MagicMock(spec=ZkLendEventDBConnector) + yield mock_zklend_event_db_connector + + +@pytest.fixture(scope="function") +def mock_zklend_data_parser(): + """ + Mock for ZklendDataParser + :return: None + """ + mock_zklend_data_parser = MagicMock(spec=ZklendDataParser) + yield mock_zklend_data_parser From f47a8416d615c655c85dc696abaf2b2ef699c458 Mon Sep 17 00:00:00 2001 From: Peterson_dt <168048103+petersdt@users.noreply.github.com> Date: Sat, 2 Nov 2024 07:36:25 +0000 Subject: [PATCH 3/5] test: create test for zklendtransformers --- .../handler_tools/data_parser/serializers.py | 15 +- .../handler_tools/data_parser/zklend.py | 6 +- .../events/zklend/transform_events.py | 5 +- apps/data_handler/tests/conftest.py | 1 + .../tests/test_zklend_transformer.py | 456 ++++++++++++++++++ 5 files changed, 472 insertions(+), 11 deletions(-) create mode 100644 apps/data_handler/tests/test_zklend_transformer.py diff --git a/apps/data_handler/handler_tools/data_parser/serializers.py b/apps/data_handler/handler_tools/data_parser/serializers.py index 6181009d..593f220d 100644 --- a/apps/data_handler/handler_tools/data_parser/serializers.py +++ b/apps/data_handler/handler_tools/data_parser/serializers.py @@ -295,7 +295,7 @@ def validate_addresses(cls, value: str) -> str: return add_leading_zeros(value) @field_validator("amount", mode="before") - def validate_amount(cls, value: str) -> Decimal: + def validate_amount(cls, value: str, info: ValidationInfo) -> Decimal: """ Validates that the provided amount is numeric and converts it to a Decimal. @@ -308,10 +308,13 @@ def validate_amount(cls, value: str) -> Decimal: Raises: ValueError: If the provided amount is not numeric. """ - if not value.isdigit(): - raise ValueError("Amount field is not numeric") - return Decimal(value) - + try: + return Decimal(int(value, 16)) + except ValueError: + raise ValueError( + f"{info.field_name} field is not a valid hexadecimal number" + ) + class CollateralEnabledDisabledEventData(BaseModel): """ Data model representing a collateral enabled/disabled event in the system. """ @@ -329,4 +332,4 @@ def validate_valid_addresses(cls, value: str, info: ValidationInfo) -> str: """ if not value.startswith("0x"): raise ValueError("Invalid address provided for %s" % info.field_name) - return add_leading_zeros(value) \ No newline at end of file + return add_leading_zeros(value) diff --git a/apps/data_handler/handler_tools/data_parser/zklend.py b/apps/data_handler/handler_tools/data_parser/zklend.py index 1a95c821..d0f7e8fa 100644 --- a/apps/data_handler/handler_tools/data_parser/zklend.py +++ b/apps/data_handler/handler_tools/data_parser/zklend.py @@ -149,6 +149,6 @@ def parse_collateral_enabled_disabled_event( CollateralEnabledDisabledEventData: A model with the parsed event data. """ return CollateralEnabledDisabledEventData( - user=event_data["data"][0], - token=event_data["data"][1], - ) \ No newline at end of file + user=event_data[0], + token=event_data[1], + ) diff --git a/apps/data_handler/handlers/events/zklend/transform_events.py b/apps/data_handler/handlers/events/zklend/transform_events.py index 8d87882f..130ae470 100644 --- a/apps/data_handler/handlers/events/zklend/transform_events.py +++ b/apps/data_handler/handlers/events/zklend/transform_events.py @@ -100,7 +100,7 @@ class ZklendTransformer: """ EVENT_MAPPING: Dict[str, Tuple[Callable, str, Type[Base]]] = EVENT_MAPPING - PROTOCOL_ADDRESSES: str = ProtocolAddresses.ZKLEND_MARKET_ADDRESSES + PROTOCOL_ADDRESSES: str = "0x04c0a5193d58f74fbace4b74dcf65481e734ed1714121bdc571da345540efa05" PROTOCOL_TYPE: ProtocolIDs = ProtocolIDs.ZKLEND PAGINATION_SIZE: int = 1000 @@ -218,7 +218,7 @@ def save_withdrawal_event(self, event_name: str, block_number: int, event_data: event_data={ "user": event_data.user, "token": event_data.token, - "face_amount": event_data.face_amount + "amount": event_data.amount } ) @@ -277,3 +277,4 @@ def run(self) -> None: """ transformer = ZklendTransformer() transformer.run() + \ No newline at end of file diff --git a/apps/data_handler/tests/conftest.py b/apps/data_handler/tests/conftest.py index 344ffda1..250c7a9d 100644 --- a/apps/data_handler/tests/conftest.py +++ b/apps/data_handler/tests/conftest.py @@ -62,3 +62,4 @@ def mock_zklend_data_parser(): """ mock_zklend_data_parser = MagicMock(spec=ZklendDataParser) yield mock_zklend_data_parser +k \ No newline at end of file diff --git a/apps/data_handler/tests/test_zklend_transformer.py b/apps/data_handler/tests/test_zklend_transformer.py new file mode 100644 index 00000000..29b6258c --- /dev/null +++ b/apps/data_handler/tests/test_zklend_transformer.py @@ -0,0 +1,456 @@ +""" +Test the zklend transformer +""" + +import pytest +from typing import Dict, Any +from shared.constants import ProtocolIDs +from unittest.mock import MagicMock, patch +from data_handler.handlers.events.zklend.transform_events import ZklendTransformer +from data_handler.handler_tools.data_parser.zklend import ZklendDataParser + +from data_handler.handler_tools.data_parser.serializers import ( + AccumulatorsSyncEventData, + LiquidationEventData, + WithdrawalEventData, + BorrowingEventData, + RepaymentEventData, + DepositEventData, + CollateralEnabledDisabledEventData, +) + + +@pytest.fixture(scope="function") +def transformer(): + """ + Fixture to create a ZklendTransformer instance with mocked dependencies. + """ + with patch('data_handler.handlers.events.zklend.transform_events.DeRiskAPIConnector') as mock_api, \ + patch('data_handler.handlers.events.zklend.transform_events.ZkLendEventDBConnector') as mock_db: + + # Configure mock DB + mock_db_instance = mock_db.return_value + mock_db_instance.get_last_block.return_value = 0 + + # Configure mock API + mock_api_instance = mock_api.return_value + + transformer = ZklendTransformer() + transformer.api_connector = mock_api_instance + transformer.db_connector = mock_db_instance + + return transformer + +@pytest.fixture(scope="function") +def sample_borrowing_event_data() -> Dict[str, Any]: + """ + Sample borrowing event data + """ + return { + "id": "0x00a00637ed8fd6f3f83a1eb743a36c894c6fe5af5a87e8ab35697afb3422967e_3", + "block_hash": "0x07d1b221c40b6a19c0381d61ebbe8d048018b49314ae1bdc93938059e29febdf", + "block_number": 630008, + "transaction_hash": "0x00a00637ed8fd6f3f83a1eb743a36c894c6fe5af5a87e8ab35697afb3422967e", + "event_index": 3, + "from_address": "0x04c0a5193d58f74fbace4b74dcf65481e734ed1714121bdc571da345540efa05", + "keys": ["0xfa3f9acdb7b24dcf6d40d77ff2f87a87bca64a830a2169aebc9173db23ff41"], + "data": [ + "0x1a0027d1bf86904d1051fe0ca94c39b659135f19504d663d66771a7424ca2eb", + "0x49d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7", + "0x8ec920c39e9", + "0x9184e72a000" + ], + "timestamp": 1712276824, + "key_name": "zklend::market::Market::Borrowing" + } + + +@pytest.fixture(scope="function") +def sample_repayment_event_data() -> Dict[str, Any]: + """ + Sample repayment event data + """ + return { + "id": "0x0216d505e065501a8f26be71516b6f624dedff0dee50c5ccbc33142f378d8028_5", + "block_hash": "0x056914ef72facffc6e7fbb651d7ee91fa3a0bcc49de3058129ece5c706a72bd8", + "block_number": 630004, + "transaction_hash": "0x0216d505e065501a8f26be71516b6f624dedff0dee50c5ccbc33142f378d8028", + "event_index": 5, + "from_address": "0x04c0a5193d58f74fbace4b74dcf65481e734ed1714121bdc571da345540efa05", + "keys": ["0x7ae0ab7952bbfc33a72035e5eccec7c8816723421c0acb315bd4690a71d46e"], + "data": [ + "0x7f121e44b3f446cdcaa28b230546956208d51e96894acc3b482947356bc10ed", + "0x7f121e44b3f446cdcaa28b230546956208d51e96894acc3b482947356bc10ed", + "0x3fe2b97c1fd336e750087d68b9b867997fd64a2661ff3ca5a7c771641e8e7ac", + "0xd60", + "0xdaf" + ], + "timestamp": 1712275350, + "key_name": "zklend::market::Market::Repayment" + } + + +@pytest.fixture(scope="function") +def sample_deposit_event_data() -> Dict[str, Any]: + """ + Sample deposit event data + """ + return { + "id": "0x053217250e329e81d69d44a9f89bb65c4b97d07693f4a59ee32d898f5e0beef2_5", + "block_hash": "0x07d1b221c40b6a19c0381d61ebbe8d048018b49314ae1bdc93938059e29febdf", + "block_number": 630008, + "transaction_hash": "0x053217250e329e81d69d44a9f89bb65c4b97d07693f4a59ee32d898f5e0beef2", + "event_index": 5, + "from_address": "0x04c0a5193d58f74fbace4b74dcf65481e734ed1714121bdc571da345540efa05", + "keys": ["0x9149d2123147c5f43d258257fef0b7b969db78269369ebcf5ebb9eef8592f2"], + "data": [ + "0x1cfa080d4bbddc206637afad05e5e1abb04da69630f40b2fd9dc578e618ec78", + "0x585c32b625999e6e5e78645ff8df7a9001cf5cf3eb6b80ccdd16cb64bd3a34", + "0x14839256fce60ba2c" + ], + "timestamp": 1712276824, + "key_name": "zklend::market::Market::Deposit" + } + + +@pytest.fixture(scope="function") +def sample_withdrawal_event_data() -> Dict[str, Any]: + """ + Sample withdrawal event data + """ + return { + "id": "0x01e6bdd3a0cc5531b97ba28c135ceffd0d528aa648a8731e0dfb0ca293465991_3", + "block_hash": "0x06eb8ae20d3e98d69025be79135523cded41257cfd694b1aea02ddec8e9196d9", + "block_number": 630009, + "transaction_hash": "0x01e6bdd3a0cc5531b97ba28c135ceffd0d528aa648a8731e0dfb0ca293465991", + "event_index": 3, + "from_address": "0x04c0a5193d58f74fbace4b74dcf65481e734ed1714121bdc571da345540efa05", + "keys": ["0x2eed7e29b3502a726faf503ac4316b7101f3da813654e8df02c13449e03da8"], + "data": [ + "0x49920f8f551060f726e3c8c2fe26e2b39376027450b7672634824bd60c64022", + "0x585c32b625999e6e5e78645ff8df7a9001cf5cf3eb6b80ccdd16cb64bd3a34", + "0x176b344f2a78c0000" + ], + "timestamp": 1712277188, + "key_name": "zklend::market::Market::Withdrawal" + } + + + +@pytest.fixture(scope="function") +def sample_collateral_enabled_event_data() -> Dict[str, Any]: + """ + Sample collateral enabled event data + """ + return { + "id": "0x043e9faa1cb77136dcbfcd7d093583bd877d10e55b5ebe83c49c88853d46a744_0", + "block_hash": "0x03a7d0eac98323ecf1c756e5c10668a1e82dd6a858ed2909f36797e471279853", + "block_number": 630010, + "transaction_hash": "0x043e9faa1cb77136dcbfcd7d093583bd877d10e55b5ebe83c49c88853d46a744", + "event_index": 0, + "from_address": "0x04c0a5193d58f74fbace4b74dcf65481e734ed1714121bdc571da345540efa05", + "keys": ["0x2324062bde6ebb76ffd17d55fee62fee62a4877588eb02524b19c091983b365"], + "data": [ + "0x54f9574d3029b81e0d64e3267a7b682ab920b57948644de4581f5ceb30351ea", + "0xda114221cb83fa859dbdb4c44beeaa0bb37c7537ad5ae66fe5e0efd20e6eb3" + ], + "timestamp": 1712277561, + "key_name": "zklend::market::Market::CollateralEnabled" + } + + +@pytest.fixture(scope="function") +def sample_collateral_disabled_event_data() -> Dict[str, Any]: + """ + Sample collateral disabled event data + """ + return { + "id": "0x03b10eded4321e6385993b392c8c9a07be54ae822c467b0d6e029886c7ddf62b_0", + "block_hash": "0x022e7611bf432bfefe7743b69da8fb498834ffbc2bbe220c57dd8709c1247596", + "block_number": 630028, + "transaction_hash": "0x03b10eded4321e6385993b392c8c9a07be54ae822c467b0d6e029886c7ddf62b", + "event_index": 0, + "from_address": "0x04c0a5193d58f74fbace4b74dcf65481e734ed1714121bdc571da345540efa05", + "keys": ["0xf999d0d33513a8215756ae6a9223180a439c134372b158bc84b9dd02f63856"], + "data": [ + "0x237be5917e0f4ceba3067af8f11137cc7262b9444fce220183e7fdffe4c1a40", + "0x4718f5a0fc34cc1af16a1cdee98ffb20c31f5cd61d6ab07201858f4287c938d" + ], + "timestamp": 1712284226, + "key_name": "zklend::market::Market::CollateralDisabled" + } + + +@pytest.fixture(scope="function") +def sample_accumulators_sync_event_data() -> Dict[str, Any]: + """ + Sample accumulators sync event data + """ + return { + "id": "0x001dfdb09e48a91cf6297c9fd50878c25b91ab67cb826a50f05ef03bd74192c6_0", + "block_hash": "0x0474f1553ebeba66a52163ad62172f27d797d6b139159c391b611f5c7ab58e96", + "block_number": 630029, + "transaction_hash": "0x001dfdb09e48a91cf6297c9fd50878c25b91ab67cb826a50f05ef03bd74192c6", + "event_index": 0, + "from_address": "0x04c0a5193d58f74fbace4b74dcf65481e734ed1714121bdc571da345540efa05", + "keys": ["0x30c296ae369716818de77cb5b71ce9cda7cc2c0e8456f474e0abb1ae8d017da"], + "data": ["0x53c91253bc9682c04929ca02ed00b3e423f6710d2ee7e0d5ebb06f3ecf368a8", "0x3583127bd9f4ef81d8d7b6e", "0x364c261a781ab91b6c39aca"], + "timestamp": 1712284614, + "key_name": "zklend::market::Market::AccumulatorsSync" + } + + +def test_save_borrowing_event(transformer, sample_borrowing_event_data): + """ + Test saving a borrowing event. + """ + # Setup API response + transformer.api_connector.get_data.return_value = [sample_borrowing_event_data] + + expected_parsed_data = BorrowingEventData( + user=sample_borrowing_event_data['data'][0], + token=sample_borrowing_event_data['data'][1], + raw_amount=sample_borrowing_event_data['data'][2], + face_amount=sample_borrowing_event_data['data'][3] + ) + + # Call the method + transformer.fetch_and_transform_events( + from_address=transformer.PROTOCOL_ADDRESSES, + min_block=0, + max_block=1000 + ) + + # Verify DB connector was called with correct data + transformer.db_connector.create_borrowing_event.assert_called_once_with( + protocol_id=ProtocolIDs.ZKLEND, + event_name=sample_borrowing_event_data['key_name'], + block_number=sample_borrowing_event_data['block_number'], + event_data={ + 'user': expected_parsed_data.user, + 'token': expected_parsed_data.token, + 'raw_amount': expected_parsed_data.raw_amount, + 'face_amount': expected_parsed_data.face_amount + } + ) + + +def test_save_repayment_event(transformer, sample_repayment_event_data): + """ + Test saving a repayment event. + """ + transformer.api_connector.get_data.return_value = [sample_repayment_event_data] + + expected_parsed_data = RepaymentEventData( + repayer=sample_repayment_event_data['data'][0], + beneficiary=sample_repayment_event_data['data'][1], + token=sample_repayment_event_data['data'][2], + raw_amount=sample_repayment_event_data['data'][3], + face_amount=sample_repayment_event_data['data'][4] + ) + + transformer.fetch_and_transform_events( + from_address=transformer.PROTOCOL_ADDRESSES, + min_block=0, + max_block=1000 + ) + + transformer.db_connector.create_repayment_event.assert_called_once_with( + protocol_id=ProtocolIDs.ZKLEND, + event_name=sample_repayment_event_data['key_name'], + block_number=sample_repayment_event_data['block_number'], + event_data={ + 'repayer': expected_parsed_data.repayer, + 'beneficiary': expected_parsed_data.beneficiary, + 'token': expected_parsed_data.token, + 'raw_amount': expected_parsed_data.raw_amount, + 'face_amount': expected_parsed_data.face_amount + } + ) + + +def test_unsupported_event_type(transformer): + """ + Test handling of unsupported event types. + """ + unsupported_event = { + 'key_name': 'UnsupportedEvent', + 'data': [], + 'block_number': 1000 + } + transformer.api_connector.get_data.return_value = [unsupported_event] + + # Should not raise an exception + transformer.fetch_and_transform_events( + from_address=transformer.PROTOCOL_ADDRESSES, + min_block=0, + max_block=1000 + ) + + # Verify no DB calls were made + transformer.db_connector.create_borrowing_event.assert_not_called() + transformer.db_connector.create_repayment_event.assert_not_called() + transformer.db_connector.create_deposit_event.assert_not_called() + transformer.db_connector.create_withdrawal_event.assert_not_called() + transformer.db_connector.create_collateral_enabled_event.assert_not_called() + transformer.db_connector.create_collateral_disabled_event.assert_not_called() + transformer.db_connector.create_accumulators_sync_event.assert_not_called() + + +def test_api_error_handling(transformer): + """ + Test handling of API errors. + """ + transformer.api_connector.get_data.return_value = {'error': 'API Error'} + + with pytest.raises(ValueError, match='Error fetching events: API Error'): + transformer.fetch_and_transform_events( + from_address=transformer.PROTOCOL_ADDRESSES, + min_block=0, + max_block=1000 + ) + + +def test_save_deposit_event(transformer, sample_deposit_event_data): + """ + Test saving a deposit event. + """ + transformer.api_connector.get_data.return_value = [sample_deposit_event_data] + + expected_parsed_data = DepositEventData( + user=sample_deposit_event_data['data'][0], + token=sample_deposit_event_data['data'][1], + face_amount=sample_deposit_event_data['data'][2] + ) + + transformer.fetch_and_transform_events( + from_address=transformer.PROTOCOL_ADDRESSES, + min_block=0, + max_block=1000 + ) + + transformer.db_connector.create_deposit_event.assert_called_once_with( + protocol_id=ProtocolIDs.ZKLEND, + event_name=sample_deposit_event_data['key_name'], + block_number=sample_deposit_event_data['block_number'], + event_data={ + 'user': expected_parsed_data.user, + 'token': expected_parsed_data.token, + 'face_amount': expected_parsed_data.face_amount + } + ) + + +def test_save_withdrawal_event(transformer, sample_withdrawal_event_data): + """ + Test saving a withdrawal event. + """ + transformer.api_connector.get_data.return_value = [sample_withdrawal_event_data] + + expected_parsed_data = WithdrawalEventData( + user=sample_withdrawal_event_data['data'][0], + token=sample_withdrawal_event_data['data'][2], + amount=sample_withdrawal_event_data['data'][1] + ) + + transformer.fetch_and_transform_events( + from_address=transformer.PROTOCOL_ADDRESSES, + min_block=0, + max_block=1000 + ) + + transformer.db_connector.create_withdrawal_event.assert_called_once_with( + protocol_id=ProtocolIDs.ZKLEND, + event_name=sample_withdrawal_event_data['key_name'], + block_number=sample_withdrawal_event_data['block_number'], + event_data={ + 'user': expected_parsed_data.user, + 'token': expected_parsed_data.token, + 'amount': expected_parsed_data.amount + } + ) + + +def test_save_collateral_enabled_event(transformer, sample_collateral_enabled_event_data): + """ + Test saving a collateral enabled event. + """ + transformer.api_connector.get_data.return_value = [sample_collateral_enabled_event_data] + + expected_parsed_data = CollateralEnabledDisabledEventData( + user=sample_collateral_enabled_event_data['data'][0], + token=sample_collateral_enabled_event_data['data'][1] + ) + + transformer.fetch_and_transform_events( + from_address=transformer.PROTOCOL_ADDRESSES, + min_block=0, + max_block=1000 + ) + + transformer.db_connector.create_collateral_enabled_disabled_event.assert_called_once_with( + protocol_id=ProtocolIDs.ZKLEND, + event_name=sample_collateral_enabled_event_data['key_name'], + block_number=sample_collateral_enabled_event_data['block_number'], + event_data={ + 'user': expected_parsed_data.user, + 'token': expected_parsed_data.token + } + ) + + +def test_save_collateral_disabled_event(transformer, sample_collateral_disabled_event_data): + """ + Test saving a collateral disabled event. + """ + transformer.api_connector.get_data.return_value = [sample_collateral_disabled_event_data] + + expected_parsed_data = CollateralEnabledDisabledEventData( + user=sample_collateral_disabled_event_data['data'][0], + token=sample_collateral_disabled_event_data['data'][1] + ) + + transformer.fetch_and_transform_events( + from_address=transformer.PROTOCOL_ADDRESSES, + min_block=0, + max_block=1000 + ) + + transformer.db_connector.create_collateral_enabled_disabled_event.assert_called_once_with( + protocol_id=ProtocolIDs.ZKLEND, + event_name=sample_collateral_disabled_event_data['key_name'], + block_number=sample_collateral_disabled_event_data['block_number'], + event_data={ + 'user': expected_parsed_data.user, + 'token': expected_parsed_data.token + } + ) + +def test_save_accumulators_sync_event(transformer, sample_accumulators_sync_event_data): + """ + Test saving an accumulators sync event. + """ + transformer.api_connector.get_data.return_value = [sample_accumulators_sync_event_data] + + expected_parsed_data = AccumulatorsSyncEventData( + token=sample_accumulators_sync_event_data['data'][0], + lending_accumulator=sample_accumulators_sync_event_data['data'][1], + debt_accumulator=sample_accumulators_sync_event_data['data'][2] + ) + + transformer.fetch_and_transform_events( + from_address=transformer.PROTOCOL_ADDRESSES, + min_block=0, + max_block=1000 + ) + + transformer.db_connector.create_accumulator_event.assert_called_once_with( + protocol_id=ProtocolIDs.ZKLEND, + event_name=sample_accumulators_sync_event_data['key_name'], + block_number=sample_accumulators_sync_event_data['block_number'], + event_data={ + 'token': expected_parsed_data.token, + 'lending_accumulator': expected_parsed_data.lending_accumulator, + 'debt_accumulator': expected_parsed_data.debt_accumulator + } + ) From 4994bfaab79f81440e5c5d10245e5bcef3240732 Mon Sep 17 00:00:00 2001 From: Peterson_dt <168048103+petersdt@users.noreply.github.com> Date: Sat, 2 Nov 2024 15:56:09 +0000 Subject: [PATCH 4/5] fix: update transformzklend models --- apps/data_handler/db/crud.py | 150 ++++++++++++++++++ apps/data_handler/handler_tools/constants.py | 4 +- .../events/zklend/transform_events.py | 2 +- apps/data_handler/tests/conftest.py | 1 - learning.md | 13 ++ 5 files changed, 165 insertions(+), 5 deletions(-) create mode 100644 learning.md diff --git a/apps/data_handler/db/crud.py b/apps/data_handler/db/crud.py index ca767e65..9d88eeb5 100644 --- a/apps/data_handler/db/crud.py +++ b/apps/data_handler/db/crud.py @@ -26,6 +26,11 @@ from data_handler.db.models.zklend_events import ( AccumulatorsSyncEventModel, LiquidationEventModel, + RepaymentEventModel, + DepositEventModel, + CollateralEnabledDisabledEventModel, + BorrowingEventModel, + WithdrawalEventModel ) logger = logging.getLogger(__name__) @@ -630,6 +635,151 @@ def create_liquidation_event( finally: db.close() + def create_repayment_event( + self, protocol_id: str, event_name: str, block_number: int, event_data: dict + ) -> None: + """ + Creates a RepaymentEventModel record in the database. + :param protocol_id: The protocol ID for the event. + :param event_name: The name of the event. + :param block_number: The block number associated with the event. + :param event_data: A dictionary containing 'user', 'amount'. + """ + db = self.Session() + try: + event = RepaymentEventModel( + protocol_id=protocol_id, + event_name=event_name, + block_number=block_number, + repayer=event_data.get("repayer"), + beneficiary=event_data.get("beneficiary"), + token=event_data.get("token"), + raw_amount=event_data.get("raw_amount"), + face_amount=event_data.get("face_amount"), + ) + db.add(event) + db.commit() + except SQLAlchemyError as e: + db.rollback() + logger.error(f"Error creating RepaymentEventModel: {e}") + raise e + finally: + db.close() + + def create_borrowing_event( + self, protocol_id: str, event_name: str, block_number: int, event_data: dict + ) -> None: + """ + Creates a BorrowingEventModel record in the database. + :param protocol_id: The protocol ID for the event. + :param event_name: The name of the event. + :param block_number: The block number associated with the event. + :param event_data: A dictionary containing 'user', 'token', 'raw_amount', 'face_amount'. + """ + db = self.Session() + try: + event = BorrowingEventModel( + protocol_id=protocol_id, + event_name=event_name, + block_number=block_number, + user=event_data.get("user"), + token=event_data.get("token"), + raw_amount=event_data.get("raw_amount"), + face_amount=event_data.get("face_amount"), + ) + db.add(event) + db.commit() + except SQLAlchemyError as e: + db.rollback() + logger.error(f"Error creating BorrowingEventModel: {e}") + raise e + finally: + db.close() + + def create_deposit_event( + self, protocol_id: str, event_name: str, block_number: int, event_data: dict + ) -> None: + """ + Creates a DepositEventModel record in the database. + :param protocol_id: The protocol ID for the event. + :param event_name: The name of the event. + :param block_number: The block number associated with the event. + :param event_data: A dictionary containing 'user', 'token', 'face_amount'. + """ + db = self.Session() + try: + event = DepositEventModel( + protocol_id=protocol_id, + event_name=event_name, + block_number=block_number, + user=event_data.get("user"), + token=event_data.get("token"), + face_amount=event_data.get("face_amount"), + ) + db.add(event) + db.commit() + except SQLAlchemyError as e: + db.rollback() + logger.error(f"Error creating DepositEventModel: {e}") + raise e + + def create_withdrawal_event( + self, protocol_id: str, event_name: str, block_number: int, event_data: dict + ) -> None: + """ + Creates a WithdrawalEventModel record in the database. + :param protocol_id: The protocol ID for the event. + :param event_name: The name of the event. + :param block_number: The block number associated with the event. + :param event_data: A dictionary containing 'user', 'token', 'face_amount'. + """ + db = self.Session() + try: + event = WithdrawalEventModel( + protocol_id=protocol_id, + event_name=event_name, + block_number=block_number, + user=event_data.get("user"), + token=event_data.get("token"), + amount=event_data.get("amount"), + ) + db.add(event) + db.commit() + except SQLAlchemyError as e: + db.rollback() + logger.error(f"Error creating WithdrawalEventModel: {e}") + raise e + finally: + db.close() + + def create_collateral_enabled_disabled_event( + self, protocol_id: str, event_name: str, block_number: int, event_data: dict + ) -> None: + """ + Creates a CollateralEnabledDisabledEventModel record in the database. + :param protocol_id: The protocol ID for the event. + :param event_name: The name of the event. + :param block_number: The block number associated with the event. + :param event_data: A dictionary containing 'user', 'token'. + """ + db = self.Session() + try: + event = CollateralEnabledDisabledEventModel( + protocol_id=protocol_id, + event_name=event_name, + block_number=block_number, + user=event_data.get("user"), + token=event_data.get("token"), + ) + db.add(event) + db.commit() + except SQLAlchemyError as e: + db.rollback() + logger.error(f"Error creating CollateralEnabledDisabledEventModel: {e}") + raise e + finally: + db.close() + def get_all_events( self, protocol_id: Optional[str] = None, diff --git a/apps/data_handler/handler_tools/constants.py b/apps/data_handler/handler_tools/constants.py index 898dc847..a53b93f4 100644 --- a/apps/data_handler/handler_tools/constants.py +++ b/apps/data_handler/handler_tools/constants.py @@ -21,9 +21,7 @@ class ProtocolAddresses: This class contains the addresses of the contracts that are used """ - ZKLEND_MARKET_ADDRESSES: str = field( - default_factory=lambda: "0x04c0a5193d58f74fbace4b74dcf65481e734ed1714121bdc571da345540efa05" - ) + ZKLEND_MARKET_ADDRESSES: str = "0x04c0a5193d58f74fbace4b74dcf65481e734ed1714121bdc571da345540efa05" HASHSTACK_V0_ADDRESSES: Set[str] = field( default_factory=lambda: {"0x03dcf5c72ba60eb7b2fe151032769d49dd3df6b04fa3141dffd6e2aa162b7a6e"} diff --git a/apps/data_handler/handlers/events/zklend/transform_events.py b/apps/data_handler/handlers/events/zklend/transform_events.py index 130ae470..6ea2d837 100644 --- a/apps/data_handler/handlers/events/zklend/transform_events.py +++ b/apps/data_handler/handlers/events/zklend/transform_events.py @@ -100,7 +100,7 @@ class ZklendTransformer: """ EVENT_MAPPING: Dict[str, Tuple[Callable, str, Type[Base]]] = EVENT_MAPPING - PROTOCOL_ADDRESSES: str = "0x04c0a5193d58f74fbace4b74dcf65481e734ed1714121bdc571da345540efa05" + PROTOCOL_ADDRESSES: str = ProtocolAddresses.ZKLEND_MARKET_ADDRESSES PROTOCOL_TYPE: ProtocolIDs = ProtocolIDs.ZKLEND PAGINATION_SIZE: int = 1000 diff --git a/apps/data_handler/tests/conftest.py b/apps/data_handler/tests/conftest.py index 250c7a9d..344ffda1 100644 --- a/apps/data_handler/tests/conftest.py +++ b/apps/data_handler/tests/conftest.py @@ -62,4 +62,3 @@ def mock_zklend_data_parser(): """ mock_zklend_data_parser = MagicMock(spec=ZklendDataParser) yield mock_zklend_data_parser -k \ No newline at end of file diff --git a/learning.md b/learning.md new file mode 100644 index 00000000..d7a7990c --- /dev/null +++ b/learning.md @@ -0,0 +1,13 @@ +{"id": "0x0216d505e065501a8f26be71516b6f624dedff0dee50c5ccbc33142f378d8028_5", "block_hash": "0x056914ef72facffc6e7fbb651d7ee91fa3a0bcc49de3058129ece5c706a72bd8", "block_number": 630004, "transaction_hash": "0x0216d505e065501a8f26be71516b6f624dedff0dee50c5ccbc33142f378d8028", "event_index": 5, "from_address": "0x04c0a5193d58f74fbace4b74dcf65481e734ed1714121bdc571da345540efa05", "keys": ["0x7ae0ab7952bbfc33a72035e5eccec7c8816723421c0acb315bd4690a71d46e"], "data": ["0x7f121e44b3f446cdcaa28b230546956208d51e96894acc3b482947356bc10ed", "0x7f121e44b3f446cdcaa28b230546956208d51e96894acc3b482947356bc10ed", "0x3fe2b97c1fd336e750087d68b9b867997fd64a2661ff3ca5a7c771641e8e7ac", "0xd60", "0xdaf"], "timestamp": 1712275350, "key_name": "zklend::market::Market::Repayment"} + +{"id": "0x00a00637ed8fd6f3f83a1eb743a36c894c6fe5af5a87e8ab35697afb3422967e_3", "block_hash": "0x07d1b221c40b6a19c0381d61ebbe8d048018b49314ae1bdc93938059e29febdf", "block_number": 630008, "transaction_hash": "0x00a00637ed8fd6f3f83a1eb743a36c894c6fe5af5a87e8ab35697afb3422967e", "event_index": 3, "from_address": "0x04c0a5193d58f74fbace4b74dcf65481e734ed1714121bdc571da345540efa05", "keys": ["0xfa3f9acdb7b24dcf6d40d77ff2f87a87bca64a830a2169aebc9173db23ff41"], "data": ["0x1a0027d1bf86904d1051fe0ca94c39b659135f19504d663d66771a7424ca2eb", "0x49d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7", "0x8ec920c39e9", "0x9184e72a000"], "timestamp": 1712276824, "key_name": "zklend::market::Market::Borrowing"} + +{"id": "0x053217250e329e81d69d44a9f89bb65c4b97d07693f4a59ee32d898f5e0beef2_5", "block_hash": "0x07d1b221c40b6a19c0381d61ebbe8d048018b49314ae1bdc93938059e29febdf", "block_number": 630008, "transaction_hash": "0x053217250e329e81d69d44a9f89bb65c4b97d07693f4a59ee32d898f5e0beef2", "event_index": 5, "from_address": "0x04c0a5193d58f74fbace4b74dcf65481e734ed1714121bdc571da345540efa05", "keys": ["0x9149d2123147c5f43d258257fef0b7b969db78269369ebcf5ebb9eef8592f2"], "data": ["0x1cfa080d4bbddc206637afad05e5e1abb04da69630f40b2fd9dc578e618ec78", "0x585c32b625999e6e5e78645ff8df7a9001cf5cf3eb6b80ccdd16cb64bd3a34", "0x14839256fce60ba2c"], "timestamp": 1712276824, "key_name": "zklend::market::Market::Deposit"} + +{"id": "0x01e6bdd3a0cc5531b97ba28c135ceffd0d528aa648a8731e0dfb0ca293465991_3", "block_hash": "0x06eb8ae20d3e98d69025be79135523cded41257cfd694b1aea02ddec8e9196d9", "block_number": 630009, "transaction_hash": "0x01e6bdd3a0cc5531b97ba28c135ceffd0d528aa648a8731e0dfb0ca293465991", "event_index": 3, "from_address": "0x04c0a5193d58f74fbace4b74dcf65481e734ed1714121bdc571da345540efa05", "keys": ["0x2eed7e29b3502a726faf503ac4316b7101f3da813654e8df02c13449e03da8"], "data": ["0x49920f8f551060f726e3c8c2fe26e2b39376027450b7672634824bd60c64022", "0x585c32b625999e6e5e78645ff8df7a9001cf5cf3eb6b80ccdd16cb64bd3a34", "0x176b344f2a78c0000"], "timestamp": 1712277188, "key_name": "zklend::market::Market::Withdrawal"} + +{"id": "0x043e9faa1cb77136dcbfcd7d093583bd877d10e55b5ebe83c49c88853d46a744_0", "block_hash": "0x03a7d0eac98323ecf1c756e5c10668a1e82dd6a858ed2909f36797e471279853", "block_number": 630010, "transaction_hash": "0x043e9faa1cb77136dcbfcd7d093583bd877d10e55b5ebe83c49c88853d46a744", "event_index": 0, "from_address": "0x04c0a5193d58f74fbace4b74dcf65481e734ed1714121bdc571da345540efa05", "keys": ["0x2324062bde6ebb76ffd17d55fee62fee62a4877588eb02524b19c091983b365"], "data": ["0x54f9574d3029b81e0d64e3267a7b682ab920b57948644de4581f5ceb30351ea", "0xda114221cb83fa859dbdb4c44beeaa0bb37c7537ad5ae66fe5e0efd20e6eb3"], "timestamp": 1712277561, "key_name": "zklend::market::Market::CollateralEnabled"} + +{"id": "0x03b10eded4321e6385993b392c8c9a07be54ae822c467b0d6e029886c7ddf62b_0", "block_hash": "0x022e7611bf432bfefe7743b69da8fb498834ffbc2bbe220c57dd8709c1247596", "block_number": 630028, "transaction_hash": "0x03b10eded4321e6385993b392c8c9a07be54ae822c467b0d6e029886c7ddf62b", "event_index": 0, "from_address": "0x04c0a5193d58f74fbace4b74dcf65481e734ed1714121bdc571da345540efa05", "keys": ["0xf999d0d33513a8215756ae6a9223180a439c134372b158bc84b9dd02f63856"], "data": ["0x237be5917e0f4ceba3067af8f11137cc7262b9444fce220183e7fdffe4c1a40", "0x4718f5a0fc34cc1af16a1cdee98ffb20c31f5cd61d6ab07201858f4287c938d"], "timestamp": 1712284226, "key_name": "zklend::market::Market::CollateralDisabled"} + +{"id": "0x001dfdb09e48a91cf6297c9fd50878c25b91ab67cb826a50f05ef03bd74192c6_0", "block_hash": "0x0474f1553ebeba66a52163ad62172f27d797d6b139159c391b611f5c7ab58e96", "block_number": 630029, "transaction_hash": "0x001dfdb09e48a91cf6297c9fd50878c25b91ab67cb826a50f05ef03bd74192c6", "event_index": 0, "from_address": "0x04c0a5193d58f74fbace4b74dcf65481e734ed1714121bdc571da345540efa05", "keys": ["0x30c296ae369716818de77cb5b71ce9cda7cc2c0e8456f474e0abb1ae8d017da"], "data": ["0x53c91253bc9682c04929ca02ed00b3e423f6710d2ee7e0d5ebb06f3ecf368a8", "0x3583127bd9f4ef81d8d7b6e", "0x364c261a781ab91b6c39aca"], "timestamp": 1712284614, "key_name": "zklend::market::Market::AccumulatorsSync"} \ No newline at end of file From 617ff4a1821fe5444e74ee09afa86baa4ffdd683 Mon Sep 17 00:00:00 2001 From: Peterson_dt <168048103+petersdt@users.noreply.github.com> Date: Sat, 2 Nov 2024 17:50:08 +0000 Subject: [PATCH 5/5] chore: remove irrelevant file --- learning.md | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 learning.md diff --git a/learning.md b/learning.md deleted file mode 100644 index d7a7990c..00000000 --- a/learning.md +++ /dev/null @@ -1,13 +0,0 @@ -{"id": "0x0216d505e065501a8f26be71516b6f624dedff0dee50c5ccbc33142f378d8028_5", "block_hash": "0x056914ef72facffc6e7fbb651d7ee91fa3a0bcc49de3058129ece5c706a72bd8", "block_number": 630004, "transaction_hash": "0x0216d505e065501a8f26be71516b6f624dedff0dee50c5ccbc33142f378d8028", "event_index": 5, "from_address": "0x04c0a5193d58f74fbace4b74dcf65481e734ed1714121bdc571da345540efa05", "keys": ["0x7ae0ab7952bbfc33a72035e5eccec7c8816723421c0acb315bd4690a71d46e"], "data": ["0x7f121e44b3f446cdcaa28b230546956208d51e96894acc3b482947356bc10ed", "0x7f121e44b3f446cdcaa28b230546956208d51e96894acc3b482947356bc10ed", "0x3fe2b97c1fd336e750087d68b9b867997fd64a2661ff3ca5a7c771641e8e7ac", "0xd60", "0xdaf"], "timestamp": 1712275350, "key_name": "zklend::market::Market::Repayment"} - -{"id": "0x00a00637ed8fd6f3f83a1eb743a36c894c6fe5af5a87e8ab35697afb3422967e_3", "block_hash": "0x07d1b221c40b6a19c0381d61ebbe8d048018b49314ae1bdc93938059e29febdf", "block_number": 630008, "transaction_hash": "0x00a00637ed8fd6f3f83a1eb743a36c894c6fe5af5a87e8ab35697afb3422967e", "event_index": 3, "from_address": "0x04c0a5193d58f74fbace4b74dcf65481e734ed1714121bdc571da345540efa05", "keys": ["0xfa3f9acdb7b24dcf6d40d77ff2f87a87bca64a830a2169aebc9173db23ff41"], "data": ["0x1a0027d1bf86904d1051fe0ca94c39b659135f19504d663d66771a7424ca2eb", "0x49d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7", "0x8ec920c39e9", "0x9184e72a000"], "timestamp": 1712276824, "key_name": "zklend::market::Market::Borrowing"} - -{"id": "0x053217250e329e81d69d44a9f89bb65c4b97d07693f4a59ee32d898f5e0beef2_5", "block_hash": "0x07d1b221c40b6a19c0381d61ebbe8d048018b49314ae1bdc93938059e29febdf", "block_number": 630008, "transaction_hash": "0x053217250e329e81d69d44a9f89bb65c4b97d07693f4a59ee32d898f5e0beef2", "event_index": 5, "from_address": "0x04c0a5193d58f74fbace4b74dcf65481e734ed1714121bdc571da345540efa05", "keys": ["0x9149d2123147c5f43d258257fef0b7b969db78269369ebcf5ebb9eef8592f2"], "data": ["0x1cfa080d4bbddc206637afad05e5e1abb04da69630f40b2fd9dc578e618ec78", "0x585c32b625999e6e5e78645ff8df7a9001cf5cf3eb6b80ccdd16cb64bd3a34", "0x14839256fce60ba2c"], "timestamp": 1712276824, "key_name": "zklend::market::Market::Deposit"} - -{"id": "0x01e6bdd3a0cc5531b97ba28c135ceffd0d528aa648a8731e0dfb0ca293465991_3", "block_hash": "0x06eb8ae20d3e98d69025be79135523cded41257cfd694b1aea02ddec8e9196d9", "block_number": 630009, "transaction_hash": "0x01e6bdd3a0cc5531b97ba28c135ceffd0d528aa648a8731e0dfb0ca293465991", "event_index": 3, "from_address": "0x04c0a5193d58f74fbace4b74dcf65481e734ed1714121bdc571da345540efa05", "keys": ["0x2eed7e29b3502a726faf503ac4316b7101f3da813654e8df02c13449e03da8"], "data": ["0x49920f8f551060f726e3c8c2fe26e2b39376027450b7672634824bd60c64022", "0x585c32b625999e6e5e78645ff8df7a9001cf5cf3eb6b80ccdd16cb64bd3a34", "0x176b344f2a78c0000"], "timestamp": 1712277188, "key_name": "zklend::market::Market::Withdrawal"} - -{"id": "0x043e9faa1cb77136dcbfcd7d093583bd877d10e55b5ebe83c49c88853d46a744_0", "block_hash": "0x03a7d0eac98323ecf1c756e5c10668a1e82dd6a858ed2909f36797e471279853", "block_number": 630010, "transaction_hash": "0x043e9faa1cb77136dcbfcd7d093583bd877d10e55b5ebe83c49c88853d46a744", "event_index": 0, "from_address": "0x04c0a5193d58f74fbace4b74dcf65481e734ed1714121bdc571da345540efa05", "keys": ["0x2324062bde6ebb76ffd17d55fee62fee62a4877588eb02524b19c091983b365"], "data": ["0x54f9574d3029b81e0d64e3267a7b682ab920b57948644de4581f5ceb30351ea", "0xda114221cb83fa859dbdb4c44beeaa0bb37c7537ad5ae66fe5e0efd20e6eb3"], "timestamp": 1712277561, "key_name": "zklend::market::Market::CollateralEnabled"} - -{"id": "0x03b10eded4321e6385993b392c8c9a07be54ae822c467b0d6e029886c7ddf62b_0", "block_hash": "0x022e7611bf432bfefe7743b69da8fb498834ffbc2bbe220c57dd8709c1247596", "block_number": 630028, "transaction_hash": "0x03b10eded4321e6385993b392c8c9a07be54ae822c467b0d6e029886c7ddf62b", "event_index": 0, "from_address": "0x04c0a5193d58f74fbace4b74dcf65481e734ed1714121bdc571da345540efa05", "keys": ["0xf999d0d33513a8215756ae6a9223180a439c134372b158bc84b9dd02f63856"], "data": ["0x237be5917e0f4ceba3067af8f11137cc7262b9444fce220183e7fdffe4c1a40", "0x4718f5a0fc34cc1af16a1cdee98ffb20c31f5cd61d6ab07201858f4287c938d"], "timestamp": 1712284226, "key_name": "zklend::market::Market::CollateralDisabled"} - -{"id": "0x001dfdb09e48a91cf6297c9fd50878c25b91ab67cb826a50f05ef03bd74192c6_0", "block_hash": "0x0474f1553ebeba66a52163ad62172f27d797d6b139159c391b611f5c7ab58e96", "block_number": 630029, "transaction_hash": "0x001dfdb09e48a91cf6297c9fd50878c25b91ab67cb826a50f05ef03bd74192c6", "event_index": 0, "from_address": "0x04c0a5193d58f74fbace4b74dcf65481e734ed1714121bdc571da345540efa05", "keys": ["0x30c296ae369716818de77cb5b71ce9cda7cc2c0e8456f474e0abb1ae8d017da"], "data": ["0x53c91253bc9682c04929ca02ed00b3e423f6710d2ee7e0d5ebb06f3ecf368a8", "0x3583127bd9f4ef81d8d7b6e", "0x364c261a781ab91b6c39aca"], "timestamp": 1712284614, "key_name": "zklend::market::Market::AccumulatorsSync"} \ No newline at end of file