fix VerifiedBlockchain.getBlockTime

chromaway · Dec 7, 2014 · ce7acac · ce7acac
1 parent fbfd971
commit ce7acac
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cc-wallet-core",
-  "version": "0.2.8",
+  "version": "0.2.9",
   "description": "",
   "main": "./src/index.js",
   "keywords": [],

diff --git a/src/blockchain/VerifiedBlockchain.js b/src/blockchain/VerifiedBlockchain.js
@@ -133,8 +133,10 @@ VerifiedBlockchain.prototype.getCurrentHeight = function() {
 VerifiedBlockchain.prototype.getBlockTime = function(height, cb) {
   verify.function(cb)
 
-  this._getVerifiedHeader(height)
-    .done(function(header) { cb(null, header.timestamp) }, function(error) { cb(error) })
+  this._getVerifiedHeader(height).then(function (header) {
+    return bitcoin.buffer2header(header).timestamp
+
+  }).done(function (ts) { cb(null, ts) }, function (error) { cb(error) })
 }
 
 /**
@@ -179,9 +181,8 @@ VerifiedBlockchain.prototype.clear = function() {
  * @return {Q.Promise}
  */
 VerifiedBlockchain.prototype._waitHeight = function(height) {
-  var self = this
-
   var deferreds = this._waitHeightDeferreds[height] || []
+
   deferreds.push(Q.defer())
   this._waitHeightDeferreds[height] = deferreds
 

diff --git a/src/history/HistoryManager.js b/src/history/HistoryManager.js
@@ -259,6 +259,9 @@ HistoryManager.prototype._addTx = function (tx) {
     self._resortHistoryEntries()
     self.emit('update')
 
+  }).catch(function (error) {
+    self.emit('error', error)
+
   }).finally(function () {
     self._syncExit()