Merge pull request #10456 from ethereum/dev

Author: corwintines

.all-contributorsrc

@@ -10172,6 +10172,44 @@
       "contributions": [
         "content"
       ]
+    },
+    {
+      "login": "megatheikal",
+      "name": "megatheikal",
+      "avatar_url": "https://avatars.githubusercontent.com/u/64621442?v=4",
+      "profile": "https://megatheikal.com",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "stephenfire",
+      "name": "Stephen Guo",
+      "avatar_url": "https://avatars.githubusercontent.com/u/17247036?v=4",
+      "profile": "https://github.com/stephenfire",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "feuGeneA",
+      "name": "F. Eugene Aumson",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7883777?v=4",
+      "profile": "http://aumson.org/gene",
+      "contributions": [
+        "bug",
+        "content"
+      ]
+    },
+    {
+      "login": "rpalakkal",
+      "name": "Roshan",
+      "avatar_url": "https://avatars.githubusercontent.com/u/19766713?v=4",
+      "profile": "https://github.com/rpalakkal",
+      "contributions": [
+        "content",
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,
@@ -10180,5 +10218,6 @@
   "repoType": "github",
   "repoHost": "https://github.com",
   "skipCi": true,
-  "commitConvention": "angular"
+  "commitConvention": "angular",
+  "commitType": "docs"
 }

README.md

@@ -1595,6 +1595,10 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://changwu.me/"><img src="https://avatars.githubusercontent.com/u/1557364?v=4?s=100" width="100px;" alt="changwu"/><br /><sub><b>changwu</b></sub></a><br /><a href="#content-changwu-tw" title="Content">🖋</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://uniyj.eth"><img src="https://avatars.githubusercontent.com/u/84749041?v=4?s=100" width="100px;" alt="yj"/><br /><sub><b>yj</b></sub></a><br /><a href="#content-uniyj" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://megatheikal.com"><img src="https://avatars.githubusercontent.com/u/64621442?v=4?s=100" width="100px;" alt="megatheikal"/><br /><sub><b>megatheikal</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Amegatheikal" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/stephenfire"><img src="https://avatars.githubusercontent.com/u/17247036?v=4?s=100" width="100px;" alt="Stephen Guo"/><br /><sub><b>Stephen Guo</b></sub></a><br /><a href="#translation-stephenfire" title="Translation">🌍</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://aumson.org/gene"><img src="https://avatars.githubusercontent.com/u/7883777?v=4?s=100" width="100px;" alt="F. Eugene Aumson"/><br /><sub><b>F. Eugene Aumson</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AfeuGeneA" title="Bug reports">🐛</a> <a href="#content-feuGeneA" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/rpalakkal"><img src="https://avatars.githubusercontent.com/u/19766713?v=4?s=100" width="100px;" alt="Roshan"/><br /><sub><b>Roshan</b></sub></a><br /><a href="#content-rpalakkal" title="Content">🖋</a> <a href="https://github.com/ethereum/ethereum-org-website/commits?author=rpalakkal" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ethereum-org-website",
-  "version": "7.14.0",
+  "version": "7.14.1",
   "description": "Website of ethereum.org",
   "main": "index.js",
   "repository": "[email protected]:ethereum/ethereum-org-website.git",

redirects.json

@@ -342,9 +342,5 @@
   {
     "fromPath": "/*/staking/withdraws",
     "toPath": "/:splat/staking/withdrawals/"
-  },
-  {
-    "fromPath": "/*/writing-cohort",
-    "toPath": "https://ethereumwriterscohort.carrd.co/"
   }
 ]

src/@chakra-ui/gatsby-plugin/components/Tag/index.ts

@@ -15,9 +15,11 @@ const { Tag: tagTheme } = theme.components
 const baseStyleContainer = defineMergeStyles(tagTheme.baseStyle?.container, {
   border: "1px",
   borderColor: "transparent",
+  boxSizing: "border-box",
   gap: 1,
   borderRadius: "full",
   px: 2,
+  py: 0.5,
   minH: 8,
   fontWeight: 300,
   "&:any-link": {
@@ -35,7 +37,7 @@ const baseStyleLabel = defineStyle({
   fontSize: "xs",
   textTransform: "uppercase",
   textAlign: "center",
-  lineHeight: 1,
+  lineHeight: 1.6,
 })
 
 const baseStyleCloseButton = defineStyle({

src/components/Banners/Implementations/WritersCohortBanner.tsx

@@ -229,7 +229,20 @@ export const useStakingConsiderations = ({ page }: IProps) => {
         matomo: {
           eventCategory: `StakingConsiderations`,
           eventAction: `Clicked`,
-          eventName: "clicked saas diverse clients",
+          eventName: "clicked saas diverse consensus clients",
+        },
+      },
+      {
+        title: t("page-staking-considerations-saas-8-title"),
+        description: t("page-staking-considerations-saas-8-description"),
+        valid: t("page-staking-considerations-saas-8-valid"),
+        caution: t("page-staking-considerations-saas-8-caution"),
+        warning: t("page-staking-considerations-saas-8-warning"),
+        Svg: MultiClientIcon,
+        matomo: {
+          eventCategory: `StakingConsiderations`,
+          eventAction: `Clicked`,
+          eventName: "clicked saas diverse execution clients",
         },
       },
       {
@@ -335,7 +348,20 @@ export const useStakingConsiderations = ({ page }: IProps) => {
         matomo: {
           eventCategory: `StakingConsiderations`,
           eventAction: `Clicked`,
-          eventName: "clicked pooled diverse clients",
+          eventName: "clicked pooled diverse execution clients",
+        },
+      },
+      {
+        title: t("page-staking-considerations-saas-8-title"),
+        description: t("page-staking-considerations-pools-9-description"),
+        valid: t("page-staking-considerations-saas-8-valid"),
+        caution: t("page-staking-considerations-saas-8-caution"),
+        warning: t("page-staking-considerations-saas-8-warning"),
+        Svg: MultiClientIcon,
+        matomo: {
+          eventCategory: `StakingConsiderations`,
+          eventAction: `Clicked`,
+          eventName: "clicked pooled diverse consensus clients",
         },
       },
       {

src/components/Staking/StakingConsiderations/use-staking-considerations.tsx

@@ -104,7 +104,8 @@ type Product = {
   permissionless: FlagType
   permissionlessNodes: FlagType
   multiClient: FlagType
-  diverseClients: FlagType
+  consensusDiversity: FlagType
+  executionDiversity: FlagType
   economical: FlagType
   matomo: MatomoEventOptions
 }
@@ -131,7 +132,8 @@ const StakingProductCard: React.FC<ICardProps> = ({
     permissionless,
     permissionlessNodes,
     multiClient,
-    diverseClients,
+    consensusDiversity,
+    executionDiversity,
     economical,
     matomo,
   },
@@ -172,7 +174,11 @@ const StakingProductCard: React.FC<ICardProps> = ({
     },
     {
       label: <Translation id="page-staking-considerations-saas-7-title" />,
-      status: diverseClients,
+      status: executionDiversity,
+    },
+    {
+      label: <Translation id="page-staking-considerations-saas-8-title" />,
+      status: consensusDiversity,
     },
     {
       label: <Translation id="page-staking-considerations-solo-8-title" />,
@@ -318,12 +324,8 @@ const StakingProductCardGrid: React.FC<IProps> = ({ category }) => {
     return product.multiClient === FlagType.VALID ? 1 : 0
   }
 
-  const scoreDiverseClients = (product: Product): 2 | 1 | 0 => {
-    return product.diverseClients === FlagType.VALID
-      ? 2
-      : product.diverseClients === FlagType.WARNING
-      ? 1
-      : 0
+  const scoreClientDiversity = (flag: FlagType): 2 | 1 | 0 => {
+    return flag === FlagType.VALID ? 2 : flag === FlagType.WARNING ? 1 : 0
   }
 
   const scoreEconomical = (product: Product): 1 | 0 => {
@@ -340,7 +342,8 @@ const StakingProductCardGrid: React.FC<IProps> = ({ category }) => {
     score += scorePermissionless(product)
     score += scorePermissionlessNodes(product)
     score += scoreMultiClient(product)
-    score += scoreDiverseClients(product)
+    score += scoreClientDiversity(product.executionDiversity)
+    score += scoreClientDiversity(product.consensusDiversity)
     score += scoreEconomical(product)
     return score
   }
@@ -421,7 +424,12 @@ const StakingProductCardGrid: React.FC<IProps> = ({ category }) => {
           permissionlessNodes: getFlagFromBoolean(
             listing.hasPermissionlessNodes
           ),
-          diverseClients: getDiversityOfClients(listing.pctMajorityClient),
+          executionDiversity: getDiversityOfClients(
+            listing.pctMajorityExecutionClient
+          ),
+          consensusDiversity: getDiversityOfClients(
+            listing.pctMajorityConsensusClient
+          ),
           liquidityToken: getFlagFromBoolean(listing.tokens?.length),
           minEth: listing.minEth,
         }))
@@ -452,7 +460,12 @@ const StakingProductCardGrid: React.FC<IProps> = ({ category }) => {
           ...getTagProperties(listing),
           ...getSharedSecurityProperties(listing),
           permissionless: getFlagFromBoolean(listing.isPermissionless),
-          diverseClients: getDiversityOfClients(listing.pctMajorityClient),
+          executionDiversity: getDiversityOfClients(
+            listing.pctMajorityExecutionClient
+          ),
+          consensusDiversity: getDiversityOfClients(
+            listing.pctMajorityConsensusClient
+          ),
           selfCustody: getFlagFromBoolean(listing.isSelfCustody),
           minEth: listing.minEth,
         }))

src/components/Staking/StakingProductsCardGrid.tsx

@@ -2,7 +2,7 @@ import React from "react"
 import { VStack, Icon, Box, Flex, Text } from "@chakra-ui/react"
 import { MdInfoOutline } from "react-icons/md"
 import { kebabCase } from "lodash"
-import { ResponsiveContainer, AreaChart, Area, XAxis } from "recharts"
+import { ResponsiveContainer, AreaChart, Area, XAxis, YAxis } from "recharts"
 import Tooltip from "../Tooltip"
 import Translation from "../Translation"
 import Link from "../Link"
@@ -60,6 +60,16 @@ export const GridItem: React.FC<IGridItemProps> = ({ metric, dir }) => {
     })
   }
 
+  const minValue = state.data.reduce(
+    (prev, { value }) => (prev < value ? prev : value),
+    1e42
+  )
+
+  const maxValue = state.data.reduce(
+    (prev, { value }) => (prev > value ? prev : value),
+    0
+  )
+
   const chart: React.ReactNode = (
     <ResponsiveContainer width="100%" height="100%">
       <AreaChart
@@ -96,6 +106,7 @@ export const GridItem: React.FC<IGridItemProps> = ({ metric, dir }) => {
           fill={`url(#colorUv-${kebabCase(title)})`}
           connectNulls
         />
+        <YAxis type="number" domain={[minValue, maxValue]} width={0} />
         <XAxis dataKey="timestamp" axisLine={false} tick={false} />
       </AreaChart>
     </ResponsiveContainer>