[TEST] Zk v25 sync main #841

koloz193 · 2024-10-04T12:52:37Z

What ❔

Why ❔

Checklist

PR title corresponds to the body of PR (we generate changelog entries from PRs).
Tests for the changes have been added / updated.
Documentation comments have been added / updated.

Co-authored-by: Raid Ateir <[email protected]>

Co-authored-by: Uacias <[email protected]> Co-authored-by: Mateusz Zając <[email protected]> Co-authored-by: Mateusz Zając <[email protected]>

…contracts (#473)

chore(contracts): merge release 23 into dev

Merge main to dev

Co-authored-by: Stanislav Breadless <[email protected]>

Signed-off-by: Danil <[email protected]> Co-authored-by: Lyova Potyomkin <[email protected]> Co-authored-by: kelemeno <[email protected]> Co-authored-by: Stanislav Bezkorovainyi <[email protected]> Co-authored-by: Raid Ateir <[email protected]> Co-authored-by: kelemeno <[email protected]> Co-authored-by: Jmunoz <[email protected]> Co-authored-by: Bence Haromi <[email protected]> Co-authored-by: Danil <[email protected]>

Co-authored-by: tommysr <[email protected]>

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

Signed-off-by: Danil <[email protected]>

Co-authored-by: Raid Ateir <[email protected]>

Signed-off-by: Danil <[email protected]>

…x-dev

Signed-off-by: Danil <[email protected]>

Signed-off-by: Danil <[email protected]> Co-authored-by: otani <[email protected]>

Signed-off-by: Danil <[email protected]>

…x-dev

Signed-off-by: Danil <[email protected]> Co-authored-by: Bence Haromi <[email protected]> Co-authored-by: Grzegorz Prusak <[email protected]> Co-authored-by: Moshe Shababo <[email protected]> Co-authored-by: Akosh Farkash <[email protected]> Co-authored-by: Bruno França <[email protected]> Co-authored-by: Vlad Bochok <[email protected]> Co-authored-by: Roman Brodetski <[email protected]> Co-authored-by: vladbochok <[email protected]> Co-authored-by: Stanislav Bezkorovainyi <[email protected]> Co-authored-by: Danil <[email protected]>

github-actions · 2024-10-04T13:25:29Z

Coverage after merging zk-v25-sync-main into main will be

86.09%

Coverage Report

File	Stmts	Branches	Funcs	Lines	Uncovered Lines
contracts/bridge
L1ERC20Bridge.sol	81.63%	80%	75%	83.87%	62, 70, 70, 70–71, 73–74
L1SharedBridge.sol	84.40%	90.77%	81.58%	81.17%	102, 110, 118, 125, 125, 125–126, 145–149, 191, 200, 213, 216, 227, 227, 227–231, 231, 231–232, 234, 239–241, 241, 241–242, 244–246, 246, 246–247, 249, 261, 270, 270, 270–271, 445, 448, 580, 597, 608, 624, 721, 962, 967
contracts/bridgehub
Bridgehub.sol	95.09%	100%	100%	91.49%	101, 113, 133, 156, 159, 333, 49, 64
contracts/common
ReentrancyGuard.sol	95.65%	100%	100%	92.86%	79
contracts/common/libraries
L2ContractHelper.sol	54.55%	60%	50%	52.63%	26, 32, 36, 50, 52, 52, 52–53, 57, 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, 27–28, 30, 32–33, 39–40, 47–48, 56, 56, 56–57, 60, 62–63, 63, 63, 66, 69, 78, 78, 78–79, 81
Governance.sol	91.74%	93.75%	95%	89.86%	44, 44, 44–45, 48, 50–51, 53–54
contracts/state-transition
StateTransitionManager.sol	63.80%	75%	50%	65.42%	101, 106–110, 116, 150, 153, 156, 159, 201, 203–204, 209, 211, 211, 211–212, 215–217, 219–220, 255, 275, 289, 294, 299, 304, 309, 314, 319, 386, 386, 386–387, 390, 456, 92, 92, 92–93
TestnetVerifier.sol	50%	50%	50%	50%	16, 28, 32
ValidatorTimelock.sol	92.41%	100%	94.74%	89.58%	241, 59–61, 83
Verifier.sol	91.21%	92.86%	96.30%	90.93%	1674, 287–302, 305–308, 311–318, 321–328, 331–332, 335–336, 339, 385, 396, 407, 418, 429, 445, 454, 454–455, 905
contracts/state-transition/chain-deps
DiamondInit.sol	91.07%	100%	100%	86.11%	35, 38, 41, 44, 47
DiamondProxy.sol	84.62%	75%	100%	88.24%	16, 16, 16–17
contracts/state-transition/chain-deps/facets
Admin.sol	86.73%	81.82%	92.31%	87.30%	109, 109, 109–110, 112–113, 142, 175, 178, 180, 84, 95
Executor.sol	88.67%	90.58%	84.38%	88.16%	138, 192, 197, 202, 207, 212, 217, 222, 227, 231, 236, 240, 242, 245, 247, 261, 280, 295, 362, 425, 448–449, 469, 49, 520, 529, 549, 557, 57, 59, 59, 59–60, 62, 620, 63, 647, 697, 701, 71, 75, 775
Getters.sol	92.23%	100%	90.24%	93.10%	153, 206, 72, 77
Mailbox.sol	100%	100%	100%	100%
ZkSyncHyperchainBase.sol	97.14%	100%	100%	92.86%	56
contracts/state-transition/libraries
Diamond.sol	94.12%	88.64%	100%	95.96%	110, 113, 115, 117, 120, 199, 308, 311, 316
LibMap.sol	100%	100%	100%	100%
Merkle.sol	100%	100%	100%	100%
PriorityQueue.sol	100%	100%	100%	100%
TransactionValidator.sol	97.73%	100%	100%	95.92%	67, 70
contracts/upgrades
BaseZkSyncUpgrade.sol	72.03%	86.36%	100%	60.92%	104, 104, 104–105, 108, 111, 114–115, 126, 126, 126–127, 130, 133, 136–137, 151–153, 171–173, 213, 216, 233, 250, 253, 258–259, 259, 259–260, 272, 279, 286, 294, 299, 309, 312, 76
BaseZkSyncUpgradeGenesis.sol	83.33%	100%	100%	71.43%	26, 34, 41, 53, 63, 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 <[email protected]>

NonceHolder Tests (#176)

3601648

Co-authored-by: Uacias <[email protected]> Co-authored-by: Mateusz Zając <[email protected]> Co-authored-by: Mateusz Zając <[email protected]>

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 <[email protected]>

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 <[email protected]>

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

Deniallugo and others added 22 commits September 3, 2024 13:41

Update foundry bytecode

e7f3dfd

Signed-off-by: Danil <[email protected]>

lint

1a3fed8

Signed-off-by: Danil <[email protected]>

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

7f2c27a

Co-authored-by: Raid Ateir <[email protected]>

Fix memory layout for token description

0fc6ac5

Signed-off-by: Danil <[email protected]>

Update preprocessor

7a4a894

Signed-off-by: Danil <[email protected]>

Set foundry optimizer_runs (#770)

3d6e02f

Save tests as well

60b27ee

Signed-off-by: Danil <[email protected]>

Merge branch 'main' into deniallugo-zk-toolbox-dev

8e71448

Merge branch 'release-v25-protocol-defense' into deniallugo-zk-toolbo…

0396573

…x-dev

Fix contract places

b87da1c

Signed-off-by: Danil <[email protected]>

Fix packages

60449fc

Signed-off-by: Danil <[email protected]>

Fix

e171277

Signed-off-by: Danil <[email protected]>

Fix post merge

a999079

Signed-off-by: Danil <[email protected]>

add foundry to ci (#815)

f3178f7

Signed-off-by: Danil <[email protected]> Co-authored-by: otani <[email protected]>

Update version

fa1bcbc

Signed-off-by: Danil <[email protected]>

ci: make CI more readable (#816)

fc7c206

merging main (#824)

1fba03d

Merge branch 'release-v25-protocol-defense' into deniallugo-zk-toolbo…

c5fda60

…x-dev

update deps

466de97

bump yarn lock

5d9aa19

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

c858366

koloz193 requested review from Deniallugo, vladbochok and StanislavBreadless as code owners October 4, 2024 12:52

koloz193 changed the base branch from main to release-v25-protocol-defense October 4, 2024 12:53

koloz193 changed the base branch from release-v25-protocol-defense to main October 4, 2024 12:53

Merge branch 'deniallugo-zk-toolbox-dev' into zk-v25-sync-main

4d472b2

koloz193 closed this Oct 4, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[TEST] Zk v25 sync main #841

[TEST] Zk v25 sync main #841

koloz193 commented Oct 4, 2024

github-actions bot commented Oct 4, 2024

[TEST] Zk v25 sync main #841

[TEST] Zk v25 sync main #841

Conversation

koloz193 commented Oct 4, 2024

What ❔

Why ❔

Checklist

github-actions bot commented Oct 4, 2024