chore: make proof verification external to reduce codesize

AztecProtocol · Feb 11, 2025 · da391f8 · da391f8
1 parent 8ced7a7
commit da391f8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/l1-contracts/src/core/RollupCore.sol b/l1-contracts/src/core/RollupCore.sol
@@ -349,7 +349,7 @@ contract RollupCore is
     // End of `isAcceptable`
 
     // Start of verifying the proof
-    require(EpochProofLib.verifyEpochRootProof(rollupStore, _args), "proof is invalid");
+    require(ExtRollupLib.verifyEpochRootProof(rollupStore, _args), "proof is invalid");
     // End of verifying the proof
 
     interim.isFeeCanonical = address(this) == FEE_JUICE_PORTAL.canonicalRollup();

diff --git a/l1-contracts/src/core/libraries/RollupLibs/ExtRollupLib.sol b/l1-contracts/src/core/libraries/RollupLibs/ExtRollupLib.sol
@@ -2,6 +2,8 @@
 // Copyright 2024 Aztec Labs.
 pragma solidity >=0.8.27;
 
+import {RollupStore, SubmitEpochRootProofArgs} from "@aztec/core/interfaces/IRollup.sol";
+
 import {BlockLog, RollupStore} from "@aztec/core/interfaces/IRollup.sol";
 import {BlobLib} from "./BlobLib.sol";
 import {EpochProofLib} from "./EpochProofLib.sol";
@@ -19,6 +21,13 @@ library ExtRollupLib {
     ValidationLib.validateHeaderForSubmissionBase(_args, _blocks);
   }
 
+  function verifyEpochRootProof(
+    RollupStore storage _rollupStore,
+    SubmitEpochRootProofArgs calldata _args
+  ) external view returns (bool) {
+    return EpochProofLib.verifyEpochRootProof(_rollupStore, _args);
+  }
+
   function getManaBaseFeeComponentsAt(
     FeeHeader storage _parentFeeHeader,
     L1FeeData memory _fees,

diff --git a/l1-contracts/test/fees/FeeRollup.t.sol b/l1-contracts/test/fees/FeeRollup.t.sol
@@ -54,7 +54,7 @@ import {MinimalFeeModel} from "./MinimalFeeModel.sol";
 // solhint-disable comprehensive-interface
 
 contract FakeCanonical is IRewardDistributor {
-  uint256 public constant BLOCK_REWARD = 0; //50e18;
+  uint256 public constant BLOCK_REWARD = 50e18;
   IERC20 public immutable UNDERLYING;
 
   address public canonicalRollup;