Skip to content

Commit b8e8ec1

Browse files
authored
Merge pull request #228 from blocknative/fix/correct-derivation-paths
Make derivation paths match common implementations. Closes #227
2 parents ec13054 + f9d02dd commit b8e8ec1

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/modules/select/wallets/ledger.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,12 +148,12 @@ async function ledgerProvider(options: {
148148

149149
if (numberToGet > 1) {
150150
for (
151-
let i = addressesAlreadyFetched;
151+
let i = addressesAlreadyFetched > 1 ? addressesAlreadyFetched : 0;
152152
i < numberToGet + addressesAlreadyFetched;
153153
i++
154154
) {
155155
const ledgerLive = `${basePath}/${i}'/0/0`
156-
const legacy = `${basePath}/0'/${i}'`
156+
const legacy = `${basePath}/0'/${i}`
157157

158158
paths.push(ledgerLive, legacy)
159159
}

src/modules/select/wallets/trezor.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,11 +166,11 @@ async function trezorProvider(options: {
166166
}
167167

168168
for (
169-
let i = addressesAlreadyFetched;
169+
let i = addressesAlreadyFetched > 1 ? addressesAlreadyFetched : 0;
170170
i < accountsToGet + addressesAlreadyFetched;
171171
i++
172172
) {
173-
const path = `${basePath}/${i}'/0/0`
173+
const path = `${basePath}/0'/0/${i}`
174174
bundle.push({ path, showOnTrezor: false })
175175
}
176176

0 commit comments

Comments
 (0)