Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 3 commits into from
Jun 25, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a679e15
fix(fw): Rename validator_public_key -> validator_pubkey
marioevz Jun 6, 2024
01c1616
fix(tests): EIP-7002: Rename validator_public_key -> validator_pubkey
marioevz Jun 6, 2024
e119c13
changelog
marioevz Jun 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions src/ethereum_test_tools/common/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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),
]

Expand Down
4 changes: 2 additions & 2 deletions tests/prague/eip7002_el_triggerable_withdrawals/helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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":
Expand Down Expand Up @@ -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,
)
Expand Down
Loading