Skip to content

Commit 5ef1554

Browse files
committed
Merge branch 'dev' into migrate/stablecoinaccordionindex
2 parents 4748da2 + 26619ff commit 5ef1554

File tree

356 files changed

+19976
-8029
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

356 files changed

+19976
-8029
lines changed

.all-contributorsrc

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12643,6 +12643,24 @@
1264312643
"contributions": [
1264412644
"doc"
1264512645
]
12646+
},
12647+
{
12648+
"login": "YakshitAgarwal",
12649+
"name": "Yakshit Agarwal",
12650+
"avatar_url": "https://avatars.githubusercontent.com/u/153830716?v=4",
12651+
"profile": "https://github.com/YakshitAgarwal",
12652+
"contributions": [
12653+
"content"
12654+
]
12655+
},
12656+
{
12657+
"login": "mseidlx",
12658+
"name": "Matthias Seidl",
12659+
"avatar_url": "https://avatars.githubusercontent.com/u/32496674?v=4",
12660+
"profile": "https://growthepie.xyz",
12661+
"contributions": [
12662+
"code"
12663+
]
1264612664
}
1264712665
],
1264812666
"contributorsPerLine": 7,

.github/workflows/generate-review-report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
2929

3030
- name: Upload output as artifact
31-
uses: actions/upload-artifact@v2
31+
uses: actions/upload-artifact@v4
3232
with:
3333
name: output
3434
path: ./src/data/crowdin/bucketsAwaitingReviewReport.csv

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1934,6 +1934,10 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
19341934
<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>
19351935
<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>
19361936
<td align="center" valign="top" width="14.28%"><a href="https://github.com/CremaFR"><img src="https://avatars.githubusercontent.com/u/5360522?v=4?s=100" width="100px;" alt="Thomas Brillard"/><br /><sub><b>Thomas Brillard</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=CremaFR" title="Documentation">📖</a></td>
1937+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/YakshitAgarwal"><img src="https://avatars.githubusercontent.com/u/153830716?v=4?s=100" width="100px;" alt="Yakshit Agarwal"/><br /><sub><b>Yakshit Agarwal</b></sub></a><br /><a href="#content-YakshitAgarwal" title="Content">🖋</a></td>
1938+
</tr>
1939+
<tr>
1940+
<td align="center" valign="top" width="14.28%"><a href="https://growthepie.xyz"><img src="https://avatars.githubusercontent.com/u/32496674?v=4?s=100" width="100px;" alt="Matthias Seidl"/><br /><sub><b>Matthias Seidl</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=mseidlx" title="Code">💻</a></td>
19371941
</tr>
19381942
</tbody>
19391943
</table>

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ethereum-org-website",
3-
"version": "9.2.0",
3+
"version": "9.3.0",
44
"license": "MIT",
55
"private": true,
66
"scripts": {
@@ -66,7 +66,7 @@
6666
"lodash.merge": "^4.6.2",
6767
"lodash.shuffle": "^4.2.0",
6868
"lodash.union": "^4.6.0",
69-
"next": "^14.2.10",
69+
"next": "^14.2.15",
7070
"next-i18next": "^14.0.3",
7171
"next-mdx-remote": "^3.0.8",
7272
"next-sitemap": "^4.2.3",
@@ -83,6 +83,7 @@
8383
"react-lite-youtube-embed": "^2.4.0",
8484
"react-select": "5.8.0",
8585
"reading-time": "^1.5.0",
86+
"recharts": "^2.13.3",
8687
"remark-gfm": "^3.0.1",
8788
"swiper": "^11.1.10",
8889
"tailwind-merge": "^2.3.0",

public/_redirects

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828

2929
/nfts/ /en/nft/ 301!
3030

31+
/payments/ /en/payments/ 301!
32+
3133
/daos/ /en/dao/ 301!
3234

3335
/layer2/ /en/layer-2/ 301!

public/content/community/research/index.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ There are now several Layer 2 protocols that scale Ethereum using different tech
111111
#### Recent research {#recent-research-2}
112112

113113
- [Arbitrum's fair-ordering for sequencers](https://eprint.iacr.org/2021/1465)
114-
- [ethresear.ch Layer 2](https://ethresear.ch/c/layer-2/32)
114+
- [Ethresear.ch Layer 2](https://ethresear.ch/c/layer-2/32)
115115
- [Rollup-centric roadmap](https://ethereum-magicians.org/t/a-rollup-centric-ethereum-roadmap/4698)
116116
- [L2Beat](https://l2beat.com/)
117117

@@ -189,7 +189,7 @@ Ethereum wallets can be browser extensions, desktop and mobile apps or smart con
189189

190190
- [Introduction to wallets](/wallets/)
191191
- [Introduction to wallet security](/security/)
192-
- [ethresear.ch Security](https://ethresear.ch/tag/security)
192+
- [Ethresear.ch Security](https://ethresear.ch/tag/security)
193193
- [EIP-2938 Account Abstraction](https://eips.ethereum.org/EIPS/eip-2938)
194194
- [EIP-4337 Account Abstraction](https://eips.ethereum.org/EIPS/eip-4337)
195195

@@ -364,7 +364,7 @@ Oracles import off-chain data onto the blockchain in a permissionless and decent
364364

365365
- [Introduction to Oracles](/developers/docs/oracles/)
366366

367-
#### Recent Research {#recent-research-18}
367+
#### Recent research {#recent-research-18}
368368

369369
- [Survey of blockchain oracles](https://arxiv.org/pdf/2004.07140.pdf)
370370
- [Chainlink white paper](https://chain.link/whitepaper)
@@ -381,7 +381,7 @@ Hacks on Ethereum generally exploit vulnerabilities in individual applications r
381381

382382
#### Recent research {#recent-research-19}
383383

384-
- [ethresear.ch Applications](https://ethresear.ch/c/applications/18)
384+
- [Ethresear.ch Applications](https://ethresear.ch/c/applications/18)
385385

386386
### Technology stack {#technology-stack}
387387

public/content/contributing/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ We are a welcoming community that will help you grow and educate in the Ethereum
1919
- [Work on an open issue](https://github.com/ethereum/ethereum-org-website/issues) – Work we've identified that needs doing
2020

2121
**Design**
22-
- [Help design the website](/contributing/design/) Designers of all levels can contribute to improve the website
22+
- [Help design the website](/contributing/design/) Designers of all levels can contribute to improve the website
2323

2424
**Content**
2525
- [Create/edit content](/contributing/#how-to-update-content) – Suggest new pages or make tweaks to what's here already
@@ -94,7 +94,7 @@ If your contribution gets merged into ethereum.org, you will have a chance to cl
9494

9595
### How to claim
9696
1. Join our [Discord server](https://discord.gg/ethereum-org).
97-
2. Paste a link to your contribution in the `#🥇 | proof-of-contribution` channel
97+
2. Paste a link to your contribution in the `#🥇 | proof-of-contribution` channel.
9898
3. Wait for a member of our team to send you a link to your OAT.
9999
4. Claim your OAT!
100100

public/content/contributing/style-guide/content-standardization/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ This site uses **sentence casing** for header names as a convention. Only the fi
252252

253253
### Setting Up Your Wallet
254254

255-
### Getting Enough Ether
255+
### Getting Enough ether
256256
```
257257

258258
### Article authors {#authors}

public/content/dao/index.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
2-
title: Decentralized autonomous organizations (DAOs)
2+
title: What is a DAO?
3+
metaTitle: What is a DAO? | Decentralized Autonomous Organization
34
description: An overview of DAOs on Ethereum
45
lang: en
56
template: use-cases

public/content/defi/index.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
title: Decentralized finance (DeFi)
3+
metaTitle: What is DeFi? | Benefits and Use of Decentralised Finance
34
description: An overview of DeFi on Ethereum
45
lang: en
56
template: use-cases
@@ -168,7 +169,7 @@ If exchange B's supply dropped suddenly and the user wasn't able to buy enough t
168169

169170
To be able to do the above example in the traditional finance world, you'd need an enormous amount of money. These money-making strategies are only accessible to those with existing wealth. Flash loans are an example of a future where having money is not necessarily a prerequisite for making money.
170171

171-
<ButtonLink isSecondary href="https://aave.com/flash-loans/">
172+
<ButtonLink isSecondary href="https://aave.com/docs/concepts/flash-loans">
172173
More on flash loans
173174
</ButtonLink>
174175

@@ -324,7 +325,7 @@ You can think of DeFi in layers:
324325
3. The protocols – [smart contracts](/glossary/#smart-contract) that provide the functionality, for example, a service that allows for decentralized lending of assets.
325326
4. [The applications](/dapps/) – the products we use to manage and access the protocols.
326327

327-
Note: much of DeFi uses the [ERC-20 standard](/glossary/#erc-20). Applications in DeFi use a wrapper for ETH called Wrapped Ether (WETH). [Learn more about wrapped ether](/wrapped-eth).
328+
Note: much of DeFi uses the [ERC-20 standard](/glossary/#erc-20). Applications in DeFi use a wrapper for ETH called Wrapped ether (WETH). [Learn more about wrapped ether](/wrapped-eth).
328329

329330
## Build DeFi {#build-defi}
330331

@@ -358,4 +359,4 @@ DeFi is an open-source movement. The DeFi protocols and applications are all ope
358359

359360
<Divider />
360361

361-
<QuizWidget quizKey="defi" />
362+
<QuizWidget quizKey="defi" />

public/content/developers/docs/apis/json-rpc/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -992,7 +992,7 @@ curl -X POST --data '{"jsonrpc":"2.0","method":"eth_sendRawTransaction","params"
992992

993993
### eth_call {#eth_call}
994994

995-
Executes a new message call immediately without creating a transaction on the block chain. Often used for executing read-only smart contract functions, for example the `balanceOf` for an ERC-20 contract.
995+
Executes a new message call immediately without creating a transaction on the blockchain. Often used for executing read-only smart contract functions, for example the `balanceOf` for an ERC-20 contract.
996996

997997
**Parameters**
998998

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Some basic familiarity with common terminology in computer science such as [byte
1414

1515
The analogy of a 'distributed ledger' is often used to describe blockchains like Bitcoin, which enable a decentralized currency using fundamental tools of cryptography. The ledger maintains a record of activity which must adhere to a set of rules that govern what someone can and cannot do to modify the ledger. For example, a Bitcoin address cannot spend more Bitcoin than it has previously received. These rules underpin all transactions on Bitcoin and many other blockchains.
1616

17-
While Ethereum has its own native cryptocurrency (Ether) that follows almost exactly the same intuitive rules, it also enables a much more powerful function: [smart contracts](/developers/docs/smart-contracts/). For this more complex feature, a more sophisticated analogy is required. Instead of a distributed ledger, Ethereum is a distributed [state machine](https://wikipedia.org/wiki/Finite-state_machine). Ethereum's state is a large data structure which holds not only all accounts and balances, but a _machine state_, which can change from block to block according to a pre-defined set of rules, and which can execute arbitrary machine code. The specific rules of changing state from block to block are defined by the EVM.
17+
While Ethereum has its own native cryptocurrency (ether) that follows almost exactly the same intuitive rules, it also enables a much more powerful function: [smart contracts](/developers/docs/smart-contracts/). For this more complex feature, a more sophisticated analogy is required. Instead of a distributed ledger, Ethereum is a distributed [state machine](https://wikipedia.org/wiki/Finite-state_machine). Ethereum's state is a large data structure which holds not only all accounts and balances, but a _machine state_, which can change from block to block according to a pre-defined set of rules, and which can execute arbitrary machine code. The specific rules of changing state from block to block are defined by the EVM.
1818

1919
![A diagram showing the make up of the EVM](./evm.png)
2020
_Diagram adapted from [Ethereum EVM illustrated](https://takenobu-hs.github.io/downloads/ethereum_evm_illustrated.pdf)_

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
title: Gas and fees
3+
metaTitle: "Ethereum gas and fees: technical overview"
34
description:
45
lang: en
56
---

public/content/developers/docs/intro-to-ether/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Users can query the ether balance of any [account](/developers/docs/accounts/) b
7171

7272
## Further reading {#further-reading}
7373

74-
- [Defining Ether and Ethereum](https://www.cmegroup.com/education/courses/introduction-to-ether/defining-ether-and-ethereum.html)_CME Group_
74+
- [Defining ether and Ethereum](https://www.cmegroup.com/education/courses/introduction-to-ether/defining-ether-and-ethereum.html)_CME Group_
7575
- [Ethereum Whitepaper](/whitepaper/): The original proposal for Ethereum. This document includes a description of ether and the motivations behind its creation.
7676
- [Gwei Calculator](https://www.alchemy.com/gwei-calculator): Use this gwei calculator to easily convert wei, gwei, and ether. Simply plug in any amount of wei, gwei, or ETH and automatically calculate the conversion.
7777

public/content/developers/docs/networking-layer/network-addresses/index.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ For an Ethereum node, the multiaddr contains the node-ID (a hash of their public
2323

2424
## Enode {#enode}
2525

26-
An enode is a way to identify an Ethereum node using a URL address format. The hexadecimal node-ID is encoded in the username portion of the URL separated from the host using an @ sign. The hostname can only be given as an IP address; DNS names are not allowed. The port in the hostname section is the TCP listening port. If the TCP and UDP (discovery) ports differ, the UDP port is specified as a query parameter "discport"
26+
An enode is a way to identify an Ethereum node using a URL address format. The hexadecimal node-ID is encoded in the username portion of the URL separated from the host using an @ sign. The hostname can only be given as an IP address; DNS names are not allowed. The port in the hostname section is the TCP listening port. If the TCP and UDP (discovery) ports differ, the UDP port is specified as a query parameter "discport".
2727

2828
In the following example, the node URL describes a node with IP address `10.3.58.6`, TCP port `30303` and UDP discovery port `30301`.
2929

@@ -35,6 +35,6 @@ Ethereum Node Records (ENRs) are a standardized format for network addresses on
3535

3636
## Further Reading {#further-reading}
3737

38-
[EIP-778: Ethereum Node Records (ENR)](https://eips.ethereum.org/EIPS/eip-778)
39-
[Network addresses in Ethereum](https://dean.eigenmann.me/blog/2020/01/21/network-addresses-in-ethereum/)
40-
[LibP2P: Multiaddr-Enode-ENR?!](https://consensys.net/diligence/blog/2020/09/libp2p-multiaddr-enode-enr/)
38+
- [EIP-778: Ethereum Node Records (ENR)](https://eips.ethereum.org/EIPS/eip-778)
39+
- [Network addresses in Ethereum](https://dean.eigenmann.me/blog/2020/01/21/network-addresses-in-ethereum/)
40+
- [LibP2P: Multiaddr-Enode-ENR?!](https://consensys.net/diligence/blog/2020/09/libp2p-multiaddr-enode-enr/)

public/content/developers/docs/nodes-and-clients/client-diversity/index.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@ Addressing client diversity requires more than individual users to choose minori
8080

8181
[Prysm](https://docs.prylabs.network/docs/getting-started)
8282

83+
[Grandine](https://docs.grandine.io/)
84+
8385
Technical users can help accelerate this process by writing more tutorials and documentation for minority clients and encouraging their node-operating peers to migrate away from the dominant clients. Guides for switching to a minority consensus client are available on [clientdiversity.org](https://clientdiversity.org/).
8486

8587
## Client diversity dashboards {#client-diversity-dashboards}

public/content/developers/docs/nodes-and-clients/run-a-node/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ reth node \
312312
--authrpc.port 8551
313313
```
314314

315-
See [Configuring Reth](https://reth.rs/run/config.html?highlight=data%20directory#configuring-reth) to learn more about data default data directories. [Reth's documentation](https://reth.rs/run/mainnet.html) contains additional options and configuration details.
315+
See [Configuring Reth](https://reth.rs/run/config.html?highlight=data%20directory#configuring-reth) to learn more about default data directories. [Reth's documentation](https://reth.rs/run/mainnet.html) contains additional options and configuration details.
316316

317317
#### Starting the consensus client {#starting-the-consensus-client}
318318

public/content/developers/docs/scaling/optimistic-rollups/index.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -253,12 +253,6 @@ More of a visual learner? Watch Finematics explain optimistic rollups:
253253

254254
<YouTube id="7pWxCklcNsU" start="263" />
255255

256-
### Use Optimistic rollups {#use-optimistic-rollups}
257-
258-
Multiple implementations of Optimistic rollups exist that you can integrate into your dapps:
259-
260-
<RollupProductDevDoc rollupType="optimistic" />
261-
262256
## Further reading on optimistic rollups
263257

264258
- [How do optimistic rollups work (The Complete guide)](https://www.alchemy.com/overviews/optimistic-rollups)

public/content/developers/docs/scaling/plasma/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ Although exit games sound nice in theory, real-life mass exits will likely trigg
108108

109109
| Pros | Cons |
110110
| -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
111-
| Offers high throughput and low cost per transaction. | Does not support general computation (cannot run smart contracts. Only basic token transfers, swaps, and a few other transaction types are supported via predicate logic. |
111+
| Offers high throughput and low cost per transaction. | Does not support general computation (cannot run smart contracts). Only basic token transfers, swaps, and a few other transaction types are supported via predicate logic. |
112112
| Good for transactions between arbitrary users (no overhead per user pair if both are established on the plasma chain) | Need to periodically watch the network (liveness requirement) or delegate this responsibility to someone else to ensure the security of your funds. |
113113
| Plasma chains can be adapted to specific use-cases that are unrelated to the main chain. Anyone, including businesses, can customize Plasma smart contracts to provide scalable infrastructure that works in different contexts. | Relies on one or more operators to store data and serve it upon request. |
114114
| Reduces load on Ethereum Mainnet by moving computation and storage off-chain. | Withdrawals are delayed by several days to allow for challenges. For fungible assets, this can be mitigated by liquidity providers, but there is an associated capital cost. |

public/content/developers/docs/scaling/zk-rollups/index.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -222,11 +222,6 @@ Watch Finematics explain ZK-rollups:
222222

223223
<YouTube id="7pWxCklcNsU" start="406" />
224224

225-
### Use ZK-rollups {#use-zk-rollups}
226-
227-
Multiple implementations of ZK-rollups exist that you can integrate into your dapps:
228-
229-
<RollupProductDevDoc rollupType="zk" />
230225

231226
## Who is working on a zkEVM? {#zkevm-projects}
232227

0 commit comments

Comments
 (0)