Merge pull request #1277 from braydonf/transaction-benchmarks

Benchmarks for block serialization & 4x performance improvement.

benchmark/package.json

@@ -0,0 +1,8 @@
+{
+  "devDependencies": {
+    "bcoin": "0.15.0",
+    "bitcoinjs-lib": "^1.5.7",
+    "fullnode": "^0.9.0",
+    "benchmark": "^1.0.0"
+  }
+}

benchmark/serialization.js

@@ -0,0 +1,63 @@
+'use strict';
+
+var benchmark = require('benchmark');
+var bitcore = require('..');
+var bitcoinjs = require('bitcoinjs-lib');
+var bcoin = require('bcoin');
+var async = require('async');
+var fullnode = require('fullnode');
+var blockData = require('./block-357238.json');
+
+var maxTime = 20;
+
+console.log('Benchmarking Block/Transaction Serialization');
+console.log('---------------------------------------');
+
+async.series([
+  function(next) {
+
+    var block1;
+    var block2;
+    var block3;
+
+    function bitcoreTest() {
+      block1 = bitcore.Block.fromString(blockData);
+    }
+
+    function bitcoinJSTest() {
+      block2 = bitcoinjs.Block.fromHex(blockData);
+    }
+
+    var parser = new bcoin.protocol.parser();
+
+    function bcoinTest() {
+      var raw = bcoin.utils.toArray(blockData, 'hex');
+      var data = parser.parseBlock(raw);
+      block3 = new bcoin.block(data, 'block');
+    }
+
+    var blockDataMessage = '0000000000000000' + blockData; // add mock leading magic and size
+
+    function fullnodeTest() {
+      fullnode.Block().fromHex(blockDataMessage);
+    }
+
+    var suite = new benchmark.Suite();
+    suite.add('bitcore', bitcoreTest, {maxTime: maxTime});
+    suite.add('bitcoinjs', bitcoinJSTest, {maxTime: maxTime});
+    suite.add('bcoin', bcoinTest, {maxTime: maxTime});
+    suite.add('fullnode', fullnodeTest, {maxTime: maxTime});
+    suite
+      .on('cycle', function(event) {
+        console.log(String(event.target));
+      })
+      .on('complete', function() {
+        console.log('Fastest is ' + this.filter('fastest').pluck('name'));
+        console.log('----------------------------------------------------------------------');
+        next();
+      })
+      .run();
+  }
+], function(err) {
+  console.log('Finished');
+});

lib/block/block.js

@@ -69,7 +69,11 @@ Block._fromJSON = function _fromJSON(data) {
 Block._fromObject = function _fromObject(data) {
   var transactions = [];
   data.transactions.forEach(function(tx) {
+    if (tx instanceof Transaction) {
+      transactions.push(tx);
+    } else {
       transactions.push(Transaction().fromJSON(tx));
+    }
   });
   var info = {
     header: BlockHeader.fromObject(data.header),

lib/transaction/output.js

@@ -16,14 +16,18 @@ function Output(args) {
   if (!(this instanceof Output)) {
     return new Output(args);
   }
-  if (JSUtil.isValidJSON(args)) {
+  if (_.isObject(args)) {
-    return Output.fromJSON(args);
-  } else if (_.isObject(args)) {
     this.satoshis = args.satoshis;
+    if (bufferUtil.isBuffer(args.script)) {
+      this._scriptBuffer = args.script;
+    } else {
       if (_.isString(args.script) && JSUtil.isHexa(args.script)) {
         args.script = new buffer.Buffer(args.script, 'hex');
       }
       this.setScript(args.script);
+    }
+  } else if (JSUtil.isValidJSON(args)) {
+    return Output.fromJSON(args);
   } else {
     throw new TypeError('Unrecognized argument for Output');
   }
@@ -33,7 +37,13 @@ Object.defineProperty(Output.prototype, 'script', {
   configurable: false,
   enumerable: true,
   get: function() {
+    if (this._script) {
       return this._script;
+    } else {
+      this.setScriptFromBuffer(this._scriptBuffer);
+      return this._script;
+    }
+
   }
 });