Skip to content

Commit 21c03a3

Browse files
authored
Merge branch 'ethereum:dev' into gas-docs-update
2 parents d412a9f + a19b5bd commit 21c03a3

File tree

700 files changed

+28059
-6024
lines changed

Some content is hidden

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

700 files changed

+28059
-6024
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,3 +49,6 @@ robots.txt
4949

5050
# .crowdin folder used as temp forlder for crowdin-import script
5151
.crowdin
52+
53+
# vscode workplace configuration
54+
.vscode

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"crowdin-contributors": "ts-node -O '{ \"module\": \"commonjs\" }' src/scripts/crowdin/getCrowdinContributors.ts",
1515
"storybook": "storybook dev -p 6006",
1616
"build-storybook": "storybook build",
17+
"chromatic": "chromatic --project-token fee8e66c9916",
1718
"crowdin-clean": "rm -rf .crowdin && mkdir .crowdin",
1819
"crowdin-import": "ts-node src/scripts/crowdin-import.ts",
1920
"markdown-checker": "ts-node -O '{ \"module\": \"commonjs\" }' src/scripts/markdownChecker.ts"
@@ -70,6 +71,7 @@
7071
"@types/node": "^20.4.2",
7172
"@types/react": "^18.2.15",
7273
"@types/react-dom": "^18.2.7",
74+
"chromatic": "^10.5.0",
7375
"eslint": "^8.45.0",
7476
"eslint-config-next": "^13.0.0",
7577
"eslint-config-prettier": "^9.0.0",

public/content/about/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ We're open source, with a community of contributors, so you can propose changes
8888
### 3. ethereum.org is not a typical product website 🦄 {#core-principles-3}
8989

9090
Ethereum is a big thing: it includes a community, a technology, a set of ideas and ideologies, and more.
91-
This means the website needs to handle many different user journeys, from “a developer who wants a specific tool” and “a newcomer who just bought some ETH and doesn’t know what a wallet is"
91+
This means the website needs to handle many different user journeys, from “a developer who wants a specific tool” and “a newcomer who just bought some ETH and doesn’t know what a wallet is".
9292
"What is the best website for a blockchain platform?" remains an open question - we are pioneers. Building this requires experimentation.
9393

9494
## Product roadmap {#roadmap}

public/content/community/research/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ The execution layer is concerned with executing transactions, running the [Ether
7171
- [Paths to state expiry](https://hackmd.io/@vbuterin/state_expiry_paths)
7272
- [Verkle and state expiry proposal](https://notes.ethereum.org/@vbuterin/verkle_and_state_expiry_proposal)
7373
- [History management](https://eips.ethereum.org/EIPS/eip-4444)
74-
- [Verkle Trees](https://vitalik.ca/general/2021/06/18/verkle.html)
74+
- [Verkle Trees](https://vitalik.eth.limo/general/2021/06/18/verkle.html)
7575
- [Data availability sampling](https://github.com/ethereum/research/wiki/A-note-on-data-availability-and-erasure-coding)
7676

7777
## Client Development {#client-development}

public/content/dao/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ _Typically used for decentralized development and governance of protocols and da
156156
- [How to Start a DAO-Powered Digital Community](https://daohaus.substack.com/p/four-and-a-half-steps-to-start-a)[DAOhaus](https://daohaus.club/)
157157
- [What is a DAO?](https://coinmarketcap.com/alexandria/article/what-is-a-dao)[Coinmarketcap](https://coinmarketcap.com)
158158
- [What is Holographic Consensus?](https://medium.com/daostack/holographic-consensus-part-1-116a73ba1e1c) - [DAOstack](https://daostack.io/)
159-
- [DAOs are not corporations: where decentralization in autonomous organizations matters by Vitalik](https://vitalik.ca/general/2022/09/20/daos.html)
159+
- [DAOs are not corporations: where decentralization in autonomous organizations matters by Vitalik](https://vitalik.eth.limo/general/2022/09/20/daos.html)
160160
- [DAOs, DACs, DAs and More: An Incomplete Terminology Guide](https://blog.ethereum.org/2014/05/06/daos-dacs-das-and-more-an-incomplete-terminology-guide) - [Ethereum Blog](https://blog.ethereum.org)
161161

162162
### Videos {#videos}

public/content/decentralized-identity/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ Here's an example to show how on-chain attestations might work in practice:
109109

110110
### Soulbound tokens and identity {#soulbound}
111111

112-
[Soulbound tokens](https://vitalik.ca/general/2022/01/26/soulbound.html) (non-transferable NFTs) could be used to collect information unique to a specific wallet. This effectively creates a unique on-chain identity bound to a particular Ethereum address that could include tokens representing achievements (e.g. finishing some specific online course or passing a threshold score in a game) or community participation.
112+
[Soulbound tokens](https://vitalik.eth.limo/general/2022/01/26/soulbound.html) (non-transferable NFTs) could be used to collect information unique to a specific wallet. This effectively creates a unique on-chain identity bound to a particular Ethereum address that could include tokens representing achievements (e.g. finishing some specific online course or passing a threshold score in a game) or community participation.
113113

114114
## Benefits of decentralized identity {#benefits-of-decentralized-identity}
115115

public/content/desci/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ Intellectual property (IP) is a big problem in traditional science: from being s
7777
In the same way that NFTs can pass revenue for future transactions back to the original creator, you can establish transparent value attribution chains to reward researchers, governing bodies (like DAOs), or even the subjects whose data is collected.
7878

7979
[IP-NFTs](https://medium.com/molecule-blog/ip-nfts-for-researchers-a-new-biomedical-funding-paradigm-91312d8d92e6) can also function as a key to a decentralized data repository of the research experiments being undertaken, and plug into NFT and [DeFi](/defi/) financialization (from fractionalization to lending pools and value appraisal). It also allows natively on-chain entities such as DAOs like [VitaDAO](https://www.vitadao.com/) to conduct research directly on-chain.
80-
The advent of non-transferable ["soulbound" tokens](https://vitalik.ca/general/2022/01/26/soulbound.html) may also play an important role in DeSci by allowing individuals to prove their experience and credentials linked to their Ethereum address.
80+
The advent of non-transferable ["soulbound" tokens](https://vitalik.eth.limo/general/2022/01/26/soulbound.html) may also play an important role in DeSci by allowing individuals to prove their experience and credentials linked to their Ethereum address.
8181

8282
### Data storage, access and architecture {#data-storage}
8383

public/content/developers/docs/apis/json-rpc/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ Returns Keccak-256 (_not_ the standardized SHA3-256) of the given data.
166166

167167
**Parameters**
168168

169-
1. `DATA` - the data to convert into a SHA3 hash
169+
1. `DATA` - The data to convert into a SHA3 hash
170170

171171
```js
172172
params: ["0x68656c6c6f20776f726c64"]

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Proof-of-stake requires nodes, known as validators, to explicitly submit a crypt
1818

1919
Proof-of-work is much more energy-hungry because electricity is burned in the mining process. Proof-of-stake, on the other hand, requires only a very small amount of energy - Ethereum validators can even run on a low-powered device such as Raspberry Pi. Ethereum's proof-of-stake mechanism is thought to be more secure than proof-of-work because the cost to attack is greater, and the consequences to an attacker are more severe.
2020

21-
Proof-of-work versus proof-of-stake is a contentious topic. [Vitalik Buterin's blog](https://vitalik.ca/general/2017/12/31/pos_faq.html#what-are-the-benefits-of-proof-of-stake-as-opposed-to-proof-of-work) and the debate between Justin Drake and Lyn Alden give a good summary of the arguments.
21+
Proof-of-work versus proof-of-stake is a contentious topic. [Vitalik Buterin's blog](https://vitalik.eth.limo/general/2017/12/31/pos_faq.html#what-are-the-benefits-of-proof-of-stake-as-opposed-to-proof-of-work) and the debate between Justin Drake and Lyn Alden give a good summary of the arguments.
2222

2323
<YouTube id="1m12zgJ42dI" />
2424

@@ -89,7 +89,7 @@ Stake grinding is a category of attack on proof-of-stake networks where the atta
8989
Social slashing is the ability of the community to coordinate a fork of the blockchain in response to an attack. It enables the community to recover from an attacker finalizing a dishonest chain. Social slashing can also be used against censorship attacks.
9090

9191
- [More on social slashing](https://ercwl.medium.com/the-case-for-social-slashing-59277ff4d9c7)
92-
- [Vitalik Buterin on social slashing](https://vitalik.ca/general/2017/12/31/pos_faq.html#what-is-proof-of-stake)
92+
- [Vitalik Buterin on social slashing](https://vitalik.eth.limo/general/2017/12/31/pos_faq.html#what-is-proof-of-stake)
9393

9494
## Will I get slashed? {#will-i-get-slashed}
9595

@@ -101,7 +101,7 @@ As a validator, it is very difficult to get slashed unless you deliberately enga
101101

102102
The nothing-at-stake problem is a conceptual issue with some proof-of-stake mechanisms where there are only rewards and no penalties. If there is nothing at stake, a pragmatic validator is equally happy to attest to any, or even multiple, forks of the blockchain, as this increases their rewards. Ethereum gets around this using finality conditions and slashing to ensure one canonical chain.
103103

104-
[More on the nothing-at-stake problem](https://vitalik.ca/general/2017/12/31/pos_faq.html#what-is-the-nothing-at-stake-problem-and-how-can-it-be-fixed)
104+
[More on the nothing-at-stake problem](https://vitalik.eth.limo/general/2017/12/31/pos_faq.html#what-is-the-nothing-at-stake-problem-and-how-can-it-be-fixed)
105105

106106
## What is a fork choice algorithm? {#what-is-a-fork-choice-algorithm}
107107

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,10 @@ Ethereum has not always been a proof-of-stake network. When Ethereum started, it
7979

8080
## Further reading {#further-reading}
8181

82-
- [Proof of Stake FAQ](https://vitalik.ca/general/2017/12/31/pos_faq.html) _Vitalik Buterin_
82+
- [Proof of Stake FAQ](https://vitalik.eth.limo/general/2017/12/31/pos_faq.html) _Vitalik Buterin_
8383
- [What is Proof of Stake](https://consensys.net/blog/blockchain-explained/what-is-proof-of-stake/) _ConsenSys_
8484
- [What Proof of Stake Is And Why It Matters](https://bitcoinmagazine.com/culture/what-proof-of-stake-is-and-why-it-matters-1377531463) _Vitalik Buterin_
85-
- [Why Proof of Stake (Nov 2020)](https://vitalik.ca/general/2020/11/06/pos2020.html) _Vitalik Buterin_
85+
- [Why Proof of Stake (Nov 2020)](https://vitalik.eth.limo/general/2020/11/06/pos2020.html) _Vitalik Buterin_
8686
- [Proof of Stake: How I Learned to Love Weak Subjectivity](https://blog.ethereum.org/2014/11/25/proof-stake-learned-love-weak-subjectivity/) _Vitalik Buterin_
8787
- [Proof-of-stake Ethereum attack and defense](https://mirror.xyz/jmcook.eth/YqHargbVWVNRQqQpVpzrqEQ8IqwNUJDIpwRP7SS5FXs)
8888
- [A Proof of Stake Design Philosophy](https://medium.com/@VitalikButerin/a-proof-of-stake-design-philosophy-506585978d51) _Vitalik Buterin_

0 commit comments

Comments
 (0)