Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrades landing post-merge updates #8103

Merged
merged 2 commits into from
Oct 4, 2022
Merged

Upgrades landing post-merge updates #8103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9e26bd
update /upgrades page for post-merge
wackerow Sep 30, 2022
b77f380
Update ethUpgradeArticles.ts
wackerow Sep 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
60 changes: 30 additions & 30 deletions src/data/ethUpgradeArticles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,57 +7,57 @@ interface Article {
/** Articles by Danny Ryan (Ethereum Foundation) */
export const dannyArticles: Array<Article> = [
{
title: "Finalized no. 34",
description: "23 March 2022",
link: "https://blog.ethereum.org/2022/03/23/finalized-no-34/",
title: "Finalized no. 37",
description: "26 August 2022",
link: "https://blog.ethereum.org/2022/08/26/finalized-no-37/",
},
{
title: "Finalized no. 33",
description: "31 January 2022",
link: "https://blog.ethereum.org/2022/01/31/finalized-no-33/",
title: "Finalized no. 36",
description: "12 August 2022",
link: "https://blog.ethereum.org/2022/08/12/finalized-no-36/",
},
{
title: "Finalized no. 32",
description: "22 November 2021",
link: "https://blog.ethereum.org/2021/11/22/finalized-no-32/",
title: "Finalized no. 35",
description: "19 May 2022",
link: "https://blog.ethereum.org/2022/05/19/finalized-no-35/",
},
{
title: "Finalized no. 31",
description: "2 November 2021",
link: "https://blog.ethereum.org/2021/11/02/finalized-no-31/",
title: "Finalized no. 34",
description: "23 March 2022",
link: "https://blog.ethereum.org/2022/03/23/finalized-no-34/",
},
{
title: "Finalized no. 30",
description: "19 October 2021",
link: "https://blog.ethereum.org/2021/10/19/finalized-no-30/",
title: "Finalized no. 33",
description: "31 January 2022",
link: "https://blog.ethereum.org/2022/01/31/finalized-no-33/",
},
]

/** Articles by Ben Edgington (PegaSys, ConsenSys) */
export const benArticles: Array<Article> = [
{
title: "What’s New in Eth2 – #92",
description: "6 May 2022",
link: "https://hackmd.io/@benjaminion/eth2_news/https%3A%2F%2Fhackmd.io%2F%40benjaminion%2Fwnie2_220506",
title: "What’s New in Eth2 – #100",
description: "26 August 2022",
link: "https://hackmd.io/@benjaminion/eth2_news/https%3A%2F%2Fhackmd.io%2F%40benjaminion%2Fwnie2_220826",
},
{
title: "What’s New in Eth2 – #91",
description: "8 April 2022",
link: "https://hackmd.io/@benjaminion/eth2_news/https%3A%2F%2Fhackmd.io%2F%40benjaminion%2Fwnie2_220408",
title: "What’s New in Eth2 – #99",
description: "12 August 2022",
link: "https://hackmd.io/@benjaminion/eth2_news/https%3A%2F%2Fhackmd.io%2F%40benjaminion%2Fwnie2_220812",
},
{
title: "What’s New in Eth2 – #90",
description: "25 March 2022",
link: "https://hackmd.io/@benjaminion/eth2_news/https%3A%2F%2Fhackmd.io%2F%40benjaminion%2Fwnie2_220325",
title: "What’s New in Eth2 – #98",
description: "29 July 2022",
link: "https://hackmd.io/@benjaminion/eth2_news/https%3A%2F%2Fhackmd.io%2F%40benjaminion%2Fwnie2_220729",
},
{
title: "What’s New in Eth2 – #89",
description: "11 March 2022",
link: "https://hackmd.io/@benjaminion/eth2_news/https%3A%2F%2Fhackmd.io%2F%40benjaminion%2Fwnie2_220311",
title: "What’s New in Eth2 – #97",
description: "15 July 2022",
link: "https://hackmd.io/@benjaminion/eth2_news/https%3A%2F%2Fhackmd.io%2F%40benjaminion%2Fwnie2_220715",
},
{
title: "What’s New in Eth2 – #88",
description: "25 February 2022",
link: "https://hackmd.io/@benjaminion/eth2_news/https%3A%2F%2Fhackmd.io%2F%40benjaminion%2Fwnie2_220225",
title: "What’s New in Eth2 – #96",
description: "1 July 2022",
link: "https://hackmd.io/@benjaminion/eth2_news/https%3A%2F%2Fhackmd.io%2F%40benjaminion%2Fwnie2_220701",
},
]
34 changes: 16 additions & 18 deletions src/intl/en/page-upgrades-index.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
"consensus-client-prysm-logo-alt": "Prysm logo",
"consensus-client-teku-logo-alt": "Teku logo",
"consensus-client-under-review": "Review and audit in progress",
"page-upgrades-answer-1": "Think of the changes being rolled out as a set of upgrades being added to improve the Ethereum we use today. These upgrades included the creation of a new chain called the Beacon Chain, which will soon act as the consensus engine for the entire network.",
"page-upgrades-answer-2": "Despite the Beacon Chain starting as a separate chain, the existing Mainnet will be 'merged' with this new proof-of-stake consensus layer.",
"page-upgrades-answer-4": "In other words the Ethereum we use today will eventually embody all the features that we're aiming towards in the Ethereum vision.",
"page-upgrades-answer-1": "Think of the changes being rolled out as a set of upgrades being added to improve the Ethereum we use today. These upgrades included the creation of a new chain called the Beacon Chain, which now acts as the consensus engine for the entire network.",
"page-upgrades-answer-2": "Despite the Beacon Chain starting as a separate chain, the existing Mainnet has been 'merged' with this new proof-of-stake consensus layer.",
"page-upgrades-answer-4": "In other words the Ethereum we use today now embodies all the features that we're aiming towards in the Ethereum vision.",
"page-upgrade-article-author-ethmerge": "Ethmerge",
"page-upgrade-article-author-alchemy": "Alchemy",
"page-upgrade-article-author-consensys": "Consensys",
Expand All @@ -34,7 +34,7 @@
"page-upgrade-article-title-engine-api-specs": "Engine API specs",
"page-upgrades-beacon-chain-btn": "More on the Beacon Chain",
"page-upgrades-beacon-chain-date": "The Beacon Chain went live on December 1, 2020.",
"page-upgrades-beacon-chain-desc": "The Beacon Chain brought staking to Ethereum, laid the groundwork for future upgrades, and will soon coordinate the new system.",
"page-upgrades-beacon-chain-desc": "The Beacon Chain brought staking to Ethereum, laid the groundwork for future upgrades, and coordinates the network.",
"page-upgrades-beacon-chain-estimate": "The Beacon Chain is live",
"page-upgrades-beacon-chain-title": "The Beacon Chain",
"page-upgrades-bug-bounty": "View the bug bounty program",
Expand All @@ -43,9 +43,9 @@
"page-upgrades-dive": "Dive into the vision",
"page-upgrades-dive-desc": "How are we going to make Ethereum more scalable, secure, and sustainable? All while keeping Ethereum's core ethos of decentralization.",
"page-upgrades-docking": "The Merge",
"page-upgrades-merge-answer-1": "The Merge is when Mainnet begins using the Beacon Chain for consensus, and proof-of-work is turned off, coming soon.",
"page-upgrades-merge-answer-1": "The Merge occurred via the Paris upgrade on September 15, 2022.",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't love this phrasing but not blocking, and I can't think of anything better off the top of my head.

"page-upgrades-merge-btn": "More on The Merge",
"page-upgrades-merge-desc": "Mainnet Ethereum will soon 'merge' with the proof-of-stake Beacon Chain, marking the end of energy-intensive mining.",
"page-upgrades-merge-desc": "Mainnet Ethereum merged with the Beacon Chain, marking the end of energy-intensive mining.",
"page-upgrades-merge-estimate": "The Merge is live",
"page-upgrades-merge-mainnet": "What's Mainnet?",
"page-upgrades-merge-mainnet-eth2": "Merging Mainnet and the Beacon Chain",
Expand Down Expand Up @@ -76,19 +76,17 @@
"page-upgrades-question-1-desc": "Ethereum is being upgraded progressively; the upgrades are distinct with different ship dates.",
"page-upgrades-question-2-title": "Is the Beacon Chain a separate blockchain?",
"page-upgrades-question-2-desc": "It's not accurate to think of this upgrade as a separate blockchain.",
"page-upgrades-question-3-answer-2a": "The Merge specifications have been finalized, and is designed to have minimal impact on dapp developers.",
"page-upgrades-question-3-answer-2a": "The Merge is now finalized, and was designed to have minimal impact on dapp developers.",
"page-upgrades-question-3-answer-2a-link": "The Merge and dapp developers",
"page-upgrades-question-3-answer-2b": "Sharding plans are still being developed, but will be designed with layer 2 rollups in mind.",
"page-upgrades-layer-2-rollups": "More on layer 2 rollups",
"page-upgrades-question-3-answer-3-link": "Visit ethresear.ch",
"page-upgrades-question-3-desc": "You don't have to do anything right now to prepare for the upgrades.",
"page-upgrades-question-3-title": "How do I prepare for the upgrades?",
"page-upgrades-question-4-answer-1": "Whenever you send a transaction or use a dapp today, you're using the execution layer, also known as Mainnet.",
"page-upgrades-question-4-answer-2": "Mainnet will continue to run as normal until The Merge.",
"page-upgrades-question-4-answer-3": "After The Merge, validators will secure the entire network via proof-of-stake.",
"page-upgrades-question-4-answer-3": "Since The Merge, validators secure the entire network via proof-of-stake.",
"page-upgrades-question-4-answer-6": "Anyone can become a validator by staking their ETH.",
"page-upgrades-question-4-answer-7": "More on staking",
"page-upgrades-question-4-answer-8": "The Beacon Chain and sharding upgrades will not disrupt the execution layer (Mainnet) as they are being built out separately.",
"page-upgrades-question-4-title": "What is the execution layer?",
"page-upgrades-question-4-desc": "The Ethereum Mainnet you transact on today has previously been referred to as 'Eth1.' This term is being phased out in favor of the 'execution layer'.",
"page-upgrades-question-5-answer-1": "To become a full validator on the network, you'll need to stake 32 ETH. If you don't have that much, or aren't willing to stake that much, you can join staking pools. These pools will let you stake less and earn fractions of the total rewards.",
Expand All @@ -99,9 +97,9 @@
"page-upgrades-question-6-answer-5": "You can also join the discussion on Ethereum research and development at ethresear.ch.",
"page-upgrades-question-6-title": "What do I need to do with my dapp?",
"page-upgrades-question-6-desc": "The Merge has been designed with the goal of minimizing impact on dapp developers, though there are a couple things work noting.",
"page-upgrades-question-6-answer-1": "A few changes with The Merge can impact certain types of applications. These changes include block structure and timing, a few opcode changes, sources of on-chain randomness and the concept of epoch finalization.",
"page-upgrades-question-6-answer-1": "The Merge has brought a few changes that may have impacted certain types of applications. These changes include block structure and timing, a few opcode changes, sources of on-chain randomness and the concept of epoch finalization.",
"page-upgrades-question-6-answer-1-link": "How The Merge Impacts Ethereum's Application Layer",
"page-upgrades-question-6-answer-2": "Most applications will be unaffected, but we recommend that developers stay up to date on the latest with The Merge.",
"page-upgrades-question-6-answer-2": "Most applications will remain unaffected, but we recommend that developers test their apps in a post-merge environment.",
"page-upgrades-question-7-desc": "Many different teams from all over the community are working on the various Ethereum upgrades.",
"page-upgrades-question-7-lighthouse": "Lighthouse",
"page-upgrades-question-7-lighthouse-lang": "(Rust implementation)",
Expand All @@ -118,7 +116,7 @@
"page-upgrades-question-7-clients": "Learn more about Ethereum clients",
"page-upgrades-question-8-answer-1": "The Ethereum upgrades will help Ethereum scale in a decentralized way, while maintaining security, and increasing sustainability.",
"page-upgrades-question-8-answer-2": "Perhaps the most obvious problem is that Ethereum needs to be able to handle more than 15-45 transactions per second. But the upgrades also address some other problems with Ethereum today.",
"page-upgrades-question-8-answer-3": "The network is in such high demand that it's making Ethereum expensive to use. Nodes in the network are struggling under the size of Ethereum and the amount of data their computers are having to process. The original algorithm that underlies Ethereum security and decentralization is energy intensive and needs to be greener.",
"page-upgrades-question-8-answer-3": "The network at times of high demand leaves Ethereum expensive to use. Nodes in the network are struggling under the size of Ethereum and the amount of data their computers are having to process. The original algorithm that underlaid Ethereum security and decentralization was energy intensive and needed to be greener.",
"page-upgrades-question-8-answer-4": "A lot of what's changing has always been on the Ethereum roadmap, even since 2015. But current conditions are making the need for the upgrades even greater.",
"page-upgrades-question-8-answer-6": "Explore the Ethereum vision",
"page-upgrades-question-8-desc": "The Ethereum we use today needs to offer a better experience to end users and network participants.",
Expand All @@ -138,12 +136,12 @@
"page-upgrades-question-10-answer-1-link": "View the upgrades",
"page-upgrades-question-10-answer-2": "But if you've followed the discussions, here's how the upgrades fit into technical roadmaps, and a bit on how they're changing.",
"page-upgrades-question-10-answer-3": "Phase 0 described the work to get the Beacon Chain live.",
"page-upgrades-question-10-answer-5": "Phase 1 originally focused on implementing the shard chains, but prioritization has shifted to 'The Merge' which is the next planned upgrade.",
"page-upgrades-question-10-answer-6": "Phase 1.5 was originally planned to follow shard implementations when Mainnet would be added as the last shard to the Beacon Chain. However, as rollup technology progressed, the Ethereum community expedited the transition away from proof-of-work. Mainnet will instead be 'merged' into the Beacon Chain and remain as the execution layer of Ethereum. This will be a significant step towards a greener Ethereum.",
"page-upgrades-question-10-answer-7": "The plans around Phase 2 have been a point of intense research and discussion. With The Merge planned before sharding, and the advancements in layer 2 solutions, goals have shifted to provide a more simplified form of data sharding to maximize rollup efficiency. Current layer 2s enable the ability to scale transaction execution, and sharding will allow for storage of proofs for this data on layer 1 in a cheap and scalable manner.",
"page-upgrades-question-10-answer-5": "Phase 1 originally focused on implementing the shard chains, but prioritization shifted to 'The Merge' which has now been completed.",
"page-upgrades-question-10-answer-6": "Phase 1.5 was originally planned to follow shard implementations when Mainnet would be added as the last shard to the Beacon Chain. However, as rollup technology progressed, the Ethereum community expedited the transition away from proof-of-work. Mainnet was instead 'merged' into the Beacon Chain and remains as the execution layer of Ethereum. This was a significant step towards a greener Ethereum.",
"page-upgrades-question-10-answer-7": "The plans around Phase 2 have been a point of intense research and discussion. With The Merge completed before sharding, and the advancements in layer 2 solutions, goals have shifted to provide a more simplified form of data sharding to maximize rollup efficiency. Current layer 2s enable the ability to scale transaction execution, and sharding will allow for storage of proofs for this data on layer 1 in a cheap and scalable manner.",
"page-upgrades-question-10-answer-8": "More on a rollup-centric roadmap",
"page-upgrades-question-11-title": "Can I buy Eth2?",
"page-upgrades-question-11-desc": "No. There is no Eth2 token and your ETH will not change after The Merge.",
"page-upgrades-question-11-desc": "No. There is no Eth2 token and your ETH did not change with The Merge.",
"page-upgrades-question-11-answer-1": "One of the driving forces behind the Eth2 rebrand was the common misconception that ETH holders would have to migrate their ETH after 'Ethereum 2.0'. This has never been true. It is ",
"page-upgrades-question-11-answer-2": "a common technique used scammers.",
"page-upgrades-question-title": "Frequently asked questions",
Expand All @@ -160,7 +158,7 @@
"page-upgrades-shard-title": "Sharding",
"page-upgrades-stay-up-to-date": "Stay up to date",
"page-upgrades-stay-up-to-date-desc": "Get the latest from the researchers and developers working on the Ethereum upgrades.",
"page-upgrades-sustainable-desc": "Ethereum needs to be better for the environment. The technology today requires too much computing power and energy.",
"page-upgrades-sustainable-desc": "Ethereum was energy-intense until recently. The transition to proof-of-stake brought a network energy reduction of over 99.9%.",
"page-upgrades-take-part": "Take part in the research",
"page-upgrades-take-part-desc": "Ethereum researchers and enthusiasts alike meet here to discuss research efforts, including everything related to Ethereum upgrades.",
"page-upgrades-the-upgrades": "The Ethereum upgrades",
Expand Down
9 changes: 0 additions & 9 deletions src/pages/upgrades/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -596,12 +596,6 @@ const Eth2IndexPage = ({ data }: PageProps<Queries.UpgradesPageQuery>) => {
<Translation id="page-upgrades-merge-mainnet" />
</Link>
</p>
<p>
<Translation id="page-upgrades-question-4-answer-2" />{" "}
<Link to="/upgrades/merge/">
<Translation id="page-upgrades-merge-btn" />
</Link>
</p>
<p>
<Translation id="page-upgrades-question-4-answer-3" />{" "}
<Link to="/developers/docs/consensus-mechanisms/pos/">
Expand All @@ -614,9 +608,6 @@ const Eth2IndexPage = ({ data }: PageProps<Queries.UpgradesPageQuery>) => {
<Translation id="page-upgrades-question-4-answer-7" />
</Link>
</p>
<p>
<Translation id="page-upgrades-question-4-answer-8" />
</p>
</ExpandableCard>
<ExpandableCard
contentPreview={translateMessageId(
Expand Down