BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rm senderId from setCopayers

This commit is contained in:
Matias Alejo Garcia 2014-11-27 07:35:07 -03:00
parent e49a61980e
commit cdc80e94eb
3 changed files with 13 additions and 12 deletions
Show Stats 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; return this.sentTs;
} }
TxProposal.prototype.setCopayers = function(senderId, keyMap) { TxProposal.prototype.setCopayers = function(pubkeyToCopayerMap) {
var newCopayer = {}, var newCopayer = {},
oldCopayers = {}, oldCopayers = {},
newSignedBy = {}, newSignedBy = {},
@ -431,7 +431,7 @@ TxProposal.prototype.setCopayers = function(senderId, keyMap) {
var iSig = this.getSignersPubKeys(); var iSig = this.getSignersPubKeys();
for (var i in iSig) { for (var i in iSig) {
var copayerId = keyMap[iSig[i]]; var copayerId = pubkeyToCopayerMap[iSig[i]];
if (!copayerId) if (!copayerId)
throw new Error('Found unknown signature') 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'); throw new Error('New TX must have only 1 new signature');
// Handler creator / createdTs. // Handler creator / createdTs.
// from senderId, and must be signed by senderId // from senderId, and must be signed by senderId * DISABLED*
//
if (isNew) { if (isNew) {
this.creator = Object.keys(newCopayer)[0]; this.creator = Object.keys(newCopayer)[0];
this.seenBy[this.creator] = this.createdTs = Date.now(); 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); var keyMap = self._getPubkeyToCopayerMap(incomingTx);
incomingTx.setCopayers(senderId, keyMap); incomingTx.setCopayers(keyMap);
self.txProposals.add(incomingTx); self.txProposals.add(incomingTx);
self.emitAndKeepAlive('txProposalEvent', { self.emitAndKeepAlive('txProposalEvent', {

16
test/TxProposal.js
View File

@ -480,7 +480,7 @@ describe('TxProposal', function() {
}; };
delete txp['creator']; delete txp['creator'];
(function() { (function() {
txp.setCopayers('juan', { txp.setCopayers({
pk1: 'pepe' pk1: 'pepe'
}) })
}).should.throw('no creator'); }).should.throw('no creator');
@ -495,7 +495,7 @@ describe('TxProposal', function() {
['pkX'] ['pkX']
]; ];
(function() { (function() {
txp.setCopayers('juan', { txp.setCopayers({
pk1: 'pepe' pk1: 'pepe'
}) })
}).should.throw('creator'); }).should.throw('creator');
@ -512,7 +512,7 @@ describe('TxProposal', function() {
['pk0', 'pkX'] ['pk0', 'pkX']
]; ];
(function() { (function() {
txp.setCopayers('juan', { txp.setCopayers({
pk1: 'pepe' pk1: 'pepe'
}) })
}).should.throw('unknown sig'); }).should.throw('unknown sig');
@ -529,7 +529,7 @@ describe('TxProposal', function() {
'creator': Date.now() 'creator': Date.now()
}; };
(function() { (function() {
txp.setCopayers('juan', { txp.setCopayers({
pk0: 'creator', pk0: 'creator',
pk1: 'pepe', pk1: 'pepe',
pk2: 'john' pk2: 'john'
@ -546,7 +546,7 @@ describe('TxProposal', function() {
txp.signedBy = { txp.signedBy = {
'creator': Date.now() 'creator': Date.now()
}; };
txp.setCopayers('pepe', { txp.setCopayers({
pk0: 'creator', pk0: 'creator',
pk1: 'pepe', pk1: 'pepe',
pk2: 'john' pk2: 'john'
@ -562,7 +562,7 @@ describe('TxProposal', function() {
txp.signedBy = {}; txp.signedBy = {};
delete txp['creator']; delete txp['creator'];
delete txp['creatorTs']; delete txp['creatorTs'];
txp.setCopayers('creator', { txp.setCopayers({
pk0: 'creator', pk0: 'creator',
pk1: 'pepe', pk1: 'pepe',
pk2: 'john' pk2: 'john'
@ -581,7 +581,7 @@ describe('TxProposal', function() {
sinon.stub(txp,'getSignersPubKeys').returns(['pk0', 'pk1']); sinon.stub(txp,'getSignersPubKeys').returns(['pk0', 'pk1']);
(function() { (function() {
txp.setCopayers( txp.setCopayers(
'creator', { {
pk0: 'creator', pk0: 'creator',
pk1: 'pepe', pk1: 'pepe',
pk2: 'john' pk2: 'john'
@ -600,7 +600,7 @@ describe('TxProposal', function() {
txp.signedBy = { txp.signedBy = {
'creator': 1 'creator': 1
}; };
txp.setCopayers('pepe', { txp.setCopayers({
pk0: 'creator', pk0: 'creator',
pk1: 'pepe', pk1: 'pepe',
pk2: 'john' pk2: 'john'