RanchiMall/fcoin
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hd/wallet: add bip48 arg to prepare for bip48 support. see #238.

Browse Source
This commit is contained in:
Christopher Jeffrey 2017-07-23 07:21:56 -07:00
parent 75adfe5ec0
commit 9219e23d8c
No known key found for this signature in database
GPG Key ID: 8962AB9DE6666BBD
7 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/hd/common.js
View File

@ -117,13 +117,13 @@ common.isMaster = function isMaster(key) {
/** /**
* Test whether the key is (most likely) a BIP44 account key. * Test whether the key is (most likely) a BIP44 account key.
* @param {HDPrivateKey|HDPublicKey} key * @param {HDPrivateKey|HDPublicKey} key
* @param {Number?} accountIndex * @param {Number?} account
* @returns {Boolean} * @returns {Boolean}
*/ */
common.isAccount44 = function isAccount44(key, accountIndex) { common.isBIP44 = function isBIP44(key, account) {
if (accountIndex != null) { if (account != null) {
if (key.childIndex !== common.HARDENED + accountIndex) if (key.childIndex !== common.HARDENED + account)
return false; return false;
} }
return key.depth === 3 && key.childIndex >= common.HARDENED; return key.depth === 3 && key.childIndex >= common.HARDENED;
@ -135,6 +135,6 @@ common.isAccount44 = function isAccount44(key, accountIndex) {
* @returns {Boolean} * @returns {Boolean}
*/ */
common.isPurpose45 = function isPurpose45(key) { common.isBIP45 = function isBIP45(key) {
return key.depth === 1 && key.childIndex === common.HARDENED + 45; return key.depth === 1 && key.childIndex === common.HARDENED + 45;
}; };

23
lib/hd/private.js
View File

@ -252,18 +252,19 @@ HDPrivateKey.prototype.getID = function getID(index) {
/** /**
* Derive a BIP44 account key. * Derive a BIP44 account key.
* @param {Number} accountIndex * @param {Number} account
* @param {Boolean?} bip48
* @returns {HDPrivateKey} * @returns {HDPrivateKey}
* @throws Error if key is not a master key. * @throws Error if key is not a master key.
*/ */
HDPrivateKey.prototype.deriveAccount44 = function deriveAccount44(accountIndex) { HDPrivateKey.prototype.deriveBIP44 = function deriveBIP44(account, bip48) {
assert(util.isNumber(accountIndex), 'Account index must be a number.'); assert(util.isNumber(account), 'Account index must be a number.');
assert(this.isMaster(), 'Cannot derive account index.'); assert(this.isMaster(), 'Cannot derive account index.');
return this return this
.derive(44, true) .derive(bip48 ? 48 : 44, true)
.derive(this.network.keyPrefix.coinType, true) .derive(this.network.keyPrefix.coinType, true)
.derive(accountIndex, true); .derive(account, true);
}; };
/** /**
@ -271,7 +272,7 @@ HDPrivateKey.prototype.deriveAccount44 = function deriveAccount44(accountIndex)
* @returns {HDPrivateKey} * @returns {HDPrivateKey}
*/ */
HDPrivateKey.prototype.derivePurpose45 = function derivePurpose45() { HDPrivateKey.prototype.deriveBIP45 = function deriveBIP45() {
assert(this.isMaster(), 'Cannot derive purpose 45.'); assert(this.isMaster(), 'Cannot derive purpose 45.');
return this.derive(45, true); return this.derive(45, true);
}; };
@ -287,12 +288,12 @@ HDPrivateKey.prototype.isMaster = function isMaster() {
/** /**
* Test whether the key is (most likely) a BIP44 account key. * Test whether the key is (most likely) a BIP44 account key.
* @param {Number?} accountIndex * @param {Number?} account
* @returns {Boolean} * @returns {Boolean}
*/ */
HDPrivateKey.prototype.isAccount44 = function isAccount44(accountIndex) { HDPrivateKey.prototype.isBIP44 = function isBIP44(account) {
return common.isAccount44(this, accountIndex); return common.isBIP44(this, account);
}; };
/** /**
@ -300,8 +301,8 @@ HDPrivateKey.prototype.isAccount44 = function isAccount44(accountIndex) {
* @returns {Boolean} * @returns {Boolean}
*/ */
HDPrivateKey.prototype.isPurpose45 = function isPurpose45() { HDPrivateKey.prototype.isBIP45 = function isBIP45() {
return common.isPurpose45(this); return common.isBIP45(this);
}; };
/** /**

21
lib/hd/public.js
View File

@ -218,13 +218,14 @@ HDPublicKey.prototype.getID = function getID(index) {
/** /**
* Derive a BIP44 account key (does not derive, only ensures account key). * Derive a BIP44 account key (does not derive, only ensures account key).
* @method * @method
* @param {Number} accountIndex * @param {Number} account
* @param {Boolean?} bip48
* @returns {HDPublicKey} * @returns {HDPublicKey}
* @throws Error if key is not already an account key. * @throws Error if key is not already an account key.
*/ */
HDPublicKey.prototype.deriveAccount44 = function deriveAccount44(accountIndex) { HDPublicKey.prototype.deriveBIP44 = function deriveBIP44(account, bip48) {
assert(this.isAccount44(accountIndex), 'Cannot derive account index.'); assert(this.isBIP44(account), 'Cannot derive account index.');
return this; return this;
}; };
@ -235,8 +236,8 @@ HDPublicKey.prototype.deriveAccount44 = function deriveAccount44(accountIndex) {
* @throws Error if key is not already a purpose key. * @throws Error if key is not already a purpose key.
*/ */
HDPublicKey.prototype.derivePurpose45 = function derivePurpose45() { HDPublicKey.prototype.deriveBIP45 = function deriveBIP45() {
assert(this.isPurpose45(), 'Cannot derive purpose 45.'); assert(this.isBIP45(), 'Cannot derive purpose 45.');
return this; return this;
}; };
@ -253,12 +254,12 @@ HDPublicKey.prototype.isMaster = function isMaster() {
/** /**
* Test whether the key is (most likely) a BIP44 account key. * Test whether the key is (most likely) a BIP44 account key.
* @method * @method
* @param {Number?} accountIndex * @param {Number?} account
* @returns {Boolean} * @returns {Boolean}
*/ */
HDPublicKey.prototype.isAccount44 = function isAccount44(accountIndex) { HDPublicKey.prototype.isBIP44 = function isBIP44(account) {
return common.isAccount44(this, accountIndex); return common.isBIP44(this, account);
}; };
/** /**
@ -267,8 +268,8 @@ HDPublicKey.prototype.isAccount44 = function isAccount44(accountIndex) {
* @returns {Boolean} * @returns {Boolean}
*/ */
HDPublicKey.prototype.isPurpose45 = function isPurpose45() { HDPublicKey.prototype.isBIP45 = function isBIP45() {
return common.isPurpose45(this); return common.isBIP45(this);
}; };
/** /**

6
lib/wallet/account.js
View File

@ -285,7 +285,7 @@ Account.prototype.pushKey = function pushKey(key) {
if (!HD.isPublic(key)) if (!HD.isPublic(key))
throw new Error('Must add HD keys to wallet.'); throw new Error('Must add HD keys to wallet.');
if (!key.isAccount44()) if (!key.isBIP44())
throw new Error('Must add HD account keys to BIP44 wallet.'); throw new Error('Must add HD account keys to BIP44 wallet.');
if (this.type !== Account.types.MULTISIG) if (this.type !== Account.types.MULTISIG)
@ -325,7 +325,7 @@ Account.prototype.spliceKey = function spliceKey(key) {
if (!HD.isPublic(key)) if (!HD.isPublic(key))
throw new Error('Must add HD keys to wallet.'); throw new Error('Must add HD keys to wallet.');
if (!key.isAccount44()) if (!key.isBIP44())
throw new Error('Must add HD account keys to BIP44 wallet.'); throw new Error('Must add HD account keys to BIP44 wallet.');
if (this.type !== Account.types.MULTISIG) if (this.type !== Account.types.MULTISIG)
@ -542,7 +542,7 @@ Account.prototype.deriveKey = function deriveKey(branch, index, master) {
assert(typeof branch === 'number'); assert(typeof branch === 'number');
if (master && master.key && !this.watchOnly) { if (master && master.key && !this.watchOnly) {
key = master.key.deriveAccount44(this.accountIndex); key = master.key.deriveBIP44(this.accountIndex);
key = key.derive(branch).derive(index); key = key.derive(branch).derive(index);
} else { } else {
key = this.accountKey.derive(branch).derive(index); key = this.accountKey.derive(branch).derive(index);

2
lib/wallet/wallet.js
View File

@ -705,7 +705,7 @@ Wallet.prototype._createAccount = async function createAccount(options, passphra
'Network mismatch for watch only key.'); 'Network mismatch for watch only key.');
} else { } else {
assert(this.master.key); assert(this.master.key);
key = this.master.key.deriveAccount44(this.accountDepth); key = this.master.key.deriveBIP44(this.accountDepth);
key = key.toPublic(); key = key.toPublic();
} }

4
test/util/memwallet.js
View File

@ -89,7 +89,7 @@ MemWallet.prototype.init = function init() {
this.master = HD.PrivateKey.generate(); this.master = HD.PrivateKey.generate();
if (!this.key) if (!this.key)
this.key = this.master.deriveAccount44(this.account); this.key = this.master.deriveBIP44(this.account);
i = this.receiveDepth; i = this.receiveDepth;
while (i--) while (i--)
@ -133,7 +133,7 @@ MemWallet.prototype.derivePath = function derivePath(path) {
}; };
MemWallet.prototype.deriveKey = function deriveKey(branch, index) { MemWallet.prototype.deriveKey = function deriveKey(branch, index) {
let key = this.master.deriveAccount44(this.account); let key = this.master.deriveBIP44(this.account);
key = key.derive(branch).derive(index); key = key.derive(branch).derive(index);
key = new KeyRing({ key = new KeyRing({
network: this.network, network: this.network,

2
test/wallet-test.js
View File

@ -151,7 +151,7 @@ describe('Wallet', function() {
n: 2 n: 2
}); });
k = HD.generate().deriveAccount44(0).toPublic(); k = HD.generate().deriveBIP44(0).toPublic();
await w.addSharedKey(k); await w.addSharedKey(k);