post-merge updates: staking content

src/content/staking/pools/index.md

@@ -67,17 +67,11 @@ Typically ERC-20 liquidity tokens are issued to stakers that represents the valu
 </ExpandableCard>
 
 <ExpandableCard title="When can I withdraw my stake?">
-Currently, withdrawing funds from a validator on the Beacon Chain is not possible, which currently limits the ability to actually <em>redeem</em> your liquidity token for the ETH rewards locked in the consensus layer.
 
-Alternatively, pools that utilize an ERC-20 liquidity token allow users to trade this token in the open market, effectively allowing you to "withdraw" without actually removing ETH from the Beacon Chain.
-</ExpandableCard>
-
-<ExpandableCard title="Do pooled stakers need to do anything for The Merge?">
-Pooled stakers <strong>do not need to do anything to prepare for The Merge</strong>.
+Currently, withdrawing funds from an Ethereum validator is not possible, which limits the ability to actually _redeem_ your liquidity token for the ETH rewards locked in the consensus layer.
 
-However, as The Merge approaches, be on high alert for scammers. **You do not need to upgrade your ETH or staked ETH tokens** for the transition to proof-of-stake.
 
-Learn more about [The Merge](/upgrades/merge/)
+Alternatively, pools that utilize an ERC-20 liquidity token allow users to trade this token in the open market, allowing you to sell your staking position, effectively "withdrawing" without actually removing ETH from the staking contract.
 </ExpandableCard>
 
 <ExpandableCard title="Is this different from staking with my exchange?">

src/content/staking/saas/index.md

@@ -76,21 +76,7 @@ All of these keys can always be regenerated in a reproducible manner using your
 </ExpandableCard>
 
 <ExpandableCard title="When can I withdraw?" eventCategory="SaasStaking" eventName="clicked when can I withdraw">
-  When you stake 32 ETH with a SaaS provider, that ETH is still deposited to the official staking deposit contract. As such, SaaS stakers are currently limited by the same withdrawal restrictions as solo stakers. This means that staking your ETH is currently a one-way deposit. This will be the case until the Shanghai upgrade planned to follow the Merge.
-</ExpandableCard>
-
-<ExpandableCard title="What will change with the Merge?" eventCategory="SaasStaking" eventName="clicked what will change with the Merge">
-  After the Merge, SaaS stakers will begin to receive unburnt transaction fees/tips. Check with your provider to determine how to update your settings to include an Ethereum address you control where these funds will be sent when the time comes.
-
-The Merge will <em>not</em> enable the ability to withdraw your stake or protocol rewards; this feature is planned for the Shanghai upgrade, which will follow the Merge by an estimated six months to a year.
-</ExpandableCard>
-
-<ExpandableCard title="Do SaaS stakers need to do anything for The Merge?">
-SaaS stakers <strong>do not need to do anything to prepare for The Merge</strong>.
-
-There are a few things node operators must attend to for this upgrade. Check with your staking provider for assurance their systems are ready to go.
-
-Learn more about [The Merge](/upgrades/merge/)
+  When you stake 32 ETH with a SaaS provider, that ETH is still deposited to the official staking deposit contract. As such, SaaS stakers are currently limited by the same withdrawal restrictions as solo stakers. This means that staking your ETH is currently a one-way deposit. This will be the case until the Shanghai upgrade.
 </ExpandableCard>
 
 <ExpandableCard title="What happens if I get slashed?" eventCategory="SaasStaking" eventName="clicked what happens if I get slashed">

src/content/staking/solo/index.md

@@ -9,7 +9,7 @@ image: ../../../assets/staking/leslie-solo.png
 alt: Leslie the rhino on her own computer chip.
 sidebarDepth: 2
 summaryPoints:
-  - Receive maximum rewards directly from the protocol (including unburnt fees after The Merge) for keeping your validator properly functioning and online
+  - Receive maximum rewards directly from the protocol for keeping your validator properly functioning and online
   - Run home hardware and personally add to the security and decentralization of the Ethereum network
   - Remove trust, and never give up control of the keys to your funds
 ---
@@ -58,7 +58,7 @@ As much as we wish that solo staking was accessible and risk free to everyone, t
     <p style={{marginTop: "1rem"}}><a href="/security">Ethereum security and scam prevention</a></p>
   </ExpandableCard>
   <ExpandableCard title="No withdrawing (for now)" eventCategory="SoloStaking" eventName="clicked no withdrawing">
-    Withdrawing staked ETH or rewards from a validator balance is not yet supported. Support for withdrawals are planned for the Shanghai upgrade following The Merge. You should anticipate your ETH being locked for at least one-to-two years. After the Shanghai upgrade you will be able to freely withdraw portions or all of your stake if you wish.
+    Withdrawing staked ETH or rewards from a validator balance is not yet supported. Support for withdrawals are planned for the upcoming Shanghai upgrade. You should anticipate your ETH being locked for at least one-to-two years. After the Shanghai upgrade you will be able to freely withdraw portions or all of your stake if you wish.
   </ExpandableCard>
   <ExpandableCard title="Maintenance" eventCategory="SoloStaking" eventName="clicked maintenance">
     Hardware occasionally fails, network connections error out, and client software occasionally needs upgrading. Node maintenance is inevitable and will occasionally require your attention. You'll want to be sure you stay aware of any anticipated network upgrades, or other critical client upgrades.
@@ -89,10 +89,6 @@ The Staking Launchpad is an open source application that will help you become a
 
 <StakingLaunchpadWidget />
 
-<InfoBanner emoji=":panda:" isWarning>
-<strong>Note for existing stakers:</strong> The Merge is approaching, which brings a few changes since staking was launched. Make sure you're prepared with the <a href="https://launchpad.ethereum.org/en/merge-readiness">Merge readiness checklist</a> over on the Staking Launchpad.
-</InfoBanner>
-
 ## What to consider with node and client setup tools {#node-tool-considerations}
 
 There are a growing number of tools and services to help you solo stake your ETH, but each come with different risks and benefits.
@@ -130,7 +126,9 @@ Have a suggestion for a staking tool we missed? Check out our [product listing p
 These are a few of the most common questions about staking that are worth knowing about.
 
 <ExpandableCard title="What is a validator?">
-A <em>validator</em> is a virtual entity that lives on the Beacon Chain and participates in the consensus of the Ethereum protocol. Validators are represented by a balance, public key, and other properties. A <em>validator client</em> is the software that acts on behalf of the validator by holding and using its private key. A single validator client can hold many key pairs, controlling many validators.
+
+A _validator_ is a virtual entity that lives on Ethereum and participates in the consensus of the Ethereum protocol. Validators are represented by a balance, public key, and other properties. A _validator client_ is the software that acts on behalf of the validator by holding and using its private key. A single validator client can hold many key pairs, controlling many validators.
+
 </ExpandableCard>
 
 <ExpandableCard title="Can I deposit more than 32 ETH?">
@@ -180,18 +178,6 @@ Offline penalties are proportional to how many others are offline at the same ti
 <a href="https://consensys.net/blog/codefi/rewards-and-penalties-on-ethereum-20-phase-0/">More on rewards and penalties</a>
 </ExpandableCard>
 
-<ExpandableCard title="Do I need to do anything before The Merge?">
-Stakers currently running a consensus layer client (Beacon Chain) will also be required to run an execution layer client after The Merge. The new Engine API will be used to interface between the two layers, requiring a JWT secret. If you currently run a Beacon Chain without an execution layer client, you will need to sync the execution layer before The Merge to stay in sync with the network.
-
-The Merge will also bring unburnt transaction fees to validators. These fees do not accumulate in the balance associated with the validator keys but instead can be directed to a regular Ethereum address of your choice. To receive your tips (priority fees) from proposed blocks, you should update your client settings with the address you want your tips sent to.
-
-Links to individual client documentation and additional information can be found on the Merge readiness checklist over on the Launchpad.
-
-<ButtonLink to="https://launchpad.ethereum.org/merge-readiness/">
-Merge readiness checklist
-</ButtonLink>
-</ExpandableCard>
-
 ## Further reading {#further-reading}
 
 - [Ethereum's Client Diversity Problem](https://hackernoon.com/ethereums-client-diversity-problem) - _@emmanuelawosika 2022_

src/intl/en/page-staking.json

@@ -10,7 +10,7 @@
   "page-staking-check-address": "Check deposit address",
   "page-staking-deposit-address": "Check the deposit address",
   "page-staking-deposit-address-desc": "If you’ve already followed the setup instructions on the launchpad, you’ll know you need to send a transaction to the staking deposit contract. We recommend you check the address very carefully. You can find the official address on ethereum.org and a number of other trusted sites.",
-  "page-staking-description": "Staking is the act of depositing 32 ETH to activate validator software. As a validator you’ll be responsible for storing data, processing transactions, and adding new blocks to the blockchain. This will keep Ethereum secure for everyone and earn you new ETH in the process. This process, known as proof-of-stake, is being introduced by the Beacon Chain.",
+  "page-staking-description": "Staking is the act of depositing 32 ETH to activate validator software. As a validator you’ll be responsible for storing data, processing transactions, and adding new blocks to the blockchain. This will keep Ethereum secure for everyone and earn you new ETH in the process.",
   "page-staking-hero-title": "How to stake your ETH",
   "page-staking-hero-header": "Earn rewards while securing Ethereum",
   "page-staking-hero-subtitle": "Staking is a public good for the Ethereum ecosystem. Any user with any amount of ETH can help secure the network and earn rewards in the process.",
@@ -139,7 +139,7 @@
   "page-staking-section-comparison-rewards-title": "Rewards",
   "page-staking-section-comparison-solo-rewards-li1": "Maximum rewards - receive full rewards directly from the protocol",
   "page-staking-section-comparison-solo-rewards-li2": "You'll get rewards for batching transactions into a new block or checking the work of other validators to keep the chain running securely",
-  "page-staking-section-comparison-solo-rewards-li3": "After The Merge you'll receive unburnt transaction fees for blocks you propose",
+  "page-staking-section-comparison-solo-rewards-li3": "You'll also receive unburnt transaction fees for blocks you propose",
   "page-staking-section-comparison-saas-rewards-li1": "Usually involves full protocol rewards minus monthly fee for node operations",
   "page-staking-section-comparison-saas-rewards-li2": "Dashboards often available to easily track your validator client",
   "page-staking-section-comparison-pools-rewards-li1": "Pooled stakers accrue rewards differently, depending on which method of pooled staking chosen",
@@ -163,15 +163,15 @@
   "page-staking-section-comparison-pools-requirements-li1": "Lowest ETH requirements, some projects require as little as 0.01 ETH",
   "page-staking-section-comparison-pools-requirements-li2": "Deposit directly from your wallet to different pooled staking platforms or simply trade for one of the staking liquidity tokens",
   "page-staking-faq-1-question": "What is a validator?",
-  "page-staking-faq-1-answer": "A <em>validator</em> is a virtual entity that lives on the Beacon Chain and participates in the consensus of the Ethereum protocol. Validators are represented by a balance, public key, and other properties. A <em>validator client</em> is the software that acts on behalf of the validator by holding and using its private key. A single validator client can hold many key pairs, controlling many validators.",
+  "page-staking-faq-1-answer": "A <em>validator</em> is a virtual entity that lives on Ethereum and participates in the consensus of the Ethereum protocol. Validators are represented by a balance, public key, and other properties. A <em>validator client</em> is the software that acts on behalf of the validator by holding and using its private key. A single validator client can hold many key pairs, controlling many validators.",
   "page-staking-faq-2-question": "Why do I need to have funds at stake?",
   "page-staking-faq-2-answer": "A validator has the ability to propose and attest to blocks for the network. To prevent dishonest behavior, users must have their funds at stake. This allows the protocol to penalize malicious actors. Staking is a means to keep you honest, as your actions will have financial consequences.",
   "page-staking-faq-3-question": "Can I buy 'Eth2'?",
-  "page-staking-faq-3-answer-p1": "There is no 'Eth2' token native to the protocol, as the native token ether (ETH) will not change with the transition to proof-of-stake. Learn more about <a href=\"/upgrades/merge/\">The Merge</a>",
+  "page-staking-faq-3-answer-p1": "There is no 'Eth2' token native to the protocol, as the native token ether (ETH) did not change when Ethereum switched to proof-of-stake.",
   "page-staking-faq-3-answer-p2": "There are derivative tokens/tickers that may represent staked ETH (ie. rETH from Rocket Pool, stETH from Lido, ETH2 from Coinbase). Learn more about <a href=\"/staking/pools/\">staking pools</a>",
   "page-staking-faq-4-question": "Is staking already live?",
-  "page-staking-faq-4-answer-p1": "Yes and no. Staking has been live since December 1, 2020, but until the Merge happens, the proof-of-stake consensus remains isolated on its own chain, while the existing Ethereum network as we know it continues to operate using proof-of-work. These two chains start separate, but with the Merge, proof-of-work will be fully deprecated, and proof-of-stake will become the sole means of consensus from here-on-out.",
-  "page-staking-faq-4-answer-p2": "This means that staking is currently live for users to deposit their ETH, run a validator client, and start earning rewards. After the Merge, stakers will earn higher rewards as validators begin to process transactions and earn fee tips on top of protocol rewards. After the Shanghai update (planned to follow the Merge by a few months), stakers will then be able to withdraw rewards and funds from their validator balance.",
+  "page-staking-faq-4-answer-p1": "Yes. Staking has been live since December 1, 2020",
+  "page-staking-faq-4-answer-p2": "This means that staking is currently live for users to deposit their ETH, run a validator client, and start earning rewards. After the Shanghai update, stakers will then be able to withdraw rewards and funds from their validator balance.",
   "page-staking-toc-how-to-stake-your-eth": "How to stake your ETH",
   "page-staking-toc-comparison-of-options": "Comparison of staking options",
   "page-staking-toc-faq": "FAQ",