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 /signer/core | |
| 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 'signer/core')
| -rw-r--r-- | signer/core/api.go | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/signer/core/api.go b/signer/core/api.go index 0ed037fc2..671fbf79b 100644 --- a/signer/core/api.go +++ b/signer/core/api.go @@ -319,12 +319,10 @@ func (api *SignerAPI) startUSBListener() { status, _ := event.Wallet.Status() log.Info("New wallet appeared", "url", event.Wallet.URL(), "status", status) - derivationPath := accounts.DefaultBaseDerivationPath - if event.Wallet.URL().Scheme == "ledger" { - derivationPath = accounts.DefaultLedgerBaseDerivationPath - } - var nextPath = derivationPath // Derive first N accounts, hardcoded for now + var nextPath = make(accounts.DerivationPath, len(accounts.DefaultBaseDerivationPath)) + copy(nextPath[:], accounts.DefaultBaseDerivationPath[:]) + for i := 0; i < numberOfAccountsToDerive; i++ { acc, err := event.Wallet.Derive(nextPath, true) if err != nil { |