diff --git a/packages/protocol/contracts/bridge/Bridge.sol b/packages/protocol/contracts/bridge/Bridge.sol index dbc5b9ce85b..86b2d7a5849 100644 --- a/packages/protocol/contracts/bridge/Bridge.sol +++ b/packages/protocol/contracts/bridge/Bridge.sol @@ -37,7 +37,8 @@ contract Bridge is EssentialContract, IBridge { event MessageStatusChanged( bytes32 indexed msgHash, - LibBridgeStatus.MessageStatus status + LibBridgeStatus.MessageStatus status, + address transactor ); event DestChainEnabled(uint256 indexed chainId, bool enabled); @@ -48,11 +49,7 @@ contract Bridge is EssentialContract, IBridge { /// Allow Bridge to receive ETH from the TokenVault or EtherVault. receive() external payable { - // 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) - ); + // TODO(dave,PR#13110): require the sender is the TokenVault or EtherVault } /// @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 index 19e5404633e..f93e435c5a2 100644 --- a/packages/protocol/contracts/bridge/libs/LibBridgeStatus.sol +++ b/packages/protocol/contracts/bridge/libs/LibBridgeStatus.sol @@ -24,7 +24,11 @@ library LibBridgeStatus { FAILED } - event MessageStatusChanged(bytes32 indexed msgHash, MessageStatus status); + event MessageStatusChanged( + bytes32 indexed msgHash, + MessageStatus status, + address transactor + ); /** * @dev If messageStatus is same as in the messageStatus mapping, @@ -38,7 +42,11 @@ library LibBridgeStatus { ) internal { if (getMessageStatus(msgHash) != status) { _setMessageStatus(msgHash, status); - emit LibBridgeStatus.MessageStatusChanged(msgHash, status); + emit LibBridgeStatus.MessageStatusChanged( + msgHash, + status, + msg.sender + ); } }