Merge branch 'dev' of github.com:parotax/ethereum-org-website into lu…

…ksu05
ethereum · Aug 29, 2022 · 6833075 · 6833075
2 parents 6576d22 + b3b39fe
commit 6833075
Show file tree

Hide file tree

Showing 72 changed files with 1,002 additions and 167 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -938,7 +938,8 @@
       "contributions": [
         "translation",
         "code",
-        "ideas"
+        "ideas",
+        "doc"
       ]
     },
     {
@@ -8442,6 +8443,100 @@
         "doc",
         "translation"
       ]
+    },
+    {
+      "login": "srhinee",
+      "name": "samsara",
+      "avatar_url": "https://avatars.githubusercontent.com/u/29331203?v=4",
+      "profile": "https://github.com/srhinee",
+      "contributions": [
+        "doc",
+        "bug",
+        "translation"
+      ]
+    },
+    {
+      "login": "greefea",
+      "name": "greefea",
+      "avatar_url": "https://avatars.githubusercontent.com/u/106492500?v=4",
+      "profile": "https://github.com/greefea",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "parotax",
+      "name": "parotax",
+      "avatar_url": "https://avatars.githubusercontent.com/u/86522055?v=4",
+      "profile": "https://github.com/parotax",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "vinhloc30796",
+      "name": "Loc Nguyen",
+      "avatar_url": "https://avatars.githubusercontent.com/u/19675202?v=4",
+      "profile": "https://linkedin.com/in/vinhloc30796",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "north-vanhooser",
+      "name": "north-vanhooser",
+      "avatar_url": "https://avatars.githubusercontent.com/u/86130010?v=4",
+      "profile": "https://github.com/north-vanhooser",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "othaime-en",
+      "name": "othaime-en",
+      "avatar_url": "https://avatars.githubusercontent.com/u/61498231?v=4",
+      "profile": "https://github.com/othaime-en",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "fleischi-svr",
+      "name": "Cronos",
+      "avatar_url": "https://avatars.githubusercontent.com/u/79516944?v=4",
+      "profile": "https://github.com/fleischi-svr",
+      "contributions": [
+        "doc",
+        "translation"
+      ]
+    },
+    {
+      "login": "MicahZoltu",
+      "name": "Micah Zoltu",
+      "avatar_url": "https://avatars.githubusercontent.com/u/886059?v=4",
+      "profile": "https://github.com/MicahZoltu",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "Aracki",
+      "name": "Ivan Aracki",
+      "avatar_url": "https://avatars.githubusercontent.com/u/6129986?v=4",
+      "profile": "https://www.aracki.me",
+      "contributions": [
+        "ideas"
+      ]
+    },
+    {
+      "login": "always0e0w",
+      "name": "屠虫少年",
+      "avatar_url": "https://avatars.githubusercontent.com/u/64178062?v=4",
+      "profile": "https://alphabeta.top/",
+      "contributions": [
+        "doc",
+        "translation"
+      ]
     }
   ],
   "contributorsPerLine": 7,

diff --git a/.gitignore b/.gitignore
@@ -81,3 +81,6 @@ src/gatsby-types.d.ts
 
 # Exported Crowdin files
 .crowdin
+
+# vscode workplace configuration
+.vscode
diff --git a/README.md b/README.md
@@ -311,7 +311,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
   </tr>
   <tr>
     <td align="center"><a href="https://github.com/DjangoM"><img src="https://avatars2.githubusercontent.com/u/35060411?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jaroslav Macej</b></sub></a><br /><a href="#translation-DjangoM" title="Translation">🌍</a></td>
-    <td align="center"><a href="/EmanHerawy"><img src="https://avatars3.githubusercontent.com/u/10674070?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Eman Herawy</b></sub></a><br /><a href="#translation-EmanHerawy" title="Translation">🌍</a> <a href="/ethereum/ethereum-org-website/commits?author=EmanHerawy" title="Code">💻</a> <a href="#ideas-EmanHerawy" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="/EmanHerawy"><img src="https://avatars3.githubusercontent.com/u/10674070?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Eman Herawy</b></sub></a><br /><a href="#translation-EmanHerawy" title="Translation">🌍</a> <a href="/ethereum/ethereum-org-website/commits?author=EmanHerawy" title="Code">💻</a> <a href="#ideas-EmanHerawy" title="Ideas, Planning, & Feedback">🤔</a> <a href="/ethereum/ethereum-org-website/commits?author=EmanHerawy" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/Bellinas"><img src="https://avatars0.githubusercontent.com/u/45827044?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Bellinas</b></sub></a><br /><a href="#translation-Bellinas" title="Translation">🌍</a></td>
     <td align="center"><a href="https://github.com/amchercashin"><img src="https://avatars3.githubusercontent.com/u/8727497?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Alexander Cherkashin</b></sub></a><br /><a href="#translation-amchercashin" title="Translation">🌍</a></td>
     <td align="center"><a href="http://www.soarontech.com.ng"><img src="https://avatars0.githubusercontent.com/u/29120867?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Enoch Mbaebie</b></sub></a><br /><a href="#translation-EnochMbaebie" title="Translation">🌍</a></td>
@@ -1347,6 +1347,18 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
   <tr>
     <td align="center"><a href="https://github.com/lonelyotter"><img src="https://avatars.githubusercontent.com/u/57280827?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Haochen Song</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=lonelyotter" title="Documentation">📖</a> <a href="#translation-lonelyotter" title="Translation">🌍</a></td>
     <td align="center"><a href="https://github.com/opensourcex123"><img src="https://avatars.githubusercontent.com/u/73230562?v=4?s=100" width="100px;" alt=""/><br /><sub><b>N Fx</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=opensourcex123" title="Documentation">📖</a> <a href="#translation-opensourcex123" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/srhinee"><img src="https://avatars.githubusercontent.com/u/29331203?v=4?s=100" width="100px;" alt=""/><br /><sub><b>samsara</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=srhinee" title="Documentation">📖</a> <a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Asrhinee" title="Bug reports">🐛</a> <a href="#translation-srhinee" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/greefea"><img src="https://avatars.githubusercontent.com/u/106492500?v=4?s=100" width="100px;" alt=""/><br /><sub><b>greefea</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=greefea" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/parotax"><img src="https://avatars.githubusercontent.com/u/86522055?v=4?s=100" width="100px;" alt=""/><br /><sub><b>parotax</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=parotax" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://linkedin.com/in/vinhloc30796"><img src="https://avatars.githubusercontent.com/u/19675202?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Loc Nguyen</b></sub></a><br /><a href="#content-vinhloc30796" title="Content">🖋</a></td>
+    <td align="center"><a href="https://github.com/north-vanhooser"><img src="https://avatars.githubusercontent.com/u/86130010?v=4?s=100" width="100px;" alt=""/><br /><sub><b>north-vanhooser</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=north-vanhooser" title="Documentation">📖</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/othaime-en"><img src="https://avatars.githubusercontent.com/u/61498231?v=4?s=100" width="100px;" alt=""/><br /><sub><b>othaime-en</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=othaime-en" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/fleischi-svr"><img src="https://avatars.githubusercontent.com/u/79516944?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Cronos</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=fleischi-svr" title="Documentation">📖</a> <a href="#translation-fleischi-svr" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/MicahZoltu"><img src="https://avatars.githubusercontent.com/u/886059?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Micah Zoltu</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=MicahZoltu" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://www.aracki.me"><img src="https://avatars.githubusercontent.com/u/6129986?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ivan Aracki</b></sub></a><br /><a href="#ideas-Aracki" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="https://alphabeta.top/"><img src="https://avatars.githubusercontent.com/u/64178062?v=4?s=100" width="100px;" alt=""/><br /><sub><b>屠虫少年</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=always0e0w" title="Documentation">📖</a> <a href="#translation-always0e0w" title="Translation">🌍</a></td>
   </tr>
 </table>
 

diff --git a/docs/chakra-migration-guide.md b/docs/chakra-migration-guide.md
@@ -8,6 +8,63 @@ This is part of our [UI library implementation epic](https://github.com/ethereum
 
 All `styled` components need to be removed and replaced with the corresponded Chakra component. [See the list of components](https://chakra-ui.com/docs/components).
 
+Use as much native Chakra components as possible.
+
+### Wrappers or layout divs
+
+Use the [native layouts components](https://chakra-ui.com/docs/components/box)
+
+```tsx
+// before
+const Wrapper = styled.div`
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+`
+
+// now
+<Stack direction='row'>
+```
+
+Center things using the `<Center />` component
+
+```tsx
+// before
+const Center = styled.div`
+  height: 100px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+`
+
+// now
+<Center h="100px">
+```
+
+Group buttons using `<ButtonGroup />` or `<Wrap />`
+
+```tsx
+// before
+const ButtonRow = styled.div`
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+`
+
+// now
+<ButtonGroup variant='outline' spacing={2}>
+  <Button>Button 1</Button>
+  <Button>Button 2</Button>
+</ButtonGroup>
+
+// or
+<Wrap spacing={2}>
+  <WrapItem><Button variant="outline">Button 1</Button></WrapItem>
+  <WrapItem><Button variant="outline">Button 2</Button></WrapItem>
+</Wrap>
+```
+
 ## Override styles using style props
 
 - You can see how to use the different style props here: [https://chakra-ui.com/docs/styled-system/style-props](https://chakra-ui.com/docs/styled-system/style-props#margin-and-padding)

diff --git a/gatsby-config.ts b/gatsby-config.ts
@@ -66,7 +66,7 @@ const config: GatsbyConfig = {
         icon: `src/assets/favicon.png`,
       },
     },
-    // Sitemap generator (ethereum.org/sitemap.xml)
+    // Sitemap generator (ethereum.org/sitemap/sitemap-index.xml)
     {
       resolve: `gatsby-plugin-sitemap`,
       options: {
@@ -104,6 +104,15 @@ const config: GatsbyConfig = {
         },
       },
     },
+    // robots.txt creation
+    {
+      resolve: "gatsby-plugin-robots-txt",
+      options: {
+        host: siteUrl,
+        sitemap: `${siteUrl}/sitemap/sitemap-index.xml`,
+        policy: [{ userAgent: "*", allow: "/" }],
+      },
+    },
     // Ability to set custom IDs for headings (for translations)
     // i.e. https://www.markdownguide.org/extended-syntax/#heading-ids
     `gatsby-remark-autolink-headers`,

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ethereum-org-website",
-  "version": "5.1.1",
+  "version": "5.3.1",
   "description": "Website of ethereum.org",
   "main": "index.js",
   "repository": "git@github.com:ethereum/ethereum-org-website.git",
@@ -39,6 +39,7 @@
     "gatsby-plugin-react-helmet": "^5.0.0",
     "gatsby-plugin-react-helmet-canonical-urls": "^1.4.0",
     "gatsby-plugin-react-svg": "^3.1.0",
+    "gatsby-plugin-robots-txt": "^1.7.1",
     "gatsby-plugin-sharp": "^4.10.0",
     "gatsby-plugin-sitemap": "^5.0.0",
     "gatsby-remark-autolink-headers": "^5.0.0",

diff --git a/src/assets/dev-tools/speed-run-ethereum.png b/src/assets/dev-tools/speed-run-ethereum.png
diff --git a/src/assets/wallets/exodus.png b/src/assets/wallets/exodus.png
diff --git a/src/assets/wallets/infinity_wallet.png b/src/assets/wallets/infinity_wallet.png
diff --git a/src/assets/wallets/rabbywallet.png b/src/assets/wallets/rabbywallet.png
diff --git a/src/assets/wallets/sequence.png b/src/assets/wallets/sequence.png
diff --git a/src/components/ShardChainsList.tsx b/src/components/ShardChainsList.tsx
@@ -15,46 +15,28 @@ const ShardChainsList: React.FC<IProps> = () => {
   const intl = useIntl()
   const reads: Array<CardListItem> = [
     {
-      title: translateMessageId(
-        "page-upgrade-article-title-sharding-is-great",
-        intl
-      ),
-      description: "Vitalik Buterin",
+      title: translateMessageId("page-upgrade-article-title-sharding-is-great", intl),
+      description: translateMessageId("page-upgrade-article-author-vitalik-buterin", intl),
       link: "https://vitalik.ca/general/2021/04/07/sharding.html",
     },
     {
-      title: translateMessageId(
-        "page-upgrade-article-title-rollup-roadmap",
-        intl
-      ),
-      description: "Vitalik Buterin",
+      title: translateMessageId("page-upgrade-article-title-rollup-roadmap", intl),
+      description: translateMessageId("page-upgrade-article-author-vitalik-buterin", intl),
       link: "https://ethereum-magicians.org/t/a-rollup-centric-ethereum-roadmap/4698",
     },
     {
-      title: translateMessageId(
-        "page-upgrade-article-title-two-point-oh",
-        intl
-      ),
-      description: "Ethos.dev",
+      title: translateMessageId("page-upgrade-article-title-two-point-oh", intl),
+      description: translateMessageId("page-upgrade-article-author-ethos-dev", intl),
       link: "https://ethos.dev/beacon-chain/",
     },
     {
-      title: translateMessageId(
-        "page-upgrade-article-title-sharding-consensus",
-        intl
-      ),
-      description: translateMessageId(
-        "page-upgrade-article-author-ethereum-foundation",
-        intl
-      ),
+      title: translateMessageId("page-upgrade-article-title-sharding-consensus", intl),
+      description: translateMessageId("page-upgrade-article-author-ethereum-foundation", intl),
       link: "https://blog.ethereum.org/2020/03/27/sharding-consensus/",
     },
     {
-      title: translateMessageId(
-        "page-upgrade-article-title-hitchhikers-guide-to-ethereum",
-        intl
-      ),
-      description: "Delphi Digital",
+      title: translateMessageId("page-upgrade-article-title-hitchhikers-guide-to-ethereum", intl),
+      description: translateMessageId("page-upgrade-article-author-delphi-digital", intl),
       link: "https://members.delphidigital.io/reports/the-hitchhikers-guide-to-ethereum",
     },
   ]

diff --git a/src/content/community/grants/index.md b/src/content/community/grants/index.md
@@ -21,6 +21,7 @@ These programs support the broad Ethereum ecosystem by offering grants to a wide
 - [Moloch DAO](https://www.molochdao.com/) - _Privacy, layer 2 scaling, client security, and more_
 - [Open Grants](https://opengrants.com/explore)
 - [DAO Grants](https://docs.google.com/spreadsheets/d/1XHc-p_MHNRdjacc8uOEjtPoWL86olP4GyxAJOFO0zxY/edit#gid=0) - _Google spreadsheet of organizations offering grants_
+- [Merge Data Challenge](https://esp.ethereum.foundation/merge-data-challenge) - _Calling all Ethereans, data scientists, data engineers, data visualizers, developers, and anyone interested in digging into Ethereum data!_
 
 ## Project specific {#project-specific}
 

diff --git a/src/content/contributing/translation-program/blog-translations/index.md b/src/content/contributing/translation-program/blog-translations/index.md
@@ -22,7 +22,7 @@ Anyone can contribute to translating the EF blog. If you want to get involved, k
 
 </InfoBanner>
 
-### Join the blog translations project in Crowdin {#join-crowdin}
+### Join the blog translations project in Crowdin {#join-crowdin}
 
 You'll need to log in to your Crowdin account or sign up if you don’t already have one. All that is required to sign up is an e-mail account and password.
 
@@ -33,7 +33,7 @@ You'll need to log in to your Crowdin account or sign up if you don’t already
 ### Open the language you want to translate and find a blog post to work on {#pick-language-and-post}
 
 Each post is uploaded to Crowdin as an individual file. The files are named after the blog post title, so it should be fairly straightforward if you're looking for a specific post to translate.
- 
+
 Blog posts are prioritized based on their date of publication. Please follow the numerical order when translating to ensure that recently published posts get translated first (1 → 2 → 3 → ⋯).
 
 ![Screenshot showing how blog posts are numbered in the Crowdin user interface](./blog-posts.png)

diff --git a/src/content/developers/docs/apis/javascript/index.md b/src/content/developers/docs/apis/javascript/index.md
@@ -265,7 +265,7 @@ ethers.utils.formatEther(balance)
 
 **Alchemyweb3 -** **_Wrapper around Web3.js with automatic retries and enhanced apis._**
 
-- [Documentation](https://docs.alchemyapi.io/documentation/alchemy-web3)
+- [Documentation](https://docs.alchemy.com/reference/api-overview)
 - [GitHub](https://github.com/alchemyplatform/alchemy-web3)
 
 **Alchemy NFT API -** **_API for fetching NFT data, including ownership, metadata attributes and more._**

diff --git a/src/content/developers/docs/blocks/index.md b/src/content/developers/docs/blocks/index.md
@@ -14,7 +14,7 @@ Blocks are a very beginner-friendly topic. But to help you better understand thi
 
 ## Why blocks? {#why-blocks}
 
-To ensure that all participants on the Ethereum network maintain a synchronized state and agree on the precise history of transactions, we batch transactions into blocks. This means dozens (or hundreds) of transactions are committed, agreed on, and synchronized on all at once.
+To ensure that all participants on the Ethereum network maintain a synchronized state and agree on the precise history of transactions, we batch transactions into blocks. This means dozens (or hundreds) of transactions are committed, agreed on, and synchronized all at once.
 
 ![A diagram showing transaction in a block causing state changes](./tx-block.png)
 _Diagram adapted from [Ethereum EVM illustrated](https://takenobu-hs.github.io/downloads/ethereum_evm_illustrated.pdf)_

diff --git a/...opers/docs/consensus-mechanisms/pow/mining-algorithms/dagger-hashamoto/index.md b/...opers/docs/consensus-mechanisms/pow/mining-algorithms/dagger-hashamoto/index.md
@@ -1,6 +1,6 @@
 ---
-title: Dagger-Hashamoto
-description: A detailed look at the Dagger-Hashamoto algorithm.
+title: Dagger-Hashimoto
+description: A detailed look at the Dagger-Hashimoto algorithm.
 lang: en
 sidebar: true
 ---