From f0710d6bf5044be1326f2dbb319874fea23b6f7e Mon Sep 17 00:00:00 2001
From: Shun Usami <usatie@gmail.com>
Date: Sun, 22 Sep 2019 03:04:04 +0900
Subject: [PATCH] :bug: Fix HDWallet initializer to enable overriding  HDWallet

---
 Sources/BitcoinKit/Wallet/HDWallet.swift | 63 +++++++++++++-----------
 1 file changed, 34 insertions(+), 29 deletions(-)

diff --git a/Sources/BitcoinKit/Wallet/HDWallet.swift b/Sources/BitcoinKit/Wallet/HDWallet.swift
index 378b30f2..e0dc4666 100644
--- a/Sources/BitcoinKit/Wallet/HDWallet.swift
+++ b/Sources/BitcoinKit/Wallet/HDWallet.swift
@@ -86,22 +86,7 @@ open class HDWallet {
     /// [Cached] Addresses combined both external and internal.
     public var addresses: [BitcoinAddress] { return externalAddresses + internalAddresses }
 
-    private init(mnemonic: [String]?,
-                 seed: Data,
-                 externalIndex: UInt32,
-                 internalIndex: UInt32,
-                 network: Network,
-                 account: UInt32) {
-        self.mnemonic = mnemonic
-        self.seed = seed
-        self.network = network
-        self.account = account
-        self.externalIndex = externalIndex
-        self.internalIndex = internalIndex
-        self.keychain = HDKeychain(seed: seed, network: network)
-        self.rootXPrivKey = HDPrivateKey(seed: seed, network: network)
-        self.rootXPubKey = rootXPrivKey.extendedPublicKey()
-
+    private func initializeCache() {
         // Privkey cache
         self.externalPrivKeys = (0...externalIndex).map { privKey(index: $0, chain: .external) }
         self.internalPrivKeys = (0...internalIndex).map { privKey(index: $0, chain: .internal) }
@@ -115,22 +100,42 @@ open class HDWallet {
         self.internalAddresses = internalPubKeys.map { $0.toBitcoinAddress() }
     }
 
-    public convenience init(seed: Data,
-                            externalIndex: UInt32,
-                            internalIndex: UInt32,
-                            network: Network,
-                            account: UInt32 = 0) {
-        self.init(mnemonic: nil, seed: seed, externalIndex: externalIndex, internalIndex: internalIndex, network: network, account: account)
+    public init(seed: Data,
+                externalIndex: UInt32,
+                internalIndex: UInt32,
+                network: Network,
+                account: UInt32 = 0) {
+        self.mnemonic = nil
+        self.seed = seed
+        self.network = network
+        self.account = account
+        self.externalIndex = externalIndex
+        self.internalIndex = internalIndex
+        self.keychain = HDKeychain(seed: seed, network: network)
+        self.rootXPrivKey = HDPrivateKey(seed: seed, network: network)
+        self.rootXPubKey = rootXPrivKey.extendedPublicKey()
+
+        self.initializeCache()
     }
 
-    public convenience init(mnemonic: [String],
-                            passphrase: String,
-                            externalIndex: UInt32,
-                            internalIndex: UInt32,
-                            network: Network,
-                            account: UInt32 = 0) throws {
+    public init(mnemonic: [String],
+                passphrase: String,
+                externalIndex: UInt32,
+                internalIndex: UInt32,
+                network: Network,
+                account: UInt32 = 0) throws {
         let seed: Data = try Mnemonic.seed(mnemonic: mnemonic, passphrase: passphrase)
-        self.init(mnemonic: mnemonic, seed: seed, externalIndex: externalIndex, internalIndex: internalIndex, network: network, account: account)
+        self.mnemonic = mnemonic
+        self.seed = seed
+        self.network = network
+        self.account = account
+        self.externalIndex = externalIndex
+        self.internalIndex = internalIndex
+        self.keychain = HDKeychain(seed: seed, network: network)
+        self.rootXPrivKey = HDPrivateKey(seed: seed, network: network)
+        self.rootXPubKey = rootXPrivKey.extendedPublicKey()
+
+        self.initializeCache()
     }
 
     /// Create HDWallet by generating random mnemonic. Passphrase is used as salt to generate seed from the mnemonic.