refactor(benchmark): update jump initcode analysis

Author: LouisTsai-Csie

tests/benchmark/test_worst_bytecode.py

@@ -9,13 +9,16 @@
 
 import pytest
 
+from ethereum_test_benchmark.benchmark_code_generator import JumpLoopGenerator
 from ethereum_test_forks import Fork
 from ethereum_test_tools import (
     Account,
     Alloc,
+    BenchmarkTestFiller,
     Block,
     BlockchainTestFiller,
     Bytecode,
+    Bytes,
     Environment,
     Hash,
     StateTestFiller,
@@ -245,7 +248,7 @@ def test_worst_bytecode_single_opcode(
     ids=lambda x: x.hex(),
 )
 def test_worst_initcode_jumpdest_analysis(
-    state_test: StateTestFiller,
+    benchmark_test: BenchmarkTestFiller,
     pre: Alloc,
     fork: Fork,
     pattern: Bytecode,
@@ -260,7 +263,6 @@ def test_worst_initcode_jumpdest_analysis(
     The initicode is modified by mixing-in the returned create address between CREATE invocations
     to prevent caching.
     """
-    max_code_size = fork.max_code_size()
     initcode_size = fork.max_initcode_size()
 
     # Expand the initcode pattern to the transaction data so it can be used in CALLDATACOPY
@@ -290,32 +292,20 @@ def test_worst_initcode_jumpdest_analysis(
     # Make sure the last opcode in the initcode is JUMPDEST.
     code_prepare_initcode += Op.MSTORE(initcode_size - 32, Op.PUSH32[bytes(Op.JUMPDEST) * 32])
 
-    code_invoke_create = (
+    attack_block = (
         Op.PUSH1[len(initcode_prefix)]
         + Op.MSTORE
         + Op.CREATE(value=Op.PUSH0, offset=Op.PUSH0, size=Op.MSIZE)
     )
 
-    initial_random = Op.PUSH0
-    code_prefix = code_prepare_initcode + initial_random
-    code_loop_header = Op.JUMPDEST
-    code_loop_footer = Op.JUMP(len(code_prefix))
-    code_loop_body_len = (
-        max_code_size - len(code_prefix) - len(code_loop_header) - len(code_loop_footer)
-    )
-
-    code_loop_body = (code_loop_body_len // len(code_invoke_create)) * bytes(code_invoke_create)
-    code = code_prefix + code_loop_header + code_loop_body + code_loop_footer
-    assert (max_code_size - len(code_invoke_create)) < len(code) <= max_code_size
+    setup = code_prepare_initcode + Op.PUSH0
 
-    tx = Transaction(
-        to=pre.deploy_contract(code=code),
-        data=tx_data,
-        gas_limit=gas_benchmark_value,
-        sender=pre.fund_eoa(),
-    )
+    generator = JumpLoopGenerator(setup=setup, attack_block=attack_block, cleanup=Bytecode())
+    generator.deploy_contracts(pre, fork)
+    tx = generator.generate_transaction(pre, gas_benchmark_value, fork)
+    tx.data = Bytes(tx_data)
 
-    state_test(
+    benchmark_test(
         pre=pre,
         post={},
         tx=tx,