Merge branch 'main' into refactor/ethereum/safe-proxy-heuristic

Author: fubuloubu

tests/conftest.py

@@ -599,7 +599,14 @@ def custom_network_chain_id_1():
 
 @pytest.fixture
 def custom_network(ethereum, project, custom_networks_config_dict):
-    with project.temp_config(**custom_networks_config_dict):
+    config = {
+        **custom_networks_config_dict,
+        ethereum.name: {
+            CUSTOM_NETWORK_0: {"required_confirmations": 0},
+            CUSTOM_NETWORK_1: {"required_confirmations": 0},
+        },
+    }
+    with project.temp_config(**config):
         yield ethereum.apenet
 
 
@@ -646,4 +653,4 @@ def empty_project():
 
 @pytest.fixture
 def geth_contract(geth_account, project, geth_provider):
-    return geth_account.deploy(project.SolidityContract, 0)
+    return geth_account.deploy(project.SolidityContract, 0, required_confirmations=0)

tests/functional/conftest.py

@@ -406,11 +406,15 @@ def use_debug(logger):
 
 
 @pytest.fixture
-def dummy_live_network(chain):
-    original_network = chain.provider.network.name
-    chain.provider.network.name = "sepolia"
-    yield chain.provider.network
-    chain.provider.network.name = original_network
+def dummy_live_network(chain, project):
+    network = chain.provider.network
+    original_network = network.name
+    network.name = "sepolia"
+    try:
+        with project.temp_config(ethereum={"sepolia": {"required_confirmations": 0}}):
+            yield network
+    finally:
+        network.name = original_network
 
 
 @pytest.fixture
@@ -620,15 +624,19 @@ def mock_sepolia(create_mock_sepolia):
 
 
 @pytest.fixture
-def create_mock_sepolia(ethereum, eth_tester_provider, minimal_proxy):
+def create_mock_sepolia(ethereum, eth_tester_provider, minimal_proxy, project):
     @contextmanager
     def fn():
         # Ensuring contract exists before hack.
         # This allows the network to be past genesis which is more realistic.
         _ = minimal_proxy
-        eth_tester_provider.network.name = "sepolia"
-        yield eth_tester_provider.network
-        eth_tester_provider.network.name = LOCAL_NETWORK_NAME
+        network = eth_tester_provider.network
+        network.name = "sepolia"
+        try:
+            with project.temp_config(ethereum={"sepolia": {"required_confirmations": 0}}):
+                yield network
+        finally:
+            network.name = LOCAL_NETWORK_NAME
 
     return fn
 

tests/functional/geth/conftest.py

@@ -21,29 +21,31 @@ def contract_with_call_depth_geth(
     and is used for any testing that requires nested calls, such as
     call trees or event-name clashes.
     """
-    return owner.deploy(project.ContractA, middle_contract_geth, leaf_contract_geth)
+    return owner.deploy(
+        project.ContractA, middle_contract_geth, leaf_contract_geth, required_confirmations=0
+    )
 
 
 @pytest.fixture
 def error_contract_geth(owner, project, geth_provider):
     _ = geth_provider  # Ensure uses geth
-    return owner.deploy(project.HasError, 1)
+    return owner.deploy(project.HasError, 1, required_confirmations=0)
 
 
 @pytest.fixture
 def leaf_contract_geth(project, geth_provider, owner):
     """
     The last contract called by `contract_with_call_depth`.
     """
-    return owner.deploy(project.ContractC)
+    return owner.deploy(project.ContractC, required_confirmations=0)
 
 
 @pytest.fixture
 def middle_contract_geth(project, geth_provider, owner, leaf_contract_geth):
     """
     The middle contract called by `contract_with_call_depth`.
     """
-    return owner.deploy(project.ContractB, leaf_contract_geth)
+    return owner.deploy(project.ContractB, leaf_contract_geth, required_confirmations=0)
 
 
 @pytest.fixture
@@ -83,7 +85,12 @@ def custom_network_connection(
     data["networks"]["custom"][0]["chain_id"] = geth_provider.chain_id
 
     config = {
-        ethereum.name: {custom_network_name_0: {"default_transaction_type": 0}},
+        ethereum.name: {
+            custom_network_name_0: {
+                "default_transaction_type": 0,
+                "required_confirmations": 0,
+            }
+        },
         geth_provider.name: {ethereum.name: {custom_network_name_0: {"uri": geth_provider.uri}}},
         **data,
     }

tests/functional/geth/test_network_manager.py

@@ -5,7 +5,7 @@
 
 
 @pytest.fixture
-def mock_geth_sepolia(ethereum, geth_provider, geth_contract):
+def mock_geth_sepolia(ethereum, geth_provider, geth_contract, project):
     """
     Temporarily tricks Ape into thinking the local network
     is Sepolia so we can test features that require a live
@@ -14,9 +14,13 @@ def mock_geth_sepolia(ethereum, geth_provider, geth_contract):
     # Ensuring contract exists before hack.
     # This allows the network to be past genesis which is more realistic.
     _ = geth_contract
-    geth_provider.network.name = "sepolia"
-    yield geth_provider.network
-    geth_provider.network.name = LOCAL_NETWORK_NAME
+    network = geth_provider.network
+    network.name = "sepolia"
+    try:
+        with project.temp_config(ethereum={"sepolia": {"required_confirmations": 0}}):
+            yield network
+    finally:
+        network.name = LOCAL_NETWORK_NAME
 
 
 @geth_process_test