Skip to content

Commit 61ed73e

Browse files
authored
Merge pull request #16684 from ethereum/staging
Staging -> dev
2 parents d155468 + 050080e commit 61ed73e

File tree

15 files changed

+75
-14
lines changed

15 files changed

+75
-14
lines changed
File renamed without changes.

public/_redirects

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,9 @@
108108

109109
/*/upgrades/beacon-chain /:splat/roadmap/beacon-chain 301!
110110

111-
/upgrades/vision/ /roadmap/vision/ 301!
111+
/upgrades/vision/ /roadmap/ 301!
112112

113-
/*/upgrades/vision/ /:splat/roadmap/vision/ 301!
113+
/*/upgrades/vision/ /:splat/roadmap/ 301!
114114

115115
/upgrades /roadmap 301!
116116

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ sidebarDepth: 3
99

1010
As the number of people using Ethereum has grown, the blockchain has reached certain capacity limitations. This has driven up the cost of using the network, creating the need for "scaling solutions." There are multiple solutions being researched, tested and implemented that take different approaches to achieve similar goals.
1111

12-
The main goal of scalability is to increase transaction speed (faster finality) and transaction throughput (higher number of transactions per second) without sacrificing decentralization or security (more on the [Ethereum vision](/roadmap/vision/)). On the layer 1 Ethereum blockchain, high demand leads to slower transactions and nonviable [gas prices](/developers/docs/gas/). Increasing the network capacity in terms of speed and throughput is fundamental to the meaningful and mass adoption of Ethereum.
12+
The main goal of scalability is to increase transaction speed (faster finality) and transaction throughput (higher number of transactions per second) without sacrificing decentralization or security. On the layer 1 Ethereum blockchain, high demand leads to slower transactions and nonviable [gas prices](/developers/docs/gas/). Increasing the network capacity in terms of speed and throughput is fundamental to the meaningful and mass adoption of Ethereum.
1313

1414
While speed and throughput are important, it is essential that scaling solutions enabling these goals remain decentralized and secure. Keeping the barrier to entry low for node operators is critical in preventing a progression towards centralized and insecure computing power.
1515

@@ -88,7 +88,6 @@ Learn more about [Validium](/developers/docs/scaling/validium/).
8888
- Multiple solutions can help reduce the overall congestion on any one part of the network and also prevent single points of failure.
8989
- The whole is greater than the sum of its parts. Different solutions can exist and work in harmony, allowing for an exponential effect on future transaction speed and throughput.
9090
- Not all solutions require utilizing the Ethereum consensus algorithm directly, and alternatives can offer benefits that would otherwise be difficult to obtain.
91-
- No one scaling solution is enough to fulfill the [Ethereum vision](/roadmap/vision/).
9291

9392
## More of a visual learner? {#visual-learner}
9493

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ sidebarDepth: 3
77

88
A sidechain is a separate blockchain that runs independent of Ethereum and is connected to Ethereum Mainnet by a two-way bridge. Sidechains can have separate block parameters and [consensus algorithms](/developers/docs/consensus-mechanisms/), which are often designed for efficient processing of transactions. Using a sidechain involves trade-offs, though, as they do not inherit Ethereum's security properties. Unlike [layer 2 scaling solutions](/layer-2/), sidechains do not post state changes and transaction data back to Ethereum Mainnet.
99

10-
Sidechains also sacrifice some measure of decentralization or security to achieve high throughput ([scalability trilemma](https://vitalik.eth.limo/general/2021/05/23/scaling.html)). Ethereum is, however, committed to scaling without compromising on decentralization and security as outlined in its [vision statement](/roadmap/vision/) for upgrades.
10+
Sidechains also sacrifice some measure of decentralization or security to achieve high throughput ([scalability trilemma](https://vitalik.eth.limo/general/2021/05/23/scaling.html)). Ethereum is, however, committed to scaling without compromising on decentralization and security.
1111

1212
## How do sidechains work? {#how-do-sidechains-work}
1313

public/content/energy-consumption/index.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,5 @@ Web3 native public goods funding platforms such as [Gitcoin](https://gitcoin.co)
8282

8383
## Related topics {#related-topics}
8484

85-
- [Ethereum's vision](/roadmap/vision/)
8685
- [The Beacon Chain](/roadmap/beacon-chain)
8786
- [The Merge](/roadmap/merge/)

public/content/ethereum-forks/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ The Berlin upgrade optimized gas cost for certain EVM actions, and increases sup
386386

387387
#### Summary {#beacon-chain-genesis-summary}
388388

389-
The [Beacon Chain](/roadmap/beacon-chain/) needed 16384 deposits of 32 staked ETH to ship securely. This happened on November 27, meaning the Beacon Chain started producing blocks on December 1, 2020. This is an important first step in achieving the [Ethereum vision](/roadmap/vision/).
389+
The [Beacon Chain](/roadmap/beacon-chain/) needed 16384 deposits of 32 staked ETH to ship securely. This happened on November 27, and the Beacon Chain started producing blocks on December 1, 2020.
390390

391391
[Read the Ethereum Foundation announcement](https://blog.ethereum.org/2020/11/27/eth2-quick-update-no-21/)
392392

public/content/roadmap/beacon-chain/index.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ Staking serves a similar purpose that [mining](/developers/docs/consensus-mechan
3434

3535
The transition to proof-of-stake made Ethereum significantly more secure and decentralized by comparison to proof-of-work. The more people that participate in the network, the more decentralized and safe from attacks it becomes.
3636

37-
And using proof-of-stake as consensus mechanism is a foundational component for [the secure, environmentally friendly and scalable Ethereum we have now](/roadmap/vision/).
3837

3938
<Alert variant="update">
4039
<AlertEmoji text=":money_bag:"/>
@@ -77,6 +76,5 @@ Sharding can only safely enter the Ethereum ecosystem with a proof-of-stake cons
7776

7877
## Further Reading
7978

80-
- [More on Ethereum's future upgrades](/roadmap/vision)
8179
- [More on node architecture](/developers/docs/nodes-and-clients/node-architecture)
8280
- [More of proof-of-stake](/developers/docs/consensus-mechanisms/pos)

public/content/roadmap/fusaka/peerdas/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ The Ethereum protocol is undergoing its most significant scaling upgrade since t
1212

1313
## Scalability {#scalability}
1414

15-
[Ethereum’s vision](/roadmap/vision/) is to be a neutral, secure and decentralized platform available for everyone in the world. As network usage grows, this requires balancing the trilemma of scale, security, and decentralization of the network. If Ethereum simply increased the data handled by the network within its current design, it would run the risk of overwhelming the [nodes that Ethereum relies on for its decentralization](/developers/docs/nodes-and-clients/). Scalability requires rigorous mechanism design that minimizes trade-offs.
15+
Ethereum’s vision is to be a neutral, secure and decentralized platform available for everyone in the world. As network usage grows, this requires balancing the trilemma of scale, security, and decentralization of the network. If Ethereum simply increased the data handled by the network within its current design, it would run the risk of overwhelming the [nodes that Ethereum relies on for its decentralization](/developers/docs/nodes-and-clients/). Scalability requires rigorous mechanism design that minimizes trade-offs.
1616

1717
One of the strategies to achieve this goal is to allow for a diverse ecosystem of layer 2 scaling solutions rather than processing all transactions on [layer 1 (L1)](/glossary/#layer-1) Mainnet. [Layer 2s (L2s)](/glossary/#layer-2) or [rollups](/glossary#rollups) process transactions on their own separate chains and use Ethereum for verification and security. Publishing only security-critical commitments and compressing payloads lets L2s use Ethereum’s DA capacity more efficiently. In turn, L1 carries less data without compromising security guarantees, while L2s onboard more users at lower gas costs. Initially, L2s published data as `calldata` in ordinary transactions, which competed with L1 transactions for gas and was impractical for bulk data availability.
1818

0 commit comments

Comments
 (0)