diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2019-04-10 18:09:08 +0800 |
|---|---|---|
| committer | Péter Szilágyi <peterke@gmail.com> | 2019-04-10 18:09:08 +0800 |
| commit | ae7344d7999723cfef99fd0e01acd12e20cd5a85 (patch) | |
| tree | 18396adfbbe92a26e202965c2d8f2699757bdeff /cmd | |
| parent | 8cf764da896d77ca2dc2181b24ea52839645185f (diff) | |
| download | go-tangerine-ae7344d7999723cfef99fd0e01acd12e20cd5a85.tar go-tangerine-ae7344d7999723cfef99fd0e01acd12e20cd5a85.tar.gz go-tangerine-ae7344d7999723cfef99fd0e01acd12e20cd5a85.tar.bz2 go-tangerine-ae7344d7999723cfef99fd0e01acd12e20cd5a85.tar.lz go-tangerine-ae7344d7999723cfef99fd0e01acd12e20cd5a85.tar.xz go-tangerine-ae7344d7999723cfef99fd0e01acd12e20cd5a85.tar.zst go-tangerine-ae7344d7999723cfef99fd0e01acd12e20cd5a85.zip | |
accounts: switch Ledger derivation path to canonical one
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/geth/main.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 4f3849a41..5425606f1 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -328,11 +328,13 @@ func startNode(ctx *cli.Context, stack *node.Node) { status, _ := event.Wallet.Status() log.Info("New wallet appeared", "url", event.Wallet.URL(), "status", status) - derivationPath := accounts.DefaultBaseDerivationPath + var derivationPaths []accounts.DerivationPath if event.Wallet.URL().Scheme == "ledger" { - derivationPath = accounts.DefaultLedgerBaseDerivationPath + derivationPaths = append(derivationPaths, accounts.LegacyLedgerBaseDerivationPath) } - event.Wallet.SelfDerive(derivationPath, stateReader) + derivationPaths = append(derivationPaths, accounts.DefaultBaseDerivationPath) + + event.Wallet.SelfDerive(derivationPaths, stateReader) case accounts.WalletDropped: log.Info("Old wallet dropped", "url", event.Wallet.URL()) |