Skip to content

Commit 4322206

Browse files
Merge branch 'main' of https://github.com/0xPolygon/polygon-docs into km/cdk-sharon-updates
2 parents f761b1c + e9a4bbb commit 4322206

File tree

10 files changed

+335
-26
lines changed

10 files changed

+335
-26
lines changed

docs/img/learn/agglayer-2.png

436 KB
Loading

docs/img/learn/agglayer-3.png

362 KB
Loading

docs/img/learn/agglayer-4.png

330 KB
Loading

docs/img/learn/agglayer-5.png

387 KB
Loading

docs/learn/agglayer.md

Lines changed: 293 additions & 0 deletions
Large diffs are not rendered by default.

docs/learn/index.md

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,20 @@ hide:
3131
</div>
3232
<div class="grid-container">
3333
<div class="grid-item">
34-
<a href="./liquidity-and-scalability">
34+
<a href="./agglayer">
3535
<div class="product-list-item-header">
36-
<div class="feature-card-heading">Liquidity and scalability</div>
36+
<div class="feature-card-heading">Polygon AggLayer</div>
3737
</div>
3838
<p class="feature-paragraph">ZK-powered L2s to unify liquidity across ecosystem and scale on demand.</p>
3939
</a>
40+
</div>
41+
<div class="grid-item">
42+
<a href="../cdk/architecture/type-1-prover/intro-t1-prover">
43+
<div class="product-list-item-header">
44+
<div class="feature-card-heading">Polygon Type 1 Prover</div>
45+
</div>
46+
<p class="feature-paragraph">Driven by innovation, the Polygon Type 1 Prover is fully Ethereum equivalent.</p>
47+
</a>
4048
</div>
4149
<div class="grid-item">
4250
<a href="./polygon-protocols">
@@ -46,7 +54,15 @@ hide:
4654
<p class="feature-paragraph">Widely-adopted EVM-compatible sidechain designed for low transaction costs and fast transaction times.</p>
4755
</a>
4856
</div>
49-
<div class="grid-item">
57+
<div class="grid-item">
58+
<a href="./welcome">
59+
<div class="product-list-item-header">
60+
<div class="feature-card-heading">Welcome to Polygon innovation and design</div>
61+
</div>
62+
<p class="feature-paragraph">Find out what to expect from the Polygon Knowledge Layer Learn section.</p>
63+
</a>
64+
</div>
65+
<div class="grid-item">
5066
<a href="./deep-dive-arch">
5167
<div class="product-list-item-header">
5268
<div class="feature-card-heading">Deep dive into the architecture</div>

docs/learn/liquidity-and-scalability.md

Lines changed: 0 additions & 20 deletions
This file was deleted.

docs/zkEVM/get-started/historical-data.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,23 @@ Find in here a record of the zkEVM’s historical data. This document records ti
33
Join discussions or ask questions on Telegram: https://t.me/polygonzkevm_technical_updates/31
44

55

6+
7+
### 12th Feb, 2024
8+
9+
**zkEVM mainnet Upgrade: Etrog hardfork**
10+
11+
This upgrade brings the Polygon zkEVM to being almost a type 2 ZK-EVM. See further details [here](../architecture/protocol/etrog-upgrade.md)
12+
13+
| | Version |
14+
| :-------------: | :----------------------------------------------------------: |
15+
| Node | v0.5.6 |
16+
| Prover | v4.0.4 |
17+
| Bridge | v0.4.0 |
18+
| Change logs url | https://github.com/0xPolygonHermez/zkevm-node/releases/tag/v0.5.7 |
19+
| Supported ForkIDs | Mainnet & Cardona: ForkIDs 4, 5, 6 & 7. Testnet (Goerli): ForkIDs 1, 2, 3, 4, 5 & 6. |
20+
21+
22+
623
### 13th Dec, 2023
724

825
**zkEVM mainnet update**

docs/zkEVM/get-started/quick-start/connect-wallet.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ Add the Polygon zkEVM network of your choice to your wallet by navigating to the
88
| Network | RPC URL | ChainID | Block Explorer URL | Currency |
99
| ------- | ------------------------------- | ---------------- | ---------------- | ----- |
1010
| Polygon zkEVM | `https://zkevm-rpc.com` | `1101` | `https://zkevm.polygonscan.com/` | **ETH** |
11-
| zkEVM Testnet | `https://rpc.public.zkevm-test.net` | `1442` | `https://testnet-zkevm.polygonscan.com` | **ETH** |
11+
| Cardona Testnet | `https://rpc.cardona.zkevm-rpc.com` | `2442` | `https://cardona-zkevm.polygonscan.com/` | **ETH** |
12+
| zkEVM Testnet (Deprecating soon!) | `https://rpc.public.zkevm-test.net` | `1442` | `https://testnet-zkevm.polygonscan.com` | **ETH** |
1213

1314
Here is a video tutorial on how to add Polygon zkEVM Testnet to MetaMask and deploy smart contracts:
1415

mkdocs.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,11 @@ nav:
133133
- Verify a contract: zkEVM/how-to/verify-contract.md
134134
- Architecture:
135135
- Architecture: zkEVM/architecture/index.md
136+
- Upgrades:
137+
- Etrog upgrade: zkEVM/architecture/protocol/etrog-upgrade.md
136138
- zkEVM protocol:
137139
- zkEVM protocol: zkEVM/architecture/protocol/index.md
138-
- Etrog upgrade: zkEVM/architecture/protocol/etrog-upgrade.md
140+
139141
- State management: zkEVM/architecture/protocol/state-management.md
140142
- Transaction life cycle:
141143
- Submit transactions: zkEVM/architecture/protocol/transaction-life-cycle/submit-transaction.md
@@ -572,7 +574,7 @@ nav:
572574
- Learn:
573575
- Learn: learn/index.md
574576
- Welcome: learn/welcome.md
575-
- Unified liquidity and scalability: learn/liquidity-and-scalability.md
577+
- Polygon AggLayer: learn/agglayer.md
576578
- Polygon protocols: learn/polygon-protocols.md
577579
- Polygon 2.0 architecture: learn/deep-dive-arch.md
578580

0 commit comments

Comments
 (0)