Revert "feat(protocol): revert Bridge receive() checks (#13128)"

This reverts commit 675611d.
taikoxyz · Feb 10, 2023 · f33e357 · f33e357
1 parent 675611d
commit f33e357
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/packages/protocol/contracts/bridge/Bridge.sol b/packages/protocol/contracts/bridge/Bridge.sol
@@ -37,8 +37,7 @@ contract Bridge is EssentialContract, IBridge {
 
     event MessageStatusChanged(
         bytes32 indexed msgHash,
-        LibBridgeStatus.MessageStatus status,
-        address transactor
+        LibBridgeStatus.MessageStatus status
     );
 
     event DestChainEnabled(uint256 indexed chainId, bool enabled);
@@ -49,7 +48,11 @@ contract Bridge is EssentialContract, IBridge {
 
     /// Allow Bridge to receive ETH from the TokenVault or EtherVault.
     receive() external payable {
-        // TODO(dave,PR#13110): require the sender is the TokenVault or EtherVault
+        // Ensure the sender is either the Ether vault or the token vault.
+        require(
+            msg.sender == this.resolve("token_vault", false) ||
+                msg.sender == this.resolve("ether_vault", true)
+        );
     }
 
     /// @dev Initializer to be called after being deployed behind a proxy.

diff --git a/packages/protocol/contracts/bridge/libs/LibBridgeStatus.sol b/packages/protocol/contracts/bridge/libs/LibBridgeStatus.sol
@@ -24,11 +24,7 @@ library LibBridgeStatus {
         FAILED
     }
 
-    event MessageStatusChanged(
-        bytes32 indexed msgHash,
-        MessageStatus status,
-        address transactor
-    );
+    event MessageStatusChanged(bytes32 indexed msgHash, MessageStatus status);
 
     /**
      * @dev If messageStatus is same as in the messageStatus mapping,
@@ -42,11 +38,7 @@ library LibBridgeStatus {
     ) internal {
         if (getMessageStatus(msgHash) != status) {
             _setMessageStatus(msgHash, status);
-            emit LibBridgeStatus.MessageStatusChanged(
-                msgHash,
-                status,
-                msg.sender
-            );
+            emit LibBridgeStatus.MessageStatusChanged(msgHash, status);
         }
     }