refactor: add fastLaneLengthSlots to getFrameConfig interface

lidofinance · Sep 11, 2024 · 5dda4dd · 5dda4dd
1 parent 243f124
commit 5dda4dd
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git a/contracts/0.4.24/oracle/LegacyOracle.sol b/contracts/0.4.24/oracle/LegacyOracle.sol
@@ -25,7 +25,8 @@ interface IHashConsensus {
 
     function getFrameConfig() external view returns (
         uint256 initialEpoch,
-        uint256 epochsPerFrame
+        uint256 epochsPerFrame,
+        uint256 fastLaneLengthSlots
     );
 
     function getCurrentFrame() external view returns (
@@ -147,7 +148,7 @@ contract LegacyOracle is Versioned, AragonApp {
             uint64 genesisTime
         )
     {
-        (, uint256 epochsPerFrame_) = _getAccountingConsensusContract().getFrameConfig();
+        (, uint256 epochsPerFrame_,) = _getAccountingConsensusContract().getFrameConfig();
         epochsPerFrame = uint64(epochsPerFrame_);
 
         ChainSpec memory spec = _getChainSpec();
@@ -365,7 +366,7 @@ contract LegacyOracle is Versioned, AragonApp {
     {
         IHashConsensus consensus = IHashConsensus(_accountingOracleConsensusContract);
         (uint256 slotsPerEpoch, uint256 secondsPerSlot, uint256 genesisTime) = consensus.getChainConfig();
-        (, uint256 epochsPerFrame_) = consensus.getFrameConfig();
+        (, uint256 epochsPerFrame_,) = consensus.getFrameConfig();
 
         spec.epochsPerFrame = uint64(epochsPerFrame_);
         spec.slotsPerEpoch = uint64(slotsPerEpoch);

diff --git a/contracts/0.8.9/oracle/AccountingOracle.sol b/contracts/0.8.9/oracle/AccountingOracle.sol
@@ -495,7 +495,7 @@ contract AccountingOracle is BaseOracle {
         internal view returns (uint256)
     {
         (uint256 initialEpoch,
-            uint256 epochsPerFrame) = IConsensusContract(consensusContract).getFrameConfig();
+            uint256 epochsPerFrame,) = IConsensusContract(consensusContract).getFrameConfig();
 
         (uint256 slotsPerEpoch,
             uint256 secondsPerSlot,

diff --git a/contracts/0.8.9/oracle/BaseOracle.sol b/contracts/0.8.9/oracle/BaseOracle.sol
@@ -25,7 +25,11 @@ interface IConsensusContract {
         uint256 genesisTime
     );
 
-    function getFrameConfig() external view returns (uint256 initialEpoch, uint256 epochsPerFrame);
+    function getFrameConfig() external view returns (
+        uint256 initialEpoch,
+        uint256 epochsPerFrame,
+        uint256 fastLaneLengthSlots
+    );
 
     function getInitialRefSlot() external view returns (uint256);
 }

diff --git a/test/0.4.24/contracts/HashConsensus__MockForLegacyOracle.sol b/test/0.4.24/contracts/HashConsensus__MockForLegacyOracle.sol
@@ -80,10 +80,11 @@ contract HashConsensus__MockForLegacyOracle is IHashConsensus {
 
     function getFrameConfig() external view returns (
         uint256 initialEpoch,
-        uint256 epochsPerFrame
+        uint256 epochsPerFrame,
+        uint256 fastLaneLengthSlots
     ) {
         FrameConfig memory config = _frameConfig;
-        return (config.initialEpoch, config.epochsPerFrame);
+        return (config.initialEpoch, config.epochsPerFrame, config.fastLaneLengthSlots);
     }
 
     function getCurrentFrame() external view returns (

diff --git a/test/0.8.9/contracts/MockConsensusContract.sol b/test/0.8.9/contracts/MockConsensusContract.sol
@@ -104,9 +104,9 @@ contract MockConsensusContract is IConsensusContract {
     function getFrameConfig()
         external
         view
-        returns (uint256 initialEpoch, uint256 epochsPerFrame)
+        returns (uint256 initialEpoch, uint256 epochsPerFrame, uint256 fastLaneLengthSlots)
     {
-        return (_frameConfig.initialEpoch, _frameConfig.epochsPerFrame);
+        return (_frameConfig.initialEpoch, _frameConfig.epochsPerFrame, _frameConfig.fastLaneLengthSlots);
     }
 
     function getInitialRefSlot() external view returns (uint256) {