RanchiMall/bitcoinjs-lib
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

restore typeforce with Buffer hash instead of Function getHash

Browse Source
This commit is contained in:
junderw 2018-05-22 18:51:21 +09:00
parent 5a60a03066
commit 1e095d487d
No known key found for this signature in database
GPG Key ID: B256185D3A971908
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/block.js
View File

@ -1,8 +1,8 @@
var Buffer = require('safe-buffer').Buffer var Buffer = require('safe-buffer').Buffer
var bcrypto = require('./crypto') var bcrypto = require('./crypto')
var fastMerkleRoot = require('merkle-lib/fastRoot') var fastMerkleRoot = require('merkle-lib/fastRoot')
// var typeforce = require('typeforce') var typeforce = require('typeforce')
// var types = require('./types') var types = require('./types')
var varuint = require('varuint-bitcoin') var varuint = require('varuint-bitcoin')
var Transaction = require('./transaction') var Transaction = require('./transaction')
@ -150,7 +150,7 @@ Block.calculateTarget = function (bits) {
} }
Block.calculateMerkleRoot = function (transactions) { Block.calculateMerkleRoot = function (transactions) {
// typeforce([{ getHash: types.Function }], transactions) ToDo: What should this be? typeforce([{ hash: types.Buffer }], transactions)
if (transactions.length === 0) throw TypeError('Cannot compute merkle root for zero transactions') if (transactions.length === 0) throw TypeError('Cannot compute merkle root for zero transactions')
var hashes = transactions.map(function (transaction) { var hashes = transactions.map(function (transaction) {