Merge pull request #7366 from ethereum/dev

Deploy v4.11.1

Author: corwintines

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ethereum-org-website",
-  "version": "4.11.0",
+  "version": "4.11.1",
   "description": "Website of ethereum.org",
   "main": "index.js",
   "repository": "git@github.com:ethereum/ethereum-org-website.git",

src/components/Staking/StakingLaunchpadWidget.tsx

@@ -64,7 +64,7 @@ const StakingLaunchpadWidget: React.FC<IProps> = () => {
   const data = {
     testnet: {
       label: "Goerli/Prater testnet",
-      url: "https://prater.launchpad.ethereum.org",
+      url: "https://goerli.launchpad.ethereum.org",
     },
     mainnet: {
       label: "Mainnet",

src/content/developers/docs/development-networks/index.md

@@ -59,10 +59,10 @@ Some consensus clients have built-in tools for spinning up local Beacon chains f
 
 ### Public Beacon Test-chains {#public-beacon-testchains}
 
-There are also public test implementations of the Beacon Chain. The recommended testnet with long-term support is Prater (which will eventually merge with the Goerli chain). The Ropsten Chain was recently merged with its own Beacon Chain and is currently still available for testing consensus client implementations and post-merge application development.
+There are also public test implementations of the Beacon Chain. The recommended testnet with long-term support is Goerli (which will merge with the Prater chain in August 2022). The Ropsten Chain was recently merged with its own Beacon Chain and is currently still available for testing consensus client implementations and post-merge application development.
 
-- [Prater Staking Launchpad](https://prater.launchpad.ethereum.org/en/)
-- [Ropsten Staking Launchpad](https://ropsten.launchpad.ethereum.org/en/)
+- [Goerli Staking Launchpad](https://goerli.launchpad.ethereum.org/)
+- [Ropsten Staking Launchpad](https://ropsten.launchpad.ethereum.org/)
 
 ## Further reading {#further-reading}
 

src/content/developers/docs/nodes-and-clients/run-a-node/index.md

@@ -148,7 +148,7 @@ path as an argument. This must be consistent with the `jwtsecret` path provided
 ### Adding Validators {#adding-validators}
 
 Each of the consensus clients have their own validator software that is described in detail in their respective documentation. The easiest way to get started with
-staking and validator key generation is to use the [Prater Testnet Staking Launchpad](https://prater.launchpad.ethereum.org/), allowing you to test your setup. When you're ready for Mainnet, you can repeat these steps using the [Mainnet Staking Launchpad](https://launchpad.ethereum.org/).
+staking and validator key generation is to use the [Goerli Testnet Staking Launchpad](https://goerli.launchpad.ethereum.org/), allowing you to test your setup. When you're ready for Mainnet, you can repeat these steps using the [Mainnet Staking Launchpad](https://launchpad.ethereum.org/).
 
 ### Using the node {#using-the-node}
 

src/content/developers/docs/standards/index.md

@@ -25,7 +25,7 @@ Typically standards are introduced as [Ethereum Improvement Proposals](/eips/) (
 
 There are 3 types of EIPs:
 
-- [Standards Track](https://eips.ethereum.org/): describes any change that affects most or all Ethereum implementations
+- Standards Track: describes any change that affects most or all Ethereum implementations
 - [Meta Track](https://eips.ethereum.org/meta): describes a process surrounding Ethereum or proposes a change to a process
 - [Informational Track](https://eips.ethereum.org/informational): describes an Ethereum design issue or provides general guidelines or information to the Ethereum community
 

src/intl/en/page-staking.json

@@ -156,7 +156,7 @@
   "page-staking-section-comparison-requirements-title": "Requirements",
   "page-staking-section-comparison-solo-requirements-li1": "You must deposit 32 ETH",
   "page-staking-section-comparison-solo-requirements-li2": "Maintain hardware that runs both an Ethereum execution client and consensus client while connected to the internet",
-  "page-staking-section-comparison-solo-requirements-li3": "The <a href=\"https://prater.launchpad.ethereum.org\" target=\"_blank\">Staking Launchpad</a> will walk you through the process and hardware requirements",
+  "page-staking-section-comparison-solo-requirements-li3": "The <a href=\"https://goerli.launchpad.ethereum.org\" target=\"_blank\">Staking Launchpad</a> will walk you through the process and hardware requirements",
   "page-staking-section-comparison-saas-requirements-li1": "Deposit 32 ETH and generate your keys with assistance",
   "page-staking-section-comparison-saas-requirements-li2": "Store your keys securely",
   "page-staking-section-comparison-saas-requirements-li3": "The rest is taken care of, though specific services will vary",

src/pages/stablecoins.tsx

@@ -331,7 +331,7 @@ const StablecoinsPage = ({ data }: PageProps<Queries.StablecoinsPageQuery>) => {
     () => ({
       USDT: { type: FIAT, url: "https://tether.to/" },
       USDC: { type: FIAT, url: "https://www.coinbase.com/usdc" },
-      DAI: { type: CRYPTO, url: "https://oasis.app/dai" },
+      DAI: { type: CRYPTO, url: "https://kb.oasis.app/help/what-is-dai" },
       BUSD: { type: FIAT, url: "https://www.binance.com/en/busd" },
       PAX: { type: FIAT, url: "https://www.paxos.com/pax/" },
       TUSD: { type: FIAT, url: "https://www.trusttoken.com/trueusd" },
@@ -722,7 +722,10 @@ const StablecoinsPage = ({ data }: PageProps<Queries.StablecoinsPageQuery>) => {
                       </ButtonLink>
                     </div>
                     <div>
-                      <ButtonLink isSecondary to="https://oasis.app/dai">
+                      <ButtonLink
+                        isSecondary
+                        to="https://kb.oasis.app/help/what-is-dai"
+                      >
                         <Translation id="page-stablecoins-dai-banner-learn-button" />
                       </ButtonLink>
                     </div>