From 8c3a9e95cceb07b57a1df16d32e5972792c4ed1d Mon Sep 17 00:00:00 2001 From: eordano Date: Wed, 25 Mar 2015 12:20:22 -0300 Subject: [PATCH] Update bitcore-p2p to latest minor --- config/default.yml | 4 ++-- index.js | 5 ++--- lib/networkmonitor.js | 6 +++++- package.json | 5 ++--- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/config/default.yml b/config/default.yml index 9b5e636c..c2bebc07 100644 --- a/config/default.yml +++ b/config/default.yml @@ -1,5 +1,5 @@ BitcoreNode: - network: testnet + network: livenet NetworkMonitor: host: localhost port: 8333 @@ -10,4 +10,4 @@ RPC: pass: password protocol: http host: 127.0.0.1 - port: 8322 + port: 8332 diff --git a/index.js b/index.js index c7958dd4..9b3e729b 100644 --- a/index.js +++ b/index.js @@ -10,7 +10,8 @@ BitcoreNode.errors = require('./lib/errors'); if (require.main === module) { var config = require('config'); - bitcore.Networks.defaultNetwork = bitcore.Networks.get(config.network); + bitcore.Networks.defaultNetwork = bitcore.Networks.get(config.get('BitcoreNode').network); + var node = BitcoreNode.create(config.get('BitcoreNode')); node.start(); node.on('error', function(err) { @@ -30,6 +31,4 @@ if (require.main === module) { node.on('Transaction', reporter); } - - module.exports = BitcoreNode; diff --git a/lib/networkmonitor.js b/lib/networkmonitor.js index 97dad3d7..210c6452 100644 --- a/lib/networkmonitor.js +++ b/lib/networkmonitor.js @@ -24,7 +24,11 @@ NetworkMonitor.create = function(eventBus, opts) { opts = opts || {}; var host = opts.host || 'localhost'; var port = opts.port || Networks.defaultNetwork.port; - var peer = new Peer(host, port, Networks.defaultNetwork); + var peer = new Peer({ + host: host, + port: port, + network: Networks.defaultNetwork + }); return new NetworkMonitor(eventBus, peer); }; diff --git a/package.json b/package.json index cb4592e0..bf3093e7 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "async": "0.9.0", "bitcoind-rpc": "^0.2.1", "bitcore": "bitpay/bitcore", - "bitcore-p2p": "bitpay/bitcore-p2p", + "bitcore-p2p": "^0.11.0", "bluebird": "^2.9.12", "body-parser": "^1.12.0", "bufferput": "bitpay/node-bufferput", @@ -59,8 +59,7 @@ "express": "4.11.1", "glob": "*", "js-yaml": "^3.2.7", - "level-lock": "^1.0.1", - "leveldown": "^1.0.0", + "leveldown": "^0.10.4", "levelup": "^0.19.0", "moment": "~2.5.0", "morgan": "^1.5.1",