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

hd: refactor deps.

Browse Source
This commit is contained in:
Christopher Jeffrey 2016-10-01 21:42:36 -07:00
parent d842b5639b
commit 323d5fb8a4
No known key found for this signature in database
GPG Key ID: 8962AB9DE6666BBD
4 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/hd/hd.js
View File

@ -6,10 +6,9 @@
'use strict'; 'use strict';
var bcoin = require('../env');
var utils = require('../utils/utils'); var utils = require('../utils/utils');
var assert = utils.assert; var assert = utils.assert;
var constants = bcoin.constants; var constants = require('../protocol/constants');
var LRU = require('../utils/lru'); var LRU = require('../utils/lru');
var Mnemonic = require('./mnemonic'); var Mnemonic = require('./mnemonic');
var HDPrivateKey = require('./private'); var HDPrivateKey = require('./private');

3
lib/hd/mnemonic.js
View File

@ -6,11 +6,10 @@
'use strict'; 'use strict';
var bcoin = require('../env');
var utils = require('../utils/utils'); var utils = require('../utils/utils');
var crypto = require('../crypto/crypto'); var crypto = require('../crypto/crypto');
var assert = utils.assert; var assert = utils.assert;
var constants = bcoin.constants; var constants = require('../protocol/constants');
var BufferWriter = require('../utils/writer'); var BufferWriter = require('../utils/writer');
var BufferReader = require('../utils/reader'); var BufferReader = require('../utils/reader');
var HD = require('./hd'); var HD = require('./hd');

18
lib/hd/private.js
View File

@ -6,13 +6,13 @@
'use strict'; 'use strict';
var bcoin = require('../env');
var utils = require('../utils/utils'); var utils = require('../utils/utils');
var crypto = require('../crypto/crypto'); var crypto = require('../crypto/crypto');
var ec = require('../crypto/ec'); var ec = require('../crypto/ec');
var assert = utils.assert; var assert = utils.assert;
var constants = bcoin.constants; var constants = require('../protocol/constants');
var networks = bcoin.networks; var networks = require('../protocol/networks');
var Network = require('../protocol/network');
var BufferWriter = require('../utils/writer'); var BufferWriter = require('../utils/writer');
var BufferReader = require('../utils/reader'); var BufferReader = require('../utils/reader');
var HD = require('./hd'); var HD = require('./hd');
@ -52,7 +52,7 @@ function HDPrivateKey(options) {
if (!(this instanceof HDPrivateKey)) if (!(this instanceof HDPrivateKey))
return new HDPrivateKey(options); return new HDPrivateKey(options);
this.network = bcoin.network.get(); this.network = Network.primary;
this.depth = 0; this.depth = 0;
this.parentFingerPrint = FINGER_PRINT; this.parentFingerPrint = FINGER_PRINT;
this.childIndex = 0; this.childIndex = 0;
@ -89,7 +89,7 @@ HDPrivateKey.prototype.fromOptions = function fromOptions(options) {
assert(options.depth <= 0xff, 'Depth is too high.'); assert(options.depth <= 0xff, 'Depth is too high.');
if (options.network) if (options.network)
this.network = bcoin.network.get(options.network); this.network = Network.get(options.network);
this.depth = options.depth; this.depth = options.depth;
this.parentFingerPrint = options.parentFingerPrint; this.parentFingerPrint = options.parentFingerPrint;
@ -490,7 +490,7 @@ HDPrivateKey.prototype.fromSeed = function fromSeed(seed, network) {
if (!ec.privateKeyVerify(left)) if (!ec.privateKeyVerify(left))
throw new Error('Master private key is invalid.'); throw new Error('Master private key is invalid.');
this.network = bcoin.network.get(network); this.network = Network.get(network);
this.depth = 0; this.depth = 0;
this.parentFingerPrint = new Buffer([0, 0, 0, 0]); this.parentFingerPrint = new Buffer([0, 0, 0, 0]);
this.childIndex = 0; this.childIndex = 0;
@ -549,7 +549,7 @@ HDPrivateKey.fromMnemonic = function fromMnemonic(mnemonic, network) {
HDPrivateKey.prototype.fromKey = function fromKey(key, entropy, network) { HDPrivateKey.prototype.fromKey = function fromKey(key, entropy, network) {
assert(Buffer.isBuffer(key) && key.length === 32); assert(Buffer.isBuffer(key) && key.length === 32);
assert(Buffer.isBuffer(entropy) && entropy.length === 32); assert(Buffer.isBuffer(entropy) && entropy.length === 32);
this.network = bcoin.network.get(network); this.network = Network.get(network);
this.depth = 0; this.depth = 0;
this.parentFingerPrint = new Buffer([0, 0, 0, 0]); this.parentFingerPrint = new Buffer([0, 0, 0, 0]);
this.childIndex = 0; this.childIndex = 0;
@ -624,7 +624,7 @@ HDPrivateKey.prototype.fromRaw = function fromRaw(raw) {
assert(i < networks.types.length, 'Network not found.'); assert(i < networks.types.length, 'Network not found.');
this.publicKey = ec.publicKeyCreate(this.privateKey, true); this.publicKey = ec.publicKeyCreate(this.privateKey, true);
this.network = bcoin.network.get(type); this.network = Network.get(type);
return this; return this;
}; };
@ -651,7 +651,7 @@ HDPrivateKey.prototype.toRaw = function toRaw(network, writer) {
if (!network) if (!network)
network = this.network; network = this.network;
network = bcoin.network.get(network); network = Network.get(network);
p.writeU32BE(network.keyPrefix.xprivkey); p.writeU32BE(network.keyPrefix.xprivkey);
p.writeU8(this.depth); p.writeU8(this.depth);

14
lib/hd/public.js
View File

@ -6,13 +6,13 @@
'use strict'; 'use strict';
var bcoin = require('../env');
var utils = require('../utils/utils'); var utils = require('../utils/utils');
var crypto = require('../crypto/crypto'); var crypto = require('../crypto/crypto');
var ec = require('../crypto/ec'); var ec = require('../crypto/ec');
var assert = utils.assert; var assert = utils.assert;
var constants = bcoin.constants; var constants = require('../protocol/constants');
var networks = bcoin.networks; var networks = require('../protocol/networks');
var Network = require('../protocol/network');
var BufferWriter = require('../utils/writer'); var BufferWriter = require('../utils/writer');
var BufferReader = require('../utils/reader'); var BufferReader = require('../utils/reader');
var HD = require('./hd'); var HD = require('./hd');
@ -47,7 +47,7 @@ function HDPublicKey(options) {
if (!(this instanceof HDPublicKey)) if (!(this instanceof HDPublicKey))
return new HDPublicKey(options); return new HDPublicKey(options);
this.network = bcoin.network.get(); this.network = Network.primary;
this.depth = 0; this.depth = 0;
this.parentFingerPrint = FINGER_PRINT; this.parentFingerPrint = FINGER_PRINT;
this.childIndex = 0; this.childIndex = 0;
@ -80,7 +80,7 @@ HDPublicKey.prototype.fromOptions = function fromOptions(options) {
assert(Buffer.isBuffer(options.publicKey)); assert(Buffer.isBuffer(options.publicKey));
if (options.network) if (options.network)
this.network = bcoin.network.get(options.network); this.network = Network.get(options.network);
this.depth = options.depth; this.depth = options.depth;
this.parentFingerPrint = options.parentFingerPrint; this.parentFingerPrint = options.parentFingerPrint;
@ -475,7 +475,7 @@ HDPublicKey.prototype.fromRaw = function fromRaw(raw) {
assert(i < networks.types.length, 'Network not found.'); assert(i < networks.types.length, 'Network not found.');
this.network = bcoin.network.get(type); this.network = Network.get(type);
return this; return this;
}; };
@ -502,7 +502,7 @@ HDPublicKey.prototype.toRaw = function toRaw(network, writer) {
if (!network) if (!network)
network = this.network; network = this.network;
network = bcoin.network.get(network); network = Network.get(network);
p.writeU32BE(network.keyPrefix.xpubkey); p.writeU32BE(network.keyPrefix.xpubkey);
p.writeU8(this.depth); p.writeU8(this.depth);