From 34851cf1136e6321e7347e9309e125d07c6f8359 Mon Sep 17 00:00:00 2001 From: Joe Date: Thu, 22 Sep 2022 10:57:55 +0100 Subject: [PATCH 1/6] refine upgrades page for post-merge --- src/intl/en/page-upgrades-index.json | 56 ++++++++++++++-------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/src/intl/en/page-upgrades-index.json b/src/intl/en/page-upgrades-index.json index 5867b89d4e4..1836385cbe7 100644 --- a/src/intl/en/page-upgrades-index.json +++ b/src/intl/en/page-upgrades-index.json @@ -9,8 +9,8 @@ "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-1": "Think of the changes being rolled out as a set of upgrades being added to improve the Ethereum we use today.", + "page-upgrades-answer-2": "Recently Ethereum underwent its most substantial upgrade ever when proof-of-work was swapped for a new proof-of-stake based 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-upgrade-article-author-ethmerge": "Ethmerge", "page-upgrade-article-author-alchemy": "Alchemy", @@ -33,19 +33,19 @@ "page-upgrade-article-title-consensus-layer-specs": "Consensus layer specs", "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-date": "The Beacon Chain went live on December 1, 2020 and took control of consensus on Ethereum Mainnet on September 15, 2022.", + "page-upgrades-beacon-chain-desc": "The Beacon Chain brought staking to Ethereum, laid the groundwork for future upgrades. It coordinates the new proof-of-stake Ethereum.", "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", "page-upgrades-clients": "Check out the consensus clients (previously known as 'Eth2' clients)", "page-staking-deposit-contract-title": "Check the deposit contract address", "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-dive-desc": "How are we making 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 was when Mainnet switched off proof-of-work and turned on proof-of-stake on 15th September 2022.", "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 proof-of-stake 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", @@ -74,9 +74,9 @@ "page-upgrades-proof-stake-link": "More on proof of stake", "page-upgrades-question-1-title": "When will the upgrades ship?", "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-2-title": "Was the Beacon Chain a separate blockchain?", + "page-upgrades-question-2-desc": "The Beacon Chain was the name given to a parallel proof-of-stake blockchain used to upgrade Ethereum's Mainnet. There is now only one blockchain, formed by merging the original Ethereum blockchain and the Beacon Chain together.", + "page-upgrades-question-3-answer-2a": "The Merge had minimal impact on dapp developers - they still interact with Etheruem in the same ways.", "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", @@ -85,23 +85,23 @@ "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-answer-8": "Sharding upgrades will not change how end-users interact with Ethereum.", "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.", + "page-upgrades-question-4-desc": "Before The Merge, the Ethereum blockchain was sometimes referred to as 'Eth1.' This term was phased out in favor of the 'execution layer'.", + "page-upgrades-question-5-answer-1": "To become a 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.", "page-upgrades-question-5-desc": "You'll need to use the staking launchpad or join a staking pool.", "page-upgrades-question-5-title": "How do I stake?", "page-upgrades-question-6-answer-3": "Danny Ryan of the Ethereum foundation regularly updates the community:", "page-upgrades-question-6-answer-4": "Ben Edgington of ConsenSys has a weekly newsletter about the Ethereum upgrades:", "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-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-desc": "The Merge was designed to have minimal impact on dapp developers, though there are a couple of msmall changes worth noting.", + "page-upgrades-question-6-answer-1": "Dapp developers familiar with pre-merge Ethereum should be aware of some changes. 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 Impacted Ethereum's Application Layer", + "page-upgrades-question-6-answer-2": "Applications were almost entirely unaffected.", "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)", @@ -118,7 +118,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 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.", "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.", @@ -138,14 +138,14 @@ "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 shipped on September 15, 2022.", + "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 instead.", + "page-upgrades-question-10-answer-7": "The plans around Phase 2 have been a point of intense research and discussion. With The Merge behind us, 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-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-11-desc": "No. There is no Eth2 token and your ETH did not change at The Merge.", + "page-upgrades-question-11-answer-1": "One of the driving forces behind the Eth2 rebrand was the common misconception that ETH holders were required to migrate their ETH to 'ETH 2.0' on account of The Merge or any other upgrade. This is not true, and never has been.", + "page-upgrades-question-11-answer-2": "This confusion is commonly expoited by scammers.", "page-upgrades-question-title": "Frequently asked questions", "page-upgrades-question3-answer-1": "ETH holders don't need to do anything. Your ETH will not need changing or upgrading. There's almost certain to be scams telling you otherwise, so be careful.", "page-upgrades-scalable": "More scalable", @@ -164,7 +164,7 @@ "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", - "page-upgrades-the-upgrades-desc": "Ethereum consists of a set of upgrades that improve the scalability, security, and sustainability of the network. Although each is being worked on in parallel, they have certain dependencies that determine when they will be deployed.", + "page-upgrades-the-upgrades-desc": "Ethereum upgrades aim to improve the scalability, security, and sustainability of the network. Ethereum has recently undergone some major upgrades to security and sustainability and there are more coming in the future, especially relating to scalability.", "page-upgrades-unofficial-roadmap": "This is not the official roadmap. This is how we view what's happening based on the information out there. But this is technology, things can change in an instant. So please don't read this as a commitment.", "page-upgrades-upgrade-desc": "The Ethereum we know and love, just more scalable, more secure, and more sustainable...", "page-upgrades-upgrades": "The Ethereum upgrades", @@ -180,9 +180,9 @@ "page-upgrades-vision-desc": "To bring Ethereum into the mainstream and serve all of humanity, we have to make Ethereum more scalable, secure, and sustainable.", "page-upgrades-vision-upper": "Ethereum vision", "page-upgrades-what-happened-to-eth2-title": "What happened to 'Eth2'?", - "page-upgrades-what-happened-to-eth2-1": "The term 'Eth2' is being phased out in preparation for The Merge.", + "page-upgrades-what-happened-to-eth2-1": "The term 'Eth2' was commonly used before The Merge but is being phased out in favor of more precise terminology.", "page-upgrades-what-happened-to-eth2-1-more": "More on The Merge.", - "page-upgrades-what-happened-to-eth2-2": "After merging 'Eth1' and 'Eth2' into a single chain, there will no longer be two distinct Ethereum networks; there will only be Ethereum.", + "page-upgrades-what-happened-to-eth2-2": "Since 'Eth1' and 'Eth2' were merged into a single chain, there are no longer be two distinct Ethereum blockchains; there is only Ethereum.", "page-upgrades-what-happened-to-eth2-3": "To limit confusion, the community has updated these terms:", "page-upgrades-what-happened-to-eth2-3-1": "'Eth1' is now the 'execution layer', which handles transactions and execution.", "page-upgrades-what-happened-to-eth2-3-2": "'Eth2' is now the 'consensus layer', which handles proof-of-stake consensus.", From a4c19ea5090d237f7d8da1f8e87ade3957fcb29c Mon Sep 17 00:00:00 2001 From: Joseph Cook <33655003+jmcook1186@users.noreply.github.com> Date: Wed, 5 Oct 2022 11:07:31 +0100 Subject: [PATCH 2/6] Apply suggestions from code review Co-authored-by: Joshua <62268199+minimalsm@users.noreply.github.com> --- src/intl/en/page-upgrades-index.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/intl/en/page-upgrades-index.json b/src/intl/en/page-upgrades-index.json index 1836385cbe7..8c21ddbd87f 100644 --- a/src/intl/en/page-upgrades-index.json +++ b/src/intl/en/page-upgrades-index.json @@ -10,8 +10,8 @@ "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.", - "page-upgrades-answer-2": "Recently Ethereum underwent its most substantial upgrade ever when proof-of-work was swapped for a new proof-of-stake based 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-2": "With The Merge, Ethereum had its most substantial upgrade ever swapping proof-of-work for a new proof-of-stake based 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-upgrade-article-author-ethmerge": "Ethmerge", "page-upgrade-article-author-alchemy": "Alchemy", "page-upgrade-article-author-consensys": "Consensys", @@ -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 and took control of consensus on Ethereum Mainnet on September 15, 2022.", - "page-upgrades-beacon-chain-desc": "The Beacon Chain brought staking to Ethereum, laid the groundwork for future upgrades. It coordinates the new proof-of-stake Ethereum.", + "page-upgrades-beacon-chain-desc": "The Beacon Chain brought staking to Ethereum and laid the groundwork for future upgrades. It coordinates the new proof-of-stake Ethereum.", "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", @@ -45,7 +45,7 @@ "page-upgrades-docking": "The Merge", "page-upgrades-merge-answer-1": "The Merge was when Mainnet switched off proof-of-work and turned on proof-of-stake on 15th September 2022.", "page-upgrades-merge-btn": "More on The Merge", - "page-upgrades-merge-desc": "Mainnet Ethereum 'merged' with the proof-of-stake Beacon Chain, marking the end of energy-intensive mining.", + "page-upgrades-merge-desc": "Mainnet Ethereum merged with the proof-of-stake 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", @@ -74,7 +74,7 @@ "page-upgrades-proof-stake-link": "More on proof of stake", "page-upgrades-question-1-title": "When will the upgrades ship?", "page-upgrades-question-1-desc": "Ethereum is being upgraded progressively; the upgrades are distinct with different ship dates.", - "page-upgrades-question-2-title": "Was the Beacon Chain a separate blockchain?", + "page-upgrades-question-2-title": "Is the Beacon Chain a separate blockchain?", "page-upgrades-question-2-desc": "The Beacon Chain was the name given to a parallel proof-of-stake blockchain used to upgrade Ethereum's Mainnet. There is now only one blockchain, formed by merging the original Ethereum blockchain and the Beacon Chain together.", "page-upgrades-question-3-answer-2a": "The Merge had minimal impact on dapp developers - they still interact with Etheruem in the same ways.", "page-upgrades-question-3-answer-2a-link": "The Merge and dapp developers", @@ -98,7 +98,7 @@ "page-upgrades-question-6-answer-4": "Ben Edgington of ConsenSys has a weekly newsletter about the Ethereum upgrades:", "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 was designed to have minimal impact on dapp developers, though there are a couple of msmall changes worth noting.", + "page-upgrades-question-6-desc": "The Merge was designed to have minimal impact on dapp developers, though there are a couple of small changes worth noting.", "page-upgrades-question-6-answer-1": "Dapp developers familiar with pre-merge Ethereum should be aware of some changes. 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 Impacted Ethereum's Application Layer", "page-upgrades-question-6-answer-2": "Applications were almost entirely unaffected.", @@ -138,14 +138,14 @@ "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 shifted to 'The Merge' which shipped on September 15, 2022.", + "page-upgrades-question-10-answer-5": "Phase 1 originally focused on implementing the shard chains, but prioritization shifted to The Merge, which shipped on September 15, 2022.", "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 instead.", "page-upgrades-question-10-answer-7": "The plans around Phase 2 have been a point of intense research and discussion. With The Merge behind us, 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 did not change at The Merge.", - "page-upgrades-question-11-answer-1": "One of the driving forces behind the Eth2 rebrand was the common misconception that ETH holders were required to migrate their ETH to 'ETH 2.0' on account of The Merge or any other upgrade. This is not true, and never has been.", - "page-upgrades-question-11-answer-2": "This confusion is commonly expoited by scammers.", + "page-upgrades-question-11-desc": "No. There is no Eth2 token, and your ETH did not change after The Merge.", + "page-upgrades-question-11-answer-1": "One of the driving forces behind the Eth2 rebrand was the common misconception that ETH holders were required to migrate their ETH to 'ETH 2.0' after The Merge or any other upgrade. This is not true and never has been.", + "page-upgrades-question-11-answer-2": " This confusion is commonly exploited by scammers.", "page-upgrades-question-title": "Frequently asked questions", "page-upgrades-question3-answer-1": "ETH holders don't need to do anything. Your ETH will not need changing or upgrading. There's almost certain to be scams telling you otherwise, so be careful.", "page-upgrades-scalable": "More scalable", @@ -164,7 +164,7 @@ "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", - "page-upgrades-the-upgrades-desc": "Ethereum upgrades aim to improve the scalability, security, and sustainability of the network. Ethereum has recently undergone some major upgrades to security and sustainability and there are more coming in the future, especially relating to scalability.", + "page-upgrades-the-upgrades-desc": "Ethereum upgrades aim to improve the network's scalability, security, and sustainability. Ethereum has recently undergone some major upgrades to security and sustainability, and there are more coming in the future, especially relating to scalability.", "page-upgrades-unofficial-roadmap": "This is not the official roadmap. This is how we view what's happening based on the information out there. But this is technology, things can change in an instant. So please don't read this as a commitment.", "page-upgrades-upgrade-desc": "The Ethereum we know and love, just more scalable, more secure, and more sustainable...", "page-upgrades-upgrades": "The Ethereum upgrades", @@ -182,7 +182,7 @@ "page-upgrades-what-happened-to-eth2-title": "What happened to 'Eth2'?", "page-upgrades-what-happened-to-eth2-1": "The term 'Eth2' was commonly used before The Merge but is being phased out in favor of more precise terminology.", "page-upgrades-what-happened-to-eth2-1-more": "More on The Merge.", - "page-upgrades-what-happened-to-eth2-2": "Since 'Eth1' and 'Eth2' were merged into a single chain, there are no longer be two distinct Ethereum blockchains; there is only Ethereum.", + "page-upgrades-what-happened-to-eth2-2": "Since merging 'Eth1' and 'Eth2', there are no longer two distinct Ethereum blockchains; there is only Ethereum.", "page-upgrades-what-happened-to-eth2-3": "To limit confusion, the community has updated these terms:", "page-upgrades-what-happened-to-eth2-3-1": "'Eth1' is now the 'execution layer', which handles transactions and execution.", "page-upgrades-what-happened-to-eth2-3-2": "'Eth2' is now the 'consensus layer', which handles proof-of-stake consensus.", From 034d07fa29ea8187b6fe9c9c2e376ef3a132d109 Mon Sep 17 00:00:00 2001 From: Joseph Cook <33655003+jmcook1186@users.noreply.github.com> Date: Wed, 5 Oct 2022 11:22:13 +0100 Subject: [PATCH 3/6] fix FAQ card --- src/intl/en/page-upgrades-index.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/intl/en/page-upgrades-index.json b/src/intl/en/page-upgrades-index.json index 8c21ddbd87f..ab7a4853079 100644 --- a/src/intl/en/page-upgrades-index.json +++ b/src/intl/en/page-upgrades-index.json @@ -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.", + "page-upgrades-answer-1": "The Beacon Chain was used as a tool to upgrade Ethereum Mainnet at The Merge.", "page-upgrades-answer-2": "With The Merge, Ethereum had its most substantial upgrade ever swapping proof-of-work for a new proof-of-stake based 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-4": "The Beacon Chain was used to develop the proof-of-stake based consensus Ethereum uses today. It was run separately to Ethereum Mainnet so developers could observe the consensus mechanism in isolation before using it to coordinate real activity.", "page-upgrade-article-author-ethmerge": "Ethmerge", "page-upgrade-article-author-alchemy": "Alchemy", "page-upgrade-article-author-consensys": "Consensys", @@ -75,7 +75,7 @@ "page-upgrades-question-1-title": "When will the upgrades ship?", "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": "The Beacon Chain was the name given to a parallel proof-of-stake blockchain used to upgrade Ethereum's Mainnet. There is now only one blockchain, formed by merging the original Ethereum blockchain and the Beacon Chain together.", + "page-upgrades-question-2-desc": "Yes. The Beacon Chain was the name given to a parallel proof-of-stake blockchain used to upgrade Ethereum's Mainnet. There is now only one blockchain, formed by merging the original Ethereum blockchain and the Beacon Chain together.", "page-upgrades-question-3-answer-2a": "The Merge had minimal impact on dapp developers - they still interact with Etheruem in the same ways.", "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.", From 291614b12293950ac9f4d4e8515edc0988174701 Mon Sep 17 00:00:00 2001 From: Joseph Cook <33655003+jmcook1186@users.noreply.github.com> Date: Wed, 5 Oct 2022 11:29:46 +0100 Subject: [PATCH 4/6] Apply suggestions from code review --- src/intl/en/page-upgrades-index.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/intl/en/page-upgrades-index.json b/src/intl/en/page-upgrades-index.json index ab7a4853079..89becf6a09b 100644 --- a/src/intl/en/page-upgrades-index.json +++ b/src/intl/en/page-upgrades-index.json @@ -33,7 +33,7 @@ "page-upgrade-article-title-consensus-layer-specs": "Consensus layer specs", "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 and took control of consensus on Ethereum Mainnet on September 15, 2022.", + "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 and laid the groundwork for future upgrades. It coordinates the new proof-of-stake Ethereum.", "page-upgrades-beacon-chain-estimate": "The Beacon Chain is live", "page-upgrades-beacon-chain-title": "The Beacon Chain", From 4ee3f492e4eba66bbaf4a3d3b5b13a212b4d8bd0 Mon Sep 17 00:00:00 2001 From: Paul Wackerow <54227730+wackerow@users.noreply.github.com> Date: Fri, 21 Oct 2022 16:44:38 +0200 Subject: [PATCH 5/6] Update src/intl/en/page-upgrades-index.json --- src/intl/en/page-upgrades-index.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/intl/en/page-upgrades-index.json b/src/intl/en/page-upgrades-index.json index 91325bdb4dc..3f37a5ad4eb 100644 --- a/src/intl/en/page-upgrades-index.json +++ b/src/intl/en/page-upgrades-index.json @@ -96,7 +96,7 @@ "page-upgrades-question-6-answer-4": "Ben Edgington of ConsenSys has a weekly newsletter about the Ethereum upgrades:", "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 was designed to have minimal impact on dapp developers, though there are a couple of small changes worth noting.", + "page-upgrades-question-6-desc": "The Merge was designed to have minimal impact on dapp developers, though there were a couple of small changes worth noting.", "page-upgrades-question-6-answer-1": "Dapp developers familiar with pre-merge Ethereum should be aware of some changes. 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 Impacted Ethereum's Application Layer", "page-upgrades-question-6-answer-2": "Applications were almost entirely unaffected.", From 6e25a3f38ce31a8e81b3e33cf8a4d4ee6ee2921a Mon Sep 17 00:00:00 2001 From: Paul Wackerow <54227730+wackerow@users.noreply.github.com> Date: Fri, 21 Oct 2022 16:47:46 +0200 Subject: [PATCH 6/6] Update src/intl/en/page-upgrades-index.json --- src/intl/en/page-upgrades-index.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/intl/en/page-upgrades-index.json b/src/intl/en/page-upgrades-index.json index 3f37a5ad4eb..d14a34b0409 100644 --- a/src/intl/en/page-upgrades-index.json +++ b/src/intl/en/page-upgrades-index.json @@ -11,7 +11,7 @@ "consensus-client-under-review": "Review and audit in progress", "page-upgrades-answer-1": "The Beacon Chain was used as a tool to upgrade Ethereum Mainnet at The Merge.", "page-upgrades-answer-2": "With The Merge, Ethereum had its most substantial upgrade ever swapping proof-of-work for a new proof-of-stake based consensus layer.", - "page-upgrades-answer-4": "The Beacon Chain was used to develop the proof-of-stake based consensus Ethereum uses today. It was run separately to Ethereum Mainnet so developers could observe the consensus mechanism in isolation before using it to coordinate real activity.", + "page-upgrades-answer-4": "The Beacon Chain was used to develop the proof-of-stake-based consensus Ethereum uses today. It was run separately to Ethereum Mainnet so developers could observe the consensus mechanism in isolation before using it to coordinate real activity.", "page-upgrade-article-author-ethmerge": "Ethmerge", "page-upgrade-article-author-alchemy": "Alchemy", "page-upgrade-article-author-consensys": "Consensys",