Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
9127812
Update community-events.json
Nik-EpicWeb3 Jun 2, 2025
38320d1
communities - empty hive group removed
radeksvarz Jun 2, 2025
0738a9a
Update community-meetups.json - beerfi adjusted name and link
radeksvarz Jun 2, 2025
1f65410
Merge pull request #15610 from ethereum/master
wackerow Jun 4, 2025
61ce01d
feat: use 7d gtp endpoint
wackerow Jun 4, 2025
98919f9
remove old info from withdrawal page
konopkja Jun 4, 2025
80f745f
removing mention of shapella upgrade fromm staking as a service - irr…
konopkja Jun 4, 2025
1c2ed63
fix: 10y image banner
wackerow Jun 4, 2025
36bd66d
Merge pull request #15612 from ethereum/konopkja-patch-4
wackerow Jun 4, 2025
b786716
Merge pull request #15613 from ethereum/konopkja-patch-5
wackerow Jun 4, 2025
0755f42
Merge pull request #15615 from ethereum/fix-10y-img
corwintines Jun 5, 2025
42b83a9
Merge pull request #15611 from ethereum/gtp-7d
pettinarip Jun 5, 2025
5007c17
fix: json syntax
wackerow Jun 5, 2025
5e5782f
Merge pull request #15586 from Nik-EpicWeb3/patch-2
wackerow Jun 5, 2025
0430836
docs: update README.md [skip ci]
allcontributors[bot] Jun 5, 2025
263df4c
docs: update .all-contributorsrc [skip ci]
allcontributors[bot] Jun 5, 2025
2cf9f96
Merge pull request #15621 from ethereum/all-contributors/add-Nik-Epic…
wackerow Jun 5, 2025
5052b52
Merge pull request #15590 from radeksvarz/patch-3
wackerow Jun 5, 2025
d40448b
docs: update README.md [skip ci]
allcontributors[bot] Jun 5, 2025
ce96786
docs: update .all-contributorsrc [skip ci]
allcontributors[bot] Jun 5, 2025
471b46d
Merge pull request #15622 from ethereum/all-contributors/add-radeksvarz
wackerow Jun 5, 2025
e71e80d
Merge pull request #15591 from radeksvarz/patch-4
wackerow Jun 5, 2025
564e636
refactor: rename gh token to not be public
pettinarip Jun 6, 2025
8d70a0e
Merge pull request #15625 from ethereum/fix-envvar
wackerow Jun 6, 2025
0791714
fix: 10years metadata, feat: add custom og image
wackerow Jun 6, 2025
4b038ad
update: 10years metadata description
wackerow Jun 6, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -11685,7 +11685,8 @@
"avatar_url": "https://avatars.githubusercontent.com/u/6020891?v=4",
"profile": "http://www.edukids.cz",
"contributions": [
"eventOrganizing"
"eventOrganizing",
"maintenance"
]
},
{
Expand Down Expand Up @@ -12770,6 +12771,15 @@
"contributions": [
"maintenance"
]
},
{
"login": "Nik-EpicWeb3",
"name": "Nik-EpicWeb3",
"avatar_url": "https://avatars.githubusercontent.com/u/214466248?v=4",
"profile": "https://github.com/Nik-EpicWeb3",
"contributions": [
"eventOrganizing"
]
}
],
"contributorsPerLine": 7,
Expand Down
2 changes: 1 addition & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# NEXT_PUBLIC_ALGOLIA_BASE_SEARCH_INDEX_NAME=insertValue

# Github token for read-only use with api functions
# NEXT_PUBLIC_GITHUB_TOKEN_READ_ONLY=insertValue
# GITHUB_TOKEN_READ_ONLY=insertValue

# Etherscan API key (required for Etherscan API fetches)
# ETHERSCAN_API_KEY=insertValue
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -1836,7 +1836,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<td align="center" valign="top" width="14.28%"><a href="http://hector.im"><img src="https://avatars.githubusercontent.com/u/12469549?v=4?s=100" width="100px;" alt="Héctor Chong"/><br /><sub><b>Héctor Chong</b></sub></a><br /><a href="#content-Hector-Chong" title="Content">🖋</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/nakmr"><img src="https://avatars.githubusercontent.com/u/145886319?v=4?s=100" width="100px;" alt="nace.kimura"/><br /><sub><b>nace.kimura</b></sub></a><br /><a href="#content-nakmr" title="Content">🖋</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/WuRuiLei2023"><img src="https://avatars.githubusercontent.com/u/149141323?v=4?s=100" width="100px;" alt="WuRuiLei2023"/><br /><sub><b>WuRuiLei2023</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AWuRuiLei2023" title="Bug reports">🐛</a></td>
<td align="center" valign="top" width="14.28%"><a href="http://www.edukids.cz"><img src="https://avatars.githubusercontent.com/u/6020891?v=4?s=100" width="100px;" alt="Radek"/><br /><sub><b>Radek</b></sub></a><br /><a href="#eventOrganizing-radeksvarz" title="Event Organizing">📋</a></td>
<td align="center" valign="top" width="14.28%"><a href="http://www.edukids.cz"><img src="https://avatars.githubusercontent.com/u/6020891?v=4?s=100" width="100px;" alt="Radek"/><br /><sub><b>Radek</b></sub></a><br /><a href="#eventOrganizing-radeksvarz" title="Event Organizing">📋</a> <a href="#maintenance-radeksvarz" title="Maintenance">🚧</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/bhargavkakadiya"><img src="https://avatars.githubusercontent.com/u/26486494?v=4?s=100" width="100px;" alt="Bhargav kakadiya"/><br /><sub><b>Bhargav kakadiya</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Abhargavkakadiya" title="Bug reports">🐛</a></td>
</tr>
<tr>
Expand Down Expand Up @@ -1990,6 +1990,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<td align="center" valign="top" width="14.28%"><a href="https://github.com/smithrashell"><img src="https://avatars.githubusercontent.com/u/36465023?v=4?s=100" width="100px;" alt="Rashell Smith"/><br /><sub><b>Rashell Smith</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Asmithrashell" title="Bug reports">🐛</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/aolson078"><img src="https://avatars.githubusercontent.com/u/69769089?v=4?s=100" width="100px;" alt="Alex Olson"/><br /><sub><b>Alex Olson</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Aaolson078" title="Bug reports">🐛</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://www.suci.io/"><img src="https://avatars.githubusercontent.com/u/155696196?v=4?s=100" width="100px;" alt="SUCI - Blockchain Hub Team"/><br /><sub><b>SUCI - Blockchain Hub Team</b></sub></a><br /><a href="#maintenance-adminsuci" title="Maintenance">🚧</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Nik-EpicWeb3"><img src="https://avatars.githubusercontent.com/u/214466248?v=4?s=100" width="100px;" alt="Nik-EpicWeb3"/><br /><sub><b>Nik-EpicWeb3</b></sub></a><br /><a href="#eventOrganizing-Nik-EpicWeb3" title="Event Organizing">📋</a></td>
</tr>
</tbody>
</table>
Expand Down
2 changes: 1 addition & 1 deletion app/[locale]/10years/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ export async function generateMetadata({

return await getMetadata({
locale,
slug: ["10-year-anniversary"],
slug: ["10years"],
title: t("page-10-year-anniversary-meta-title"),
description: t("page-10-year-anniversary-meta-description"),
})
Expand Down
2 changes: 1 addition & 1 deletion docs/api-keys.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ We recommend setting this up when running the project locally, as we use the Git

```sh
# .env Example:
NEXT_PUBLIC_GITHUB_TOKEN_READ_ONLY=48f84de812090000demo00000000697cf6e6a059
GITHUB_TOKEN_READ_ONLY=48f84de812090000demo00000000697cf6e6a059
```

2. Add Etherscan API token (free)
Expand Down
1 change: 0 additions & 1 deletion public/content/community/online/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ If you believe a community should be added or removed based on these guidelines,
<SocialListItem socialIcon="twitter"><Link href="https://x.com/ethereum">@ethereum</Link> - Main Ethereum account for the community</SocialListItem>
<SocialListItem socialIcon="twitter"><Link href="https://x.com/ethereumfndn">@ethereumfndn</Link> - Official account of the Ethereum Foundation</SocialListItem>
<SocialListItem socialIcon="twitter"><Link href="https://x.com/ethdotorg">@ethdotorg</Link> - The portal to Ethereum, built for our growing global community</SocialListItem>
<SocialListItem socialIcon="webpage"><Link href="https://hive.one/c/ethereum?page=1">List of influential Ethereum twitter accounts</Link></SocialListItem>

<Divider />

Expand Down
2 changes: 1 addition & 1 deletion public/content/staking/saas/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ Updating withdrawal credentials is a required step to enable withdrawals\*. This
</ExpandableCard>

<ExpandableCard title="When can I withdraw?" eventCategory="SaasStaking" eventName="clicked when can I withdraw">
Staking withdrawals were implemented in the Shanghai/Capella upgrade in April 2023. Stakers need to provide a withdrawal address (if not provided on initial deposit), and reward payments will begin being distributed automatically on a periodic basis every few days.
Stakers need to provide a withdrawal address (if not provided on initial deposit), and reward payments will begin being distributed automatically on a periodic basis every few days.

Validators can also fully exit as a validator, which will unlock their remaining ETH balance for withdrawal. Accounts that have provided an execution withdrawal address and completed the exiting process will receive their entire balance to the withdrawal address provided during the next validator sweep.

Expand Down
8 changes: 2 additions & 6 deletions public/content/staking/withdrawals/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@ summaryPoints:
- Validators who fully exit staking will receive their remaining balance
---

<UpgradeStatus dateKey="page-staking-withdrawals-when">
Staking withdrawals were enabled with the Shanghai/Capella upgrade which occurred on April 12, 2023.&nbsp;<a href="#when" customEventOptions={{ eventCategory: "Anchor link", eventAction: "When's it shipping?", eventName: "click" }}>More about Shanghai/Capella</a>
</UpgradeStatus>

**Staking withdrawals** refer to transfers of ETH from a validator account on Ethereum's consensus layer (the Beacon Chain), to the execution layer where it can be transacted with.

**Reward payments of excess balance** over 32 ETH will automatically and regularly be sent to a withdrawal address linked to each validator, once provided by the user. Users can also **exit staking entirely**, unlocking their full validator balance.
Expand Down Expand Up @@ -59,9 +55,9 @@ The process of a validator exiting from staking takes variable amounts of time,

Once an account is flagged as "withdrawable", and withdrawal credentials have been provided, there is nothing more a user needs to do aside from wait. Accounts are automatically and continuously swept by block proposers for eligible exited funds, and your account balance will be transferred in full (also known as a "full withdrawal") during the next <a href="#validator-sweeping" customEventOptions={{ eventCategory: "Anchor link", eventAction: "Exiting staking entirely (sweep)", eventName: "click" }}>sweep</a>.

## When are staking withdrawals enabled? {#when}
## When were staking withdrawals enabled? {#when}

Staking withdrawals are live! Withdrawal functionality was enabled as part of the Shanghai/Capella upgrade which occurred on April 12, 2023.
Withdrawal functionality was enabled as part of the Shanghai/Capella upgrade which occurred on** April 12, 2023**.

The Shanghai/Capella upgrade enabled previously staked ETH to be reclaimed into regular Ethereum accounts. This closed the loop on staking liquidity, and brought Ethereum one step closer on its journey towards building a sustainable, scalable, secure decentralized ecosystem.

Expand Down
Binary file modified public/images/10-year-anniversary/10-year-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions src/data/community-events.json
Original file line number Diff line number Diff line change
Expand Up @@ -790,5 +790,14 @@
"location": "Istanbul, TR",
"description": "ETHIstanbul is a conference and hackathon connecting you with global talents, industry professionals, and web3 companies advancing technology.",
"imageUrl": "https://ethistanbul.io/_next/image?url=%2F_next%2Fstatic%2Fmedia%2Fistanbul-background.99d6ad2a.webp&w=3840&q=75"
},
{
"title": "L2con",
"startDate": "2025-07-01",
"endDate": "2025-07-01",
"href": "https://lu.ma/L2conCannes/",
"location": "Cannes, FR",
"description": "​L2con is the largest EthCC[8] conference focused on the future of the scaling ecosystem, General-Purpose Chains and App-Chains, development of dApps, and what unites us all — achieving mass adoption.",
"imageUrl": "https://images.lumacdn.com/event-covers/cu/93aa5fca-1515-4a6a-aed3-9d933d8faf73.gif"
}
]
4 changes: 2 additions & 2 deletions src/data/community-meetups.json
Original file line number Diff line number Diff line change
Expand Up @@ -468,10 +468,10 @@
"link": "https://lu.ma/user/usr-zgxbPuCTyKGBQq6"
},
{
"title": "BeerFi Prague - Web3 on-chain dev Meetup",
"title": "BeerFi Prague - Web3 Builders Meetup",
"emoji": ":czech_republic:",
"location": "Prague",
"link": "https://www.meetup.com/web3-on-chain-dev-meetup-group/"
"link": "https://www.meetup.com/beerfi/"
},
{
"title": "NapulETH Meetup",
Expand Down
2 changes: 1 addition & 1 deletion src/intl/en/page-10-year-anniversary.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"page-10-year-anniversary-meta-title": "10 Year Anniversary",
"page-10-year-anniversary-meta-description": "10 Year Anniversary"
"page-10-year-anniversary-meta-description": "Celebrating 10 years of censorship resistance, 100% uptime, decentralization, community building, developer growth, global collaboration, cypherpunk values, hackathons, censorship resistance, permissionless finance, credible neutrality, the infinite garden, client diversity and more."
}
2 changes: 1 addition & 1 deletion src/lib/api/fetchGFIs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export const fetchGFIs = async () => {
try {
const response = await fetch(url, {
headers: {
Authorization: `token ${process.env.NEXT_PUBLIC_GITHUB_TOKEN_READ_ONLY}`,
Authorization: `token ${process.env.GITHUB_TOKEN_READ_ONLY}`,
Accept: "application/vnd.github.v3+json",
},
})
Expand Down
2 changes: 1 addition & 1 deletion src/lib/api/fetchGitHistory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ async function fetchWithRateLimit(filepath: string): Promise<Commit[]> {
url.searchParams.set("path", filepath)
url.searchParams.set("sha", "master")

const gitHubToken = process.env.NEXT_PUBLIC_GITHUB_TOKEN_READ_ONLY
const gitHubToken = process.env.GITHUB_TOKEN_READ_ONLY

// If no token available, return empty array
if (!gitHubToken) return []
Expand Down
20 changes: 6 additions & 14 deletions src/lib/api/fetchGrowThePie.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,27 +14,19 @@ const TXCOUNT = "txcount"
const ACTIVE_ADDRESSES = "aa_last7d"

export const fetchGrowThePie = async (): Promise<GrowThePieData> => {
const url = "https://api.growthepie.xyz/v1/fundamentals.json"
const url = "https://api.growthepie.xyz/v1/fundamentals_7d.json"

const response = await fetch(url, { cache: "no-store" })
const response = await fetch(url)
if (!response.ok) {
console.log(response.status, response.statusText)
throw new Error("Failed to fetch growthepie data")
}
const data: DataItem[] = await response.json()

// Get the date 7 days ago
const sevenDaysAgo = new Date()
sevenDaysAgo.setDate(sevenDaysAgo.getDate() - 7)

// Filter data to only include the last 7 days and the metrics we need
const filteredData = data.filter((item) => {
const itemDate = new Date(item.date)
return (
itemDate >= sevenDaysAgo &&
[TXCOSTS_MEDIAN_USD, TXCOUNT, ACTIVE_ADDRESSES].includes(item.metric_key)
)
})
// Filter data to only include the metrics we need
const filteredData = data.filter((item) =>
[TXCOSTS_MEDIAN_USD, TXCOUNT, ACTIVE_ADDRESSES].includes(item.metric_key)
)

const mostRecentDate = filteredData.reduce((latest, item) => {
const itemDate = new Date(item.date)
Expand Down
4 changes: 2 additions & 2 deletions src/lib/api/ghRepoData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ export const ghRepoData = async (githubUrl: string) => {
`https://api.github.com/repos/${repoOwner}/${repoName}`,
{
headers: {
Authorization: `Bearer ${process.env.NEXT_PUBLIC_GITHUB_TOKEN_READ_ONLY}`,
Authorization: `Bearer ${process.env.GITHUB_TOKEN_READ_ONLY}`,
},
}
)
Expand All @@ -121,7 +121,7 @@ export const ghRepoData = async (githubUrl: string) => {
`https://api.github.com/repos/${repoOwner}/${repoName}/languages`,
{
headers: {
Authorization: `Bearer ${process.env.NEXT_PUBLIC_GITHUB_TOKEN_READ_ONLY}`,
Authorization: `Bearer ${process.env.GITHUB_TOKEN_READ_ONLY}`,
},
}
)
Expand Down
1 change: 1 addition & 0 deletions src/lib/utils/metadata.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ const imageForSlug = [
{ section: "guides", image: "/images/heroes/guides-hub-hero.jpg" },
{ section: "community", image: "/images/heroes/community-hero.png" },
{ section: "staking", image: "/images/upgrades/upgrade_rhino.png" },
{ section: "10years", image: "/images/10-year-anniversary/10-year-og.png" },
] as const

/**
Expand Down