Merge branch 'main' into optimization

CHANGELOG.md

@@ -2,9 +2,17 @@
 
 ## [Unreleased](https://github.com/bancorprotocol/fastlane-bot/tree/HEAD)
 
-[Full Changelog](https://github.com/bancorprotocol/fastlane-bot/compare/v2.7.35...HEAD)
+[Full Changelog](https://github.com/bancorprotocol/fastlane-bot/compare/v2.7.36...HEAD)
+
+- pol merge bug on mainnet [\#147](https://github.com/bancorprotocol/fastlane-bot/issues/147)
+- bugfix for POL on mainnet [\#148](https://github.com/bancorprotocol/fastlane-bot/pull/148) ([mikewcasale](https://github.com/mikewcasale))
 
 - Checklist for Adding Tests to Bancor POL Contract Support [\#116](https://github.com/bancorprotocol/fastlane-bot/issues/116)
+
+## [v2.7.36](https://github.com/bancorprotocol/fastlane-bot/tree/v2.7.36) (2023-09-21)
+
+[Full Changelog](https://github.com/bancorprotocol/fastlane-bot/compare/v2.7.35...v2.7.36)
+
 - 109 pol and tenderly cleanup [\#136](https://github.com/bancorprotocol/fastlane-bot/pull/136) ([mikewcasale](https://github.com/mikewcasale))
 
 Closed issues

fastlane_bot/__init__.py

@@ -1,7 +1,7 @@
 from .bot import CarbonBot as Bot, __VERSION__, __DATE__
 from .config import Config, ConfigNetwork, ConfigDB, ConfigLogger, ConfigProvider
 
-__version__ = '2.7.36'
+__version__ = '2.7.37'
 
 
 

fastlane_bot/events/managers/contracts.py

@@ -12,7 +12,7 @@
 from web3 import Web3
 from web3.contract import Contract
 
-from fastlane_bot.data.abi import BANCOR_V3_NETWORK_INFO_ABI, ERC20_ABI
+from fastlane_bot.data.abi import BANCOR_V3_NETWORK_INFO_ABI, ERC20_ABI, BANCOR_POL_ABI
 from fastlane_bot.events.managers.base import BaseManager
 
 
@@ -53,6 +53,13 @@ def init_exchange_contracts(self):
                     abi=BANCOR_V3_NETWORK_INFO_ABI,
                     name="BancorNetwork",
                 )
+            elif exchange_name == "bancor_pol":
+                self.pool_contracts[exchange_name][
+                    self.cfg.BANCOR_POL_ADDRESS
+                ] = self.web3.eth.contract(
+                    address=self.cfg.BANCOR_POL_ADDRESS,
+                    abi=BANCOR_POL_ABI,
+                )
 
     @staticmethod
     def get_or_create_token_contracts(

fastlane_bot/events/managers/manager.py

@@ -121,7 +121,7 @@ def update_from_pool_info(
         )
         pool = self.get_or_init_pool(pool_info)
         params = pool.update_from_contract(
-            contract, self.tenderly_fork_id, self.w3_tenderly
+            contract, self.tenderly_fork_id, self.w3_tenderly, self.web3
         )
         for key, value in params.items():
             pool_info[key] = value
@@ -182,6 +182,7 @@ def update_from_contract(
             contract,
             tenderly_fork_id=self.tenderly_fork_id,
             w3_tenderly=self.w3_tenderly,
+            w3=self.web3,
         )
         for key, value in params.items():
             pool_info[key] = value
@@ -216,6 +217,7 @@ def update_from_erc20_balance(
             contract=pool_contract,
             tenderly_fork_id=self.tenderly_fork_id,
             w3_tenderly=self.w3_tenderly,
+            w3=self.web3,
         )
         params["last_updated_block"] = current_block
 

fastlane_bot/events/managers/pools.py

@@ -273,7 +273,7 @@ def add_pool_info(
         if contract:
             pool_info.update(
                 pool.update_from_contract(
-                    contract, self.tenderly_fork_id, self.w3_tenderly
+                    contract, self.tenderly_fork_id, self.w3_tenderly, self.web3
                 )
             )
 

fastlane_bot/events/pools/bancor_pol.py

@@ -25,6 +25,7 @@ class BancorPolPool(Pool):
 
     exchange_name: str = "bancor_pol"
     ONE = 2**48
+    contract: Contract = None
 
     @staticmethod
     def unique_key() -> str:
@@ -83,7 +84,7 @@ def update_from_event(
         return data
 
     def update_from_contract(
-        self, contract: Contract, tenderly_fork_id: str = None, w3_tenderly: Web3 = None
+        self, contract: Contract, tenderly_fork_id: str = None, w3_tenderly: Web3 = None, w3: Web3 = None
     ) -> Dict[str, Any]:
         """
         See base class.
@@ -96,13 +97,13 @@ def update_from_contract(
         p0 = 0
         p1 = 0
 
-        tkn_balance = self.get_erc20_tkn_balance(contract, tkn0, w3_tenderly)
+        tkn_balance = self.get_erc20_tkn_balance(contract, tkn0, w3_tenderly, w3)
 
         if tenderly_fork_id:
             contract = w3_tenderly.eth.contract(
                 abi=BANCOR_POL_ABI, address=contract.address
             )
-
+            
         try:
             p0, p1 = contract.functions.tokenPrice(tkn0).call()
         except web3.exceptions.BadFunctionCallOutput:
@@ -128,7 +129,7 @@ def update_from_contract(
 
     @staticmethod
     def get_erc20_tkn_balance(
-        contract: Contract, tkn0: str, w3_tenderly: Web3 = None
+        contract: Contract, tkn0: str, w3_tenderly: Web3 = None, w3: Web3 = None
     ) -> int:
         """
         Get the ERC20 token balance of the POL contract
@@ -141,14 +142,19 @@ def get_erc20_tkn_balance(
             The token address
         w3_tenderly: Web3
             The tenderly web3 object
+        w3: Web3
+            The web3 object
 
         Returns
         -------
         int
             The token balance
 
         """
-        erc20_contract = w3_tenderly.eth.contract(abi=ERC20_ABI, address=tkn0)
+        if w3_tenderly:
+            erc20_contract = w3_tenderly.eth.contract(abi=ERC20_ABI, address=tkn0)
+        else:
+            erc20_contract = w3.eth.contract(abi=ERC20_ABI, address=tkn0)
         return erc20_contract.functions.balanceOf(contract.address).call()
 
     @staticmethod

fastlane_bot/events/pools/bancor_v2.py

@@ -85,7 +85,7 @@ def update_from_event(
         return data
 
     def update_from_contract(
-        self, contract: Contract, tenderly_fork_id: str = None, w3_tenderly: Web3 = None
+        self, contract: Contract, tenderly_fork_id: str = None, w3_tenderly: Web3 = None, w3: Web3 = None
     ) -> Dict[str, Any]:
         """
         See base class.

fastlane_bot/events/pools/bancor_v3.py

@@ -70,7 +70,7 @@ def update_from_event(
         return data
 
     def update_from_contract(
-        self, contract: Contract, tenderly_fork_id: str = None, w3_tenderly: Web3 = None
+        self, contract: Contract, tenderly_fork_id: str = None, w3_tenderly: Web3 = None, w3: Web3 = None
     ) -> Dict[str, Any]:
         """
         See base class.

fastlane_bot/events/pools/base.py

@@ -76,7 +76,7 @@ def update_from_event(
 
     @abstractmethod
     def update_from_contract(
-        self, contract: Contract, tenderly_fork_id: str = None, w3_tenderly: Web3 = None
+        self, contract: Contract, tenderly_fork_id: str = None, w3_tenderly: Web3 = None, w3: Web3 = None
     ) -> Dict[str, Any]:
         """
         Update the pool state from a contract.
@@ -89,6 +89,8 @@ def update_from_contract(
             The tenderly fork id, by default None
         w3_tenderly : Web3, optional
             The tenderly web3 instance, by default None
+        w3 : Web3, optional
+            The web3 instance, by default None
 
         Returns
         -------

fastlane_bot/events/pools/carbon_v1.py

@@ -113,7 +113,7 @@ def parse_orders(
         return order0, order1
 
     def update_from_contract(
-        self, contract: Contract, tenderly_fork_id: str = None, w3_tenderly: Web3 = None
+        self, contract: Contract, tenderly_fork_id: str = None, w3_tenderly: Web3 = None, w3: Web3 = None
     ) -> Dict[str, Any]:
         """
         See base class.

fastlane_bot/events/pools/sushiswap_v2.py

@@ -57,7 +57,7 @@ def update_from_event(
         return data
 
     def update_from_contract(
-        self, contract: Contract, tenderly_fork_id: str = None, w3_tenderly: Web3 = None
+        self, contract: Contract, tenderly_fork_id: str = None, w3_tenderly: Web3 = None, w3: Web3 = None
     ) -> Dict[str, Any]:
         """
         See base class.

fastlane_bot/events/pools/uniswap_v2.py

@@ -57,7 +57,7 @@ def update_from_event(
         return data
 
     def update_from_contract(
-        self, contract: Contract, tenderly_fork_id: str = None, w3_tenderly: Web3 = None
+        self, contract: Contract, tenderly_fork_id: str = None, w3_tenderly: Web3 = None, w3: Web3 = None
     ) -> Dict[str, Any]:
         """
         See base class.

fastlane_bot/events/pools/uniswap_v3.py

@@ -64,7 +64,7 @@ def update_from_event(
         return data
 
     def update_from_contract(
-        self, contract: Contract, tenderly_fork_id: str = None, w3_tenderly: Any = None
+        self, contract: Contract, tenderly_fork_id: str = None, w3_tenderly: Any = None, w3: Any = None
     ) -> Dict[str, Any]:
         """
         See base class.

fastlane_bot/events/utils.py

@@ -967,13 +967,14 @@ def multicall_every_iteration(
         The number of jobs to run in parallel.
 
     """
+    multicallable_exchanges = [exchange for exchange in mgr.cfg.MULTICALLABLE_EXCHANGES if exchange in mgr.exchanges]
     multicallable_pool_rows = [
         list(set(get_pools_for_exchange(mgr=mgr, exchange=ex_name)))
         for ex_name in mgr.cfg.MULTICALLABLE_EXCHANGES
         if ex_name in mgr.exchanges
     ]
 
-    for idx, exchange in enumerate(mgr.cfg.MULTICALLABLE_EXCHANGES):
+    for idx, exchange in enumerate(multicallable_exchanges):
         update_pools_from_contracts(
             n_jobs=n_jobs,
             current_block=current_block,