Browse Source

add walletId to address

activeAddress
Ivan Socolsky 10 years ago
parent
commit
88c7323a0e
  1. 2
      lib/model/address.js
  2. 6
      lib/model/copayer.js
  3. 5
      lib/model/wallet.js

2
lib/model/address.js

@ -13,6 +13,7 @@ Address.create = function(opts) {
x.createdOn = Math.floor(Date.now() / 1000); x.createdOn = Math.floor(Date.now() / 1000);
x.address = opts.address; x.address = opts.address;
x.walletId = opts.walletId;
x.isChange = opts.isChange; x.isChange = opts.isChange;
x.path = opts.path; x.path = opts.path;
x.publicKeys = opts.publicKeys; x.publicKeys = opts.publicKeys;
@ -24,6 +25,7 @@ Address.fromObj = function(obj) {
x.createdOn = obj.createdOn; x.createdOn = obj.createdOn;
x.address = obj.address; x.address = obj.address;
x.walletId = obj.walletId;
x.isChange = obj.isChange; x.isChange = obj.isChange;
x.path = obj.path; x.path = obj.path;
x.publicKeys = obj.publicKeys; x.publicKeys = obj.publicKeys;

6
lib/model/copayer.js

@ -60,7 +60,11 @@ Copayer.prototype.createAddress = function(wallet, isChange) {
$.checkState(wallet.isComplete()); $.checkState(wallet.isComplete());
var path = this.addressManager.getNewAddressPath(isChange); var path = this.addressManager.getNewAddressPath(isChange);
var address = Address.create(WalletUtils.deriveAddress(wallet.publicKeyRing, path, wallet.m, wallet.network)); var raw = Address.create(WalletUtils.deriveAddress(wallet.publicKeyRing, path, wallet.m, wallet.network));
var address = Address.create(_.extend(raw, {
walletId: wallet.id,
}));
address.isChange = isChange; address.isChange = isChange;
return address; return address;
}; };

5
lib/model/wallet.js

@ -145,7 +145,10 @@ Wallet.prototype.createAddress = function(isChange) {
$.checkState(this.isComplete()); $.checkState(this.isComplete());
var path = this.addressManager.getNewAddressPath(isChange); var path = this.addressManager.getNewAddressPath(isChange);
var address = Address.create(WalletUtils.deriveAddress(this.publicKeyRing, path, this.m, this.network)); var raw = WalletUtils.deriveAddress(this.publicKeyRing, path, this.m, this.network);
var address = Address.create(_.extend(raw, {
walletId: this.id,
}));
address.isChange = isChange; address.isChange = isChange;
return address; return address;
}; };

Loading…
Cancel
Save