From efd7d8df5abfd62706912fd80814d9900676a74b Mon Sep 17 00:00:00 2001 From: Dobromir Popov Date: Wed, 6 Nov 2024 13:27:19 +0200 Subject: [PATCH] fix --- crypto/sol/modules/SolanaAPI.py | 16 ++-------------- crypto/sol/modules/log_processor.py | 2 +- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/crypto/sol/modules/SolanaAPI.py b/crypto/sol/modules/SolanaAPI.py index 48f8b7a..78a87ee 100644 --- a/crypto/sol/modules/SolanaAPI.py +++ b/crypto/sol/modules/SolanaAPI.py @@ -76,10 +76,6 @@ solana_client = AsyncClient(SOLANA_HTTP_URL) dexscreener_client = DexscreenerClient() - - - - class SolanaWS: def __init__(self, on_message: Optional[callable] = None): self.websocket = None @@ -411,9 +407,6 @@ class SolanaAPI: logging.error(f"Error fetching token metadata for {mint_address}: {str(e)}") return None - - - async def get_transaction_details_rpc(self, tx_signature, readfromDump=False): try: @@ -564,7 +557,6 @@ class SolanaAPI: logging.error(f"Error calculating percentage swapped: {e}") return tr_info - # def _get_pre_balance(transaction_details: Dict[str, Any], token: str) -> float: # pre_balances = transaction_details.get('meta', {}).get('preTokenBalances', []) # for balance in pre_balances: @@ -589,8 +581,7 @@ class SolanaAPI: if backoff: retry_delay = retry_delay * 1.2 return tx_details - - + async def get_swap_transaction_details(self, tx_signature_str): t = await self.get_transaction(Signature.from_string(tx_signature_str), max_supported_transaction_version=0) try: @@ -632,7 +623,6 @@ class SolanaAPI: logging.error(f"Error fetching transaction details: {e}") return None - async def get_token_balance_rpc(self, wallet_address, token_address): try: @@ -855,7 +845,6 @@ class SolanaAPI: except Exception as e: logging.error(f"Error following move: {e}") - async def calculate_priority_fee(async_client, priority_level=5): recent_fees = await async_client.get_recent_prioritization_fees() @@ -881,6 +870,7 @@ class SolanaAPI: # Set minimum fee to avoid too low values return max(final_fee, 100) # minimum 100 microlamports + class SolanaDEX: def __init__(self, DISPLAY_CURRENCY: str): self.DISPLAY_CURRENCY = DISPLAY_CURRENCY @@ -1201,7 +1191,5 @@ class SolanaDEX: return obj.get(prop, 'N/A') - - DEX = SolanaDEX(DISPLAY_CURRENCY) SAPI = SolanaAPI( on_initial_subscription_callback=DEX.list_initial_wallet_states(FOLLOWED_WALLET,YOUR_WALLET)) \ No newline at end of file diff --git a/crypto/sol/modules/log_processor.py b/crypto/sol/modules/log_processor.py index 32b8b18..fdc024b 100644 --- a/crypto/sol/modules/log_processor.py +++ b/crypto/sol/modules/log_processor.py @@ -4,7 +4,7 @@ from pathlib import Path from .storage import store_transaction, prisma_client from .SolanaAPI import SolanaAPI -LOG_DIRECTORY = "logs" +LOG_DIRECTORY = "./logs" FILE_MASK = "wh_*.json" async def process_log_file(file_path):