Skip to content

Commit 6b7dc9d

Browse files
dhirajgagraidhirajgagrai
authored
Merge branch 'ethereum:dev' into improve_btn_position
2 parents e310f62 + 5628306 commit 6b7dc9d

File tree

15 files changed

+40103
-23635
lines changed

15 files changed

+40103
-23635
lines changed

‎.all-contributorsrc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9108,6 +9108,15 @@
91089108
"contributions": [
91099109
"content"
91109110
]
9111+
},
9112+
{
9113+
"login": "medardm",
9114+
"name": "Medard Mandane",
9115+
"avatar_url": "https://avatars.githubusercontent.com/u/20562573?v=4",
9116+
"profile": "https://github.com/medardm",
9117+
"contributions": [
9118+
"doc"
9119+
]
91119120
}
91129121
],
91139122
"contributorsPerLine": 7,

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1440,6 +1440,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
14401440
<td align="center"><a href="https://www.linkedin.com/in/simonletort"><img src="https://avatars.githubusercontent.com/u/367992?v=4?s=100" width="100px;" alt="Simon Letort"/><br /><sub><b>Simon Letort</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=simonletort" title="Documentation">📖</a></td>
14411441
<td align="center"><a href="https://github.com/AidanPine"><img src="https://avatars.githubusercontent.com/u/92037147?v=4?s=100" width="100px;" alt="AidanPine"/><br /><sub><b>AidanPine</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=AidanPine" title="Code">💻</a></td>
14421442
<td align="center"><a href="https://github.com/christy-pdx"><img src="https://avatars.githubusercontent.com/u/107286087?v=4?s=100" width="100px;" alt="christy-pdx"/><br /><sub><b>christy-pdx</b></sub></a><br /><a href="#content-christy-pdx" title="Content">🖋</a></td>
1443+
<td align="center"><a href="https://github.com/medardm"><img src="https://avatars.githubusercontent.com/u/20562573?v=4?s=100" width="100px;" alt="Medard Mandane"/><br /><sub><b>Medard Mandane</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=medardm" title="Documentation">📖</a></td>
14431444
</tr>
14441445
</tbody>
14451446
<tfoot>

‎src/components/BeaconChainActions.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ const BeaconChainActions: React.FC = () => {
124124
intl
125125
),
126126
description: "Ethos.dev",
127-
link: "https://web.archive.org/web/20220719213551/https://ethos.dev/beacon-chain/",
127+
link: "https://ethos.dev/beacon-chain/",
128128
},
129129
{
130130
title: translateMessageId(

‎src/components/ShardChainsList.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ const ShardChainsList: React.FC<IProps> = () => {
4545
"page-upgrade-article-author-ethos-dev",
4646
intl
4747
),
48-
link: "https://web.archive.org/web/20220719213551/https://ethos.dev/beacon-chain/",
48+
link: "https://ethos.dev/beacon-chain/",
4949
},
5050
{
5151
title: translateMessageId(

‎src/content/community/grants/staking-community-grants/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ title="How can I learn more about Eth2?">
239239
- [Eth2 Overview](/eth2/) – _ethereum.org_
240240
- [The beacon chain](/upgrades/beacon-chain/) – _ethereum.org_
241241
- The Genesis of a Beacon Chain — Ben Edgington [https://hackmd.io/@benjaminion/genesis](https://hackmd.io/@benjaminion/genesis)
242-
- The Beacon Chain Ethereum 2.0 explainer — [https://ethos.dev/beacon-chain/](https://web.archive.org/web/20220719213551/https://ethos.dev/beacon-chain/)
242+
- The Beacon Chain Ethereum 2.0 explainer — [https://ethos.dev/beacon-chain/](https://ethos.dev/beacon-chain/)
243243
- [The State of Eth2](https://blog.ethereum.org/2020/06/02/the-state-of-eth2-june-2020/) _– Danny Ryan_
244244
- ['Intro to Eth2 & Staking for Beginners'](https://www.youtube.com/watch?v=tpkpW031RCI) - Superphiz
245245
- [https://old.reddit.com/r/ethstaker/wiki/studymaster](https://old.reddit.com/r/ethstaker/wiki/studymaster)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Overall, proof-of-stake, as it is implemented on Ethereum, has been demonstrated
6363
- [Proof of Stake FAQ](https://vitalik.ca/general/2017/12/31/pos_faq.html) _Vitalik Buterin_
6464
- [What is Proof of Stake](https://consensys.net/blog/blockchain-explained/what-is-proof-of-stake/) _ConsenSys_
6565
- [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_
66-
- [The Beacon Chain Ethereum 2.0 explainer you need to read first](https://web.archive.org/web/20220719213551/https://ethos.dev/beacon-chain/) _Ethos.dev_
66+
- [The Beacon Chain Ethereum 2.0 explainer you need to read first](https://ethos.dev/beacon-chain/) _Ethos.dev_
6767
- [Why Proof of Stake (Nov 2020)](https://vitalik.ca/general/2020/11/06/pos2020.html) _Vitalik Buterin_
6868
- [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_
6969
- [Proof-of-stake Ethereum attack and defense](https://mirror.xyz/jmcook.eth/YqHargbVWVNRQqQpVpzrqEQ8IqwNUJDIpwRP7SS5FXs)

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,9 @@ lang: en
55
---
66

77
<InfoBanner emoji=":wave:">
8-
9-
Proof-of-work is no longer underlying Ethereum's consensus mechanism, meaning mining has been switched off. Instead, Ethereum is secured by validators who stake ETH. You can start staking your ETH today. Read more on [The Merge](/upgrades/merge/), [proof-of-stake](/developers/docs/consensus-mechanisms/pos/), and [staking](/staking/). This page is for historical interest only.
10-
8+
Proof-of-work is no longer underlying Ethereum's consensus mechanism, meaning mining has been switched off. Instead, Ethereum is secured by validators who stake ETH. You can start staking your ETH today. Read more on [The Merge](/upgrades/merge/), [proof-of-stake](/developers/docs/consensus-mechanisms/pos/), and [staking](/staking/). This page is for historical interest only.
119
</InfoBanner>
12-
13-
10+
1411
Ethereum mining used an algorithm known as Ethash. The fundamental idea of the algorithm is that a miner tries to find a nonce input using brute force computation so that the resulting hash is smaller than a threshold determined by the calculated difficulty. This difficulty level can be dynamically adjusted, allowing block production to happen at a regular interval.
1512

1613
## Prerequisites {#prerequisites}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ lang: en
55
---
66

77
<InfoBanner emoji=":wave:">
8-
Proof-of-work is no longer underlying Ethereum's consensus mechanism, meaning mining has been switched off. Instead, Ethereum is secured by validators who stake ETH. You can start staking your ETH today. Read more on [The Merge](/upgrades/merge/), [proof-of-stake](/developers/docs/consensus-mechanisms/pos/), and [staking](/staking/). This page is for historical interest.
8+
Proof-of-work is no longer underlying Ethereum's consensus mechanism, meaning mining has been switched off. Instead, Ethereum is secured by validators who stake ETH. You can start staking your ETH today. Read more on [The Merge](/upgrades/merge/), [proof-of-stake](/developers/docs/consensus-mechanisms/pos/), and [staking](/staking/). This page is for historical interest only.
99
</InfoBanner>
1010

1111
## Prerequisites {#prerequisites}

‎src/content/developers/docs/gas/index.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,9 @@ i.e `21,000 * 200 = 4,200,000 gwei` or 0.0042 ETH
3535

3636
Let's say Jordan has to pay Taylor 1 ETH. In the transaction, the gas limit is 21,000 units and the base fee is 10 gwei. Jordan includes a tip of 2 gwei.
3737

38-
Total fee would have been: `Gas units (limit) * (Base fee + Tip)`
39-
`21,000 * (10 + 2) = 252,000 gwei` or 0.000252 ETH.
38+
The total fee would now be: `units of gas used * (base fee + priority fee)` where the `base fee` is a value set by the protocol and the `priority fee` is a value set by the user as a tip to the validator.
39+
40+
i.e `21,000 * (10 + 2) = 252,000 gwei` or 0.000252 ETH.
4041

4142
When Jordan sends the money, 1.000252 ETH will be deducted from Jordan's account.
4243
Taylor will be credited 1.0000 ETH.

‎src/data/ethUpgradeArticles.ts

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -7,57 +7,57 @@ interface Article {
77
/** Articles by Danny Ryan (Ethereum Foundation) */
88
export const dannyArticles: Array<Article> = [
99
{
10-
title: "Finalized no. 34",
11-
description: "23 March 2022",
12-
link: "https://blog.ethereum.org/2022/03/23/finalized-no-34/",
10+
title: "Finalized no. 37",
11+
description: "26 August 2022",
12+
link: "https://blog.ethereum.org/2022/08/26/finalized-no-37/",
1313
},
1414
{
15-
title: "Finalized no. 33",
16-
description: "31 January 2022",
17-
link: "https://blog.ethereum.org/2022/01/31/finalized-no-33/",
15+
title: "Finalized no. 36",
16+
description: "12 August 2022",
17+
link: "https://blog.ethereum.org/2022/08/12/finalized-no-36/",
1818
},
1919
{
20-
title: "Finalized no. 32",
21-
description: "22 November 2021",
22-
link: "https://blog.ethereum.org/2021/11/22/finalized-no-32/",
20+
title: "Finalized no. 35",
21+
description: "19 May 2022",
22+
link: "https://blog.ethereum.org/2022/05/19/finalized-no-35/",
2323
},
2424
{
25-
title: "Finalized no. 31",
26-
description: "2 November 2021",
27-
link: "https://blog.ethereum.org/2021/11/02/finalized-no-31/",
25+
title: "Finalized no. 34",
26+
description: "23 March 2022",
27+
link: "https://blog.ethereum.org/2022/03/23/finalized-no-34/",
2828
},
2929
{
30-
title: "Finalized no. 30",
31-
description: "19 October 2021",
32-
link: "https://blog.ethereum.org/2021/10/19/finalized-no-30/",
30+
title: "Finalized no. 33",
31+
description: "31 January 2022",
32+
link: "https://blog.ethereum.org/2022/01/31/finalized-no-33/",
3333
},
3434
]
3535

3636
/** Articles by Ben Edgington (PegaSys, ConsenSys) */
3737
export const benArticles: Array<Article> = [
3838
{
39-
title: "What’s New in Eth2 – #92",
40-
description: "6 May 2022",
41-
link: "https://hackmd.io/@benjaminion/eth2_news/https%3A%2F%2Fhackmd.io%2F%40benjaminion%2Fwnie2_220506",
39+
title: "What’s New in Eth2 – #100",
40+
description: "26 August 2022",
41+
link: "https://hackmd.io/@benjaminion/eth2_news/https%3A%2F%2Fhackmd.io%2F%40benjaminion%2Fwnie2_220826",
4242
},
4343
{
44-
title: "What’s New in Eth2 – #91",
45-
description: "8 April 2022",
46-
link: "https://hackmd.io/@benjaminion/eth2_news/https%3A%2F%2Fhackmd.io%2F%40benjaminion%2Fwnie2_220408",
44+
title: "What’s New in Eth2 – #99",
45+
description: "12 August 2022",
46+
link: "https://hackmd.io/@benjaminion/eth2_news/https%3A%2F%2Fhackmd.io%2F%40benjaminion%2Fwnie2_220812",
4747
},
4848
{
49-
title: "What’s New in Eth2 – #90",
50-
description: "25 March 2022",
51-
link: "https://hackmd.io/@benjaminion/eth2_news/https%3A%2F%2Fhackmd.io%2F%40benjaminion%2Fwnie2_220325",
49+
title: "What’s New in Eth2 – #98",
50+
description: "29 July 2022",
51+
link: "https://hackmd.io/@benjaminion/eth2_news/https%3A%2F%2Fhackmd.io%2F%40benjaminion%2Fwnie2_220729",
5252
},
5353
{
54-
title: "What’s New in Eth2 – #89",
55-
description: "11 March 2022",
56-
link: "https://hackmd.io/@benjaminion/eth2_news/https%3A%2F%2Fhackmd.io%2F%40benjaminion%2Fwnie2_220311",
54+
title: "What’s New in Eth2 – #97",
55+
description: "15 July 2022",
56+
link: "https://hackmd.io/@benjaminion/eth2_news/https%3A%2F%2Fhackmd.io%2F%40benjaminion%2Fwnie2_220715",
5757
},
5858
{
59-
title: "What’s New in Eth2 – #88",
60-
description: "25 February 2022",
61-
link: "https://hackmd.io/@benjaminion/eth2_news/https%3A%2F%2Fhackmd.io%2F%40benjaminion%2Fwnie2_220225",
59+
title: "What’s New in Eth2 – #96",
60+
description: "1 July 2022",
61+
link: "https://hackmd.io/@benjaminion/eth2_news/https%3A%2F%2Fhackmd.io%2F%40benjaminion%2Fwnie2_220701",
6262
},
6363
]

0 commit comments

Comments
 (0)