From 3840b7303ef94508ee555293a9064ffd53ed63f1 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Sat, 22 Mar 2014 01:52:50 -0300 Subject: [PATCH 1/2] version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 38fef416..0326fea9 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "insight-bitcore-api", "description": "An open-source bitcoin blockchain API. The Insight API provides you with a convenient, powerful and simple way to query and broadcast data on the bitcoin network and build your own services with it.", - "version": "0.1.5", + "version": "0.1.6", "author": { "name": "Ryan X Charles", "email": "ryan@bitpay.com" From 2c70e21f5543944d9d31123069225d4db6e8deee Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Tue, 15 Apr 2014 09:15:47 -0300 Subject: [PATCH 2/2] add check in getUxos --- app/models/Address.js | 1 + lib/TransactionDb.js | 2 +- test/integration/addr.js | 4 ++-- test/integration/addr.json | 8 +++++--- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/models/Address.js b/app/models/Address.js index aff16114..a71d78c8 100644 --- a/app/models/Address.js +++ b/app/models/Address.js @@ -92,6 +92,7 @@ Address.prototype.getUtxo = function(next) { // Complete utxo info async.eachLimit(txOut,CONCURRENCY,function (txItem, a_c) { db.fromIdInfoSimple(txItem.txid, function(err, info) { + if (!info || !info.hex) return a_c(err); var scriptPubKey = self._getScriptPubKey(info.hex, txItem.index); diff --git a/lib/TransactionDb.js b/lib/TransactionDb.js index fef8d60f..a33bd195 100644 --- a/lib/TransactionDb.js +++ b/lib/TransactionDb.js @@ -13,7 +13,7 @@ var OUTS_PREFIX = 'txo-'; //txo-- => [addr, btc_sat] var SPENT_PREFIX = 'txs-'; //txs---- = ts // to sum up addr balance (only outs, spents are gotten later) -var ADDR_PREFIX = 'txa-'; //txa--- => + btc_sat:ts +var ADDR_PREFIX = 'txa-'; //txa--- => + btc_sat:ts [:-](spent) // TODO: use bitcore networks module var genesisTXID = '4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b'; diff --git a/test/integration/addr.js b/test/integration/addr.js index 2bce598b..12309645 100644 --- a/test/integration/addr.js +++ b/test/integration/addr.js @@ -31,8 +31,8 @@ describe('Address balances', function() { a.update(function(err) { if (err) done(err); assert.equal(v.addr, a.addrStr); - assert.equal(a.unconfirmedTxApperances ,0, 'unconfirmedTxApperances: 0'); - assert.equal(a.unconfirmedBalanceSat ,0, 'unconfirmedBalanceSat: 0'); + assert.equal(a.unconfirmedTxApperances ,v.unconfirmedTxApperances || 0, 'unconfirmedTxApperances'); + assert.equal(a.unconfirmedBalanceSat ,v.unconfirmedBalanceSat || 0, 'unconfirmedBalanceSat: ' + a.unconfirmedBalanceSat + ' vs.: ' + v.unconfirmedBalanceSat ); if (v.txApperances) assert.equal(v.txApperances, a.txApperances, 'txApperances: ' + a.txApperances); if (v.totalReceived) assert.equal(v.totalReceived, a.totalReceived, 'received: ' + a.totalReceived); diff --git a/test/integration/addr.json b/test/integration/addr.json index 15c47af9..ffd9358d 100644 --- a/test/integration/addr.json +++ b/test/integration/addr.json @@ -42,10 +42,12 @@ }, { "addr": "mzW2hdZN2um7WBvTDerdahKqRgj3md9C29", - "balance": 1199.74393853, - "totalReceived": 1199.74393853, + "balance": 1271.87752288, + "totalReceived": 1271.87752288, "totalSent": 0, - "txApperances": 6048 + "txApperances": 6197, + "unconfirmedTxApperances": 3, + "unconfirmedBalanceSat": 149174913 }, { "addr": "mjRmkmYzvZN3cA3aBKJgYJ65epn3WCG84H",