Simplify class TxHelpers

fastlane_bot/bot.py

@@ -60,7 +60,6 @@
 from fastlane_bot.helpers import (
     TxRouteHandler,
     TxHelpers,
-    TxHelpersBase,
     TradeInstruction,
     Univ3Calculator,
     add_wrap_or_unwrap_trades_to_route,
@@ -93,7 +92,7 @@ class CarbonBotBase:
         the database manager.
     TxRouteHandlerClass
         ditto (default: TxRouteHandler).
-    TxHelpersClass: class derived from TxHelpersBase
+    TxHelpersClass:
         ditto (default: TxHelpers).
 
     """
@@ -128,9 +127,6 @@ def __post_init__(self):
 
         if self.TxHelpersClass is None:
             self.TxHelpersClass = TxHelpers(ConfigObj=self.ConfigObj)
-        assert issubclass(
-            self.TxHelpersClass.__class__, TxHelpersBase
-        ), f"TxHelpersClass not derived from TxHelpersBase {self.TxHelpersClass}"
 
         self.db = QueryInterface(ConfigObj=self.ConfigObj)
         self.RUN_FLASHLOAN_TOKENS = [*self.ConfigObj.CHAIN_FLASHLOAN_TOKENS.values()]

fastlane_bot/events/utils.py

@@ -1998,62 +1998,6 @@ def handle_tokens_csv(mgr, prefix_path, read_only: bool = False):
     )
 
 
-def self_funding_warning_sequence(cfg):
-    """
-    This function initiates a warning sequence if the user has specified to use their own funds.
-
-    :param cfg: the config object
-
-    """
-    cfg.logger.info(
-        f"\n\n*********************************************************************************\n*********************************   WARNING   *********************************\n\n"
-    )
-    cfg.logger.info(
-        f"Arbitrage bot is set to use its own funds instead of using Flashloans.\n\n*****   This could put your funds at risk.    ******\nIf you did not mean to use this mode, cancel the bot now.\n\nOtherwise, the bot will submit token approvals IRRESPECTIVE OF CURRENT GAS PRICE for each token specified in Flashloan tokens.\n\n*********************************************************************************"
-    )
-    time.sleep(5)
-    cfg.logger.info(f"Submitting approvals in 15 seconds")
-    time.sleep(5)
-    cfg.logger.info(f"Submitting approvals in 10 seconds")
-    time.sleep(5)
-    cfg.logger.info(f"Submitting approvals in 5 seconds")
-    time.sleep(5)
-    cfg.logger.info(
-        f"*********************************************************************************\n\nSelf-funding mode activated."
-    )
-    cfg.logger.info(
-        f"""\n\n
-          _____
-         |A .  | _____
-         | /.\ ||A ^  | _____
-         |(_._)|| / \ ||A _  | _____
-         |  |  || \ / || ( ) ||A_ _ |
-         |____V||  .  ||(_'_)||( v )|
-                |____V||  |  || \ / |
-                       |____V||  .  |
-                              |____V|
-    \n\n"""
-    )
-
-
-def find_unapproved_tokens(tokens: List, cfg, tx_helpers) -> List:
-    """
-    This function checks if tokens have been previously approved from the wallet address to the Arbitrage contract.
-    If they are not already approved, it will submit approvals for each token specified in Flashloan tokens.
-    :param tokens: the list of tokens to check/approve
-    :param cfg: the config object
-    :param tx_helpers: the TxHelpers instantiated class
-
-    returns: List of tokens that have not been approved
-
-    """
-    unapproved_tokens = []
-    for tkn in tokens:
-        if not tx_helpers.check_if_token_approved(token_address=tkn):
-            unapproved_tokens.append(tkn)
-    return unapproved_tokens
-
-
 def check_and_approve_tokens(tokens: List, cfg) -> bool:
     """
     This function checks if tokens have been previously approved from the wallet address to the Arbitrage contract.
@@ -2063,28 +2007,4 @@ def check_and_approve_tokens(tokens: List, cfg) -> bool:
     :param cfg: the config object
 
     """
-
-    tokens = [tkn for tkn in tokens if tkn != cfg.NATIVE_GAS_TOKEN_ADDRESS]
-
-    self_funding_warning_sequence(cfg=cfg)
-    tx_helpers = TxHelpers(ConfigObj=cfg)
-    unapproved_tokens = find_unapproved_tokens(
-        tokens=tokens, cfg=cfg, tx_helpers=tx_helpers
-    )
-
-    if len(unapproved_tokens) == 0:
-        return True
-
-    for _tkn in unapproved_tokens:
-        tx = tx_helpers.approve_token_for_arb_contract(token_address=_tkn)
-        if tx is not None:
-            continue
-        else:
-            assert (
-                False
-            ), f"Failed to approve token: {_tkn}. This can be fixed by approving manually, or restarting the bot to try again."
-
-    unapproved_tokens = find_unapproved_tokens(
-        tokens=unapproved_tokens, cfg=cfg, tx_helpers=tx_helpers
-    )
-    return len(unapproved_tokens) == 0
+    TxHelpers(ConfigObj=cfg).check_and_approve_tokens(tokens=tokens)

fastlane_bot/helpers/__init__.py

@@ -5,7 +5,3 @@
 from .univ3calc import Univ3Calculator
 from .wrap_unwrap_processor import add_wrap_or_unwrap_trades_to_route
 from .carbon_trade_splitter import split_carbon_trades
-TxHelpersBase = TxHelpers
-
-
-