Use EIP 191. fix #71

uport-project · Nov 16, 2017 · baaf442 · baaf442
1 parent 880f8b8
commit baaf442
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/contracts/TxRelay.sol b/contracts/TxRelay.sol
@@ -26,8 +26,9 @@ contract TxRelay {
     ) public {
 
         address claimedSender = getAddress(data);
-        // relay :: nonce :: destination :: data :: relayer
-        bytes32 h = sha3(this, nonce[claimedSender], destination, data);
+        // use EIP 191
+        // 0x19 :: version :: relay :: nonce :: destination :: data :: relayer
+        bytes32 h = keccak256(byte(0x19), byte(0), this, nonce[claimedSender], destination, data);
         address addressFromSig = ecrecover(h, sigV, sigR, sigS);
 
         require(claimedSender == addressFromSig);

diff --git a/test/txRelay.js b/test/txRelay.js
@@ -66,7 +66,7 @@ async function signPayload(signingAddr, sendingAddr, txRelay, destinationAddress
 
    nonce = await txRelay.getNonce.call(signingAddr)
    //Tight packing, as Solidity sha3 does
-   hashInput = txRelay.address + pad(nonce.toString('16')).slice(2)
+   hashInput = '0x1900' + txRelay.address.slice(2) + pad(nonce.toString('16')).slice(2)
                + destinationAddress.slice(2) + data.slice(2)
    hash = solsha3(hashInput)
    sig = lightwallet.signing.signMsgHash(lw, keyFromPw, hash, signingAddr)