From bf0010b8ac7b8438a20e44d69c2d2e5f9ae054a4 Mon Sep 17 00:00:00 2001 From: Manuel Araoz Date: Tue, 18 Feb 2014 14:36:35 -0300 Subject: [PATCH] fix buffertool's fill calls --- bitcore.js | 1 + networks.js | 5 +++-- util/util.js | 9 ++++----- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/bitcore.js b/bitcore.js index f9b9ce0..c6c9d94 100644 --- a/bitcore.js +++ b/bitcore.js @@ -19,6 +19,7 @@ module.exports.Peer = require('./Peer'); module.exports.Block = require('./Block'); module.exports.Connection = require('./Connection'); module.exports.ScriptInterpreter = require('./ScriptInterpreter'); +module.exports.networks = require('./networks'); if (typeof process.versions === 'undefined') { diff --git a/networks.js b/networks.js index 97a1fa9..07e10f3 100644 --- a/networks.js +++ b/networks.js @@ -1,4 +1,5 @@ var Put = require('bufferput'); +var buffertools = require('buffertools'); var hex = function(hex) {return new Buffer(hex, 'hex');}; exports.livenet = { @@ -10,7 +11,7 @@ exports.livenet = { nonce: 2083236893, version: 1, hash: hex('6FE28C0AB6F1B372C1A6A246AE63F74F931E8365E15A089C68D6190000000000'), - prev_hash: new Buffer(32).fill(0), + prev_hash: buffertools.fill(new Buffer(32), 0), timestamp: 1231006505, merkle_root: hex('3BA3EDFD7A7B12B27AC72C3E67768F617FC81BC3888A51323A9FB8AA4B1E5E4A'), bits: 486604799 @@ -53,7 +54,7 @@ exports.testnet = { nonce: 414098458, version: 1, hash: hex('43497FD7F826957108F4A30FD9CEC3AEBA79972084E90EAD01EA330900000000'), - prev_hash: new Buffer(32).fill(0), + prev_hash: buffertools.fill(new Buffer(32), 0), timestamp: 1296688602, merkle_root: hex('3BA3EDFD7A7B12B27AC72C3E67768F617FC81BC3888A51323A9FB8AA4B1E5E4A'), bits: 486604799, diff --git a/util/util.js b/util/util.js index e67ae83..dec16ff 100644 --- a/util/util.js +++ b/util/util.js @@ -225,7 +225,8 @@ var decodeDiffBits = exports.decodeDiffBits = function (diffBits, asBigInt) { // Convert to buffer var diffBuf = target.toBuffer(); - var targetBuf = new Buffer(32).fill(0); + var targetBuf = new Buffer(32); + buffertools.fill(targetBuf, 0); diffBuf.copy(targetBuf, 32-diffBuf.length); return targetBuf; }; @@ -325,11 +326,9 @@ var varStrBuf = exports.varStrBuf = function varStrBuf(s) { }; // Initializations -exports.NULL_HASH = new Buffer(32) -buffertools.fill(exports.NULL_HASH, 0); +exports.NULL_HASH = buffertools.fill(new Buffer(32), 0); exports.EMPTY_BUFFER = new Buffer(0); -exports.ZERO_VALUE = new Buffer(8) -buffertools.fill(exports.ZERO_VALUE, 0); +exports.ZERO_VALUE = buffertools.fill(new Buffer(8), 0); var INT64_MAX = new Buffer('ffffffffffffffff', 'hex'); exports.INT64_MAX = INT64_MAX;