fix: reduce code size of rollup

l1-contracts/src/core/Rollup.sol

@@ -21,16 +21,15 @@ import {IVerifier} from "@aztec/core/interfaces/IVerifier.sol";
 import {TempCheckpointLog, CheckpointLog} from "@aztec/core/libraries/compressed-data/CheckpointLog.sol";
 import {FeeAssetValue, PriceLib} from "@aztec/core/libraries/compressed-data/fees/FeeConfig.sol";
 import {FeeHeaderLib} from "@aztec/core/libraries/compressed-data/fees/FeeStructs.sol";
-import {FeeLib} from "@aztec/core/libraries/rollup/FeeLib.sol";
 import {ProposedHeader} from "@aztec/core/libraries/rollup/ProposedHeaderLib.sol";
 import {StakingLib} from "@aztec/core/libraries/rollup/StakingLib.sol";
 import {GSE} from "@aztec/governance/GSE.sol";
 import {IRewardDistributor} from "@aztec/governance/interfaces/IRewardDistributor.sol";
 import {CompressedSlot, CompressedTimestamp, CompressedTimeMath} from "@aztec/shared/libraries/CompressedTimeMath.sol";
 import {Signature} from "@aztec/shared/libraries/SignatureLib.sol";
 import {ChainTipsLib, CompressedChainTips} from "./libraries/compressed-data/Tips.sol";
-import {ProposeLib, ValidateHeaderArgs} from "./libraries/rollup/ProposeLib.sol";
-import {RewardLib, RewardConfig} from "./libraries/rollup/RewardLib.sol";
+import {ValidateHeaderArgs} from "./libraries/rollup/ProposeLib.sol";
+import {RewardExtLib, RewardConfig} from "./libraries/rollup/RewardExtLib.sol";
 import {DepositArgs} from "./libraries/StakingQueue.sol";
 import {
   RollupCore,
@@ -236,11 +235,11 @@ contract Rollup is IStaking, IValidatorSelection, IRollup, RollupCore {
   }
 
   function getManaTarget() external view override(IRollup) returns (uint256) {
-    return FeeLib.getManaTarget();
+    return RewardExtLib.getManaTarget();
   }
 
   function getManaLimit() external view override(IRollup) returns (uint256) {
-    return FeeLib.getManaLimit();
+    return RewardExtLib.getManaLimit();
   }
 
   function getTips() external view override(IRollup) returns (ChainTips memory) {
@@ -353,23 +352,23 @@ contract Rollup is IStaking, IValidatorSelection, IRollup, RollupCore {
   }
 
   function getConfig(address _attester) external view override(IStaking) returns (AttesterConfig memory) {
-    return StakingLib.getConfig(_attester);
+    return ValidatorOperationsExtLib.getConfig(_attester);
   }
 
   function getExit(address _attester) external view override(IStaking) returns (Exit memory) {
-    return StakingLib.getExit(_attester);
+    return ValidatorOperationsExtLib.getExit(_attester);
   }
 
   function getStatus(address _attester) external view override(IStaking) returns (Status) {
-    return StakingLib.getStatus(_attester);
+    return ValidatorOperationsExtLib.getStatus(_attester);
   }
 
   function getAttesterView(address _attester) external view override(IStaking) returns (AttesterView memory) {
-    return StakingLib.getAttesterView(_attester);
+    return ValidatorOperationsExtLib.getAttesterView(_attester);
   }
 
   function getSharesFor(address _prover) external view override(IRollup) returns (uint256) {
-    return RewardLib.getSharesFor(_prover);
+    return RewardExtLib.getSharesFor(_prover);
   }
 
   /**
@@ -475,11 +474,11 @@ contract Rollup is IStaking, IValidatorSelection, IRollup, RollupCore {
   }
 
   function getSequencerRewards(address _sequencer) external view override(IRollup) returns (uint256) {
-    return RewardLib.getSequencerRewards(_sequencer);
+    return RewardExtLib.getSequencerRewards(_sequencer);
   }
 
   function getCollectiveProverRewardsForEpoch(Epoch _epoch) external view override(IRollup) returns (uint256) {
-    return RewardLib.getCollectiveProverRewardsForEpoch(_epoch);
+    return RewardExtLib.getCollectiveProverRewardsForEpoch(_epoch);
   }
 
   /**
@@ -498,7 +497,7 @@ contract Rollup is IStaking, IValidatorSelection, IRollup, RollupCore {
     override(IRollup)
     returns (uint256)
   {
-    return RewardLib.getSpecificProverRewardsForEpoch(_epoch, _prover);
+    return RewardExtLib.getSpecificProverRewardsForEpoch(_epoch, _prover);
   }
 
   function getHasSubmitted(Epoch _epoch, uint256 _length, address _prover)
@@ -507,19 +506,19 @@ contract Rollup is IStaking, IValidatorSelection, IRollup, RollupCore {
     override(IRollup)
     returns (bool)
   {
-    return RewardLib.getHasSubmitted(_epoch, _length, _prover);
+    return RewardExtLib.getHasSubmitted(_epoch, _length, _prover);
   }
 
   function getHasClaimed(address _prover, Epoch _epoch) external view override(IRollup) returns (bool) {
-    return RewardLib.getHasClaimed(_prover, _epoch);
+    return RewardExtLib.getHasClaimed(_prover, _epoch);
   }
 
   function getProvingCostPerManaInEth() external view override(IRollup) returns (EthValue) {
-    return FeeLib.getProvingCostPerMana();
+    return RewardExtLib.getProvingCostPerMana();
   }
 
   function getProvingCostPerManaInFeeAsset() external view override(IRollup) returns (FeeAssetValue) {
-    return FeeLib.getProvingCostPerMana().toFeeAsset(getEthPerFeeAsset());
+    return RewardExtLib.getProvingCostPerMana().toFeeAsset(getEthPerFeeAsset());
   }
 
   function getVersion() external view override(IHaveVersion) returns (uint256) {
@@ -543,31 +542,31 @@ contract Rollup is IStaking, IValidatorSelection, IRollup, RollupCore {
   }
 
   function getRewardDistributor() external view override(IRollup) returns (IRewardDistributor) {
-    return RewardLib.getStorage().config.rewardDistributor;
+    return RewardExtLib.getRewardDistributor();
   }
 
   function getL1FeesAt(Timestamp _timestamp) external view override(IRollup) returns (L1FeeData memory) {
-    return FeeLib.getL1FeesAt(_timestamp);
+    return RewardExtLib.getL1FeesAt(_timestamp);
   }
 
   function canPruneAtTime(Timestamp _ts) external view override(IRollup) returns (bool) {
-    return STFLib.canPruneAtTime(_ts);
+    return RewardExtLib.canPruneAtTime(_ts);
   }
 
   function getRewardConfig() external view override(IRollup) returns (RewardConfig memory) {
-    return RewardLib.getStorage().config;
+    return RewardExtLib.getRewardConfig();
   }
 
   function getCheckpointReward() external view override(IRollup) returns (uint256) {
-    return RewardLib.getCheckpointReward();
+    return RewardExtLib.getCheckpointReward();
   }
 
   function isRewardsClaimable() external view override(IRollup) returns (bool) {
-    return RewardLib.isRewardsClaimable();
+    return RewardExtLib.isRewardsClaimable();
   }
 
   function getEarliestRewardsClaimableTimestamp() external view override(IRollup) returns (Timestamp) {
-    return RewardLib.getEarliestRewardsClaimableTimestamp();
+    return RewardExtLib.getEarliestRewardsClaimableTimestamp();
   }
 
   function getAvailableValidatorFlushes() external view override(IStaking) returns (uint256) {
@@ -579,11 +578,11 @@ contract Rollup is IStaking, IValidatorSelection, IRollup, RollupCore {
   }
 
   function getEntryQueueAt(uint256 _index) external view override(IStaking) returns (DepositArgs memory) {
-    return StakingLib.getEntryQueueAt(_index);
+    return ValidatorOperationsExtLib.getEntryQueueAt(_index);
   }
 
   function getBurnAddress() external pure override(IRollup) returns (address) {
-    return RewardLib.BURN_ADDRESS;
+    return address(bytes20("CUAUHXICALLI"));
   }
 
   /**
@@ -632,7 +631,7 @@ contract Rollup is IStaking, IValidatorSelection, IRollup, RollupCore {
    * @return The attester at the index
    */
   function getAttesterAtIndex(uint256 _index) public view override(IStaking) returns (address) {
-    return StakingLib.getAttesterAtIndex(_index);
+    return ValidatorOperationsExtLib.getAttesterAtIndex(_index);
   }
 
   /**
@@ -643,7 +642,7 @@ contract Rollup is IStaking, IValidatorSelection, IRollup, RollupCore {
    * @return The mana min fee
    */
   function getManaMinFeeAt(Timestamp _timestamp, bool _inFeeAsset) public view override(IRollup) returns (uint256) {
-    return FeeLib.summedMinFee(getManaMinFeeComponentsAt(_timestamp, _inFeeAsset));
+    return RewardExtLib.summedMinFee(getManaMinFeeComponentsAt(_timestamp, _inFeeAsset));
   }
 
   function getManaMinFeeComponentsAt(Timestamp _timestamp, bool _inFeeAsset)
@@ -652,7 +651,7 @@ contract Rollup is IStaking, IValidatorSelection, IRollup, RollupCore {
     override(IRollup)
     returns (ManaMinFeeComponents memory)
   {
-    return ProposeLib.getManaMinFeeComponentsAt(_timestamp, _inFeeAsset);
+    return RewardExtLib.getManaMinFeeComponentsAt(_timestamp, _inFeeAsset);
   }
 
   /**
@@ -662,11 +661,11 @@ contract Rollup is IStaking, IValidatorSelection, IRollup, RollupCore {
    * @return The fee asset price
    */
   function getEthPerFeeAsset() public view override(IRollup) returns (EthPerFeeAssetE12) {
-    return FeeLib.getEthPerFeeAssetAtCheckpoint(STFLib.getStorage().tips.getPending());
+    return RewardExtLib.getEthPerFeeAssetAtCheckpoint(STFLib.getStorage().tips.getPending());
   }
 
   function getEpochForCheckpoint(uint256 _checkpointNumber) public view override(IRollup) returns (Epoch) {
-    return STFLib.getEpochForCheckpoint(_checkpointNumber);
+    return RewardExtLib.getEpochForCheckpoint(_checkpointNumber);
   }
 
   /**
@@ -702,10 +701,10 @@ contract Rollup is IStaking, IValidatorSelection, IRollup, RollupCore {
   }
 
   function getNextFlushableEpoch() public view override(IStaking) returns (Epoch) {
-    return StakingLib.getNextFlushableEpoch();
+    return ValidatorOperationsExtLib.getNextFlushableEpoch();
   }
 
   function getEntryQueueLength() public view override(IStaking) returns (uint256) {
-    return StakingLib.getEntryQueueLength();
+    return ValidatorOperationsExtLib.getEntryQueueLength();
   }
 }

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

@@ -2,15 +2,24 @@
 // Copyright 2024 Aztec Labs.
 pragma solidity >=0.8.27;
 
+import {
+  FeeLib,
+  ManaMinFeeComponents,
+  L1FeeData,
+  EthPerFeeAssetE12,
+  EthValue
+} from "@aztec/core/libraries/rollup/FeeLib.sol";
+import {ProposeLib} from "@aztec/core/libraries/rollup/ProposeLib.sol";
 import {RewardLib, RewardConfig} from "@aztec/core/libraries/rollup/RewardLib.sol";
+import {STFLib} from "@aztec/core/libraries/rollup/STFLib.sol";
 import {Epoch, Timestamp} from "@aztec/core/libraries/TimeLib.sol";
-
 import {
   RewardBooster,
   RewardBoostConfig,
   IBoosterCore,
   IValidatorSelection
 } from "@aztec/core/reward-boost/RewardBooster.sol";
+import {IRewardDistributor} from "@aztec/governance/interfaces/IRewardDistributor.sol";
 
 library RewardExtLib {
   function initialize(Timestamp _earliestRewardsClaimableTimestamp) external {
@@ -37,4 +46,92 @@ library RewardExtLib {
     RewardBooster booster = new RewardBooster(IValidatorSelection(address(this)), _config);
     return IBoosterCore(address(booster));
   }
+
+  // View wrappers - delegated from Rollup.sol to avoid inlining RewardLib into Rollup bytecode
+
+  function getSpecificProverRewardsForEpoch(Epoch _epoch, address _prover) external view returns (uint256) {
+    return RewardLib.getSpecificProverRewardsForEpoch(_epoch, _prover);
+  }
+
+  function getSharesFor(address _prover) external view returns (uint256) {
+    return RewardLib.getSharesFor(_prover);
+  }
+
+  function getSequencerRewards(address _sequencer) external view returns (uint256) {
+    return RewardLib.getSequencerRewards(_sequencer);
+  }
+
+  function getCollectiveProverRewardsForEpoch(Epoch _epoch) external view returns (uint256) {
+    return RewardLib.getCollectiveProverRewardsForEpoch(_epoch);
+  }
+
+  function getHasSubmitted(Epoch _epoch, uint256 _length, address _prover) external view returns (bool) {
+    return RewardLib.getHasSubmitted(_epoch, _length, _prover);
+  }
+
+  function getHasClaimed(address _prover, Epoch _epoch) external view returns (bool) {
+    return RewardLib.getHasClaimed(_prover, _epoch);
+  }
+
+  function getCheckpointReward() external view returns (uint256) {
+    return RewardLib.getCheckpointReward();
+  }
+
+  function isRewardsClaimable() external view returns (bool) {
+    return RewardLib.isRewardsClaimable();
+  }
+
+  function getEarliestRewardsClaimableTimestamp() external view returns (Timestamp) {
+    return RewardLib.getEarliestRewardsClaimableTimestamp();
+  }
+
+  function getRewardConfig() external view returns (RewardConfig memory) {
+    return RewardLib.getStorage().config;
+  }
+
+  function getRewardDistributor() external view returns (IRewardDistributor) {
+    return RewardLib.getStorage().config.rewardDistributor;
+  }
+
+  // FeeLib/STFLib/ProposeLib view wrappers - overflow from RollupOperationsExtLib
+
+  function getManaMinFeeComponentsAt(Timestamp _timestamp, bool _inFeeAsset)
+    external
+    view
+    returns (ManaMinFeeComponents memory)
+  {
+    return ProposeLib.getManaMinFeeComponentsAt(_timestamp, _inFeeAsset);
+  }
+
+  function canPruneAtTime(Timestamp _ts) external view returns (bool) {
+    return STFLib.canPruneAtTime(_ts);
+  }
+
+  function getEpochForCheckpoint(uint256 _checkpointNumber) external view returns (Epoch) {
+    return STFLib.getEpochForCheckpoint(_checkpointNumber);
+  }
+
+  function getL1FeesAt(Timestamp _timestamp) external view returns (L1FeeData memory) {
+    return FeeLib.getL1FeesAt(_timestamp);
+  }
+
+  function getEthPerFeeAssetAtCheckpoint(uint256 _checkpointNumber) external view returns (EthPerFeeAssetE12) {
+    return FeeLib.getEthPerFeeAssetAtCheckpoint(_checkpointNumber);
+  }
+
+  function getProvingCostPerMana() external view returns (EthValue) {
+    return FeeLib.getProvingCostPerMana();
+  }
+
+  function getManaTarget() external view returns (uint256) {
+    return FeeLib.getManaTarget();
+  }
+
+  function getManaLimit() external view returns (uint256) {
+    return FeeLib.getManaLimit();
+  }
+
+  function summedMinFee(ManaMinFeeComponents memory _components) external pure returns (uint256) {
+    return FeeLib.summedMinFee(_components);
+  }
 }

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

@@ -6,7 +6,9 @@ pragma solidity >=0.8.27;
 import {IEscapeHatch} from "@aztec/core/interfaces/IEscapeHatch.sol";
 import {Epoch, Slot, Timestamp, TimeLib} from "@aztec/core/libraries/TimeLib.sol";
 import {StakingQueueConfig} from "@aztec/core/libraries/compressed-data/StakingQueueConfig.sol";
-import {StakingLib} from "./StakingLib.sol";
+import {StakingLib, Exit, Status, AttesterView} from "./StakingLib.sol";
+import {AttesterConfig} from "@aztec/governance/GSE.sol";
+import {DepositArgs} from "@aztec/core/libraries/StakingQueue.sol";
 import {InvalidateLib} from "./InvalidateLib.sol";
 import {ValidatorSelectionLib} from "./ValidatorSelectionLib.sol";
 import {CommitteeAttestations} from "@aztec/core/libraries/rollup/AttestationLib.sol";
@@ -162,4 +164,38 @@ library ValidatorOperationsExtLib {
   function getAvailableValidatorFlushes() external view returns (uint256) {
     return StakingLib.getAvailableValidatorFlushes();
   }
+
+  // View wrappers - delegated from Rollup.sol to avoid inlining StakingLib into Rollup bytecode
+
+  function getAttesterView(address _attester) external view returns (AttesterView memory) {
+    return StakingLib.getAttesterView(_attester);
+  }
+
+  function getStatus(address _attester) external view returns (Status) {
+    return StakingLib.getStatus(_attester);
+  }
+
+  function getConfig(address _attester) external view returns (AttesterConfig memory) {
+    return StakingLib.getConfig(_attester);
+  }
+
+  function getExit(address _attester) external view returns (Exit memory) {
+    return StakingLib.getExit(_attester);
+  }
+
+  function getAttesterAtIndex(uint256 _index) external view returns (address) {
+    return StakingLib.getAttesterAtIndex(_index);
+  }
+
+  function getEntryQueueAt(uint256 _index) external view returns (DepositArgs memory) {
+    return StakingLib.getEntryQueueAt(_index);
+  }
+
+  function getNextFlushableEpoch() external view returns (Epoch) {
+    return StakingLib.getNextFlushableEpoch();
+  }
+
+  function getEntryQueueLength() external view returns (uint256) {
+    return StakingLib.getEntryQueueLength();
+  }
 }