Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge Main into Dev #678

Merged
merged 8 commits into from
Aug 6, 2024
Merged

Merge Main into Dev #678

merged 8 commits into from
Aug 6, 2024

Conversation

koloz193
Copy link
Contributor

@koloz193 koloz193 commented Aug 5, 2024

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.

Copy link

github-actions bot commented Aug 5, 2024

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

89.77%

Coverage Report
FileStmtsBranchesFuncsLinesUncovered Lines
contracts/bridge
   L1ERC20Bridge.sol81.82%80%75%84.62%62, 70, 70, 70–72
   L1SharedBridge.sol80.91%73.87%79.41%85.98%102, 111, 117, 117, 117, 129–133, 147, 154, 165–166, 176, 176, 176–180, 180, 180–181, 186–188, 188, 188–191, 191, 191–192, 204, 213, 213, 213, 346–347, 463, 469, 484, 493, 510, 593, 599, 654, 827, 832, 96
contracts/bridgehub
   Bridgehub.sol81.15%57.89%89.47%92.31%133–134, 136, 140–141, 143, 249–250, 296, 296–297, 303, 303, 303–304, 326, 330, 361, 366, 50, 72
contracts/common
   ReentrancyGuard.sol100%100%100%100%
contracts/common/libraries
   L2ContractHelper.sol53.57%30%50%71.43%25, 28–29, 42–43, 43, 43, 45, 45, 45, 52
   SemVer.sol100%100%100%100%
   UncheckedMath.sol100%100%100%100%
   UnsafeBytes.sol100%100%100%100%
contracts/governance
   Governance.sol91.67%93.55%95%89.47%44, 44, 44, 46, 48–49, 51–52
contracts/state-transition
   StateTransitionManager.sol63.16%56%50%69.47%103–107, 113, 144–146, 150, 191, 193–194, 199–200, 200, 200, 202–204, 206–207, 241, 261, 275, 280, 285, 290, 295, 300, 305, 372, 372, 372, 374, 437, 91, 91, 91, 98
   TestnetVerifier.sol44.44%33.33%50%50%16, 16, 16, 32
   ValidatorTimelock.sol92.86%100%94.74%90.70%231, 60–62
   Verifier.sol89.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.sol87.76%70%100%100%27–31, 54
   DiamondProxy.sol80.77%62.50%100%88.24%16, 16, 16–17, 27
contracts/state-transition/chain-deps/facets
   Admin.sol86.05%72.73%92.31%90.20%126, 153–154, 156, 76, 85, 97, 97, 97–99
   Executor.sol86.63%75.56%84.38%94.79%123, 168, 171, 174, 177, 180, 183, 186, 189, 192, 198, 200, 200–202, 214, 232, 246, 305, 363, 383–385, 405, 42, 446, 453, 472, 477, 538, 54, 56, 56, 56, 563–564, 57–58, 612, 614, 65–66, 675
   Getters.sol92.08%100%90.24%92.98%153, 204, 72, 77
   Mailbox.sol100%100%100%100%
   ZkSyncHyperchainBase.sol96.43%92.86%100%100%48
contracts/state-transition/libraries
   Diamond.sol94.81%86.49%100%97.73%110, 112, 114, 116, 119, 184, 294
   LibMap.sol100%100%100%100%
   Merkle.sol100%100%100%100%
   PriorityQueue.sol100%100%100%100%
   TransactionValidator.sol97.18%94.12%100%100%54–55
contracts/upgrades
   BaseZkSyncUpgrade.sol69.42%48.65%100%75%102, 102, 102, 104, 107, 110–111, 122, 122, 122, 124, 127, 130–131, 145–147, 165–167, 206, 208, 223, 241–242, 246, 246, 246, 259, 267, 272, 278–279, 283, 291–292, 75
   BaseZkSyncUpgradeGenesis.sol56.67%14.29%100%68.18%25, 25–26, 33–34, 40–41, 52–53, 62–63, 65–66
   DefaultUpgrade.sol100%100%100%100%
   GenesisUpgrade.sol100%100%100%100%
contracts/vendor
   AddressAliasHelper.sol85.71%75%100%85.71%59, 61

@StanislavBreadless StanislavBreadless merged commit 5b8d6ae into dev Aug 6, 2024
23 checks passed
@StanislavBreadless StanislavBreadless deleted the zk-sync-main-dev branch August 6, 2024 08:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants