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

reject button working

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-04-23 02:01:54 -03:00
commit b6280348e5
6 changed files with 99 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -274,46 +274,38 @@ Wallet.prototype.generateAddress = function(isChange) {
return addr;
};
// TODO : sort by time... / signed.
Wallet.prototype.getTxProposals = function() {
var ret = [];
for(var k in this.txProposals.txps) {
var txp = this.txProposals.txps[k];
var i = JSON.parse(JSON.stringify(txp));
i.builder = txp.builder;
i.ntxid = k;
i.signedByUs = txp.signedBy[this.getMyPeerId()]?true:false;
i.peerActions = {};
for(var p in txp.seenBy){
i.peerActions[p]={seen: txp.seenBy[p]};
}
for(var p in txp.signedBy){
i.peerActions[p]= i.peerActions[p] || {};
i.peerActions[p].sign = txp.signedBy[p];
}
var c = txp.creator;
i.peerActions[c] = i.peerActions[c] || {};
i.peerActions[c].create = txp.createdTs;
var i = this.txProposals.getTxProposal(k);
i.signedByUs = i.signedBy[this.getMyPeerId()]?true:false;
i.rejectedByUs = i.rejectedBy[this.getMyPeerId()]?true:false;
if (this.totalCopayers-i.rejectCount < this.requiredCopayers)
i.finallyRejected=true;
ret.push(i);
}
return ret;
};
Wallet.prototype.getTxProposal = function(ntxid) {
Wallet.prototype.reject = function(ntxid) {
var myId=this.getMyPeerId();
var txp = this.txProposals.txps[ntxid];
var i = {txp:txp};
i.ntxid = ntxid;
i.signedByUs = txp.signedBy[this.getMyPeerId()]?true:false;
return i;
if (!txp || txp.rejectedBy[myId] || txp.signedBy[myId]) return;
txp.rejectedBy[myId] = Date.now();
this.sendTxProposals();
this.store(true);
};
Wallet.prototype.sign = function(ntxid) {
var self = this;
var myId=this.getMyPeerId();
var txp = self.txProposals.txps[ntxid];
if (!txp) return;
if (!txp || txp.rejectedBy[myId] || txp.signedBy[myId]) return;
var pkr = self.publicKeyRing;
var keys = self.privateKey.getAll(pkr.addressIndex, pkr.changeAddressIndex);
@ -324,7 +316,7 @@ Wallet.prototype.sign = function(ntxid) {
var ret = false;
if (b.signaturesAdded > before) {
txp.signedBy[self.getMyPeerId()] = Date.now();
txp.signedBy[myId] = Date.now();
this.sendTxProposals();
this.store(true);
ret = true;
@ -371,7 +363,6 @@ Wallet.prototype.addSeenToTxProposals = function() {
return ret;
};
Wallet.prototype.getAddresses = function(onlyMain) {
return this.publicKeyRing.getAddresses(onlyMain);
};
@ -438,7 +429,8 @@ Wallet.prototype.getSafeUnspent = function(cb) {
this.blockchain.getUnspent(this.getAddressesStr(), function(unspentList) {
var ret=[];
var uu = self.txProposals.getUsedUnspent();
var maxRejectCount = self.totalCopayers - self.requiredCopayers;
var uu = self.txProposals.getUsedUnspent(maxRejectCount);
for(var i in unspentList){
if (uu.indexOf(unspentList[i].txid) === -1)
@ -497,21 +489,25 @@ Wallet.prototype.createTxSync = function(toAddress, amountSatStr, utxos, opts) {
if (priv) {
b.sign( priv.getAll(pkr.addressIndex, pkr.changeAddressIndex) );
}
var me = {};
var myId = this.getMyPeerId();
var now = Date.now();
if (priv) me[myId] = now;
var me = {};
if (priv && b.signaturesAdded) me[myId] = now;
var meSeen = {};
if (priv) meSeen[myId] = now;
var data = {
signedBy: (priv && b.signaturesAdded ? me : {}),
seenBy: (priv ? me : {}),
signedBy: me,
seenBy: meSeen,
creator: myId,
createdTs: now,
builder: b,
};
this.txProposals.add(data);
return true;
};
Wallet.prototype.connectTo = function(peerId) {