Skip to content

Commit f8bbd9d

Browse files
committed
Merge branch 'dev' of github.com:ethereum/ethereum-org-website into performance-chartjs
2 parents d723cd2 + 22a656f commit f8bbd9d

File tree

103 files changed

+3443
-3811
lines changed

Some content is hidden

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

103 files changed

+3443
-3811
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,7 @@ robots.txt
5656

5757
# Crowdin report output
5858
src/data/crowdin/bucketsAwaitingReviewReport.csv
59+
60+
# Storybook
61+
build-storybook.log
62+
storybook-static

.storybook/main.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ const config: StorybookConfig = {
2222
"@storybook/addon-essentials",
2323
"@storybook/addon-interactions",
2424
"storybook-react-i18next",
25+
"@chromatic-com/storybook"
2526
],
2627
staticDirs: ["../public"],
2728
framework: {
@@ -68,6 +69,8 @@ const config: StorybookConfig = {
6869
return !(isStyledSystemProp || isHTMLElementProp)
6970
},
7071
},
72+
73+
reactDocgen: "react-docgen-typescript"
7174
},
7275
}
7376
export default config

chromatic.config.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"projectId": "Project:6629cd26b1440f2cc20b94c0",
3+
"zip": true,
4+
"buildScriptName": "build-storybook:chromatic"
5+
}

package.json

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"crowdin-contributors": "ts-node -O '{ \"module\": \"commonjs\" }' src/scripts/crowdin/getCrowdinContributors.ts",
1616
"storybook": "storybook dev -p 6006",
1717
"build-storybook": "storybook build",
18+
"build-storybook:chromatic": "storybook build --test",
1819
"chromatic": "chromatic --project-token fee8e66c9916",
1920
"crowdin-clean": "rm -rf .crowdin && mkdir .crowdin",
2021
"crowdin-import": "ts-node src/scripts/crowdin-import.ts",
@@ -63,41 +64,43 @@
6364
},
6465
"devDependencies": {
6566
"@chakra-ui/cli": "^2.4.1",
67+
"@chromatic-com/storybook": "1.5.0",
6668
"@netlify/plugin-nextjs": "^5.0.0",
67-
"@storybook/addon-essentials": "7.6.6",
68-
"@storybook/addon-interactions": "7.6.6",
69-
"@storybook/addon-links": "7.6.6",
70-
"@storybook/nextjs": "7.6.6",
71-
"@storybook/react": "7.6.6",
72-
"@storybook/test": "8.0.0",
69+
"@storybook/addon-essentials": "8.1.10",
70+
"@storybook/addon-interactions": "8.1.10",
71+
"@storybook/addon-links": "8.1.10",
72+
"@storybook/nextjs": "^8.1.10",
73+
"@storybook/react": "8.1.10",
74+
"@storybook/test": "8.1.10",
7375
"@svgr/webpack": "^8.1.0",
7476
"@types/decompress": "^4.2.7",
7577
"@types/hast": "^3.0.0",
7678
"@types/node": "^20.4.2",
7779
"@types/react": "18.2.57",
7880
"@types/react-dom": "18.2.19",
79-
"chromatic": "^10.5.0",
81+
"chromatic": "10.9.6",
8082
"decompress": "^4.2.1",
8183
"eslint": "^8.45.0",
8284
"eslint-config-next": "^14.2.2",
8385
"eslint-config-prettier": "^9.0.0",
8486
"eslint-plugin-simple-import-sort": "^10.0.0",
85-
"eslint-plugin-storybook": "^0.6.15",
87+
"eslint-plugin-storybook": "0.8.0",
8688
"image-size": "^1.0.2",
8789
"mdast-util-toc": "^7.0.0",
8890
"minimist": "^1.2.8",
8991
"plaiceholder": "^3.0.0",
9092
"polished": "^4.2.2",
9193
"raw-loader": "^4.0.2",
92-
"storybook": "7.6.6",
93-
"storybook-react-i18next": "^2.0.9",
94+
"storybook": "8.1.10",
95+
"storybook-react-i18next": "3.1.1",
9496
"ts-node": "^10.9.1",
9597
"tsconfig-paths-webpack-plugin": "4.1.0",
96-
"typescript": "^5.4.2",
98+
"typescript": "^5.5.2",
9799
"unified": "^10.0.0",
98100
"unist-util-visit": "^5.0.0"
99101
},
100102
"resolutions": {
101-
"jackspeak": "2.1.1"
103+
"jackspeak": "2.1.1",
104+
"sharp": "0.32.6"
102105
}
103106
}

public/content/community/language-resources/index.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@ If you are bilingual and want to help us reach more people, you can also get inv
110110
### Russian {#ru}
111111

112112
- [Cyber Academy](https://cyberacademy.dev) - educational space for web3 builders
113+
- [Forklog](https://forklog.com) - news and educational articles about crypto in general, existing technologies and future upgrades of different blockchains
114+
- [BeInCrypto](https://ru.beincrypto.com) - news, crypto price analysis and non-technical articles with simple explanations about everything in crypto
113115

114116
### Spanish {#es}
115117

public/content/decentralized-identity/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Decentralized identity can help create online communities that are free of fake
7373

7474
### 4. Anti-Sybil protection {#sybil-protection}
7575

76-
Sybil attacks refer to individual humans tricking a system into thinking they are multiple people to increase their influence. Grant-giving applications that use [quadratic voting](/glossary/#quadratic-voting) are vulnerable to these Sybil attacks because the value of a grant is increased when more individuals vote for it, incentivizing users to split their contributions across many identities. Decentralized identities help to prevent this by raising the burden on each participant to prove that they are really human, although often without having to reveal specific private information.
76+
Grant-giving applications that use [quadratic voting](/glossary/#quadratic-voting) are vulnerable to [Sybil attacks](/glossary/#sybil-attack) because the value of a grant is increased when more individuals vote for it, incentivizing users to split their contributions across many identities. Decentralized identities help to prevent this by raising the burden on each participant to prove that they are really human, although often without having to reveal specific private information.
7777

7878
## What are attestations? {#what-are-attestations}
7979

public/content/developers/docs/consensus-mechanisms/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: An explanation of consensus protocols in distributed systems and th
44
lang: en
55
---
66

7-
The term 'consensus mechanism' is often used colloquially to refer to 'proof-of-stake', 'proof-of-work' or 'proof-of-authority' protocols. However, these are just components in consensus mechanisms that protect against Sybil attacks. Consensus mechanisms are the complete stack of ideas, protocols and incentives that enable a distributed set of nodes to agree on the state of a blockchain.
7+
The term 'consensus mechanism' is often used colloquially to refer to 'proof-of-stake', 'proof-of-work' or 'proof-of-authority' protocols. However, these are just components in consensus mechanisms that protect against [Sybil attacks](/glossary/#sybil-attack). Consensus mechanisms are the complete stack of ideas, protocols and incentives that enable a distributed set of nodes to agree on the state of a blockchain.
88

99
## Prerequisites {#prerequisites}
1010

@@ -68,7 +68,7 @@ Watch more on the different types of consensus mechanisms used on Ethereum:
6868

6969
Proof-of-work and proof-of-stake alone are not consensus protocols, but they are often referred to as such for simplicity. They are actually Sybil resistance mechanisms and block author selectors; they are a way to decide who is the author of the latest block. Another important component is the chain selection (aka fork choice) algorithm that enables nodes to pick one single correct block at the head of the chain in scenarios where multiple blocks exist in the same position.
7070

71-
**Sybil resistance** measures how a protocol fares against a [Sybil attack](https://wikipedia.org/wiki/Sybil_attack). Sybil attacks are when one user or group pretends to be many users. Resistance to this type of attack is essential for a decentralized blockchain and enables miners and validators to be rewarded equally based on resources put in. Proof-of-work and proof-of-stake protect against this by making users expend a lot of energy or put up a lot of collateral. These protections are an economic deterrent to Sybil attacks.
71+
**Sybil resistance** measures how a protocol fares against a Sybil attack. Resistance to this type of attack is essential for a decentralized blockchain and enables miners and validators to be rewarded equally based on resources put in. Proof-of-work and proof-of-stake protect against this by making users expend a lot of energy or put up a lot of collateral. These protections are an economic deterrent to Sybil attacks.
7272

7373
A **chain selection rule** is used to decide which chain is the "correct" chain. Bitcoin uses the "longest chain" rule, which means that whichever blockchain is the longest will be the one the rest of the nodes accept as valid and work with. For proof-of-work chains, the longest chain is determined by the chain's total cumulative proof-of-work difficulty. Ethereum used to use the longest chain rule too; however, now that Ethereum runs on proof-of-stake it adopted an updated fork-choice algorithm that measures the 'weight' of the chain. The weight is the accumulated sum of validator votes, weighted by validator staked-ether balances.
7474

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ Over Ethereum's nine year history, the EVM has undergone several revisions, and
6363
- [Py-EVM](https://github.com/ethereum/py-evm) - _Python_
6464
- [evmone](https://github.com/ethereum/evmone) - _C++_
6565
- [ethereumjs-vm](https://github.com/ethereumjs/ethereumjs-vm) - _JavaScript_
66-
- [eEVM](https://github.com/microsoft/eevm) - _C++_
6766
- [revm](https://github.com/bluealloy/revm) - _Rust_
6867

6968
## Further Reading {#further-reading}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ Some decentralized oracle networks require participants to vote or stake on the
274274

275275
Nodes whose answers deviate from the majority answer are penalized by having their tokens distributed to others who provide more correct values. Forcing nodes to provide a bond before providing data incentivizes honest responses since they are assumed to be rational economic actors intent on maximizing returns.
276276

277-
Staking/voting also protects decentralized oracles from Sybil attacks where malicious actors create multiple identities to game the consensus system. However, staking cannot prevent “freeloading” (oracle nodes copying information from others) and “lazy validation” (oracle nodes following the majority without verifying the information themselves).
277+
Staking/voting also protects decentralized oracles from [Sybil attacks](/glossary/#sybil-attack) where malicious actors create multiple identities to game the consensus system. However, staking cannot prevent “freeloading” (oracle nodes copying information from others) and “lazy validation” (oracle nodes following the majority without verifying the information themselves).
278278

279279
##### Schelling point mechanisms
280280

public/content/developers/docs/scaling/validium/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ Multiple projects provide implementations of Validium and volitions that you can
154154
**Matter Labs zkPorter**- _zkPorter is a Layer 2 scaling protocol tackling data availability with a hybrid approach that combines the ideas of zkRollup and sharding. It can support arbitrarily many shards, each with its own data availability policy._
155155

156156
- [Blog](https://blog.matter-labs.io/zkporter-a-breakthrough-in-l2-scaling-ed5e48842fbf)
157-
- [Documentation](https://docs.zksync.io/zk-stack/concepts/hyperchains-hyperscaling.html#logical-state-partitions-in-zk-porters)
157+
- [Documentation](https://docs.zksync.io/zk-stack/concepts/data-availability)
158158
- [Website](https://zksync.io/)
159159

160160
## Further reading {#further-reading}

0 commit comments

Comments
 (0)