diff --git a/api/config/default.yml b/api/config/default.yml index 7d5332ac..35e47ea2 100644 --- a/api/config/default.yml +++ b/api/config/default.yml @@ -2,15 +2,15 @@ BitcoreHTTP: port: 8080 logging: true BitcoreNode: - LevelUp: ./testnet-db - network: testnet + LevelUp: ./db + network: livenet NetworkMonitor: host: localhost - port: 18333 + port: 8333 Reporter: none # none, simple, matrix RPC: user: user pass: password protocol: http host: 127.0.0.1 - port: 18332 + port: 8332 diff --git a/api/config/livenet.yml b/api/config/livenet.yml index 1ba65a51..35e47ea2 100644 --- a/api/config/livenet.yml +++ b/api/config/livenet.yml @@ -2,7 +2,15 @@ BitcoreHTTP: port: 8080 logging: true BitcoreNode: + LevelUp: ./db + network: livenet NetworkMonitor: - network: livenet host: localhost port: 8333 + Reporter: none # none, simple, matrix + RPC: + user: user + pass: password + protocol: http + host: 127.0.0.1 + port: 8332 diff --git a/api/config/testnet.yml b/api/config/testnet.yml index 1ba65a51..7d5332ac 100644 --- a/api/config/testnet.yml +++ b/api/config/testnet.yml @@ -2,7 +2,15 @@ BitcoreHTTP: port: 8080 logging: true BitcoreNode: + LevelUp: ./testnet-db + network: testnet NetworkMonitor: - network: livenet host: localhost - port: 8333 + port: 18333 + Reporter: none # none, simple, matrix + RPC: + user: user + pass: password + protocol: http + host: 127.0.0.1 + port: 18332 diff --git a/api/index.js b/api/index.js index d0a21153..e6759cc5 100755 --- a/api/index.js +++ b/api/index.js @@ -1,9 +1,13 @@ 'use strict'; var BitcoreHTTP = require('./lib/http'); +var bitcore = require('bitcore'); if (require.main === module) { var config = require('config'); + var network = config.get('BitcoreHTTP.BitcoreNode').network; + console.log('Starting bitcore-node-http', network, 'network'); + bitcore.Networks.defaultNetwork = bitcore.Networks.get(network); var http = BitcoreHTTP.create(config.get('BitcoreHTTP')); http.start(); } diff --git a/api/test/v1/node.js b/api/test/v1/node.js index ff45b99c..16ebcad6 100644 --- a/api/test/v1/node.js +++ b/api/test/v1/node.js @@ -19,7 +19,8 @@ describe('BitcoreHTTP v1 node routes', function() { nodeMock.status = { sync: 0.75, peerCount: 8, - version: 'test' + version: 'test', + network: 'test', }; nodeMock.getStatus = function() { return Promise.resolve(nodeMock.status); diff --git a/lib/node.js b/lib/node.js index 14ae583d..b0965207 100644 --- a/lib/node.js +++ b/lib/node.js @@ -167,6 +167,7 @@ BitcoreNode.prototype.getStatus = function() { sync: this.getSyncProgress(), peerCount: this.networkMonitor.getConnectedPeers(), version: pjson.version, + network: bitcore.Networks.defaultNetwork.name, }); };