Skip to content

Commit 5098629

Browse files
authored
Merge branch 'ethereum:dev' into dev
2 parents d8749ed + 5403acd commit 5098629

File tree

892 files changed

+49860
-20684
lines changed

Some content is hidden

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

892 files changed

+49860
-20684
lines changed

.all-contributorsrc

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12625,6 +12625,51 @@
1262512625
"contributions": [
1262612626
"design"
1262712627
]
12628+
},
12629+
{
12630+
"login": "jkylling",
12631+
"name": "Jonas Irgens Kylling",
12632+
"avatar_url": "https://avatars.githubusercontent.com/u/6781076?v=4",
12633+
"profile": "https://github.com/jkylling",
12634+
"contributions": [
12635+
"content"
12636+
]
12637+
},
12638+
{
12639+
"login": "CremaFR",
12640+
"name": "Thomas Brillard",
12641+
"avatar_url": "https://avatars.githubusercontent.com/u/5360522?v=4",
12642+
"profile": "https://github.com/CremaFR",
12643+
"contributions": [
12644+
"doc"
12645+
]
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+
]
12664+
},
12665+
{
12666+
"login": "JoeChenJ",
12667+
"name": "JoeChenJ",
12668+
"avatar_url": "https://avatars.githubusercontent.com/u/171761102?v=4",
12669+
"profile": "https://github.com/JoeChenJ",
12670+
"contributions": [
12671+
"content"
12672+
]
1262812673
}
1262912674
],
1263012675
"contributorsPerLine": 7,

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@
99

1010
# Owners of specific files
1111
/src/data/consensus-bounty-hunters.json @djrtwo @asanso @fredriksvantes
12+
/src/data/wallets/new-to-crypto.ts @konopkja @minimalsm

.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

.github/workflows/update-chains.yml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: Update Chains
2+
3+
on:
4+
schedule:
5+
- cron: '20 16 * * FRI' # Runs every Friday at 16:20 UTC
6+
workflow_dispatch: # Can be dispatched manually
7+
8+
jobs:
9+
update-chains:
10+
runs-on: ubuntu-latest
11+
12+
steps:
13+
- name: Checkout repository
14+
uses: actions/checkout@v4
15+
16+
- name: Set up Node.js
17+
uses: actions/setup-node@v3
18+
with:
19+
node-version: '20'
20+
21+
- name: Install dependencies
22+
run: yarn install
23+
24+
- name: Install ts-node
25+
run: yarn global add ts-node
26+
27+
- name: Update chains data
28+
run: npx ts-node -O '{"module":"commonjs"}' ./src/scripts/update-chains.ts
29+
30+
- name: Create Pull Request
31+
uses: peter-evans/create-pull-request@v6
32+
with:
33+
token: ${{ secrets.GITHUB_TOKEN }}
34+
branch: update-chains
35+
branch-suffix: timestamp
36+
commit-message: |
37+
Update chains data
38+
base: dev
39+
title: Update chains data
40+
body: Automated update of chains data from https://chainid.network/chains.json
41+
labels: update 🔄

.github/workflows/wallets-check.yml

Lines changed: 0 additions & 32 deletions
This file was deleted.

README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1932,6 +1932,13 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
19321932
<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>
19331933
<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>
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>
1935+
<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>
1936+
<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>
1941+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/JoeChenJ"><img src="https://avatars.githubusercontent.com/u/171761102?v=4?s=100" width="100px;" alt="JoeChenJ"/><br /><sub><b>JoeChenJ</b></sub></a><br /><a href="#content-JoeChenJ" title="Content">🖋</a></td>
19351942
</tr>
19361943
</tbody>
19371944
</table>

next.config.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,12 @@ module.exports = (phase, { defaultConfig }) => {
6363
trailingSlash: true,
6464
images: {
6565
deviceSizes: [640, 750, 828, 1080, 1200, 1504, 1920],
66+
remotePatterns: [
67+
{
68+
protocol: "https",
69+
hostname: "crowdin-static.downloads.crowdin.com",
70+
},
71+
],
6672
},
6773
}
6874

package.json

Lines changed: 4 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.4.1",
44
"license": "MIT",
55
"private": true,
66
"scripts": {
@@ -45,6 +45,7 @@
4545
"@radix-ui/react-portal": "^1.1.1",
4646
"@radix-ui/react-progress": "^1.1.0",
4747
"@radix-ui/react-radio-group": "^1.2.0",
48+
"@radix-ui/react-scroll-area": "^1.2.2",
4849
"@radix-ui/react-select": "^2.1.1",
4950
"@radix-ui/react-slot": "^1.1.0",
5051
"@radix-ui/react-switch": "^1.1.0",
@@ -66,7 +67,7 @@
6667
"lodash.merge": "^4.6.2",
6768
"lodash.shuffle": "^4.2.0",
6869
"lodash.union": "^4.6.0",
69-
"next": "^14.2.10",
70+
"next": "^14.2.21",
7071
"next-i18next": "^14.0.3",
7172
"next-mdx-remote": "^3.0.8",
7273
"next-sitemap": "^4.2.3",
@@ -83,6 +84,7 @@
8384
"react-lite-youtube-embed": "^2.4.0",
8485
"react-select": "5.8.0",
8586
"reading-time": "^1.5.0",
87+
"recharts": "^2.13.3",
8688
"remark-gfm": "^3.0.1",
8789
"swiper": "^11.1.10",
8890
"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

0 commit comments

Comments
 (0)