Deploy v3.1.1

gatsby-config.js

@@ -125,6 +125,8 @@ module.exports = {
     // Image support in markdown
     `gatsby-remark-images`,
     `gatsby-remark-copy-linked-files`,
+    // READING time
+    "gatsby-remark-reading-time",
     // MDX support
     {
       resolve: `gatsby-plugin-mdx`,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ethereum-org-website",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "description": "Website of ethereum.org",
   "main": "index.js",
   "repository": "[email protected]:ethereum/ethereum-org-website.git",
@@ -38,6 +38,7 @@
     "gatsby-remark-autolink-headers": "^5.0.0",
     "gatsby-remark-copy-linked-files": "^5.0.0",
     "gatsby-remark-images": "^6.0.0",
+    "gatsby-remark-reading-time": "^1.1.0",
     "gatsby-source-filesystem": "^4.0.0",
     "gatsby-transformer-csv": "^4.0.0",
     "gatsby-transformer-gitinfo": "^1.1.0",

src/components/Layout.js

@@ -9,7 +9,6 @@ import "../styles/layout.css"
 import { lightTheme, darkTheme, GlobalStyle } from "../theme"
 
 import Footer from "./Footer"
-import UpgradeBannerNotification from "./UpgradeBannerNotification"
 import VisuallyHidden from "./VisuallyHidden"
 import Nav from "./Nav"
 import SideNav from "./SideNav"
@@ -60,7 +59,6 @@ const Layout = (props) => {
   const [isDarkTheme, setIsDarkTheme] = useState(false)
   const [isZenMode, setIsZenMode] = useState(false)
   const [shouldShowSideNav, setShouldShowSideNav] = useState(false)
-  const [isHomepage, setIsHomepage] = useState(false)
 
   // Exit Zen Mode on 'esc' click
   useKeyPress(`Escape`, () => handleZenModeChange(false))
@@ -75,8 +73,6 @@ const Layout = (props) => {
   }, [])
 
   useEffect(() => {
-    // Check if path matches homepage for any language (boolean for UpgradeBannerNotification)
-    setIsHomepage(/^\/[a-z]{2}\/$|^\/[a-z]{2}\-[a-z]{2}\/$/.test(props.path))
     if (props.path.includes("/docs/")) {
       setShouldShowSideNav(true)
 
@@ -166,7 +162,6 @@ const Layout = (props) => {
                   </VisuallyHidden>
                 )}
                 <MainContent>
-                  {isHomepage && <UpgradeBannerNotification />}
                   <ZenModeContext.Provider
                     value={{ isZenMode, handleZenModeChange }}
                   >

src/components/Translation.js

@@ -1,11 +1,11 @@
 import React from "react"
-import { FormattedMessage } from "gatsby-plugin-intl"
+import { FormattedHTMLMessage } from "gatsby-plugin-intl"
 import { getDefaultMessage } from "../utils/translations"
 
 // Wrapper on <FormattedMessage /> to always fallback to English
 // Use this component for any user-facing string
 const Translation = ({ id }) => (
-  <FormattedMessage id={id} defaultMessage={getDefaultMessage(id)} />
+  <FormattedHTMLMessage id={id} defaultMessage={getDefaultMessage(id)} />
 )
 
 export default Translation

src/components/TutorialMetadata.js

@@ -115,7 +115,7 @@ const TutorialMetadata = ({ tutorial, data }) => {
         )}
         <DataContainer>
           <Emoji size={1} mr={`0.5em`} text=":stopwatch:" />
-          {tutorial.timeToRead}{" "}
+          {Math.round(tutorial.fields.readingTime.minutes)}{" "}
           <Translation id="comp-tutorial-metadata-minute-read" />
         </DataContainer>
       </HorizontalContainer>

src/components/WalletCompare.js

@@ -500,10 +500,7 @@ const WalletCompare = ({ location }) => {
           <ResultsContainer>
             <Emoji text=":crying_face:" size={3} mb={`2em`} mt={`2em`} />
             <h2>
-              <Translation id="page-find-wallet-not-all-features" />{" "}
-              <b>
-                <Translation id="page-find-wallet-yet" />
-              </b>
+              <Translation id="page-find-wallet-not-all-features" />
             </h2>
             <p>
               <Translation id="page-find-wallet-try-removing" />

src/content/about/index.md

@@ -38,7 +38,7 @@ Ethereum and the community are always evolving, so ethereum.org will too. That's
 
 We're open source, with a community of contributors, so you can propose changes or help us out too.
 
-[Learn about contributing](/en/contributing/)
+[Learn about contributing](/contributing/)
 
 ### 3. ethereum.org is not a typical product website 🦄 {#core-principles-3}
 
@@ -49,15 +49,15 @@ This means the website needs to handle many different user journeys, from “a d
 
 ## Design principles {#design-principles}
 
-We use a set of [design principles](/en/contributing/design-principles/) to guide our content and design decisions on the site.
+We use a set of [design principles](/contributing/design-principles/) to guide our content and design decisions on the site.
 
 ## Style guide {#style-guide}
 
-We have a [style guide](/en/contributing/style-guide/) to standardize certain aspects of writing content to make the contribution process smoother.
+We have a [style guide](/contributing/style-guide/) to standardize certain aspects of writing content to make the contribution process smoother.
 
 We welcome feedback on both the design principles and the style guide. Remember, ethereum.org is for the community, by the community.
 
-Make sure you read [our principles](/en/contributing/design-principles/) and [our style guide](/en/contributing/style-guide/) if you'd like to [contribute to the site](/en/contributing/).
+Make sure you read [our principles](/contributing/design-principles/) and [our style guide](/contributing/style-guide/) if you'd like to [contribute to the site](/contributing/).
 
 ## Roadmap {#roadmap}
 

src/content/contributing/adding-exchanges/index.md

@@ -17,7 +17,7 @@ This page allows a user to input where they live and see what exchanges they can
 
 Because of this context, we need some specific information when you suggest an exchange.
 
-**NOTE:** If you want to list a decentralized exchange, take a look at our [policy for listing wallets and dapps](/en/contributing/adding-products/).
+**NOTE:** If you want to list a decentralized exchange, take a look at our [policy for listing wallets and dapps](/contributing/adding-products/).
 
 ## What we need {#what-we-need}
 

src/content/contributing/design-principles/index.md

@@ -11,7 +11,7 @@ sidebar: true
 
 Our principles inform the look and feel of the site and the content that's on it.
 
-You should read these before you [contribute to ethereum.org](/en/contributing/).
+You should read these before you [contribute to ethereum.org](/contributing/).
 
 ## What are design principles? {#ways-to-contribute}
 

src/content/contributing/index.md

@@ -18,23 +18,23 @@ The ethereum.org website, like Ethereum more broadly, is an open-source project.
 
 - [Work on an open issue](https://github.com/ethereum/ethereum-org-website/issues)
   _– Work we've identified that needs doing_
-- [Join the translations program](/en/contributing/translation-program/)
+- [Join the translations program](/contributing/translation-program/)
   _– Help us bring ethereum.org to new languages_
-- [Add community articles](/en/contributing/content-resources/)
+- [Add community articles](/contributing/content-resources/)
   _– Add a helpful article to a relevant page_
-- [Add a product](/en/contributing/adding-products/)
+- [Add a product](/contributing/adding-products/)
   _– Add a dapp or wallet to a relevant page_
-- [Add developer tools](/en/contributing/adding-developer-tools/)
+- [Add developer tools](/contributing/adding-developer-tools/)
   _– Add a developer tool to a relevant page_
-- [Add an exchange](/en/contributing/adding-exchanges/)
+- [Add an exchange](/contributing/adding-exchanges/)
   _– Add an exchange to our [exchange finder](/get-eth/#country-picker)_
 - [Improve our research](https://www.notion.so/efdn/Ethereum-org-User-Persona-Memo-b44dc1e89152457a87ba872b0dfa366c)
   _– Let us know your feedback on our research or contribute your own_
 - [Request a feature](https://github.com/ethereum/ethereum-org-website/issues/new?assignees=&labels=Type%3A+Feature&template=feature_request.md&title=)
   _– Let us know about any ideas you have for a new feature or design_
-- [Add a glossary term](/en/contributing/adding-glossary-terms)
+- [Add a glossary term](/contributing/adding-glossary-terms)
   _– Help us continue to expand the Ethereum [glossary](/glossary/)_
-- [Create/edit content](/en/contributing/#how-to-update-content)
+- [Create/edit content](/contributing/#how-to-update-content)
   _– Suggest new pages or makes tweaks to what's here already_
 
 _Any questions?_ 🤔 Reach out on our [Discord server](https://discord.gg/CetY6Y4)
@@ -53,8 +53,8 @@ You don't need permission to work on anything, but it's always best to let us kn
 Before contributing , make sure you're familiar with:
 
 - the evolving [vision of ethereum.org](/about/)
-- our [design principles](/en/contributing/design-principles/)
-- our [style guide](/en/contributing/style-guide/)
+- our [design principles](/contributing/design-principles/)
+- our [style guide](/contributing/style-guide/)
 
 ## How decisions about the site are made {#how-decisions-about-the-site-are-made}
 

src/content/contributing/style-guide/index.md

@@ -9,7 +9,7 @@ sidebar: true
 
 Content on [ethereum.org](/) is crowdsourced and primarily written by our incredible contributors. This style guide aims to standardize certain aspects of writing content to make the contribution process smoother.
 
-You should read this style guide before you [contribute to ethereum.org](/en/contributing/).
+You should read this style guide before you [contribute to ethereum.org](/contributing/).
 
 ## Who can submit content to ethereum.org {#who-can-help}
 
@@ -75,7 +75,7 @@ Ethereum.org documentation (and content at large) aims to maintain a credibly ne
 
 The tone of the content on the site should be welcoming, friendly and straightforward. Jargon should be minimized and simple language used instead.
 
-Read the [ethereum.org design principles](/en/contributing/design-principles/) for more on direction tone.
+Read the [ethereum.org design principles](/contributing/design-principles/) for more on direction tone.
 
 ## Best practices {#best-practices}
 

src/content/contributing/translation-program/content-versions/index.md

@@ -7,7 +7,7 @@ sidebar: true
 
 # Content versions {#content-versions}
 
-As mentioned in our [Translation Program overview](/en/contributing/translation-program/), we use 'content buckets' within Crowdin to get the highest priority content released first. When you check out a language to translate, for example, [German](https://crowdin.com/project/ethereum-org/de) you'll see folders for each content bucket.
+As mentioned in our [Translation Program overview](/contributing/translation-program/), we use 'content buckets' within Crowdin to get the highest priority content released first. When you check out a language to translate, for example, [German](https://crowdin.com/project/ethereum-org/de) you'll see folders for each content bucket.
 
 Below is a breakdown of the website pages each content bucket contains.
 

src/content/contributing/translation-program/index.md

@@ -59,7 +59,7 @@ The ethereum.org Translation Program aims to make Ethereum accessible to everyon
 
    We encourage you to translate in this numerical order (1 → 2 → 3 → ⋯) to ensure the highest impact pages are translated first.
 
-   [Learn more about ethereum.org content versions](/en/contributing/translation-program/content-versions/)
+   [Learn more about ethereum.org content versions](/contributing/translation-program/content-versions/)
 
 3. **Translate**  
    After selecting the file you want to translate, it will open in the online editor. If you have never used Crowdin before, you can use this quick guide to go over the basics.

src/content/deprecated-software/index.md

@@ -92,7 +92,7 @@ Ethereum Studio was developed to provide users with an IDE that had a built-in E
 
 **Alternatives**
 
-[Remix](https://remix.ethereum.org/) is an alternative web IDE for Solidity development. Additionally, the [Developer Portal](https://ethereum.org/en/developers/) has tools for web and local development, documentation, and more.
+[Remix](https://remix.ethereum.org/) is an alternative web IDE for Solidity development. Additionally, the [Developer Portal](/developers/) has tools for web and local development, documentation, and more.
 
 ### Meteor Dapp Wallet {#meteor-dapp-wallet}
 
@@ -330,26 +330,6 @@ Associated with the EthFans community, the service was launched in 2015. SparkPo
 
 [Ethermine](https://ethermine.org/)
 
-### ConsenSys - ERC-20 Implementation
-
-Deprecated on Nov 13, 2020.
-
-**Summary**
-
-This project aimed to implement some EIP about Tokens (e.g. EIP20) as smart contract to allow developers to easily incorporate them into their Solidity applications while adhering to standards.
-
-**Archives**
-
-[GitHub repo](https://github.com/ConsenSys/Tokens/blob/master/contracts/eip20/EIP20.sol)
-
-**History**
-
-The project was discontinued in favor of the "thoroughly vetted OpenZeppelin token implementations" - as per Consensys team's own words.
-
-**Alternatives**
-
-[OpenZeppelin Contracts - Token](https://github.com/OpenZeppelin/openzeppelin-contracts/tree/master/contracts/token)
-
 ## Documentation and Information Sources {#documentation-and-information-sources}
 
 There are numerous sources of documentation, articles, tutorials, and forums which are now removed or live but no longer maintained. We have selected a few which are significant or whose current status as deprecated may lead to confusion or scam attempts.

src/content/developers/docs/consensus-mechanisms/pos/index.md

@@ -85,6 +85,7 @@ Stake slashings, ejections, and other penalties, coordinated by the beacon chain
 
 ## Further reading {#further-reading}
 
+- [Proof of Stake FAQ](https://vitalik.ca/general/2017/12/31/pos_faq.html) _Vitalik Buterin_
 - [What is Proof of Stake](https://consensys.net/blog/blockchain-explained/what-is-proof-of-stake/) _ConsenSys_
 - [What Proof of Stake Is And Why It Matters](https://bitcoinmagazine.com/culture/what-proof-of-stake-is-and-why-it-matters-1377531463) _Vitalik Buterin_
 - [The Beacon Chain Ethereum 2.0 explainer you need to read first](https://ethos.dev/beacon-chain/) _Ethos.dev_

src/content/developers/docs/programming-languages/rust/index.md

@@ -27,14 +27,13 @@ Need a more basic primer first? Check out [ethereum.org/learn](/learn/) or [ethe
 - [The Rust Ethereum Client](https://openethereum.github.io/) \* **Note that OpenEthereum [has been deprecated](https://medium.com/openethereum/gnosis-joins-erigon-formerly-turbo-geth-to-release-next-gen-ethereum-client-c6708dd06dd) and is no longer being maintained.** Use it with caution and preferably switch to another client implementation.
 - [Sending Transaction to Ethereum Using Rust](https://kauri.io/#collections/A%20Hackathon%20Survival%20Guide/sending-ethereum-transactions-with-rust/)
 - [An Introduction to Smart Contracts with Parity Ethereum Client](https://wiki.parity.io/Smart-Contracts)
-- [Setting up your Oasis SDK dev environment](https://docs.oasis.dev/quickstart.html#set-up-the-oasis-sdk)
+- [Setting up your Oasis SDK dev environment](https://docs.oasis.dev/oasis-sdk/guide/getting-started)
 - [A step-by-step tutorial on how to write contracts in rust Wasm for Kovan](https://github.com/paritytech/pwasm-tutorial)
 
 ## Intermediate articles {#intermediate-articles}
 
 - [Rust-Web3 Documentation](https://tomusdrw.github.io/rust-web3/web3/index.html)
 - [Rust-Web3 Working Examples](https://github.com/tomusdrw/rust-web3/blob/master/examples)
-- [Creating a Private Chat Server with OASIS SDK](https://docs.oasis.dev/tutorials/messaging.html#prerequisites)
 
 ## Advanced use patterns {#advanced-use-patterns}
 

src/content/developers/tutorials/erc20-annotated-code/index.md

@@ -86,7 +86,7 @@ By convention, interface names start with `I`.
 This function is `external`, meaning [it can only be called from outside the contract](https://docs.soliditylang.org/en/v0.7.0/cheatsheet.html#index-2).
 It returns the total supply of tokens in the contract. This value is returned using the most common type in Ethereum, unsigned 256 bits (256 bits is the
 native word size of the EVM). This function is also a `view`, which means that it does not change the state, so it can be executed on a single node instead of having
-every node in the blockchain run it. This kind of function does not generate a transaction and does not cost [gas](https://ethereum.org/en/developers/docs/gas/).
+every node in the blockchain run it. This kind of function does not generate a transaction and does not cost [gas](/developers/docs/gas/).
 
 **Note:** In theory it might appear that a contract's creator could cheat by returning a smaller total supply than the real value, making each token appear
 more valuable than it actually is. However, that fear ignores the true nature of the blockchain. Everything that happens on the blockchain can be verified by

src/content/developers/tutorials/uniswap-v2-annotated-code/index.md

@@ -865,7 +865,7 @@ exchange.
 ```
 
 We want the address of the new exchange to be deterministic, so it can be calculated in advance off chain
-(this can be useful for [layer 2 transactions](https://ethereum.org/en/developers/docs/layer-2-scaling/)).
+(this can be useful for [layer 2 transactions](/developers/docs/layer-2-scaling/)).
 To do this we need to have a consistent order of the token addresses, regardless of the order in which we have
 received them, so we sort them here.
 

src/content/developers/tutorials/waffle-test-simple-smart-contract/index.md

@@ -199,6 +199,6 @@ The test, if passed, will assure us that the transaction was reverted indeed. Ho
 
 You've made your first big step towards testing smart contracts with Waffle! You might be interested in other Waffle tutorials:
 
-- [Testing ERC20 with Waffle](https://ethereum.org/en/developers/tutorials/testing-erc-20-tokens-with-waffle/)
-- [Waffle: Dynamic mocking and testing contract calls](https://ethereum.org/en/developers/tutorials/waffle-dynamic-mocking-and-testing-calls/#gatsby-focus-wrapper)
-- [Waffle say hello world tutorial with hardhat and ethers](https://ethereum.org/en/developers/tutorials/waffle-hello-world-with-buidler-tutorial/)
+- [Testing ERC20 with Waffle](/developers/tutorials/testing-erc-20-tokens-with-waffle/)
+- [Waffle: Dynamic mocking and testing contract calls](/developers/tutorials/waffle-dynamic-mocking-and-testing-calls/#gatsby-focus-wrapper)
+- [Waffle say hello world tutorial with hardhat and ethers](/developers/tutorials/waffle-hello-world-with-buidler-tutorial/)

src/content/enterprise/index.md

@@ -164,4 +164,4 @@ Here are some of the enterprise applications that have been deployed to the publ
 
 - [GridPlus](https://blog.gridplus.io/gridplus-is-live-in-texas-efc83c814601) _electricity payments_
 
-If you would like to add to this list, please see [instructions for contributing](https://ethereum.org/en/contributing/).
+If you would like to add to this list, please see [instructions for contributing](/contributing/).

src/content/eth2/get-involved/medalla-data-challenge/index.md

@@ -106,7 +106,7 @@ _Surprise us with your creativity! But here are some judging criteria considerat
 - [Medalla ETH 2.0 Testnet](https://github.com/goerli/medalla)
 - [The State of Eth2](https://blog.ethereum.org/2020/06/02/the-state-of-eth2-june-2020/) _– Danny Ryan_
 - [Eth2 quick update no. 14 – testnet edition](https://blog.ethereum.org/2020/08/03/eth2-quick-update-no-14/) _– Danny Ryan_
-- [Ethereum 2.0 Overview](https://ethereum.org/en/eth2/)
+- [Ethereum 2.0 Overview](/eth2/)
 - [Eth R&D](https://discord.gg/VmG7Uxc) _– Discord_
 - [ethstaker](https://invite.gg/ethstaker) _– Discord_
 

src/content/eth2/shard-chains/index.md

@@ -14,8 +14,8 @@ summaryPoints:
   ]
 ---
 
-<UpgradeStatus date="~2022">
-    Shard chains should ship sometime in 2022, depending on how quickly work progresses after <a href="/eth2/merge/">the merge</a>. These shards will give Ethereum more capacity to store and access data, but they won’t be used for executing code. The details of that are still being figured out.
+<UpgradeStatus date="~2023">
+    Shard chains should ship sometime in 2023, depending on how quickly work progresses after <a href="/eth2/merge/">the merge</a>. These shards will give Ethereum more capacity to store and access data, but they won’t be used for executing code. The details of that are still being figured out.
 </UpgradeStatus>
 
 ## What is sharding? {#what-is-sharding}

src/content/glossary/index.md

@@ -732,4 +732,4 @@ _Provided in part by [Mastering Ethereum](https://github.com/ethereumbook/ethere
 
 Did we miss something? Is something incorrect? Help us improve by contributing to this glossary on GitHub!
 
-[Learn more about how to contribute](/en/contributing/adding-glossary-terms)
+[Learn more about how to contribute](/contributing/adding-glossary-terms)