aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHsuan Lee <hsuan@cobinhood.com>2018-12-05 14:38:14 +0800
committerHsuan Lee <hsuan@cobinhood.com>2018-12-10 18:53:27 +0800
commit70020380fbce25c2dd6c36734b4b77f2a5d69b78 (patch)
tree16fa2871f8e62068d8fbc8173d0bb73c6ee0913c
parentc941911cf37a9baff8f40023b57ab413190b1a46 (diff)
downloaddexon-wallet-70020380fbce25c2dd6c36734b4b77f2a5d69b78.tar.gz
dexon-wallet-70020380fbce25c2dd6c36734b4b77f2a5d69b78.tar.zst
dexon-wallet-70020380fbce25c2dd6c36734b4b77f2a5d69b78.zip
Update coin type
-rw-r--r--app/scripts/lib/seed-phrase-verifier.js4
-rw-r--r--app/scripts/metamask-controller.js2
-rw-r--r--package.json1
-rw-r--r--ui/app/components/pages/create-account/connect-hardware/account-list.js4
-rw-r--r--ui/app/reducers/app.js4
5 files changed, 9 insertions, 6 deletions
diff --git a/app/scripts/lib/seed-phrase-verifier.js b/app/scripts/lib/seed-phrase-verifier.js
index 3b5afb80..a1a3ebde 100644
--- a/app/scripts/lib/seed-phrase-verifier.js
+++ b/app/scripts/lib/seed-phrase-verifier.js
@@ -1,5 +1,6 @@
-const KeyringController = require('eth-keyring-controller')
+const KeyringController = require('@dexon-foundation/dexon-keyring-controller')
const log = require('loglevel')
+const hdPathString = `m/44'/237'/0'/0`
const seedPhraseVerifier = {
@@ -29,6 +30,7 @@ const seedPhraseVerifier = {
const opts = {
mnemonic: seedWords,
numberOfAccounts: createdAccounts.length,
+ hdPath: hdPathString,
}
const keyring = new Keyring(opts)
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 963ffefa..19faffa2 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -20,7 +20,7 @@ const createOriginMiddleware = require('./lib/createOriginMiddleware')
const createLoggerMiddleware = require('./lib/createLoggerMiddleware')
const createProviderMiddleware = require('./lib/createProviderMiddleware')
const setupMultiplex = require('./lib/stream-utils.js').setupMultiplex
-const KeyringController = require('eth-keyring-controller')
+const KeyringController = require('@dexon-foundation/dexon-keyring-controller')
const NetworkController = require('./controllers/network')
const PreferencesController = require('./controllers/preferences')
const CurrencyController = require('./controllers/currency')
diff --git a/package.json b/package.json
index 52e3fb5e..495c3870 100644
--- a/package.json
+++ b/package.json
@@ -82,6 +82,7 @@
"dependencies": {
"@sentry/browser": "^4.1.1",
"@dexon-foundation/dekusan-inpage-provider": "^1.2.3",
+ "@dexon-foundation/dexon-keyring-controller": "^4.0.0",
"@dexon-foundation/jazzicon": "^2.0.0",
"@material-ui/core": "^3.1.0",
"@zxing/library": "^0.8.0",
diff --git a/ui/app/components/pages/create-account/connect-hardware/account-list.js b/ui/app/components/pages/create-account/connect-hardware/account-list.js
index 8c187604..1a900f44 100644
--- a/ui/app/components/pages/create-account/connect-hardware/account-list.js
+++ b/ui/app/components/pages/create-account/connect-hardware/account-list.js
@@ -14,11 +14,11 @@ class AccountList extends Component {
return [
{
label: `Ledger Live`,
- value: `m/44'/60'/0'/0/0`,
+ value: `m/44'/237'/0'/0/0`,
},
{
label: `Legacy (MEW / MyCrypto)`,
- value: `m/44'/60'/0'`,
+ value: `m/44'/237'/0'`,
},
]
}
diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js
index 297a3c94..307ef31c 100644
--- a/ui/app/reducers/app.js
+++ b/ui/app/reducers/app.js
@@ -73,8 +73,8 @@ function reduceApp (state, action) {
gasIsLoading: false,
networkNonce: null,
defaultHdPaths: {
- trezor: `m/44'/60'/0'/0`,
- ledger: `m/44'/60'/0'/0/0`,
+ trezor: `m/44'/237'/0'/0`,
+ ledger: `m/44'/237'/0'/0/0`,
},
}, state.appState)