From 17a4e0f0cccdb827b4b558a9592e47dbd44e89da Mon Sep 17 00:00:00 2001 From: Sky Young Date: Tue, 8 May 2018 13:48:43 -0700 Subject: [PATCH] Use fcoin instead of bcoin --- lib/services/block/encoding.js | 2 +- lib/services/block/index.js | 2 +- lib/services/fee/index.js | 2 +- lib/services/header/index.js | 2 +- lib/services/mempool/encoding.js | 2 +- lib/services/p2p/bcoin.js | 6 +++--- lib/services/p2p/index.js | 2 +- lib/services/transaction/encoding.js | 2 +- package.json | 3 ++- 9 files changed, 12 insertions(+), 11 deletions(-) diff --git a/lib/services/block/encoding.js b/lib/services/block/encoding.js index 3f16204e..70baaa8d 100644 --- a/lib/services/block/encoding.js +++ b/lib/services/block/encoding.js @@ -1,6 +1,6 @@ 'use strict'; -var Block = require('bcoin').block; +var Block = require('fcoin').block; // stores -- block header as key, block itself as value (optionally) function Encoding(servicePrefix) { diff --git a/lib/services/block/index.js b/lib/services/block/index.js index 7450bd9d..f8a4dce9 100644 --- a/lib/services/block/index.js +++ b/lib/services/block/index.js @@ -9,7 +9,7 @@ var log = index.log; var utils = require('../../utils'); var assert = require('assert'); var constants = require('../../constants'); -var bcoin = require('bcoin'); +var bcoin = require('fcoin'); var _ = require('lodash'); var LRU = require('lru-cache'); diff --git a/lib/services/fee/index.js b/lib/services/fee/index.js index 5e1dd71b..6e79b335 100644 --- a/lib/services/fee/index.js +++ b/lib/services/fee/index.js @@ -10,7 +10,7 @@ var FeeService = function(options) { pass: 'local321', host: 'localhost', protocol: 'http', - port: 8332 + port: 7312 }; BaseService.call(this, options); this._client = new FlocoreRPC(this._config); diff --git a/lib/services/header/index.js b/lib/services/header/index.js index e0f7ef3c..766c5dec 100644 --- a/lib/services/header/index.js +++ b/lib/services/header/index.js @@ -11,7 +11,7 @@ var BN = require('bn.js'); var consensus = require('bcoin').consensus; var assert = require('assert'); var constants = require('../../constants'); -var bcoin = require('bcoin'); +var bcoin = require('fcoin'); var HeaderService = function(options) { diff --git a/lib/services/mempool/encoding.js b/lib/services/mempool/encoding.js index ad327da2..1f671b11 100644 --- a/lib/services/mempool/encoding.js +++ b/lib/services/mempool/encoding.js @@ -1,6 +1,6 @@ 'use strict'; -var tx = require('bcoin').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 c3baa8fb..86b4a645 100644 --- a/lib/services/p2p/bcoin.js +++ b/lib/services/p2p/bcoin.js @@ -2,7 +2,7 @@ var index = require('../../'); var log = index.log; -var bcoin = require('bcoin'); +var bcoin = require('fcoin'); var Bcoin = function(options) { this._config = this._getConfig(options); @@ -12,11 +12,11 @@ Bcoin.prototype.start = function(callback) { var self = this; self._bcoin = bcoin.fullnode(self._config); - log.info('Starting Bcoin full node...'); + log.info('Starting Fcoin full node...'); self._bcoin.open().then(function() { self._bcoin.connect().then(function() { - log.info('Waiting for Bcoin to sync'); + log.info('Waiting for Fcoin to sync'); self._bcoin.startSync(); // this will instruct the p2p service to start trying to connect to bcoin right away callback(); diff --git a/lib/services/p2p/index.js b/lib/services/p2p/index.js index 7d5c35c4..64aa164a 100644 --- a/lib/services/p2p/index.js +++ b/lib/services/p2p/index.js @@ -8,7 +8,7 @@ var log = index.log; var BaseService = require('../../service'); var assert = require('assert'); var Bcoin = require('./bcoin'); -var BcoinTx = require('bcoin').tx; +var BcoinTx = require('fcoin').tx; var Networks = require('flocore-lib').Networks; var LRU = require('lru-cache'); diff --git a/lib/services/transaction/encoding.js b/lib/services/transaction/encoding.js index add531e8..466b88b6 100644 --- a/lib/services/transaction/encoding.js +++ b/lib/services/transaction/encoding.js @@ -1,6 +1,6 @@ 'use strict'; -var Tx = require('bcoin').tx; +var Tx = require('fcoin').tx; function Encoding(servicePrefix) { this.servicePrefix = servicePrefix; diff --git a/package.json b/package.json index 0589c752..20e1b74e 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "node": ">=8.0.0" }, "author": "BitPay ", - "version": "5.0.0-beta.49", + "version": "5.0.0-beta.50", "main": "./index.js", "repository": "git://github.com/bitpay/flocore-node.git", "homepage": "https://github.com/bitpay/flocore-node", @@ -29,6 +29,7 @@ ], "dependencies": { "async": "^2.5.0", + "fcoin": "1.0.0-beta.15", "florincoind-rpc": "0.7.1", "flocore-lib": "0.15.0", "flocore-p2p": "5.0.0-beta.2",