Added internal max time variation func

Author: yahgwai

src/bridge/SequencerInbox.sol

@@ -111,35 +111,54 @@ contract SequencerInbox is GasRefundEnabled, ISequencerInbox {
 
     function getTimeBounds() internal view virtual returns (IBridge.TimeBounds memory) {
         IBridge.TimeBounds memory bounds;
-        ISequencerInbox.MaxTimeVariation memory maxTimeVariation_ = maxTimeVariation();
-        if (block.timestamp > maxTimeVariation_.delaySeconds) {
-            bounds.minTimestamp = uint64(block.timestamp - maxTimeVariation_.delaySeconds);
+        (
+            uint256 delayBlocks_,
+            uint256 futureBlocks_,
+            uint256 delaySeconds_,
+            uint256 futureSeconds_
+        ) = maxTimeVariationInternal();
+        if (block.timestamp > delaySeconds_) {
+            bounds.minTimestamp = uint64(block.timestamp - delaySeconds_);
         }
-        bounds.maxTimestamp = uint64(block.timestamp + maxTimeVariation_.futureSeconds);
-        if (block.number > maxTimeVariation_.delayBlocks) {
-            bounds.minBlockNumber = uint64(block.number - maxTimeVariation_.delayBlocks);
+        bounds.maxTimestamp = uint64(block.timestamp + futureSeconds_);
+        if (block.number > delayBlocks_) {
+            bounds.minBlockNumber = uint64(block.number - delayBlocks_);
         }
-        bounds.maxBlockNumber = uint64(block.number + maxTimeVariation_.futureBlocks);
+        bounds.maxBlockNumber = uint64(block.number + futureBlocks_);
         return bounds;
     }
 
     function maxTimeVariation() public view returns (ISequencerInbox.MaxTimeVariation memory) {
+        (
+            uint256 delayBlocks_,
+            uint256 futureBlocks_,
+            uint256 delaySeconds_,
+            uint256 futureSeconds_
+        ) = maxTimeVariationInternal();
+
+        return
+            ISequencerInbox.MaxTimeVariation({
+                delayBlocks: delayBlocks_,
+                futureBlocks: futureBlocks_,
+                delaySeconds: delaySeconds_,
+                futureSeconds: futureSeconds_
+            });
+    }
+
+    function maxTimeVariationInternal()
+        internal
+        view
+        returns (
+            uint256,
+            uint256,
+            uint256,
+            uint256
+        )
+    {
         if (_chainIdChanged()) {
-            return
-                ISequencerInbox.MaxTimeVariation({
-                    delayBlocks: 1,
-                    futureBlocks: 1,
-                    delaySeconds: 1,
-                    futureSeconds: 1
-                });
+            return (1, 1, 1, 1);
         } else {
-            return
-                ISequencerInbox.MaxTimeVariation({
-                    delayBlocks: delayBlocks,
-                    futureBlocks: futureBlocks,
-                    delaySeconds: delaySeconds,
-                    futureSeconds: futureSeconds
-                });
+            return (delayBlocks, futureBlocks, delaySeconds, futureSeconds);
         }
     }
 
@@ -162,12 +181,10 @@ contract SequencerInbox is GasRefundEnabled, ISequencerInbox {
             baseFeeL1,
             messageDataHash
         );
-        ISequencerInbox.MaxTimeVariation memory maxTimeVariation_ = maxTimeVariation();
+        (uint256 delayBlocks_, , uint256 delaySeconds_, ) = maxTimeVariationInternal();
         // Can only force-include after the Sequencer-only window has expired.
-        if (l1BlockAndTime[0] + maxTimeVariation_.delayBlocks >= block.number)
-            revert ForceIncludeBlockTooSoon();
-        if (l1BlockAndTime[1] + maxTimeVariation_.delaySeconds >= block.timestamp)
-            revert ForceIncludeTimeTooSoon();
+        if (l1BlockAndTime[0] + delayBlocks_ >= block.number) revert ForceIncludeBlockTooSoon();
+        if (l1BlockAndTime[1] + delaySeconds_ >= block.timestamp) revert ForceIncludeTimeTooSoon();
 
         // Verify that message hash represents the last message sequence of delayed message to be included
         bytes32 prevDelayedAcc = 0;

src/rollup/BridgeCreator.sol

@@ -58,12 +58,10 @@ contract BridgeCreator is Ownable {
         emit ERC20TemplatesUpdated();
     }
 
-    function _createBridge(
-        address adminProxy,
-        BridgeTemplates storage templates,
-        ISequencerInbox.MaxTimeVariation calldata maxTimeVariation,
-        uint256 maxDataSize
-    ) internal returns (BridgeContracts memory) {
+    function _createBridge(address adminProxy, BridgeTemplates storage templates)
+        internal
+        returns (BridgeContracts memory)
+    {
         BridgeContracts memory frame;
         frame.bridge = IBridge(
             address(new TransparentUpgradeableProxy(address(templates.bridge), adminProxy, ""))
@@ -92,9 +90,7 @@ contract BridgeCreator is Ownable {
         // create ETH-based bridge if address zero is provided for native token, otherwise create ERC20-based bridge
         BridgeContracts memory frame = _createBridge(
             adminProxy,
-            nativeToken == address(0) ? ethBasedTemplates : erc20BasedTemplates,
-            maxTimeVariation,
-            maxDataSize
+            nativeToken == address(0) ? ethBasedTemplates : erc20BasedTemplates
         );
 
         // init contracts