feat: throw RollupNotChanged

OffchainLabs · Oct 24, 2023 · e8aac68 · e8aac68
1 parent ca6e8ef
commit e8aac68
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/src/bridge/AbsOutbox.sol b/src/bridge/AbsOutbox.sol
@@ -13,7 +13,8 @@ import {
     AlreadySpent,
     BridgeCallFailed,
     HadZeroInit,
-    BadPostUpgradeInit
+    BadPostUpgradeInit,
+    RollupNotChanged
 } from "../libraries/Error.sol";
 import "./IBridge.sol";
 import "./IOutbox.sol";
@@ -94,7 +95,9 @@ abstract contract AbsOutbox is DelegateCallAware, IOutbox {
     function updateRollupAddress() external {
         if (msg.sender != IOwnable(rollup).owner())
             revert NotOwner(msg.sender, IOwnable(rollup).owner());
-        rollup = address(bridge.rollup());
+        address newRollup = address(bridge.rollup());
+        if (rollup == newRollup) revert RollupNotChanged();
+        rollup = newRollup;
     }
 
     function updateSendRoot(bytes32 root, bytes32 l2BlockHash) external {

diff --git a/src/bridge/SequencerInbox.sol b/src/bridge/SequencerInbox.sol
@@ -20,7 +20,8 @@ import {
     DataNotAuthenticated,
     AlreadyValidDASKeyset,
     NoSuchKeyset,
-    NotForked
+    NotForked,
+    RollupNotChanged
 } from "../libraries/Error.sol";
 import "./IBridge.sol";
 import "./IInboxBase.sol";
@@ -95,7 +96,9 @@ contract SequencerInbox is DelegateCallAware, GasRefundEnabled, ISequencerInbox
     function updateRollupAddress() external {
         if (msg.sender != IOwnable(rollup).owner())
             revert NotOwner(msg.sender, IOwnable(rollup).owner());
-        rollup = bridge.rollup();
+        IOwnable newRollup = bridge.rollup();
+        if (rollup == newRollup) revert RollupNotChanged();
+        rollup = newRollup;
     }
 
     function getTimeBounds() internal view virtual returns (TimeBounds memory) {

diff --git a/src/libraries/Error.sol b/src/libraries/Error.sol
@@ -175,3 +175,6 @@ error AlreadyValidDASKeyset(bytes32);
 
 /// @dev Tried to use or invalidate an already invalid Data Availability Service keyset
 error NoSuchKeyset(bytes32);
+
+/// @dev Thrown when rollup is not updated with updateRollupAddress
+error RollupNotChanged();
diff --git a/src/rollup/AbsRollupEventInbox.sol b/src/rollup/AbsRollupEventInbox.sol
@@ -12,7 +12,7 @@ import "../libraries/ArbitrumChecker.sol";
 import "../bridge/IDelayedMessageProvider.sol";
 import "../libraries/DelegateCallAware.sol";
 import {INITIALIZATION_MSG_TYPE} from "../libraries/MessageTypes.sol";
-import {AlreadyInit, HadZeroInit} from "../libraries/Error.sol";
+import {AlreadyInit, HadZeroInit, RollupNotChanged} from "../libraries/Error.sol";
 
 /**
  * @title The inbox for rollup protocol events
@@ -41,7 +41,9 @@ abstract contract AbsRollupEventInbox is
     function updateRollupAddress() external {
         if (msg.sender != IOwnable(rollup).owner())
             revert NotOwner(msg.sender, IOwnable(rollup).owner());
-        rollup = address(bridge.rollup());
+        address newRollup = address(bridge.rollup());
+        if (rollup == newRollup) revert RollupNotChanged();
+        rollup = newRollup;
     }
 
     function rollupInitialized(uint256 chainId, string calldata chainConfig)