Skip to content

Commit 6cea877

Browse files
committed
Merge branch 'dev' of https://github.com/Shiva-Sai-ssb/ethereum-org-website into fix-13649
2 parents ec878ba + 69cdf4e commit 6cea877

File tree

87 files changed

+884
-381
lines changed

Some content is hidden

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

87 files changed

+884
-381
lines changed

.all-contributorsrc

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12398,6 +12398,51 @@
1239812398
"contributions": [
1239912399
"content"
1240012400
]
12401+
},
12402+
{
12403+
"login": "yannggg",
12404+
"name": "Yann Gerardi",
12405+
"avatar_url": "https://avatars.githubusercontent.com/u/29145014?v=4",
12406+
"profile": "https://www.mtpelerin.com",
12407+
"contributions": [
12408+
"code"
12409+
]
12410+
},
12411+
{
12412+
"login": "panditdhamdhere",
12413+
"name": "Pandit Dhamdhere",
12414+
"avatar_url": "https://avatars.githubusercontent.com/u/85685981?v=4",
12415+
"profile": "https://github.com/panditdhamdhere",
12416+
"contributions": [
12417+
"code"
12418+
]
12419+
},
12420+
{
12421+
"login": "ferreiramarcelo",
12422+
"name": "M@rC3L0",
12423+
"avatar_url": "https://avatars.githubusercontent.com/u/11818521?v=4",
12424+
"profile": "http://linkedin.com/in/fmarcelo",
12425+
"contributions": [
12426+
"ideas"
12427+
]
12428+
},
12429+
{
12430+
"login": "Refdeveloper",
12431+
"name": "DevOFtoken",
12432+
"avatar_url": "https://avatars.githubusercontent.com/u/87125773?v=4",
12433+
"profile": "https://github.com/Refdeveloper",
12434+
"contributions": [
12435+
"ideas"
12436+
]
12437+
},
12438+
{
12439+
"login": "vvvvvv1vvvvvv",
12440+
"name": "vvvvvv1vvvvvv",
12441+
"avatar_url": "https://avatars.githubusercontent.com/u/86296331?v=4",
12442+
"profile": "https://github.com/vvvvvv1vvvvvv",
12443+
"contributions": [
12444+
"doc"
12445+
]
1240112446
}
1240212447
],
1240312448
"contributorsPerLine": 7,

.github/workflows/wallets-check.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Check Wallet Data for new_to_crypto
2+
3+
on:
4+
pull_request:
5+
paths:
6+
- "src/data/wallets/wallet-data.ts"
7+
8+
jobs:
9+
check_new_to_crypto:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Checkout repository
13+
uses: actions/checkout@v3
14+
15+
- name: Check for new_to_crypto
16+
id: check_new_to_crypto
17+
run: |
18+
if git diff --name-only HEAD^ | grep -q "data/wallets/wallet-data.ts"; then
19+
if git diff -U0 HEAD^ HEAD data/wallets/wallet-data.ts | grep -q "+.*new_to_crypto: true"; then
20+
echo "New wallet added with 'new_to_crypto: true'"
21+
echo "new_to_crypto_found=true" >> $GITHUB_OUTPUT
22+
else
23+
echo "new_to_crypto_found=false" >> $GITHUB_OUTPUT
24+
fi
25+
fi
26+
27+
- name: Comment on PR if new_to_crypto is added
28+
if: steps.check_new_to_crypto.outputs.new_to_crypto_found == 'true'
29+
uses: actions-ecosystem/action-add-comment@v1
30+
with:
31+
github-token: ${{ secrets.GITHUB_TOKEN }}
32+
body: "A wallet has been added with 'new_to_crypto: true'. Please ensure this meets our guidelines."

.storybook/preview.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@ import ThemeProvider from "@/components/ThemeProvider"
77
import i18n, { baseLocales } from "./i18next"
88
import { withNextThemes } from "./withNextThemes"
99

10-
import "@docsearch/css"
1110
import "../src/styles/global.css"
1211
import "../src/styles/fonts.css"
1312
import "../src/styles/docsearch.css"
1413

14+
import "@docsearch/css"
15+
1516
MotionGlobalConfig.skipAnimations = isChromatic()
1617

1718
export const breakpointSet: [token: string, value: string][] = [

README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1896,6 +1896,13 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
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>
18971897
<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>
18981898
</tr>
1899+
<tr>
1900+
<td align="center" valign="top" width="14.28%"><a href="https://www.mtpelerin.com"><img src="https://avatars.githubusercontent.com/u/29145014?v=4?s=100" width="100px;" alt="Yann Gerardi"/><br /><sub><b>Yann Gerardi</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=yannggg" title="Code">💻</a></td>
1901+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/panditdhamdhere"><img src="https://avatars.githubusercontent.com/u/85685981?v=4?s=100" width="100px;" alt="Pandit Dhamdhere"/><br /><sub><b>Pandit Dhamdhere</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=panditdhamdhere" title="Code">💻</a></td>
1902+
<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>
1903+
<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>
1904+
<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+
</tr>
18991906
</tbody>
19001907
</table>
19011908

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
"@radix-ui/react-radio-group": "^1.2.0",
4747
"@radix-ui/react-slot": "^1.1.0",
4848
"@radix-ui/react-switch": "^1.1.0",
49+
"@radix-ui/react-tooltip": "^1.1.2",
4950
"@radix-ui/react-visually-hidden": "^1.1.0",
5051
"@sentry/nextjs": "^8.19.0",
5152
"@socialgouv/matomo-next": "^1.8.0",

public/content/bridges/index.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,15 @@ Many bridging solutions adopt models between these two extremes with varying deg
9595

9696
<Divider />
9797

98+
## Use bridge {#use-bridge}
99+
100+
Using bridges allows you to move your assets across different blockchains. Here are some resources that can help you find and use bridges:
101+
102+
- **[L2BEAT Bridges Summary](https://l2beat.com/bridges/summary) & [L2BEAT Bridges Risk Analysis](https://l2beat.com/bridges/risk)**: A comprehensive summary of various bridges, including details on market share, bridge type, and destination chains. L2BEAT also has a risk analysis for bridges, helping users make informed decisions when selecting a bridge.
103+
- **[DefiLlama Bridge Summary](https://defillama.com/bridges/Ethereum)**: A summary of bridge volumes across Ethereum networks.
104+
105+
<Divider />
106+
98107
## Risk using bridges {#bridge-risk}
99108

100109
Bridges are in the early stages of development. It is likely that the optimal bridge design has not yet been discovered. Interacting with any type of bridge carries risk:

public/content/community/support/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,5 +100,6 @@ Most of the teams building Ethereum clients also have dedicated, public-facing,
100100
- [Lighthouse](https://discord.gg/cyAszAh)
101101
- [Teku](https://discord.gg/7hPv2T6)
102102
- [Lodestar](https://discord.gg/aMxzVcr)
103+
- [Grandine](https://discord.gg/H9XCdUSyZd)
103104

104105
You can also [learn how to run a node here](/developers/docs/nodes-and-clients/run-a-node/).

public/content/contributing/adding-staking-products/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ For any custom software or smart contracts involved:
8787

8888
For software products related to node or client setup, management or migration:
8989

90-
**Which consensus layer clients (i.e. Lighthouse, Teku, Nimbus, Prysm) are supported?**
90+
**Which consensus layer clients (i.e. Lighthouse, Teku, Nimbus, Prysm, Grandine) are supported?**
9191

9292
- Which clients are supported? Can the user choose?
9393
- This is used to determine the products "multi-client" score.

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,12 +194,13 @@ Learn more about it by reading its [documentation](https://github.com/ethereumjs
194194
There are multiple consensus clients (previously known as 'Eth2' clients) to support the [consensus upgrades](/roadmap/beacon-chain/). They are responsible for all consensus-related logic including the fork-choice algorithm, processing attestations and managing [proof-of-stake](/developers/docs/consensus-mechanisms/pos) rewards and penalties.
195195

196196
| Client | Language | Operating systems | Networks |
197-
| ------------------------------------------------------------- | ---------- | --------------------- | ----------------------------------------------------------------- |
197+
| ------------------------------------------------------------- | ---------- | --------------------- | ----------------------------------------------------------------- | |
198198
| [Lighthouse](https://lighthouse.sigmaprime.io/) | Rust | Linux, Windows, macOS | Beacon Chain, Goerli, Pyrmont, Sepolia, Ropsten, and more |
199199
| [Lodestar](https://lodestar.chainsafe.io/) | TypeScript | Linux, Windows, macOS | Beacon Chain, Goerli, Sepolia, Ropsten, and more |
200200
| [Nimbus](https://nimbus.team/) | Nim | Linux, Windows, macOS | Beacon Chain, Goerli, Sepolia, Ropsten, and more |
201201
| [Prysm](https://docs.prylabs.network/docs/getting-started/) | Go | Linux, Windows, macOS | Beacon Chain, Gnosis, Goerli, Pyrmont, Sepolia, Ropsten, and more |
202202
| [Teku](https://consensys.net/knowledge-base/ethereum-2/teku/) | Java | Linux, Windows, macOS | Beacon Chain, Gnosis, Goerli, Sepolia, Ropsten, and more |
203+
| [Grandine](https://docs.grandine.io/) (beta) | Rust | Linux, Windows, macOS | Beacon Chain, Goerli, Sepolia, and more
203204

204205
### Lighthouse {#lighthouse}
205206

@@ -233,6 +234,12 @@ Teku offers very flexible deployment options. The beacon node and validator clie
233234

234235
Teku is written in Java and is Apache 2.0 licensed. It is developed by the Protocols team at ConsenSys that is also responsible for Besu and Web3Signer. Learn more in [Teku docs](https://docs.teku.consensys.net/en/latest/).
235236

237+
### Grandine {#grandine}
238+
239+
Grandine is a consensus client implementation, written in Rust under the GPL-3.0 license. It is maintained by the Grandine Core Team and is fast, high-performance and lightweight. It fits a wide range of stakers from solo stakers running on low-resource devices such as Raspberry Pi to large institutional stakers running tens of thousands of validators.
240+
241+
Documentation can be found in the [Grandine Book](https://docs.grandine.io/)
242+
236243
## Synchronization modes {#sync-modes}
237244

238245
To follow and verify current data in the network, the Ethereum client needs to sync with the latest network state. This is done by downloading data from peers, cryptographically verifying their integrity, and building a local blockchain database.

public/content/developers/docs/storage/index.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Platforms with contract-based persistence:
4545
- [Filecoin](https://docs.filecoin.io/about-filecoin/what-is-filecoin/)
4646
- [Skynet](https://siasky.net/)
4747
- [Storj](https://storj.io/)
48-
- [0Chain](https://0chain.net/)
48+
- [Züs](https://zus.network/)
4949
- [Crust Network](https://crust.network)
5050
- [Swarm](https://www.ethswarm.org/)
5151
- [4EVERLAND](https://www.4everland.org/)
@@ -75,7 +75,7 @@ One of the most popular ways to make sure data is retained, is to use some type
7575

7676
Types of dStorage with a challenge mechanism:
7777

78-
- 0Chain
78+
- Züs
7979
- Skynet
8080
- Arweave
8181
- Filecoin
@@ -88,7 +88,6 @@ There aren't great tools to measure the level of decentralization of platforms,
8888

8989
Decentralized tools without KYC:
9090

91-
- 0Chain (implementing a non-KYC edition)
9291
- Skynet
9392
- Arweave
9493
- Filecoin
@@ -110,7 +109,7 @@ Proof-of-stake based:
110109

111110
- Ethereum
112111
- Filecoin
113-
- 0Chain
112+
- Züs
114113
- Crust Network
115114

116115
## Related tools {#related-tools}
@@ -145,10 +144,10 @@ Proof-of-stake based:
145144
- [Documentation](https://docs.arweave.org/info/)
146145
- [Arweave](https://github.com/ArweaveTeam/arweave/)
147146

148-
**0chain - _0Chain is a proof-of-stake dStorage platform with sharding and blobbers._**
147+
**Züs - _Züs is a proof-of-stake dStorage platform with sharding and blobbers._**
149148

150-
- [0Chain.net](https://0chain.net/)
151-
- [Documentation](https://docs.0chain.net/0chain/)
149+
- [zus.network](https://zus.network/)
150+
- [Documentation](https://0chaindocs.gitbook.io/zus-docs)
152151
- [GitHub](https://github.com/0chain/)
153152

154153
**Crust Network - _Crust is a dStorage platform on top of the IPFS._**

0 commit comments

Comments
 (0)