[DO NOT MERGE]: Release v25 protocol defense #774

koloz193 · 2024-09-05T16:33:12Z

v25 release changes

Bootloader

increase max_pubdata price and max_l2_price from 1M to 2^64
- This is for chains with custom base tokens with low unit value.
removed upgradesystemcontext method
- It was a temporary method, used in one of the past upgrades.

Contracts

Moved to custom errors from string based ones
small gas optimisations
l2-contracts moved to 1.5.0 compiler and solidity 0.8.24
verifier_contract - mention vk_hash in the source code comments

Scripts

workflows - switching to forge & foundry from hardhat
script for new chain registration
moved from zksync-web3 to zksync-ethers
improvements to deploy scripts - comare diamond hash
improved compilation caching in scripts (don't recompile if not needed)

Testing

more bridgehub tests
adopting tests to custom errors
more mailbox tests

Docs & comments

naming - changing from zkSync to ZKsync
additional documentation in solidity files
better documentation for some methods & arguments
changed wording from 'ergs' to 'gas'
added missing licenses to YUL files

Dependencies

hardhat updated to 2.22 and chai matchers to 0.2.0
lower restriction on solidity versions for interfaces (from 0.8.24 to ^0.8.21)
explicit dependency on openzeppelin-v4 (to allow users to include other OZ versions)
updated forge-sdk & murky

Co-authored-by: Raid Ateir <ra@matterlabs.dev>

Co-authored-by: Uacias <filgum0326@gmail.com> Co-authored-by: Mateusz Zając <matzayonc@gmail.com> Co-authored-by: Mateusz Zając <60236390+matzayonc@users.noreply.github.com>

…contracts (#473)

chore(contracts): merge release 23 into dev

Merge main to dev

Co-authored-by: Stanislav Breadless <stanislavbezkor@gmail.com>

Signed-off-by: Danil <deniallugo@gmail.com> Co-authored-by: Lyova Potyomkin <lyova.potyomkin@gmail.com> Co-authored-by: kelemeno <kl@matterlabs.dev> Co-authored-by: Stanislav Bezkorovainyi <stanislavbezkor@gmail.com> Co-authored-by: Raid Ateir <ra@matterlabs.dev> Co-authored-by: kelemeno <34402761+kelemeno@users.noreply.github.com> Co-authored-by: Jmunoz <juanmunoz890@gmail.com> Co-authored-by: Bence Haromi <bence.haromi@gmail.com> Co-authored-by: Danil <deniallugo@gmail.com>

Co-authored-by: tommysr <47206288+tommysr@users.noreply.github.com>

CI checks were failing in the earlier branch

Failing CI check is for coverage and for external contributors, they are not permissioned enough to run this check. The reason being Github doesn't allow granting anything except read for tokens, when PR is from fork https://docs.github.com/en/actions/security-guides/automatic-token-authentication#permissions-for-the-github_token

Merge Main into Dev

Merge main into dev

Co-authored-by: Raid Ateir <ra@matterlabs.dev>

Signed-off-by: Danil <deniallugo@gmail.com> Co-authored-by: Bence Haromi <56651250+benceharomi@users.noreply.github.com> Co-authored-by: Grzegorz Prusak <pompon.pompon@gmail.com> Co-authored-by: Moshe Shababo <17073733+moshababo@users.noreply.github.com> Co-authored-by: Akosh Farkash <aakoshh@gmail.com> Co-authored-by: Bruno França <bruno@franca.xyz> Co-authored-by: Vlad Bochok <41153528+vladbochok@users.noreply.github.com> Co-authored-by: Roman Brodetski <Roman.Brodetski@gmail.com> Co-authored-by: vladbochok <vladbochok1@gmail.com> Co-authored-by: Stanislav Bezkorovainyi <stanislavbezkor@gmail.com> Co-authored-by: Danil <deniallugo@gmail.com>

Signed-off-by: Danil <deniallugo@gmail.com> Co-authored-by: otani <maksym.kryva@gmail.com> Co-authored-by: Zach Kolodny <zach.kolodny@gmail.com>

Deniallugo · 2024-10-09T14:14:41Z

l1-contracts/deploy-scripts/AcceptAdmin.s.sol

+    using stdToml for string;
+
+    struct Config {
+        address admin;
+        address governor;
+    }
+
+    Config internal config;
+
+    function initConfig() public {
+        string memory root = vm.projectRoot();
+        string memory path = string.concat(root, "/script-config/config-accept-admin.toml");
+        string memory toml = vm.readFile(path);
+        config.admin = toml.readAddress("$.target_addr");
+        config.governor = toml.readAddress("$.governor");
+    }
+


Seems it's a merge artifact

mm-zk · 2024-10-17T06:45:37Z

tools/src/main.rs

@@ -145,7 +158,8 @@ fn insert_residue_elements_and_commitments(
    Ok(reg.render_template(
        &verifier_contract_template,
        &json!({"residue_g2_elements": residue_g2_elements,
-                        "commitments": commitments}),
+                        "commitments": commitments,
+                        "vk_hash": vk_hash}),


@koloz193 - but this vk_hash is not present in the verifier_contract_template.txt ?

It’s one of the comments at the top

shahar4 · 2024-10-20T09:07:29Z

@koloz193 it's worth calling out explicitly the bootloader change to remove the 10k gwei limitation for the fair_l2_price. I'd say it's a lot more impactful than the pubdata limitation.

Signed-off-by: Danil <deniallugo@gmail.com>

…-asserter

Co-authored-by: Vlad Bochok <41153528+vladbochok@users.noreply.github.com>

feat: add timestamp asserter contract

github-actions · 2024-10-31T12:11:12Z

Coverage after merging release-v25-protocol-defense into main will be

86.48%

Coverage Report

File	Stmts	Branches	Funcs	Lines	Uncovered Lines
contracts/bridge
L1ERC20Bridge.sol	81.82%	80%	75%	83.87%	62, 70, 70–71, 73–74
L1SharedBridge.sol	79.59%	66.23%	84.21%	83.41%	101–102, 109–110, 117–118, 125, 125–126, 133, 177, 190–191, 199–200, 212–213, 215–216, 227, 227, 227–231, 231–232, 234, 239–241, 241–242, 244–246, 246–247, 249, 261, 270, 270–271, 279–280, 290, 444–445, 447–448, 579–580, 596–597, 607–608, 623–624, 720–721, 962, 967
contracts/bridgehub
Bridgehub.sol	89.29%	74.07%	100%	91.49%	100–101, 112–113, 132–133, 155–156, 158–159, 332–333, 49, 63–64
contracts/common
ReentrancyGuard.sol	90%	66.67%	100%	92.86%	78–79
contracts/common/libraries
L2ContractHelper.sol	42.86%	0%	50%	52.63%	25–26, 31–32, 35–36, 50, 52, 52–53, 57, 57–58, 66
SemVer.sol	100%	100%	100%	100%
UncheckedMath.sol	100%	100%	100%	100%
UnsafeBytes.sol	100%	100%	100%	100%
contracts/governance
ChainAdmin.sol	0%	0%	0%	0%	27, 27–28, 30, 32–33, 39–40, 47–48, 56, 56–57, 60, 62–63, 63, 66, 69, 78, 78–79, 81
Governance.sol	91.67%	94.74%	95%	89.86%	44, 44–45, 48, 50–51, 53–54
contracts/state-transition
StateTransitionManager.sol	59.48%	35.71%	50%	65.42%	101, 106–110, 116, 149–150, 152–153, 155–156, 158–159, 201, 203–204, 209, 211, 211–212, 215–217, 219–220, 255, 275, 289, 294, 299, 304, 309, 314, 319, 386, 386–387, 390, 455–456, 79, 92, 92–93
TestnetVerifier.sol	44.44%	33.33%	50%	50%	16, 16, 16, 32
ValidatorTimelock.sol	95.89%	83.33%	100%	95.83%	241, 82–83
Verifier.sol	89.88%	35.71%	96.30%	90.93%	1673–1674, 287–302, 305–308, 311–318, 321–328, 331–332, 335–336, 339, 384–385, 395–396, 406–407, 417–418, 428–429, 444–445, 454, 454–455, 904–905
contracts/state-transition/chain-deps
DiamondInit.sol	77.55%	45.45%	100%	86.11%	34–35, 37–38, 40–41, 43–44, 46–47, 71
DiamondProxy.sol	92.31%	75%	100%	100%	16, 27
contracts/state-transition/chain-deps/facets
Admin.sol	86.21%	72.73%	92.31%	87.30%	109, 109–110, 112–113, 178, 180, 83–84, 94–95
Executor.sol	82.04%	63.41%	84.38%	87.90%	137–138, 192, 197, 202, 207, 212, 217, 222, 227, 230–231, 235–236, 240–242, 244–245, 260–261, 280, 294–295, 361–362, 425, 447–449, 469, 48, 48–49, 519–520, 528–529, 549, 556–557, 57, 59, 59–60, 619, 62, 620, 63, 646–647, 696–697, 70, 700–701, 71, 74–75, 775
Getters.sol	92.08%	100%	90.24%	93.10%	153, 206, 72, 77
Mailbox.sol	100%	100%	100%	100%
ZkSyncHyperchainBase.sol	92.86%	85.71%	100%	92.86%	55–56
contracts/state-transition/libraries
Diamond.sol	93.33%	80.77%	100%	95.96%	109–110, 113, 115, 117, 120, 198–199, 316
LibMap.sol	100%	100%	100%	100%
Merkle.sol	100%	100%	100%	100%
PriorityQueue.sol	100%	100%	100%	100%
TransactionValidator.sol	94.44%	88.24%	100%	96%	66–67, 69–70
contracts/upgrades
BaseZkSyncUpgrade.sol	58.20%	27.27%	100%	60.23%	104, 104–105, 108, 111, 114–115, 126, 126–127, 130, 133, 136–137, 151–153, 171–173, 212–213, 215, 215–216, 232–233, 249–250, 252–253, 258–259, 259–260, 271–272, 278–279, 285–286, 293–294, 298–299, 308–309, 311–312, 75–76
BaseZkSyncUpgradeGenesis.sol	56.67%	14.29%	100%	68.18%	25, 25–26, 33–34, 40–41, 52–53, 62–63, 65–66
DefaultUpgrade.sol	100%	100%	100%	100%
GenesisUpgrade.sol	100%	100%	100%	100%
contracts/vendor
AddressAliasHelper.sol	100%	100%	100%	100%

Raid5594 and others added 30 commits April 24, 2024 15:36

extend utils & update compilation process (#396)

4c0e566

Co-authored-by: Raid Ateir <ra@matterlabs.dev>

NonceHolder Tests (#176)

3601648

Co-authored-by: Uacias <filgum0326@gmail.com> Co-authored-by: Mateusz Zając <matzayonc@gmail.com> Co-authored-by: Mateusz Zając <60236390+matzayonc@users.noreply.github.com>

chore(scripts): remove unconditionally removed facets (#448)

2840540

chore(contracts): remove usage of ergs (#454)

622638a

chore(verifier): update generation to include vk hash (#453)

bd9bec5

chore(contract): applied new solhint rules across l1, l2, and system …

994897b

…contracts (#473)

Merge branch 'release-v23' into dev

8e4c291

tests and fix merge conflict

d97d8cd

fix merge conflicts and bump hashes

704b41b

fixed lint

ee5667e

update system contracts hashes and verifier hash

5c4525a

update forge-std

131f823

Merge pull request #508 from matter-labs/zk-merge-release-23-dev

360a918

chore(contracts): merge release 23 into dev

sync with dev

680b252

Merge pull request #523 from matter-labs/sb-merge-main-to-dev

8df3025

Merge main to dev

chore: zksync-ethers 5.8.0-beta.5 (#387)

311b82e

Co-authored-by: Stanislav Breadless <stanislavbezkor@gmail.com>

feat: check diamond cut hash locally (#525)

ab2f13d

Fix incorrect clause (#535)

7d7af53

Add CI coverage (reopenned to dev) (#543)

dc7bd13

Mailbox unit testing (#489)

8fec7ec

Co-authored-by: tommysr <47206288+tommysr@users.noreply.github.com>

Revert "Mailbox unit testing (#489)" (#558)

116206c

CI checks were failing in the earlier branch

chore(ci): Additional permissions for CI token (#565)

fb3a5d8

chore: zksync-ethers to stable v5.9.0 (#567)

c9a8a68

remove outdated folder (#601)

bc98e4b

Merge branch 'main' into zk-sync-main-dev

c808b1f

Merge pull request #678 from matter-labs/zk-sync-main-dev

5b8d6ae

Merge Main into Dev

sync main with dev

3161150

Merge pull request #681 from matter-labs/sb-merge-main-into-dev

0b80914

Merge main into dev

benceharomi and others added 5 commits August 28, 2024 14:18

docs: update zkSync casing to ZKsync (#733)

383e1b0

chore(contracts): add missing spdx licenses (#732)

dba0212

fix(scrips): read bytecode from foundry not hardhat (#750)

874bc6b

Small PR to Fix "Ethers" and "ETH" encoding (#762)

7f2c27a

Co-authored-by: Raid Ateir <ra@matterlabs.dev>

Set foundry optimizer_runs (#770)

3d6e02f

koloz193 changed the title ~~Release v25 protocol defense~~ [DO NOT MERGE]: Release v25 protocol defense Sep 27, 2024

koloz193 marked this pull request as ready for review September 27, 2024 16:00

koloz193 requested review from Deniallugo, vladbochok and StanislavBreadless as code owners September 27, 2024 16:00

koloz193 and others added 2 commits September 27, 2024 12:21

merging main (#824)

1fba03d

koloz193 closed this Oct 4, 2024

koloz193 reopened this Oct 4, 2024

koloz193 and others added 3 commits October 4, 2024 10:25

Merge branch 'main' into release-v25-protocol-defense

8499c67

remove whitespace from config

efa5d3b

Update foundry bytecode (#764)

84d5e37

Signed-off-by: Danil <deniallugo@gmail.com> Co-authored-by: otani <maksym.kryva@gmail.com> Co-authored-by: Zach Kolodny <zach.kolodny@gmail.com>

Deniallugo reviewed Oct 9, 2024

View reviewed changes

mm-zk reviewed Oct 17, 2024

View reviewed changes

Deniallugo and others added 9 commits October 22, 2024 12:59

feat(zkstack): Show chain info (#955)

dcb0eca

Signed-off-by: Danil <deniallugo@gmail.com>

Add time window asserter

72a3e8e

Changed assertion message

4c69685

Review feedback

9ed4ad0

Merge branch 'release-v25-protocol-defense' into ivan/add-time-window…

26bcdbe

…-asserter

Fix lint

9f3f710

Update l2-contracts/contracts/dev-contracts/TimestampAsserter.sol

698f6ae

Co-authored-by: Vlad Bochok <41153528+vladbochok@users.noreply.github.com>

add new lines

50a0db7

Merge pull request #843 from matter-labs/ivan/add-time-window-asserter

9fb1264

feat: add timestamp asserter contract

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[DO NOT MERGE]: Release v25 protocol defense #774

[DO NOT MERGE]: Release v25 protocol defense #774

koloz193 commented Sep 5, 2024 •

edited

Loading

Deniallugo Oct 9, 2024

mm-zk Oct 17, 2024

koloz193 Oct 17, 2024 •

edited

Loading

shahar4 commented Oct 20, 2024

github-actions bot commented Oct 31, 2024

[DO NOT MERGE]: Release v25 protocol defense #774

Are you sure you want to change the base?

[DO NOT MERGE]: Release v25 protocol defense #774

Conversation

koloz193 commented Sep 5, 2024 • edited Loading

v25 release changes

Bootloader

Contracts

Scripts

Testing

Docs & comments

Dependencies

Deniallugo Oct 9, 2024

Choose a reason for hiding this comment

mm-zk Oct 17, 2024

Choose a reason for hiding this comment

koloz193 Oct 17, 2024 • edited Loading

Choose a reason for hiding this comment

shahar4 commented Oct 20, 2024

github-actions bot commented Oct 31, 2024

koloz193 commented Sep 5, 2024 •

edited

Loading

koloz193 Oct 17, 2024 •

edited

Loading