From 978679cad782f05b603d6c40896387914577e02f Mon Sep 17 00:00:00 2001
From: Sky Young <skyoung@mediciventures.com>
Date: Wed, 24 Jul 2019 17:46:08 -0600
Subject: [PATCH] Pass fcoin Block template

---
 lib/services/p2p/index.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/services/p2p/index.js b/lib/services/p2p/index.js
index ace5fb5c..322a50cb 100644
--- a/lib/services/p2p/index.js
+++ b/lib/services/p2p/index.js
@@ -90,7 +90,7 @@ P2P.prototype.getP2PBlock = function(opts, callback) {
 
   self.once(opts.blockHash, callback);
 
-  peer.sendMessage(self.messages.GetBlocks(blockFilter));
+  peer.sendMessage(self.messages.GetBlocks(blockFilter, { Block: BcoinBlock }));
 };
 
 P2P.prototype.getHeaders = function(filter) {
@@ -278,7 +278,7 @@ P2P.prototype._initP2P = function() {
   if (this.node.network === 'regtest') {
     Networks.enableRegtest();
   }
-  this.messages = new p2p.Messages({ network: Networks.get(this.node.network), Transaction: BcoinTx });
+  this.messages = new p2p.Messages({ network: Networks.get(this.node.network), Transaction: BcoinTx, Block: BcoinBlock });
   this._peerHeights = [];
   this._peers = [];
   this._peerIndex = 0;
@@ -306,10 +306,9 @@ P2P.prototype._initPubSub = function() {
 };
 
 P2P.prototype._onPeerBlock = function(peer, message) {
-  let block = BcoinBlock.fromRaw(message.block.toBuffer())
-  this._blockCache.set(block.rhash(), block);
-  this.emit(block.rhash(), block);
-  this._broadcast(this.subscriptions.block, 'p2p/block', block);
+  this._blockCache.set(message.block.rhash(), message.block);
+  this.emit(message.block.rhash(), message.block);
+  this._broadcast(this.subscriptions.block, 'p2p/block', message.block);
 };
 
 P2P.prototype._onPeerDisconnect = function(peer, addr) {