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

add AddressIndex model

Browse source
This commit is contained in:
Manuel Araoz 2014-06-04 13:44:32 -03:00
commit 51d5d7164e
8 changed files with 104 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
js/models/core/AddressIndex.js
View file

@ -37,7 +37,7 @@ AddressIndex.prototype.toObj = function() {
};
};
AddressIndex.prototype._checkIndexRange = function(index, isChange) {
AddressIndex.prototype.checkRange = function(index, isChange) {
if ((isChange && index > this.changeIndex) ||
(!isChange && index > this.receiveIndex)) {
throw new Error('Out of bounds at index %d isChange: %d', index, isChange);
@ -45,10 +45,10 @@ AddressIndex.prototype._checkIndexRange = function(index, isChange) {
};
AddressIndex.prorotype.getChangeIndex = function() {
AddressIndex.prototype.getChangeIndex = function() {
return this.changeIndex;
};
AddressIndex.prorotype.getReceiveIndex = function() {
AddressIndex.prototype.getReceiveIndex = function() {
return this.receiveIndex;
};

3
js/models/core/PrivateKey.js
View file

@ -82,6 +82,9 @@ PrivateKey.prototype.get = function(index,isChange) {
};
PrivateKey.prototype.getAll = function(receiveIndex, changeIndex) {
if (typeof receiveIndex === 'undefined' || typeof changeIndex === 'undefined')
throw new Error('Invalid parameters');
var ret = [];
for(var i=0;i<receiveIndex; i++) {
ret.push(this.get(i,false));

4
js/models/core/PublicKeyRing.js
View file

@ -27,7 +27,7 @@ function PublicKeyRing(opts) {
this.copayersHK = opts.copayersHK || [];
this.indexes = opts.indexes || new ;
this.indexes = AddressIndex.fromObj(opts.indexes) || new AddressIndex(opts);
this.publicKeysCache = opts.publicKeysCache || {};
this.nicknameFor = opts.nicknameFor || {};
@ -159,7 +159,7 @@ PublicKeyRing.prototype.getPubKeys = function(index, isChange) {
// TODO this could be cached
PublicKeyRing.prototype.getRedeemScript = function (index, isChange) {
this._checkIndexRange(index, isChange);
this.indexes.checkRange(index, isChange);
var pubKeys = this.getPubKeys(index, isChange);
var script = Script.createMultisig(this.requiredCopayers, pubKeys);