refactor(benchmark): update transaction handling

Author: LouisTsai-Csie

tests/benchmark/test_worst_compute.py

@@ -2162,16 +2162,18 @@ def test_worst_blobhash(
 
     if blobs_present > 0:
         tx_type = TransactionType.BLOB_TRANSACTION
-        max_fee_per_blob_gas = fork.min_base_fee_per_blob_gas()
+        max_fee_per_blob_gas = HexNumber(fork.min_base_fee_per_blob_gas())
         blob_versioned_hashes = add_kzg_version(
             [i.to_bytes() * 32 for i in range(blobs_present)],
             BlobsSpec.BLOB_COMMITMENT_VERSION_KZG,
         )
+        # Set required EIP-1559 fields for blob transactions
+        tx.max_priority_fee_per_gas = HexNumber(0)
+        tx.max_fee_per_gas = HexNumber(7)
+        tx.access_list = []
 
     tx.ty = HexNumber(tx_type)
-    tx.max_fee_per_blob_gas = (
-        HexNumber(max_fee_per_blob_gas) if max_fee_per_blob_gas is not None else None
-    )
+    tx.max_fee_per_blob_gas = max_fee_per_blob_gas
     tx.blob_versioned_hashes = blob_versioned_hashes
 
     benchmark_test(

tests/benchmark/test_worst_stateful_opcodes.py

@@ -11,7 +11,7 @@
 
 from ethereum_test_benchmark.benchmark_code_generator import ExtCallGenerator, JumpLoopGenerator
 from ethereum_test_forks import Fork
-from ethereum_test_specs import BlockchainTestFiller
+from ethereum_test_specs import BlockchainTestFiller, StateTestFiller
 from ethereum_test_specs.benchmark import BenchmarkTestFiller
 from ethereum_test_tools import (
     Account,
@@ -648,7 +648,7 @@ def test_worst_selfdestruct_existing(
 
 @pytest.mark.parametrize("value_bearing", [True, False])
 def test_worst_selfdestruct_created(
-    benchmark_test: BenchmarkTestFiller,
+    state_test: StateTestFiller,
     pre: Alloc,
     value_bearing: bool,
     fork: Fork,
@@ -736,7 +736,7 @@ def test_worst_selfdestruct_created(
     )
 
     post = {code_addr: Account(storage={0: 42})}  # Check for successful execution.
-    benchmark_test(
+    state_test(
         env=env,
         pre=pre,
         post=post,
@@ -747,7 +747,7 @@ def test_worst_selfdestruct_created(
 
 @pytest.mark.parametrize("value_bearing", [True, False])
 def test_worst_selfdestruct_initcode(
-    benchmark_test: BenchmarkTestFiller,
+    state_test: StateTestFiller,
     pre: Alloc,
     value_bearing: bool,
     fork: Fork,
@@ -818,7 +818,7 @@ def test_worst_selfdestruct_initcode(
     )
 
     post = {code_addr: Account(storage={0: 42})}  # Check for successful execution.
-    benchmark_test(
+    state_test(
         env=env,
         pre=pre,
         post=post,