tornadocash/fixed-merkle-tree
1
0
Fork 0
mirror of https://github.com/tornadocash/fixed-merkle-tree.git synced 2024-11-22 09:47:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
Sergei SMART 2022-03-09 20:35:34 +10:00
parent 1015f72954
commit 623cef3da2
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/PartialMerkleTree.ts
View File

@ -114,7 +114,7 @@ export class PartialMerkleTree {
let hash: Element = this._hashFn(left, right) let hash: Element = this._hashFn(left, right)
if (!hash && this._edgeLeafProof.pathPositions[level] === i) hash = this._edgeLeafProof.pathElements[level] if (!hash && this._edgeLeafProof.pathPositions[level] === i) hash = this._edgeLeafProof.pathElements[level]
if (level === this.levels) hash = hash || this._initialRoot if (level === this.levels) hash = hash || this._initialRoot
this._layers[level][i] = hash if (hash) this._layers[level][i] = hash
} }
} }
} }
@ -147,24 +147,23 @@ export class PartialMerkleTree {
nodes = this._layers[layerIndex - 1] nodes = this._layers[layerIndex - 1]
this._layers[layerIndex] = [] this._layers[layerIndex] = []
edgeIndex = layerIndex > 1 ? Math.ceil(edgeIndex / 2) : edgeIndex edgeIndex = layerIndex > 1 ? Math.ceil(edgeIndex / 2) : edgeIndex
// console.log(layerIndex, nodes.length, index)
const from = nodes.length % 2 === 0 ? nodes.length - 1 : nodes.length const from = nodes.length % 2 === 0 ? nodes.length - 1 : nodes.length
let i = from let i = from
for (i; i >= 0; i -= 2) { for (i; i >= 0; i -= 2) {
// if (i < edgeIndex - 1) { if (i < edgeIndex - 2) {
// this._layers[layerIndex].push(undefined) break
// break }
// }
const left = nodes[i - 1] const left = nodes[i - 1]
const right = (i === from && nodes.length % 2 === 1) ? this._zeros[layerIndex - 1] : nodes[i] const right = (i === from && nodes.length % 2 === 1) ? this._zeros[layerIndex - 1] : nodes[i]
let hash: Element = this._hashFn(left, right) let hash: Element = this._hashFn(left, right)
if (layerIndex === this.levels) hash = hash || this._edgeLeafProof.pathRoot if (layerIndex === this.levels) hash = hash || this._edgeLeafProof.pathRoot
this._layers[layerIndex].push(hash) if (hash) this._layers[layerIndex].push(hash)
} }
this._layers[layerIndex].reverse() this._layers[layerIndex].reverse()
// this._layers[layerIndex].concat(nodes.length > 2 ? Array(Math.ceil(index / 2)) : []).reverse() const skipCount = (edgeIndex >> 1)
// const emptyElements = Array(Math.ceil((nodes.length - (nodes.length - index)) / 2)) const emptyArray = nodes.length > 1 ? new Array(skipCount) : []
// if (nodes.length > 3) this._layers[layerIndex] = emptyElements.concat(this._layers[layerIndex]) console.log(layerIndex, edgeIndex, skipCount, nodes.length)
this._layers[layerIndex] = emptyArray.concat(this._layers[layerIndex])
if (this._proofMap.has(layerIndex)) { if (this._proofMap.has(layerIndex)) {
const [proofPos, proofEl] = this._proofMap.get(layerIndex) const [proofPos, proofEl] = this._proofMap.get(layerIndex)
this._layers[layerIndex][proofPos] = this._layers[layerIndex][proofPos] || proofEl this._layers[layerIndex][proofPos] = this._layers[layerIndex][proofPos] || proofEl