Merge pull request #678 from wAISw/MINT-1595-Fix-addresses-on-login-w…

…ith-mnemonic-and-wallet-file MINT-1595 Fix addresses on login with mnemonic and wallet file
Chrono-Tech · Jun 19, 2018 · 8ebcaf3 · 8ebcaf3
2 parents 0bb2442 + cd3a93a
commit 8ebcaf3
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 24 deletions.
diff --git a/packages/login/network/BitcoinEngine.js b/packages/login/network/BitcoinEngine.js
@@ -33,7 +33,7 @@ export class BitcoinEngine {
   createNewChildAddress (deriveNumber = 0, coinType) {
     const wallet = bitcoin.HDNode
       .fromSeedBuffer(this._wallet.keyPair.d.toBuffer(), this._network)
-      .derivePath(`m/44'/${coinType}'/0'/0/${deriveNumber}`)
+      .derivePath(`m/44'/${coinType}'/0'/0/0/${deriveNumber}`)
 
     this._walletsMap[wallet.getAddress()] = wallet
 

diff --git a/packages/login/network/EthereumEngine.js b/packages/login/network/EthereumEngine.js
@@ -12,7 +12,7 @@ export default class EthereumEngine {
   constructor (wallet, network, url, engine, deriveNumber) {
     this._wallet = wallet
     this._network = network
-    const web3 = engine && new Web3(engine) 
+    const web3 = engine && new Web3(engine)
     try {
       this._address = engine && web3.eth.accounts[0]
     } catch (e) {
@@ -21,14 +21,14 @@ export default class EthereumEngine {
     this._engine = engine || Web3Utils.createEngine(wallet, url, deriveNumber)
   }
 
-  getNetwork() {
+  getNetwork () {
     return this._network
   }
 
   getAddress () {
     return this._address || this._wallet.getAddressString()
   }
- 
+
   getProvider () {
     return this._engine
   }

diff --git a/packages/login/network/mnemonicProvider.js b/packages/login/network/mnemonicProvider.js
@@ -31,7 +31,7 @@ export const COIN_TYPE_LTC_TESTNET = 8
 export const COIN_TYPE_BTG_MAINNET = 17
 export const COIN_TYPE_BTG_TESTNET = 16
 // get the first account using the standard hd path
-export const WALLET_HD_PATH = `m/44'/${COIN_TYPE_ETH}'/0'/0`
+export const WALLET_HD_PATH = `m/44'/${COIN_TYPE_ETH}'/0'/0/0`
 
 class MnemonicProvider {
   getMnemonicProvider (mnemonic, { url, network } = {}) {
@@ -90,7 +90,7 @@ class MnemonicProvider {
       : COIN_TYPE_BTC_MAINNET
     return bitcoin.HDNode
       .fromSeedBuffer(bip39.mnemonicToSeed(mnemonic), network)
-      .derivePath(`m/44'/${coinType}'/0'/0`)
+      .derivePath(`m/44'/${coinType}'/0'/0/0`)
   }
 
   createLitecoinWallet (mnemonic, network) {
@@ -99,7 +99,7 @@ class MnemonicProvider {
       : COIN_TYPE_LTC_MAINNET
     return bitcoin.HDNode
       .fromSeedBuffer(bip39.mnemonicToSeed(mnemonic), network)
-      .derivePath(`m/44'/${coinType}'/0'/0`)
+      .derivePath(`m/44'/${coinType}'/0'/0/0`)
   }
 
   createBitcoinGoldWallet (mnemonic, network) {
@@ -108,7 +108,7 @@ class MnemonicProvider {
       : COIN_TYPE_BTG_MAINNET
     return bitcoin.HDNode
       .fromSeedBuffer(bip39.mnemonicToSeed(mnemonic), network)
-      .derivePath(`m/44'/${coinType}'/0'/0`)
+      .derivePath(`m/44'/${coinType}'/0'/0/0`)
   }
 
   validateMnemonic (mnemonic) {

diff --git a/packages/login/network/privateKeyProvider.js b/packages/login/network/privateKeyProvider.js
@@ -85,7 +85,7 @@ class PrivateKeyProvider {
       : COIN_TYPE_BTC_MAINNET
     return bitcoin.HDNode
       .fromSeedBuffer(Buffer.from(privateKey, 'hex'), network)
-      .derivePath(`m/44'/${coinType}'/0'/0`)
+      .derivePath(`m/44'/${coinType}'/0'/0/0`)
   }
 
   createLitecoinWallet (privateKey, network) {
@@ -97,7 +97,7 @@ class PrivateKeyProvider {
       : COIN_TYPE_LTC_MAINNET
     return bitcoin.HDNode
       .fromSeedBuffer(Buffer.from(privateKey, 'hex'), network)
-      .derivePath(`m/44'/${coinType}'/0'/0`)
+      .derivePath(`m/44'/${coinType}'/0'/0/0`)
   }
 
   createBitcoinGoldWallet (privateKey, network) {
@@ -109,7 +109,7 @@ class PrivateKeyProvider {
       : COIN_TYPE_BTG_MAINNET
     return bitcoin.HDNode
       .fromSeedBuffer(Buffer.from(privateKey, 'hex'), network)
-      .derivePath(`m/44'/${coinType}'/0'/0`)
+      .derivePath(`m/44'/${coinType}'/0'/0/0`)
   }
 
   createEthereumWallet (privateKey) {

diff --git a/src/redux/mainWallet/actions.js b/src/redux/mainWallet/actions.js
@@ -263,11 +263,6 @@ export const initMainWallet = () => async (dispatch, getState) => {
       }),
     })
   })
-
-  const { isMnemonic, isWalletFile } = getState().get(DUCK_NETWORK)
-  if (isMnemonic || isWalletFile) {
-    dispatch(createPackChildWallets())
-  }
 }
 
 export const mainTransfer = (wallet: DerivedWalletModel, token: TokenModel, amount: Amount, recipient: string, feeMultiplier: Number = 1, additionalOptions = {}) => async (dispatch, getState) => {
@@ -428,11 +423,6 @@ export const getTokensBalancesAndWatch = (address, blockchain, customTokens: Arr
 
   await dao.watch(address)
 }
-export const createPackChildWallets = () => async (dispatch) => {
-  dispatch(createNewChildAddress({ blockchain: BLOCKCHAIN_ETHEREUM, deriveNumber: 0 }))
-  dispatch(createNewChildAddress({ blockchain: BLOCKCHAIN_BITCOIN, deriveNumber: 0 }))
-  dispatch(createNewChildAddress({ blockchain: BLOCKCHAIN_LITECOIN, deriveNumber: 0 }))
-}
 
 export const createNewChildAddress = ({ blockchain, tokens, name, deriveNumber }) => async (dispatch, getState) => {
   const account = getState().get(DUCK_SESSION).account
@@ -462,7 +452,7 @@ export const createNewChildAddress = ({ blockchain, tokens, name, deriveNumber }
 
   switch (blockchain) {
     case BLOCKCHAIN_ETHEREUM:
-      if (!newDeriveNumber) {
+      if (newDeriveNumber !== undefined) {
         newDeriveNumber = lastDeriveNumbers.hasOwnProperty(blockchain) ? lastDeriveNumbers[blockchain] + 1 : 0
       }
       newWallet = ethereumProvider.createNewChildAddress(newDeriveNumber)
@@ -471,15 +461,15 @@ export const createNewChildAddress = ({ blockchain, tokens, name, deriveNumber }
       ethereumProvider.addNewEthWallet(newDeriveNumber)
       break
     case BLOCKCHAIN_BITCOIN:
-      if (!newDeriveNumber) {
+      if (newDeriveNumber !== undefined) {
         newDeriveNumber = lastDeriveNumbers.hasOwnProperty(blockchain) ? lastDeriveNumbers[blockchain] + 1 : 0
       }
       newWallet = btcProvider.createNewChildAddress(newDeriveNumber)
       address = newWallet.getAddress()
       btcProvider.subscribeNewWallet(address)
       break
     case BLOCKCHAIN_LITECOIN:
-      if (!newDeriveNumber) {
+      if (newDeriveNumber !== undefined) {
         newDeriveNumber = lastDeriveNumbers.hasOwnProperty(blockchain) ? lastDeriveNumbers[blockchain] + 1 : 0
       }
       newWallet = ltcProvider.createNewChildAddress(newDeriveNumber)