Skip to content

Commit de9a567

Browse files
authored
Merge branch 'dev' into crowdin-may-ro-20250501044556020
2 parents 0a0bc17 + 3a95775 commit de9a567

File tree

307 files changed

+6223
-2990
lines changed

Some content is hidden

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

307 files changed

+6223
-2990
lines changed

.env.example

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
# be careful not to expose sensitive data (e.g. your Algolia admin key)
55

66
# Algolia environment (app ID, search key and base search index name required for search)
7+
# You can use the following test keys provided by DocSearch for local development/testing:
8+
# NEXT_PUBLIC_ALGOLIA_APP_ID=R2IYF7ETH7
9+
# NEXT_PUBLIC_ALGOLIA_SEARCH_KEY=599cec31baffa4868cae4e79f180729b
10+
# NEXT_PUBLIC_ALGOLIA_BASE_SEARCH_INDEX_NAME=docsearch
11+
# Replace insertValue with your actual keys for production builds.
712
# NEXT_PUBLIC_ALGOLIA_APP_ID=insertValue
813
# NEXT_PUBLIC_ALGOLIA_SEARCH_KEY=insertValue
914
# NEXT_PUBLIC_ALGOLIA_BASE_SEARCH_INDEX_NAME=insertValue

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,9 @@ Learn more about how we review pull requests [here](docs/review-process.md).
155155

156156
> An Onchain Achievement Token (OAT) is a special badge on [Galxe](https://app.galxe.com/quest/ethereumorg). It's a proof of your contribution to the ecosystem. [More on OATs](https://medium.com/galxe-news/introducing-galaxy-oat-on-chain-achievement-token-7e89779242b4).
157157
158-
### ethereum.org 2024 Contributor OATs
158+
### ethereum.org 2025 Contributor OATs
159159

160-
- If you have committed any changes in 2024 so far that were merged into our repo or if you have translated a certain amount of words, you can claim your OATs!
160+
- If you have committed any changes in 2025 so far that were merged into our repo or if you have translated a certain amount of words, you can claim your OATs!
161161
- There are OATs for GitHub, content, design and translation contributions.
162162

163163
[![Discord](https://img.shields.io/discord/714888181740339261?color=1C1CE1&label=Claim%20Your%20POAP!%20%7C%20Discord%20%F0%9F%91%8B%20&style=flat)](https://discord.gg/ethereum-org)

app/[locale]/get-eth/page.tsx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ import { getRequiredNamespacesForPage } from "@/lib/utils/translations"
1515

1616
import GetEthPage from "./_components/get-eth"
1717

18+
import { routing } from "@/i18n/routing"
19+
1820
export default async function Page({
1921
params,
2022
}: {
@@ -40,6 +42,10 @@ export default async function Page({
4042
)
4143
}
4244

45+
export async function generateStaticParams() {
46+
return routing.locales.map((locale) => ({ locale }))
47+
}
48+
4349
export async function generateMetadata({
4450
params,
4551
}: {

app/[locale]/staking/deposit-contract/_components/deposit-contract.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,8 @@ const StyledFakeLink = (props: ButtonProps) => (
140140
/>
141141
)
142142

143-
const CHUNKED_ADDRESS = DEPOSIT_CONTRACT_ADDRESS.match(/.{1,3}/g)?.join(" ")
143+
const CHUNKED_ADDRESS =
144+
DEPOSIT_CONTRACT_ADDRESS.match(/(?:^0x|.{4})/g)?.join(" ")
144145

145146
const blockieSrc = makeBlockie(DEPOSIT_CONTRACT_ADDRESS)
146147

app/page.tsx

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

docs/stack.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
- [React](https://reactjs.org/) - A JavaScript library for building component-based user interfaces
1111
- [Typescript](https://www.typescriptlang.org/) - TypeScript is a strongly typed programming language that builds on JavaScript
1212
- [Chakra UI](https://chakra-ui.com/) - A UI library (Migration in progress)
13-
- [Algolia](https://www.algolia.com/) - Site indexing, rapid intra-site search results, and search analytics. [Learn more on how we implement Algolia for site search](./docs/ALGOLIA_DOCSEARCH.md).
13+
- [Algolia](https://www.algolia.com/) - Site indexing, rapid intra-site search results, and search analytics. [Learn more on how we implement Algolia for site search](./site-search.md).
1414
- Primary implementation: `/src/components/Search/index.ts`
1515
- [Crowdin](https://crowdin.com/) - crowdsourcing for our translation efforts (See "Translation initiative" below)
1616
- [GitHub Actions](https://github.com/features/actions) - Manages CI/CD, and issue tracking

middleware.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import createMiddleware from "next-intl/middleware"
2+
3+
import { routing } from "./src/i18n/routing"
4+
5+
export default createMiddleware(routing)
6+
7+
// Simplified matcher pattern
8+
export const config = {
9+
matcher: ["/((?!api|_next|_vercel|.*\\.[^/]*$).*)"],
10+
}

public/content/contributing/translation-program/content-buckets/index.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,6 @@ Below is a breakdown of the website pages each content bucket contains.
254254

255255
- [About ethereum.org](/about/)
256256
- [Enterprise Ethereum](/enterprise/)
257-
- [Private Ethereum](/enterprise/private-ethereum/)
258257
- [Brand assets](/assets/)
259258
- [About the Ethereum Foundation](/foundation/)
260259
- [Bug bounty program](/bug-bounty/)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Slashing is a more severe action that results in the forceful removal of a valid
7070
- By attesting to a block that "surrounds" another one (effectively changing history)
7171
- By "double voting" by attesting to two candidates for the same block
7272

73-
If these actions are detected, the validator is slashed. This means that 1/32 of their staked ether (up to a maximum of 1 ether) is immediately burned, then a 36 day removal period begins. During this removal period the validator's stake gradually bleeds away. At the mid-point (Day 18) an additional penalty is applied whose magnitude scales with the total staked ether of all slashed validators in the 36 days prior to the slashing event. This means that when more validators are slashed, the magnitude of the slash increases. The maximum slash is the full effective balance of all slashed validators (i.e. if there are lots of validators being slashed they could lose their entire stake). On the other hand, a single, isolated slashing event only burns a small portion of the validator's stake. This midpoint penalty that scales with the number of slashed validators is called the "correlation penalty".
73+
If these actions are detected, the validator is slashed. This means that 0.0078125 is immediately burned for a 32 ETH validator (scaled linearly with active balance), then a 36 day removal period begins. During this removal period the validator's stake gradually bleeds away. At the mid-point (Day 18) an additional penalty is applied whose magnitude scales with the total staked ether of all slashed validators in the 36 days prior to the slashing event. This means that when more validators are slashed, the magnitude of the slash increases. The maximum slash is the full effective balance of all slashed validators (i.e. if there are lots of validators being slashed they could lose their entire stake). On the other hand, a single, isolated slashing event only burns a small portion of the validator's stake. This midpoint penalty that scales with the number of slashed validators is called the "correlation penalty".
7474

7575
## Inactivity leak {#inactivity-leak}
7676

0 commit comments

Comments
 (0)