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

rm senderId from setCopayers

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-11-27 07:35:07 -03:00
commit cdc80e94eb
3 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

7
js/models/TxProposal.js
View file

@ -404,7 +404,7 @@ TxProposal.prototype.getSent = function() {
return this.sentTs;
}
TxProposal.prototype.setCopayers = function(senderId, keyMap) {
TxProposal.prototype.setCopayers = function(pubkeyToCopayerMap) {
var newCopayer = {},
oldCopayers = {},
newSignedBy = {},
@ -431,7 +431,7 @@ TxProposal.prototype.setCopayers = function(senderId, keyMap) {
var iSig = this.getSignersPubKeys();
for (var i in iSig) {
var copayerId = keyMap[iSig[i]];
var copayerId = pubkeyToCopayerMap[iSig[i]];
if (!copayerId)
throw new Error('Found unknown signature')
@ -448,7 +448,8 @@ TxProposal.prototype.setCopayers = function(senderId, keyMap) {
throw new Error('New TX must have only 1 new signature');
// Handler creator / createdTs.
// from senderId, and must be signed by senderId
// from senderId, and must be signed by senderId * DISABLED*
//
if (isNew) {
this.creator = Object.keys(newCopayer)[0];
this.seenBy[this.creator] = this.createdTs = Date.now();

2
js/models/Wallet.js
View file

@ -520,7 +520,7 @@ Wallet.prototype._onTxProposal = function(senderId, data) {
}
var keyMap = self._getPubkeyToCopayerMap(incomingTx);
incomingTx.setCopayers(senderId, keyMap);
incomingTx.setCopayers(keyMap);
self.txProposals.add(incomingTx);
self.emitAndKeepAlive('txProposalEvent', {