bestBlockHeight set by node now. Less cb Hell.

server/lib/api/transaction.js

@@ -11,13 +11,7 @@ module.exports = function transactionAPI(router) {
   // Txs by txid
   router.get('/tx/:txid', (req, res) => {
     // Get max block height for calculating confirmations
-    db.blocks.getBestHeight(
+    const height = db.blocks.bestHeight();
-      (err, blockHeight) => {
-        if (err) {
-          logger.log('err', err);
-          return res.status(404).send();
-        }
-        const height = blockHeight;
     // Bcoin transaction data
     return request(`${API_URL}/tx/${req.params.txid}`,
       { timeout: TTL },
@@ -66,7 +60,6 @@ module.exports = function transactionAPI(router) {
         });
       });
   });
-  });
 
   // /txs is overloaded. Next ver separate concerns
   // query by block
@@ -78,13 +71,8 @@ module.exports = function transactionAPI(router) {
     const rangeEnd   = rangeStart + MAX_TXS;
     // get txs for blockhash, start with best height to calc confirmations
     if (req.query.block) {
-      db.blocks.getBestHeight(
+
-        (err, blockHeight) => {
+      const height = db.blocks.bestHeight();
-          if (err) {
-            logger.log('err', err);
-            return res.status(404).send();
-          }
-          const height = blockHeight;
       // Get Bcoin data
       return request(`${API_URL}/block/${req.query.block}`,
         { timeout: TTL },
@@ -133,17 +121,9 @@ module.exports = function transactionAPI(router) {
             })),
           });
         });
-        });
     } else if (req.query.address) {
       // Get txs by address, start with best height to calc confirmations
-      db.blocks.getBestHeight(
+      const height = db.blocks.bestHeight();
-        (err, blockHeight) => {
-          if (err) {
-            logger.log('err', err);
-            return res.status(404).send();
-          }
-
-          const height = blockHeight;
       const addr = req.query.address || '';
 
       logger.log('debug',
@@ -193,11 +173,9 @@ module.exports = function transactionAPI(router) {
             })),
           });
         });
-        });
+    }
-    } else {
     // Get last n txs
     return res.status(404).send({ error: 'Block hash or address expected' });
-    }
   });
 
   router.get('/rawtx/:txid', (req, res) => {

server/lib/db/blocks.js

@@ -4,6 +4,8 @@ const config = require('../../config');
 
 const MAX_BLOCKS = config.api.max_blocks; // ~ 12 hours
 
+let bestBlockHeight = 0;
+
 function getBlocks(params, options, limit, cb) {
   // Do not return mongo ids
   const defaultOptions = { _id: 0 };
@@ -54,20 +56,31 @@ function getBlock(params, options, limit, cb) {
     return cb(null, blocks[0]);
   });
 }
-// Highest known height
+// Highest known height in mongo
-function getBestHeight(cb) {
+function getBestHeight() {
   getBlock({}, {}, 1, (err, block) => {
     if (err) {
       logger.log('error',
-        `getBlock: ${err.err}`);
+        `getBestHeight: ${err.err}`);
-      return cb(err, null);
+      return;
     }
-    return cb(null, block.height);
+    bestBlockHeight = block.height;
   });
 }
+// 1e9 limit = ~2M years from now
+// Mostly for sync to set height
+function bestHeight(height) {
+  if (Number.isInteger(height) &&
+    height > 0 &&
+    height < 1 * 1e9) {
+    bestBlockHeight = height;
+    return bestBlockHeight;
+  }
+  return bestBlockHeight;
+}
 
 module.exports = {
   getBlock,
   getBlocks,
-  getBestHeight,
+  bestHeight,
 };

server/lib/db/transactions.js

@@ -2,6 +2,9 @@ const Transactions = require('../../models/transaction.js');
 const logger       = require('../logger');
 const config       = require('../../config');
 
+// For now, blocks handles these calls.
+// These will be replaced with more advanced mongo
+
 const MAX_TXS = config.api.max_txs;
 
 function getTransactions(params, options, limit, cb) {
@@ -26,7 +29,6 @@ function getTransactions(params, options, limit, cb) {
     params,
     defaultOptions,
     (err, txs) => {
-      console.log(txs)
       if (err) {
         logger.log('error',
           `getTransactions: ${err}`);

server/lib/node/index.js

@@ -3,6 +3,7 @@ const logger      = require('../../lib/logger');
 const BlockParser = require('../parser').Block;
 const config      = require('../../config');
 const socket      = require('../../lib/api/socket');
+const db          = require('../../lib/db');
 
 const node = new FullNode(config.bcoin);
 
@@ -18,6 +19,7 @@ function start() {
   node.chain.on('connect', (entry, block) => {
     BlockParser.parse(entry, block);
     socket.processBlock(entry, block);
+    db.blocks.bestHeight(entry.height);
   });
 
   node.on('error', (err) => {