Merge pull request #1 from mhz987/xpub

Merged fix where account value was used instead of internal/external value when deriving addresses from xpub.
tboydston · Feb 9, 2022 · 0267d84 · 0267d84
2 parents 4bfeb44 + a2c93b0
commit 0267d84
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/hdAddressGenerator.js b/hdAddressGenerator.js
@@ -372,8 +372,8 @@ class AddressGenerator {
 
             keyPair.pairBuffers = {}
             keyPair.rawAddress = {}
-            keyPair.pairBuffers.publicKey = bip32.fromBase58(this.xpub).derive(this.account).derive(index).publicKey
-            keyPair.rawAddress.publicKey = bip32.fromBase58(this.xpub).derive(this.account).derive(index).publicKey
+            keyPair.pairBuffers.publicKey = bip32.fromBase58(this.xpub).derive(this.change).derive(index).publicKey
+            keyPair.rawAddress.publicKey = bip32.fromBase58(this.xpub).derive(this.change).derive(index).publicKey
             keyPair.privKey = ""
 
         }
@@ -413,7 +413,7 @@ class AddressGenerator {
             keyPair.rawPair = this.root.derivePath(keyPair.path)
         } else {
             keyPair.rawPair = {}
-            keyPair.rawPair.publicKey = bip32.fromBase58(this.xpub).derive(this.account).derive(index).publicKey
+            keyPair.rawPair.publicKey = bip32.fromBase58(this.xpub).derive(this.change).derive(index).publicKey
         }
 
         let ethPubkey = ethreumUtil.importPublic(keyPair.rawPair.publicKey)
@@ -441,7 +441,7 @@ class AddressGenerator {
             keyPair.ECPair =  bitcoin.ECPair.fromPrivateKey(keyPair.rawPair.privateKey, { network: this.coin.network.p2pkh, compressed: false })
         } else {
             keyPair.rawPair = {}
-            keyPair.rawPair.publicKey = bip32.fromBase58(this.xpub).derive(this.account).derive(index).publicKey
+            keyPair.rawPair.publicKey = bip32.fromBase58(this.xpub).derive(this.change).derive(index).publicKey
         }
 
 
@@ -468,7 +468,7 @@ class AddressGenerator {
             keyPair.rawPair = this.root.derivePath(keyPair.path)
         } else {
             keyPair.rawPair = {}
-            keyPair.rawPair.publicKey = bip32.fromBase58(this.xpub).derive(this.account).derive(index).publicKey
+            keyPair.rawPair.publicKey = bip32.fromBase58(this.xpub).derive(this.change).derive(index).publicKey
         }
 
         let ethPubkey = ethreumUtil.importPublic(keyPair.rawPair.publicKey)