general: updated controllers for new api from bitcoind

lib/blocks.js

@@ -37,12 +37,15 @@ BlockController.prototype.block = function(req, res, next, hash) {
       return common.handleErrors(err, res);
     }
 
-    var info = self.node.services.bitcoind.getBlockIndex(hash);
+    self.node.services.bitcoind.getBlockHeader(hash, function(err, info) {
-    info.isMainChain = self.node.services.bitcoind.isMainChain(hash);
+      if (err) {
-
+        return common.handleErrors(err, res);        
+      }
       req.block = self.transformBlock(block, info);
       next();      
     });
+
+  });
 };
 
 BlockController.prototype.transformBlock = function(block, info) {
@@ -52,7 +55,7 @@ BlockController.prototype.transformBlock = function(block, info) {
   });
   return {
     hash: block.hash,
-    confirmations: this.node.services.db.tip.__height - info.height + 1,
+    confirmations: this.node.services.bitcoind.height - info.height + 1,
     size: block.toBuffer().length,
     height: info.height,
     version: blockObj.header.version,
@@ -62,11 +65,11 @@ BlockController.prototype.transformBlock = function(block, info) {
     nonce: blockObj.header.nonce,
     bits: blockObj.header.bits.toString(16),
     difficulty: block.header.getDifficulty(),
-    chainwork: info.chainWork,
+    chainwork: info.chainwork,
     previousblockhash: blockObj.header.prevHash,
-    nextblockhash: this.node.services.bitcoind.getNextBlockHash(block.hash),
+    nextblockhash: info.nextblockhash,
     reward: this.getBlockReward(info.height) / 1e8,
-    isMainChain: info.isMainChain,
+    isMainChain: (info.confirmations !== -1),
     poolInfo: this.getPoolInfo(block)
   };
 };
@@ -81,14 +84,14 @@ BlockController.prototype.show = function(req, res) {
 };
 
 BlockController.prototype.blockIndex = function(req, res, next, height) {
-  var info = this.node.services.bitcoind.getBlockIndex(parseInt(height));
+  this.node.services.bitcoind.getBlockHeader(parseInt(height), function(err, info) {
-  if(!info) {
+    if (err) {
-    return common.handleErrors(null, res);
+      return common.handleErrors(err, res);
     }
-
     res.jsonp({
       blockHash: info.hash
     });
+  });
 };
 
 // List blocks by date
@@ -139,6 +142,7 @@ BlockController.prototype.list = function(req, res) {
           if(err) {
             return next(err);
           }
+
           var br = new bitcore.encoding.BufferReader(blockBuffer);
           // take a shortcut to get number of transactions and the blocksize.
           // Also reads the coinbase transaction and only that.
@@ -151,9 +155,10 @@ BlockController.prototype.list = function(req, res) {
           var txlength = br.readVarintNum();
           info.transactions = [bitcore.Transaction().fromBufferReader(br)];
 
-          var index = self.node.services.bitcoind.getBlockIndex(hash);
+          self.node.services.bitcoind.getBlockHeader(hash, function(err, blockHeader) {
+
             var block = {
-              height: index.height,
+              height: blockHeader.height,
               size: blockBuffer.length,
               hash: hash,
               time: header.time,
@@ -167,6 +172,7 @@ BlockController.prototype.list = function(req, res) {
 
             return next(null, block);
           });
+        });
       },
       function(err, blocks) {
         if(err) {

lib/index.js

@@ -51,7 +51,7 @@ var InsightAPI = function(options) {
   this.txController = new TxController(this.node);
 };
 
-InsightAPI.dependencies = ['address', 'web'];
+InsightAPI.dependencies = ['bitcoind', 'web'];
 
 inherits(InsightAPI, BaseService);
 

lib/status.js

@@ -1,78 +1,112 @@
 'use strict';
 
+var common = require('./common');
+
 function StatusController(node) {
   this.node = node;
 }
 
 StatusController.prototype.show = function(req, res) {
-
   var option = req.query.q;
 
   switch(option) {
   case 'getDifficulty':
-      res.jsonp(this.getDifficulty());
+    this.getDifficulty(function(err, result) {
+      if (err) {
+        return common.handleErrors(err, res);
+      }
+      res.jsonp(result);
+    });
     break;
   case 'getLastBlockHash':
     res.jsonp(this.getLastBlockHash());
     break;
   case 'getBestBlockHash':
-      res.jsonp(this.getBestBlockHash());
+    this.getBestBlockHash(function(err, result) {
+      if (err) {
+        return common.handleErrors(err, res);
+      }
+      res.jsonp(result);
+    });
     break;
   case 'getInfo':
   default:
-      res.jsonp(this.getInfo());
+    this.getInfo(function(err, result) {
+      if (err) {
+        return common.handleErrors(err, res);
+      }
+      res.jsonp({
+        info: result
+      });
+    });
   }
 };
 
-StatusController.prototype.getInfo = function() {
+StatusController.prototype.getInfo = function(callback) {
-  var info = this.node.services.bitcoind.getInfo();
+  this.node.services.bitcoind.getInfo(callback);
-  return {
-    info: info
-  };
 };
 
 StatusController.prototype.getLastBlockHash = function() {
-  var hash = this.node.services.db.tip.hash;
+  var hash = this.node.services.bitcoind.tiphash;
   return {
     syncTipHash: hash,
     lastblockhash: hash
   };
 };
 
-StatusController.prototype.getBestBlockHash = function() {
+StatusController.prototype.getBestBlockHash = function(callback) {
-  var hash = this.node.services.bitcoind.getBestBlockHash();
+  this.node.services.bitcoind.getBestBlockHash(function(err, hash) {
-  return {
+    if (err) {
+      return callback(err);
+    }
+    callback(null, {
       bestblockhash: hash
-  };
+    });
+  });
 };
 
-StatusController.prototype.getDifficulty = function() {
+StatusController.prototype.getDifficulty = function(callback) {
-  var info = this.node.services.bitcoind.getInfo();
+  this.node.services.bitcoind.getInfo(function(err, info) {
-  return {
+    if (err) {
+      return callback(err);
+    }
+    callback(null, {
       difficulty: info.difficulty
-  };
+    });
+  });
 };
 
 StatusController.prototype.sync = function(req, res) {
+  var self = this;
   var status = 'syncing';
-  if(this.node.services.bitcoind.isSynced() && this.node.services.db.tip.__height === this.node.services.bitcoind.height) {
+
+  this.node.services.bitcoind.isSynced(function(err, synced) {
+    if (err) {
+      return common.handleErrors(err, res);
+    }
+    if (synced) {
       status = 'finished';
     }
 
-  // Not exactly the total blockchain height,
+    self.node.services.bitcoind.syncPercentage(function(err, percentage) {
-  // but we will reach 100% when our db and bitcoind are both fully synced
+      if (err) {
-  var totalHeight = this.node.services.bitcoind.height / (this.node.services.bitcoind.syncPercentage() / 100);
+        return common.handleErrors(err, res);
-
+      }
       var info = {
         status: status,
-    blockChainHeight: this.node.services.bitcoind.height,
+        blockChainHeight: self.node.services.bitcoind.height,
-    syncPercentage: Math.round(this.node.services.db.tip.__height / totalHeight * 100),
+        syncPercentage: Math.round(percentage),
-    height: this.node.services.db.tip.__height,
+        height: self.node.services.bitcoind.height,
         error: null,
         type: 'bitcore node'
       };
 
       res.jsonp(info);
+
+    });
+
+  });
+
 };
 
 // Hard coded to make insight ui happy, but not applicable

lib/transactions.js

@@ -31,7 +31,7 @@ TxController.prototype.transaction = function(req, res, next, txid) {
       return common.handleErrors(err, res);
     }
 
-    transaction.populateInputs(self.node.services.db, [], function(err) {
+    transaction.populateInputs(self.node.services.bitcoind, [], function(err) {
       if(err) {
         return res.send({
           error: err.toString()
@@ -58,7 +58,7 @@ TxController.prototype.transformTransaction = function(transaction, callback) {
 
   var confirmations = 0;
   if(transaction.__height >= 0) {
-    confirmations = this.node.services.db.tip.__height - transaction.__height + 1;
+    confirmations = this.node.services.bitcoind.height - transaction.__height + 1;
   }
 
   var transformed = {
@@ -179,7 +179,7 @@ TxController.prototype.transformOutput = function(txid, output, index, callback)
     queryMempool: true
   };
 
-  self.node.services.address.getInputForOutput(
+  self.node.services.bitcoind.getInputForOutput(
     txid,
     index,
     options,
@@ -269,7 +269,7 @@ TxController.prototype.list = function(req, res) {
         return common.handleErrors(err, res);
       }
 
-      var blockInfo = self.node.services.bitcoind.getBlockIndex(block.hash);
+      self.node.services.bitcoind.getBlockHeader(block.hash, function(err, blockInfo) {
         var txs = block.transactions;
         var totalTxs = txs.length;
 
@@ -283,7 +283,7 @@ TxController.prototype.list = function(req, res) {
           tx.__height = blockInfo.height;
           tx.__timestamp = block.header.time;
 
-        tx.populateInputs(self.node.services.db, [], function(err) {
+          tx.populateInputs(self.node.services.bitcoind, [], function(err) {
             if(err) {
               return next(err);
             }
@@ -299,6 +299,9 @@ TxController.prototype.list = function(req, res) {
             txs: transformed
           });
         });
+
+      });
+
     });
   } else if(address) {
     var options = {