feat(execute): Use seed directly if not running xdist

Author: marioevz

packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/pre_alloc.py

@@ -357,11 +357,6 @@ def deploy_contract(
 
         # Limit the gas limit
         deploy_gas_limit = min(deploy_gas_limit * 2, 30_000_000)
-        logger.info(
-            f"Deploying contract (label={label}): gas_limit={deploy_gas_limit}, "
-            f"code_size={len(code)} bytes, initcode_size={len(initcode)} bytes, "
-            f"balance={Number(balance) / 10**18:.18f} ETH, storage_slots={len(storage.root)}"
-        )
 
         deploy_tx = PendingTransaction(
             sender=self._sender,
@@ -378,6 +373,12 @@ def deploy_contract(
             tx_index=len(self._pending_txs),
         )
         self._pending_txs.append(deploy_tx)
+        logger.info(
+            f"Contract deployment tx created (label={label}): "
+            f"tx_nonce={deploy_tx.nonce}, gas_limit={deploy_gas_limit}, "
+            f"code_size={len(code)} bytes, initcode_size={len(initcode)} bytes, "
+            f"balance={Number(balance) / 10**18:.18f} ETH, storage_slots={len(storage.root)}"
+        )
 
         contract_address = deploy_tx.created_contract
         logger.debug(
@@ -528,9 +529,10 @@ def fund_eoa(
                 tx_index=len(self._pending_txs),
             )
             self._pending_txs.append(fund_tx)
-            logger.debug(
-                f"Added funding transaction for EOA {eoa} (label={label}, "
-                f"tx_index={len(self._pending_txs) - 1})"
+            logger.info(
+                f"Added funding transaction for EOA {eoa} (label={label}): "
+                f"tx_nonce={fund_tx.nonce}, "
+                f"tx_index={len(self._pending_txs) - 1}"
             )
         account_kwargs: Dict[str, Any] = {
             "nonce": eoa.nonce,
@@ -546,7 +548,8 @@ def fund_eoa(
             else "Deferred"
         )
         logger.info(
-            f"EOA {eoa} funded (label={label}, nonce={eoa.nonce}, balance={balance_str})"
+            f"EOA {eoa} funding tx created (label={label}):"
+            f"tx_nonce={eoa.nonce}, balance={balance_str}"
         )
         return eoa
 
@@ -590,7 +593,7 @@ def fund_address(
 
         super().__setitem__(address, Account(balance=amount))
         logger.info(
-            f"Address {address} funded (label={address.label}): "
+            f"Address {address} funding tx created (label={address.label}): "
             f"{Number(amount) / 10**18:.18f} ETH"
         )
 

packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/sender.py

@@ -110,7 +110,7 @@ def worker_key_funding_amount(
     sender_funding_transactions_gas_price: int,
     sender_fund_refund_gas_limit: int,
     seed_account_sweep_amount: int | None,
-) -> int:
+) -> int | None:
     """
     Calculate the initial balance of each worker key.
 
@@ -125,7 +125,13 @@ def worker_key_funding_amount(
     It's not really possible to calculate the transaction costs of each test
     that each worker is going to run, so we can't really calculate the initial
     balance of each sender key based on that.
+
+    If we are not running tests in parallel, this method is skipped since
+    all tests will run from the seed account.
     """
+    if worker_count <= 1:
+        return None
+
     base_name = "worker_key_funding_amount"
     base_file = session_temp_folder / base_name
     base_lock_file = session_temp_folder / f"{base_name}.lock"
@@ -202,7 +208,8 @@ def worker_key_funding_amount(
 def session_worker_key(
     request: pytest.FixtureRequest,
     seed_key: EOA,
-    worker_key_funding_amount: int,
+    worker_count: int,
+    worker_key_funding_amount: int | None,
     eoa_iterator: Iterator[EOA],
     eth_rpc: EthRPC,
     session_temp_folder: Path,
@@ -216,7 +223,29 @@ def session_worker_key(
 
     Each worker will have a different key, but coordination is required
     because all worker keys come from the same seed key.
+
+    If we are not running tests in parallel, this method simply returns the
+    seed account directly.
     """
+    if worker_count <= 1:
+        logger.info("Not running tests in parallel, using seed key directly")
+        starting_balance = eth_rpc.get_balance(seed_key)
+        yield seed_key
+
+        remaining_balance = eth_rpc.get_balance(seed_key)
+        used_balance = starting_balance - remaining_balance
+        logger.info(
+            f"Seed {seed_key} used balance: {used_balance / 10**18:.18f} ETH "
+            f"(remaining: {remaining_balance / 10**18:.18f} ETH)"
+        )
+        request.config.stash[metadata_key]["Senders"][str(seed_key)] = (
+            f"Used balance={used_balance / 10**18:.18f}"
+        )
+        return None
+
+    assert worker_key_funding_amount is not None, (
+        "`worker_key_funding_amount` is None"
+    )
     # For the seed sender we do need to keep track of the nonce because it is
     # shared among different processes, and there might not be a new block
     # produced between the transactions.