diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2019-04-25 18:33:17 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-25 18:33:17 +0800 |
| commit | 7c91038bff21b9085f61108d75716e2d57cdca8b (patch) | |
| tree | a6c978a658a75dd1f4138c574e37075c44cc72ed /cmd | |
| parent | 749ccab9a4fb778c144f2e435249a8bb697e974e (diff) | |
| parent | ae7344d7999723cfef99fd0e01acd12e20cd5a85 (diff) | |
| download | go-tangerine-7c91038bff21b9085f61108d75716e2d57cdca8b.tar go-tangerine-7c91038bff21b9085f61108d75716e2d57cdca8b.tar.gz go-tangerine-7c91038bff21b9085f61108d75716e2d57cdca8b.tar.bz2 go-tangerine-7c91038bff21b9085f61108d75716e2d57cdca8b.tar.lz go-tangerine-7c91038bff21b9085f61108d75716e2d57cdca8b.tar.xz go-tangerine-7c91038bff21b9085f61108d75716e2d57cdca8b.tar.zst go-tangerine-7c91038bff21b9085f61108d75716e2d57cdca8b.zip | |
Merge pull request #19438 from karalabe/ledger-new-derivation-path
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 c439e36fc..0e89481fe 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -342,11 +342,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()) |