fix VerifiedBlockchain._getVerifiedTx

fanatid · Nov 24, 2014 · 5dc7146 · 5dc7146
1 parent 1e8ddaa
commit 5dc7146
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -19,7 +19,7 @@
     "browser-request": "^0.3.2",
     "bs58": "^2.0.0",
     "buffer-equal": "0.0.1",
-    "coloredcoinjs-lib": "git://github.com/chromaway/coloredcoinjs-lib.git#v0.0.10",
+    "coloredcoinjs-lib": "git://github.com/chromaway/coloredcoinjs-lib.git#v0.0.11",
     "delayed": "^1.0.1",
     "errno": "^0.1.1",
     "lodash": "^2.4.1",

diff --git a/src/blockchain/VerifiedBlockchain.js b/src/blockchain/VerifiedBlockchain.js
@@ -280,12 +280,12 @@ VerifiedBlockchain.prototype._getVerifiedTx = function(txId) {
 
   var self = this
 
-  var tx = self._txCache.get(txId)
-  if (!_.isUndefined(tx))
-    return Q(tx)
+  var cachedResult = self._txCache.get(txId)
+  if (!_.isUndefined(cachedResult))
+    return Q(cachedResult.tx)
 
   if (_.isUndefined(self._getVerifiedTxRunning[txId])) {
-    var height, merkleRoot
+    var tx, height, merkleRoot
 
     var promise = self._getTx(txId).then(function(result) {
       tx = result

diff --git a/src/tx/OperationalTx.js b/src/tx/OperationalTx.js
@@ -96,7 +96,7 @@ OperationalTx.prototype.getDustThreshold = function() {
 
 /*
  * @param {ColorValue}
- * @param {?Object} [feeEstimator=null]
+ * @param {?Object} feeEstimator
  * @param {OperationalTx~selectCoins} cb
  */
 OperationalTx.prototype.selectCoins = function(colorValue, feeEstimator, cb) {