fix(fw,tests): Withdrawal request v1 update execution-apis #549 (#600)

* fix(fw): Rename validator_public_key -> validator_pubkey

* fix(tests): EIP-7002: Rename validator_public_key -> validator_pubkey

* changelog

Author: marioevz

docs/CHANGELOG.md

@@ -22,6 +22,7 @@ Test fixtures for use by clients are available for each release on the [Github r
 - ✨ Add tests for [EIP-7069: EOF - Revamped CALL instructions](https://eips.ethereum.org/EIPS/eip-7069) ([#595](https://github.com/ethereum/execution-spec-tests/pull/595)).
 - 🐞 Fix typos in self-destruct collision test from erroneous pytest parametrization ([#608](https://github.com/ethereum/execution-spec-tests/pull/608)).
 - ✨ Add tests for [EIP-3540: EOF - EVM Object Format v1](https://eips.ethereum.org/EIPS/eip-3540) ([#634](https://github.com/ethereum/execution-spec-tests/pull/634)).
+- 🔀 Update EIP-7002 tests to match spec changes in [ethereum/execution-apis#549](https://github.com/ethereum/execution-apis/pull/549) ([#600](https://github.com/ethereum/execution-spec-tests/pull/600))
 
 ### 🛠️ Framework
 

src/ethereum_test_tools/common/types.py

@@ -1511,7 +1511,7 @@ class WithdrawalRequestGeneric(RequestBase, CamelModel, Generic[NumberBoundTypeV
     """
 
     source_address: Address = Address(0)
-    validator_public_key: BLSPublicKey
+    validator_pubkey: BLSPublicKey
     amount: NumberBoundTypeVar
 
     @classmethod
@@ -1527,7 +1527,7 @@ def to_serializable_list(self) -> List[Any]:
         """
         return [
             self.source_address,
-            self.validator_public_key,
+            self.validator_pubkey,
             Uint(self.amount),
         ]
 

tests/prague/eip7002_el_triggerable_withdrawals/helpers.py

@@ -54,7 +54,7 @@ def calldata(self) -> bytes:
         withdrawal.
         """
         return self.calldata_modifier(
-            self.validator_public_key + self.amount.to_bytes(8, byteorder="big")
+            self.validator_pubkey + self.amount.to_bytes(8, byteorder="big")
         )
 
     def with_source_address(self, source_address: Address) -> "WithdrawalRequest":
@@ -274,7 +274,7 @@ def get_n_fee_increment_blocks(n: int) -> List[List[WithdrawalRequestContract]]:
                 WithdrawalRequestContract(
                     requests=[
                         WithdrawalRequest(
-                            validator_public_key=i,
+                            validator_pubkey=i,
                             amount=0,
                             fee=fee,
                         )