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

PublicKeyRing handles one index for each cosigner

Browse source
This commit is contained in:
Yemel Jardi 2014-07-03 11:18:01 -03:00
commit 04b6aa4003
7 changed files with 140 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -51,6 +51,7 @@ function Wallet(opts) {
this.registeredPeerIds = [];
this.addressBook = opts.addressBook || {};
this.backupOffered = opts.backupOffered || false;
this.publicKey = this.privateKey.publicHex;
}
Wallet.parent = EventEmitter;
@ -462,7 +463,7 @@ Wallet.prototype.getName = function() {
};
Wallet.prototype._doGenerateAddress = function(isChange) {
return this.publicKeyRing.generateAddress(isChange);
return this.publicKeyRing.generateAddress(isChange, this.publicKey);
};
@ -516,7 +517,6 @@ Wallet.prototype.sign = function(ntxid, cb) {
if (cb) cb(false);
}
var pkr = self.publicKeyRing;
var keys = self.privateKey.getForPaths(txp.inputChainPaths);
var b = txp.builder;