From ff2577a7ad2bf12f5b0609cd27e699d89093cc21 Mon Sep 17 00:00:00 2001 From: Lesigh-3100 Date: Tue, 25 Jun 2024 16:48:58 +0300 Subject: [PATCH 1/3] fix keyerror for y_0 --- fastlane_bot/events/managers/base.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fastlane_bot/events/managers/base.py b/fastlane_bot/events/managers/base.py index ca6361fbd..5cd2708ed 100644 --- a/fastlane_bot/events/managers/base.py +++ b/fastlane_bot/events/managers/base.py @@ -574,8 +574,8 @@ def get_strats_by_state(self, pairs: List[List[Any]], exchange_name: str) -> Lis pool["cid"] for pool in self.pool_data if pool["exchange_name"] == exchange_name - and (pool["tkn0_address"], pool["tkn1_address"]) in pairs - or (pool["tkn1_address"], pool["tkn0_address"]) in pairs + and ((pool["tkn0_address"], pool["tkn1_address"]) in pairs + or (pool["tkn1_address"], pool["tkn0_address"]) in pairs) ] strategies = [] for cid in cids: From 52a273a4fd8e7a755ddd4b21a8d9a7a98099fc3a Mon Sep 17 00:00:00 2001 From: Lesigh-3100 Date: Tue, 25 Jun 2024 17:12:46 +0300 Subject: [PATCH 2/3] Update base.py --- fastlane_bot/events/managers/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastlane_bot/events/managers/base.py b/fastlane_bot/events/managers/base.py index 5cd2708ed..1184ec454 100644 --- a/fastlane_bot/events/managers/base.py +++ b/fastlane_bot/events/managers/base.py @@ -597,7 +597,7 @@ def get_strats_by_state(self, pairs: List[List[Any]], exchange_name: str) -> Lis ] # Fetching token addresses and converting them - tkn0_address, tkn1_address = pool_data["tkn0"], pool_data["tkn1"] + tkn0_address, tkn1_address = pool_data["tkn0_address"], pool_data["tkn1_address"] # Reconstructing the strategy object strategy = [strategy_id, None, [tkn0_address, tkn1_address], [order0, order1]] From 28e33c14e766154af63a801bdfdebec29140a415 Mon Sep 17 00:00:00 2001 From: Lesigh-3100 Date: Tue, 25 Jun 2024 21:33:51 +0300 Subject: [PATCH 3/3] Add extensive path logs --- fastlane_bot/events/managers/contracts.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/fastlane_bot/events/managers/contracts.py b/fastlane_bot/events/managers/contracts.py index 1355d4ba9..b5b30f780 100644 --- a/fastlane_bot/events/managers/contracts.py +++ b/fastlane_bot/events/managers/contracts.py @@ -331,6 +331,19 @@ def get_token_info_from_contract( tokens_filepath = os.path.normpath( f"fastlane_bot/data/blockchain_data/{self.cfg.NETWORK}/tokens.csv" ) + + self.log_path_exists("fastlane_bot") + self.log_path_exists("fastlane_bot/data") + self.log_path_exists("fastlane_bot/data/blockchain_data") + self.log_path_exists(f"fastlane_bot/data/blockchain_data/{self.cfg.NETWORK}") + self.log_path_exists(f"fastlane_bot/data/blockchain_data/{self.cfg.NETWORK}/tokens.csv") + self.log_path_exists(self.prefix_path) + self.log_path_exists(f"{self.prefix_path}fastlane_bot") + self.log_path_exists(f"{self.prefix_path}fastlane_bot/data") + self.log_path_exists(f"{self.prefix_path}fastlane_bot/data/blockchain_data") + self.log_path_exists(f"{self.prefix_path}fastlane_bot/data/blockchain_data/{self.cfg.NETWORK}") + self.log_path_exists(f"{self.prefix_path}fastlane_bot/data/blockchain_data/{self.cfg.NETWORK}/token_detail") + token_data = pd.read_csv(tokens_filepath) extra_info = glob( os.path.normpath( @@ -367,6 +380,10 @@ def __init__(self, addr): def __str__(self): return self.message + def log_path_exists(self, path): + exists = os.path.exists(os.path.normpath(path)) + self.cfg.logger.info(f"Filepath: {path}. Exists: {exists}") + def _get_and_save_token_info_from_contract( self, contract: Contract,