Merge pull request #308 from bancorprotocol/307-max-priority-fee-input-overridden-when-handling-incorrect-base-fee-input-error

Fix max_priority usage in txhelpers & pool_shutdown

Author: mikewcasale

fastlane_bot/helpers/txhelpers.py

@@ -611,15 +611,12 @@ def build_transaction_with_gas(
                     split1 = message.split("maxFeePerGas: ")[1]
                     split2 = split1.split(" baseFee: ")
                     split_baseFee = int(int(split2[1].split(" (supplied gas")[0]))
-                    split_maxPriorityFeePerGas = int(
-                        int(split2[0]) * self.ConfigObj.DEFAULT_GAS_PRICE_OFFSET
-                    )
                     transaction = self.construct_contract_function(
                         routes=routes,
                         src_amt=src_amt,
                         src_address=src_address,
                         gas_price=split_baseFee,
-                        max_priority=split_maxPriorityFeePerGas,
+                        max_priority=max_priority,
                         nonce=nonce,
                         flashloan_struct=flashloan_struct,
                     )

fastlane_bot/tools/pool_shutdown.py

@@ -235,21 +235,23 @@ def build_transaction(
             )
             if "max fee per gas less than block base fee" in str(e):
                 try:
-                    return self._build_transaction(e, tkn, nonce)
+                    return self._build_transaction(e, max_priority_gas, tkn, nonce)
                 except Exception as e:
                     self.mgr.cfg.logger.debug(
                         f"(***2***) Error when building transaction: {e.__class__.__name__} {e}"
                     )
                     return None
 
-    def _build_transaction(self, e: Exception, tkn: str, nonce: int):
+    def _build_transaction(self, e: Exception, max_priority: int, tkn: str, nonce: int):
         """
         Handles the transaction generation logic.
 
         Parameters
         ----------
         e: Exception
             The exception
+        max_priority: int
+            The max priority fee input
         tkn: str
             The token address
         nonce: int
@@ -265,15 +267,12 @@ def _build_transaction(self, e: Exception, tkn: str, nonce: int):
         split1 = message.split("maxFeePerGas: ")[1]
         split2 = split1.split(" baseFee: ")
         split_base_fee = int(split2[1].split(" (supplied gas")[0])
-        split_max_priority_fee_per_gas = int(
-            int(split2[0]) * self.mgr.cfg.DEFAULT_GAS_PRICE_OFFSET
-        )
         return self.bancor_network_contract.functions.withdrawPOL(
             self.mgr.web3.to_checksum_address(tkn)
         ).build_transaction(
             self.tx_helpers.build_tx(
                 base_gas_price=split_base_fee,
-                max_priority_fee=split_max_priority_fee_per_gas,
+                max_priority_fee=max_priority,
                 nonce=nonce,
             )
         )