Deploy v6.9.0, v6.9.1

.all-contributorsrc

@@ -6853,7 +6853,8 @@
       "profile": "https://github.com/vdusart",
       "contributions": [
         "doc",
-        "code"
+        "code",
+        "translation"
       ]
     },
     {
@@ -9325,7 +9326,8 @@
       "profile": "https://sebastiansupreme.eth.link",
       "contributions": [
         "ideas",
-        "translation"
+        "translation",
+        "code"
       ]
     },
     {
@@ -9498,6 +9500,60 @@
       "contributions": [
         "content"
       ]
+    },
+    {
+      "login": "itsthedoom",
+      "name": "William Doom",
+      "avatar_url": "https://avatars.githubusercontent.com/u/32095408?v=4",
+      "profile": "https://github.com/itsthedoom",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "AsheBarrett",
+      "name": "AsheBarrett",
+      "avatar_url": "https://avatars.githubusercontent.com/u/117123553?v=4",
+      "profile": "https://github.com/AsheBarrett",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "Hitisha-G",
+      "name": "Hitishaa",
+      "avatar_url": "https://avatars.githubusercontent.com/u/89304585?v=4",
+      "profile": "https://github.com/Hitisha-G",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "srustagi",
+      "name": "Shiv Rustagi",
+      "avatar_url": "https://avatars.githubusercontent.com/u/11203724?v=4",
+      "profile": "https://github.com/srustagi",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "douglasmakey",
+      "name": "Douglas Makey Mendez Molero",
+      "avatar_url": "https://avatars.githubusercontent.com/u/8400576?v=4",
+      "profile": "https://www.kungfudev.com/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "ameeetgaikwad",
+      "name": "Amit Gaikwad",
+      "avatar_url": "https://avatars.githubusercontent.com/u/76063569?v=4",
+      "profile": "https://github.com/ameeetgaikwad",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

README.md

@@ -1127,7 +1127,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center"><a href="http://mihrac.com"><img src="https://avatars.githubusercontent.com/u/18642701?v=4?s=100" width="100px;" alt="Mihrac Cerrahoglu"/><br /><sub><b>Mihrac Cerrahoglu</b></sub></a><br /><a href="#ideas-mydearcode" title="Ideas, Planning, & Feedback">🤔</a></td>
       <td align="center"><a href="https://github.com/smartcontracts"><img src="https://avatars.githubusercontent.com/u/14298799?v=4?s=100" width="100px;" alt="smartcontracts"/><br /><sub><b>smartcontracts</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=smartcontracts" title="Documentation">📖</a> <a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Asmartcontracts" title="Bug reports">🐛</a></td>
       <td align="center"><a href="http://thetaclubai.com"><img src="https://avatars.githubusercontent.com/u/47613687?v=4?s=100" width="100px;" alt="Samay Lakhani"/><br /><sub><b>Samay Lakhani</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=BlockchainRev" title="Documentation">📖</a></td>
-      <td align="center"><a href="https://github.com/vdusart"><img src="https://avatars.githubusercontent.com/u/43795504?v=4?s=100" width="100px;" alt="vdusart"/><br /><sub><b>vdusart</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=vdusart" title="Documentation">📖</a> <a href="https://github.com/ethereum/ethereum-org-website/commits?author=vdusart" title="Code">💻</a></td>
+      <td align="center"><a href="https://github.com/vdusart"><img src="https://avatars.githubusercontent.com/u/43795504?v=4?s=100" width="100px;" alt="vdusart"/><br /><sub><b>vdusart</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=vdusart" title="Documentation">📖</a> <a href="https://github.com/ethereum/ethereum-org-website/commits?author=vdusart" title="Code">💻</a> <a href="#translation-vdusart" title="Translation">🌍</a></td>
     </tr>
     <tr>
       <td align="center"><a href="https://github.com/wd021"><img src="https://avatars.githubusercontent.com/u/2752586?v=4?s=100" width="100px;" alt="wd021"/><br /><sub><b>wd021</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=wd021" title="Documentation">📖</a> <a href="https://github.com/ethereum/ethereum-org-website/commits?author=wd021" title="Code">💻</a></td>
@@ -1469,7 +1469,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center"><a href="http://frankiefab.com"><img src="https://avatars.githubusercontent.com/u/46662771?v=4?s=100" width="100px;" alt="Franklin Ohaegbulam"/><br /><sub><b>Franklin Ohaegbulam</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=frankiefab100" title="Code">💻</a></td>
       <td align="center"><a href="https://github.com/soos3d"><img src="https://avatars.githubusercontent.com/u/99700157?v=4?s=100" width="100px;" alt="Soos3D"/><br /><sub><b>Soos3D</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=soos3d" title="Documentation">📖</a></td>
       <td align="center"><a href="http://keybase.io/minhoryang"><img src="https://avatars.githubusercontent.com/u/1270855?v=4?s=100" width="100px;" alt="Minho Ryang"/><br /><sub><b>Minho Ryang</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=minhoryang" title="Code">💻</a></td>
-      <td align="center"><a href="https://sebastiansupreme.eth.link"><img src="https://avatars.githubusercontent.com/u/106926150?v=4?s=100" width="100px;" alt="Sebastian Supreme"/><br /><sub><b>Sebastian Supreme</b></sub></a><br /><a href="#ideas-SebastianSupreme" title="Ideas, Planning, & Feedback">🤔</a> <a href="#translation-SebastianSupreme" title="Translation">🌍</a></td>
+      <td align="center"><a href="https://sebastiansupreme.eth.link"><img src="https://avatars.githubusercontent.com/u/106926150?v=4?s=100" width="100px;" alt="Sebastian Supreme"/><br /><sub><b>Sebastian Supreme</b></sub></a><br /><a href="#ideas-SebastianSupreme" title="Ideas, Planning, & Feedback">🤔</a> <a href="#translation-SebastianSupreme" title="Translation">🌍</a> <a href="https://github.com/ethereum/ethereum-org-website/commits?author=SebastianSupreme" title="Code">💻</a></td>
     </tr>
     <tr>
       <td align="center"><a href="https://github.com/jhhornn"><img src="https://avatars.githubusercontent.com/u/66667958?v=4?s=100" width="100px;" alt="Awosise Oluwaseun"/><br /><sub><b>Awosise Oluwaseun</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=jhhornn" title="Documentation">📖</a></td>
@@ -1495,6 +1495,14 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center"><a href="https://github.com/benlazzero"><img src="https://avatars.githubusercontent.com/u/85390423?v=4?s=100" width="100px;" alt="benlazzero"/><br /><sub><b>benlazzero</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=benlazzero" title="Code">💻</a></td>
       <td align="center"><a href="https://github.com/ankitzm"><img src="https://avatars.githubusercontent.com/u/66105983?v=4?s=100" width="100px;" alt="Ankit Singh"/><br /><sub><b>Ankit Singh</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=ankitzm" title="Code">💻</a></td>
       <td align="center"><a href="https://github.com/mhairimcalpine"><img src="https://avatars.githubusercontent.com/u/76955258?v=4?s=100" width="100px;" alt="mhairimcalpine"/><br /><sub><b>mhairimcalpine</b></sub></a><br /><a href="#content-mhairimcalpine" title="Content">🖋</a></td>
+      <td align="center"><a href="https://github.com/itsthedoom"><img src="https://avatars.githubusercontent.com/u/32095408?v=4?s=100" width="100px;" alt="William Doom"/><br /><sub><b>William Doom</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=itsthedoom" title="Documentation">📖</a></td>
+      <td align="center"><a href="https://github.com/AsheBarrett"><img src="https://avatars.githubusercontent.com/u/117123553?v=4?s=100" width="100px;" alt="AsheBarrett"/><br /><sub><b>AsheBarrett</b></sub></a><br /><a href="#translation-AsheBarrett" title="Translation">🌍</a></td>
+    </tr>
+    <tr>
+      <td align="center"><a href="https://github.com/Hitisha-G"><img src="https://avatars.githubusercontent.com/u/89304585?v=4?s=100" width="100px;" alt="Hitishaa"/><br /><sub><b>Hitishaa</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=Hitisha-G" title="Documentation">📖</a></td>
+      <td align="center"><a href="https://github.com/srustagi"><img src="https://avatars.githubusercontent.com/u/11203724?v=4?s=100" width="100px;" alt="Shiv Rustagi"/><br /><sub><b>Shiv Rustagi</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=srustagi" title="Documentation">📖</a></td>
+      <td align="center"><a href="https://www.kungfudev.com/"><img src="https://avatars.githubusercontent.com/u/8400576?v=4?s=100" width="100px;" alt="Douglas Makey Mendez Molero"/><br /><sub><b>Douglas Makey Mendez Molero</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=douglasmakey" title="Code">💻</a></td>
+      <td align="center"><a href="https://github.com/ameeetgaikwad"><img src="https://avatars.githubusercontent.com/u/76063569?v=4?s=100" width="100px;" alt="Amit Gaikwad"/><br /><sub><b>Amit Gaikwad</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=ameeetgaikwad" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

package.json

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

src/components/EnergyConsumptionChart.tsx

@@ -64,27 +64,39 @@ const EnergyConsumptionChart: React.FC = () => {
       color: "#FF0000",
     },
     {
-      name: "Gold mining",
+      name: "Gold mining (Galaxy Digital)",
       amount: 240,
       color: "#D7B14A",
       breakpoint: mediumBreakpoint,
     },
     {
-      name: "BTC PoW",
+      name: "Global data centers",
       amount: 200,
-      color: "#F2A900",
+      color: "#D7B14A",
+      breakpoint: mediumBreakpoint,
     },
     {
-      name: "ETH PoW",
-      amount: 112,
-      color: "#C1B6F5",
+      name: "Gold mining (CBECI)",
+      amount: 130,
+      color: "#D7B14A",
+      breakpoint: mediumBreakpoint,
+    },
+    {
+      name: "BTC PoW",
+      amount: 100,
+      color: "#F2A900",
     },
     {
       name: "Netflix",
       amount: 94,
       color: "#E50914",
       breakpoint: smallBreakpoint,
     },
+    {
+      name: "ETH PoW",
+      amount: 78,
+      color: "#C1B6F5",
+    },
     {
       name: "Gaming in the US",
       amount: 34,
@@ -99,7 +111,7 @@ const EnergyConsumptionChart: React.FC = () => {
     },
     {
       name: "ETH PoS",
-      amount: 0.01,
+      amount: 0.0026,
       color: "#C1B6F5",
     },
   ]

src/components/GhostCard.tsx

@@ -1,45 +1,40 @@
 import React from "react"
-import styled from "@emotion/styled"
-
-const Container = styled.div`
-  position: relative;
-  margin-top: 0.5rem;
-  align-self: stretch;
-`
-
-const BaseCard = styled.div`
-  height: 100%;
-  width: 100%;
-  border-radius: 2px;
-`
-
-const Card = styled(BaseCard)`
-  z-index: 2;
-  padding: 1.5rem;
-  text-align: left;
-  border: 1px solid ${(props) => props.theme.colors.border};
-  background-color: ${(props) => props.theme.colors.ghostCardBackground};
-`
-
-const Ghost = styled(BaseCard)`
-  z-index: -1;
-  position: absolute;
-  bottom: 0.5rem;
-  left: 0.5rem;
-  border: 1px solid ${(props) => props.theme.colors.border};
-  background-color: ${(props) => props.theme.colors.ghostCardGhost};
-`
+import { Box } from "@chakra-ui/react"
 
 export interface IProps {
   children?: React.ReactNode
   className?: string
 }
 
 const GhostCard: React.FC<IProps> = ({ children, className }) => (
-  <Container className={className}>
-    <Ghost />
-    <Card className="ghost-card-base">{children}</Card>
-  </Container>
+  <Box position="relative" mt="2" alignSelf="stretch" className={className}>
+    <Box
+      zIndex="hide"
+      position="absolute"
+      backgroundColor="ghostCardGhost"
+      bottom="2"
+      left="2"
+      border="1px solid"
+      borderColor="border"
+      borderRadius="2px"
+      height="full"
+      width="full"
+    />
+    <Box
+      className="ghost-card-base"
+      height="full"
+      width="full"
+      borderRadius="2px"
+      zIndex={2}
+      padding="6"
+      background="ghostCardBackground"
+      border="1px solid"
+      borderColor="border"
+      textAlign="left"
+    >
+      {children}
+    </Box>
+  </Box>
 )
 
 export default GhostCard

src/components/HorizontalCard.tsx

@@ -1,26 +1,6 @@
 import React, { ReactNode } from "react"
-import styled from "@emotion/styled"
-import Emoji from "./OldEmoji"
-
-const StyledCard = styled.div`
-  border-radius: 4px;
-  display: flex;
-`
-
-const Content = styled.div`
-  flex: 0 1 75%;
-  margin-left: 2rem;
-`
-
-const Description = styled.p`
-  opacity: 0.8;
-  margin-top: -1rem;
-  margin-bottom: 0.5rem;
-`
-
-const Title = styled.p`
-  font-size: 1.25rem;
-`
+import Emoji from "./Emoji"
+import { Text, Box, Flex } from "@chakra-ui/react"
 
 export interface IProps {
   children?: React.ReactNode
@@ -39,14 +19,16 @@ const HorizontalCard: React.FC<IProps> = ({
   className,
   emojiSize,
 }) => (
-  <StyledCard className={className}>
-    <Emoji size={emojiSize} text={emoji} />
-    <Content>
-      <Title>{title}</Title>
-      <Description>{description}</Description>
+  <Flex borderRadius="base" className={className}>
+    <Emoji fontSize={`${emojiSize}rem`} text={emoji} />
+    <Box flexGrow="0" flexShrink="1" flexBasis="75%" ml="8">
+      <Text fontSize="lg">{title}</Text>
+      <Text opacity="0.8" mt="-4" mb="2">
+        {description}
+      </Text>
       {children}
-    </Content>
-  </StyledCard>
+    </Box>
+  </Flex>
 )
 
 export default HorizontalCard

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

@@ -25,6 +25,7 @@ Do you have a background in mathematics, cryptography, or economics? You might b
 
 - [Challenges.ethereum.org](https://challenges.ethereum.org/) - a series of high-value research bounties, where you can earn >$100,000 USD
 - [Ethresear.ch](https://ethresear.ch) - Ethereum’s primary forum for research, and the world’s most influential forum for cryptoeconomics
+- [EF Research AMA](https://old.reddit.com/r/ethereum/comments/vrx9xe/ama_we_are_ef_research_pt_8_07_july_2022) - An ongoing Q&A series with researchers. As each next part opens, anyone can post questions.
 - [Ecosystem Support Program's wishlist](https://esp.ethereum.foundation/wishlist/) - research areas where the Ethereum Ecosystem Support Program is actively seeking grant applications
 
 [Explore more active areas of research](/community/research/).

src/content/community/online/index.md

@@ -36,7 +36,7 @@ Hundreds of thousands of Ethereum enthusiasts gather in these online forums to s
 ## YouTube and Twitter {#youtube-and-twitter}
 
 <SocialListItem socialIcon="youtube"><Link to="https://www.youtube.com/c/EthereumFoundation">Ethereum Foundation</Link> - Keep up to date with the latest from the Ethereum Foundation</SocialListItem>
-<SocialListItem socialIcon="twitter"><Link to="https://twitter.com/ethereum">@ethereum</Link> - Offical account of the Ethereum Foundation</SocialListItem>
+<SocialListItem socialIcon="twitter"><Link to="https://twitter.com/ethereum">@ethereum</Link> - Official account of the Ethereum Foundation</SocialListItem>
 <SocialListItem socialIcon="twitter"><Link to="https://twitter.com/ethdotorg">@ethdotorg</Link> - The portal to Ethereum, built for our growing global community</SocialListItem>
 <SocialListItem socialIcon="webpage"><Link to="https://hive.one/c/ethereum?page=1">List of influential Ethereum twitter accounts</Link></SocialListItem>
 

src/content/developers/docs/accounts/index.md

@@ -70,19 +70,22 @@ Example:
 
 The public key is generated from the private key using the [Elliptic Curve Digital Signature Algorithm](https://wikipedia.org/wiki/Elliptic_Curve_Digital_Signature_Algorithm). You get a public address for your account by taking the last 20 bytes of the Keccak-256 hash of the public key and adding `0x` to the beginning.
 
-Here's an example of creating an account in the console using GETH's `personal_newAccount`
+The following example shows how to use a signing tool called [Clef](https://geth.ethereum.org/docs/clef/introduction) to generate a new account. Clef is an account management and signing tool that comes bundled with the Ethereum client, [Geth](https://geth.ethereum.org). The `clef newaccount` command creates a new key pair and saves them in an encrypted keystore.
 
-```go
-> personal.newAccount()
-Passphrase:
-Repeat passphrase:
-"0x5e97870f263700f46aa00d967821199b9bc5a120"
+```
+> clef newaccount --keystore <path>
+
+Please enter a password for the new account to be created:
+> <password>
 
-> personal.newAccount("h4ck3r")
-"0x3d80b31a78c30fc628f20b2c89d7ddbf6e53cedc"
+------------
+INFO [10-28|16:19:09.156] Your new key was generated       address=0x5e97870f263700f46aa00d967821199b9bc5a120
+WARN [10-28|16:19:09.306] Please backup your key file      path=/home/user/go-ethereum/data/keystore/UTC--2022-10-28T15-19-08.000825927Z--5e97870f263700f46aa00d967821199b9bc5a120
+WARN [10-28|16:19:09.306] Please remember your password!
+Generated account 0x5e97870f263700f46aa00d967821199b9bc5a120
 ```
 
-[GETH documentation](https://geth.ethereum.org/docs)
+[Geth documentation](https://geth.ethereum.org/docs)
 
 It is possible to derive new public keys from your private key but you cannot derive a private key from public keys. This means it's vital to keep a private key safe and, as the name suggests, **PRIVATE**.