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

safe unspent

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-04-21 12:37:32 -03:00
commit 2fc3a8e8fa
5 changed files with 38 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -410,7 +410,7 @@ Wallet.prototype.addressIsOwn = function(addrStr) {
return ret;
};
Wallet.prototype.getBalance = function(cb) {
Wallet.prototype.getBalance = function(safe, cb) {
var balance = 0;
var balanceByAddr = {};
var isMain = {};
@ -424,7 +424,8 @@ Wallet.prototype.getBalance = function(cb) {
balanceByAddr[a]=0;
isMain[a]=1;
});
this.getUnspent(function(utxos) {
var f = safe ? this.getSafeUnspent.bind(this):this.getUnspent.bind(this);
f(function(utxos) {
for(var i=0;i<utxos.length; i++) {
var u= utxos[i];
var amt = u.amount * COIN;
@ -444,8 +445,24 @@ Wallet.prototype.getUnspent = function(cb) {
});
};
Wallet.prototype.getSafeUnspent = function(cb) {
var self = this;
this.blockchain.getUnspent(this.getAddressesStr(), function(unspentList) {
var ret=[];
var uu = self.txProposals.getUsedUnspent();
for(var i in unspentList){
if (uu.indexOf(unspentList[i].txid) === -1)
ret.push(unspentList[i]);
}
return cb(ret);
});
};
Wallet.prototype.createTx = function(toAddress, amountSatStr, opts, cb) {
console.log('[Wallet.js.447:createTx:]'); //TODO
var self = this;
if (typeof opts === 'function') {
cb = opts;
@ -456,7 +473,8 @@ console.log('[Wallet.js.447:createTx:]'); //TODO
if (typeof opts.spendUnconfirmed === 'undefined') {
opts.spendUnconfirmed = this.spendUnconfirmed;
}
self.getUnspent(function(unspentList) {
self.getSafeUnspent(function(unspentList) {
// TODO check enough funds, etc.
self.createTxSync(toAddress, amountSatStr, unspentList, opts);
self.sendPublicKeyRing(); // Change Address
@ -480,7 +498,6 @@ Wallet.prototype.createTxSync = function(toAddress, amountSatStr, utxos, opts) {
if (!opts.remainderOut) {
opts.remainderOut ={ address: this.generateAddress(true).toString() };
}
console.log('[Wallet.js.480:opts: CREATETXSYNC]',opts); //TODO
var b = new Builder(opts)
.setUnspent(utxos)