Skip to content

Commit f5dc963

Browse files
committed
Merge branch 'dev' into shadcn-emoji
2 parents 6e81bbe + ece1544 commit f5dc963

File tree

76 files changed

+5770
-3234
lines changed

Some content is hidden

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

76 files changed

+5770
-3234
lines changed

.all-contributorsrc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12389,6 +12389,15 @@
1238912389
"contributions": [
1239012390
"bug"
1239112391
]
12392+
},
12393+
{
12394+
"login": "zaryab2000",
12395+
"name": "Zaryab",
12396+
"avatar_url": "https://avatars.githubusercontent.com/u/42082608?v=4",
12397+
"profile": "https://www.zaryabs.com/",
12398+
"contributions": [
12399+
"content"
12400+
]
1239212401
}
1239312402
],
1239412403
"contributorsPerLine": 7,

.eslintrc.json

Lines changed: 12 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,7 @@
99
"env": {
1010
"es6": true
1111
},
12-
"plugins": [
13-
"simple-import-sort",
14-
"@typescript-eslint",
15-
"unused-imports"
16-
],
12+
"plugins": ["simple-import-sort", "@typescript-eslint", "unused-imports"],
1713
"parser": "@typescript-eslint/parser",
1814
"rules": {
1915
"simple-import-sort/imports": [
@@ -26,55 +22,29 @@
2622
],
2723
// Packages. `react` related packages come first.
2824
// Also, put `react-icons` in sorting order not with `react`
29-
[
30-
"^react(?!-.)$",
31-
"^\\w",
32-
"^@\\w"
33-
],
25+
["^react(?!-.)$", "^\\w", "^@\\w"],
3426
// The Chakra theme directory if imported to story file or other places
35-
[
36-
"^@/@chakra-ui"
37-
],
27+
["^@/@chakra-ui"],
3828
// From the `types` directory.
39-
[
40-
"^@/lib/types",
41-
"^@/lib/interfaces"
42-
],
29+
["^@/lib/types", "^@/lib/interfaces"],
4330
// From the `components` directory.
44-
[
45-
"^@/components"
46-
],
31+
["^@/components"],
4732
// From the `utils` directory.
48-
[
49-
"^@/lib/utils"
50-
],
33+
["^@/lib/utils"],
5134
// From the `data` directory.
52-
[
53-
"^@/data"
54-
],
35+
["^@/data"],
5536
// From the `constants` directory.
5637
["^@/lib/constants"],
5738
// From the `.storybook/utils` file
5839
["^@/storybook-utils"],
5940
// Parent imports. Put `..` last.
60-
[
61-
"^\\.\\.(?!/?$)",
62-
"^\\.\\./?$"
63-
],
41+
["^\\.\\.(?!/?$)", "^\\.\\./?$"],
6442
// Other relative imports. Put same-folder imports and `.` last.
65-
[
66-
"^\\./(?=.*/)(?!/?$)",
67-
"^\\.(?!/?$)",
68-
"^\\./?$"
69-
],
43+
["^\\./(?=.*/)(?!/?$)", "^\\.(?!/?$)", "^\\./?$"],
7044
// Style imports.
71-
[
72-
"^.+\\.s?css$"
73-
],
45+
["^.+s?css$"],
7446
// Side effect imports.
75-
[
76-
"^\\u0000"
77-
]
47+
["^\\u0000"]
7848
]
7949
}
8050
],
@@ -89,7 +59,7 @@
8959
],
9060
"unused-imports/no-unused-vars": [
9161
"error",
92-
{
62+
{
9363
"args": "all",
9464
"argsIgnorePattern": "^_$",
9565
"varsIgnorePattern": "^_$"
@@ -98,4 +68,3 @@
9868
"unused-imports/no-unused-imports-ts": "warn"
9969
}
10070
}
101-

.storybook/preview.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@ import ThemeProvider from "@/components/ThemeProvider"
77

88
import i18n, { baseLocales } from "./i18next"
99

10+
import "@docsearch/css"
1011
import "../src/styles/global.css"
1112
import "../src/styles/fonts.css"
13+
import "../src/styles/docsearch.css"
1214

1315
MotionGlobalConfig.skipAnimations = isChromatic()
1416

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1894,6 +1894,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
18941894
<td align="center" valign="top" width="14.28%"><a href="https://github.com/tr1sm0s1n"><img src="https://avatars.githubusercontent.com/u/47410557?v=4?s=100" width="100px;" alt="Mobin Mohanan"/><br /><sub><b>Mobin Mohanan</b></sub></a><br /><a href="#content-tr1sm0s1n" title="Content">🖋</a></td>
18951895
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Baystef"><img src="https://avatars.githubusercontent.com/u/36106823?v=4?s=100" width="100px;" alt="Adebayo Steve"/><br /><sub><b>Adebayo Steve</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=Baystef" title="Code">💻</a></td>
18961896
<td align="center" valign="top" width="14.28%"><a href="https://github.com/sanjanaynvsdl"><img src="https://avatars.githubusercontent.com/u/142678317?v=4?s=100" width="100px;" alt="Sanjana"/><br /><sub><b>Sanjana</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Asanjanaynvsdl" title="Bug reports">🐛</a></td>
1897+
<td align="center" valign="top" width="14.28%"><a href="https://www.zaryabs.com/"><img src="https://avatars.githubusercontent.com/u/42082608?v=4?s=100" width="100px;" alt="Zaryab"/><br /><sub><b>Zaryab</b></sub></a><br /><a href="#content-zaryab2000" title="Content">🖋</a></td>
18971898
</tr>
18981899
</tbody>
18991900
</table>

package.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,23 @@
3737
"@next/bundle-analyzer": "^14.2.5",
3838
"@radix-ui/react-accordion": "^1.2.0",
3939
"@radix-ui/react-checkbox": "^1.1.1",
40+
"@radix-ui/react-compose-refs": "^1.1.0",
4041
"@radix-ui/react-dialog": "^1.1.1",
4142
"@radix-ui/react-navigation-menu": "^1.2.0",
4243
"@radix-ui/react-popover": "^1.1.1",
44+
"@radix-ui/react-portal": "^1.1.1",
45+
"@radix-ui/react-progress": "^1.1.0",
4346
"@radix-ui/react-radio-group": "^1.2.0",
4447
"@radix-ui/react-slot": "^1.1.0",
48+
"@radix-ui/react-switch": "^1.1.0",
4549
"@radix-ui/react-visually-hidden": "^1.1.0",
4650
"@sentry/nextjs": "^8.19.0",
4751
"@socialgouv/matomo-next": "^1.8.0",
4852
"chart.js": "^4.4.2",
4953
"chartjs-plugin-datalabels": "^2.2.0",
5054
"class-variance-authority": "^0.7.0",
5155
"clsx": "^2.1.1",
56+
"cmdk": "^1.0.0",
5257
"embla-carousel-react": "^7.0.0",
5358
"ethereum-blockies-base64": "^1.0.2",
5459
"framer-motion": "^10.13.0",

public/_redirects

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,3 @@
173173
/*/guides/how-to-register-an-ethereum-account /:splat/guides/how-to-create-an-ethereum-account/ 301!
174174

175175
/*/deprecated-software /:splat/dapps/ 301!
176-
177-
/*/developers/docs/smart-contracts/languages/ /:splat/developers/docs/smart-contracts/languages/
178-
179-
/*/languages /:splat/developers/docs/programming-languages/ 301!

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

Lines changed: 79 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,86 @@ To learn more about the conventions and best practices for translating ethereum.
4545

4646
### Prizes
4747

48-
The total prize pool for the Translatathon is 30,000$.
48+
<TranslatathonPrizes />
4949

50-
A detailed breakdown of prizes will be announced at the end of the application period.
50+
**How points work**
51+
52+
Every Translatathon participant will earn points towards their final score by translating content in the ethereum.org Crowdin project and other eligible projects (the full list of eligible projects is available in the next section).
53+
54+
The scoring is simple: **1 translated word = 1 point**
55+
56+
Please note that in order to receive your final points allocation, your suggested translations will need to pass the evaluation process, where professional reviewers will check each participant's translations to ensure they meet the minimum quality threshold and no machine or AI translations were used in the process.
57+
58+
**Bonus points**
59+
60+
This year, Translatathon participants also have several options to earn bonus points.
61+
62+
Bonus points breakdown:
63+
- ETHglossary contributors: 100-1,000 bonus points
64+
- Ethereum.org contributors: 1,000 bonus points
65+
- Previous Translatathon participants: 1,000 bonus points
66+
67+
1) ETHglossary translators
68+
[ETHglossary](https://ethglossaryproject.vercel.app/) is an open-source glossary of key Ethereum terms, and an initiative to create and maintain a glossary of Ethereum terms and their translations in 60+ languages that anyone can use and contribute to.
69+
Translatathon participants can suggest translations for these terms and vote or discuss existing translations to earn bonus points in the Translathon.
70+
Each 10 translated terms will earn you 100 bonus points, with a bonus for completing all 70 terms currently available in the glossary app. The bonus points will be automatically added to your final score once the Translatathon ends and the final scores are calculated.
71+
72+
Participants can earn a maximum of 1,000 bonus points by translating all of the terms in their native language, but translating multiple languages will not result in any additional points!
73+
74+
ETHglossary points breakdown:
75+
- 10 translated terms = 100 bonus points
76+
- 20 translated terms = 200 bonus points
77+
- 30 translated terms = 300 bonus points
78+
- 40 translated terms = 400 bonus points
79+
- 50 translated terms = 500 bonus points
80+
- 60 translated terms = 600 bonus points
81+
- 70 translated terms = 1,000 bonus points
82+
83+
2) Ethereum.org contributors
84+
To reward our existing contributors, each past ethereum.org contributor is eligible for 1,000 bonus points.
85+
Contributors are individuals that have received any ethereum.org contributor POAP, OAT or GitPOAP in the past.
86+
You can check out the full list of eligible contributor POAPs, OATs and GitPOAPs [here](https://efdn.notion.site/Ethereum-org-contributor-credentials-1c23938dfd7f44d0bda3992c58897d63)
87+
88+
3) Previous Translatathon participants
89+
Previous Translatathon participants will also receive 1,000 bonus points.
90+
Anyone who participated in the 2023 edition of the ethereum.org Translatathon and scored at least 100 points, will automatically receive their bonus points once the Translatathon ends and the final scores are calculated.
91+
92+
**In order to claim their bonus points, participants must score at least 100 points in the 2024 Translatathon!**
93+
94+
### Ecosystem content
95+
96+
Since the ethereum.org Translation program is active throughout the year, the translation progress in some target languages on the website is significantly higher than others.
97+
98+
In order to ensure that all Translatathon participants have an equal opportunity to translate as much content as they can and compete for the top prizes, the source content that is part of the Translatathon is not only limited to ethereum.org website content.
99+
100+
Participants translating any of the eligible projects will earn an equal amounts of points, 1 translated word in any project = 1 point.
101+
102+
Here is a list of all the eligible projects that are part of the 2024 Translatathon:
103+
104+
Ethereum.org
105+
- https://crowdin.com/project/ethereum-org
106+
107+
Ethereum.org developer tutorials
108+
- https://crowdin.com/project/33388446abbe9d7aa21e42e49bba7f97
109+
110+
Remix
111+
- https://crowdin.com/project/remix-translation
112+
- https://crowdin.com/project/remix-ui
113+
- https://crowdin.com/project/remix-learneth
114+
- https://crowdin.com/project/361d7e8c3b07220fa22e9d5a901b0021
115+
116+
Privacy + Scaling explorations
117+
- https://crowdin.com/project/privacy-scaling-explorations
118+
119+
Speed Run Ethereum
120+
- https://crowdin.com/project/speed-run-ethereum
121+
122+
EthStaker
123+
- https://crowdin.com/project/ethstaker-website
124+
- https://crowdin.com/project/ethstaker-knowledge-base
125+
126+
Solidity Language Docs
127+
- https://crowdin.com/project/solidity-language-docs
51128

52129
### Evaluation process
53130

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ There are several light clients in development, including execution, consensus a
4444

4545
- [Lodestar](https://github.com/ChainSafe/lodestar/tree/unstable/packages/light-client): consensus light client in TypeScript
4646
- [Helios](https://github.com/a16z/helios): combined execution and consensus light client in Rust
47-
- [Geth](https://github.com/ethereum/go-ethereum/tree/master/light): light mode for execution client (in development) in Go
47+
- [Geth](https://github.com/ethereum/go-ethereum/tree/master/beacon/light): light mode for execution client (in development) in Go
4848
- [Nimbus](https://nimbus.guide/el-light-client.html): consensus light client in Nim
4949

5050
To our knowledge none of these are considered production-ready yet.

public/content/nft/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ This website also has an alternative domain name powered by NFTs, **ethereum.eth
7575

7676
## How do NFTs work? {#how-nfts-work}
7777

78-
NFTs, like any digital items on the Ethereum blockchain, are created through a special Ethereum based computer program called a "smart contract." These contracts follow certain rules, like the [ERC-721](/glossary/#erc-721) or [ERC-1155](/glossary/#erc-1155) standards, which determine what the contract can do.
78+
NFTs, like any digital items on the Ethereum blockchain, are created through a special Ethereum based computer program called a "smart contract". These contracts follow certain rules, like the [ERC-721](/glossary/#erc-721) or [ERC-1155](/glossary/#erc-1155) standards, which determine what the contract can do.
7979

8080
The NFT smart contract can do a few key things:
8181

public/content/roadmap/verkle-trees/index.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@ Verkle trees are `(key,value)` pairs where the keys are 32-byte elements compose
4949

5050
Verkle tree testnets are already up and running, but there are still substantial outstanding updates to clients that are required to support Verkle trees. You can help accelerate progress by deploying contracts to the testnets or running testnet clients.
5151

52-
[Explore the Verkle Gen Devnet 2 testnet](https://verkle-gen-devnet-2.ethpandaops.io/)
52+
[Explore the Verkle Gen Devnet 6 testnet](https://verkle-gen-devnet-6.ethpandaops.io/)
5353

54-
[Watch Guillaume Ballet explain the Condrieu Verkle testnet](https://www.youtube.com/watch?v=cPLHFBeC0Vg) (note that the Condrieu testnet was proof-of-work and has now been superseded by the Verkle Gen Devnet 2 testnet).
54+
[Watch Guillaume Ballet explain the Condrieu Verkle testnet](https://www.youtube.com/watch?v=cPLHFBeC0Vg) (note that the Condrieu testnet was proof-of-work and has now been superseded by the Verkle Gen Devnet 6 testnet).
5555

5656
## Further reading {#further-reading}
5757

5858
- [Verkle Trees for Statelessness](https://verkle.info/)
5959
- [Dankrad Feist explain Verkle trees on PEEPanEIP](https://www.youtube.com/watch?v=RGJOQHzg3UQ)
60-
- [Guillaume Ballet explain verkle trees at ETHGlobal](https://www.youtube.com/watch?v=f7bEtX3Z57o)
60+
- [Guillaume Ballet explain Verkle trees at ETHGlobal](https://www.youtube.com/watch?v=f7bEtX3Z57o)
6161
- ["How Verkle trees make Ethereum lean and mean" by Guillaume Ballet at Devcon 6](https://www.youtube.com/watch?v=Q7rStTKwuYs)
6262
- [Piper Merriam on stateless clients from ETHDenver 2020](https://www.youtube.com/watch?v=0yiZJNciIJ4)
6363
- [Dankrad Fiest explains Verkle trees and statelessness on Zero Knowledge podcast](https://zeroknowledge.fm/episode-202-stateless-ethereum-verkle-tries-with-dankrad-feist/)

0 commit comments

Comments
 (0)