From 9f037180bad44c4093a922b5cc5e8486ac30779b Mon Sep 17 00:00:00 2001 From: Danny Ryan Date: Fri, 24 Sep 2021 12:14:39 -0600 Subject: [PATCH 1/3] add ALTAIR_FORK_EPOCH for mainnet configuration --- configs/mainnet.yaml | 2 +- specs/altair/fork.md | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/configs/mainnet.yaml b/configs/mainnet.yaml index 6f2f582fa..90e5d8736 100644 --- a/configs/mainnet.yaml +++ b/configs/mainnet.yaml @@ -29,7 +29,7 @@ GENESIS_DELAY: 604800 # Altair ALTAIR_FORK_VERSION: 0x01000000 -ALTAIR_FORK_EPOCH: 18446744073709551615 +ALTAIR_FORK_EPOCH: 74240 # Oct 27, 2021, 10:56:23pm UTC # Merge MERGE_FORK_VERSION: 0x02000000 MERGE_FORK_EPOCH: 18446744073709551615 diff --git a/specs/altair/fork.md b/specs/altair/fork.md index f80064a83..739da80a5 100644 --- a/specs/altair/fork.md +++ b/specs/altair/fork.md @@ -1,7 +1,5 @@ # Altair -- Fork Logic -**Notice**: This document is a work-in-progress for researchers and implementers. - ## Table of contents @@ -26,13 +24,13 @@ Warning: this configuration is not definitive. | Name | Value | | - | - | | `ALTAIR_FORK_VERSION` | `Version('0x01000000')` | -| `ALTAIR_FORK_EPOCH` | `Epoch(18446744073709551615)` **TBD** | +| `ALTAIR_FORK_EPOCH` | `Epoch(74240)` (Oct 27, 2021, 10:56:23pm UTC) | ## Fork to Altair ### Fork trigger -TBD. Social consensus, along with state conditions such as epoch boundary, finality, deposits, active validator count, etc. may be part of the decision process to trigger the fork. For now we assume the condition will be triggered at epoch `ALTAIR_FORK_EPOCH`. +The fork is triggered at epoch `ALTAIR_FORK_EPOCH`. Note that for the pure Altair networks, we don't apply `upgrade_to_altair` since it starts with Altair version logic. From 7b0e7ceafae30861da7101ff8e9eaba91efd5359 Mon Sep 17 00:00:00 2001 From: Danny Ryan Date: Fri, 24 Sep 2021 12:28:46 -0600 Subject: [PATCH 2/3] Update configs/mainnet.yaml Co-authored-by: terence tsao --- configs/mainnet.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/mainnet.yaml b/configs/mainnet.yaml index 90e5d8736..be61d070c 100644 --- a/configs/mainnet.yaml +++ b/configs/mainnet.yaml @@ -29,7 +29,7 @@ GENESIS_DELAY: 604800 # Altair ALTAIR_FORK_VERSION: 0x01000000 -ALTAIR_FORK_EPOCH: 74240 # Oct 27, 2021, 10:56:23pm UTC +ALTAIR_FORK_EPOCH: 74240 # Oct 27, 2021, 10:56:23am UTC # Merge MERGE_FORK_VERSION: 0x02000000 MERGE_FORK_EPOCH: 18446744073709551615 From af5eef37b200129105c8430cc1e610c80b171ed3 Mon Sep 17 00:00:00 2001 From: Danny Ryan Date: Fri, 24 Sep 2021 12:29:34 -0600 Subject: [PATCH 3/3] fix am/pm issue --- specs/altair/fork.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specs/altair/fork.md b/specs/altair/fork.md index 739da80a5..6228022b8 100644 --- a/specs/altair/fork.md +++ b/specs/altair/fork.md @@ -24,7 +24,7 @@ Warning: this configuration is not definitive. | Name | Value | | - | - | | `ALTAIR_FORK_VERSION` | `Version('0x01000000')` | -| `ALTAIR_FORK_EPOCH` | `Epoch(74240)` (Oct 27, 2021, 10:56:23pm UTC) | +| `ALTAIR_FORK_EPOCH` | `Epoch(74240)` (Oct 27, 2021, 10:56:23am UTC) | ## Fork to Altair