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

getBestHeight added to db api

Browse Source
This commit is contained in:
tenthirtyone 2017-08-16 01:13:30 -04:00
parent 3b8b900405
commit 2f4533e057
5 changed files with 20 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
server/lib/api/address.js
View File

@ -8,7 +8,7 @@ module.exports = function AddressAPI(router) {
router.get('/addr/:addr', (req, res) => { router.get('/addr/:addr', (req, res) => {
const addr = req.params.addr || ''; const addr = req.params.addr || '';
// Get Bcoin data // Get Bcoin data
request(`${API_URL}/tx/address/${addr}`, return request(`${API_URL}/tx/address/${addr}`,
(error, bcoinRes, txs) => { (error, bcoinRes, txs) => {
if (error) { if (error) {
logger.log('error', logger.log('error',
@ -41,17 +41,17 @@ module.exports = function AddressAPI(router) {
// Match Insight API // Match Insight API
return res.json({ return res.json({
addrStr: req.params.addr, addrStr: req.params.addr,
balance: (totalReceived - totalSpent) / 1e8, balance: (totalReceived - totalSpent) / 1e8,
balanceSat: totalReceived - totalSpent, balanceSat: totalReceived - totalSpent,
totalReceived: totalReceived / 1e8, totalReceived: totalReceived / 1e8,
totalReceivedSat: totalReceived, totalReceivedSat: totalReceived,
totalSent: totalSpent / 1e8, totalSent: totalSpent / 1e8,
totalSentSat: totalSpent, totalSentSat: totalSpent,
unconfirmedBalance: 0, unconfirmedBalance: 0,
unconfirmedBalanceSat: 0, unconfirmedBalanceSat: 0,
unconfirmedTxApperances: 0, unconfirmedTxApperances: 0,
txApperances: txs.length, txApperances: txs.length,
}); });
}); });
}); });

1
server/lib/api/currency.js
View File

@ -16,6 +16,7 @@ setInterval(() => {
getRate(); getRate();
}, refreshInterval); }, refreshInterval);
// Make the request to the remote API
function getRate() { function getRate() {
request(config.api.ticker_url, (err, res, body) => { request(config.api.ticker_url, (err, res, body) => {
if (err) { if (err) {

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

@ -7,9 +7,7 @@ const api = express.Router();
const cors = require('./cors'); const cors = require('./cors');
app.use(cors); app.use(cors);
app.use(bodyParser.urlencoded({ extended: false }));
app.use(bodyParser.urlencoded({ extended: false }))
app.use(bodyParser.json()); app.use(bodyParser.json());
// Serve insight ui front end from root dir public folder // Serve insight ui front end from root dir public folder
@ -47,6 +45,7 @@ app.use((req, res) => {
}); });
}); });
// Socket server
const server = require('http').Server(app); const server = require('http').Server(app);
const io = require('socket.io')(server); const io = require('socket.io')(server);

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

@ -10,10 +10,7 @@ module.exports = function transactionAPI(router) {
// Txs by txid // Txs by txid
router.get('/tx/:txid', (req, res) => { router.get('/tx/:txid', (req, res) => {
// Get max block height for calculating confirmations // Get max block height for calculating confirmations
db.blocks.getBlock( db.blocks.getBestHeight(
{},
{ height: 1 },
1,
(err, block) => { (err, block) => {
if (err) { if (err) {
logger.log('err', err); logger.log('err', err);
@ -22,7 +19,7 @@ module.exports = function transactionAPI(router) {
const height = block.height; const height = block.height;
// Bcoin transaction data // Bcoin transaction data
request(`${API_URL}/tx/${req.params.txid}`, (error, localRes, tx) => { return request(`${API_URL}/tx/${req.params.txid}`, (error, localRes, tx) => {
if (error) { if (error) {
logger.log('error', logger.log('error',
`${error}`); `${error}`);
@ -73,10 +70,7 @@ module.exports = function transactionAPI(router) {
const rangeEnd = rangeStart + MAX_TXS; const rangeEnd = rangeStart + MAX_TXS;
// get txs for blockhash // get txs for blockhash
if (req.query.block) { if (req.query.block) {
db.blocks.getBlock( db.blocks.getBestHeight(
{},
{ height: 1 },
1,
(err, block) => { (err, block) => {
if (err) { if (err) {
logger.log('err', err); logger.log('err', err);
@ -84,7 +78,7 @@ module.exports = function transactionAPI(router) {
} }
const height = block.height; const height = block.height;
// Get Bcoin data // Get Bcoin data
request(`${API_URL}/block/${req.query.block}`, (error, localRes, block) => { return request(`${API_URL}/block/${req.query.block}`, (error, localRes, block) => {
if (error) { if (error) {
logger.log('error', logger.log('error',
`${error}`); `${error}`);
@ -129,9 +123,6 @@ module.exports = function transactionAPI(router) {
} else if (req.query.address) { } else if (req.query.address) {
// Get txs by address // Get txs by address
db.blocks.getBestHeight( db.blocks.getBestHeight(
{},
{ height: 1 },
1,
(err, block) => { (err, block) => {
if (err) { if (err) {
logger.log('err', err); logger.log('err', err);
@ -141,7 +132,7 @@ module.exports = function transactionAPI(router) {
const height = block.height; const height = block.height;
const addr = req.query.address || ''; const addr = req.query.address || '';
request(`${API_URL}/tx/address/${req.query.address}`, (error, localRes, txs) => { return request(`${API_URL}/tx/address/${req.query.address}`, (error, localRes, txs) => {
if (error) { if (error) {
logger.log('error', logger.log('error',
`${error}`); `${error}`);

2
server/lib/db/blocks.js
View File

@ -53,7 +53,7 @@ function getBlock(params, options, limit, cb) {
return cb(null, blocks[0]); return cb(null, blocks[0]);
}); });
} }
// Highest known height
function getBestHeight(cb) { function getBestHeight(cb) {
getBlock({}, {}, 1, (err, block) => { getBlock({}, {}, 1, (err, block) => {
if (err) { if (err) {