add isBlockTimestamp field to TxStorage

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cc-wallet-core",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "",
   "main": "./src/index.js",
   "keywords": [],

src/history/HistoryEntry.js

@@ -9,6 +9,7 @@ var historyEntryType = require('../const').historyEntryType
  * @param {bitcoinjs-lib.Transaction} data.tx
  * @param {number} data.height
  * @param {number} data.timestamp
+ * @param {boolean} data.isBlockTimestamp
  * @param {AssetValue[]} data.values
  * @param {HistoryTarget[]} data.targets
  * @param {number} data.entryType
@@ -18,6 +19,7 @@ function HistoryEntry(data) {
   verify.Transaction(data.tx)
   verify.number(data.height)
   verify.number(data.timestamp)
+  verify.boolean(data.isBlockTimestamp)
   verify.array(data.values)
   data.values.forEach(verify.AssetValue)
   verify.array(data.targets)
@@ -27,6 +29,7 @@ function HistoryEntry(data) {
   this.txId = data.tx.getId()
   this.height = data.height
   this.timestamp = data.timestamp
+  this.isBlockTimestamp = data.isBlockTimestamp
   this.values = data.values
   this.targets = data.targets
   this.entryType = data.entryType
@@ -53,6 +56,13 @@ HistoryEntry.prototype.getTimestamp = function() {
   return this.timestamp
 }
 
+/**
+ * @return {boolean}
+ */
+HistoryEntry.prototype.isBlockTimestamp = function () {
+  return this.isBlockTimestamp
+}
+
 /**
  * @return {AssetValue[]}
  */

src/history/HistoryManager.js

@@ -54,7 +54,8 @@ HistoryManager.prototype._updateEntries = function () {
         return [tx.getId(), {
           tx: tx,
           height: txDb.getTxHeight(txId),
-          timestamp: txDb.getTxTimestamp(txId)
+          timestamp: txDb.getTxTimestamp(txId),
+          isBlockTimestamp: txDb.isBlockTimestamp(txId)
         }]
       })
       .sortBy(function (entry) {
@@ -73,6 +74,7 @@ HistoryManager.prototype._updateEntries = function () {
       .value()
 
     toposort(transactions).forEach(function(tx) {
+      var txId = tx.getId()
       var colorValues = {}
       var myColorTargets = []
 
@@ -98,7 +100,7 @@ HistoryManager.prototype._updateEntries = function () {
       })
 
       var outs = _.filter(tx.outs.map(function (output, index) {
-        return coins[tx.getId()+index]
+        return coins[txId+index]
       }))
       outs.forEach(function(coin) {
         promise = promise.then(function() {
@@ -121,11 +123,11 @@ HistoryManager.prototype._updateEntries = function () {
       var colorTargets = []
       tx.outs.forEach(function (output, index) {
         promise = promise.then(function () {
-          if (!_.isUndefined(coins[tx.getId()+index])) { return }
+          if (!_.isUndefined(coins[txId+index])) { return }
 
           var address = bitcoin.getAddressesFromOutputScript(output.script, self._wallet.getBitcoinNetwork())[0]
           var coin = new Coin(self._wallet.getCoinManager(), {
-            txId: tx.getId(),
+            txId: txId,
             outIndex: index,
             value: output.value,
             script: output.script.toHex(),
@@ -186,8 +188,9 @@ HistoryManager.prototype._updateEntries = function () {
 
         self._entries.push(new HistoryEntry({
           tx: tx,
-          height: txEntries[tx.getId()].height,
-          timestamp: txEntries[tx.getId()].timestamp,
+          height: txEntries[txId].height,
+          timestamp: txEntries[txId].timestamp,
+          isBlockTimestamp: txEntries[txId].isBlockTimestamp,
           values: _.values(assetValues),
           targets: historyTargets,
           entryType: entryType

src/tx/TxDb.js

@@ -178,6 +178,7 @@ TxDb.prototype._addTx = function(txId, data, cb) {
 
       return Q.ninvoke(self._wallet.getBlockchain(), 'getBlockTime', data.height).then(function(ts) {
         data.timestamp = ts + TimezoneOffset
+        data.isBlockTimestamp = true
       })
     }
 
@@ -194,6 +195,7 @@ TxDb.prototype._addTx = function(txId, data, cb) {
       status: data.status,
       height: data.height,
       timestamp: data.timestamp,
+      isBlockTimestamp: data.isBlockTimestamp,
       tAddresses: data.tAddresses
     }
 
@@ -359,5 +361,14 @@ TxDb.prototype.getTxTimestamp = function(txId) {
   return record === null ? null : record.timestamp
 }
 
+/**
+ * @param {string} txId
+ * @return {?boolean}
+ */
+TxDb.prototype.isBlockTimestamp = function(txId) {
+  var record = this._txStorage.get(txId)
+  return record === null ? null : record.isBlockTimestamp
+}
+
 
 module.exports = TxDb

src/tx/TxStorage.js

@@ -7,15 +7,19 @@ var SyncStorage = require('../SyncStorage')
 var verify = require('../verify')
 
 
-// Todo: add shrotcut names for save storage's size
+/**
+ * @todo Add shrotcut names for save storage's size
+ */
+
 /**
  * @typedef {Object} TxStorageRecord
  * @property {string} rawTx
  * @property {number} status
- * @property {number} [height=null]
- * @property {number} [timestamp=null]
- * @property {string[]} [tAddresses=[]]
- * @property {string[]} [rAddresses=[]]
+ * @property {number} height
+ * @property {number} timestamp
+ * @property {boolean} isBlockTimestamp
+ * @property {string[]} tAddresses
+ * @property {string[]} rAddresses
  */
 
 /**
@@ -68,6 +72,13 @@ function TxStorage(opts) {
     this._saveRecords({})
     this.store.set(this.txDbKey + '_version', 5)
   }
+
+  if (this.store.get(this.txDbKey + '_version') === 5) {
+    var records = this._getRecords()
+    _.forEach(records, function (record) { record.isBlockTimestamp = true })
+    this._saveRecords(records)
+    this.store.set(this.txDbKey + '_version', 6)
+  }
 }
 
 inherits(TxStorage, SyncStorage)
@@ -100,6 +111,7 @@ TxStorage.prototype._save2store = function() {
  * @param {number} opts.status
  * @param {number} opts.height
  * @param {number} opts.timestamp
+ * @param {boolean} [opts.isBlockTimestamp=false]
  * @param {string} opts.tAddresses
  * @return {TxStorageRecord}
  * @throws {Error} If txId exists
@@ -111,6 +123,7 @@ TxStorage.prototype.add = function(txId, rawTx, opts) {
   verify.number(opts.status)
   verify.number(opts.height)
   verify.number(opts.timestamp)
+  if (!_.isUndefined(opts.isBlockTimestamp)) verify.boolean(opts.isBlockTimestamp)
   verify.array(opts.tAddresses)
   opts.tAddresses.forEach(verify.string)
 
@@ -123,6 +136,7 @@ TxStorage.prototype.add = function(txId, rawTx, opts) {
     status: opts.status,
     height: opts.height,
     timestamp: opts.timestamp,
+    isBlockTimestamp: opts.isBlockTimestamp || false,
     tAddresses: _.sortBy(opts.tAddresses)
   }
   this._saveRecords(records)