From ae7344d7999723cfef99fd0e01acd12e20cd5a85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Wed, 10 Apr 2019 13:09:08 +0300 Subject: accounts: switch Ledger derivation path to canonical one --- signer/core/api.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'signer') diff --git a/signer/core/api.go b/signer/core/api.go index 9da6ee2a2..b662744bb 100644 --- a/signer/core/api.go +++ b/signer/core/api.go @@ -306,12 +306,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 { -- cgit v1.2.3