change network.getTx

.travis.yml

@@ -4,7 +4,4 @@ before_install:
 node_js:
   - "0.11"
   - "0.10"
-env:
-  - TEST_SUITE=jshint jscs compile
-  - TEST_SUITE=coveralls
-script: "grunt $TEST_SUITE"
+script: "grunt jshint jscs compile coveralls"

src/blockchain/Blockchain.js

@@ -61,6 +61,7 @@ Blockchain.prototype.getBlockTime = function () {
 /**
  * @abstract
  * @param {string} txId
+ * @param {WalletState} [walletState]
  * @param {Blockchain~getTx} cb
  */
 Blockchain.prototype.getTx = function () {

src/blockchain/NaiveBlockchain.js

@@ -2,7 +2,6 @@ var inherits = require('util').inherits
 
 var _ = require('lodash')
 var LRU = require('lru-cache')
-var Q = require('q')
 
 var verify = require('../verify')
 var Blockchain = require('./Blockchain')
@@ -84,8 +83,14 @@ NaiveBlockchain.prototype.getBlockTime = function (height, cb) {
 /**
  * {@link Blockchain~getTx}
  */
-NaiveBlockchain.prototype.getTx = function (txId, cb) {
+NaiveBlockchain.prototype.getTx = function (txId, walletState, cb) {
+  if (_.isFunction(walletState) && _.isUndefined(cb)) {
+    cb = walletState
+    walletState = undefined
+  }
+
   verify.txId(txId)
+  if (!_.isUndefined(walletState)) { verify.WalletState(walletState) }
   verify.function(cb)
 
   var self = this
@@ -96,7 +101,7 @@ NaiveBlockchain.prototype.getTx = function (txId, cb) {
   }
 
   if (_.isUndefined(self._getTxRunning[txId])) {
-    self._getTxRunning[txId] = self._network.getTx(txId).then(function (tx) {
+    self._getTxRunning[txId] = self._network.getTx(txId, walletState).then(function (tx) {
       self._txCache.set(txId, tx)
       return tx
 

src/blockchain/VerifiedBlockchain.js

@@ -118,10 +118,16 @@ VerifiedBlockchain.prototype.getBlockTime = function (height, cb) {
 /**
  * {@link Blockchain~getTx}
  */
-VerifiedBlockchain.prototype.getTx = function (txId, cb) {
+VerifiedBlockchain.prototype.getTx = function (txId, walletState, cb) {
+  if (_.isFunction(walletState) && _.isUndefined(cb)) {
+    cb = walletState
+    walletState = undefined
+  }
+
+  if (!_.isUndefined(walletState)) { verify.WalletState(walletState) }
   verify.function(cb)
 
-  this._getVerifiedTx(txId)
+  this._getVerifiedTx(txId, walletState)
     .done(function (tx) { cb(null, tx) }, function (error) { cb(error) })
 }
 
@@ -257,17 +263,19 @@ VerifiedBlockchain.prototype._getVerifiedHeader = function (height) {
 
 /**
  * @param {string} txId
+ * @param {WalletState} [walletState]
  * @return {Q.Promise<Transaction>}
  */
-VerifiedBlockchain.prototype._getTx = function (txId) {
-  return this._network.getTx(txId)
+VerifiedBlockchain.prototype._getTx = function (txId, walletState) {
+  return this._network.getTx(txId, walletState)
 }
 
 /**
  * @param {string} txId
+ * @param {WalletState} [walletState]
  * @return {Q.Promise<Transaction>}
  */
-VerifiedBlockchain.prototype._getVerifiedTx = function (txId) {
+VerifiedBlockchain.prototype._getVerifiedTx = function (txId, walletState) {
   verify.txId(txId)
 
   var self = this
@@ -282,7 +290,7 @@ VerifiedBlockchain.prototype._getVerifiedTx = function (txId) {
     var height
     var merkleRoot
 
-    self._getVerifiedTxRunning[txId] = self._getTx(txId).then(function (result) {
+    self._getVerifiedTxRunning[txId] = self._getTx(txId, walletState).then(function (result) {
       tx = result
       return self._network.getMerkle(txId).catch(function (error) {
         if (error.message === 'BlockNotFound') {

src/coin/CoinManager.js

@@ -25,19 +25,19 @@ var verify = require('../verify')
  * @class CoinManager
  * @extends events.EventEmitter
  * @param {Wallet} wallet
- * @param {TxManager} txManager
+ * @param {WalletState} walletState
  * @param {Object} rawStorage
  */
-function CoinManager(wallet, txManager, rawStorage) {
+function CoinManager(wallet, walletState, rawStorage) {
   verify.Wallet(wallet)
-  verify.TxManager(txManager)
+  verify.WalletState(walletState)
   verify.object(rawStorage)
   rawStorage = _.defaults(rawStorage, {'coins': [], 'spend': {}})
 
   events.EventEmitter.call(this)
 
   this._wallet = wallet
-  this._txManager = txManager
+  this._walletState = walletState
   this._coins = rawStorage.coins
   this._spend = rawStorage.spend
 }
@@ -49,7 +49,7 @@ inherits(CoinManager, events.EventEmitter)
  * @return {Coin}
  */
 CoinManager.prototype._record2Coin = function (record) {
-  var txData = this._txManager.getTxData(record.txId)
+  var txData = this._walletState.getTxManager().getTxData(record.txId)
   if (txData === null) {
     // @todo Throw custom error
     throw new Error('TxNotFound: ' + record.txId)
@@ -219,7 +219,7 @@ CoinManager.prototype.isCoinSpent = function (coin) {
 CoinManager.prototype.isCoinValid = function (coin) {
   verify.Coin(coin)
 
-  var txData = this._txManager.getTxData(coin.txId)
+  var txData = this._walletState.getTxManager().getTxData(coin.txId)
   return txData !== null && txStatus.isValid(txData.status)
 }
 
@@ -230,7 +230,7 @@ CoinManager.prototype.isCoinValid = function (coin) {
 CoinManager.prototype.isCoinAvailable = function (coin) {
   verify.Coin(coin)
 
-  var txData = this._txManager.getTxData(coin.txId)
+  var txData = this._walletState.getTxManager().getTxData(coin.txId)
   return txData !== null && txStatus.isAvailable(txData.status)
 }
 
@@ -302,14 +302,16 @@ CoinManager.prototype.getCoinMainColorValue = function (coin, cb) {
  * @return {Q.Promise<ColorValue[]>}
  */
 CoinManager.prototype.getTxMainColorValues = function (tx) {
-  var colorDefinitions = this._wallet.getColorDefinitionManager().getAllColorDefinitions()
-  var colorData = this._wallet.getColorData()
-  var getTxColorValues = Q.nbind(colorData.getTxColorValues, colorData)
-  var blockchain = this._wallet.getBlockchain()
-  var getTxFn = blockchain.getTx.bind(blockchain)
+  var self = this
 
+  var colorDefinitions = self._wallet.getColorDefinitionManager().getAllColorDefinitions()
   return Q.all(colorDefinitions.map(function (colorDefinition) {
-    return getTxColorValues(tx, colorDefinition, getTxFn)
+    var blockchain = self._wallet.getBlockchain()
+    function getTxFn(txId, cb) {
+      blockchain.getTx(txId, self._walletState, cb)
+    }
+
+    return Q.ninvoke(self._wallet.getColorData(), 'getTxColorValues', tx, colorDefinition, getTxFn)
 
   })).then(function (colorValuess) {
     var nullColorValues = Array.apply(null, Array(tx.outs.length)).map(function () { return null })

src/history/HistoryManager.js

@@ -16,10 +16,10 @@ var historyEntryType = require('../const').historyEntryType
 
 /**
  * @param {{txId1: string, txIdN:string}[]} entries
- * @param {function} getTxFn
+ * @param {TxManager} txManager
  * @return {{txId1: string, txIdN:string}[]}
  */
-function toposort(entries, getTxFn) {
+function toposort(entries, txManager) {
   var entriesTxIds = _.zipObject(entries.map(function (entry) { return [entry.txId, entry] }))
   var result = []
   var resultTxIds = {}
@@ -29,7 +29,7 @@ function toposort(entries, getTxFn) {
       return
     }
 
-    getTxFn(entry.txId).ins.forEach(function (input) {
+    txManager.getTx(entry.txId).ins.forEach(function (input) {
       var inputId = Array.prototype.reverse.call(new Buffer(input.hash)).toString('hex')
       if (_.isUndefined(entriesTxIds[inputId])) {
         return
@@ -60,22 +60,19 @@ function toposort(entries, getTxFn) {
  * @class HistoryManager
  * @extends events.EventEmitter
  * @param {Wallet} wallet
- * @param {TxManager} txManager
- * @param {CoinManager} coinManager
+ * @param {WalletState} walletState
  * @param {Object} rawStorage
  */
-function HistoryManager(wallet, txManager, coinManager, rawStorage) {
+function HistoryManager(wallet, walletState, rawStorage) {
   verify.Wallet(wallet)
-  verify.TxManager(txManager)
-  verify.CoinManager(coinManager)
+  verify.WalletState(walletState)
   verify.object(rawStorage)
 
   var self = this
   events.EventEmitter.call(self)
 
   self._wallet = wallet
-  self._txManager = txManager
-  self._coinManager = coinManager
+  self._walletState = walletState
   self._historyRecords = rawStorage
 }
 
@@ -87,16 +84,15 @@ HistoryManager.prototype._resortHistoryRecords = function () {
   var self = this
 
   var orderedRecords = _.sortBy(self._historyRecords, function (record) {
-    var txData = self._txManager.getTxData(record.txId)
+    var txData = self._walletState.getTxManager().getTxData(record.txId)
     if (txData.height === 0) {
       return txData.timestamp
     }
 
     return txData.height + txData.timestamp / 10000000000
   })
 
-  var getTxFn = self._txManager.getTx.bind(self._txManager)
-  toposort(orderedRecords, getTxFn).forEach(function (record, index) {
+  toposort(orderedRecords, self._walletState.getTxManager()).forEach(function (record, index) {
     self._historyRecords[index] = record
   })
 }
@@ -133,7 +129,7 @@ HistoryManager.prototype.addTx = function (tx) {
 
       myInsCount += 1
 
-      var coin = new Coin(self._coinManager, {
+      var coin = new Coin(self._walletState.getCoinManager(), {
         txId: input.prevTx.getId(),
         outIndex: input.index,
         value: input.prevTx.outs[input.index].value,
@@ -154,7 +150,7 @@ HistoryManager.prototype.addTx = function (tx) {
     }))
 
   }).then(function () {
-    return self._coinManager.getTxMainColorValues(tx).then(function (txColorValues) {
+    return self._walletState.getCoinManager().getTxMainColorValues(tx).then(function (txColorValues) {
       txColorValues.forEach(function (colorValue, index) {
         var colorTarget = new cclib.ColorTarget(tx.outs[index].script.toHex(), colorValue)
 
@@ -243,7 +239,7 @@ HistoryManager.prototype.revertTx = function (tx) {
 HistoryManager.prototype.getEntries = function (assetdef) {
   var assetDefinitionManager = this._wallet.getAssetDefinitionManager()
   var bitcoinNetwork = this._wallet.getBitcoinNetwork()
-  var txManager = this._txManager
+  var txManager = this._walletState.getTxManager()
 
   var assetId = null
   if (!_.isUndefined(assetdef)) {

src/network/Chain.js

@@ -25,8 +25,8 @@ var Network = require('./Network')
  * @param {number} [opts.refreshInterval=30*1000]
  */
 function Chain(wallet, opts) {
-// @todo Change to Promises
-throw new Error('Not supported right now')
+  // @todo Change to Promises
+  throw new Error('Not supported right now')
 
   verify.Wallet(wallet)
   opts = _.extend({

src/network/Electrum.js

@@ -171,10 +171,11 @@ Electrum.prototype.getChunk = function (index) {
 /**
  * {@link Network~getTx}
  */
-Electrum.prototype.getTx = function (txId) {
+Electrum.prototype.getTx = function (txId, walletState) {
   verify.txId(txId)
+  if (!_.isUndefined(walletState)) { verify.WalletState(walletState) }
 
-  var tx = this._wallet.getStateManager().getTx(txId)
+  var tx = this._wallet.getStateManager().getTx(txId, walletState)
   if (tx !== null) {
     return Q(tx)
   }
@@ -193,11 +194,6 @@ Electrum.prototype.getTx = function (txId) {
  * {@link Network~getMerkle}
  */
 Electrum.prototype.getMerkle = function (txId, height) {
-  if (_.isFunction(height) && _.isUndefined(cb)) {
-    cb = height
-    height = undefined
-  }
-
   verify.txId(txId)
   if (!_.isUndefined(height)) { verify.number(height) }
 

src/tx/TxManager.js

@@ -48,10 +48,12 @@ function getCurrentTimestamp() {
  * @extends events.EventEmitter
  * @mixes SyncMixin
  * @param {Wallet} wallet
+ * @param {WalletState} walletState
  * @param {Object} rawStorage
  */
-function TxManager(wallet, rawStorage) {
+function TxManager(wallet, walletState, rawStorage) {
   verify.Wallet(wallet)
+  verify.WalletState(walletState)
   verify.object(rawStorage)
 
   events.EventEmitter.call(this)

src/verify.js

@@ -57,7 +57,8 @@ var functions = {
   Blockchain: createInstanceCheck(function () { return require('./blockchain/Blockchain') }),
   NaiveBlockchain: createInstanceCheck(function () { return require('./blockchain/NaiveBlockchain') }),
   VerifiedBlockchain: createInstanceCheck(function () { return require('./blockchain/VerifiedBlockchain') }),
-  VerifiedBlockchainStorage: createInstanceCheck(function () { return require('./blockchain/VerifiedBlockchainStorage') }),
+  VerifiedBlockchainStorage: createInstanceCheck(
+    function () { return require('./blockchain/VerifiedBlockchainStorage') }),
 
   rawCoin: isRawCoin,
   Coin: createInstanceCheck(function () { return require('./coin/Coin') }),

src/wallet/WalletState.js

@@ -27,9 +27,9 @@ function WalletState(wallet) {
     this.store.set(this._stateDBKey + '_version', 1)
   }
 
-  this._txManager = new TxManager(wallet, this._state.tx)
-  this._coinManager = new CoinManager(wallet, this._txManager, this._state.coin)
-  this._historyManager = new HistoryManager(wallet, this._txManager, this._coinManager, this._state.history)
+  this._txManager = new TxManager(wallet, this, this._state.tx)
+  this._coinManager = new CoinManager(wallet, this, this._state.coin)
+  this._historyManager = new HistoryManager(wallet, this, this._state.history)
 }
 
 inherits(WalletState, SyncStorage)

src/wallet/WalletStateManager.js

@@ -307,10 +307,14 @@ WalletStateManager.prototype.sendTx = function (tx) {
 
 /**
  * @param {string} txId
+ * @param {WalletState} [walletState=currentWalletState]
  * @return {?Transaction}
  */
-WalletStateManager.prototype.getTx = function (txId) {
-  return this._currentState.getTxManager().getTx(txId)
+WalletStateManager.prototype.getTx = function (txId, walletState) {
+  walletState = _.isUndefined(walletState) ? this._currentState : walletState
+  verify.WalletState(walletState)
+
+  return walletState.getTxManager().getTx(txId)
 }
 
 /**

test/network.implementation.js

@@ -26,7 +26,7 @@ function networkImplementationTest(opts) {
         spendUnconfirmedCoins: true
       })
       network = wallet.network
-      network.on('error', function(error) { throw error })
+      network.on('error', function (error) { throw error })
       network.once('connect', done)
     })