refactor: account interfaces (#202)

tien · Sep 26, 2024 · e5dd504 · e5dd504
1 parent 444d164
commit e5dd504
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 38 deletions.
diff --git a/packages/core/src/actions/get-accounts.ts b/packages/core/src/actions/get-accounts.ts
@@ -1,5 +1,6 @@
-import type { MaybeAsync, PolkadotAccount } from "../types.js";
+import type { MaybeAsync } from "../types.js";
 import { toObservable } from "../utils.js";
+import type { WalletAccount } from "../wallets/account.js";
 import type { Wallet } from "../wallets/wallet.js";
 import type { ChainSpecData } from "@polkadot-api/substrate-client";
 import { AccountId } from "polkadot-api";
@@ -21,15 +22,18 @@ export function getAccounts(
       const ss58Format =
         typeof maybeSs58Format === "number" ? maybeSs58Format : undefined;
 
-      const ss58AccountId =
-        ss58Format === undefined ? undefined : AccountId(ss58Format);
+      const ss58AccountId = AccountId(ss58Format);
 
       return combineLatest(
         wallets.map((wallet) =>
           wallet.accounts$.pipe(
             map((accounts) =>
               accounts.map(
-                (account): PolkadotAccount => ({ ...account, wallet }),
+                (account): WalletAccount => ({
+                  ...account,
+                  address: ss58AccountId.dec(account.polkadotSigner.publicKey),
+                  wallet,
+                }),
               ),
             ),
           ),
@@ -40,22 +44,11 @@ export function getAccounts(
           chainSpec === undefined
             ? (accounts) => accounts
             : (accounts) =>
-                accounts
-                  .filter(
-                    (account) =>
-                      !account.genesisHash ||
-                      chainSpec.genesisHash.includes(account.genesisHash),
-                  )
-                  .map((account) =>
-                    ss58AccountId === undefined
-                      ? account
-                      : {
-                          ...account,
-                          address: ss58AccountId.dec(
-                            ss58AccountId.enc(account.address),
-                          ),
-                        },
-                  ),
+                accounts.filter(
+                  (account) =>
+                    !account.genesisHash ||
+                    chainSpec.genesisHash.includes(account.genesisHash),
+                ),
         ),
       );
     }),

diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -19,4 +19,3 @@ export { MutationError, QueryError, ReactiveDotError } from "./errors.js";
 export { Query } from "./query-builder.js";
 export { PrefixedStorage } from "./storage.js";
 export { idle, pending } from "./symbols.js";
-export type { PolkadotAccount } from "./types.js";
diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts
@@ -1,9 +1,5 @@
-import type { Wallet } from "./wallets/wallet.js";
-import type { InjectedPolkadotAccount } from "polkadot-api/pjs-signer";
 import type { Observable } from "rxjs";
 
 export type Gettable<T> = T | PromiseLike<T> | (() => T | PromiseLike<T>);
 
 export type MaybeAsync<T> = T | Promise<T> | Observable<T>;
-
-export type PolkadotAccount = InjectedPolkadotAccount & { wallet: Wallet };
diff --git a/packages/core/src/wallets/account.ts b/packages/core/src/wallets/account.ts
@@ -0,0 +1,16 @@
+import type { Wallet } from "./wallet.js";
+import type { InjectedPolkadotAccount } from "polkadot-api/pjs-signer";
+
+export type PolkadotSignerAccount = {
+  polkadotSigner: InjectedPolkadotAccount["polkadotSigner"];
+  genesisHash?: InjectedPolkadotAccount["genesisHash"];
+};
+
+export type PolkadotAccount = PolkadotSignerAccount & {
+  address: string;
+};
+
+export type WalletAccount = PolkadotAccount & {
+  name?: string;
+  wallet: Wallet;
+};
diff --git a/packages/core/src/wallets/index.ts b/packages/core/src/wallets/index.ts
@@ -1,3 +1,8 @@
+export type {
+  PolkadotAccount,
+  PolkadotSignerAccount,
+  WalletAccount,
+} from "./account.js";
 export { WalletAggregator } from "./aggregator.js";
 export { DeepLinkWallet } from "./deep-link-wallet.js";
 export { initializeWallets } from "./initialize-wallets.js";

diff --git a/packages/core/src/wallets/injected/wallet.ts b/packages/core/src/wallets/injected/wallet.ts
@@ -1,9 +1,9 @@
 import { ReactiveDotError } from "../../errors.js";
+import type { PolkadotSignerAccount } from "../account.js";
 import { Wallet, type WalletOptions } from "../wallet.js";
 import {
   connectInjectedExtension,
   type InjectedExtension,
-  type InjectedPolkadotAccount,
 } from "polkadot-api/pjs-signer";
 import { BehaviorSubject, Observable } from "rxjs";
 import { map, switchMap } from "rxjs/operators";
@@ -50,7 +50,7 @@ export class InjectedWallet extends Wallet {
   override readonly accounts$ = this.#extension$.pipe(
     switchMap(
       (extension) =>
-        new Observable<InjectedPolkadotAccount[]>((subscriber) => {
+        new Observable<PolkadotSignerAccount[]>((subscriber) => {
           if (extension === undefined) {
             subscriber.next([]);
           } else {

diff --git a/packages/core/src/wallets/wallet.ts b/packages/core/src/wallets/wallet.ts
@@ -1,5 +1,5 @@
 import { type PrefixedStorage, defaultStorage } from "../storage.js";
-import type { InjectedPolkadotAccount } from "polkadot-api/pjs-signer";
+import type { PolkadotSignerAccount } from "./account.js";
 import type { Observable } from "rxjs";
 
 export type WalletOptions = {
@@ -29,9 +29,9 @@ export abstract class Wallet {
 
   abstract disconnect(): void | Promise<void>;
 
-  abstract readonly accounts$: Observable<InjectedPolkadotAccount[]>;
+  abstract readonly accounts$: Observable<PolkadotSignerAccount[]>;
 
   abstract getAccounts():
-    | InjectedPolkadotAccount[]
-    | Promise<InjectedPolkadotAccount[]>;
+    | PolkadotSignerAccount[]
+    | Promise<PolkadotSignerAccount[]>;
 }
diff --git a/packages/react/src/stores/accounts.ts b/packages/react/src/stores/accounts.ts
@@ -1,20 +1,16 @@
 import { withAtomFamilyErrorCatcher } from "../utils/jotai.js";
 import { chainSpecDataAtomFamily } from "./client.js";
 import { walletsAtom } from "./wallets.js";
-import {
-  type Config,
-  getAccounts,
-  type ChainId,
-  type PolkadotAccount,
-} from "@reactive-dot/core";
+import { getAccounts, type ChainId, type Config } from "@reactive-dot/core";
+import type { WalletAccount } from "@reactive-dot/core/wallets.js";
 import type { Atom } from "jotai";
 import { atomFamily, atomWithObservable } from "jotai/utils";
 
 export const accountsAtom = atomFamily(
   (param: {
     config: Config;
     chainId: ChainId | undefined;
-  }): Atom<PolkadotAccount[] | Promise<PolkadotAccount[]>> =>
+  }): Atom<WalletAccount[] | Promise<WalletAccount[]>> =>
     withAtomFamilyErrorCatcher(
       accountsAtom,
       param,