MerkleTree util class hashes elements

This commit is contained in:
Yondon Fu
2017-08-07 11:23:52 -04:00
parent 863ad48a81
commit 24323d3ce3
2 changed files with 22 additions and 26 deletions

View File

@ -1,14 +1,9 @@
import { sha3 } from "ethereumjs-util";
import { sha3, bufferToHex } from "ethereumjs-util";
export default class MerkleTree {
constructor(elements) {
// Filter empty strings
this.elements = elements.filter(el => el);
// Check if elements are 32 byte buffers
if (this.elements.some(el => el.length !== 32 || !Buffer.isBuffer(el))) {
throw new Error("Elements must be 32 byte buffers");
}
// Filter empty strings and hash elements
this.elements = elements.filter(el => el).map(el => sha3(el));
// Deduplicate elements
this.elements = this.bufDedup(this.elements);
@ -58,7 +53,7 @@ export default class MerkleTree {
}
getHexRoot() {
return this.bufToHex(this.getRoot());
return bufferToHex(this.getRoot());
}
getProof(el) {
@ -98,8 +93,17 @@ export default class MerkleTree {
}
bufIndexOf(el, arr) {
let hash;
// Convert element to 32 byte hash if it is not one already
if (el.length !== 32 || !Buffer.isBuffer(el)) {
hash = sha3(el);
} else {
hash = el;
}
for (let i = 0; i < arr.length; i++) {
if (el.equals(arr[i])) {
if (hash.equals(arr[i])) {
return i;
}
}
@ -113,14 +117,6 @@ export default class MerkleTree {
});
}
bufToHex(el) {
if (!Buffer.isBuffer(el)) {
throw new Error("Element is not a buffer");
}
return "0x" + el.toString("hex");
}
bufArrToHex(arr) {
if (arr.some(el => !Buffer.isBuffer(el))) {
throw new Error("Array is not an array of buffers");