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

Fix read from backup address.

This commit is contained in:
Gustavo Cortez 2014-04-18 11:16:10 -03:00
parent ae8f50793f
commit 5cd9f7a93b
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/models/core/PublicKeyRing.js
View File

@ -129,10 +129,9 @@ PublicKeyRing.prototype.getPubKeys = function (index, isChange) {
var bip32 = this.copayersBIP32[i].derive(path); var bip32 = this.copayersBIP32[i].derive(path);
pubKeys[i] = bip32.eckey.public; pubKeys[i] = bip32.eckey.public;
} }
this.publicKeysCache[path] = pubKeys; this.publicKeysCache[path] = pubKeys.map(function(pk){return pk.toString('hex')});
//console.log('cache fill['+path+']='+pubKeys.length);
} else { } else {
//console.log('cache hit!'); pubKeys = pubKeys.map(function(s){return new Buffer(s,'hex')});
} }
return pubKeys; return pubKeys;
@ -157,7 +156,6 @@ PublicKeyRing.prototype.getRedeemScript = function (index, isChange) {
PublicKeyRing.prototype.getAddress = function (index, isChange) { PublicKeyRing.prototype.getAddress = function (index, isChange) {
this._checkIndexRange(index, isChange); this._checkIndexRange(index, isChange);
var script = this.getRedeemScript(index,isChange); var script = this.getRedeemScript(index,isChange);
return Address.fromScript(script, this.network.name); return Address.fromScript(script, this.network.name);
}; };

1
js/models/core/Wallet.js
View File

@ -222,6 +222,7 @@ Wallet.prototype.sendPublicKeyRing = function(recipients) {
Wallet.prototype.generateAddress = function() { Wallet.prototype.generateAddress = function() {
var addr = this.publicKeyRing.generateAddress(); var addr = this.publicKeyRing.generateAddress();
this.sendPublicKeyRing(); this.sendPublicKeyRing();
this.store();
return addr; return addr;
}; };