From ecf9bbaeea7661b29c0a758cd441053dacc40e00 Mon Sep 17 00:00:00 2001
From: Sky Young <skyoung@mediciventures.com>
Date: Mon, 22 Jul 2019 17:26:54 -0600
Subject: [PATCH] Properly import TX and Block from fcoin

---
 lib/services/block/encoding.js       |  2 +-
 lib/services/header/index.js         |  3 ++-
 lib/services/mempool/encoding.js     |  2 +-
 lib/services/p2p/bcoin.js            |  4 ++--
 lib/services/p2p/index.js            | 10 ++++++----
 lib/services/transaction/encoding.js |  2 +-
 6 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/lib/services/block/encoding.js b/lib/services/block/encoding.js
index 70baaa8d..b38dce72 100644
--- a/lib/services/block/encoding.js
+++ b/lib/services/block/encoding.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var Block = require('fcoin').block;
+var Block = require('fcoin').Block;
 // stores -- block header as key, block itself as value (optionally)
 
 function Encoding(servicePrefix) {
diff --git a/lib/services/header/index.js b/lib/services/header/index.js
index d2849478..d4e57dac 100644
--- a/lib/services/header/index.js
+++ b/lib/services/header/index.js
@@ -7,7 +7,8 @@ var index = require('../../');
 var log = index.log;
 var utils = require('../../utils');
 var async = require('async');
-var BN = require('bn.js');
+// var BN = require('bn.js');
+var BN = require('bcrypto/lib/bn.js')
 var consensus = require('fcoin').consensus;
 var assert = require('assert');
 var constants = require('../../constants');
diff --git a/lib/services/mempool/encoding.js b/lib/services/mempool/encoding.js
index 1f671b11..d016a765 100644
--- a/lib/services/mempool/encoding.js
+++ b/lib/services/mempool/encoding.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var tx = require('fcoin').tx;
+var tx = require('fcoin').TX;
 
 function Encoding(servicePrefix) {
   this.servicePrefix = servicePrefix;
diff --git a/lib/services/p2p/bcoin.js b/lib/services/p2p/bcoin.js
index 8580ba4d..4167203b 100644
--- a/lib/services/p2p/bcoin.js
+++ b/lib/services/p2p/bcoin.js
@@ -40,8 +40,8 @@ Bcoin.prototype._getConfig = function(options) {
     logConsole: true,
     logLevel: 'info',
 
-    indexTx: true,
-    indexAddress: true,
+    // indexTx: true,
+    // indexAddress: true,
 
     checkpoints: true,
     memory: false,
diff --git a/lib/services/p2p/index.js b/lib/services/p2p/index.js
index e1620c1e..ace5fb5c 100644
--- a/lib/services/p2p/index.js
+++ b/lib/services/p2p/index.js
@@ -8,7 +8,8 @@ var log = index.log;
 var BaseService = require('../../service');
 var assert = require('assert');
 var Bcoin = require('./bcoin');
-var BcoinTx = require('fcoin').tx;
+var BcoinBlock = require('fcoin').Block;
+var BcoinTx = require('fcoin').TX;
 var Networks = require('flocore-lib').Networks;
 var BitcoreRPC = require('bitcoind-rpc');
 var LRU = require('lru-cache');
@@ -305,9 +306,10 @@ P2P.prototype._initPubSub = function() {
 };
 
 P2P.prototype._onPeerBlock = function(peer, message) {
-  this._blockCache.set(message.block.rhash(), message.block);
-  this.emit(message.block.rhash(), message.block);
-  this._broadcast(this.subscriptions.block, 'p2p/block', message.block);
+  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);
 };
 
 P2P.prototype._onPeerDisconnect = function(peer, addr) {
diff --git a/lib/services/transaction/encoding.js b/lib/services/transaction/encoding.js
index 466b88b6..fb3e886f 100644
--- a/lib/services/transaction/encoding.js
+++ b/lib/services/transaction/encoding.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var Tx = require('fcoin').tx;
+var Tx = require('fcoin').TX;
 
 function Encoding(servicePrefix) {
   this.servicePrefix = servicePrefix;