fix: issue with custom errors on estimate gas and static fee txns [APE-1421]

src/ape/api/providers.py

@@ -1420,7 +1420,8 @@ def prepare_transaction(self, txn: TransactionAPI) -> TransactionAPI:
                 txn.max_fee = int(self.base_fee * multiplier + txn.max_priority_fee)
             # else: Assume user specified the correct amount or txn will fail and waste gas
 
-        if txn.gas_limit is None:
+        gas_limit = self.network.gas_limit if txn.gas_limit is None else txn.gas_limit
+        if gas_limit in (None, "auto"):
             multiplier = self.network.auto_gas_multiplier
             if multiplier != 1.0:
                 gas = min(int(self.estimate_gas_cost(txn) * multiplier), self.max_gas)
@@ -1429,6 +1430,12 @@ def prepare_transaction(self, txn: TransactionAPI) -> TransactionAPI:
 
             txn.gas_limit = gas
 
+        elif gas_limit == "max":
+            txn.gas_limit = self.max_gas
+
+        elif gas_limit is not None and isinstance(gas_limit, int):
+            txn.gas_limit = gas_limit
+
         if txn.required_confirmations is None:
             txn.required_confirmations = self.network.required_confirmations
         elif not isinstance(txn.required_confirmations, int) or txn.required_confirmations < 0:

tests/functional/test_ecosystem.py

@@ -307,3 +307,19 @@ def test_decode_return_data_non_empty_padding_bytes(ethereum):
     )
     with pytest.raises(DecodingError):
         ethereum.decode_returndata(abi, raw_data)
+
+
+@pytest.mark.parametrize("type_", TransactionType)
+def test_create_transaction_uses_network_gas_limit(type_, ethereum, eth_tester_provider, owner):
+    tx = ethereum.create_transaction(type=type_.value, sender=owner.address)
+    assert tx.type == type_
+    assert tx.gas_limit == eth_tester_provider.max_gas
+
+
+@pytest.mark.parametrize("type_", TransactionType)
+def test_encode_transaction(type_, ethereum, vyper_contract_instance, owner, eth_tester_provider):
+    abi = vyper_contract_instance.contract_type.methods[0]
+    actual = ethereum.encode_transaction(
+        vyper_contract_instance.address, abi, sender=owner.address, type=type_.value
+    )
+    assert actual.gas_limit == eth_tester_provider.max_gas

tests/functional/test_provider.py

@@ -9,6 +9,7 @@
 from ape.exceptions import BlockNotFoundError, ContractLogicError, TransactionNotFoundError
 from ape.types import LogFilter
 from ape.utils import DEFAULT_TEST_CHAIN_ID
+from ape_ethereum.transactions import TransactionType
 
 
 def test_uri(eth_tester_provider):
@@ -251,3 +252,13 @@ def test_get_code(eth_tester_provider, vyper_contract_instance):
     assert eth_tester_provider.get_code(address) == eth_tester_provider.get_code(
         address, block_id=1
     )
+
+
+@pytest.mark.parametrize("type_", TransactionType)
+def test_prepare_static_tx_with_max_gas(type_, eth_tester_provider, ethereum, owner):
+    tx = ethereum.create_transaction(type=type_.value, sender=owner.address)
+    tx.gas_limit = None  # Undo set from validator
+    assert tx.gas_limit is None, "Test setup failed - couldn't clear tx gas limit."
+
+    actual = eth_tester_provider.prepare_transaction(tx)
+    assert actual.gas_limit == eth_tester_provider.max_gas