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

fix params

This commit is contained in:
Matias Alejo Garcia 2014-04-04 19:59:00 -03:00
parent b1b8a44a7d
commit 8b42f8508b
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/models/PublicKeyRing.js
View File

@ -161,7 +161,7 @@ PublicKeyRing.prototype.addCopayer = function (newEpk) {
};
PublicKeyRing.prototype.getCopayersPubKeys = function () {
PublicKeyRing.prototype.getCopayersPubKeys = function (index, isChange) {
this._checkKeys();
var pubKeys = [];
@ -186,7 +186,7 @@ PublicKeyRing.prototype._checkIndexRange = function (index, isChange) {
PublicKeyRing.prototype.getRedeemScript = function (index, isChange) {
this._checkIndexRange(index, isChange);
var pubKeys = this.getCopayersPubKeys();
var pubKeys = this.getCopayersPubKeys(index, isChange);
var script = Script.createMultisig(this.requiredCopayers, pubKeys);
return script;
};
@ -207,9 +207,9 @@ PublicKeyRing.prototype.generateAddress = function(isChange) {
var ret =
this.getAddress(isChange ? this.changeAddressIndex : this.addressIndex, isChange);
if (isChange)
this.addressIndex++;
else
this.changeAddressIndex++;
else
this.addressIndex++;
return ret;

5
test/test.publickeyring.js
View File

@ -101,6 +101,11 @@ describe('PublicKeyRing model', function() {
a.isValid().should.equal(true);
a.isScript().should.equal(true);
a.network().name.should.equal('livenet');
if (i>1) {
w.getAddress(i-1,isChange).should
.not.equal(w.getAddress(i-2,isChange));
}
}
}
});