Skip to content

Commit e35ae45

Browse files
committed
latest update merge
2 parents 97eeac6 + 376c564 commit e35ae45

File tree

4 files changed

+9
-21
lines changed

4 files changed

+9
-21
lines changed

docs/cdk/get-started/deploy-rollup/install-dependencies.md

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,4 @@ sudo rm -rf /usr/local/go && sudo tar -C /usr/local -xzf go1.20.4.linux-amd64.ta
3434
rm -rf go1.20.4.linux-amd64.tar.gz
3535
```
3636

37-
Confirm the Golang installation with `$ go version`.
38-
39-
## Update profile configuration
40-
41-
Add the following environment variables to your `~/.profile`.
42-
43-
```bash
44-
echo '
45-
export ZKEVM_NET=mainnet
46-
export ZKEVM_DIR=~/zkevm/zkevm-node
47-
export ZKEVM_CONFIG_DIR=~/zkevm/zkevm-config
48-
49-
[ -d "/usr/local/go/bin" ] && PATH="/usr/local/go/bin:$PATH"
50-
' >> ~/.profile
51-
source .profile
52-
```
37+
Confirm the Golang installation with `$ go version`.

docs/learn/agglayer.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,11 @@ The AggLayer will allow a single ZK proof to verify state across all chains in t
242242

243243
!!! credits
244244

245-
The contents of this document were sourced from [a blog post](https://mirror.xyz/0xfa892B19c72c2D2C6B10dFce8Ff8E7a955b58A61/TXMyZhhRFa-bjr7YHwmJpKBwt2-_ysirbh_VpNy3qZY) originally written by Brendan Farmer, Co-founder @ Polygon on Sep 2023.
245+
The contents of this document have been sourced from blog posts originally written by Brendan Farmer, Co-founder @ Polygon.
246+
247+
- [The original blog post](https://hackmd.io/@QOKsDTFRSd-1oYqrNQ3fIA/Hkx9X3jah) made on October 2023
248+
- A more recently [updated blog post](https://mirror.xyz/0xfa892B19c72c2D2C6B10dFce8Ff8E7a955b58A61/TXMyZhhRFa-bjr7YHwmJpKBwt2-_ysirbh_VpNy3qZY) with additional details.
249+
246250

247251

248252
[^1]: Definition taken from "Shared Sequencing: Defragmenting the L2 Rollup Ecosystem" https://hackmd.io/@EspressoSystems/SharedSequencing by Espresso Systems

docs/zkEVM/architecture/protocol/etrog-upgrade.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Although the Dragonfruit upgrade had some advantages over previous zkEVM version
66

77
Before discussing all these, we present the newly launched testnet that coincides with the Etrog upgrade.
88

9-
## Cardona testnet
9+
## Sepolia public testnet: Cardona
1010

1111
In addition to the Goërli testnet, we launched a second testnet on Sepolia dubbed Cardona.
1212

@@ -26,7 +26,7 @@ Use the following details to connect wallets to Cardona:
2626

2727
- Currency symbol: ETH
2828

29-
- Block Explorer: https://explorer-ui.cardona.zkevm-rpc.com
29+
- Explorer: https://cardona-zkevm.polygonscan.com/
3030

3131
We use the same faucet for testnet tokens, here: https://faucet.polygon.technology/
3232

docs/zkEVM/architecture/protocol/security-council.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
In addition to the previously mentioned governance issues and security measures, one more component was essential, especially to a young L2 system such as the Polygon zkEVM. That component is, the _Security Council Multisig_.
1+
In addition to the previously mentioned governance issues and security measures, one more component was essential, especially to a young zk-rollup such as the Polygon zkEVM. That component is, the _Security Council Multisig_.
22

33
Since critical bugs or other security issues may occur, and hence warrant instant upgrades, it is good security practice to allow for emergency upgrades.
44

55
That is, instead of employing the 2-out-of-3 _Admin Multisig Contract_ and waiting for the time-delay imposed by the _Timelock Contract_, these contracts get bypassed by deploying a so-called _Security Council Multisig_.
66

77
It is crucial, however, to emphasise that the _Security Council Multisig_ is a temporary measure, and will ultimately be phased-out once the Polygon zkEVM has been sufficiently battle-tested.
8-
z
98

109
## Understanding security council multisig
1110

0 commit comments

Comments
 (0)