refactor(benchmark): enhance CREATE2 factory deployment and testing

- Updated the deploy_create2_factory_refactored.py script to improve the deployment of a CREATE2 factory with an initcode template, allowing for dynamic contract address generation.

- Modified test_bloatnet.py to support on-the-fly CREATE2 address generation, optimizing gas costs and improving test accuracy.
- Adjusted gas cost calculations in the README to reflect the new deployment approach, ensuring accurate benchmarks for BloatNet tests.

Author: CPerezz

tests/benchmark/bloatnet/README.md

@@ -2,29 +2,31 @@
 
 ## Overview
 
-The Bloatnet benchmarks work on the following fashion:
-1. They usually require a previously-deployed state (usually quite large) which the benchmarks
-will interact with.
-2. The deployment script helpers help deploying the required bytecode for the specific tests.
-3. The outputs of the deployment scripts get hardcoded into the codebase such that the benchmarks can interact with them.
+This README pretends to be a guide for any user that wants to run the bloatnet test/benchmark suite in any network.
+BloatNet bench cases can be seen in: https://hackmd.io/9icZeLN7R0Sk5mIjKlZAHQ.
+The idea of all these tests is to stress client implementations to find out where the limits of processing are focusing specifically on state-related operations.
+
+In this document you will find a guide that will help you deploy all the setup contracts required by the benchmarks in `/benchmarks/bloatnet`.
 
 ## Gas Cost Constants
 
 ### BALANCE + EXTCODESIZE Pattern
-**Gas per contract: 2,707**
-- `PUSH20` (address): 3 gas
+**Gas per contract: ~2,772**
+- `SHA3` (CREATE2 address generation): 30 gas (static) + 18 gas (dynamic for 85 bytes)
 - `BALANCE` (cold access): 2,600 gas
 - `POP`: 2 gas
 - `EXTCODESIZE` (warm): 100 gas
 - `POP`: 2 gas
+- Memory operations and loop overhead: ~20 gas
 
-### BALANCE + EXTCODECOPY(single-byte) Pattern 
-**Gas per contract: ~2,710**
-- `PUSH20` (address): 3 gas
+### BALANCE + EXTCODECOPY(single-byte) Pattern
+**Gas per contract: ~2,775**
+- `SHA3` (CREATE2 address generation): 30 gas (static) + 18 gas (dynamic for 85 bytes)
 - `BALANCE` (cold access): 2,600 gas
 - `POP`: 2 gas
 - `EXTCODECOPY` (warm, 1 byte): 100 gas (base) + 3 gas (copy 1 byte)
-- `POP`: 2 gas
+- Memory operations: 4 gas
+- Loop overhead: ~20 gas
 
 Note: Reading just 1 byte (specifically the last byte at offset 24575) forces the client
 to load the entire 24KB contract from disk while minimizing gas cost. This allows
@@ -35,103 +37,108 @@ targeting nearly as many contracts as the EXTCODESIZE pattern while forcing maxi
 ### For BALANCE + EXTCODESIZE:
 | Gas Limit | Contracts Needed | Calculation         |
 | --------- | ---------------- | ------------------- |
-| 5M        | 1,838            | 5,000,000 ÷ 2,707   |
-| 50M       | 18,380           | 50,000,000 ÷ 2,707  |
-| 150M      | 55,403           | 150,000,000 ÷ 2,707 |
+| 1M        | 352              | 1,000,000 ÷ 2,772   |
+| 5M        | 1,769            | 5,000,000 ÷ 2,772   |
+| 50M       | 17,690           | 50,000,000 ÷ 2,772  |
+| 150M      | 53,071           | 150,000,000 ÷ 2,772 |
 
-### For BALANCE + EXTCODECOPY (Optimized):
+### For BALANCE + EXTCODECOPY:
 | Gas Limit | Contracts Needed | Calculation         |
 | --------- | ---------------- | ------------------- |
-| 5M        | 1,845            | 5,000,000 ÷ 2,710   |
-| 50M       | 18,450           | 50,000,000 ÷ 2,710  |
-| 150M      | 55,350           | 150,000,000 ÷ 2,710 |
+| 1M        | 352              | 1,000,000 ÷ 2,775   |
+| 5M        | 1,768            | 5,000,000 ÷ 2,775   |
+| 50M       | 17,684           | 50,000,000 ÷ 2,775  |
+| 150M      | 53,053           | 150,000,000 ÷ 2,775 |
 
-You can see the associated attack constants inside of the tests in `bloatnet/test_bloatnet.py`
+The CREATE2 address generation adds ~48 gas per contract but eliminates memory limitations in test framework.
 
 ## Quick Start: 150M Gas Attack
 
-### 1. Deploy CREATE2 Factory (you can use an already deployed one if preferred and therefore, skip this step)
+### 1. Deploy CREATE2 Factory with Initcode Template
 
 ```bash
-# One-time setup - deploy the CREATE2 factory
-python3 tests/benchmark/bloatnet/deploy_create2_factory.py
+# Deploy the factory and initcode template (one-time setup)
+python3 tests/benchmark/bloatnet/deploy_create2_factory_refactored.py
 
 # Output will show:
 # Factory deployed at: 0x...  <-- Save this address
+# Init code hash: 0x...  <-- Save this hash
 ```
 
 ### 2. Deploy Contracts
 
-The deployment script is interactive and will guide you through selecting the appropriate contract type for your benchmark.
-
-#### Contract Types Available
-
-1. **max_size_24kb**: 24KB contracts filled with unique bytecode (EXTCODE_ type of tests)
-2. **sload_heavy**: Contracts optimized for SLOAD benchmarking
-3. **storage_heavy**: Contracts with pre-initialized storage
-4. **custom**: Custom bytecode (for future extensions)
+Deploy contracts using the factory. Each contract will be unique due to ADDRESS-based randomness in the initcode.
 
 #### Calculate Contracts Needed
 
 Before running the deployment, calculate the number of contracts needed:
-- For 150M gas BALANCE+EXTCODESIZE: 55,403 contracts
-- For 150M gas BALANCE+EXTCODECOPY: 29,958 contracts
+- For 150M gas BALANCE+EXTCODESIZE: 53,071 contracts
+- For 150M gas BALANCE+EXTCODECOPY: 53,053 contracts
 
 _Deploy enough contracts to cover the max gas you plan to use in your tests/benchmarks._
 
 #### Running the Deployment
 
 ```bash
-# Run the interactive deployment script
-python3 tests/benchmark/bloatnet/deploy_bloatnet_simple.py \
-    --num-contracts 55403 \
-    --factory-address 0x... \  # Use factory address from step 1
-    --max-code-size 24576      # Optional: specify max contract size (default: 24576)
+# Deploy contracts for 150M gas attack
+python3 tests/benchmark/bloatnet/deploy_create2_factory_refactored.py \
+    --deploy-contracts 53100
+
+# For smaller tests (e.g., 1M gas)
+python3 tests/benchmark/bloatnet/deploy_create2_factory_refactored.py \
+    --deploy-contracts 370
 ```
 
 #### Deployment Output
 
-After successful deployment, the script will:
+After successful deployment, the script will display:
 
-1. Display the configuration needed for tests:
-```python
-=== Configuration for max_size_24kb tests ===
-CONTRACT_TYPE = "max_size_24kb"
-FACTORY_ADDRESS = Address("0x...")
-INIT_CODE_HASH = bytes.fromhex("...")
-NUM_DEPLOYED_CONTRACTS = 55403
-```
-
-2. Save the configuration to a file:
 ```
-Configuration saved to: bloatnet_config_max_size_24kb.txt
+✅ Successfully deployed 53100 contracts
+NUM_DEPLOYED_CONTRACTS = 53100
 ```
 
-This file contains all the values needed to update your test configuration.
-
 ### 3. Update Test Configuration
 
-Edit `tests/benchmark/bloatnet/test_bloatnet.py` and update:
+Edit `tests/benchmark/bloatnet/test_bloatnet.py` and update with values from deployment:
 
 ```python
-FACTORY_ADDRESS = Address("0x...")  # From deployment output
-INIT_CODE_HASH = bytes.fromhex("...")  # From deployment output
-NUM_DEPLOYED_CONTRACTS = 55403  # Actual deployed count
+FACTORY_ADDRESS = Address("0x...")  # From step 1 output
+INIT_CODE_HASH = bytes.fromhex("...")  # From step 1 output
+NUM_DEPLOYED_CONTRACTS = 53100  # From step 2 output
 ```
 
-### 5. Run Benchmark Tests
+### 4. Run Benchmark Tests
 
+#### Generate Test Fixtures
 ```bash
 # Run with specific gas values (in millions)
 uv run fill --fork=Prague --gas-benchmark-values=150 \
     tests/benchmark/bloatnet/test_bloatnet.py --clean
 
-# With EVM traces for analysis
+# Multiple gas values
+uv run fill --fork=Prague --gas-benchmark-values=1,5,50,150 \
+    tests/benchmark/bloatnet/test_bloatnet.py
+```
+
+#### Execute Against Live Client
+```bash
+# Start a test node (e.g., Geth)
+geth --dev --http --http.api eth,web3,net,debug
+
+# Run tests
+uv run execute remote --rpc-endpoint http://127.0.0.1:8545 \
+    --rpc-chain-id 1337 --rpc-seed-key 0x0000000000000000000000000000000000000000000000000000000000000001 \
+    tests/benchmark/bloatnet/test_bloatnet.py \
+    --fork=Prague --gas-benchmark-values=150 -v
+```
+
+#### With EVM Traces for Analysis
+```bash
 uv run fill --fork=Prague --gas-benchmark-values=150 \
     --evm-dump-dir=traces/ --traces \
     tests/benchmark/bloatnet/test_bloatnet.py
 
-# Multiple gas values
-uv run fill --fork=Prague --gas-benchmark-values=5,50,150 \
-    tests/benchmark/bloatnet/test_bloatnet.py
+# Analyze opcodes executed
+jq -r '.opName' traces/**/*.jsonl | sort | uniq -c
 ```