diff --git a/.eslintrc.json b/.eslintrc.json index 6cd3aad..4fcacf5 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -3,5 +3,10 @@ "env": { "node": true, "es6": true + }, + "rules": { + "no-multi-spaces": { + "exceptions": { "ImportDeclaration": true } + } } } \ No newline at end of file diff --git a/config/config-template.js b/config/config-template.js index 6aba02a..93c6841 100644 --- a/config/config-template.js +++ b/config/config-template.js @@ -1,10 +1,12 @@ const config = { + logging: 'debug', bcoin: { network: 'main', db: 'leveldb', checkpoints: true, workers: true, logLevel: 'info', + 'max-inbound': 100, }, mongodb: { uri: 'mongodb://localhost/bitcore', @@ -12,6 +14,9 @@ const config = { useMongoClient: true, }, }, + api: { + port: 3000, + }, }; module.exports = config; diff --git a/lib/api/address.js b/lib/api/address.js index 5ac517f..3fe3e65 100644 --- a/lib/api/address.js +++ b/lib/api/address.js @@ -1,4 +1,3 @@ - module.exports = function addressAPI(app) { app.get('/addr/:addr', (req, res) => { res.send(req.params.addr); diff --git a/lib/api/block.js b/lib/api/block.js index 531210c..4b9c569 100644 --- a/lib/api/block.js +++ b/lib/api/block.js @@ -1,4 +1,4 @@ -const Block = require('../../models/block.js'); +const Block = require('../../models/block.js'); const logger = require('../logger'); module.exports = function BlockAPI(app) { @@ -10,7 +10,7 @@ module.exports = function BlockAPI(app) { res.status(501).send(); logger.log('err', err); } - res.send(block); + res.json(block[0]); }); }); diff --git a/lib/api/index.js b/lib/api/index.js index ec2a97c..0a0ba3b 100644 --- a/lib/api/index.js +++ b/lib/api/index.js @@ -1,12 +1,15 @@ -const express = require('express'); +const express = require('express'); -const app = express(); +const app = express(); -const AddressAPI = require('./address')(app); -const BlockAPI = require('./block')(app); -const StatusAPI = require('./status')(app); +app.set('json spaces', 2); + +// Pass express to register the routes +const AddressAPI = require('./address')(app); +const BlockAPI = require('./block')(app); +const StatusAPI = require('./status')(app); const TransactionAPI = require('./transaction')(app); -const MessageAPI = require('./message')(app); +const MessageAPI = require('./message')(app); // 404 app.use((req, res) => { diff --git a/lib/logger/index.js b/lib/logger/index.js index 5b1a9f4..7db8f9f 100644 --- a/lib/logger/index.js +++ b/lib/logger/index.js @@ -1,5 +1,5 @@ const winston = require('winston'); -const config = require('../../config'); +const config = require('../../config'); const logfile = new Date().toISOString(); diff --git a/lib/node/block.js b/lib/node/block.js index 16d3c4d..3258b2e 100644 --- a/lib/node/block.js +++ b/lib/node/block.js @@ -1,7 +1,7 @@ const BlockModel = require('../../models/block'); -const TxParser = require('./transaction'); -const util = require('../../lib/util'); -const logger = require('../logger'); +const TxParser = require('./transaction'); +const util = require('../../lib/util'); +const logger = require('../logger'); function parse(entry, block) { const blockHash = util.revHex(block.hash().toString('hex')); diff --git a/lib/node/index.js b/lib/node/index.js index 61c2a0c..0133928 100644 --- a/lib/node/index.js +++ b/lib/node/index.js @@ -1,7 +1,7 @@ -const FullNode = require('bcoin/lib/node/fullnode'); -const logger = require('../../lib/logger'); +const FullNode = require('bcoin/lib/node/fullnode'); +const logger = require('../../lib/logger'); const BlockParser = require('./block'); -const config = require('../../config'); +const config = require('../../config'); const node = new FullNode(config.bcoin); diff --git a/lib/node/transaction.js b/lib/node/transaction.js index 765fe54..96494fc 100644 --- a/lib/node/transaction.js +++ b/lib/node/transaction.js @@ -1,9 +1,9 @@ -const TxModel = require('../../models/transaction').Transaction; -const InputModel = require('../../models/transaction').Input; +const TxModel = require('../../models/transaction').Transaction; +const InputModel = require('../../models/transaction').Input; const OutputModel = require('../../models/transaction').Output; -const config = require('../../config'); -const util = require('../../lib/util'); -const logger = require('../logger'); +const config = require('../../config'); +const util = require('../../lib/util'); +const logger = require('../logger'); function parse(entry, txs) { txs.forEach((tx) => { diff --git a/models/block.js b/models/block.js index 862611b..979b253 100644 --- a/models/block.js +++ b/models/block.js @@ -1,5 +1,5 @@ const mongoose = require('mongoose'); -const Schema = mongoose.Schema; +const Schema = mongoose.Schema; const BlockSchema = new Schema({ hash: String, diff --git a/models/transaction.js b/models/transaction.js index be5fac8..21c0cbe 100644 --- a/models/transaction.js +++ b/models/transaction.js @@ -1,5 +1,5 @@ const mongoose = require('mongoose'); -const Schema = mongoose.Schema; +const Schema = mongoose.Schema; const InputSchema = new Schema({ utxo: String,