@@ -124,28 +124,20 @@ contract Messenger {
124124 /// @dev Gas estimation: If the transaction origin is ESTIMATION_ADDRESS, failures will cause reverts to help
125125 /// compute accurate gas limits during estimation.
126126 ///
127- /// @param nonce Unique nonce of the message being relayed.
128- /// @param sender Address of the user who sent the message on the remote chain.
129- /// @param target Address that the message is targeted at on this chain.
130- /// @param value ETH value to send with the message execution.
127+ /// @param nonce Unique nonce of the message being relayed.
128+ /// @param sender Address of the user who sent the message on the remote chain.
129+ /// @param target Address that the message is targeted at on this chain.
131130 /// @param minGasLimit Minimum amount of gas that the message must be executed with.
132- /// @param message Encoded message data to send to the target address.
133- function relayMessage (
134- uint256 nonce ,
135- bytes32 sender ,
136- address target ,
137- uint256 value ,
138- uint256 minGasLimit ,
139- bytes calldata message
140- ) external payable {
131+ /// @param message Encoded message data to send to the target address.
132+ function relayMessage (uint256 nonce , bytes32 sender , address target , uint256 minGasLimit , bytes calldata message )
133+ external
134+ {
141135 bytes32 messageHash =
142- keccak256 (abi.encodeCall (this .relayMessage, (nonce, sender, target, value, minGasLimit, message)));
136+ keccak256 (abi.encodeCall (this .relayMessage, (nonce, sender, target, minGasLimit, message)));
143137
144138 if (_isRemoteMessenger ()) {
145- require (msg .value == value, IncorrectMsgValue ());
146139 require (! failedMessages[messageHash], MessageAlreadyFailed ());
147140 } else {
148- require (msg .value == 0 , IncorrectMsgValue ());
149141 require (failedMessages[messageHash], MessageNotAlreadyFailed ());
150142 }
151143
@@ -178,7 +170,7 @@ contract Messenger {
178170 }
179171
180172 _xChainMsgSender = sender;
181- bool success = SafeCall.call (target, gasleft () - RELAY_RESERVED_GAS, value , message);
173+ bool success = SafeCall.call (target, gasleft () - RELAY_RESERVED_GAS, 0 , message);
182174 _xChainMsgSender = DEFAULT_L2_SENDER;
183175
184176 if (success) {
0 commit comments