Merge branch 'dev' into rn-quiz-keys--config-refactor

.all-contributorsrc

@@ -12571,6 +12571,69 @@
       "contributions": [
         "content"
       ]
+    },
+    {
+      "login": "Xcertik-Realist",
+      "name": "NilFoundation",
+      "avatar_url": "https://avatars.githubusercontent.com/u/63165931?v=4",
+      "profile": "https://github.com/Xcertik-Realist",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "gconnect",
+      "name": "Glory Agatevure",
+      "avatar_url": "https://avatars.githubusercontent.com/u/23031920?v=4",
+      "profile": "https://github.com/gconnect",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "emmanuellar",
+      "name": "Amarachi Johnson-Ubah",
+      "avatar_url": "https://avatars.githubusercontent.com/u/41474439?v=4",
+      "profile": "http://amarachijohnson.com",
+      "contributions": [
+        "ideas"
+      ]
+    },
+    {
+      "login": "sumitvekariya",
+      "name": "Sumit Vekariya",
+      "avatar_url": "https://avatars.githubusercontent.com/u/20764957?v=4",
+      "profile": "http://sumitvekariya.surge.sh",
+      "contributions": [
+        "maintenance"
+      ]
+    },
+    {
+      "login": "rafagomes",
+      "name": "Rafa Gomes",
+      "avatar_url": "https://avatars.githubusercontent.com/u/565337?v=4",
+      "profile": "https://github.com/rafagomes",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "ddannehh",
+      "name": "ddannehh",
+      "avatar_url": "https://avatars.githubusercontent.com/u/109203827?v=4",
+      "profile": "https://github.com/ddannehh",
+      "contributions": [
+        "design"
+      ]
+    },
+    {
+      "login": "jkylling",
+      "name": "Jonas Irgens Kylling",
+      "avatar_url": "https://avatars.githubusercontent.com/u/6781076?v=4",
+      "profile": "https://github.com/jkylling",
+      "contributions": [
+        "content"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.env.example

@@ -36,4 +36,8 @@ BUILD_LOCALES=
 LIMIT_CPUS=
 
 # Enables the bundle analyzer
-ANALYZE=false
+ANALYZE=false
+
+# Use mock data for development. Set to "false" to use live data but you must have the
+# environment variables set to make api requests
+USE_MOCK_DATA=true

.github/CODEOWNERS

@@ -5,7 +5,7 @@
 
 # These owners will be the default owners for everything in
 # the repo. Unless a later match takes precedence,
-*       @wackerow @corwintines @pettinarip @minimalsm @nhsz
+*       @wackerow @corwintines @pettinarip @minimalsm
 
 # Owners of specific files
 /src/data/consensus-bounty-hunters.json @djrtwo @asanso @fredriksvantes

.storybook/i18next.ts

@@ -23,7 +23,9 @@ export const ns = [
   "page-developers-index",
   "page-what-is-ethereum",
   "page-upgrades-index",
+  "page-wallets-find-wallet",
   "page-developers-docs",
+  "table",
 ] as const
 const supportedLngs = Object.keys(baseLocales)
 

CONTRIBUTING.md

@@ -1,5 +1,5 @@
 <h1 align="center" style="margin-top: 1em; margin-bottom: 2em;">
-  <p><a href="https://ethereum.org"><img alt="ethereum logo" src="./eth-transparent.png" alt="ethereum.org" width="125"></a></p>
+  <p><a href="https://ethereum.org"><img alt="ethereum logo" src="./public/images/assets/eth-transparent.png" alt="ethereum.org" width="125"></a></p>
   <p>👋 Contributing to ethereum.org</p>
 </h1>
 

README.md

@@ -140,31 +140,35 @@ Learn more about how we review pull requests [here](docs/review-process.md).
 
 ![POAP Logo](public/images/poap-logo.svg)
 
-## Claim your POAP!
+## Claim your POAP and OATs!
 
-### What is POAP?
+### What is a POAP?
 
 > The Proof of Attendance Protocol is a dapp that distributes badges in the form of ERC-721 tokens to prove you participated in an event. [More on POAPs](https://www.poap.xyz/).
 
-### ethereum.org 2022 Contributor POAP
+### GitPOAP
 
-- If you have committed any changes in 2022 so far that were merged into our repo, you have a POAP waiting!
-- This includes our dedicated translators on Crowdin
+- If you've made at least one contribution and that gets merged into ethereum.org, GitPOAP will also auto recognize it and let you mint a unique contributor POAP for the specific year.
+  [More on GitPOAP](https://www.gitpoap.io).
 
-  [![Discord](https://img.shields.io/discord/714888181740339261?color=1C1CE1&label=Claim%20Your%20POAP!%20%7C%20Discord%20%F0%9F%91%8B%20&style=flat)](https://discord.gg/ethereum-org)
+### What is an OAT?
 
-- 👆 To claim your Contributor POAP, join our Discord server and paste a link to your contribution in the `#🥇 | proof-of-contribution` [channel](https://discord.com/channels/714888181740339261/1212737737916948530)
+> An Onchain Achievement Token (OAT) is a special badge on [Galxe](https://app.galxe.com/quest/ethereumorg). It's a proof of your contribution to the ecosystem. [More on OATs](https://medium.com/galxe-news/introducing-galaxy-oat-on-chain-achievement-token-7e89779242b4).
 
-- A member of our team will verify the request and DM you with a personalized link to claim your own freshly minted POAP collectible!
+### ethereum.org 2024 Contributor OATs
 
-- To help with verification we request GitHub contributors connect their GitHub account with their Discord account (Discord > Settings > Connections > GitHub). Crowdin contributors will be verified directly through Crowdin by our team.
+- If you have committed any changes in 2024 so far that were merged into our repo or if you have translated a certain amount of words, you can claim your OATs!
+- There are OATs for GitHub, content, design and translation contributions.
 
-### GitPOAP
+  [![Discord](https://img.shields.io/discord/714888181740339261?color=1C1CE1&label=Claim%20Your%20POAP!%20%7C%20Discord%20%F0%9F%91%8B%20&style=flat)](https://discord.gg/ethereum-org)
 
-- If you've made at least one contribution and that gets merged into ethereum.org, GitPOAP will also auto recognize it and let you mint a unique contributor POAP for the specific year.
-  [More on GitPOAP](https://www.gitpoap.io).
+- 👆 To claim your Contributor OATs, join our Discord server, create a post and paste links to your contributions in the `#🥇 | proof-of-contribution` [channel](https://discord.com/channels/714888181740339261/1212737737916948530)
 
-If you haven't contributed yet and would like to earn a POAP to show your loyalty to the Ethereum space, head over to the [issues](https://github.com/ethereum/ethereum-org-website/issues/) tab to get started!
+- Wait for a member of our team to assign you a role on Discord and send you links to your OATs.
+
+- To help with verification we request GitHub contributors connect their GitHub account with their Discord account (Discord > Settings > Connections > GitHub). Crowdin contributors will be verified directly through Crowdin by our team.
+
+If you haven't contributed yet and would like to earn a POAP/OATs to show your loyalty to the Ethereum space, head over to the [issues](https://github.com/ethereum/ethereum-org-website/issues/) tab to get started! If you would like to contribute to translations check out our [Translation Program](https://ethereum.org/en/contributing/translation-program/). 
 
 <hr style="margin-top: 3em; margin-bottom: 3em;">
 
@@ -1920,6 +1924,15 @@ 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/KatrixReloaded"><img src="https://avatars.githubusercontent.com/u/68804269?v=4?s=100" width="100px;" alt="Kartikeya Sureka"/><br /><sub><b>Kartikeya Sureka</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=KatrixReloaded" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Piyush-Tilokani"><img src="https://avatars.githubusercontent.com/u/112542519?v=4?s=100" width="100px;" alt="Piyush Tilokani"/><br /><sub><b>Piyush Tilokani</b></sub></a><br /><a href="#content-Piyush-Tilokani" title="Content">🖋</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/jacobourar"><img src="https://avatars.githubusercontent.com/u/109108267?v=4?s=100" width="100px;" alt="Jacobo Uribe"/><br /><sub><b>Jacobo Uribe</b></sub></a><br /><a href="#content-jacobourar" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Xcertik-Realist"><img src="https://avatars.githubusercontent.com/u/63165931?v=4?s=100" width="100px;" alt="NilFoundation"/><br /><sub><b>NilFoundation</b></sub></a><br /><a href="#content-Xcertik-Realist" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/gconnect"><img src="https://avatars.githubusercontent.com/u/23031920?v=4?s=100" width="100px;" alt="Glory Agatevure"/><br /><sub><b>Glory Agatevure</b></sub></a><br /><a href="#content-gconnect" title="Content">🖋</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="http://amarachijohnson.com"><img src="https://avatars.githubusercontent.com/u/41474439?v=4?s=100" width="100px;" alt="Amarachi Johnson-Ubah"/><br /><sub><b>Amarachi Johnson-Ubah</b></sub></a><br /><a href="#ideas-emmanuellar" title="Ideas, Planning, & Feedback">🤔</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://sumitvekariya.surge.sh"><img src="https://avatars.githubusercontent.com/u/20764957?v=4?s=100" width="100px;" alt="Sumit Vekariya"/><br /><sub><b>Sumit Vekariya</b></sub></a><br /><a href="#maintenance-sumitvekariya" title="Maintenance">🚧</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/rafagomes"><img src="https://avatars.githubusercontent.com/u/565337?v=4?s=100" width="100px;" alt="Rafa Gomes"/><br /><sub><b>Rafa Gomes</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=rafagomes" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ddannehh"><img src="https://avatars.githubusercontent.com/u/109203827?v=4?s=100" width="100px;" alt="ddannehh"/><br /><sub><b>ddannehh</b></sub></a><br /><a href="#design-ddannehh" title="Design">🎨</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/jkylling"><img src="https://avatars.githubusercontent.com/u/6781076?v=4?s=100" width="100px;" alt="Jonas Irgens Kylling"/><br /><sub><b>Jonas Irgens Kylling</b></sub></a><br /><a href="#content-jkylling" title="Content">🖋</a></td>
     </tr>
   </tbody>
 </table>

i18n.config.json

@@ -151,6 +151,14 @@
     "langDir": "ltr",
     "dateFormat": "MM/DD/YYYY"
   },
+  {
+    "code": "ha",
+    "crowdinCode": "ha",
+    "name": "Hausa",
+    "localName": "Hausa",
+    "langDir": "ltr",
+    "dateFormat": "MM/DD/YYYY"
+  },
   {
     "code": "he",
     "crowdinCode": "he",
@@ -399,6 +407,14 @@
     "langDir": "ltr",
     "dateFormat": "MM/DD/YYYY"
   },
+  {
+    "code": "sn",
+    "crowdinCode": "sn",
+    "name": "Shona",
+    "localName": "Shona",
+    "langDir": "ltr",
+    "dateFormat": "MM/DD/YYYY"
+  },
   {
     "code": "sr",
     "crowdinCode": "sr-CS",
@@ -447,6 +463,14 @@
     "langDir": "ltr",
     "dateFormat": "MM/DD/YYYY"
   },
+  {
+    "code": "tl",
+    "crowdinCode": "tl",
+    "name": "Tagalog",
+    "localName": "Tagalog",
+    "langDir": "ltr",
+    "dateFormat": "MM/DD/YYYY"
+  },
   {
     "code": "tr",
     "crowdinCode": "tr",
@@ -455,6 +479,14 @@
     "langDir": "ltr",
     "dateFormat": "MM/DD/YYYY"
   },
+  {
+    "code": "tw",
+    "crowdinCode": "tw",
+    "name": "Akan, Twi",
+    "localName": "Twi",
+    "langDir": "ltr",
+    "dateFormat": "MM/DD/YYYY"
+  },
   {
     "code": "uk",
     "crowdinCode": "uk",
@@ -487,6 +519,14 @@
     "langDir": "ltr",
     "dateFormat": "MM/DD/YYYY"
   },
+  {
+    "code": "yo",
+    "crowdinCode": "yo",
+    "name": "Yoruba",
+    "localName": "Yorùbá",
+    "langDir": "ltr",
+    "dateFormat": "MM/DD/YYYY"
+  },
   {
     "code": "zh-tw",
     "crowdinCode": "zh-TW",

netlify.toml

@@ -36,4 +36,7 @@
   [[plugins.inputs.audits]]
     path = "en/developers/docs/intro-to-ethereum/"
   [[plugins.inputs.audits]]
-    path = "en/developers/tutorials/creating-a-wagmi-ui-for-your-contract/"
+    path = "en/developers/tutorials/creating-a-wagmi-ui-for-your-contract/"
+
+[functions]
+  included_files = ["i18n.config.json","src/data/mocks/**/*"]

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ethereum-org-website",
-  "version": "9.0.1",
+  "version": "9.2.0",
   "license": "MIT",
   "private": true,
   "scripts": {
@@ -45,12 +45,14 @@
     "@radix-ui/react-portal": "^1.1.1",
     "@radix-ui/react-progress": "^1.1.0",
     "@radix-ui/react-radio-group": "^1.2.0",
+    "@radix-ui/react-select": "^2.1.1",
     "@radix-ui/react-slot": "^1.1.0",
     "@radix-ui/react-switch": "^1.1.0",
     "@radix-ui/react-tabs": "^1.1.0",
     "@radix-ui/react-tooltip": "^1.1.2",
     "@radix-ui/react-visually-hidden": "^1.1.0",
     "@socialgouv/matomo-next": "^1.8.0",
+    "@tanstack/react-table": "^8.19.3",
     "chart.js": "^4.4.2",
     "chartjs-plugin-datalabels": "^2.2.0",
     "class-variance-authority": "^0.7.0",
@@ -87,6 +89,7 @@
     "tailwind-variants": "^0.2.1",
     "tailwindcss-animate": "^1.0.7",
     "usehooks-ts": "^3.1.0",
+    "vaul": "^1.0.0",
     "yaml-loader": "^0.8.0"
   },
   "devDependencies": {

public/content/defi/index.md

@@ -355,3 +355,7 @@ DeFi is an open-source movement. The DeFi protocols and applications are all ope
 
 - [DeFi Llama Discord server](https://discord.defillama.com/)
 - [DeFi Pulse Discord server](https://discord.gg/Gx4TCTk)
+
+<Divider />
+
+<QuizWidget quizKey="defi" />

public/content/developers/docs/data-and-analytics/index.md

@@ -34,7 +34,7 @@ Using [GraphQL](https://graphql.org/), developers can query any of the curated o
 
 ## Dune Analytics {#dune-analytics}
 
-[Dune Analytics](https://dune.com/) pre-processes blockchain data into relational database (PostgreSQL and DatabricksSQL) tables, allows users to query blockchain data using SQL and build dashboards based on query results. On-chain data are organized into 4 raw tables: `blocks`, `transactions`, (event) `logs` and (call) `traces`. Popular contracts and protocols have been decoded, and each has its own set of event and call tables. Those event and call tables are processed further and organized into abstraction tables by the type of protocols, for example, dex, lending, stablecoins, etc.
+[Dune Analytics](https://dune.com/) pre-processes blockchain data into relational database (DuneSQL) tables, allows users to query blockchain data using SQL and build dashboards based on query results. On-chain data are organized into 4 raw tables: `blocks`, `transactions`, (event) `logs` and (call) `traces`. Popular contracts and protocols have been decoded, and each has its own set of event and call tables. Those event and call tables are processed further and organized into abstraction tables by the type of protocols, for example, dex, lending, stablecoins, etc.
 
 ## SubQuery Network {#subquery-network}
 

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

@@ -92,7 +92,7 @@ Goerli is a testnet for testing validating and staking. The Goerli network is op
 - [Coinbase Wallet Faucet | Goerli](https://coinbase.com/faucets/ethereum-goerli-faucet)
 - [Chainstack Goerli faucet](https://faucet.chainstack.com/goerli-faucet)
 
-To launch a Validator on Goerli testnet, use ethstaker's ["cheap goerli validator" launchpad](https://goerli.launchpad.ethstaker.cc/en/).
+To launch a Validator on Holesky testnet, use ethstaker's ["cheap Holesky validator" launchpad](https://holesky.launchpad.ethstaker.cc/en/).
 
 ### Layer 2 testnets {#layer-2-testnets}
 

public/content/translations/cs/developers/docs/networks/index.md

@@ -91,7 +91,7 @@ Goerli je testovací síť pro testování validace a uzamčení. Síť Goerli j
 - [Coinbase Wallet Faucet | Goerli](https://coinbase.com/faucets/ethereum-goerli-faucet)
 - [Chainstack Goerli faucet](https://faucet.chainstack.com/goerli-faucet)
 
-Chcete-li spustit validátor na testovací síti Goerli, použijte [launchpad „cheap goerli validator“](https://goerli.launchpad.ethstaker.cc/en/) od ethstaker.
+Chcete-li spustit validátor na testovací síti Goerli, použijte [launchpad „cheap goerli validator“](https://holesky.launchpad.ethstaker.cc/en/) od ethstaker.
 
 ### Testovací sítě druhé vrstvy {#layer-2-testnets}
 

public/content/translations/cs/developers/docs/scaling/index.md

@@ -100,7 +100,7 @@ _Upozornění: Ve videu je pojem „Vrstva 2“ používán k označení všech
 
 ## Další informace {#further-reading}
 
-- [A rollup-centric Ethereum roadmap](https://ethereum-magicians.org/t/a-rollup-centric-ethereum-roadmap/4698)– _Vitalik Buterin_
+- [A rollup-centric Ethereum roadmap](https://ethereum-magicians.org/t/a-rollup-centric-ethereum-roadmap/4698) – _Vitalik Buterin_
 - [Aktuální analytika škálovacích řešení vrstvy 2 pro Ethereum](https://www.l2beat.com/)
 - [Hodnocení škálovacích řešení vrstvy 2 pro Ethereum: Porovnávací rámec](https://medium.com/matter-labs/evaluating-ethereum-l2-scaling-solutions-a-comparison-framework-b6b2f410f955)
 - [Neúplný průvodce rollupy](https://vitalik.eth.limo/general/2021/01/05/rollup.html)