Merge pull request #6355 from ethereum/dev

Deploy v3.24.0

.all-contributorsrc

@@ -7388,6 +7388,70 @@
         "doc",
         "ideas"
       ]
+    },
+    {
+      "login": "soranature",
+      "name": "Sora Nature",
+      "avatar_url": "https://avatars.githubusercontent.com/u/105337203?v=4",
+      "profile": "https://github.com/soranature",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "cupOJoseph",
+      "name": "Joseph Schiarizzi",
+      "avatar_url": "https://avatars.githubusercontent.com/u/9449596?v=4",
+      "profile": "http://josephschiarizzi.com",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "GustavoRSSilva",
+      "name": "Gustavo Silva",
+      "avatar_url": "https://avatars.githubusercontent.com/u/8384988?v=4",
+      "profile": "https://gustavorssilva.github.io/",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "AweSamarth",
+      "name": "Samarth Saxena",
+      "avatar_url": "https://avatars.githubusercontent.com/u/72488638?v=4",
+      "profile": "https://github.com/AweSamarth",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "byhow",
+      "name": "Baihao",
+      "avatar_url": "https://avatars.githubusercontent.com/u/25713361?v=4",
+      "profile": "https://github.com/byhow",
+      "contributions": [
+        "doc",
+        "bug"
+      ]
+    },
+    {
+      "login": "stoobie",
+      "name": "Steve Goodman",
+      "avatar_url": "https://avatars.githubusercontent.com/u/39279277?v=4",
+      "profile": "https://github.com/stoobie",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "booklearner",
+      "name": "booklearner",
+      "avatar_url": "https://avatars.githubusercontent.com/u/103979114?v=4",
+      "profile": "http://booklearner.org",
+      "contributions": [
+        "doc"
+      ]
     }
   ],
   "contributorsPerLine": 7,

README.md

@@ -1198,6 +1198,15 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
   <tr>
     <td align="center"><a href="https://hack.bg"><img src="https://avatars.githubusercontent.com/u/13139371?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mradkov</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=mradkov" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/b17z"><img src="https://avatars.githubusercontent.com/u/3633484?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Bienvenido Rodriguez</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=b17z" title="Documentation">📖</a> <a href="#ideas-b17z" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="https://github.com/soranature"><img src="https://avatars.githubusercontent.com/u/105337203?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sora Nature</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=soranature" title="Documentation">📖</a></td>
+    <td align="center"><a href="http://josephschiarizzi.com"><img src="https://avatars.githubusercontent.com/u/9449596?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Joseph Schiarizzi</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=cupOJoseph" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://gustavorssilva.github.io/"><img src="https://avatars.githubusercontent.com/u/8384988?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Gustavo Silva</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AGustavoRSSilva" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://github.com/AweSamarth"><img src="https://avatars.githubusercontent.com/u/72488638?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Samarth Saxena</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=AweSamarth" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/byhow"><img src="https://avatars.githubusercontent.com/u/25713361?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Baihao</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=byhow" title="Documentation">📖</a> <a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Abyhow" title="Bug reports">🐛</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/stoobie"><img src="https://avatars.githubusercontent.com/u/39279277?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Steve Goodman</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=stoobie" title="Documentation">📖</a></td>
+    <td align="center"><a href="http://booklearner.org"><img src="https://avatars.githubusercontent.com/u/103979114?v=4?s=100" width="100px;" alt=""/><br /><sub><b>booklearner</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=booklearner" title="Documentation">📖</a></td>
   </tr>
 </table>
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ethereum-org-website",
-  "version": "3.23.0",
+  "version": "3.24.0",
   "description": "Website of ethereum.org",
   "main": "index.js",
   "repository": "[email protected]:ethereum/ethereum-org-website.git",
@@ -17,7 +17,7 @@
     "axios": "^0.21.2",
     "babel-plugin-styled-components": "^1.10.7",
     "clipboard": "^2.0.6",
-    "cross-fetch": "^3.1.3-alpha.6",
+    "cross-fetch": "^3.1.5",
     "dotenv": "^8.2.0",
     "ethereum-blockies-base64": "^1.0.2",
     "framer-motion": "^4.1.3",

src/components/CardList.js

@@ -36,7 +36,6 @@ const ItemLink = styled(Link)`
   padding: 1rem;
   width: 100%;
   color: #000000;
-  margin-bottom: 1rem;
   &:hover {
     border-radius: 4px;
     box-shadow: 0 0 1px ${(props) => props.theme.colors.primary};

src/components/Staking/StakingGuides.js

@@ -1,9 +1,16 @@
 // Libraries
 import React from "react"
+import styled from "styled-components"
 
 // Components
 import CardList from "../CardList"
 
+const StyledCardList = styled(CardList)`
+  display: flex;
+  flex-direction: column;
+  gap: 1rem;
+`
+
 const StakingGuides = () => {
   const guides = [
     {
@@ -23,7 +30,7 @@ const StakingGuides = () => {
     },
   ]
 
-  return <CardList content={guides} />
+  return <StyledCardList content={guides} />
 }
 
 export default StakingGuides

src/components/TranslationBanner.js

@@ -144,7 +144,7 @@ const TranslationBanner = ({
             </div>
             {!isPageContentEnglish && (
               <div>
-                <SecondaryButtonLink isSecondary to={`${originalPagePath}`}>
+                <SecondaryButtonLink isSecondary to={`/en${originalPagePath}`}>
                   <Translation id="translation-banner-button-see-english" />
                 </SecondaryButtonLink>
               </div>

src/content/community/get-involved/index.md

@@ -101,17 +101,18 @@ The Ethereum ecosystem is on a mission to fund public goods and impactful projec
 
 "DAOs" are decentralized autonomous organizations. These groups leverage Ethereum technology to facilitate organization and collaboration. For instance, for controlling membership, voting on proposals, or managing pooled assets. While DAOs are still experimental, they offer opportunities for you to find groups that you identify with, find collaborators, and grow your impact on the Ethereum community. [More on DAOs](/dao/)
 
+- [DAOSquare](https://www.daosquare.io) [@DAOSquare](https://twitter.com/DAOSquare) - _Promote the DAO concept in non-tech field and help people create value through DAO._
+- [Developer DAO](https://www.developerdao.com/) [@developer_dao](https://twitter.com/developer_dao) - _Community of builders who believe in collective ownership of the internet_
+- [dOrg](https://dOrg.tech) [@dOrg_tech](https://twitter.com/dOrg_tech) - _Freelancer Web3 development collective working as a DAO_
+- [DXdao](https://DXdao.eth.link/) [@DXdao](https://twitter.com/DXdao_) - _Decentralized development & governance of dApps & protocols_
+- [HausDAO](https://daohaus.club) [@nowdaoit](https://twitter.com/nowdaoit) - _Community governance of DAOhaus_
+- [Hero DAO](https://herodao.org/) [@hero_dao](https://twitter.com/hero_dao) - _Community owned superhero franchise_
 - [LexDAO](https://lexdao.coop) [@lex_DAO](https://twitter.com/lex_DAO) - _Legal engineering_
 - [Machi X](https://machix.com) [@MachiXOfficial](https://twitter.com/MachiXOfficial) - _Art community_
 - [MetaCartel](https://metacartel.org) [@Meta_Cartel](https://twitter.com/Meta_Cartel) - _DAO incubator_
 - [MetaCartel Ventures](https://metacartel.xyz) [@VENTURE_DAO](https://twitter.com/VENTURE_DAO) - _Venture for pre-seed crypto projects_
 - [MetaGame](https://metagame.wtf) [@MetaFam](https://twitter.com/MetaFam) - _MMORPG Game Mechanics for Real Life_
 - [MetaFactory](https://metafactory.ai) [@TheMetaFactory](https://twitter.com/TheMetaFactory) - _Digiphysical Apparel Brands_
-- [MolochDAO](https://molochdao.com) [@MolochDAO](https://twitter.com/MolochDAO) - _Community focused on funding Ethereum development_
 - [ΜΓΔ](https://metagammadelta.com/) (Meta Gamma Delta) [@metagammadelta](https://twitter.com/metagammadelta) - _Women-led projects_
+- [MolochDAO](https://molochdao.com) [@MolochDAO](https://twitter.com/MolochDAO) - _Community focused on funding Ethereum development_
 - [Raid Guild](https://raidguild.org) [@RaidGuild](https://twitter.com/RaidGuild) - _Collective of Web3 builders_
-- [DAOSquare](https://www.daosquare.io) [@DAOSquare](https://twitter.com/DAOSquare) - _Promote the DAO concept in non-tech field and help people create value through DAO._
-- [dOrg](https://dOrg.tech) [@dOrg_tech](https://twitter.com/dOrg_tech) - _Freelancer Web3 development collective working as a DAO_
-- [HausDAO](https://daohaus.club) [@nowdaoit](https://twitter.com/nowdaoit) - _Community governance of DAOhaus_
-- [Developer DAO](https://www.developerdao.com/) [@developer_dao](https://twitter.com/developer_dao) - _Community of builders who believe in collective ownership of the internet_
-- [DXdao](https://DXdao.eth.link/) [@DXdao](https://twitter.com/DXdao_) - _Decentralized development & governance of dApps & protocols_

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

@@ -20,7 +20,7 @@ If you want to get involved and help us grow the global Ethereum community by tr
 
 <InfoBanner emoji=":tada:">
   Check out our <Link to="/contributing/translation-program/acknowledgements/">Translator Acknowledgements</Link> page, and{" "}
-  claim your POAP token! If you translated ethereum.org in 2021, there's a unique POAP waiting for you.{" "}
+  claim your POAP token! If you translated ethereum.org in 2022, there's a unique POAP waiting for you.{" "}
   <Link to="/contributing/translation-program/acknowledgements/#poap">More on POAPs</Link>
 </InfoBanner>
 

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

@@ -40,7 +40,7 @@ Ethereum, like Bitcoin, currently uses a **proof-of-work (PoW)** consensus proto
 
 #### Block creation {#pow-block-creation}
 
-Proof-of-work is done by [miners](/developers/docs/consensus-mechanisms/pow/mining/), who compete to create new blocks full of processed transactions. The winner shares the new block with the rest of the network and earns some freshly minted ETH. The race is won by whosever computer can solve a math puzzle fastest – this produces the cryptographic link between the current block and the block that went before. Solving this puzzle is the work in "proof-of-work".
+Proof-of-work is done by [miners](/developers/docs/consensus-mechanisms/pow/mining/), who compete to create new blocks full of processed transactions. The winner shares the new block with the rest of the network and earns some freshly minted ETH. The race is won by the computer which is able to solve a math puzzle fastest – this produces the cryptographic link between the current block and the block that went before. Solving this puzzle is the work in "proof-of-work".
 
 #### Security {#pow-security}
 

src/content/developers/docs/data-and-analytics/block-explorers/index.md

@@ -20,6 +20,7 @@ You should understand the basic concepts of Ethereum so you can make sense of th
 - [Blockchair](https://blockchair.com/ethereum) –_Also available in Spanish, French, Italian, Dutch, Portuguese, Russian, Chinese, and Farsi_
 - [Blockscout](https://blockscout.com/)
 - [OKLink](https://www.oklink.com/eth)
+- [Otterscan](https://otterscan.io/)
 
 ## Data {#data}
 

src/content/developers/docs/data-structures-and-encoding/index.md

@@ -0,0 +1,33 @@
+---
+title: Data structures and encoding
+description: An overview of the fundamental Ethereum data structures.
+lang: en
+sidebar: true
+sidebarDepth: 2
+---
+
+Ethereum creates, stores and transfers large volumes of data. This data must get formatted in standardized and memory-efficient ways to allow anyone to [run a node](/run-a-node/) on relatively modest consumer-grade hardware. To achieve this, several specific data structures are used on the Ethereum stack.
+
+## Prerequisites {#prerequisites}
+
+You should understand the fundamentals of Ethereum and [client software](/developers/docs/nodes-and-clients/). Familiarity with the networking layer and [the Ethereum whitepaper](/whitepaper/) is recommended.
+
+## Data structures {#data-structures}
+
+### Patricia merkle tries {#patricia-merkle-tries}
+
+Patricia Merkle Tries are structures that encode key-value pairs into a deterministic and cryptographically authenticated trie. These are used extensively across Ethereum's execution layer.
+
+[More on Patricia Merkle Tries](/developers/docs/data-structures-and-encoding/patricia-merkle-trie)
+
+### Recursive Length Prefix {#recursive-length-prefix}
+
+Recursive Length Prefix (RLP) is a serialization method used extensively across Ethereum's execution layer.
+
+[More on RLP](/developers/docs/data-structures-and-encoding/rlp).
+
+### Simple Serialize {#simple-serialize}
+
+Simple Serialize (SSZ) is the dominant serialization format on Ethereum's consensus layer because of its compatibility with merklelization.
+
+[More on SSZ](/developers/docs/data-structures-and-encoding/ssz).