mappum
diff --git a/‎lib/blockStream.js
Lines changed: 32 additions & 8 deletions b/‎lib/blockStream.js
Lines changed: 32 additions & 8 deletions
diff --git a/‎lib/transactionStream.js
Lines changed: 5 additions & 3 deletions b/‎lib/transactionStream.js
Lines changed: 5 additions & 3 deletions
@@ -2,6 +2,7 @@ var Readable = require('stream').Readable
 var util = require('util')
 var Inventory = require('bitcore-p2p').Inventory
 var u = require('./utils.js')
+var MerkleTree = require('./merkleTree.js')
 
 var BlockStream = module.exports = function (opts) {
   if (!opts.peer) throw new Error('"peer" option is required for BlockStream')
@@ -15,12 +16,17 @@ var BlockStream = module.exports = function (opts) {
   this.from = opts.from || 0
   this.to = opts.to || null
   this.filtered = typeof opts.filtered === 'boolean' ? opts.filtered : !!this.peer.filter
+  this.fetchTransactions = typeof opts.fetchTransactions === 'boolean' ? opts.fetchTransactions : true
 
   this.cursor = this.from
   this.expected = null
   this.ending = false
 
-  this.peer.on(this.filtered ? 'merkleblock' : 'block', this._onBlock.bind(this))
+  if (!this.filtered) {
+    this.peer.on('block', this._onBlock.bind(this))
+  } else {
+    this.peer.on('merkleblock', this._onMerkleBlock.bind(this))
+  }
 }
 util.inherits(BlockStream, Readable)
 
@@ -55,7 +61,7 @@ BlockStream.prototype._getData = function (block) {
   this.expected = { height: block.height, hash: hash }
   var inventory = [
     new Inventory({
-      type: this.filtered ? Inventory.TYPE.MERKLE_BLOCK : Inventory.TYPE.BLOCK,
+      type: this.filtered ? Inventory.TYPE.FILTERED_BLOCK : Inventory.TYPE.BLOCK,
       hash: hash
     })
   ]
@@ -64,16 +70,34 @@ BlockStream.prototype._getData = function (block) {
 }
 
 BlockStream.prototype._onBlock = function (message) {
-  if (!this.expected) return
-  var hash = u.toHash(message.block.header.hash)
-  if (hash.compare(this.expected.hash) !== 0) return
-  var block = {
+  this._onData({
     height: this.expected.height,
     header: message.block.header,
     block: message.block
-  }
+  })
+}
+
+BlockStream.prototype._onMerkleBlock = function (message) {
+  if (!this.expected) return
+
+  var tree = MerkleTree.fromMerkleBlock(message.merkleBlock)
+
+  // TODO: fetch transactions
+
+  this._onData({
+    height: this.expected.height,
+    header: message.merkleBlock.header,
+    tree: tree,
+    transactions: []
+  })
+}
+
+BlockStream.prototype._onData = function (data) {
+  if (!this.expected) return
+  var hash = u.toHash(data.header.hash)
+  if (hash.compare(this.expected.hash) !== 0) return
   this.expected = null
-  var done = !this.push(block) || this.ending
+  var done = !this.push(data) || this.ending
   if (done) this._end()
   else this._next()
 }
@@ -1,6 +1,7 @@
 var Transform = require('stream').Transform
 var util = require('util')
-var Block = require('bitcore').Block
+var bitcore = require('bitcore')
+var BlockHeader = bitcore.BlockHeader
 
 var TransactionStream = module.exports = function (blocks, opts) {
   var self = this
@@ -17,12 +18,13 @@ var TransactionStream = module.exports = function (blocks, opts) {
 util.inherits(TransactionStream, Transform)
 
 TransactionStream.prototype._transform = function (block, enc, cb) {
-  if (block.height == null || !(block.block instanceof Block)) {
+  if (block.height == null || !(block.header instanceof BlockHeader)) {
     return cb(new Error('Input to TransactionStream must be a stream of blocks'))
   }
 
   var self = this
-  block.block.transactions.forEach(function (tx) {
+  var txs = block.block ? block.block.transactions : block.transactions
+  txs.forEach(function (tx) {
     if (this.verify && tx.verify() !== true) return
     self.push({ transaction: tx, block: block })
   })