From a2fbafb86e8f4d6be6330d856febadf6f9f680f9 Mon Sep 17 00:00:00 2001 From: parithosh Date: Mon, 25 Mar 2024 12:15:53 +0100 Subject: [PATCH 1/3] add electra configs --- configs/mainnet.yaml | 9 ++++++--- configs/minimal.yaml | 11 +++++++---- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/configs/mainnet.yaml b/configs/mainnet.yaml index 317daa1a4..82f98f819 100644 --- a/configs/mainnet.yaml +++ b/configs/mainnet.yaml @@ -50,14 +50,17 @@ CAPELLA_FORK_EPOCH: 194048 # April 12, 2023, 10:27:35pm UTC # Deneb DENEB_FORK_VERSION: 0x04000000 DENEB_FORK_EPOCH: 269568 # March 13, 2024, 01:55:35pm UTC +# Electra +ELECTRA_FORK_VERSION: 0x05000001 +ELECTRA_FORK_EPOCH: 18446744073709551615 # EIP6110 -EIP6110_FORK_VERSION: 0x05000000 # temporary stub +EIP6110_FORK_VERSION: 0x06000000 # temporary stub EIP6110_FORK_EPOCH: 18446744073709551615 # EIP7002 -EIP7002_FORK_VERSION: 0x05000000 # temporary stub +EIP7002_FORK_VERSION: 0x07000000 # temporary stub EIP7002_FORK_EPOCH: 18446744073709551615 # WHISK -WHISK_FORK_VERSION: 0x06000000 # temporary stub +WHISK_FORK_VERSION: 0x08000000 # temporary stub WHISK_FORK_EPOCH: 18446744073709551615 diff --git a/configs/minimal.yaml b/configs/minimal.yaml index 6b2da84fd..4406935e0 100644 --- a/configs/minimal.yaml +++ b/configs/minimal.yaml @@ -46,17 +46,20 @@ BELLATRIX_FORK_EPOCH: 18446744073709551615 # Capella CAPELLA_FORK_VERSION: 0x03000001 CAPELLA_FORK_EPOCH: 18446744073709551615 -# DENEB +# Deneb DENEB_FORK_VERSION: 0x04000001 DENEB_FORK_EPOCH: 18446744073709551615 +# Electra +ELECTRA_FORK_VERSION: 0x05000001 +ELECTRA_FORK_EPOCH: 18446744073709551615 # EIP6110 -EIP6110_FORK_VERSION: 0x05000001 +EIP6110_FORK_VERSION: 0x06000001 EIP6110_FORK_EPOCH: 18446744073709551615 # EIP7002 -EIP7002_FORK_VERSION: 0x05000001 +EIP7002_FORK_VERSION: 0x07000001 EIP7002_FORK_EPOCH: 18446744073709551615 # WHISK -WHISK_FORK_VERSION: 0x06000001 +WHISK_FORK_VERSION: 0x08000001 WHISK_FORK_EPOCH: 18446744073709551615 From 45803e6b83e128eb2c483d13cb31f9d9f6f7d623 Mon Sep 17 00:00:00 2001 From: parithosh Date: Mon, 25 Mar 2024 12:19:31 +0100 Subject: [PATCH 2/3] fix fork version --- configs/mainnet.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/mainnet.yaml b/configs/mainnet.yaml index 82f98f819..6afc82e95 100644 --- a/configs/mainnet.yaml +++ b/configs/mainnet.yaml @@ -51,7 +51,7 @@ CAPELLA_FORK_EPOCH: 194048 # April 12, 2023, 10:27:35pm UTC DENEB_FORK_VERSION: 0x04000000 DENEB_FORK_EPOCH: 269568 # March 13, 2024, 01:55:35pm UTC # Electra -ELECTRA_FORK_VERSION: 0x05000001 +ELECTRA_FORK_VERSION: 0x05000000 ELECTRA_FORK_EPOCH: 18446744073709551615 # EIP6110 EIP6110_FORK_VERSION: 0x06000000 # temporary stub From 88a35a1de1e77f7ca7b1f2915bc211d54783bd69 Mon Sep 17 00:00:00 2001 From: Hsiao-Wei Wang Date: Tue, 26 Mar 2024 13:18:40 +0800 Subject: [PATCH 3/3] update the spec files too --- specs/_features/eip6110/fork.md | 2 +- specs/_features/eip7002/fork.md | 2 +- specs/_features/whisk/fork.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/specs/_features/eip6110/fork.md b/specs/_features/eip6110/fork.md index 6b5ab0431..8bb8e2a67 100644 --- a/specs/_features/eip6110/fork.md +++ b/specs/_features/eip6110/fork.md @@ -28,7 +28,7 @@ Warning: this configuration is not definitive. | Name | Value | | - | - | -| `EIP6110_FORK_VERSION` | `Version('0x05000000')` | +| `EIP6110_FORK_VERSION` | `Version('0x06000000')` | | `EIP6110_FORK_EPOCH` | `Epoch(18446744073709551615)` **TBD** | ## Helper functions diff --git a/specs/_features/eip7002/fork.md b/specs/_features/eip7002/fork.md index 87008de77..8f095389d 100644 --- a/specs/_features/eip7002/fork.md +++ b/specs/_features/eip7002/fork.md @@ -28,7 +28,7 @@ Warning: this configuration is not definitive. | Name | Value | | - | - | -| `EIP7002_FORK_VERSION` | `Version('0x05000000')` | +| `EIP7002_FORK_VERSION` | `Version('0x07000000')` | | `EIP7002_FORK_EPOCH` | `Epoch(18446744073709551615)` **TBD** | ## Helper functions diff --git a/specs/_features/whisk/fork.md b/specs/_features/whisk/fork.md index ef3eb0846..300d19129 100644 --- a/specs/_features/whisk/fork.md +++ b/specs/_features/whisk/fork.md @@ -41,7 +41,7 @@ Warning: this configuration is not definitive. | Name | Value | | -------------------- | ----------------------- | -| `WHISK_FORK_VERSION` | `Version('0x05000000')` | +| `WHISK_FORK_VERSION` | `Version('0x08000000')` | | `WHISK_FORK_EPOCH` | `Epoch(18446744073709551615)` **TBD** | ## Fork to Whisk