From 9d11a754e037629202b69f76f281a4f742d12778 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marius=20Kj=C3=A6rstad?= Date: Thu, 9 Mar 2023 20:07:48 +0100 Subject: [PATCH 1/2] Add roll out strategy for Shanghai Add roll out strategy for Shanghai --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 72e0638e20..a67e2a50f0 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ This repository contains the consensus specifications related to the Ethereum ex | Frontier Thawing | 200000 | 2015-09-07 | | | [Blog](https://blog.ethereum.org/2015/08/04/the-thawing-frontier/) | | Frontier | 1 | 2015-07-30 | | | [Blog](https://blog.ethereum.org/2015/07/22/frontier-is-coming-what-to-expect-and-how-to-prepare/) | -*Note:* Starting with Paris, updates are not rolled out based on block numbers. Paris was enabled once TTD reached 58750000000000000000000. Updates after Paris are yet to have a decided roll out strategy. +*Note:* Starting with Paris, updates are not rolled out based on block numbers. Paris was enabled once TTD reached 58750000000000000000000. The roll out strategy for Shanghai will be based on timestamp. Updates after Shanghai will also most likely use this roll out strategy. Some clarifications were enabled without protocol releases: From 70e309442add8676ee5452a01cd66fd1e9eba4e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marius=20Kj=C3=A6rstad?= Date: Thu, 9 Mar 2023 22:06:07 +0100 Subject: [PATCH 2/2] Rephrase roll out strategy for Shanghai Rephrase roll out strategy for Shanghai Co-authored-by: Tim Beiko --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a67e2a50f0..c0625df08f 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ This repository contains the consensus specifications related to the Ethereum ex | Frontier Thawing | 200000 | 2015-09-07 | | | [Blog](https://blog.ethereum.org/2015/08/04/the-thawing-frontier/) | | Frontier | 1 | 2015-07-30 | | | [Blog](https://blog.ethereum.org/2015/07/22/frontier-is-coming-what-to-expect-and-how-to-prepare/) | -*Note:* Starting with Paris, updates are not rolled out based on block numbers. Paris was enabled once TTD reached 58750000000000000000000. The roll out strategy for Shanghai will be based on timestamp. Updates after Shanghai will also most likely use this roll out strategy. +*Note:* Starting with Paris, updates are no longer rolled out based on block numbers. Paris was enabled once proof-of-work Total Difficulty reached 58750000000000000000000. As of Shanghai, upgrade activation is based on timestamps. Some clarifications were enabled without protocol releases: