From 1becd05c0ee315cb35b288654fff7bd413311ece Mon Sep 17 00:00:00 2001 From: Joe Date: Mon, 19 Sep 2022 15:02:52 +0100 Subject: [PATCH 1/5] add paris to upgrade history --- src/content/history/index.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/content/history/index.md b/src/content/history/index.md index e2acd67860a..95357898d2d 100644 --- a/src/content/history/index.md +++ b/src/content/history/index.md @@ -26,6 +26,21 @@ Looking for future protocol upgrades? [Learn about upcoming upgrades to Ethereum ## 2022 {#2022} +### Paris {#paris} + +Sep-15-2022 06:42:42 AM +UTC
+Block number: 15537393
+ETH price: $1,472 USD
+ ethereum.org on waybackmachine + +#### Summary {paris-summary} + +The Paris upgrade was triggered by the proof-of-work blockchain passing a [terminal total difficulty](/glossary/#terminal-total-difficulty) of 58750000000000000000000. This happened at block 15537393 on 15th September 2022. Paris was The Merge transition - its major feature was switching off the proof-of-work mining algorithm and associated consensus logic and switching on proof-of-stake instead. Paris itself was an upgrade to the execution clients (equivalent to Bellatrix on the consensus layer) that enabled them to take instruction from their connected consensus clients. This required a new set of internal API methods, collectively known as the [Engine API](https://github.com/ethereum/execution-apis/blob/main/src/engine/specification.md), to be activated. This was arguably the most significant upgrade in Ethereum history since Homestead! + +- [Read the Paris upgrade specification](https://github.com/ethereum/execution-specs/blob/master/network-upgrades/mainnet-upgrades/paris.md) + +--- + ### Bellatrix {#bellatrix} Sep-06-2022 11:34:47 AM +UTC
From 76e5ea735cfc35949a11dbe8989a4997bbf808be Mon Sep 17 00:00:00 2001 From: Joe Date: Mon, 19 Sep 2022 15:05:17 +0100 Subject: [PATCH 2/5] update webarchive link --- src/content/history/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/content/history/index.md b/src/content/history/index.md index 95357898d2d..6e5a868e545 100644 --- a/src/content/history/index.md +++ b/src/content/history/index.md @@ -31,7 +31,7 @@ Looking for future protocol upgrades? [Learn about upcoming upgrades to Ethereum Sep-15-2022 06:42:42 AM +UTC
Block number: 15537393
ETH price: $1,472 USD
- ethereum.org on waybackmachine + ethereum.org on waybackmachine #### Summary {paris-summary} From b42bab77c9ec2339931ad2badd58a97441c54978 Mon Sep 17 00:00:00 2001 From: Joseph Cook <33655003+jmcook1186@users.noreply.github.com> Date: Tue, 20 Sep 2022 09:09:06 +0100 Subject: [PATCH 3/5] Update index.md --- src/content/history/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/content/history/index.md b/src/content/history/index.md index 6e5a868e545..b0e2aaae886 100644 --- a/src/content/history/index.md +++ b/src/content/history/index.md @@ -26,7 +26,7 @@ Looking for future protocol upgrades? [Learn about upcoming upgrades to Ethereum ## 2022 {#2022} -### Paris {#paris} +### Paris (The Merge) {#paris} Sep-15-2022 06:42:42 AM +UTC
Block number: 15537393
From 8db7d37e69647ff3e81a547a8c91358ee52b7d9e Mon Sep 17 00:00:00 2001 From: Paul Wackerow <54227730+wackerow@users.noreply.github.com> Date: Sat, 24 Sep 2022 00:25:45 +0200 Subject: [PATCH 4/5] Update src/content/history/index.md Co-authored-by: Corwin Smith --- src/content/history/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/content/history/index.md b/src/content/history/index.md index b0e2aaae886..9c079846720 100644 --- a/src/content/history/index.md +++ b/src/content/history/index.md @@ -35,7 +35,7 @@ Looking for future protocol upgrades? [Learn about upcoming upgrades to Ethereum #### Summary {paris-summary} -The Paris upgrade was triggered by the proof-of-work blockchain passing a [terminal total difficulty](/glossary/#terminal-total-difficulty) of 58750000000000000000000. This happened at block 15537393 on 15th September 2022. Paris was The Merge transition - its major feature was switching off the proof-of-work mining algorithm and associated consensus logic and switching on proof-of-stake instead. Paris itself was an upgrade to the execution clients (equivalent to Bellatrix on the consensus layer) that enabled them to take instruction from their connected consensus clients. This required a new set of internal API methods, collectively known as the [Engine API](https://github.com/ethereum/execution-apis/blob/main/src/engine/specification.md), to be activated. This was arguably the most significant upgrade in Ethereum history since Homestead! +The Paris upgrade was triggered by the proof-of-work blockchain passing a [terminal total difficulty](/glossary/#terminal-total-difficulty) of 58750000000000000000000. This happened at block 15537393 on 15th September 2022. Paris was [The Merge](/upgrades/merge/) transition - its major feature was switching off the [proof-of-work](/developers/docs/consensus-mechanisms/pow) mining algorithm and associated consensus logic and switching on [proof-of-stake](/developers/docs/consensus-mechanisms/pos) instead. Paris itself was an upgrade to the [execution clients](/developers/docs/nodes-and-clients/#execution-clients) (equivalent to Bellatrix on the consensus layer) that enabled them to take instruction from their connected [consensus clients](/developers/docs/nodes-and-clients/#consensus-clients). This required a new set of internal API methods, collectively known as the [Engine API](https://github.com/ethereum/execution-apis/blob/main/src/engine/specification.md), to be activated. This was arguably the most significant upgrade in Ethereum history since [Homestead](#homestead)! - [Read the Paris upgrade specification](https://github.com/ethereum/execution-specs/blob/master/network-upgrades/mainnet-upgrades/paris.md) From ea87ae75a6c767941170d8fa40192c3749781092 Mon Sep 17 00:00:00 2001 From: Paul Wackerow <54227730+wackerow@users.noreply.github.com> Date: Mon, 26 Sep 2022 13:07:27 -0700 Subject: [PATCH 5/5] etherscan link and block clarifier --- src/content/history/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/content/history/index.md b/src/content/history/index.md index 9c079846720..73798d54949 100644 --- a/src/content/history/index.md +++ b/src/content/history/index.md @@ -29,13 +29,13 @@ Looking for future protocol upgrades? [Learn about upcoming upgrades to Ethereum ### Paris (The Merge) {#paris} Sep-15-2022 06:42:42 AM +UTC
-Block number: 15537393
+Block number: 15537394
ETH price: $1,472 USD
ethereum.org on waybackmachine #### Summary {paris-summary} -The Paris upgrade was triggered by the proof-of-work blockchain passing a [terminal total difficulty](/glossary/#terminal-total-difficulty) of 58750000000000000000000. This happened at block 15537393 on 15th September 2022. Paris was [The Merge](/upgrades/merge/) transition - its major feature was switching off the [proof-of-work](/developers/docs/consensus-mechanisms/pow) mining algorithm and associated consensus logic and switching on [proof-of-stake](/developers/docs/consensus-mechanisms/pos) instead. Paris itself was an upgrade to the [execution clients](/developers/docs/nodes-and-clients/#execution-clients) (equivalent to Bellatrix on the consensus layer) that enabled them to take instruction from their connected [consensus clients](/developers/docs/nodes-and-clients/#consensus-clients). This required a new set of internal API methods, collectively known as the [Engine API](https://github.com/ethereum/execution-apis/blob/main/src/engine/specification.md), to be activated. This was arguably the most significant upgrade in Ethereum history since [Homestead](#homestead)! +The Paris upgrade was triggered by the proof-of-work blockchain passing a [terminal total difficulty](/glossary/#terminal-total-difficulty) of 58750000000000000000000. This happened at block 15537393 on 15th September 2022, triggering the Paris upgrade the next block. Paris was [The Merge](/upgrades/merge/) transition - its major feature was switching off the [proof-of-work](/developers/docs/consensus-mechanisms/pow) mining algorithm and associated consensus logic and switching on [proof-of-stake](/developers/docs/consensus-mechanisms/pos) instead. Paris itself was an upgrade to the [execution clients](/developers/docs/nodes-and-clients/#execution-clients) (equivalent to Bellatrix on the consensus layer) that enabled them to take instruction from their connected [consensus clients](/developers/docs/nodes-and-clients/#consensus-clients). This required a new set of internal API methods, collectively known as the [Engine API](https://github.com/ethereum/execution-apis/blob/main/src/engine/specification.md), to be activated. This was arguably the most significant upgrade in Ethereum history since [Homestead](#homestead)! - [Read the Paris upgrade specification](https://github.com/ethereum/execution-specs/blob/master/network-upgrades/mainnet-upgrades/paris.md)