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

Merge pull request #348 from poanetwork/vb-rollbackk-custom-dpath 

Rollback custom dPath for RSK/ETC
This commit is contained in:
Victor Baranov 2020-04-06 21:31:58 +03:00 committed by GitHub
parent 8a04cd5985 693cb8b8ce
commit 0fcceb6fd4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -2,6 +2,8 @@
## Current Master
- [#347](https://github.com/poanetwork/nifty-wallet/pull/347) - Rollback custom dPath for RSK/ETC
## 5.0.0 Tue Mar 31 2020
- [#340](https://github.com/poanetwork/nifty-wallet/pull/340), [#342](https://github.com/poanetwork/nifty-wallet/pull/342) - (Feature) Update in-page provider (EIP-1193)

6
old-ui/app/util.js
View File

@ -39,7 +39,7 @@ const {
RSK,
RSK_TESTNET,
RSK_TICK,
customDPaths,
// customDPaths,
} = require('../../app/scripts/controllers/network/enums')
var valueTable = {
@ -557,7 +557,9 @@ function getNetworkID ({ network }) {
}
function getDPath (network) {
return customDPaths[network] || `m/44'/60'/0'/0`
// todo: return when the robust solution will be ready
return `m/44'/60'/0'/0`
// return customDPaths[network] || `m/44'/60'/0'/0`
}
function setDPath (keyring, network) {