Merge branch 'dev' into dencun

.all-contributorsrc

@@ -11260,6 +11260,15 @@
         "content",
         "design"
       ]
+    },
+    {
+      "login": "yusuf-musleh",
+      "name": "Yusuf Musleh",
+      "avatar_url": "https://avatars.githubusercontent.com/u/6829768?v=4",
+      "profile": "http://www.ymusleh.com",
+      "contributions": [
+        "content"
+      ]
     }
   ],
   "contributorsPerLine": 7,

README.md

@@ -1753,6 +1753,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/enjoyooor"><img src="https://avatars.githubusercontent.com/u/147568088?v=4?s=100" width="100px;" alt="enjoyooor"/><br /><sub><b>enjoyooor</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=enjoyooor" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://ethereum.org"><img src="https://avatars.githubusercontent.com/u/100724231?v=4?s=100" width="100px;" alt="Jakub"/><br /><sub><b>Jakub</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=konopkja" title="Documentation">📖</a> <a href="#content-konopkja" title="Content">🖋</a> <a href="#design-konopkja" title="Design">🎨</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://www.ymusleh.com"><img src="https://avatars.githubusercontent.com/u/6829768?v=4?s=100" width="100px;" alt="Yusuf Musleh"/><br /><sub><b>Yusuf Musleh</b></sub></a><br /><a href="#content-yusuf-musleh" title="Content">🖋</a></td>
     </tr>
   </tbody>
 </table>

package.json

@@ -86,11 +86,11 @@
     "storybook": "7.6.6",
     "storybook-react-i18next": "^2.0.9",
     "ts-node": "^10.9.1",
-    "typescript": "^5.1.6",
+    "typescript": "^5.4.2",
     "unified": "^10.0.0",
     "unist-util-visit": "^5.0.0"
   },
   "resolutions": {
     "jackspeak": "2.1.1"
   }
-}
+}

public/content/contributing/translation-program/content-buckets/index.md

@@ -23,6 +23,7 @@ Below is a breakdown of the website pages each content bucket contains.
 - [Get ETH](/get-eth/)
 - [Wallets](/wallets/)
 - [Find wallets](/wallets/find-wallet/)
+- [Network fees](/gas/)
 
 ## 3) Exploring {#exploring}
 
@@ -47,7 +48,8 @@ Below is a breakdown of the website pages each content bucket contains.
 - [Introduction to smart contracts](/smart-contracts/)
 - [Decentralized identity](/decentralized-identity/)
 - [Decentralized social networks](/social-networks/)
-- [Decentralized science (DeSci))](/desci/)
+- [Decentralized science (DeSci)](/desci/)
+- [Regenerative finance (ReFi)](/refi/)
 
 ## 6) Staking pages {#staking-pages}
 
@@ -57,6 +59,7 @@ Below is a breakdown of the website pages each content bucket contains.
 - [Staking as a service](/staking/saas/)
 - [Staking deposit contract](/staking/deposit-contract/)
 - [Staking withdrawals](/staking/withdrawals/)
+- [Distributed validator technology](/dvt/)
 
 ## 7) Learn pages {#learn-pages}
 
@@ -76,6 +79,7 @@ Below is a breakdown of the website pages each content bucket contains.
 - [How to revoke smart contract access to your crypto funds](/guides/how-to-revoke-token-access/)
 - [How to bridge tokens to layer 2](/guides/how-to-use-a-bridge/)
 - [How to swap tokens](/guides/how-to-swap-tokens/)
+- [How to identify scam tokens](/guides/how-to-id-scam-tokens/)
 - [Learning quizzes](/quizzes/)
 
 ## 9) Upgrades {#upgrades}
@@ -97,6 +101,7 @@ Below is a breakdown of the website pages each content bucket contains.
 - [Account abstraction](/roadmap/account-abstraction/)
 - [Verkle trees](/roadmap/verkle-trees/)
 - [Statelessness, state expiry and history expiry](/roadmap/statelessness/)
+- [How The Merge impacted ETH supply](/roadmap/merge/issuance/)
 
 ## 10) Community pages {#community-pages}
 
@@ -107,6 +112,7 @@ Below is a breakdown of the website pages each content bucket contains.
 - [Online communities](/community/online/)
 - [Ethereum support](/community/support/)
 - [Community hub](/community/)
+- [Code of conduct](/community/code-of-conduct/#code-of-conduct)
 
 ## 11) Foundational developer docs {#foundational-docs}
 
@@ -147,6 +153,7 @@ Below is a breakdown of the website pages each content bucket contains.
 - [Proof-of-stake rewards and penalties](/developers/docs/consensus-mechanisms/pos/rewards-and-penalties/)
 - [Gasper](/developers/docs/consensus-mechanisms/pos/gasper/)
 - [Weak subjectivity](/developers/docs/consensus-mechanisms/pos/weak-subjectivity/)
+- [Proof-of-stake vs. proof-of-work](/developers/docs/consensus-mechanisms/pos/pos-vs-pow/)
 
 ## 14) Foundational docs - Proof-of-Work {#PoW}
 
@@ -220,6 +227,7 @@ Below is a breakdown of the website pages each content bucket contains.
 - [Oracles](/developers/docs/oracles/)
 - [Bridges](/developers/docs/bridges/)
 - [Data availability](/developers/docs/data-availability/)
+- [Design and UX in Web3](/developers/docs/design-and-ux/)
 
 ## 21) Advanced developer docs - Scaling {#scaling-docs}
 
@@ -239,12 +247,8 @@ Below is a breakdown of the website pages each content bucket contains.
 - [Recursive-length prefix (RLP) serialization](/developers/docs/data-structures-and-encoding/rlp/)
 - [Network addresses](/developers/docs/networking-layer/network-addresses/)
 - [Simple serialize](/developers/docs/data-structures-and-encoding/ssz/)
-- [Mining algorithms](/developers/docs/consensus-mechanisms/pow/mining/mining-algorithms/)
-- [Dagger-Hashimoto](/developers/docs/consensus-mechanisms/pow/mining/mining-algorithms/dagger-hashimoto/)
-- [Ethash](/developers/docs/consensus-mechanisms/pow/mining/mining-algorithms/ethash/)
-- [Gasper](/developers/docs/consensus-mechanisms/pos/gasper/)
-- [Weak subjectivity](/developers/docs/consensus-mechanisms/pos/weak-subjectivity/)
 - [Web3 secret storage definition](/developers/docs/data-structures-and-encoding/web3-secret-storage/)
+- [The Portal network](/developers/docs/networking-layer/portal-network/)
 
 ## 23) Miscellaneous {#miscellaneous}
 
@@ -253,6 +257,7 @@ Below is a breakdown of the website pages each content bucket contains.
 - [Private Ethereum](/enterprise/private-ethereum/)
 - [Brand assets](/assets/)
 - [About the Ethereum Foundation](/foundation/)
+- [Bug bounty program](/bug-bounty/)
 
 ## 24) Contributing {#contributing}
 
@@ -266,6 +271,9 @@ Below is a breakdown of the website pages each content bucket contains.
 - [Adding content resources](/contributing/content-resources/)
 - [Adding DeSci projects](/contributing/adding-desci-projects/)
 - [Adding wallets](/contributing/adding-wallets/)
+- [Adding a quiz](/contributing/quizzes/)
+- [Adding design resources](/contributing/design/adding-design-resources/)
+- [Design contribution to ethereum.org](/contributing/design/)
 - [Design principles](/contributing/design-principles/)
 - [Translation Program](/contributing/translation-program/)
 - [Translation guide](/contributing/translation-program/translation-guide/)
@@ -282,7 +290,6 @@ Below is a breakdown of the website pages each content bucket contains.
 - [How to write & deploy an NFT (Part 1/3 of NFT tutorial series)](/developers/tutorials/how-to-write-and-deploy-an-nft/)
 - [How to mint an NFT (Part 2/3 of NFT tutorial series)](/developers/tutorials/how-to-mint-an-nft/)
 - [How to view your NFT in your wallet (Part 3/3 of NFT tutorial series)](/developers/tutorials/how-to-view-nft-in-metamask/)
-- [Transfers and approval of ERC-20 tokens from a solidity smart contract](/developers/tutorials/transfers-and-approval-of-erc-20-tokens-from-a-solidity-smart-contract/)
 - [Understand the ERC-20 token smart contract](/developers/tutorials/understand-the-erc-20-token-smart-contract/)
 - [Uniswap-v2 contract walkthrough](/developers/tutorials/uniswap-v2-annotated-code/)
 - Submit a tutorial
@@ -299,11 +306,13 @@ Below is a breakdown of the website pages each content bucket contains.
 - [Sending tokens using ethers.js](/developers/tutorials/send-token-ethersjs/)
 - [The Graph: Fixing Web3 data querying](/developers/tutorials/the-graph-fixing-web3-data-querying/)
 - [Transfers and approval of ERC-20 tokens from a Solidity smart contract](/developers/tutorials/transfers-and-approval-of-erc-20-tokens-from-a-solidity-smart-contract/)
+- [Understanding the Yellowpaper's EVM specifications](/developers/tutorials/yellow-paper-evm/)
 
 ## 27) Developer tutorials 3 {#tutorials-3}
 
 - [A guide to smart contract security tools](/developers/tutorials/guide-to-smart-contract-security-tools/)
 - [All you can cache](/developers/tutorials/all-you-can-cache/)
+- [EIP-1271: Signing and verifying smart contract signatures](/developers/tutorials/eip-1271-smart-contract-signatures/)
 - [ERC-20 contract walkthrough](/developers/tutorials/erc20-annotated-code/)
 - [ERC-20 with safety rails](/developers/tutorials/erc20-with-safety-rails/)
 - [Getting Started with Ethereum Development](/developers/tutorials/getting-started-with-ethereum-development-using-alchemy/)

public/content/history/index.md

@@ -100,7 +100,7 @@ Notably this includes EIP-4844, known as **Proto-Danksharding**, which significa
 
 #### Deneb summary {#deneb-summary}
 
-The Deneb upgrade contains a set of improvements to Ethereum's _consensus_ aimed towards improving scalability. This upgrade comes in tandem with the Deneb execution upgrades to enable Proto-Danksharding (EIP-4844), along with other improvements to the Beacon Chain.
+The Deneb upgrade contains a set of improvements to Ethereum's _consensus_ aimed towards improving scalability. This upgrade comes in tandem with the Cancun execution upgrades to enable Proto-Danksharding (EIP-4844), along with other improvements to the Beacon Chain.
 
 Pre-generated signed "voluntary exit messages" no longer expire, thus giving more control to users staking their funds with a third-party node operator. With this signed exit message, stakers can delegate node operation while maintaining the ability to safely exit and withdrawal their funds at any time, without needing to ask permission from anyone.
 

src/@chakra-ui/components/Popover.ts

@@ -0,0 +1,62 @@
+import { popoverAnatomy as parts } from "@chakra-ui/anatomy"
+import { cssVar } from "@chakra-ui/react"
+import { createMultiStyleConfigHelpers } from "@chakra-ui/styled-system"
+
+import { defineMergeStyles, popoverDefaultTheme } from "./components.utils"
+
+const { definePartsStyle, defineMultiStyleConfig } =
+  createMultiStyleConfigHelpers(parts.keys)
+
+const {
+  baseStyle: defaultBaseStyle,
+  sizes: defaultSizes,
+  defaultProps,
+} = popoverDefaultTheme
+
+const $arrowBg = cssVar("popper-arrow-bg")
+const $arrowSize = cssVar("popper-arrow-size")
+const $arrowShadowColor = cssVar("popper-arrow-shadow-color")
+
+const baseStyle = definePartsStyle(
+  defineMergeStyles(defaultBaseStyle, {
+    popper: {
+      borderRadius: "base",
+      zIndex: "popover",
+    },
+    content: {
+      [$arrowSize.variable]: "8px",
+      p: 2,
+      bg: "background.highlight",
+      borderRadius: "base",
+      boxShadow: `0px 0px 16px 0px #00000040`,
+      fontSize: "sm",
+      border: "none",
+      minWidth: "48", // 12rem
+      maxWidth: "xs", // 20rem
+      lineHeight: "base",
+      w: "auto",
+    },
+    body: {
+      color: "body.base",
+      fontWeight: "normal",
+      textTransform: "none",
+    },
+    header: {
+      border: "none",
+    },
+    arrow: {
+      [$arrowBg.variable]: "colors.background.highlight",
+      [$arrowShadowColor.variable]: "colors.background.highlight",
+      border: "none",
+    },
+  })
+)
+
+export const Popover = defineMultiStyleConfig({
+  baseStyle,
+  sizes: defaultSizes,
+  defaultProps: {
+    ...defaultProps,
+    variant: undefined,
+  },
+})

src/@chakra-ui/components/components.utils.ts

@@ -20,6 +20,7 @@ const {
   List: listDefaultTheme,
   Menu: menuDefaultTheme,
   Modal: modalDefaultTheme,
+  Popover: popoverDefaultTheme,
   Radio: radioDefaultTheme,
   Select: selectDefaultTheme,
   Spinner: spinnerDefaultTheme,
@@ -48,6 +49,7 @@ export {
   listDefaultTheme,
   menuDefaultTheme,
   modalDefaultTheme,
+  popoverDefaultTheme,
   radioDefaultTheme,
   selectDefaultTheme,
   spinnerDefaultTheme,

src/@chakra-ui/components/index.ts

@@ -19,6 +19,7 @@ import { Heading } from "./Heading"
 import { Input } from "./Input"
 import { Link } from "./Link"
 import { Modal } from "./Modal"
+import { Popover } from "./Popover"
 import { Progress } from "./Progress"
 import { Radio } from "./Radio"
 import { ReactSelect } from "./ReactSelect"
@@ -49,6 +50,7 @@ export default {
   Link,
   Menu: menuDefaultTheme,
   Modal,
+  Popover,
   Progress,
   Radio,
   ReactSelect,

src/components/DencunBanner.tsx

@@ -1,11 +1,13 @@
-import { Box, Text, Tooltip } from "@chakra-ui/react"
+import { Box, Text } from "@chakra-ui/react"
 
 import DismissableBanner from "@/components/Banners/DismissableBanner"
 import Emoji from "@/components/Emoji"
 import Link from "@/components/Link"
 
 import NetworkUpgradeSummaryData from "@/data/NetworkUpgradeSummaryData"
 
+import Tooltip from "./Tooltip"
+
 const DencunBanner = () => {
   const dateTimeAsString = NetworkUpgradeSummaryData.dencun
     .dateTimeAsString as string
@@ -16,14 +18,10 @@ const DencunBanner = () => {
         <Emoji text="🚨" me="2" />
         The Deneb + Cancun network upgrade is scheduled for{" "}
         <Tooltip
-          label={
-            <Box bg="background.base" p="2" rounded="base">
-              Epoch 269568 - {upgradeDate.toLocaleString()}
-            </Box>
-          }
+          content={<Box>Epoch 269568 - {upgradeDate.toLocaleString()}</Box>}
           aria-label="Deneb/Cancun timing"
         >
-          {upgradeDate.toLocaleDateString()}
+          <span>{upgradeDate.toLocaleDateString()}</span>
         </Tooltip>
         . Node operators must update client software to a supported version to
         prepare.{" "}

src/components/EthPriceCard.tsx

@@ -141,7 +141,9 @@ const EthPriceCard = ({ isLeftAlign = false, ...props }: EthPriceCardProps) => {
       >
         {t("eth-current-price")}
         <Tooltip content={tooltipContent}>
-          <Icon as={MdInfoOutline} boxSize="14px" ms={2} />
+          <Box as="span" ms={2}>
+            <Icon as={MdInfoOutline} boxSize="14px" />
+          </Box>
         </Tooltip>
       </Heading>