feat(protocol): remove banning address (#16604)

Co-authored-by: D <51912515+adaki2004@users.noreply.github.com>
taikoxyz · Apr 3, 2024 · c4b705b · c4b705b
1 parent a381ddd
commit c4b705b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 95 deletions.
diff --git a/packages/protocol/contracts/bridge/Bridge.sol b/packages/protocol/contracts/bridge/Bridge.sol
@@ -37,7 +37,7 @@ contract Bridge is EssentialContract, IBridge {
 
     /// @notice Mapping to store banned addresses.
     /// @dev Slot 5.
-    mapping(address addr => bool banned) public addressBanned;
+    uint256 private __reserved1;
 
     /// @notice Mapping to store the proof receipt of a message from its hash.
     /// @dev Slot 6.
@@ -110,23 +110,6 @@ contract Bridge is EssentialContract, IBridge {
         }
     }
 
-    /// @notice Ban or unban an address. A banned addresses will not be invoked upon
-    /// with message calls.
-    /// @dev Do not make this function `nonReentrant`, this breaks {DelegateOwner} support.
-    /// @param _addr The address to ban or unban.
-    /// @param _ban True if ban, false if unban.
-    function banAddress(
-        address _addr,
-        bool _ban
-    )
-        external
-        onlyFromOwnerOrNamed("bridge_watchdog")
-    {
-        if (addressBanned[_addr] == _ban) revert B_INVALID_STATUS();
-        addressBanned[_addr] = _ban;
-        emit AddressBanned(_addr, _ban);
-    }
-
     /// @inheritdoc IBridge
     function sendMessage(Message calldata _message)
         external
@@ -292,7 +275,7 @@ contract Bridge is EssentialContract, IBridge {
             // Process message differently based on the target address
             if (
                 _message.to == address(0) || _message.to == address(this)
-                    || _message.to == signalService || addressBanned[_message.to]
+                    || _message.to == signalService
             ) {
                 // Handle special addresses that don't require actual invocation but
                 // mark message as DONE

diff --git a/packages/protocol/test/bridge/Bridge.t.sol b/packages/protocol/test/bridge/Bridge.t.sol
@@ -369,32 +369,6 @@ contract BridgeTest is TaikoTest {
         assertEq(Carol.balance, 500);
     }
 
-    function test_Bridge_banAddress_via_delegate_owner() public {
-        bytes memory banAddressCall = abi.encodeCall(Bridge.banAddress, (Alice, true));
-
-        IBridge.Message memory message = getDelegateOwnerMessage(
-            address(mockDAO),
-            abi.encodeCall(
-                DelegateOwner.onMessageInvocation,
-                abi.encode(0, address(destChainBridge), banAddressCall)
-            )
-        );
-
-        // Mocking proof - but obviously it needs to be created in prod
-        // corresponding to the message
-        bytes memory proof = hex"00";
-
-        bytes32 msgHash = destChainBridge.hashMessage(message);
-
-        vm.chainId(destChainId);
-
-        vm.prank(Bob, Bob);
-        destChainBridge.processMessage(message, proof);
-
-        IBridge.Status status = destChainBridge.messageStatus(msgHash);
-        assertEq(status == IBridge.Status.DONE, true);
-    }
-
     function test_Bridge_pause_bridge_via_delegate_owner() public {
         bytes memory pauseCall = abi.encodeCall(EssentialContract.pause, ());
 
@@ -483,33 +457,6 @@ contract BridgeTest is TaikoTest {
         assertEq(status == IBridge.Status.DONE, true);
     }
 
-    function test_Bridge_non_dao_cannot_call_via_delegate_owner() public {
-        bytes memory banAddressCall = abi.encodeCall(Bridge.banAddress, (Alice, true));
-
-        IBridge.Message memory message = getDelegateOwnerMessage(
-            Alice,
-            abi.encodeCall(
-                DelegateOwner.onMessageInvocation,
-                abi.encode(0, address(destChainBridge), banAddressCall)
-            )
-        );
-
-        // Mocking proof - but obviously it needs to be created in prod
-        // corresponding to the message
-        bytes memory proof = hex"00";
-
-        bytes32 msgHash = destChainBridge.hashMessage(message);
-
-        vm.chainId(destChainId);
-
-        vm.prank(Bob, Bob);
-        destChainBridge.processMessage(message, proof);
-
-        //Status retriable hence the low level call failed as from is not the DAO!
-        IBridge.Status status = destChainBridge.messageStatus(msgHash);
-        assertEq(status == IBridge.Status.RETRIABLE, true);
-    }
-
     function test_Bridge_send_message_ether_reverts_if_value_doesnt_match_expected() public {
         // uint256 amount = 1 wei;
         IBridge.Message memory message = newMessage({
@@ -808,29 +755,6 @@ contract BridgeTest is TaikoTest {
         assertEq(status == IBridge.Status.DONE, true);
     }
 
-    function test_Bridge_ban_address() public {
-        vm.startPrank(Alice);
-        (IBridge.Message memory message, bytes memory proof) =
-            setUpPredefinedSuccessfulProcessMessageCall();
-
-        bytes32 msgHash = destChainBridge.hashMessage(message);
-        bytes32[] memory messageHashes = new bytes32[](1);
-        messageHashes[0] = msgHash;
-
-        vm.stopPrank();
-        // Ban address
-        vm.prank(destChainBridge.owner());
-        destChainBridge.banAddress(message.to, true);
-
-        vm.startPrank(Alice);
-        // processMessage() still marks it DONE but dont call the invokeMessageCall on them
-        destChainBridge.processMessage(message, proof);
-
-        IBridge.Status status = destChainBridge.messageStatus(msgHash);
-
-        assertEq(status == IBridge.Status.DONE, true);
-    }
-
     function test_Bridge_prove_message_received() public {
         vm.startPrank(Alice);
         (IBridge.Message memory message, bytes memory proof) =