Skip to content

Commit f8828ba

Browse files
committed
Merge branch 'dev' into homepage
2 parents 38339fc + 67eebaa commit f8828ba

File tree

57 files changed

+324
-200
lines changed

Some content is hidden

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

57 files changed

+324
-200
lines changed

.all-contributorsrc

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12443,6 +12443,42 @@
1244312443
"contributions": [
1244412444
"doc"
1244512445
]
12446+
},
12447+
{
12448+
"login": "abraj",
12449+
"name": "Abhishek Raj",
12450+
"avatar_url": "https://avatars.githubusercontent.com/u/8170980?v=4",
12451+
"profile": "https://raj.me",
12452+
"contributions": [
12453+
"content"
12454+
]
12455+
},
12456+
{
12457+
"login": "p1kalys",
12458+
"name": "Pavan Emani",
12459+
"avatar_url": "https://avatars.githubusercontent.com/u/85685112?v=4",
12460+
"profile": "https://github.com/p1kalys",
12461+
"contributions": [
12462+
"content"
12463+
]
12464+
},
12465+
{
12466+
"login": "makoshan",
12467+
"name": "Mako Shan",
12468+
"avatar_url": "https://avatars.githubusercontent.com/u/7024451?v=4",
12469+
"profile": "https://v2eth.com/",
12470+
"contributions": [
12471+
"content"
12472+
]
12473+
},
12474+
{
12475+
"login": "cratiu222",
12476+
"name": "Christina",
12477+
"avatar_url": "https://avatars.githubusercontent.com/u/156356273?v=4",
12478+
"profile": "https://github.com/cratiu222",
12479+
"contributions": [
12480+
"content"
12481+
]
1244612482
}
1244712483
],
1244812484
"contributorsPerLine": 7,

.storybook/i18next.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ export const ns = [
2222
"page-developers-index",
2323
"page-what-is-ethereum",
2424
"page-upgrades-index",
25+
"page-developers-docs",
2526
] as const
2627
const supportedLngs = Object.keys(baseLocales)
2728

.storybook/preview.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { MotionGlobalConfig } from "framer-motion"
33
import type { Preview } from "@storybook/react"
44

55
import ThemeProvider from "@/components/ThemeProvider"
6+
import { TooltipProvider } from "@/components/ui/tooltip"
67

78
import i18n, { baseLocales } from "./i18next"
89
import { withNextThemes } from "./withNextThemes"
@@ -39,7 +40,9 @@ const preview: Preview = {
3940
}),
4041
(Story) => (
4142
<ThemeProvider>
42-
<Story />
43+
<TooltipProvider>
44+
<Story />
45+
</TooltipProvider>
4346
</ThemeProvider>
4447
),
4548
],

README.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[![Netlify Status](https://api.netlify.com/api/v1/badges/e8f2e766-888b-4954-8500-1b647d84db99/deploy-status)](https://app.netlify.com/sites/ethereumorg/deploys)
22
[![All Contributors](https://img.shields.io/github/all-contributors/ethereum/ethereum-org-website?color=orange&style=flat-square)](#contributors-)
33
[![Discord](https://img.shields.io/discord/714888181740339261?color=1C1CE1&label=ethereum.org%20%7C%20Discord%20%F0%9F%91%8B%20&style=flat-square)](https://discord.gg/ethereum-org)
4-
[![Twitter Follow](https://img.shields.io/twitter/follow/ethdotorg.svg?style=social)](https://twitter.com/ethdotorg)
4+
[![Twitter Follow](https://img.shields.io/twitter/follow/ethdotorg.svg?style=social)](https://x.com/ethdotorg)
55
[![Crowdin](https://badges.crowdin.net/ethereum-org/localized.svg)](https://crowdin.com/project/ethereum-org)
66
[![gitpoap badge](https://public-api.gitpoap.io/v1/repo/ethereum/ethereum-org-website/badge)](https://www.gitpoap.io/gh/ethereum/ethereum-org-website)
77

@@ -1902,6 +1902,12 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
19021902
<td align="center" valign="top" width="14.28%"><a href="http://linkedin.com/in/fmarcelo"><img src="https://avatars.githubusercontent.com/u/11818521?v=4?s=100" width="100px;" alt="M@rC3L0"/><br /><sub><b>M@rC3L0</b></sub></a><br /><a href="#ideas-ferreiramarcelo" title="Ideas, Planning, & Feedback">🤔</a></td>
19031903
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Refdeveloper"><img src="https://avatars.githubusercontent.com/u/87125773?v=4?s=100" width="100px;" alt="DevOFtoken"/><br /><sub><b>DevOFtoken</b></sub></a><br /><a href="#ideas-Refdeveloper" title="Ideas, Planning, & Feedback">🤔</a></td>
19041904
<td align="center" valign="top" width="14.28%"><a href="https://github.com/vvvvvv1vvvvvv"><img src="https://avatars.githubusercontent.com/u/86296331?v=4?s=100" width="100px;" alt="vvvvvv1vvvvvv"/><br /><sub><b>vvvvvv1vvvvvv</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=vvvvvv1vvvvvv" title="Documentation">📖</a></td>
1905+
<td align="center" valign="top" width="14.28%"><a href="https://raj.me"><img src="https://avatars.githubusercontent.com/u/8170980?v=4?s=100" width="100px;" alt="Abhishek Raj"/><br /><sub><b>Abhishek Raj</b></sub></a><br /><a href="#content-abraj" title="Content">🖋</a></td>
1906+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/p1kalys"><img src="https://avatars.githubusercontent.com/u/85685112?v=4?s=100" width="100px;" alt="Pavan Emani"/><br /><sub><b>Pavan Emani</b></sub></a><br /><a href="#content-p1kalys" title="Content">🖋</a></td>
1907+
</tr>
1908+
<tr>
1909+
<td align="center" valign="top" width="14.28%"><a href="https://v2eth.com/"><img src="https://avatars.githubusercontent.com/u/7024451?v=4?s=100" width="100px;" alt="Mako Shan"/><br /><sub><b>Mako Shan</b></sub></a><br /><a href="#content-makoshan" title="Content">🖋</a></td>
1910+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/cratiu222"><img src="https://avatars.githubusercontent.com/u/156356273?v=4?s=100" width="100px;" alt="Christina"/><br /><sub><b>Christina</b></sub></a><br /><a href="#content-cratiu222" title="Content">🖋</a></td>
19051911
</tr>
19061912
</tbody>
19071913
</table>

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ethereum-org-website",
3-
"version": "8.10.0",
3+
"version": "8.10.1",
44
"license": "MIT",
55
"private": true,
66
"scripts": {

public/content/contributing/translation-program/translatathon/details/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ All translations will also be subject to a thorough review before being added to
154154
</ExpandableCard>
155155

156156
<ExpandableCard title="Which languages can I translate into?">
157-
<p>You can translate into any language! It is recommended to only translate into your native language to ensure sufficient quality, but in short, all language available in Crowdin are in scope for the Translatathon.</p>
157+
<p>You can translate into any language! It is recommended to only translate into your native language to ensure sufficient quality, but in short, all languages available in Crowdin are in scope for the Translatathon.</p>
158158
<p>If you want to translate into a language that isn't available in Crowdin, reach out to us and we will add any language per request.</p>
159159
</ExpandableCard>
160160

public/content/cookie-policy/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ hideEditButton: true
99
Our Websites may use cookies to distinguish you from other users of our Websites. This may help us to provide you with a good experience when you browse our Websites and may also allow us to improve our Websites. By continuing to browse the Websites, you are agreeing to our use of cookies as well as the terms of this policy (the “Cookie Policy”). A cookie is a small file of letters and numbers that we may store on your browser or the hard drive of your computer if you agree. Cookies contain information that is transferred to your computer's hard drive. We may use the following cookies:
1010

1111
- **Strictly necessary cookies.** These are cookies that are required for the operation of our websites. They include, for example, cookies that enable you to log into secure areas of our websites, use a shopping cart or make use of e-commerce payment processing services.
12-
- **Analytical/performance cookies.** They allow us to recognise and count the number of visitors and to see how visitors move around our websites when they are using it. This may help us to improve the way our websites work, for example, by ensuring that users are finding what they are looking for easily.
12+
- **Analytical/performance cookies.** They allow us to recognise and count the number of visitors and to see how visitors move around our websites when they are using them. This may help us to improve the way our websites work, for example, by ensuring that users are finding what they are looking for easily.
1313
- **Functionality cookies.** These cookies are used to recognise you when you return to our websites. They may enable us to personalise our content for you, greet you by name, or remember your preferences (for example, your choice of language or region).
1414
- **Targeting cookies.** These cookies record your visit to our websites, the pages you have visited and the links you have followed.
1515

public/content/developers/docs/consensus-mechanisms/pos/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Whereas under proof-of-work, the timing of blocks is determined by the mining di
2424

2525
The following provides an end-to-end explanation of how a transaction gets executed in Ethereum proof-of-stake.
2626

27-
1. A user creates and signs a [transaction](/developers/docs/transactions/) with their private key. This is usually handled by a wallet or a library such as [ether.js](https://docs.ethers.io/v5/), [web3js](https://docs.web3js.org/), [web3py](https://web3py.readthedocs.io/en/v5/) etc but under the hood the user is making a request to a node using the Ethereum [JSON-RPC API](/developers/docs/apis/json-rpc/). The user defines the amount of gas that they are prepared to pay as a tip to a validator to encourage them to include the transaction in a block. The [tips](/developers/docs/gas/#priority-fee) get paid to the validator while the [base fee](/developers/docs/gas/#base-fee) gets burned.
27+
1. A user creates and signs a [transaction](/developers/docs/transactions/) with their private key. This is usually handled by a wallet or a library such as [ethers.js](https://docs.ethers.org/v6/), [web3js](https://docs.web3js.org/), [web3py](https://web3py.readthedocs.io/en/v5/) etc but under the hood the user is making a request to a node using the Ethereum [JSON-RPC API](/developers/docs/apis/json-rpc/). The user defines the amount of gas that they are prepared to pay as a tip to a validator to encourage them to include the transaction in a block. The [tips](/developers/docs/gas/#priority-fee) get paid to the validator while the [base fee](/developers/docs/gas/#base-fee) gets burned.
2828
2. The transaction is submitted to an Ethereum [execution client](/developers/docs/nodes-and-clients/#execution-client) which verifies its validity. This means ensuring that the sender has enough ETH to fulfill the transaction and they have signed it with the correct key.
2929
3. If the transaction is valid, the execution client adds it to its local mempool (list of pending transactions) and also broadcasts it to other nodes over the execution layer gossip network. When other nodes hear about the transaction they add it to their local mempool too. Advanced users might refrain from broadcasting their transaction and instead forward it to specialized block builders such as [Flashbots Auction](https://docs.flashbots.net/flashbots-auction/overview). This allows them to organize the transactions in upcoming blocks for maximum profit ([MEV](/developers/docs/mev/#mev-extraction)).
3030
4. One of the validator nodes on the network is the block proposer for the current slot, having previously been selected pseudo-randomly using RANDAO. This node is responsible for building and broadcasting the next block to be added to the Ethereum blockchain and updating the global state. The node is made up of three parts: an execution client, a consensus client and a validator client. The execution client bundles transactions from the local mempool into an "execution payload" and executes them locally to generate a state change. This information is passed to the consensus client where the execution payload is wrapped as part of a "beacon block" that also contains information about rewards, penalties, slashings, attestations etc. that enable the network to agree on the sequence of blocks at the head of the chain. The communication between the execution and consensus clients is described in more detail in [Connecting the Consensus and Execution Clients](/developers/docs/networking-layer/#connecting-clients).

public/content/developers/docs/design-and-ux/dex-design-best-practice/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ lang: en
55
---
66

77
Since the launch of Uniswap in 2018, there have been hundreds of decentralized exchanges launched across dozens of different chains.
8-
Many of these have introduced new elements or added their own twist, but the interface has remained generally the same.
8+
Many of these introduced new elements or added their own twist, but the interface has remained generally the same.
99

1010
One reason for this is [Jakob’s Law](https://lawsofux.com/jakobs-law/):
1111

public/content/developers/docs/design-and-ux/heuristics-for-web3/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ lang: en
55
---
66

77
Usability heuristics are broad “rules of thumb” that you can use to measure the usability of your site.
8-
These heuristics are specifically tailored for Web3 and should be used alongside Jakob Nielsen's [10 general principles for interaction design](https://www.nngroup.com/articles/ten-usability-heuristics/).
8+
The 7 heuristics here are specifically tailored for Web3 and should be used alongside Jakob Nielsen's [10 general principles for interaction design](https://www.nngroup.com/articles/ten-usability-heuristics/).
99

1010
## Seven usability heuristics for web3 {#seven-usability-heuristics-for-web3}
1111

0 commit comments

Comments
 (0)