p30629751
/
merkletreejs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bump version to 0.2.11

This commit is contained in:
Miguel Mota 2020-12-07 14:33:26 -08:00
parent de9840f8d9
commit 072a6c2962
4 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@ -1,6 +1,6 @@
{
"name": "merkletreejs",
"version": "0.2.10",
"version": "0.2.11",
"description": "Construct Merkle Trees and verify proofs",
"main": "dist/index.js",
"types": "dist/index.d.ts",
@ -12,7 +12,7 @@
"test": "tape test/*.js",
"build": "rm -rf dist/ && tsc && npm run build:browser",
"build:browser": "browserify -t [ babelify --presets [ @babel/preset-env ] ] dist/index.js | uglifyjs > merkletree.js",
"lint": "standardx --fix index.ts test/*.js",
"lint": "standardx --fix src/*.ts test/*.js",
"docs": "rm -rf docs/ && typedoc --plugin typedoc-plugin-markdown -hideSources --theme markdown --hideGenerator --excludeExternals --excludePrivate --out docs index.ts",
"prepare": "npm run lint && npm run build"
},

16
index.ts → src/MerkleTree.ts
View File

@ -631,7 +631,7 @@ export class MerkleTree {
*```
*/
getHexMultiProof (tree: Buffer[], indices: number[]):string[] {
return this.getMultiProof(tree, indices).map(this.bufferToHex)
return this.getMultiProof(tree, indices).map((x) => this.bufferToHex(x))
}
/**
@ -793,6 +793,7 @@ export class MerkleTree {
if (this.sortPairs) {
pair = pair.sort(Buffer.compare)
}
tree[(index / 2) | 0] = this.hashAlgo(Buffer.concat(pair))
indexqueue.push((index / 2) | 0)
}
@ -823,7 +824,7 @@ export class MerkleTree {
*```
*/
getLayersAsObject ():any {
const layers: any[] = this.getLayers().map((layer: any) => layer.map((value: any) => value.toString('hex')))
const layers: any[] = this.getLayers().map((layer: any) => layer.map((value: any) => this.bufferToHex(value, false)))
const objs = []
for (let i = 0; i < layers.length; i++) {
const arr = []
@ -850,9 +851,6 @@ export class MerkleTree {
return objs[0]
}
toJSON () {
}
/**
* print
* @desc Prints out a visual representation of the merkle tree.
@ -1019,8 +1017,8 @@ export class MerkleTree {
*const hexStr = tree.bufferToHex(Buffer.from('A'))
*```
*/
bufferToHex (value: Buffer):string {
return MerkleTree.bufferToHex(value)
bufferToHex (value: Buffer, withPrefix: boolean = true):string {
return MerkleTree.bufferToHex(value, withPrefix)
}
/**
@ -1033,8 +1031,8 @@ export class MerkleTree {
*const hexStr = MerkleTree.bufferToHex(Buffer.from('A'))
*```
*/
static bufferToHex (value: Buffer):string {
return '0x' + value.toString('hex')
static bufferToHex (value: Buffer, withPrefix: boolean = true):string {
return `${withPrefix ? '0x' : ''}${value.toString('hex')}`
}
/**

3
src/index.ts Normal file
View File

@ -0,0 +1,3 @@
import MerkleTree from './MerkleTree'
export { MerkleTree }
export default MerkleTree

33
test/merkletree.test.js
View File

@ -93,6 +93,7 @@ test('sha256 verify with positional hex proof and no pairSort', t => {
const leaves = ['a', 'b', 'c', 'd', 'e', 'f'].map(x => sha256(x))
const tree = new MerkleTree(leaves, sha256, { sortPairs: false })
t.true(tree.verify(tree.getPositionalHexProof(leaves[1], 1), leaves[1], tree.getHexRoot()))
})
@ -245,7 +246,7 @@ test('solidity keccak [keccak-256]', t => {
t.equal(proof_0[1].position, 'right')
t.equal(proof_0[1].data.toString('hex'), c_hash)
t.equal(tree.verify(proof_0, leaves[0], root), true)
t.true(tree.verify(proof_0, leaves[0], root))
const proof_1 = tree.getProof(leaves[1])
t.equal(proof_1.length, 2)
@ -254,14 +255,14 @@ test('solidity keccak [keccak-256]', t => {
t.equal(proof_1[1].position, 'right')
t.equal(proof_1[1].data.toString('hex'), c_hash)
t.equal(tree.verify(proof_1, leaves[1], root), true)
t.true(tree.verify(proof_1, leaves[1], root))
const proof_2 = tree.getProof(leaves[2])
t.equal(proof_2.length, 1)
t.equal(proof_2[0].position, 'left')
t.equal(proof_2[0].data.toString('hex'), layer_1)
t.equal(tree.verify(proof_2, leaves[2], root), true)
t.true(tree.verify(proof_2, leaves[2], root))
})
test('solidity keccak [keccak-256] with duplicate odd option', t => {
@ -292,7 +293,7 @@ test('solidity keccak [keccak-256] with duplicate odd option', t => {
t.equal(proof_0[1].position, 'right')
t.equal(proof_0[1].data.toString('hex'), layer_2)
t.equal(tree.verify(proof_0, leaves[0], root), true)
t.true(tree.verify(proof_0, leaves[0], root))
const proof_1 = tree.getProof(leaves[1])
t.equal(proof_1.length, 2)
@ -301,14 +302,14 @@ test('solidity keccak [keccak-256] with duplicate odd option', t => {
t.equal(proof_1[1].position, 'right')
t.equal(proof_1[1].data.toString('hex'), layer_2)
t.equal(tree.verify(proof_1, leaves[1], root), true)
t.true(tree.verify(proof_1, leaves[1], root))
const proof_2 = tree.getProof(leaves[2])
t.equal(proof_2.length, 1)
t.equal(proof_2[0].position, 'left')
t.equal(proof_2[0].data.toString('hex'), layer_1)
t.equal(tree.verify(proof_2, layer_2, root), true)
t.true(tree.verify(proof_2, layer_2, root))
})
test('solidity keccak [keccak-256] with duplicate leaves', t => {
@ -450,7 +451,7 @@ test('sha-256 with option.isBitcoinTree', t => {
const proof_0 = tree.getProof(leaves[0])
t.equal(tree.verify(proof_0, leaves[0], root), true)
t.true(tree.verify(proof_0, leaves[0], root))
})
test('keccak - hex strings', t => {
@ -511,7 +512,7 @@ test('crypto-js SHA3 leaves SHA256 hash algo', t => {
return tree.verify(proof, leaf, root)
})
t.equal(verifications.every(Boolean), true)
t.true(verifications.every(Boolean))
})
test('crypto-js SHA3 1 leaf SHA256 hash algo', t => {
@ -526,7 +527,7 @@ test('crypto-js SHA3 1 leaf SHA256 hash algo', t => {
const proof = tree.getProof(leaf)
t.equal(proof.length, 0)
t.equal(MerkleTree.bufferify(leaf).toString('hex'), root.toString('hex'))
t.equal(tree.verify(proof, leaf, root), true)
t.true(tree.verify(proof, leaf, root))
})
test('crypto-js bufferify', t => {
@ -575,7 +576,7 @@ test('sha1', t => {
'0x59f544ee5de8d761b124ccd4e1285d3b02a2a539'
])
t.equal(tree.verify(proof, leaf, root), true)
t.true(tree.verify(proof, leaf, root))
})
test('sha56 getHexLayers', t => {
@ -719,7 +720,7 @@ test('sha256 getMultiProof', t => {
const depth = tree.getDepth()
const tLeaves = indices.map(i => leaves[i])
t.equal(tree.verifyMultiProof(root, indices, tLeaves, depth, proof), true)
t.true(tree.verifyMultiProof(root, indices, tLeaves, depth, proof))
})
test('sha256 getMultiProof with pairs sorted', t => {
@ -732,18 +733,16 @@ test('sha256 getMultiProof with pairs sorted', t => {
})
const tree = new MerkleTree(leaves, sha256, { sortPairs: true })
const root = tree.getHexRoot()
const i = 100
const indices = Array(16).fill(0).map((x, j) => j).filter(j => (i >> j) % 2 === 1)
const proof = tree.getMultiProof(indices)
const depth = tree.getDepth()
const tLeaves = indices.map(i => leaves[i])
t.equal(tree.verifyMultiProof(root, indices, tLeaves, depth, proof), true)
t.true(tree.verifyMultiProof(root, indices, tLeaves, depth, proof))
})
test('sha256 getMultiProof using tree array', t => {
@ -813,7 +812,7 @@ test('sha256 getMultiProof using tree array', t => {
const tRoot = treeFlat[1]
const tLeaves = indices.map(i => leaves[i])
t.equal(tree.verifyMultiProof(tRoot, indices, tLeaves, depth, proof), true)
t.true(tree.verifyMultiProof(tRoot, indices, tLeaves, depth, proof))
})
test('sha256 getMultiProof', t => {
@ -933,7 +932,7 @@ test('marshal proof', t => {
t.equal(parsed[0].data, '0xb5553de315e0edf504d9150af82dafa5c4667fa618ed0a6f19c69b41166c5510')
t.equal(parsed[1].data, '0x43e061172b1177f25d0f156b2d2ed11728006fade8e167ff3d1b9dbc979a3358')
t.equal(tree.verify(parsed, leaves[0], tree.getRoot()), true)
t.true(tree.verify(parsed, leaves[0], tree.getRoot()))
})
test('unmarshal proof', t => {