Merge branch 'dev' into add_CTA

ethereum · Mar 11, 2024 · 7e31f16 · 7e31f16
2 parents e094f30 + 2ce32ca
commit 7e31f16
Show file tree

Hide file tree

Showing 201 changed files with 4,173 additions and 4,376 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -11249,6 +11249,26 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "konopkja",
+      "name": "Jakub",
+      "avatar_url": "https://avatars.githubusercontent.com/u/100724231?v=4",
+      "profile": "http://ethereum.org",
+      "contributions": [
+        "doc",
+        "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,

diff --git a/README.md b/README.md
@@ -1752,6 +1752,8 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     </tr>
     <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>

diff --git a/package.json b/package.json
@@ -50,7 +50,7 @@
     "react-i18next": "^13.3.1",
     "react-icons": "^4.10.1",
     "react-lite-youtube-embed": "^2.4.0",
-    "react-select": "^4.3.0",
+    "react-select": "5.8.0",
     "reading-time": "^1.5.0",
     "recharts": "^2.7.3",
     "remark-gfm": "^3.0.1",
@@ -86,7 +86,7 @@
     "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"
   },

diff --git a/public/content/community/events/index.md b/public/content/community/events/index.md
@@ -11,7 +11,7 @@ hideEditButton: true
 
 <UpcomingEventsList/>
 
-This is a non-exhaustive list maintained by our community. Know of an upcoming Ethereum event to add to this list? [Please add it](https://github.com/ethereum/ethereum-org-website/blob/dev/src/data/community-events.json)!
+This is a non-exhaustive list maintained by our community. Know of an upcoming Ethereum event to add to this list? [Please add it](https://github.com/ethereum/ethereum-org-website/blob/dev/src/data/community-events.ts)!
 
 ## Ethereum meetups {#meetups}
 

diff --git a/public/content/contributing/translation-program/content-buckets/index.md b/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,14 +153,15 @@ 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}
 
 - [Proof-of-work](/developers/docs/consensus-mechanisms/pow/)
 - [Mining](/developers/docs/consensus-mechanisms/pow/mining/)
-- [Mining algorithms](/developers/docs/consensus-mechanisms/pow/mining-algorithms/)
-- [Dagger-Hashimoto](/developers/docs/consensus-mechanisms/pow/mining-algorithms/dagger-hashimoto/)
-- [Ethash](/developers/docs/consensus-mechanisms/pow/mining-algorithms/ethash/)
+- [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/)
 
 ## 15) Ethereum stack developer docs {#ethereum-stack-docs}
 
@@ -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-algorithms/)
-- [Dagger-Hashimoto](/developers/docs/consensus-mechanisms/pow/mining-algorithms/dagger-hashimoto/)
-- [Ethash](/developers/docs/consensus-mechanisms/pow/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/)

diff --git a/public/content/developers/docs/consensus-mechanisms/pow/mining/index.md b/public/content/developers/docs/consensus-mechanisms/pow/mining/index.md
@@ -70,9 +70,9 @@ Watch Austin walk you through mining and the proof-of-work blockchain.
 
 ## The mining algorithm {#mining-algorithm}
 
-Ethereum Mainnet only ever used one mining algorithm - ['Ethash'](/developers/docs/consensus-mechanisms/pow/mining-algorithms/ethash/). Ethhash was the successor to an original R&D algorithm known as ['Dagger-Hashimoto'](/developers/docs/consensus-mechanisms/pow/mining-algorithms/dagger-hashimoto/).
+Ethereum Mainnet only ever used one mining algorithm - ['Ethash'](/developers/docs/consensus-mechanisms/pow/mining/mining-algorithms/ethash/). Ethhash was the successor to an original R&D algorithm known as ['Dagger-Hashimoto'](/developers/docs/consensus-mechanisms/pow/mining/mining-algorithms/dagger-hashimoto/).
 
-[More on mining algorithms](/developers/docs/consensus-mechanisms/pow/mining-algorithms/).
+[More on mining algorithms](/developers/docs/consensus-mechanisms/pow/mining/mining-algorithms/).
 
 ## Related topics {#related-topics}
 

diff --git a/...velopers/docs/consensus-mechanisms/pow/mining/mining-algorithms/ethash/index.md b/...velopers/docs/consensus-mechanisms/pow/mining/mining-algorithms/ethash/index.md
@@ -8,7 +8,7 @@ lang: en
    Ethash was Ethereum's proof-of-work mining algorithm. Proof-of-work has now been **switched off entirely** and Ethereum is now secured using <a href="/developers/docs/consensus-mechanisms/pos/">proof-of-stake</a> instead. Read more on <a href="/roadmap/merge/">The Merge</a>, <a href="/developers/docs/consensus-mechanisms/pos/">proof-of-stake</a> and <a href="/staking/">staking</a>. This page is for historical interest!  
 </InfoBanner>
 
-[Ethash](https://github.com/ethereum/wiki/wiki/Ethash) is a modified version of the [Dagger-Hashimoto](/developers/docs/consensus-mechanisms/pow/mining-algorithms/dagger-hashimoto) algorithm. Ethash proof-of-work is [memory hard](https://wikipedia.org/wiki/Memory-hard_function), which was thought to make the algorithm ASIC resistant. Ethash ASICs were eventually developed but GPU mining was still a viable option until proof-of-work was switched off. Ethash is still used to mine other coins on other non-Ethereum proof-of-work networks.
+[Ethash](https://github.com/ethereum/wiki/wiki/Ethash) is a modified version of the [Dagger-Hashimoto](/developers/docs/consensus-mechanisms/pow/mining/mining-algorithms/dagger-hashimoto) algorithm. Ethash proof-of-work is [memory hard](https://wikipedia.org/wiki/Memory-hard_function), which was thought to make the algorithm ASIC resistant. Ethash ASICs were eventually developed but GPU mining was still a viable option until proof-of-work was switched off. Ethash is still used to mine other coins on other non-Ethereum proof-of-work networks.
 
 ## How does Ethash work? {#how-does-ethash-work}
 

diff --git a/...tent/developers/docs/consensus-mechanisms/pow/mining/mining-algorithms/index.md b/...tent/developers/docs/consensus-mechanisms/pow/mining/mining-algorithms/index.md
@@ -24,13 +24,13 @@ Dagger Hashimoto was a precursor research algorithm for Ethereum mining that Eth
 
 Dagger-Hashimoto used amended versions of the Dagger and Hashimoto algorithms. The difference between Dagger Hashimoto and Hashimoto is that, instead of using the blockchain as a data source, Dagger Hashimoto uses a custom-generated data set, which updates based on block data every N blocks. The data set is generated using the Dagger algorithm, allowing for efficiently calculating a subset specific to every nonce for the light client verification algorithm. The difference between Dagger Hashimoto and Dagger is that, unlike in the original Dagger, the dataset used to query the block is semi-permanent, only being updated at occasional intervals (e.g. once per week). This means that the portion of the effort of generating the dataset is close to zero, so Sergio Lerner’s arguments regarding shared memory speedups become negligible.
 
-More on [Dagger-Hashimoto](/developers/docs/consensus-mechanisms/pow/mining-algorithms/dagger-hashimoto).
+More on [Dagger-Hashimoto](/developers/docs/consensus-mechanisms/pow/mining/mining-algorithms/dagger-hashimoto).
 
 ## Ethash {#ethash}
 
 Ethash was the mining algorithm that was actually used on the real Ethereum Mainnet under the now deprecated proof-of-work architecture. Ethash was effectively a new name given to a specific version of Dagger-Hashimoto after the algorithm got significantly updated, whilst still inheriting the fundamental principles of its predecessor. Ethereum Mainnet only ever used Ethash - Dagger Hashimoto was an R&D version of the mining algorithm that was superseded before mining started on Ethereum mainnet.
 
-[More on Ethash](/developers/docs/consensus-mechanisms/pow/mining-algorithms/ethash).
+[More on Ethash](/developers/docs/consensus-mechanisms/pow/mining/mining-algorithms/ethash).
 
 ## Further reading {#further-reading}
 

diff --git a/public/content/history/index.md b/public/content/history/index.md
@@ -63,7 +63,7 @@ Notably this includes EIP-4844, known as **Proto-Danksharding**, which significa
 
 #### 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.
 

diff --git a/public/content/translations/de/glossary/index.md b/public/content/translations/de/glossary/index.md
@@ -378,7 +378,7 @@ Eine Kennzeichnung, die einigen [EIPs](#eip) zugewiesen wurde, die versuchen, ei
 
 Ein [Proof-Work](#pow)-Algorithmus, der bei Ethereum verwendet wurde, bevor er zu [Proof-of-Stake](#pos) gewechselt ist.
 
-[Weiterlesen](/developers/docs/consensus-mechanisms/pow/mining-algorithms/ethash)
+[Weiterlesen](/developers/docs/consensus-mechanisms/pow/mining/mining-algorithms/ethash)
 
 ### Ether {#ether}
 

diff --git a/...ontent/translations/es/developers/docs/consensus-mechanisms/pow/mining/index.md b/...ontent/translations/es/developers/docs/consensus-mechanisms/pow/mining/index.md
@@ -70,9 +70,9 @@ Observe a Austin mientras le guía por el proceso de minado y la cadena de bloqu
 
 ## El algoritmo de minería {#mining-algorithm}
 
-Ethereum Mainnet sólo ha usado un algoritmo de minería- ['Ethash'](/developers/docs/consensus-mechanisms/pow/mining-algorithms/ethash/). Ethhash fue el sucesor de un algoritmo de R&D original conocido como ['Dagger-Hashimoto'](/developers/docs/consensus-mechanisms/pow/mining-algorithms/dagger-hashimoto/).
+Ethereum Mainnet sólo ha usado un algoritmo de minería- ['Ethash'](/developers/docs/consensus-mechanisms/pow/mining/mining-algorithms/ethash/). Ethhash fue el sucesor de un algoritmo de R&D original conocido como ['Dagger-Hashimoto'](/developers/docs/consensus-mechanisms/pow/mining/mining-algorithms/dagger-hashimoto/).
 
-[Más información sobre los algoritmos de minería](/developers/docs/consensus-mechanisms/pow/mining-algorithms/).
+[Más información sobre los algoritmos de minería](/developers/docs/consensus-mechanisms/pow/mining/mining-algorithms/).
 
 ## Temas relacionados {#related-topics}
 

diff --git a/...velopers/docs/consensus-mechanisms/pow/mining/mining-algorithms/ethash/index.md b/...velopers/docs/consensus-mechanisms/pow/mining/mining-algorithms/ethash/index.md
@@ -8,7 +8,7 @@ lang: es
    Ethash era el algoritmo de minería de prueba de trabajo de Ethereum. La prueba de trabajo ahora se ha **desactivado por completo** y Ethereum ahora está protegido utilizando la <a href="/developers/docs/consensus-mechanisms/pos/">prueba de participación</a> en su lugar. Descubra más en <a href="/roadmap/merge/">La fusión</a>, <a href="/developers/docs/consensus-mechanisms/pos/">prueba de participación (PoS)</a> y la <a href="/staking/">participación</a>. ¡Esta página es de interés histórico!  
 </InfoBanner>
 
-[Ethash](https://github.com/ethereum/wiki/wiki/Ethash) es una versión modificada del algoritmo [Dagger-Hashimoto](/developers/docs/consensus-mechanisms/pow/mining-algorithms/dagger-hashimoto). La prueba de trabajo de Ethash es [memoria dura](https://wikipedia.org/wiki/Memory-hard_function), lo que se pensaba que hacía que el algoritmo fuera resistente a ASIC. Finalmente se desarrollaron los ASIC de Ethash, pero la minería de GPU seguía siendo una opción viable hasta que se desactivó la prueba de trabajo. Ethash todavía se utiliza para minar otras monedas en otras redes de prueba de trabajo que no son de Ethereum.
+[Ethash](https://github.com/ethereum/wiki/wiki/Ethash) es una versión modificada del algoritmo [Dagger-Hashimoto](/developers/docs/consensus-mechanisms/pow/mining/mining-algorithms/dagger-hashimoto). La prueba de trabajo de Ethash es [memoria dura](https://wikipedia.org/wiki/Memory-hard_function), lo que se pensaba que hacía que el algoritmo fuera resistente a ASIC. Finalmente se desarrollaron los ASIC de Ethash, pero la minería de GPU seguía siendo una opción viable hasta que se desactivó la prueba de trabajo. Ethash todavía se utiliza para minar otras monedas en otras redes de prueba de trabajo que no son de Ethereum.
 
 ## ¿Cómo funciona Ethash? {#how-does-ethash-work}