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

chore(EVM): Merge dev #1077

Merged
merged 2 commits into from
Nov 20, 2024
Merged

Conversation

0xVolosnikov
Copy link

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

Coverage after merging evm-emulator/merge-dev into stable/evm-emulator will be

86.78%

Coverage Report
FileStmtsBranchesFuncsLinesUncovered Lines
contracts/bridge
   L1ERC20Bridge.sol81.82%80%75%83.87%62, 70, 70–71, 73–74
   L1SharedBridge.sol78.11%63.89%84.21%81.58%101–102, 109–110, 117–118, 125, 125–126, 133–134, 179–180, 194–195, 203–204, 216–217, 219–220, 231, 231, 231–235, 235–236, 238, 243–245, 245–246, 248–250, 250–251, 253, 265, 274, 274–275, 283–284, 286–287, 298–299, 454–455, 457–458, 589–590, 606–607, 617–618, 633–634, 730–731, 972, 977
contracts/bridgehub
   Bridgehub.sol89.29%74.07%100%91.49%100–101, 112–113, 132–133, 155–156, 158–159, 332–333, 49, 63–64
contracts/common
   ReentrancyGuard.sol90%66.67%100%92.86%78–79
contracts/common/libraries
   L2ContractHelper.sol42.86%0%50%52.63%25–26, 31–32, 35–36, 50, 52, 52–53, 57, 57–58, 66
   SemVer.sol100%100%100%100%
   UncheckedMath.sol100%100%100%100%
   UnsafeBytes.sol100%100%100%100%
contracts/governance
   ChainAdmin.sol64.29%50%60%68.42%27–28, 39–40, 78, 78–79, 81
   Governance.sol91.67%94.74%95%89.86%45, 45–46, 49, 51–52, 54–55
contracts/state-transition
   StateTransitionManager.sol59.74%35.71%50%65.74%102, 107–111, 117, 150–151, 153–154, 156–157, 159–160, 202, 204–205, 210, 212, 212–213, 216–218, 220–221, 256, 276, 290, 295, 300, 305, 310, 315, 320, 395, 395–396, 399, 470–471, 80, 93, 93–94
   TestnetVerifier.sol44.44%33.33%50%50%16, 16, 16, 32
   ValidatorTimelock.sol95.89%83.33%100%95.83%241, 82–83
   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.sol78%45.45%100%86.49%34–35, 37–38, 40–41, 43–44, 46–47, 72
   DiamondProxy.sol92.31%75%100%100%16, 27
contracts/state-transition/chain-deps/facets
   Admin.sol86.21%72.73%92.31%87.30%109, 109–110, 112–113, 178, 180, 83–84, 94–95
   Executor.sol82.09%63.41%84.38%87.95%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.sol90.48%100%88.37%91.67%147, 216, 57, 77, 82
   Mailbox.sol100%100%100%100%
   ZkSyncHyperchainBase.sol92.86%85.71%100%92.86%55–56
contracts/state-transition/libraries
   Diamond.sol93.33%80.77%100%95.96%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.44%88.24%100%96%66–67, 69–70
contracts/upgrades
   BaseZkSyncUpgrade.sol58.46%29.17%100%60.22%115, 115, 118, 121, 124–125, 137, 137, 140, 143, 146–147, 159, 159, 162, 165, 168–169, 183–185, 203–205, 252, 252, 255, 255, 272, 272, 289, 289, 292, 292, 297–299, 299, 311, 311, 318, 318, 325, 325, 333, 333, 338, 338, 348, 348, 351, 351, 81, 81
   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%60, 62

@0xVolosnikov 0xVolosnikov merged commit 348e84a into stable/evm-emulator Nov 20, 2024
21 checks passed
@0xVolosnikov 0xVolosnikov deleted the evm-emulator/merge-dev branch November 20, 2024 18:16
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.

1 participant