anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

fix conflics

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-06-13 19:45:00 -03:00
commit 194e5fed54
7 changed files with 55 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

47
js/models/blockchain/Insight.js
View file

@ -183,34 +183,35 @@ Insight.prototype._request = function(options, callback) {
request.timeout = 5000;
request.ontimeout = function() {
setTimeout(function() {
return self._request(options,callback);
return self._request(options, callback);
}, self.retryDelay);
return callback(new Error('Insight request timeout'));
};
request.onreadystatechange = function() {
if (request.readyState === 4) {
if (request.status === 200 || request.status === 304) {
try {
var ret = JSON.parse(request.responseText);
return callback(null, ret);
} catch (e) {
return callback(new Error('CRITICAL: Wrong response from insight'));
}
}
// User error
else if (request.status >= 400 && request.status < 499) {
return callback(new Error('CRITICAL: Bad request to insight. Probably wrong transaction to broadcast?.'));
}
else {
var err= 'Error code: ' + request.status + ' - Status: ' + request.statusText
+ ' - Description: ' + request.responseText;
setTimeout(function() {
return self._request(options,callback);
}, self.retryDelay);
return callback(new Error(err));
if (request.readyState !== 4) return;
var ret, errTxt, e;
if (request.status === 200 || request.status === 304) {
try {
ret = JSON.parse(request.responseText);
} catch (e2) {
errTxt = 'CRITICAL: Wrong response from insight' + e2;
}
} else if (request.status >= 400 && request.status < 499) {
errTxt = 'CRITICAL: Bad request to insight. Probably wrong transaction to broadcast?.';
} else {
errTxt = 'Error code: ' + request.status + ' - Status: ' + request.statusText + ' - Description: ' + request.responseText;
setTimeout(function() {
console.log('### Retrying Insight Request....');
return self._request(options, callback);
}, self.retryDelay);
}
if (errTxt) {
console.log("INSIGHT ERROR:", e);
e = new Error(errTxt);
}
return callback(e, ret);
};
if (options.method === 'POST') {
@ -218,9 +219,7 @@ Insight.prototype._request = function(options, callback) {
}
request.send(options.data || null);
}
else {
} else {
var http = require('http');
var req = http.request(options, function(response) {
var ret;

2
js/models/core/TxProposals.js
View file

@ -24,6 +24,8 @@ function TxProposal(opts) {
}
TxProposal.prototype.toObj = function() {
console.log('[TxProposals.js.27]',this); //TODO
var o = JSON.parse(JSON.stringify(this));
delete o['builder'];
o.builderObj = this.builder.toObj();

6
js/models/core/Wallet.js
View file

@ -572,6 +572,10 @@ Wallet.prototype.getBalance = function(cb) {
if (!BIT)
throw new Error('BIT not defined. A newer version of bitcore is needed');
console.log('[Wallet.js.574] getBalance'); //TODO
this.getUnspent(function(err, safeUnspent, unspent) {
if (err) {
return cb(err);
@ -604,6 +608,7 @@ Wallet.prototype.getBalance = function(cb) {
Wallet.prototype.getUnspent = function(cb) {
var self = this;
this.blockchain.getUnspent(this.getAddressesStr(), function(err, unspentList) {
console.log('[Wallet.js.606:unspentList:]', unspentList); //TODO
if (err) {
return cb(err);
@ -637,6 +642,7 @@ Wallet.prototype.createTx = function(toAddress, amountSatStr, comment, opts, cb)
}
this.getUnspent(function(err, safeUnspent) {
console.log('[Wallet.js.639:safeUnspent:]', safeUnspent); //TODO
var ntxid = self.createTxSync(toAddress, amountSatStr, comment, safeUnspent, opts);
if (ntxid) {
self.sendIndexes();