Solhint

Author: spalladino

l1-contracts/src/core/RollupCore.sol

@@ -247,15 +247,15 @@ contract RollupCore is
     CommitteeAttestations memory _attestations,
     address[] memory _committee,
     uint256 _invalidIndex
-  ) external {
+  ) external override(IRollupCore) {
     ExtRollupLib2.invalidateBadAttestation(_blockNumber, _attestations, _committee, _invalidIndex);
   }
 
   function invalidateInsufficientAttestations(
     uint256 _blockNumber,
     CommitteeAttestations memory _attestations,
     address[] memory _committee
-  ) external {
+  ) external override(IRollupCore) {
     ExtRollupLib2.invalidateInsufficientAttestations(_blockNumber, _attestations, _committee);
   }
 

l1-contracts/src/core/libraries/rollup/EpochProofLib.sol

@@ -6,11 +6,10 @@ import {
   SubmitEpochRootProofArgs,
   PublicInputArgs,
   IRollupCore,
-  RollupStore,
-  BlockHeaderValidationFlags
+  RollupStore
 } from "@aztec/core/interfaces/IRollup.sol";
-import {ChainTipsLib, CompressedChainTips} from "@aztec/core/libraries/compressed-data/Tips.sol";
 import {TempBlockLog} from "@aztec/core/libraries/compressed-data/BlockLog.sol";
+import {ChainTipsLib, CompressedChainTips} from "@aztec/core/libraries/compressed-data/Tips.sol";
 import {Constants} from "@aztec/core/libraries/ConstantsGen.sol";
 import {Errors} from "@aztec/core/libraries/Errors.sol";
 import {BlobLib} from "@aztec/core/libraries/rollup/BlobLib.sol";
@@ -215,6 +214,31 @@ library EpochProofLib {
     return publicInputs;
   }
 
+  /**
+   * @notice Verifies the attestations for the last block in the epoch
+   * @param _endBlockNumber The last block number in the epoch
+   * @param _attestations The attestations to verify
+   */
+  function verifyLastBlockAttestations(
+    uint256 _endBlockNumber,
+    CommitteeAttestations memory _attestations
+  ) private {
+    // Get the stored attestation hash and payload digest for the last block
+    TempBlockLog memory blockLog = STFLib.getTempBlockLog(_endBlockNumber);
+
+    // Verify that the provided attestations match the stored hash
+    bytes32 providedAttestationsHash = keccak256(abi.encode(_attestations));
+    require(
+      providedAttestationsHash == blockLog.attestationsHash, Errors.Rollup__InvalidAttestations()
+    );
+
+    // Get the slot and epoch for the last block
+    Slot slot = blockLog.slotNumber;
+    Epoch epoch = STFLib.getEpochForBlock(_endBlockNumber);
+
+    ValidatorSelectionLib.verify(slot, epoch, _attestations, blockLog.payloadDigest);
+  }
+
   function assertAcceptable(uint256 _start, uint256 _end) private view returns (Epoch) {
     RollupStore storage rollupStore = STFLib.getStorage();
 
@@ -294,29 +318,4 @@ library EpochProofLib {
   function addressToField(address _a) private pure returns (bytes32) {
     return bytes32(uint256(uint160(_a)));
   }
-
-  /**
-   * @notice Verifies the attestations for the last block in the epoch
-   * @param _endBlockNumber The last block number in the epoch
-   * @param _attestations The attestations to verify
-   */
-  function verifyLastBlockAttestations(
-    uint256 _endBlockNumber,
-    CommitteeAttestations memory _attestations
-  ) private {
-    // Get the stored attestation hash and payload digest for the last block
-    TempBlockLog memory blockLog = STFLib.getTempBlockLog(_endBlockNumber);
-
-    // Verify that the provided attestations match the stored hash
-    bytes32 providedAttestationsHash = keccak256(abi.encode(_attestations));
-    require(
-      providedAttestationsHash == blockLog.attestationsHash, Errors.Rollup__InvalidAttestations()
-    );
-
-    // Get the slot and epoch for the last block
-    Slot slot = blockLog.slotNumber;
-    Epoch epoch = STFLib.getEpochForBlock(_endBlockNumber);
-
-    ValidatorSelectionLib.verify(slot, epoch, _attestations, blockLog.payloadDigest);
-  }
 }

l1-contracts/src/core/libraries/rollup/ExtRollupLib.sol

@@ -5,12 +5,10 @@ pragma solidity >=0.8.27;
 
 import {Errors} from "@aztec/core/libraries/Errors.sol";
 import {SubmitEpochRootProofArgs, PublicInputArgs} from "@aztec/core/interfaces/IRollup.sol";
-import {TempBlockLog} from "@aztec/core/libraries/compressed-data/BlockLog.sol";
 import {STFLib} from "@aztec/core/libraries/rollup/STFLib.sol";
 import {Timestamp, TimeLib, Slot, Epoch} from "@aztec/core/libraries/TimeLib.sol";
 import {BlobLib} from "./BlobLib.sol";
 import {EpochProofLib} from "./EpochProofLib.sol";
-import {InvalidateLib} from "./InvalidateLib.sol";
 import {SignatureLib} from "@aztec/shared/libraries/SignatureLib.sol";
 import {
   ProposeLib,
@@ -55,6 +53,11 @@ library ExtRollupLib {
     ProposeLib.propose(_args, _attestations, _blobInput, _checkBlob);
   }
 
+  function prune() external {
+    require(STFLib.canPruneAtTime(Timestamp.wrap(block.timestamp)), Errors.Rollup__NothingToPrune());
+    STFLib.prune();
+  }
+
   function getEpochProofPublicInputs(
     uint256 _start,
     uint256 _end,
@@ -80,9 +83,4 @@ library ExtRollupLib {
   function getBlobBaseFee() external view returns (uint256) {
     return BlobLib.getBlobBaseFee();
   }
-
-  function prune() external {
-    require(STFLib.canPruneAtTime(Timestamp.wrap(block.timestamp)), Errors.Rollup__NothingToPrune());
-    STFLib.prune();
-  }
 }

l1-contracts/src/core/libraries/rollup/ExtRollupLib2.sol

@@ -83,6 +83,10 @@ library ExtRollupLib2 {
     InvalidateLib.invalidateInsufficientAttestations(_blockNumber, _attestations, _committee);
   }
 
+  function slash(address _attester, uint256 _amount) external returns (bool) {
+    return StakingLib.trySlash(_attester, _amount);
+  }
+
   function canProposeAtTime(Timestamp _ts, bytes32 _archive) external returns (Slot, uint256) {
     return ValidatorSelectionLib.canProposeAtTime(_ts, _archive);
   }
@@ -110,8 +114,4 @@ library ExtRollupLib2 {
   function getEntryQueueFlushSize() external view returns (uint256) {
     return StakingLib.getEntryQueueFlushSize();
   }
-
-  function slash(address _attester, uint256 _amount) external returns (bool) {
-    return StakingLib.trySlash(_attester, _amount);
-  }
 }

l1-contracts/src/core/libraries/rollup/InvalidateLib.sol

@@ -2,23 +2,19 @@
 // Copyright 2024 Aztec Labs.
 pragma solidity >=0.8.27;
 
-import {
-  IRollupCore, RollupStore, BlockHeaderValidationFlags
-} from "@aztec/core/interfaces/IRollup.sol";
-import {
-  TempBlockLog, CompressedTempBlockLog
-} from "@aztec/core/libraries/compressed-data/BlockLog.sol";
+import {IRollupCore, RollupStore} from "@aztec/core/interfaces/IRollup.sol";
+import {CompressedTempBlockLog} from "@aztec/core/libraries/compressed-data/BlockLog.sol";
 import {ChainTipsLib, CompressedChainTips} from "@aztec/core/libraries/compressed-data/Tips.sol";
 import {Errors} from "@aztec/core/libraries/Errors.sol";
 import {STFLib} from "@aztec/core/libraries/rollup/STFLib.sol";
 import {ValidatorSelectionLib} from "@aztec/core/libraries/rollup/ValidatorSelectionLib.sol";
 import {Timestamp, Slot, Epoch, TimeLib} from "@aztec/core/libraries/TimeLib.sol";
+import {CompressedSlot, CompressedTimeMath} from "@aztec/shared/libraries/CompressedTimeMath.sol";
 import {
   CommitteeAttestations, SignatureLib, Signature
 } from "@aztec/shared/libraries/SignatureLib.sol";
 import {ECDSA} from "@oz/utils/cryptography/ECDSA.sol";
 import {MessageHashUtils} from "@oz/utils/cryptography/MessageHashUtils.sol";
-import {CompressedSlot, CompressedTimeMath} from "@aztec/shared/libraries/CompressedTimeMath.sol";
 
 library InvalidateLib {
   using TimeLib for Timestamp;

l1-contracts/src/core/libraries/rollup/ValidatorSelectionLib.sol

@@ -3,13 +3,11 @@
 pragma solidity >=0.8.27;
 
 import {RollupStore} from "@aztec/core/interfaces/IRollup.sol";
-import {STFLib} from "@aztec/core/libraries/rollup/STFLib.sol";
-
-import {BlockHeaderValidationFlags} from "@aztec/core/interfaces/IRollup.sol";
 import {ValidatorSelectionStorage} from "@aztec/core/interfaces/IValidatorSelection.sol";
 import {SampleLib} from "@aztec/core/libraries/crypto/SampleLib.sol";
 import {Errors} from "@aztec/core/libraries/Errors.sol";
 import {StakingLib} from "@aztec/core/libraries/rollup/StakingLib.sol";
+import {STFLib} from "@aztec/core/libraries/rollup/STFLib.sol";
 import {Timestamp, Slot, Epoch, TimeLib} from "@aztec/core/libraries/TimeLib.sol";
 import {
   SignatureLib, Signature, CommitteeAttestations
@@ -354,6 +352,28 @@ library ValidatorSelectionLib {
     }
   }
 
+  function canProposeAtTime(Timestamp _ts, bytes32 _archive) internal returns (Slot, uint256) {
+    Slot slot = _ts.slotFromTimestamp();
+    RollupStore storage rollupStore = STFLib.getStorage();
+
+    uint256 pendingBlockNumber = STFLib.getEffectivePendingBlockNumber(_ts);
+
+    Slot lastSlot = STFLib.getSlotNumber(pendingBlockNumber);
+
+    require(slot > lastSlot, Errors.Rollup__SlotAlreadyInChain(lastSlot, slot));
+
+    // Make sure that the proposer is up to date and on the right chain (ie no reorgs)
+    bytes32 tipArchive = rollupStore.archives[pendingBlockNumber];
+    require(tipArchive == _archive, Errors.Rollup__InvalidArchive(tipArchive, _archive));
+
+    (address proposer,) = getProposerAt(slot);
+    require(
+      proposer == msg.sender, Errors.ValidatorSelection__InvalidProposer(proposer, msg.sender)
+    );
+
+    return (slot, pendingBlockNumber + 1);
+  }
+
   function getCachedProposer(Slot _slot)
     internal
     view
@@ -400,28 +420,6 @@ library ValidatorSelectionLib {
     }
   }
 
-  function canProposeAtTime(Timestamp _ts, bytes32 _archive) internal returns (Slot, uint256) {
-    Slot slot = _ts.slotFromTimestamp();
-    RollupStore storage rollupStore = STFLib.getStorage();
-
-    uint256 pendingBlockNumber = STFLib.getEffectivePendingBlockNumber(_ts);
-
-    Slot lastSlot = STFLib.getSlotNumber(pendingBlockNumber);
-
-    require(slot > lastSlot, Errors.Rollup__SlotAlreadyInChain(lastSlot, slot));
-
-    // Make sure that the proposer is up to date and on the right chain (ie no reorgs)
-    bytes32 tipArchive = rollupStore.archives[pendingBlockNumber];
-    require(tipArchive == _archive, Errors.Rollup__InvalidArchive(tipArchive, _archive));
-
-    (address proposer,) = getProposerAt(slot);
-    require(
-      proposer == msg.sender, Errors.ValidatorSelection__InvalidProposer(proposer, msg.sender)
-    );
-
-    return (slot, pendingBlockNumber + 1);
-  }
-
   /**
    * @notice  Computes the nextSeed for an epoch
    *

l1-contracts/src/mock/StakingAssetHandler.sol

@@ -57,7 +57,7 @@ interface IStakingAssetHandler {
   // Add validator methods
   function addValidator(
     address _attester,
-    bytes32[] memory merkleProof,
+    bytes32[] memory _merkleProof,
     ProofVerificationParams memory _params
   ) external;
   function reenterExitedValidator(address _attester) external;