From bbe03ae9923a517c7249c593e880b395fd587a50 Mon Sep 17 00:00:00 2001 From: spencer-tb Date: Mon, 25 Sep 2023 14:46:06 -0400 Subject: [PATCH 1/4] src|tests: Final final update to beacon root address. --- src/ethereum_test_forks/forks/forks.py | 2 +- tests/cancun/eip4788_beacon_root/spec.py | 4 ++-- .../eip4788_beacon_root/test_blocks_beacon_root_contract.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ethereum_test_forks/forks/forks.py b/src/ethereum_test_forks/forks/forks.py index d2894288e2..c13b41438a 100644 --- a/src/ethereum_test_forks/forks/forks.py +++ b/src/ethereum_test_forks/forks/forks.py @@ -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" diff --git a/tests/cancun/eip4788_beacon_root/spec.py b/tests/cancun/eip4788_beacon_root/spec.py index 739f09fe73..65b8f2de4e 100644 --- a/tests/cancun/eip4788_beacon_root/spec.py +++ b/tests/cancun/eip4788_beacon_root/spec.py @@ -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 diff --git a/tests/cancun/eip4788_beacon_root/test_blocks_beacon_root_contract.py b/tests/cancun/eip4788_beacon_root/test_blocks_beacon_root_contract.py index 32b45ba07b..bb55311655 100644 --- a/tests/cancun/eip4788_beacon_root/test_blocks_beacon_root_contract.py +++ b/tests/cancun/eip4788_beacon_root/test_blocks_beacon_root_contract.py @@ -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 From d8783d71e75831ffd793b792a0010745fd92842d Mon Sep 17 00:00:00 2001 From: spencer-tb Date: Mon, 25 Sep 2023 14:56:28 -0400 Subject: [PATCH 2/4] docs: Update changelog. --- docs/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index c52956bdf4..6d388d4bd2 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -9,6 +9,7 @@ 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)). +- ๐Ÿž Src|Tests: Final update to the beacon root address ([#312](https://github.com/ethereum/execution-spec-tests/pull/312)). ### ๐Ÿ› ๏ธ Framework From bf1e899b390c65de81429a991ac71f034f0c93d9 Mon Sep 17 00:00:00 2001 From: spencer-tb Date: Mon, 25 Sep 2023 15:00:31 -0400 Subject: [PATCH 3/4] evm-config.yaml: Update develop branch. --- evm-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evm-config.yaml b/evm-config.yaml index 371fc0fe57..f67dd3e7f9 100644 --- a/evm-config.yaml +++ b/evm-config.yaml @@ -5,4 +5,4 @@ main: develop: impl: geth repo: marioevz/go-ethereum - ref: cancun-t8n \ No newline at end of file + ref: cancun-t8n-beacon-root-final-address \ No newline at end of file From 03b936c6aee0012bb62e0db18c85e8b01dc6c7e1 Mon Sep 17 00:00:00 2001 From: danceratopz Date: Tue, 26 Sep 2023 11:52:05 +0200 Subject: [PATCH 4/4] docs: small updates to changelog --- docs/CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 6d388d4bd2..79717cb1fa 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -8,8 +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)). -- ๐Ÿž Src|Tests: Final update to the beacon root address ([#312](https://github.com/ethereum/execution-spec-tests/pull/312)). +- ๐Ÿž [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 @@ -19,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