fix: resolve failing blob and block has tests

Author: LouisTsai-Csie

tests/benchmark/test_worst_compute.py

@@ -1667,6 +1667,9 @@ def test_worst_blobhash(
     if blobs_present > 0:
         tx.ty = HexNumber(TransactionType.BLOB_TRANSACTION)
         tx.max_fee_per_blob_gas = HexNumber(fork.min_base_fee_per_blob_gas())
+        tx.max_fee_per_gas = HexNumber(1000)
+        tx.max_priority_fee_per_gas = HexNumber(0)
+        tx.access_list = []
         tx.blob_versioned_hashes = add_kzg_version(
             [i.to_bytes() * 32 for i in range(blobs_present)],
             BlobsSpec.BLOB_COMMITMENT_VERSION_KZG,

tests/benchmark/test_worst_stateful_opcodes.py

@@ -7,6 +7,7 @@
 
 import pytest
 
+from ethereum_test_base_types import HexNumber
 from ethereum_test_benchmark.benchmark_code_generator import ExtCallGenerator, JumpLoopGenerator
 from ethereum_test_forks import Fork
 from ethereum_test_specs import StateTestFiller
@@ -442,7 +443,7 @@ def test_worst_blockhash(
     # Create 256 dummy blocks to fill the blockhash window.
     blocks = [Block()] * 256
 
-    code = ExtCallGenerator(setup=Bytecode(), attack_block=Op.BLOCKHASH(0)).generate_repeated_code(
+    code = ExtCallGenerator(setup=Bytecode(), attack_block=Op.BLOCKHASH(1)).generate_repeated_code(
         repeated_code=Op.BLOCKHASH(1),
         setup=Bytecode(),
         cleanup=Bytecode(),
@@ -452,16 +453,14 @@ def test_worst_blockhash(
     iteration_count = math.ceil(gas_benchmark_value / tx_gas_limit_cap)
     code_address = pre.deploy_contract(code=code)
 
+    gas_remaining = gas_benchmark_value
     txs = []
-    for i in range(iteration_count):
-        tx_gas_limit = (
-            tx_gas_limit_cap
-            if i != iteration_count - 1
-            else gas_benchmark_value % tx_gas_limit_cap
-        )
+    for _ in range(iteration_count):
+        tx_gas_limit = min(tx_gas_limit_cap, gas_remaining)
+        gas_remaining -= tx_gas_limit
         tx = Transaction(
             to=code_address,
-            gas_limit=tx_gas_limit,
+            gas_limit=HexNumber(tx_gas_limit),
             sender=pre.fund_eoa(),
         )
         txs.append(tx)
@@ -471,6 +470,7 @@ def test_worst_blockhash(
         pre=pre,
         post={},
         blocks=blocks,
+        expected_benchmark_gas_used=gas_benchmark_value,
     )