Merge pull request #1098 from graphprotocol/mde/add-contract-address-to-signer-proof-message

Author: tmigone

packages/horizon/contracts/payments/collectors/TAPCollector.sol

@@ -276,7 +276,7 @@ contract TAPCollector is EIP712, GraphDirectory, ITAPCollector {
         );
 
         // Generate the hash of the payer's address
-        bytes32 messageHash = keccak256(abi.encodePacked(block.chainid, _proofDeadline, msg.sender));
+        bytes32 messageHash = keccak256(abi.encodePacked(block.chainid, address(this), _proofDeadline, msg.sender));
 
         // Generate the digest to be signed by the signer
         bytes32 digest = MessageHashUtils.toEthSignedMessageHash(messageHash);

packages/horizon/test/payments/tap-collector/TAPCollector.t.sol

@@ -48,7 +48,7 @@ contract TAPCollectorTest is HorizonStakingSharedTest, PaymentsEscrowSharedTest
 
     function _getSignerProof(uint256 _proofDeadline, uint256 _signer) internal returns (bytes memory) {
         (, address msgSender, ) = vm.readCallers();
-        bytes32 messageHash = keccak256(abi.encodePacked(block.chainid, _proofDeadline, msgSender));
+        bytes32 messageHash = keccak256(abi.encodePacked(block.chainid, address(tapCollector), _proofDeadline, msgSender));
         bytes32 proofToDigest = MessageHashUtils.toEthSignedMessageHash(messageHash);
         (uint8 v, bytes32 r, bytes32 s) = vm.sign(_signer, proofToDigest);
         return abi.encodePacked(r, s, v);