lnd: fix another bug in key derivation

guggero · guggero · commit ece46945b131 · 2022-03-22T21:42:19.000+01:00
Turns out, the same "we create a default account immediately but any
other account is loaded from the DB" rule applies to the coin type key
too.
diff --git a/lnd/hdkeychain.go b/lnd/hdkeychain.go
@@ -45,7 +45,7 @@ func DeriveChildren(key *hdkeychain.ExtendedKey, path []uint32) (
 		// derived directly.
 		depth := derivedKey.Depth()
 		keyID := pathPart - hdkeychain.HardenedKeyStart
-		if (depth == 3 && keyID != 0) || depth == 2 {
+		if (depth == 3 && keyID != 0) || (depth == 2 && keyID != 0) {
 			currentKey, err = hdkeychain.NewKeyFromString(
 				derivedKey.String(),
 			)

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ func DeriveChildren(key *hdkeychain.ExtendedKey, path []uint32) (`
`45`	`45`	`// derived directly.`
`46`	`46`	`depth := derivedKey.Depth()`
`47`	`47`	`keyID := pathPart - hdkeychain.HardenedKeyStart`
`48`		`- if (depth == 3 && keyID != 0) \|\| depth == 2 {`
	`48`	`+ if (depth == 3 && keyID != 0) \|\| (depth == 2 && keyID != 0) {`
`49`	`49`	`currentKey, err = hdkeychain.NewKeyFromString(`
`50`	`50`	`derivedKey.String(),`
`51`	`51`	`)`