RanchiMall/flosight-api
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'next-merge' of https://github.com/tenthirtyone/insight into next

Browse Source
This commit is contained in:
Darren Nelsen 2017-08-22 14:11:10 -04:00
commit b9de71862d
3 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/index.js
View File

@ -1,7 +1,7 @@
const Bcoin = require('./lib/node'); const Bcoin = require('./lib/node');
const config = require('./config'); const config = require('./config');
const logger = require('./lib/logger'); const logger = require('./lib/logger');
const Api = require('./lib/api'); const Api = require('./lib/api').server;
const db = require('./lib/db'); const db = require('./lib/db');
logger.log('debug', logger.log('debug',

7
server/lib/api/index.js
View File

@ -14,6 +14,8 @@ app.use(bodyParser.json());
// Serve insight ui front end from root dir public folder // Serve insight ui front end from root dir public folder
app.use(express.static('../app/www', { maxage: '1w' })); app.use(express.static('../app/www', { maxage: '1w' }));
// Legacy UI - useful for 1:1 compares
// app.use(express.static('./public', { maxage: '1w' }));
app.set('json spaces', config.api.json_spaces); app.set('json spaces', config.api.json_spaces);
@ -37,4 +39,7 @@ app.use((req, res) => res.status(404).send({
// Socket server // Socket server
const server = require('http').Server(app); const server = require('http').Server(app);
module.exports = server; module.exports = {
server,
api,
};

6
server/lib/api/transaction.js
View File

@ -59,7 +59,6 @@ module.exports = function transactionAPI(router) {
// /txs is overloaded. Next ver separate concerns // /txs is overloaded. Next ver separate concerns
// query by block // query by block
// query by address // query by address
// last n txs - haha jk YOU 404
router.get('/txs', (req, res) => { router.get('/txs', (req, res) => {
const pageNum = parseInt(req.query.pageNum, 10) || 0; const pageNum = parseInt(req.query.pageNum, 10) || 0;
const rangeStart = pageNum * MAX_TXS; const rangeStart = pageNum * MAX_TXS;
@ -174,8 +173,7 @@ module.exports = function transactionAPI(router) {
`/txs getTopTransactions ${err}`); `/txs getTopTransactions ${err}`);
return res.status(404).send(err); return res.status(404).send(err);
} }
return res.json({ return res.send(txs.map(tx => ({
txs: txs.map(tx => ({
txid: tx.hash, txid: tx.hash,
fees: tx.fee / 1e8, fees: tx.fee / 1e8,
size: tx.size, size: tx.size,
@ -197,7 +195,7 @@ module.exports = function transactionAPI(router) {
})), })),
isCoinBase: tx.inputs[0].prevout.hash === '0000000000000000000000000000000000000000000000000000000000000000', isCoinBase: tx.inputs[0].prevout.hash === '0000000000000000000000000000000000000000000000000000000000000000',
})), })),
}); );
}); });
} }
}); });