Merge pull request #12411 from ethereum/dencun

Join in-tandem upgrades as one entry in `/history`; add naming explainer

public/content/history/index.md

@@ -19,6 +19,49 @@ These rule changes may create a temporary split in the network. New blocks could
 
 </ExpandableCard>
 
+<ExpandableCard title="Why do some upgrades have multiple names?" contentPreview="Upgrades names follow a pattern">
+
+The software that underlies Ethereum is composed of two halves, known as the [execution layer](/glossary/#execution-layer) and the [consensus layer](/glossary/#consensus-layer).
+
+**Execution upgrade naming**
+
+Since 2021, upgrades to the **execution layer** are named according to the city names of [previous Devcon locations](https://devcon.org/en/past-events/) in chronological order:
+
+| Upgrade Name | Devcon Year | Devcon Number | Upgrade Date |
+| ------------ | ----------- | ------------- | ------------ |
+| Berlin       | 2015        | 0             | Apr 15, 2021 |
+| London       | 2016        | I             | Aug 5, 2021  |
+| Shanghai     | 2017        | II            | Apr 12, 2023 |
+| **_Cancun_** | 2018        | III           | Mar 13, 2024 |
+| _Prague_     | 2019        | IV            | TBD          |
+| _Osaka_      | 2020        | V             | TBD          |
+| _Bogota_     | 2022        | VI            | TBD          |
+| _Bangkok_    | 2024        | VII           | TBD          |
+
+**Consensus upgrade naming**
+
+Since the launch of the [Beacon Chain](/glossary/#beacon-chain), upgrades to the **consensus layer** are named after celestial stars beginning with letters that proceed in alphabetical order:
+
+| Upgrade Name                                                | Upgrade Date |
+| ----------------------------------------------------------- | ------------ |
+| Beacon Chain genesis                                        | Dec 1, 2020  |
+| [Altair](https://en.wikipedia.org/wiki/Altair)              | Oct 27, 2021 |
+| [Bellatrix](https://en.wikipedia.org/wiki/Bellatrix)        | Sep 6, 2022  |
+| [Capella](https://en.wikipedia.org/wiki/Capella)            | Apr 12, 2023 |
+| [**_Deneb_**](https://en.wikipedia.org/wiki/Deneb)          | Mar 13, 2024 |
+| [_Electra_](<https://en.wikipedia.org/wiki/Electra_(star)>) | TBD          |
+
+**Combined naming**
+
+The execution and consensus upgrades were initially rolled out at different times, but after [The Merge](/roadmap/merge/) in 2022 these have been deployed simultaneously. As-such, colloquial terms have emerged to simplify references to these upgrades using a single conjoined term. This began with the _Shanghai-Capella_ upgrade, commonly referred to as "**Shapella**", and is continued with the _Cancun-Deneb_ upgrade, which may be referred to as "**Dencun**."
+
+| Execution Upgrade | Consensus Upgrade | Short Name |
+| ----------------- | ----------------- | ---------- |
+| Shanghai          | Capella           | "Shapella" |
+| Cancun            | Deneb             | "Dencun"   |
+
+</ExpandableCard>
+
 Skip straight to information about some of the particularly important past upgrades: [The Beacon Chain](/roadmap/beacon-chain/); [The Merge](/roadmap/merge/); and [EIP-1559](#london)
 
 Looking for future protocol upgrades? [Learn about upcoming upgrades on the Ethereum roadmap](/roadmap/).
@@ -27,11 +70,11 @@ Looking for future protocol upgrades? [Learn about upcoming upgrades on the Ethe
 
 ## 2024 {#2024}
 
-### _(In Progress)_&nbsp; Cancun {#cancun}
+###  Cancun-Deneb ("Dencun") {#dencun}
 
-<NetworkUpgradeSummary name="cancun" />
+<NetworkUpgradeSummary name="dencun" />
 
-#### Summary {#cancun-summary}
+#### Cancun summary {#cancun-summary}
 
 The Cancun upgrade contains a set of improvements to Ethereum's _execution_ aimed towards improving scalability, in tandem with the Deneb consensus upgrades.
 
@@ -55,13 +98,7 @@ Notably this includes EIP-4844, known as **Proto-Danksharding**, which significa
 - [Danksharding](/roadmap/danksharding/)
 - [Read the Cancun upgrade specification](https://github.com/ethereum/execution-specs/blob/master/network-upgrades/mainnet-upgrades/cancun.md)
 
----
-
-### _(In Progress)_&nbsp; Deneb {#deneb}
-
-<NetworkUpgradeSummary name="deneb" />
-
-#### Summary {#deneb-summary}
+#### Deneb summary {#deneb-summary}
 
 The Deneb upgrade contains a set of improvements to Ethereum's _consensus_ aimed towards improving scalability. This upgrade comes in tandem with the Cancun execution upgrades to enable Proto-Danksharding (EIP-4844), along with other improvements to the Beacon Chain.
 
@@ -87,11 +124,11 @@ EIP-7514 brings a tightening to the issuance of ETH by capping the "churn" rate
 
 ## 2023 {#2023}
 
-### Shanghai {#shanghai}
+### Shanghai-Capella ("Shapella") {#shapella}
 
-<NetworkUpgradeSummary name="shanghai" />
+<NetworkUpgradeSummary name="shapella" />
 
-#### Summary {#shanghai-summary}
+#### Shanghai summary {#shanghai-summary}
 
 The Shanghai upgrade brought staking withdrawals to the execution layer. In tandem with the Capella upgrade, this enabled blocks to accept withdrawal operations, which allows stakers to withdraw their ETH from the Beacon Chain to the execution layer.
 
@@ -109,13 +146,7 @@ The Shanghai upgrade brought staking withdrawals to the execution layer. In tand
 
 - [Read the Shanghai upgrade specification](https://github.com/ethereum/execution-specs/blob/master/network-upgrades/mainnet-upgrades/shanghai.md)
 
----
-
-### Capella {#capella}
-
-<NetworkUpgradeSummary name="capella" />
-
-#### Summary {#capella-summary}
+#### Capella summary {#capella-summary}
 
 The Capella upgrade was the third major upgrade to the consensus layer (Beacon Chain) and enabled staking withdrawals. Capella occurred synchronously with the execution layer upgrade, Shanghai, and enabled staking withdrawal functionality.
 

public/content/translations/de/history/index.md

@@ -26,11 +26,11 @@ Suchen Sie nach weiteren Protokoll-Upgrades? [Erfahren Sie mehr über anstehende
 
 ## 2023 {#2023}
 
-### Shanghai {#shanghai}
+### Shanghai-Capella ("Shapella") {#shapella}
 
-<NetworkUpgradeSummary name="shanghai" />
+<NetworkUpgradeSummary name="shapella" />
 
-#### Zusammenfassung {#shanghai-summary}
+#### Shanghai-Zusammenfassung {#shanghai-summary}
 
 Das Shanghai-Update ebnete den Weg für Staking-Auszahlungen auf der Ausführungsebene. Die Fusion mit dem Capella-Upgrade ermöglichte es Blöcken, Auszahlungen zu akzeptieren, wodurch Stakern erlaubt wurde, ihre ETH von der Beacon Chain auf der Ausführungsebene abzuheben.
 
@@ -48,13 +48,7 @@ Das Shanghai-Update ebnete den Weg für Staking-Auszahlungen auf der Ausführung
 
 - [Lesen Sie die Spezifikation für das Shanghai-Upgrade](https://github.com/ethereum/execution-specs/blob/master/network-upgrades/mainnet-upgrades/shanghai.md)
 
----
-
-### Capella {#capella}
-
-<NetworkUpgradeSummary name="capella" />
-
-#### Zusammenfassung {#capella-summary}
+#### Capella-Zusammenfassung {#capella-summary}
 
 Das Capella-Update war das drittgrößte Upgrade für die Konsensebene (Beacon Chain) und ermöglichte Staking-Abhebungen. Mit Capella, das gleichzeitig mit dem Upgrade der Ausführungsebene, Shanghai, erfolgte, wurde die Staking-Abhebungsfunktion zur Verfügung gestellt.
 

public/content/translations/es/history/index.md

@@ -27,11 +27,11 @@ Vaya directamente a la información sobre algunas de las actualizaciones anterio
 
 ## 2023 {#2023}
 
-### Shanghai {#shanghai}
+### Shanghai-Capella {#shapella}
 
-<NetworkUpgradeSummary name="shanghai" />
+<NetworkUpgradeSummary name="shapella" />
 
-#### Resumen {#shanghai-summary}
+#### Resumen de Shangai {#shanghai-summary}
 
 La actualizacion Shangai permite retirar la participación a la capa de ejecución. Junto con la actualización Capella, habilitó los bloques para aceptar las operaciones de retirada, que permitieran a los interesados retirar sus ETH provenientes de la cadena de baliza para ejecutarlos posteriormente.
 
@@ -49,13 +49,7 @@ La actualizacion Shangai permite retirar la participación a la capa de ejecuci
 
 - [Lea la especificación de la actualización Shanghai](https://github.com/ethereum/execution-specs/blob/master/network-upgrades/mainnet-upgrades/shanghai.md)
 
----
-
-### Capella {#capella}
-
-<NetworkUpgradeSummary name="capella" />
-
-#### Resumen {#capella-summary}
+#### Resumen de Capella {#capella-summary}
 
 La actualizacion Capella es la tercera actualización importante a la capa de consenso (cadena de baliza), que le permite retirar su participación. Capella se produjo de forma sincrónica a la actualización de la capa de ejecución, Shanghai, y activó la funcionalidad de retirada de participaciones.
 

public/content/translations/fr/history/index.md

@@ -27,11 +27,11 @@ Vous cherchez les prochaines mises à jour de protocole ? [Découvrez les mises
 
 ## 2023 {#2023}
 
-### Shanghai {#shanghai}
+### Shanghai-Capella ("Shapella") {#shapella}
 
-<NetworkUpgradeSummary name="shanghai" />
+<NetworkUpgradeSummary name="shapella" />
 
-#### Résumé {#shanghai-summary}
+#### Résumé de Shanghai {#shanghai-summary}
 
 La mise à jour Shanghai a ouvert la voie à des opérations de retrait et de basculement vers la couche d'exécution Couplée à la mise à jour Capella, cette mise à jour permet aux blocs d'accepter des opérations de retrait, permettant ainsi aux validateurs de retirer leur ETH de la chaîne phare et de le basculer vers la couche d'exécution.
 
@@ -49,13 +49,7 @@ La mise à jour Shanghai a ouvert la voie à des opérations de retrait et de ba
 
 - [Lire les spécificités de la mise à jour Shanghai](https://github.com/ethereum/execution-specs/blob/master/network-upgrades/mainnet-upgrades/shanghai.md)
 
----
-
-### Capella {#capella}
-
-<NetworkUpgradeSummary name="capella" />
-
-#### Résumé {#capella-summary}
+#### Résumé de Capella {#capella-summary}
 
 La mise à jour Capella est la troisième mise à jour majeure vers la couche de consensus (Chaine phare). Elle a permis d'effectuer des retraits de mise en jeu. Capella est entrée en action en même temps que la mise à niveau de la couche d'exécution, Shanghai, et a activé la fonctionnalité de retrait de mise en jeu.
 

public/content/translations/hu/history/index.md

@@ -27,11 +27,11 @@ Az elkövetkező protokollfrissítések érdeklik? [Tudjon meg többet a követk
 
 ## 2023 {#2023}
 
-### Shanghai {#shanghai}
+### Shanghai-Capella ("Shapella") {#shapella}
 
-<NetworkUpgradeSummary name="shanghai" />
+<NetworkUpgradeSummary name="shapella" />
 
-#### Összegzés {#shanghai-summary}
+#### Shanghai összefoglaló {#shanghai-summary}
 
 A Shanghai frissítés bevezette a letétek kivonási lehetőségét a végrehajtási rétegen. A Capella frissítéssel együtt ez lehetővé tette, hogy a blokkok kivonási műveletet fogadjanak el, amivel a letétesek ki tudják venni az ETH a Beacon láncról a végrehajtási rétegre.
 
@@ -49,13 +49,7 @@ A Shanghai frissítés bevezette a letétek kivonási lehetőségét a végrehaj
 
 - [Olvassa el a Shanghai frissítés specifikációit](https://github.com/ethereum/execution-specs/blob/master/network-upgrades/mainnet-upgrades/shanghai.md)
 
----
-
-### Capella {#capella}
-
-<NetworkUpgradeSummary name="capella" />
-
-#### Összegzés {#capella-summary}
+#### Capella összefoglaló {#capella-summary}
 
 A Capella frissítés a harmadik legnagyobb frissítés volt a konszenzusrétegen (Beacon lánc) és lehetővé tette a letétek kivételét. A Capella egyszerre történt a Shanghai frissítéssel, ami a végrehajtási réteget változtatta meg, s így lehetővé vált a letét kivétele.
 

public/content/translations/id/history/index.md

@@ -27,11 +27,11 @@ Sedang mencari peningkatan protokol di masa mendatang? [Pelajari tentang upgrade
 
 ## 2023 {#2023}
 
-### Shanghai {#shanghai}
+### Shanghai-Capella ("Shapella") {#shapella}
 
-<NetworkUpgradeSummary name="shanghai" />
+<NetworkUpgradeSummary name="shapella" />
 
-#### Ringkasan {#shanghai-summary}
+#### Ringkasan Shanghai {#shanghai-summary}
 
 Peningkatan Shanghai membawa penarikan penaruhan ke Lapisan Eksekusi. Bersamaan dengan peningkatan Capella, ini memungkinkan blok menerima operasi penarikan, yang memungkinkan para staker menarik ETH mereka dari Rantai Suar ke lapisan eksekusi.
 
@@ -49,13 +49,7 @@ Peningkatan Shanghai membawa penarikan penaruhan ke Lapisan Eksekusi. Bersamaan
 
 - [Baca spesifikasi meningkatkan Shanghai](https://github.com/ethereum/execution-specs/blob/master/network-upgrades/mainnet-upgrades/shanghai.md)
 
----
-
-### Capella {#capella}
-
-<NetworkUpgradeSummary name="capella" />
-
-#### Ringkasan {#capella-summary}
+#### Ringkasan Capella {#capella-summary}
 
 Peningkatan Capella adalah peningkatan utama ketiga pada lapisan konsensus (Rantai Suar) dan memungkinkan penarikan penaruhan. Capella terjadi secara bersamaan dengan upgrade lapisan eksekusi, Shanghai, dan mengaktifkan fungsionalitas penarikan penaruhan.
 

public/content/translations/it/history/index.md

@@ -27,11 +27,11 @@ Stai cercando i prossimi aggiornamenti di protocollo? [Scopri di più sui prossi
 
 ## 2023 {#2023}
 
-### Shanghai {#shanghai}
+### Shanghai-Capella ("Shapella") {#shapella}
 
-<NetworkUpgradeSummary name="shanghai" />
+<NetworkUpgradeSummary name="shapella" />
 
-#### Riepilogo {#shanghai-summary}
+#### Riepilogo di Shanghai {#shanghai-summary}
 
 L'aggiornamento di Shanghai ha portato i prelievi di staking al livello d'esecuzione. Insieme all'aggiornamento Capella, questo abiliterà i blocchi ad accettare le operazioni di prelievo, che consentono agli staker di prelevare i propri ETH dalla Beacon Chain al livello d'esecuzione.
 
@@ -49,13 +49,7 @@ L'aggiornamento di Shanghai ha portato i prelievi di staking al livello d'esecuz
 
 - [Leggi le specifiche dell'aggiornamento Shanghai](https://github.com/ethereum/execution-specs/blob/master/network-upgrades/mainnet-upgrades/shanghai.md)
 
----
-
-### Capella {#capella}
-
-<NetworkUpgradeSummary name="capella" />
-
-#### Riepilogo {#capella-summary}
+#### Riepilogo di Capella {#capella-summary}
 
 L'aggiornamento di Capella è il terzo aggiornamento principale al livello del consenso (Beacon Chain) e ha abilitato i prelievi di staking. Capella è avvenuto contemporaneamente all'aggiornamento del livello di esecuzione di Shanghai, e ha reso disponibili le funzioni di prelievo da staking.
 

public/content/translations/pt-br/history/index.md

@@ -26,11 +26,11 @@ Procurando por futuras melhorias de protocolo? [Saiba mais sobre as próximas at
 
 ## 2023 {#2023}
 
-### Shanghai {#shanghai}
+### Shanghai-Capella ("Shapella") {#shapella}
 
-<NetworkUpgradeSummary name="shanghai" />
+<NetworkUpgradeSummary name="shapella" />
 
-#### Resumo {#shanghai-summary}
+#### Resumo de Shanghai {#shanghai-summary}
 
 A atualização Shanghai trouxe saques de stake para a camada de execução. Em conjunto com a atualização Capella, isso permitiu que os blocos aceitassem operações de saque, o que permite que os stakers saquem seu ETH da Beacon Chain para a camada de execução.
 
@@ -46,13 +46,7 @@ A atualização Shanghai trouxe saques de stake para a camada de execução. Em
 
 - [Leia a especificação de atualização Shangai](https://github.com/ethereum/execution-specs/blob/master/network-upgrades/mainnet-upgrades/shanghai.md)
 
----
-
-### Capella {#capella}
-
-<NetworkUpgradeSummary name="capella" />
-
-#### Resumo {#capella-summary}
+#### Resumo de Capella {#capella-summary}
 
 A atualização Capella foi a terceira maior atualização para a camada de consenso (Beacon Chain) e permitiu saques de stake. Capella ocorreu em sincronia com a atualização da camada de execução, Shanghai, e ativou a funcionalidade de saque de stake.
 

public/content/translations/tr/history/index.md

@@ -27,11 +27,11 @@ Gelecekteki protokol yükseltmelerini mi arıyorsunuz? [Ethereum yol haritasınd
 
 ## 2023 {#2023}
 
-### Şanghay {#shanghai}
+### Şanghay-Capella ("Shapella") {#shapella}
 
-<NetworkUpgradeSummary name="shanghai" />
+<NetworkUpgradeSummary name="shapella" />
 
-#### Özet {#shanghai-summary}
+#### Şanghay özeti {#shanghai-summary}
 
 Şanghay yükseltmesi, hisselemede çekimlerini yürütüm katmanına getirdi. Bu, Capella yükseltmesiyle birlikte blokların çekim işlemlerini kabul etmesi sağladı; bu da, paydaşların ETH'lerini İşaret Zincirinden yürütüm katmanına çekmelerine olanak tanıyor.
 
@@ -49,13 +49,7 @@ Gelecekteki protokol yükseltmelerini mi arıyorsunuz? [Ethereum yol haritasınd
 
 - [Şanghay güncellemesinin spesifikasyonunu okuyun](https://github.com/ethereum/execution-specs/blob/master/network-upgrades/mainnet-upgrades/shanghai.md)
 
----
-
-### Capella {#capella}
-
-<NetworkUpgradeSummary name="capella" />
-
-#### Özet {#capella-summary}
+#### Capella özeti {#capella-summary}
 
 Capella yükseltmesi, fikir birliği katmanındaki (İşaret Zinciri) en büyük 3. büyük yükseltmeydi ve hisseleme çekimlerini mümkün kıldı. Capella, Şanghay yürütüm katmanı yükseltmesi ile eş zamanlı gerçekleşti ve hisseleme çekim işlevselliğini aktif hale getirdi.
 

public/content/translations/zh/history/index.md

@@ -27,11 +27,11 @@ sidebarDepth: 1
 
 ## 2023 年 {#2023}
 
-### 上海升级 {#shanghai}
+### 上海嘉佩乐 (“Shapella”) {#shapella}
 
-<NetworkUpgradeSummary name="shanghai" />
+<NetworkUpgradeSummary name="shapella" />
 
-#### 摘要 {#shanghai-summary}
+#### 上海总结 {#shanghai-summary}
 
 上海升级将质押提款引入执行层。 上海升级与卡佩拉升级同时进行，使区块能够接受提款操作，因此质押人可以将以太币从信标链提取到执行层。
 
@@ -49,13 +49,7 @@ sidebarDepth: 1
 
 - [阅读上海升级规范](https://github.com/ethereum/execution-specs/blob/master/network-upgrades/mainnet-upgrades/shanghai.md)
 
----
-
-### 卡佩拉升级 {#capella}
-
-<NetworkUpgradeSummary name="capella" />
-
-#### 摘要 {#capella-summary}
+#### 卡佩拉总结 {#capella-summary}
 
 卡佩拉升级是共识层（信标链）的第三次重大升级，实现了质押提款。 卡佩拉与上海同步升级执行层并启用了质押提款功能。
 

src/components/DencunBanner.tsx

@@ -9,7 +9,7 @@ import NetworkUpgradeSummaryData from "@/data/NetworkUpgradeSummaryData"
 import Tooltip from "./Tooltip"
 
 const DencunBanner = () => {
-  const dateTimeAsString = NetworkUpgradeSummaryData.cancun
+  const dateTimeAsString = NetworkUpgradeSummaryData.dencun
     .dateTimeAsString as string
   const upgradeDate = new Date(dateTimeAsString)
   return (