Skip to content

Commit 4627a9f

Browse files
committed
Merge branch 'dev' into pr/mlCode111/9398-1
2 parents 620e6f7 + 5718ed5 commit 4627a9f

File tree

55 files changed

+141
-77
lines changed

Some content is hidden

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

55 files changed

+141
-77
lines changed

.all-contributorsrc

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10082,6 +10082,33 @@
1008210082
"contributions": [
1008310083
"doc"
1008410084
]
10085+
},
10086+
{
10087+
"login": "MateusTP",
10088+
"name": "Mateus Pimenta",
10089+
"avatar_url": "https://avatars.githubusercontent.com/u/59940545?v=4",
10090+
"profile": "https://github.com/MateusTP",
10091+
"contributions": [
10092+
"content"
10093+
]
10094+
},
10095+
{
10096+
"login": "ezal",
10097+
"name": "ezal",
10098+
"avatar_url": "https://avatars.githubusercontent.com/u/6931328?v=4",
10099+
"profile": "https://github.com/ezal",
10100+
"contributions": [
10101+
"bug"
10102+
]
10103+
},
10104+
{
10105+
"login": "jarrodwatts",
10106+
"name": "Jarrod Watts",
10107+
"avatar_url": "https://avatars.githubusercontent.com/u/35651410?v=4",
10108+
"profile": "https://jarrodwatts.com",
10109+
"contributions": [
10110+
"content"
10111+
]
1008510112
}
1008610113
],
1008710114
"contributorsPerLine": 7,

.github/workflows/chromatic.yml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
# .github/workflows/chromatic.yml
2+
3+
# Workflow name
4+
name: Chromatic Publish and Testing
5+
6+
# Event for the workflow
7+
on:
8+
pull_request:
9+
types:
10+
- opened
11+
- synchronize
12+
- ready_for_review
13+
paths:
14+
# Only run on file changes in any of these paths
15+
- "src/components/**/*"
16+
- "src/pages/**/*"
17+
- "src/pages-conditional/**/*"
18+
- "src/templates/**/*"
19+
- "src/@chakra-ui/gatsby-plugin/**/*"
20+
21+
# List of jobs
22+
jobs:
23+
chromatic-deployment:
24+
# Operating System
25+
runs-on: ubuntu-latest
26+
# Job steps
27+
steps:
28+
# 👇 Version 2 of the action
29+
- name: Checkout repo
30+
uses: actions/checkout@v2
31+
with:
32+
fetch-depth: 0 # 👈 Required to retrieve git history
33+
- name: Install deps
34+
# 👇 Install dependencies with the same package manager used in the project (replace it as needed), e.g. yarn, npm, pnpm
35+
run: yarn
36+
- name: Publish to Chromatic
37+
# 👇 Adds Chromatic as a step in the workflow
38+
uses: chromaui/action@v1
39+
# Options required for Chromatic's GitHub Action
40+
with:
41+
projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
42+
# 👇 Only fail if Storybook contains stories that error
43+
exitZeroOnChanges: true

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1577,6 +1577,11 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
15771577
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Ash20pk"><img src="https://avatars.githubusercontent.com/u/86375577?v=4?s=100" width="100px;" alt="Ash@metaschool"/><br /><sub><b>Ash@metaschool</b></sub></a><br /><a href="#content-Ash20pk" title="Content">🖋</a></td>
15781578
<td align="center" valign="top" width="14.28%"><a href="https://github.com/t-rutten"><img src="https://avatars.githubusercontent.com/u/1389793?v=4?s=100" width="100px;" alt="Tom Rutten"/><br /><sub><b>Tom Rutten</b></sub></a><br /><a href="#content-t-rutten" title="Content">🖋</a></td>
15791579
<td align="center" valign="top" width="14.28%"><a href="http://chawyehsu.com"><img src="https://avatars.githubusercontent.com/u/5764917?v=4?s=100" width="100px;" alt="Chawye Hsu"/><br /><sub><b>Chawye Hsu</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=chawyehsu" title="Documentation">📖</a></td>
1580+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/MateusTP"><img src="https://avatars.githubusercontent.com/u/59940545?v=4?s=100" width="100px;" alt="Mateus Pimenta"/><br /><sub><b>Mateus Pimenta</b></sub></a><br /><a href="#content-MateusTP" title="Content">🖋</a></td>
1581+
</tr>
1582+
<tr>
1583+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/ezal"><img src="https://avatars.githubusercontent.com/u/6931328?v=4?s=100" width="100px;" alt="ezal"/><br /><sub><b>ezal</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Aezal" title="Bug reports">🐛</a></td>
1584+
<td align="center" valign="top" width="14.28%"><a href="https://jarrodwatts.com"><img src="https://avatars.githubusercontent.com/u/35651410?v=4?s=100" width="100px;" alt="Jarrod Watts"/><br /><sub><b>Jarrod Watts</b></sub></a><br /><a href="#content-jarrodwatts" title="Content">🖋</a></td>
15801585
</tr>
15811586
</tbody>
15821587
</table>

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ethereum-org-website",
3-
"version": "7.3.3",
3+
"version": "7.4.0",
44
"description": "Website of ethereum.org",
55
"main": "index.js",
66
"repository": "git@github.com:ethereum/ethereum-org-website.git",

src/content/developers/docs/apis/backend/index.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,11 @@ These libraries abstract away much of the complexity of interacting directly wit
143143
- [Discord](https://discord.com/invite/KYswaxwEtg)
144144
- [Forum](https://forum.moralis.io/)
145145

146+
**GetBlock- Blockchain-as-a-service for Web3 developement*
147+
148+
- [GetBlock.io](https://getblock.io/)
149+
- [Documentation](https://getblock.io/docs/)
150+
146151
## Further reading {#further-reading}
147152

148153
_Know of a community resource that helped you? Edit this page and add it!_

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ Validators have to stake ETH so that they have something to lose if they misbeha
7676

7777
A single validator is pseudo-randomly chosen to propose a block in each slot using an algorithm called RANDAO that mixes a hash from the block proposer with a seed that gets updated every block. This value is used to select a specific validator from the total validator set. The validator selection is fixed four epochs in advance.
7878

79-
[More on validator selection](/developers/docs/consensus-mechanisms/pos/block_proposal)
79+
[More on validator selection](/developers/docs/consensus-mechanisms/pos/block-proposal)
8080

8181
## What is stake grinding? {#what-is-stake-grinding}
8282

src/content/developers/docs/consensus-mechanisms/pow/mining/index.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,6 @@ Ethereum Mainnet only ever used one mining algorithm - ['Ethash'](/developers/do
7474

7575
[More on mining algorithms](/developers/docs/consensus-mechanisms/pow/mining-algorithms/).
7676

77-
## Further reading {#further-reading}
78-
79-
- [What does it mean to mine Ethereum?](https://web.archive.org/web/20220917012350/https://docs.ethhub.io/using-ethereum/mining/) _EthHub (Archived)_
80-
8177
## Related topics {#related-topics}
8278

8379
- [Gas](/developers/docs/gas/)

src/content/developers/docs/data-structures-and-encoding/patricia-merkle-trie/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ The update and delete operations for radix tries can be defined as follows:
5555
newindex = delete(curnode[path[0]],path[1:])
5656
newnode[path[0]] = newindex
5757
58-
if len(filter(x -> x is not NULL, newnode)) == 0:
58+
if all(x is NULL for x in newnode):
5959
return NULL
6060
else:
6161
db.put(hash(newnode),newnode)

src/content/developers/docs/intro-to-ethereum/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ A blockchain is a public database that is updated and shared across many compute
1414

1515
Every computer in the network must agree upon each new block and the chain as a whole. These computers are known as "nodes". Nodes ensure everyone interacting with the blockchain has the same data. To accomplish this distributed agreement, blockchains need a consensus mechanism.
1616

17-
Ethereum uses a [proof-of-stake-based consensus mechanism](/developers/docs/consensus-mechanisms/pos/). Anyone who wants to add new blocks to the chain must stake at least 32 ETH into the deposit contract and run validator software. They can then be randomly selected to propose blocks that other validators check and add to the blockchain. In this model, there is usually only one chain, but network latency and dishonest behavior can cause multiple blocks to exist at the same position near the head of the chain. To resolve this, a fork-choice algorithm selects one canonical set of blocks. The blocks selected are the ones that form the heaviest possible chain, where 'heavy' refers to the number of validators that have endorsed the blocks (weighted by the ETH they have staked). There is a system of rewards and penalties that strongly incentivize participants to be honest and available online as much as possible.
17+
Ethereum uses a [proof-of-stake-based consensus mechanism](/developers/docs/consensus-mechanisms/pos/). Anyone who wants to add new blocks to the chain must stake ETH - the native currency in Ethereum - as collateral and run validator software. These "validators" can then be randomly selected to propose blocks that other validators check and add to the blockchain. There is a system of rewards and penalties that strongly incentivize participants to be honest and available online as much as possible.
1818

1919
If you would like to see how blockchain data is hashed and subsequently appended to the history of block references, be sure to check out [this demo](https://andersbrownworth.com/blockchain/blockchain) by Anders Brownworth and watch the accompanying video below.
2020

src/content/developers/docs/nodes-and-clients/run-a-node/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ geth --mainnet \
291291
--authrpc.jwtsecret=/path/to/jwtsecret
292292
```
293293

294-
Check [docs for all configuration options](https://geth.ethereum.org/docs/interface/command-line-options) and learn more about [running Geth with a consensus client](https://geth.ethereum.org/docs/interface/consensus-clients).
294+
Check [docs for all configuration options](https://geth.ethereum.org/docs/fundamentals/command-line-options) and learn more about [running Geth with a consensus client](https://geth.ethereum.org/docs/getting-started/consensus-clients).
295295

296296
##### Running Nethermind
297297

0 commit comments

Comments
 (0)