@@ -80,7 +80,7 @@ contract FastBridgeSenderToEthereum is SafeBridgeSenderToEthereum, IFastBridgeSe
80
80
81
81
ticketID = currentTicketID++ ;
82
82
83
- (bytes32 messageHash , bytes memory messageData ) = _encode (ticketID, _receiver, _calldata);
83
+ (bytes32 messageHash , bytes memory messageData ) = _encode (ticketID, block . number , _receiver, _calldata);
84
84
emit OutgoingMessage (ticketID, block .number , _receiver, messageHash, messageData);
85
85
86
86
tickets[ticketID] = Ticket ({messageHash: messageHash, blockNumber: block .number , sentSafe: false });
@@ -102,7 +102,7 @@ contract FastBridgeSenderToEthereum is SafeBridgeSenderToEthereum, IFastBridgeSe
102
102
require (ticket.messageHash != 0 , "Ticket does not exist. " );
103
103
require (ticket.sentSafe == false , "Ticket already sent safely. " );
104
104
105
- (bytes32 messageHash , bytes memory messageData ) = _encode (_ticketID, _receiver, _calldata);
105
+ (bytes32 messageHash , bytes memory messageData ) = _encode (_ticketID, ticket.blockNumber, _receiver, _calldata);
106
106
require (ticket.messageHash == messageHash, "Invalid message for ticketID. " );
107
107
108
108
// Safe Bridge message envelope
@@ -132,13 +132,14 @@ contract FastBridgeSenderToEthereum is SafeBridgeSenderToEthereum, IFastBridgeSe
132
132
133
133
function _encode (
134
134
uint256 _ticketID ,
135
+ uint256 _blockNumber ,
135
136
address _receiver ,
136
137
bytes memory _calldata
137
- ) internal view returns (bytes32 messageHash , bytes memory messageData ) {
138
+ ) internal pure returns (bytes32 messageHash , bytes memory messageData ) {
138
139
// Encode the receiver address with the function signature + arguments i.e calldata
139
140
messageData = abi.encode (_receiver, _calldata);
140
141
141
142
// Compute the hash over the message header (ticketID, blockNumber) and body (data).
142
- messageHash = keccak256 (abi.encode (_ticketID, block . number , messageData));
143
+ messageHash = keccak256 (abi.encode (_ticketID, _blockNumber , messageData));
143
144
}
144
145
}
0 commit comments