Skip to content

chore: Merge main in dev#1208

Merged
StanislavBreadless merged 29 commits intodevfrom
vv-merge-main-in-dev
Jan 21, 2025
Merged

chore: Merge main in dev#1208
StanislavBreadless merged 29 commits intodevfrom
vv-merge-main-in-dev

Conversation

@0xVolosnikov
Copy link
Contributor

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.

Deniallugo and others added 25 commits September 10, 2024 15:10
Signed-off-by: Danil <deniallugo@gmail.com>
Co-authored-by: Vlad Bochok <41153528+vladbochok@users.noreply.github.com>
Signed-off-by: Danil <deniallugo@gmail.com>
Co-authored-by: Vlad Bochok <41153528+vladbochok@users.noreply.github.com>
Signed-off-by: Danil <deniallugo@gmail.com>
Co-authored-by: Vlad Bochok <41153528+vladbochok@users.noreply.github.com>
Signed-off-by: Danil <deniallugo@gmail.com>
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>
Signed-off-by: Danil <deniallugo@gmail.com>
Co-authored-by: Vlad Bochok <41153528+vladbochok@users.noreply.github.com>
…sserter-command

fix: add deploy timestamp asserter command
@0xVolosnikov 0xVolosnikov marked this pull request as draft January 20, 2025 16:48
Bump coverage deps

Pin lcov version

Add setup lcov action
@github-actions
Copy link
Contributor

Coverage after merging vv-merge-main-in-dev into dev will be

87.43%

Coverage Report
FileStmtsBranchesFuncsLinesUncovered Lines
contracts/bridge
   L1ERC20Bridge.sol86.79%80%87.50%87.50%69–70, 70–71, 73–74
   L1SharedBridge.sol78.72%63.89%84.21%81.95%101–102, 109–110, 117–118, 124–125, 125–126, 133–134, 179–180, 194–195, 203–204, 216–217, 219–220, 230–231, 231, 231–235, 235–236, 238, 243–245, 245–246, 248–250, 250–251, 253, 259, 265, 273–274, 274–275, 283–284, 286–287, 298–299, 454–455, 457–458, 589–590, 606–607, 617–618, 633–634, 730–731, 971–972, 976–977
contracts/bridgehub
   Bridgehub.sol90.45%74.07%100%92.86%100–101, 112–113, 132–133, 155–156, 158–159, 332–333, 49, 63–64
contracts/chain-registrar
   ChainRegistrar.sol77.78%50%80%82.35%154–155, 181–183, 191–192, 199–200
contracts/common
   ReentrancyGuard.sol91.30%66.67%100%94.12%78–79
contracts/common/libraries
   L2ContractHelper.sol43.75%0%50%52.17%25–26, 31–32, 35–36, 49–50, 52, 52–53, 57, 57–58, 65–66
   SemVer.sol100%100%100%100%
   UncheckedMath.sol100%100%100%100%
   UnsafeBytes.sol100%100%100%100%
contracts/governance
   ChainAdmin.sol63.64%50%60%66.67%27–28, 38–40, 77–78, 78–79, 81
   Governance.sol98.44%94.74%100%98.88%45–46
contracts/state-transition
   StateTransitionManager.sol57.92%33.33%50%61.87%101, 105–110, 115–116, 149–150, 152–153, 155–156, 158–159, 199, 201, 203–204, 208–209, 211, 211–212, 215–217, 219–220, 254–255, 274–275, 284, 289, 293–294, 298–299, 303–304, 308–309, 313–314, 318–319, 385–386, 386–387, 390, 455–456, 91–92, 92–93, 99
   TestnetVerifier.sol88.89%100%100%83.33%32
   ValidatorTimelock.sol96.74%83.33%100%97.01%241, 82–83
   Verifier.sol90.17%35.71%96.30%91.19%1673–1674, 284, 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.sol78.72%44.44%100%86.49%34–35, 37–38, 40–41, 43–44, 46–47
   DiamondProxy.sol93.10%75%100%100%16, 27
contracts/state-transition/chain-deps/facets
   Admin.sol87%72.73%92.31%88.16%107, 109, 109–110, 112–113, 178, 180, 83–84, 94–95
   Executor.sol82.23%63.41%84.38%87.50%137–138, 192, 197, 202, 207, 212, 217, 222, 227, 230–231, 235–236, 240–242, 244–245, 260–261, 275, 280, 294–295, 361–362, 421, 425, 447–449, 463, 469, 48, 48–49, 519–520, 528–529, 548–549, 556–557, 57, 59, 59–60, 619, 62, 620, 63, 646–647, 696–697, 70, 700–701, 71, 74–75, 773, 775
   Getters.sol91.72%100%90.48%92.08%210–211, 56–57, 76–77, 81–82
   Mailbox.sol100%100%100%100%
   ZkSyncHyperchainBase.sol94.29%85.71%100%95.24%55–56
contracts/state-transition/libraries
   Diamond.sol93.79%80.77%100%96.33%109–110, 113, 115, 117, 120, 198–199, 316
   LibMap.sol100%100%100%100%
   Merkle.sol100%100%100%100%
   PriorityQueue.sol100%100%100%100%
   TransactionValidator.sol94.81%88.24%100%96.36%66–67, 69–70
contracts/upgrades
   BaseZkSyncUpgrade.sol61.94%27.27%100%65%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.sol58.06%14.29%100%69.57%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.sol88.24%75%100%90%60, 62

@0xVolosnikov 0xVolosnikov marked this pull request as ready for review January 20, 2025 18:26
@StanislavBreadless StanislavBreadless merged commit 4b01468 into dev Jan 21, 2025
21 checks passed
@StanislavBreadless StanislavBreadless deleted the vv-merge-main-in-dev branch January 21, 2025 09:24
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.

7 participants