LBRYCommunity/bitcoinjs-lib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

block: use merkle-lib instead of inline calculation

Browse source
This commit is contained in:
Daniel Cousens 2016-10-07 17:03:12 +11:00 • committed by Daniel Cousens
parent 3bff2c63af
commit dd4596a44a
2 changed files with 7 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
package.json
View file

@ -57,6 +57,7 @@
"create-hash": "^1.1.0", "create-hash": "^1.1.0",
"create-hmac": "^1.1.3", "create-hmac": "^1.1.3",
"ecurve": "^1.0.0", "ecurve": "^1.0.0",
"merkle-lib": "^1.0.0",
"randombytes": "^2.0.1", "randombytes": "^2.0.1",
"typeforce": "^1.8.7", "typeforce": "^1.8.7",
"varuint-bitcoin": "^1.0.4", "varuint-bitcoin": "^1.0.4",

24
src/block.js
View file

@ -1,7 +1,7 @@
var createHash = require('create-hash')
var bufferutils = require('./bufferutils') var bufferutils = require('./bufferutils')
var bcrypto = require('./crypto') var bcrypto = require('./crypto')
var bufferReverse = require('buffer-reverse') var bufferReverse = require('buffer-reverse')
var fastMerkleRoot = require('merkle-lib/fastRoot')
var Transaction = require('./transaction') var Transaction = require('./transaction')
@ -134,25 +134,13 @@ Block.calculateTarget = function (bits) {
} }
Block.calculateMerkleRoot = function (transactions) { Block.calculateMerkleRoot = function (transactions) {
var length = transactions.length if (transactions.length === 0) throw TypeError('Cannot compute merkle root for zero transactions')
if (length === 0) throw TypeError('Cannot compute merkle root for zero transactions')
var hashes = transactions.map(function (transaction) { return transaction.getHash() }) var hashes = transactions.map(function (transaction) {
return transaction.getHash()
})
while (length > 1) { return fastMerkleRoot(hashes, bcrypto.hash256)
var j = 0
for (var i = 0; i < length; i += 2, ++j) {
var hasher = createHash('sha256')
hasher.update(hashes[i])
hasher.update(i + 1 !== length ? hashes[i + 1] : hashes[i])
hashes[j] = bcrypto.sha256(hasher.digest())
}
length = j
}
return hashes[0]
} }
Block.prototype.checkMerkleRoot = function () { Block.prototype.checkMerkleRoot = function () {