Merge branch 'dev' into homepage

Author: wackerow

.all-contributorsrc

@@ -12434,6 +12434,15 @@
       "contributions": [
         "ideas"
       ]
+    },
+    {
+      "login": "vvvvvv1vvvvvv",
+      "name": "vvvvvv1vvvvvv",
+      "avatar_url": "https://avatars.githubusercontent.com/u/86296331?v=4",
+      "profile": "https://github.com/vvvvvv1vvvvvv",
+      "contributions": [
+        "doc"
+      ]
     }
   ],
   "contributorsPerLine": 7,

README.md

@@ -1901,6 +1901,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/panditdhamdhere"><img src="https://avatars.githubusercontent.com/u/85685981?v=4?s=100" width="100px;" alt="Pandit Dhamdhere"/><br /><sub><b>Pandit Dhamdhere</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=panditdhamdhere" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://linkedin.com/in/fmarcelo"><img src="https://avatars.githubusercontent.com/u/11818521?v=4?s=100" width="100px;" alt="M@rC3L0"/><br /><sub><b>M@rC3L0</b></sub></a><br /><a href="#ideas-ferreiramarcelo" title="Ideas, Planning, & Feedback">🤔</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Refdeveloper"><img src="https://avatars.githubusercontent.com/u/87125773?v=4?s=100" width="100px;" alt="DevOFtoken"/><br /><sub><b>DevOFtoken</b></sub></a><br /><a href="#ideas-Refdeveloper" title="Ideas, Planning, & Feedback">🤔</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/vvvvvv1vvvvvv"><img src="https://avatars.githubusercontent.com/u/86296331?v=4?s=100" width="100px;" alt="vvvvvv1vvvvvv"/><br /><sub><b>vvvvvv1vvvvvv</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=vvvvvv1vvvvvv" title="Documentation">📖</a></td>
     </tr>
   </tbody>
 </table>

public/content/community/support/index.md

@@ -100,5 +100,6 @@ Most of the teams building Ethereum clients also have dedicated, public-facing,
 - [Lighthouse](https://discord.gg/cyAszAh)
 - [Teku](https://discord.gg/7hPv2T6)
 - [Lodestar](https://discord.gg/aMxzVcr)
+- [Grandine](https://discord.gg/H9XCdUSyZd)
 
 You can also [learn how to run a node here](/developers/docs/nodes-and-clients/run-a-node/).

public/content/contributing/adding-staking-products/index.md

@@ -87,7 +87,7 @@ For any custom software or smart contracts involved:
 
 For software products related to node or client setup, management or migration:
 
-**Which consensus layer clients (i.e. Lighthouse, Teku, Nimbus, Prysm) are supported?**
+**Which consensus layer clients (i.e. Lighthouse, Teku, Nimbus, Prysm, Grandine) are supported?**
 
 - Which clients are supported? Can the user choose?
 - This is used to determine the products "multi-client" score.

public/content/developers/docs/nodes-and-clients/index.md

@@ -194,12 +194,13 @@ Learn more about it by reading its [documentation](https://github.com/ethereumjs
 There are multiple consensus clients (previously known as 'Eth2' clients) to support the [consensus upgrades](/roadmap/beacon-chain/). They are responsible for all consensus-related logic including the fork-choice algorithm, processing attestations and managing [proof-of-stake](/developers/docs/consensus-mechanisms/pos) rewards and penalties.
 
 | Client                                                        | Language   | Operating systems     | Networks                                                          |
-| ------------------------------------------------------------- | ---------- | --------------------- | ----------------------------------------------------------------- |
+| ------------------------------------------------------------- | ---------- | --------------------- | ----------------------------------------------------------------- |                        |
 | [Lighthouse](https://lighthouse.sigmaprime.io/)               | Rust       | Linux, Windows, macOS | Beacon Chain, Goerli, Pyrmont, Sepolia, Ropsten, and more         |
 | [Lodestar](https://lodestar.chainsafe.io/)                    | TypeScript | Linux, Windows, macOS | Beacon Chain, Goerli, Sepolia, Ropsten, and more                  |
 | [Nimbus](https://nimbus.team/)                                | Nim        | Linux, Windows, macOS | Beacon Chain, Goerli, Sepolia, Ropsten, and more                  |
 | [Prysm](https://docs.prylabs.network/docs/getting-started/)   | Go         | Linux, Windows, macOS | Beacon Chain, Gnosis, Goerli, Pyrmont, Sepolia, Ropsten, and more |
 | [Teku](https://consensys.net/knowledge-base/ethereum-2/teku/) | Java       | Linux, Windows, macOS | Beacon Chain, Gnosis, Goerli, Sepolia, Ropsten, and more          |
+| [Grandine](https://docs.grandine.io/) (beta)                  | Rust       | Linux, Windows, macOS | Beacon Chain, Goerli, Sepolia, and more   
 
 ### Lighthouse {#lighthouse}
 
@@ -233,6 +234,12 @@ Teku offers very flexible deployment options. The beacon node and validator clie
 
 Teku is written in Java and is Apache 2.0 licensed. It is developed by the Protocols team at ConsenSys that is also responsible for Besu and Web3Signer. Learn more in [Teku docs](https://docs.teku.consensys.net/en/latest/).
 
+### Grandine {#grandine}
+
+Grandine is a consensus client implementation, written in Rust under the GPL-3.0 license. It is maintained by the Grandine Core Team and is fast, high-performance and lightweight. It fits a wide range of stakers from solo stakers running on low-resource devices such as Raspberry Pi to large institutional stakers running tens of thousands of validators.
+
+Documentation can be found in the [Grandine Book](https://docs.grandine.io/)
+
 ## Synchronization modes {#sync-modes}
 
 To follow and verify current data in the network, the Ethereum client needs to sync with the latest network state. This is done by downloading data from peers, cryptographically verifying their integrity, and building a local blockchain database.

public/content/developers/docs/storage/index.md

@@ -45,7 +45,7 @@ Platforms with contract-based persistence:
 - [Filecoin](https://docs.filecoin.io/about-filecoin/what-is-filecoin/)
 - [Skynet](https://siasky.net/)
 - [Storj](https://storj.io/)
-- [0Chain](https://0chain.net/)
+- [Züs](https://zus.network/)
 - [Crust Network](https://crust.network)
 - [Swarm](https://www.ethswarm.org/)
 - [4EVERLAND](https://www.4everland.org/)
@@ -75,7 +75,7 @@ One of the most popular ways to make sure data is retained, is to use some type
 
 Types of dStorage with a challenge mechanism:
 
-- 0Chain
+- Züs
 - Skynet
 - Arweave
 - Filecoin
@@ -88,7 +88,6 @@ There aren't great tools to measure the level of decentralization of platforms,
 
 Decentralized tools without KYC:
 
-- 0Chain (implementing a non-KYC edition)
 - Skynet
 - Arweave
 - Filecoin
@@ -110,7 +109,7 @@ Proof-of-stake based:
 
 - Ethereum
 - Filecoin
-- 0Chain
+- Züs
 - Crust Network
 
 ## Related tools {#related-tools}
@@ -145,10 +144,10 @@ Proof-of-stake based:
 - [Documentation](https://docs.arweave.org/info/)
 - [Arweave](https://github.com/ArweaveTeam/arweave/)
 
-**0chain - _0Chain is a proof-of-stake dStorage platform with sharding and blobbers._**
+**Züs - _Züs is a proof-of-stake dStorage platform with sharding and blobbers._**
 
-- [0Chain.net](https://0chain.net/)
-- [Documentation](https://docs.0chain.net/0chain/)
+- [zus.network](https://zus.network/)
+- [Documentation](https://0chaindocs.gitbook.io/zus-docs)
 - [GitHub](https://github.com/0chain/)
 
 **Crust Network - _Crust is a dStorage platform on top of the IPFS._**

public/content/governance/index.md

@@ -48,7 +48,7 @@ There are various stakeholders in the [Ethereum community](/community/), each pl
 - **Node Operators**: these people run nodes that propagate blocks and transactions, rejecting any invalid transaction or block that they come across. [More on nodes](/developers/docs/nodes-and-clients/).
 - **EIP Authors**: these people propose changes to the Ethereum protocol, in the form of Ethereum Improvement Proposals (EIPs). [More on EIPs](/eips/).
 - **Validators**: these people run nodes that can add new blocks to the Ethereum blockchain.
-- **Protocol Developers** (a.k.a. "Core Developers" ): these people maintain the various Ethereum implementations (e.g. go-ethereum, Nethermind, Besu, Erigon, Reth at the execution layer or Prysm, Lighthouse, Nimbus, Teku, Lodestar at the consensus layer). [More on Ethereum clients](/developers/docs/nodes-and-clients/).
+- **Protocol Developers** (a.k.a. "Core Developers" ): these people maintain the various Ethereum implementations (e.g. go-ethereum, Nethermind, Besu, Erigon, Reth at the execution layer or Prysm, Lighthouse, Nimbus, Teku, Lodestar, Grandine at the consensus layer). [More on Ethereum clients](/developers/docs/nodes-and-clients/).
 
 _Note: any individual can be part of multiple of these groups (e.g. a protocol developer could champion an EIP, and run a beacon chain validator, and use DeFi applications). For conceptual clarity, it is easiest to distinguish between them, though._
 

src/components/FindWallet/MobileFiltersMenu.tsx

@@ -26,8 +26,8 @@ import WalletFilterSidebar, {
 type MobileFiltersMenuProps = WalletFilterSidebarProps & {
   showMobileSidebar: boolean
   setFilters: React.Dispatch<React.SetStateAction<WalletFilter>>
-  selectedPersona: number
-  setSelectedPersona: React.Dispatch<React.SetStateAction<number>>
+  selectedPersona: number[]
+  setSelectedPersona: React.Dispatch<React.SetStateAction<number[]>>
   onOpen: () => void
   onClose: () => void
   totalWallets: number
@@ -89,6 +89,7 @@ export const MobileFiltersMenu = ({
                 selectedPersona={selectedPersona}
                 setSelectedPersona={setSelectedPersona}
                 showMobileSidebar={showMobileSidebar}
+                resetWalletFilter={resetWalletFilter}
               />
             </Box>
 

src/components/FindWallet/WalletFilterPersona.tsx

@@ -1,4 +1,4 @@
-import { MdCircle } from "react-icons/md"
+import { MdCheckBox } from "react-icons/md"
 import {
   Box,
   Flex,
@@ -19,9 +19,32 @@ import { useWalletPersonas } from "../../hooks/useWalletPersonas"
 type WalletFilterPersonaProps = {
   resetFilters: () => void
   setFilters: React.Dispatch<React.SetStateAction<WalletFilter>>
-  selectedPersona: number
-  setSelectedPersona: React.Dispatch<React.SetStateAction<number>>
+  selectedPersona: number[]
+  setSelectedPersona: React.Dispatch<React.SetStateAction<number[]>>
   showMobileSidebar: boolean
+  resetWalletFilter: React.MutableRefObject<() => void>
+}
+
+const computeFilters = (
+  selectedPersonas: number[],
+  personas: WalletPersonas[]
+) => {
+  if (selectedPersonas.length === 0) return {}
+
+  const firstPersona = personas[selectedPersonas[0]]
+  const initialFilters = firstPersona.presetFilters
+  return selectedPersonas
+    .slice(1)
+    .reduce((filters: { [key: string]: boolean }, personaId) => {
+      const persona = personas[personaId]
+      if (!persona) return filters
+
+      return Object.fromEntries(
+        Object.entries(filters).map(([key, value]) => {
+          return [key, value || persona.presetFilters[key]]
+        })
+      )
+    }, initialFilters)
 }
 
 const WalletFilterPersona = ({
@@ -30,26 +53,50 @@ const WalletFilterPersona = ({
   selectedPersona,
   setSelectedPersona,
   showMobileSidebar,
+  resetWalletFilter,
 }: WalletFilterPersonaProps) => {
   const personas = useWalletPersonas()
   const handleSelectPersona = (idx: number, persona: WalletPersonas) => {
-    if (idx === selectedPersona) {
-      resetFilters()
-
+    let newSelectedPersonas
+    if (selectedPersona.includes(idx)) {
+      newSelectedPersonas = selectedPersona.filter((persona) => persona !== idx)
       trackCustomEvent({
         eventCategory: "UserPersona",
         eventAction: `${persona.title}`,
         eventName: `${persona.title} false`,
       })
+      setSelectedPersona(newSelectedPersonas)
+      if (newSelectedPersonas.length < 1) {
+        resetFilters()
+        resetWalletFilter.current()
+      } else {
+        const newFilters = computeFilters(newSelectedPersonas, personas)
+        setFilters((prevFilters) => {
+          const combinedFilters = Object.fromEntries(
+            Object.entries(prevFilters).map(([key]) => {
+              return [key, newFilters[key]]
+            })
+          )
+          return combinedFilters as WalletFilter
+        })
+      }
     } else {
-      setSelectedPersona(idx)
-      setFilters(persona.presetFilters)
-
+      newSelectedPersonas = [...selectedPersona, idx]
       trackCustomEvent({
         eventCategory: "UserPersona",
         eventAction: `${persona.title}`,
         eventName: `${persona.title} true`,
       })
+      setSelectedPersona(newSelectedPersonas)
+      const newFilters = computeFilters(newSelectedPersonas, personas)
+      setFilters((prevFilters) => {
+        const combinedFilters = Object.fromEntries(
+          Object.entries(prevFilters).map(([key, value]) => {
+            return [key, value || newFilters[key]]
+          })
+        )
+        return combinedFilters as WalletFilter
+      })
     }
   }
 
@@ -95,16 +142,19 @@ const WalletFilterPersona = ({
               <Flex gap={2} mb={showMobileSidebar ? 0 : 1} px={1.5}>
                 <Box role="radio" aria-label={`${persona.title} filter`}>
                   <Icon
-                    as={MdCircle}
-                    borderRadius="full"
+                    as={MdCheckBox}
                     boxSize={2.5}
                     my={0}
                     mx={1}
                     fill={
-                      selectedPersona === idx ? "primary.base" : "transparent"
+                      selectedPersona.includes(idx)
+                        ? "primary.base"
+                        : "transparent"
                     }
                     background={
-                      selectedPersona === idx ? "primary.base" : "transparent"
+                      selectedPersona.includes(idx)
+                        ? "primary.base"
+                        : "transparent"
                     }
                     outline="1.5px solid"
                     outlineColor="primary.base"
@@ -135,7 +185,9 @@ const WalletFilterPersona = ({
               {!showMobileSidebar && (
                 <Text
                   p="0.4rem"
-                  color={selectedPersona === idx ? "body.base" : "body.medium"}
+                  color={
+                    selectedPersona.includes(idx) ? "body.base" : "body.medium"
+                  }
                   fontSize="sm"
                   fontWeight="normal"
                   transition="0.5s all"

src/components/FindWallet/WalletFilterSidebar.tsx

@@ -18,6 +18,9 @@ export type WalletFilterSidebarProps = Omit<BoxProps, "children"> & {
   filters: WalletFilter
   resetWalletFilter: React.MutableRefObject<() => void>
   resetFilters: () => void
+  setFilters: React.Dispatch<React.SetStateAction<WalletFilter>>
+  selectedPersona: number[]
+  setSelectedPersona: React.Dispatch<React.SetStateAction<number[]>>
   updateFilterOption: (key: unknown) => void
   updateFilterOptions: (keys: unknown, value: unknown) => void
   showMobileSidebar?: boolean