diff --git a/lib/messages/commands/addr.js b/lib/messages/commands/addr.js index 1aa7d79..5491c09 100644 --- a/lib/messages/commands/addr.js +++ b/lib/messages/commands/addr.js @@ -25,18 +25,18 @@ AddrMessage.fromBuffer = function(payload) { var parser = new BufferReader(payload); var addrCount = parser.readVarintNum(); - + var obj = {}; obj.addresses = []; for (var i = 0; i < addrCount; i++) { // todo: time only available on versions >=31402 var time = new Date(parser.readUInt32LE() * 1000); - + var addr = utils.parseAddr(parser); addr.time = time; obj.addresses.push(addr); } - + utils.checkFinished(parser); return AddrMessage.fromObject(obj); }; @@ -44,13 +44,13 @@ AddrMessage.fromBuffer = function(payload) { AddrMessage.prototype.getPayload = function() { var bw = new BufferWriter(); bw.writeVarintNum(this.addresses.length); - + for (var i = 0; i < this.addresses.length; i++) { var addr = this.addresses[i]; bw.writeUInt32LE(addr.time.getTime() / 1000); utils.writeAddr(addr, bw); } - + return bw.concat(); }; diff --git a/lib/messages/commands/alert.js b/lib/messages/commands/alert.js index 6a3c8f3..7e4926a 100644 --- a/lib/messages/commands/alert.js +++ b/lib/messages/commands/alert.js @@ -13,7 +13,7 @@ function AlertMessage(options) { Message.call(this, options); this.magicNumber = magicNumber; this.command = 'alert'; - + this.payload = options.payload || new Buffer(32); this.signature = options.signature || new Buffer(32); } @@ -36,10 +36,10 @@ AlertMessage.prototype.getPayload = function() { var bw = new BufferWriter(); bw.writeVarintNum(this.payload.length); bw.write(this.payload); - + bw.writeVarintNum(this.signature.length); bw.write(this.signature); - + return bw.concat(); }; diff --git a/lib/messages/commands/getblocks.js b/lib/messages/commands/getblocks.js index a45b818..e8ff388 100644 --- a/lib/messages/commands/getblocks.js +++ b/lib/messages/commands/getblocks.js @@ -24,7 +24,7 @@ function GetblocksMessage(options) { this.command = 'getblocks'; this.version = protocolVersion; this.magicNumber = magicNumber; - + options = utils.sanitizeStartStop(options); this.starts = options.starts; this.stop = options.stop; @@ -40,10 +40,10 @@ GetblocksMessage.fromBuffer = function(payload) { var obj = {}; var parser = new BufferReader(payload); $.checkArgument(!parser.finished(), 'No data received in payload'); - + obj.version = parser.readUInt32LE(); var startCount = parser.readVarintNum(); - + obj.starts = []; for (var i = 0; i < startCount; i++) { obj.starts.push(parser.read(32)); diff --git a/lib/messages/commands/getdata.js b/lib/messages/commands/getdata.js index d8d71b1..229bcb4 100644 --- a/lib/messages/commands/getdata.js +++ b/lib/messages/commands/getdata.js @@ -25,7 +25,7 @@ GetdataMessage.fromBuffer = function(payload) { var obj = { inventory: [] }; - + var parser = new BufferReader(payload); var count = parser.readVarintNum(); for (var i = 0; i < count; i++) { @@ -33,7 +33,7 @@ GetdataMessage.fromBuffer = function(payload) { var hash = parser.read(32); obj.inventory.push({type: type, hash: hash}); } - + utils.checkFinished(parser); return GetdataMessage.fromObject(obj); }; diff --git a/lib/messages/commands/getheaders.js b/lib/messages/commands/getheaders.js index e272d7c..97a5068 100644 --- a/lib/messages/commands/getheaders.js +++ b/lib/messages/commands/getheaders.js @@ -22,11 +22,11 @@ function GetheadersMessage(options) { this.command = 'getheaders'; this.version = protocolVersion; this.magicNumber = magicNumber; - + options = utils.sanitizeStartStop(options); this.starts = options.starts; this.stop = options.stop; - + } inherits(GetheadersMessage, Message); @@ -38,10 +38,10 @@ GetheadersMessage.fromBuffer = function(payload) { var obj = {}; var parser = new BufferReader(payload); $.checkArgument(!parser.finished(), 'No data received in payload'); - + obj.version = parser.readUInt32LE(); var startCount = Math.min(parser.readVarintNum(), 500); - + obj.starts = []; for (var i = 0; i < startCount; i++) { obj.starts.push(parser.read(32)); diff --git a/lib/messages/commands/inv.js b/lib/messages/commands/inv.js index 3ddc0be..dba560a 100644 --- a/lib/messages/commands/inv.js +++ b/lib/messages/commands/inv.js @@ -31,7 +31,7 @@ InvMessage.fromBuffer = function(payload) { var obj = { inventory: [] }; - + var parser = new BufferReader(payload); var count = parser.readVarintNum(); for (var i = 0; i < count; i++) { @@ -39,7 +39,7 @@ InvMessage.fromBuffer = function(payload) { var hash = parser.read(32); obj.inventory.push({type: type, hash: hash}); } - + utils.checkFinished(parser); return InvMessage.fromObject(obj); }; diff --git a/lib/messages/commands/ping.js b/lib/messages/commands/ping.js index 462346d..84536b9 100644 --- a/lib/messages/commands/ping.js +++ b/lib/messages/commands/ping.js @@ -31,7 +31,7 @@ PingMessage.fromBuffer = function(payload) { var obj = {}; var parser = new BufferReader(payload); obj.nonce = parser.read(8); - + utils.checkFinished(parser); return PingMessage.fromObject(obj); }; @@ -40,4 +40,3 @@ module.exports = function(options) { magicNumber = options.magicNumber || magicNumber; return PingMessage; }; - diff --git a/lib/messages/commands/pong.js b/lib/messages/commands/pong.js index b91cf51..66eb4f4 100644 --- a/lib/messages/commands/pong.js +++ b/lib/messages/commands/pong.js @@ -24,7 +24,7 @@ PongMessage.fromBuffer = function(payload) { var obj = {}; var parser = new BufferReader(payload); obj.nonce = parser.read(8); - + utils.checkFinished(parser); return PongMessage.fromObject(obj); }; diff --git a/lib/messages/commands/verack.js b/lib/messages/commands/verack.js index 5619457..1653612 100644 --- a/lib/messages/commands/verack.js +++ b/lib/messages/commands/verack.js @@ -30,4 +30,3 @@ module.exports = function(options) { magicNumber = options.magicNumber || magicNumber; return VerackMessage; }; -