feat: sort Ledger accounts by derivation path

tien · Oct 6, 2024 · 25414fe · 25414fe
1 parent 962c468
commit 25414fe
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 30 deletions.
diff --git a/.changeset/chilly-pugs-poke.md b/.changeset/chilly-pugs-poke.md
@@ -0,0 +1,5 @@
+---
+"@reactive-dot/wallet-ledger": patch
+---
+
+Sort Ledger accounts by derivation path.
diff --git a/packages/wallet-ledger/src/ledger-wallet.ts b/packages/wallet-ledger/src/ledger-wallet.ts
@@ -29,37 +29,39 @@ export class LedgerWallet extends LocalWallet<LedgerAccount, "accounts"> {
 
   readonly accounts$ = this.#ledgerAccounts$.pipe(
     map((accounts) =>
-      accounts.map(
-        (account): PolkadotSignerAccount => ({
-          id: account.id,
-          ...(account.name === undefined ? {} : { name: account.name }),
-          polkadotSigner: ({ tokenSymbol, tokenDecimals }) => ({
-            publicKey: account.publicKey,
-            signTx: async (...args) => {
-              await this.#assertMatchingAccount(account);
-
-              const ledgerSigner = await this.#getOrCreateLedgerSigner();
-              const polkadotSigner = await ledgerSigner.getPolkadotSigner(
-                { tokenSymbol, decimals: tokenDecimals },
-                account.path,
-              );
-
-              return polkadotSigner.signTx(...args);
-            },
-            signBytes: async (...args) => {
-              await this.#assertMatchingAccount(account);
-
-              const ledgerSigner = await this.#getOrCreateLedgerSigner();
-              const polkadotSigner = await ledgerSigner.getPolkadotSigner(
-                { tokenSymbol, decimals: tokenDecimals },
-                account.path,
-              );
-
-              return polkadotSigner.signBytes(...args);
-            },
+      accounts
+        .toSorted((a, b) => a.path - b.path)
+        .map(
+          (account): PolkadotSignerAccount => ({
+            id: account.id,
+            ...(account.name === undefined ? {} : { name: account.name }),
+            polkadotSigner: ({ tokenSymbol, tokenDecimals }) => ({
+              publicKey: account.publicKey,
+              signTx: async (...args) => {
+                await this.#assertMatchingAccount(account);
+
+                const ledgerSigner = await this.#getOrCreateLedgerSigner();
+                const polkadotSigner = await ledgerSigner.getPolkadotSigner(
+                  { tokenSymbol, decimals: tokenDecimals },
+                  account.path,
+                );
+
+                return polkadotSigner.signTx(...args);
+              },
+              signBytes: async (...args) => {
+                await this.#assertMatchingAccount(account);
+
+                const ledgerSigner = await this.#getOrCreateLedgerSigner();
+                const polkadotSigner = await ledgerSigner.getPolkadotSigner(
+                  { tokenSymbol, decimals: tokenDecimals },
+                  account.path,
+                );
+
+                return polkadotSigner.signBytes(...args);
+              },
+            }),
           }),
-        }),
-      ),
+        ),
     ),
   );