status-im
/
EIPs
mirror of https://github.com/status-im/EIPs.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Replaced sha3 with keccak256 in EIP-712 assets

This commit is contained in:
Paul Berg 2018-11-01 20:57:33 +01:00
parent 8b19b7e2db
commit 8bb289598e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
assets/eip-712/Example.js
View File

@ -76,7 +76,7 @@ function encodeType(primaryType) {
} }
function typeHash(primaryType) { function typeHash(primaryType) {
return ethUtil.sha3(encodeType(primaryType)); return ethUtil.keccak256(encodeType(primaryType));
} }
function encodeData(primaryType, data) { function encodeData(primaryType, data) {
@ -92,11 +92,11 @@ function encodeData(primaryType, data) {
let value = data[field.name]; let value = data[field.name];
if (field.type == 'string' || field.type == 'bytes') { if (field.type == 'string' || field.type == 'bytes') {
encTypes.push('bytes32'); encTypes.push('bytes32');
value = ethUtil.sha3(value); value = ethUtil.keccak256(value);
encValues.push(value); encValues.push(value);
} else if (types[field.type] !== undefined) { } else if (types[field.type] !== undefined) {
encTypes.push('bytes32'); encTypes.push('bytes32');
value = ethUtil.sha3(encodeData(field.type, value)); value = ethUtil.keccak256(encodeData(field.type, value));
encValues.push(value); encValues.push(value);
} else if (field.type.lastIndexOf(']') === field.type.length - 1) { } else if (field.type.lastIndexOf(']') === field.type.length - 1) {
throw 'TODO: Arrays currently unimplemented in encodeData'; throw 'TODO: Arrays currently unimplemented in encodeData';
@ -110,11 +110,11 @@ function encodeData(primaryType, data) {
} }
function structHash(primaryType, data) { function structHash(primaryType, data) {
return ethUtil.sha3(encodeData(primaryType, data)); return ethUtil.keccak256(encodeData(primaryType, data));
} }
function signHash() { function signHash() {
return ethUtil.sha3( return ethUtil.keccak256(
Buffer.concat([ Buffer.concat([
Buffer.from('1901', 'hex'), Buffer.from('1901', 'hex'),
structHash('EIP712Domain', typedData.domain), structHash('EIP712Domain', typedData.domain),
@ -123,7 +123,7 @@ function signHash() {
); );
} }
const privateKey = ethUtil.sha3('cow'); const privateKey = ethUtil.keccak256('cow');
const address = ethUtil.privateToAddress(privateKey); const address = ethUtil.privateToAddress(privateKey);
const sig = ethUtil.ecsign(signHash(), privateKey); const sig = ethUtil.ecsign(signHash(), privateKey);