mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-08 22:14:29 +00:00
accounts: fix Ledger Live account derivation path (clef) (#21757)
* signer/core/api: fix derivation of ledger live accounts For ledger hardware wallets, change account iteration as follows: - ledger legacy: m/44'/60'/0'/X; for 0<=X<5 - ledger live: m/44'/60'/0'/0/X; for 0<=X<5 - ledger legacy: m/44'/60'/0'/X; for 0<=X<10 - ledger live: m/44'/60'/X'/0/0; for 0<=X<10 Non-ledger derivation is unchanged and remains as: - non-ledger: m/44'/60'/0'/0/X; for 0<=X<10 * signer/core/api: derive ten default paths for all hardware wallets, plus ten legacy and ten live paths for ledger wallets * signer/core/api: as .../0'/0/0 already included by default paths, do not include it again with ledger live paths * accounts, signer: implement path iterators for hd wallets Co-authored-by: Martin Holst Swende <martin@swende.se>
This commit is contained in:
parent
25284155d8
commit
ddea01dc9c
2 changed files with 67 additions and 0 deletions
|
|
@ -150,3 +150,31 @@ func (path *DerivationPath) UnmarshalJSON(b []byte) error {
|
||||||
*path, err = ParseDerivationPath(dp)
|
*path, err = ParseDerivationPath(dp)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// DefaultIterator creates a BIP-32 path iterator, which progresses by increasing the last component:
|
||||||
|
// i.e. m/44'/60'/0'/0/0, m/44'/60'/0'/0/1, m/44'/60'/0'/0/2, ... m/44'/60'/0'/0/N.
|
||||||
|
func DefaultIterator(base DerivationPath) func() DerivationPath {
|
||||||
|
path := make(DerivationPath, len(base))
|
||||||
|
copy(path[:], base[:])
|
||||||
|
// Set it back by one, so the first call gives the first result
|
||||||
|
path[len(path)-1]--
|
||||||
|
return func() DerivationPath {
|
||||||
|
path[len(path)-1]++
|
||||||
|
return path
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// LedgerLiveIterator creates a bip44 path iterator for Ledger Live.
|
||||||
|
// Ledger Live increments the third component rather than the fifth component
|
||||||
|
// i.e. m/44'/60'/0'/0/0, m/44'/60'/1'/0/0, m/44'/60'/2'/0/0, ... m/44'/60'/N'/0/0.
|
||||||
|
func LedgerLiveIterator(base DerivationPath) func() DerivationPath {
|
||||||
|
path := make(DerivationPath, len(base))
|
||||||
|
copy(path[:], base[:])
|
||||||
|
// Set it back by one, so the first call gives the first result
|
||||||
|
path[2]--
|
||||||
|
return func() DerivationPath {
|
||||||
|
// ledgerLivePathIterator iterates on the third component
|
||||||
|
path[2]++
|
||||||
|
return path
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,7 @@
|
||||||
package accounts
|
package accounts
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"fmt"
|
||||||
"reflect"
|
"reflect"
|
||||||
"testing"
|
"testing"
|
||||||
)
|
)
|
||||||
|
|
@ -77,3 +78,41 @@ func TestHDPathParsing(t *testing.T) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func testDerive(t *testing.T, next func() DerivationPath, expected []string) {
|
||||||
|
t.Helper()
|
||||||
|
for i, want := range expected {
|
||||||
|
if have := next(); fmt.Sprintf("%v", have) != want {
|
||||||
|
t.Errorf("step %d, have %v, want %v", i, have, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestHdPathIteration(t *testing.T) {
|
||||||
|
testDerive(t, DefaultIterator(DefaultBaseDerivationPath),
|
||||||
|
[]string{
|
||||||
|
"m/44'/60'/0'/0/0", "m/44'/60'/0'/0/1",
|
||||||
|
"m/44'/60'/0'/0/2", "m/44'/60'/0'/0/3",
|
||||||
|
"m/44'/60'/0'/0/4", "m/44'/60'/0'/0/5",
|
||||||
|
"m/44'/60'/0'/0/6", "m/44'/60'/0'/0/7",
|
||||||
|
"m/44'/60'/0'/0/8", "m/44'/60'/0'/0/9",
|
||||||
|
})
|
||||||
|
|
||||||
|
testDerive(t, DefaultIterator(LegacyLedgerBaseDerivationPath),
|
||||||
|
[]string{
|
||||||
|
"m/44'/60'/0'/0", "m/44'/60'/0'/1",
|
||||||
|
"m/44'/60'/0'/2", "m/44'/60'/0'/3",
|
||||||
|
"m/44'/60'/0'/4", "m/44'/60'/0'/5",
|
||||||
|
"m/44'/60'/0'/6", "m/44'/60'/0'/7",
|
||||||
|
"m/44'/60'/0'/8", "m/44'/60'/0'/9",
|
||||||
|
})
|
||||||
|
|
||||||
|
testDerive(t, LedgerLiveIterator(DefaultBaseDerivationPath),
|
||||||
|
[]string{
|
||||||
|
"m/44'/60'/0'/0/0", "m/44'/60'/1'/0/0",
|
||||||
|
"m/44'/60'/2'/0/0", "m/44'/60'/3'/0/0",
|
||||||
|
"m/44'/60'/4'/0/0", "m/44'/60'/5'/0/0",
|
||||||
|
"m/44'/60'/6'/0/0", "m/44'/60'/7'/0/0",
|
||||||
|
"m/44'/60'/8'/0/0", "m/44'/60'/9'/0/0",
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue