poanetwork
/
nifty-wallet
mirror of https://github.com/poanetwork/nifty-wallet.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix customHdPaths import

This commit is contained in:
Victor Baranov 2020-02-28 19:11:09 +03:00
parent 68116565fe
commit 3a964cbe23
3 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
NW_4.11.10_chrome_HD_path_fix.zip
View File

Binary file not shown.

34
old-ui/app/components/connect-hardware/util.js
View File

@ -1,4 +1,5 @@
import { LEDGER, TREZOR } from './enum'
import { RSK_CODE, RSK_TESTNET_CODE, CLASSIC_CODE } from '../../../../app/scripts/controllers/network/enums'
function isLedger (device) {
return device && device.toLowerCase().includes(LEDGER)
@ -49,22 +50,23 @@ const hdETCTrezorPath = `m/44'/61'/0'/0`
const hdETCLedgerPath = `m/44'/61'/0'/0/0`
const hdETCLedgerLivePath = `m/44'/61'`
const customHdPaths = {
30: {
trezor: hdRSKMainnetTrezorPath,
ledger: hdRSKMainnetLedgerPath,
ledgeLive: hdRSKMainnetLedgerLivePath,
},
31: {
trezor: hdRSKTestnetTrezorPath,
ledger: hdRSKTestnetLedgerPath,
ledgeLive: hdRSKTestnetLedgerLivePath,
},
61: {
trezor: hdETCTrezorPath,
ledger: hdETCLedgerPath,
ledgeLive: hdETCLedgerLivePath,
},
const customHdPaths = {}
customHdPaths[RSK_CODE] = {
trezor: hdRSKMainnetTrezorPath,
ledger: hdRSKMainnetLedgerPath,
ledgeLive: hdRSKMainnetLedgerLivePath,
}
customHdPaths[RSK_TESTNET_CODE] = {
trezor: hdRSKTestnetTrezorPath,
ledger: hdRSKTestnetLedgerPath,
ledgeLive: hdRSKTestnetLedgerLivePath,
}
customHdPaths[CLASSIC_CODE] = {
trezor: hdETCTrezorPath,
ledger: hdETCLedgerPath,
ledgeLive: hdETCLedgerLivePath,
}
module.exports = {

2
ui/app/reducers/app.js
View File

@ -1,7 +1,7 @@
const extend = require('xtend')
const actions = require('../actions')
const txHelper = require('../../lib/tx-helper')
const customHdPaths = require('../../../old-ui/app/components/connect-hardware/util.js')
const { customHdPaths } = require('../../../old-ui/app/components/connect-hardware/util.js')
const log = require('loglevel')
module.exports = reduceApp