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

feat: OZ ZKChain: Governance Audit Fixes Combines (#1044) #1145

Merged
merged 276 commits into from
Dec 17, 2024

Conversation

Raid5594
Copy link
Collaborator

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.

@Raid5594 Raid5594 changed the base branch from oz-audit-sep-head to oz-audit-sep-base December 12, 2024 16:43
Copy link

Coverage after merging governance-fix-review into oz-audit-sep-base will be

86.26%

Coverage Report
FileStmtsBranchesFuncsLinesUncovered Lines
../da-contracts/contracts
   RollupL1DAValidator.sol66.27%37.50%83.33%72.13%145, 148, 148, 148, 150, 183–184, 187–188, 26–27, 27–28, 30, 30–31, 34, 36–37, 41–42, 65, 67, 67, 67–68, 70
contracts/bridge
   BridgeHelper.sol93.75%50%100%100%22
   BridgedStandardERC20.sol76.14%25%92.31%79.10%107–108, 113–114, 126–127, 151–152, 193, 193, 200, 200, 207, 207, 217–218, 54–55, 81–82
   L1ERC20Bridge.sol94.23%80%100%95%188–189, 264
   L1Nullifier.sol75.30%56%75.86%80.95%111–112, 126–127, 127–128, 134–135, 135–136, 142–143, 143–144, 173–174, 197, 215, 217, 224–225, 227–228, 237–238, 246–247, 249, 415, 417–418, 418, 418, 420–421, 421, 421, 432–433, 446–447, 468–469, 508, 602, 678, 688, 690, 692, 705, 718–719, 723–724
contracts/bridge/asset-router
   AssetRouterBase.sol86.36%40%100%90.63%138–139, 57–58, 85–86
contracts/bridge/ntv
   L1NativeTokenVault.sol93.75%90.48%92.86%94.81%192, 215, 215–216, 70–71
   NativeTokenVault.sol88.10%68.18%90.48%91.20%192, 194, 212–213, 220–221, 254–255, 380, 382, 394–395, 446–447, 451–452, 64–65
contracts/bridgehub
   Bridgehub.sol81.58%48.48%93.33%87.73%110–111, 111–112, 118–119, 126–127, 133–134, 140, 140–141, 175–176, 222–223, 223, 223–224, 231–232, 234–235, 238–239, 249–250, 264–265, 314–315, 317–318, 375–376, 391–392, 422–423, 506–507, 588, 687, 690–691, 695–696, 729–730, 743, 786–787, 789–790, 792–793, 827–828, 831–832, 834–835, 869–870, 874–875
   CTMDeploymentTracker.sol81.13%50%90%93.10%115, 118–119, 34, 41, 64, 91, 94, 96
   MessageRoot.sol92.65%63.64%100%97.78%116–117, 148, 69, 87
contracts/common
   ReentrancyGuard.sol91.30%66.67%100%94.12%78–79
contracts/common/libraries
   DataEncoding.sol72.73%37.50%100%75.86%108, 112, 119, 129, 129–131, 134, 74–75, 82–83
   DynamicIncrementalMerkle.sol75%100%80%73.17%66–70, 72–74, 76–78
   FullMerkle.sol100%100%100%100%
   L2ContractHelper.sol45.24%0%50%51.61%100, 100–101, 108–109, 139, 143, 55–56, 68–69, 74–75, 78–79, 92–93, 95, 95–96
   Merkle.sol96.88%90.91%100%97.92%80–81
   MessageHashing.sol100%100%100%100%
   SemVer.sol100%100%100%100%
   SystemContractsCaller.sol0%0%0%0%102, 114, 122–125, 128, 135–138, 138–139, 141, 141–142, 32–33, 33–34, 37, 44–45, 47, 49, 51, 53, 66, 66, 66, 69, 72, 75, 78, 83, 89, 91, 93, 96, 98
   UncheckedMath.sol100%100%100%100%
   UnsafeBytes.sol84%100%83.33%84.21%33, 35–36
contracts/governance
   AccessControlRestriction.sol100%100%100%100%
   ChainAdmin.sol96.36%83.33%100%97.44%36–37
   Governance.sol98.44%94.74%100%98.88%45–46
   PermanentRestriction.sol87.76%73.08%100%89.72%110, 110–111, 199, 199–200, 203, 205, 205–206, 233, 235, 285–286, 307–308, 338–339
contracts/governance/restriction
   Restriction.sol100%100%100%100%
   RestrictionValidator.sol100%100%100%100%
contracts/state-transition
   ChainTypeManager.sol66.15%31.82%60%73.19%106, 108, 135–136, 138–139, 141–142, 144–145, 200–201, 244–245, 251–252, 269–270, 275–276, 282–283, 290, 295, 301–302, 308–309, 316–317, 323–324, 331–332, 338–339, 357, 359, 424, 442–443, 443, 443, 446, 446, 446, 448, 461, 466, 491, 87–88
   TestnetVerifier.sol88.89%100%100%83.33%28
   ValidatorTimelock.sol95.95%83.33%100%96.36%200, 82–83
   Verifier.sol90.19%40%96.30%91.19%1674–1675, 284, 287–302, 305–308, 311–318, 321–328, 331–332, 335–336, 339, 383–384, 394–395, 405–406, 416–417, 427–428, 443–444, 453, 453–454, 905–906
contracts/state-transition/chain-deps
   DiamondInit.sol79.17%44.44%100%86.84%39–40, 42–43, 45–46, 48–49, 51–52
   DiamondProxy.sol93.10%75%100%100%16, 27
contracts/state-transition/chain-deps/facets
   Admin.sol77.31%39.66%95.45%88.61%104–105, 115–116, 128, 130, 130–131, 133–134, 157–158, 239, 241, 254–255, 261, 263, 266, 266, 266, 284, 295–296, 301, 313, 313, 315, 315, 315, 321, 321, 321–322, 322, 322–324, 324, 324–325, 325, 325–327, 354, 356, 360, 369, 379, 383, 40, 40
   Executor.sol77.08%57.14%92%82.05%120–121, 173, 178, 183, 188, 193, 198, 202–203, 208, 208–209, 209–210, 212, 212–213, 223, 227, 227–228,

@Raid5594 Raid5594 merged commit 9b940ef into oz-audit-sep-base Dec 17, 2024
24 checks passed
@Raid5594 Raid5594 deleted the governance-fix-review branch December 17, 2024 16:23
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.

10 participants