Merge pull request #75 from matiu/bug/fix-unconfigmed-tx

Bug/fix unconfigmed tx
bitpay · May 13, 2014 · dfddf83 · dfddf83
2 parents 5cf6ce4 + 9b4ba42
commit dfddf83
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/lib/TransactionDb.js b/lib/TransactionDb.js
@@ -586,8 +586,8 @@ TransactionDb.prototype.add = function(tx, blockhash, cb) {
 
             // existed? 
             var k = OUTS_PREFIX + tx.txid + '-' + o.n;
-            db.get(k, function(err) {
-              if (err && err.notFound) {
+            db.get(k, function(err, val) {
+              if (!val || (err && err.notFound)) {
                 db.batch()
                   .put(k, addr + ':' + sat)
                   .put(ADDR_PREFIX + addr + '-' + tx.txid + '-' + o.n, sat + ':' + ts)
@@ -698,7 +698,6 @@ TransactionDb.prototype.createFromArray = function(txs, blockHash, next) {
 
         Rpc.getTxInfo(t, function(err, inInfo) {
           if (!inInfo) return each_cb(err);
-
           return self.add(inInfo, blockHash, each_cb);
         });
       } else {

diff --git a/package.json b/package.json
@@ -50,7 +50,7 @@
     "start": "node node_modules/grunt-cli/bin/grunt"
   },
   "dependencies": {
-    "bitcore": "=0.1.18",
+    "bitcore": "=0.1.19",
     "base58-native": "0.1.2",
     "async": "*",
     "leveldown": "*",

diff --git a/test/integration/blockExtractor.js b/test/integration/blockExtractor.js
@@ -43,7 +43,7 @@ describe('BlockExtractor', function(){
     });
   });
 
-  it('should read next testnet block ', function(done) {
+  it('should read next '+config.network+' block ', function(done) {
     be.getNextBlock(function(err,b) {
       assert(!err);
       assert(b.timestamp > lastTs, 'timestamp > genesis_ts');