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.

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

src|tests: Final final update to beacon root address #312

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ Test fixtures for use by clients are available for each release on the [Github r

### 🧪 Test Cases

- 🐞 Tests: Fix invalid blob txs pre-Cancun engine response ([#306](https://github.com/ethereum/execution-spec-tests/pull/306)).
- 🐞 [EIP-4844](https://eips.ethereum.org/EIPS/eip-4844): Fix invalid blob txs pre-Cancun engine response ([#306](https://github.com/ethereum/execution-spec-tests/pull/306)).
- ✨ [EIP-4788](https://eips.ethereum.org/EIPS/eip-4788): Final update to the beacon root address ([#312](https://github.com/ethereum/execution-spec-tests/pull/312)).

### 🛠️ Framework

Expand All @@ -18,7 +19,7 @@ Test fixtures for use by clients are available for each release on the [Github r

- ✨ Docs: Changelog added ([#305](https://github.com/ethereum/execution-spec-tests/pull/305)).
- ✨ CI/CD: Run development fork tests in Github Actions ([#302](https://github.com/ethereum/execution-spec-tests/pull/302)).
- ✨ CI/CD: Generate test JSON fixtures on push ([#301](https://github.com/ethereum/execution-spec-tests/pull/303)).
- ✨ CI/CD: Generate test JSON fixtures on push ([#303](https://github.com/ethereum/execution-spec-tests/pull/303)).

## [v1.0.4](https://github.com/ethereum/execution-spec-tests/releases/tag/v1.0.4) - 2023-09-21: 🐍 Cancun Devnet 9 Release 2

Expand Down
2 changes: 1 addition & 1 deletion evm-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ main:
develop:
impl: geth
repo: marioevz/go-ethereum
ref: cancun-t8n
ref: cancun-t8n-beacon-root-final-address
2 changes: 1 addition & 1 deletion src/ethereum_test_forks/forks/forks.py
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ def pre_allocation(cls, block_number: int = 0, timestamp: int = 0) -> Mapping:
Cancun requires pre-allocation of the beacon root contract for EIP-4788
"""
new_allocation = {
0xBEAC020008AFF7331C0A389CB2AAB67597567D7A: {
0x000F3DF6D732807EF1319FB7B8BB8522D0BEAC02: {
"nonce": 1,
"code": "0x3373fffffffffffffffffffffffffffffffffffffffe14604d57602036146024575f5f"
"fd5b5f35801560495762001fff810690815414603c575f5ffd5b62001fff01545f5260205ff35b5f"
Expand Down
4 changes: 2 additions & 2 deletions tests/cancun/eip4788_beacon_root/spec.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ class Spec:
https://eips.ethereum.org/EIPS/eip-4788#specification
"""

BEACON_ROOTS_ADDRESS = 0xBEAC020008AFF7331C0A389CB2AAB67597567D7A
BEACON_ROOTS_ADDRESS = 0x000F3DF6D732807EF1319FB7B8BB8522D0BEAC02
BEACON_ROOTS_CALL_GAS = 100_000
BEACON_ROOTS_DEPLOYER_ADDRESS = 0x4F6DA9BA1CC8C37D9CE52311D4BAFFC43BA42D0E
BEACON_ROOTS_DEPLOYER_ADDRESS = 0x0B799C86A49DEEB90402691F1041AA3AF2D3C875
HISTORY_BUFFER_LENGTH = 8_191
SYSTEM_ADDRESS = 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
FORK_TIMESTAMP = 15_000 # ShanghaiToCancun timestamp
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ def test_beacon_root_contract_deploy(
),
v=0x1B,
r=0x539,
s=0x1337005F06A8B6A0A0B1F4,
s=0x1B9B6EB1F0,
protected=False,
).with_signature_and_sender()
deployer_address = deploy_tx.sender
Expand Down