From 323d5fb8a4800735fe2d2e3a00d7b74754fc526e Mon Sep 17 00:00:00 2001 From: Christopher Jeffrey Date: Sat, 1 Oct 2016 21:42:36 -0700 Subject: [PATCH] hd: refactor deps. --- lib/hd/hd.js | 3 +-- lib/hd/mnemonic.js | 3 +-- lib/hd/private.js | 18 +++++++++--------- lib/hd/public.js | 14 +++++++------- 4 files changed, 18 insertions(+), 20 deletions(-) diff --git a/lib/hd/hd.js b/lib/hd/hd.js index 2314e175..3b9382f1 100644 --- a/lib/hd/hd.js +++ b/lib/hd/hd.js @@ -6,10 +6,9 @@ 'use strict'; -var bcoin = require('../env'); var utils = require('../utils/utils'); var assert = utils.assert; -var constants = bcoin.constants; +var constants = require('../protocol/constants'); var LRU = require('../utils/lru'); var Mnemonic = require('./mnemonic'); var HDPrivateKey = require('./private'); diff --git a/lib/hd/mnemonic.js b/lib/hd/mnemonic.js index 2573d3bc..7e008061 100644 --- a/lib/hd/mnemonic.js +++ b/lib/hd/mnemonic.js @@ -6,11 +6,10 @@ 'use strict'; -var bcoin = require('../env'); var utils = require('../utils/utils'); var crypto = require('../crypto/crypto'); var assert = utils.assert; -var constants = bcoin.constants; +var constants = require('../protocol/constants'); var BufferWriter = require('../utils/writer'); var BufferReader = require('../utils/reader'); var HD = require('./hd'); diff --git a/lib/hd/private.js b/lib/hd/private.js index 12667035..543090d2 100644 --- a/lib/hd/private.js +++ b/lib/hd/private.js @@ -6,13 +6,13 @@ 'use strict'; -var bcoin = require('../env'); var utils = require('../utils/utils'); var crypto = require('../crypto/crypto'); var ec = require('../crypto/ec'); var assert = utils.assert; -var constants = bcoin.constants; -var networks = bcoin.networks; +var constants = require('../protocol/constants'); +var networks = require('../protocol/networks'); +var Network = require('../protocol/network'); var BufferWriter = require('../utils/writer'); var BufferReader = require('../utils/reader'); var HD = require('./hd'); @@ -52,7 +52,7 @@ function HDPrivateKey(options) { if (!(this instanceof HDPrivateKey)) return new HDPrivateKey(options); - this.network = bcoin.network.get(); + this.network = Network.primary; this.depth = 0; this.parentFingerPrint = FINGER_PRINT; this.childIndex = 0; @@ -89,7 +89,7 @@ HDPrivateKey.prototype.fromOptions = function fromOptions(options) { assert(options.depth <= 0xff, 'Depth is too high.'); if (options.network) - this.network = bcoin.network.get(options.network); + this.network = Network.get(options.network); this.depth = options.depth; this.parentFingerPrint = options.parentFingerPrint; @@ -490,7 +490,7 @@ HDPrivateKey.prototype.fromSeed = function fromSeed(seed, network) { if (!ec.privateKeyVerify(left)) throw new Error('Master private key is invalid.'); - this.network = bcoin.network.get(network); + this.network = Network.get(network); this.depth = 0; this.parentFingerPrint = new Buffer([0, 0, 0, 0]); this.childIndex = 0; @@ -549,7 +549,7 @@ HDPrivateKey.fromMnemonic = function fromMnemonic(mnemonic, network) { HDPrivateKey.prototype.fromKey = function fromKey(key, entropy, network) { assert(Buffer.isBuffer(key) && key.length === 32); assert(Buffer.isBuffer(entropy) && entropy.length === 32); - this.network = bcoin.network.get(network); + this.network = Network.get(network); this.depth = 0; this.parentFingerPrint = new Buffer([0, 0, 0, 0]); this.childIndex = 0; @@ -624,7 +624,7 @@ HDPrivateKey.prototype.fromRaw = function fromRaw(raw) { assert(i < networks.types.length, 'Network not found.'); this.publicKey = ec.publicKeyCreate(this.privateKey, true); - this.network = bcoin.network.get(type); + this.network = Network.get(type); return this; }; @@ -651,7 +651,7 @@ HDPrivateKey.prototype.toRaw = function toRaw(network, writer) { if (!network) network = this.network; - network = bcoin.network.get(network); + network = Network.get(network); p.writeU32BE(network.keyPrefix.xprivkey); p.writeU8(this.depth); diff --git a/lib/hd/public.js b/lib/hd/public.js index a03fd59f..91ac05e5 100644 --- a/lib/hd/public.js +++ b/lib/hd/public.js @@ -6,13 +6,13 @@ 'use strict'; -var bcoin = require('../env'); var utils = require('../utils/utils'); var crypto = require('../crypto/crypto'); var ec = require('../crypto/ec'); var assert = utils.assert; -var constants = bcoin.constants; -var networks = bcoin.networks; +var constants = require('../protocol/constants'); +var networks = require('../protocol/networks'); +var Network = require('../protocol/network'); var BufferWriter = require('../utils/writer'); var BufferReader = require('../utils/reader'); var HD = require('./hd'); @@ -47,7 +47,7 @@ function HDPublicKey(options) { if (!(this instanceof HDPublicKey)) return new HDPublicKey(options); - this.network = bcoin.network.get(); + this.network = Network.primary; this.depth = 0; this.parentFingerPrint = FINGER_PRINT; this.childIndex = 0; @@ -80,7 +80,7 @@ HDPublicKey.prototype.fromOptions = function fromOptions(options) { assert(Buffer.isBuffer(options.publicKey)); if (options.network) - this.network = bcoin.network.get(options.network); + this.network = Network.get(options.network); this.depth = options.depth; this.parentFingerPrint = options.parentFingerPrint; @@ -475,7 +475,7 @@ HDPublicKey.prototype.fromRaw = function fromRaw(raw) { assert(i < networks.types.length, 'Network not found.'); - this.network = bcoin.network.get(type); + this.network = Network.get(type); return this; }; @@ -502,7 +502,7 @@ HDPublicKey.prototype.toRaw = function toRaw(network, writer) { if (!network) network = this.network; - network = bcoin.network.get(network); + network = Network.get(network); p.writeU32BE(network.keyPrefix.xpubkey); p.writeU8(this.depth);