feat(bounties): make watch API singleton

polkadot-api · Jan 15, 2025 · 86e44b8 · 86e44b8
1 parent 95b4db8
commit 86e44b8
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 10 deletions.
diff --git a/packages/sdk-governance/src/bounties/bounties-sdk.ts b/packages/sdk-governance/src/bounties/bounties-sdk.ts
@@ -247,7 +247,7 @@ export function createBountiesSdk(typedApi: BountiesSdkTypedApi): BountiesSdk {
   }
 
   return {
-    watchBounties,
+    watch: watchBounties(),
     getBounties,
     getBounty,
     getProposedBounty,

diff --git a/packages/sdk-governance/src/bounties/child-bounties-sdk.ts b/packages/sdk-governance/src/bounties/child-bounties-sdk.ts
@@ -16,6 +16,7 @@ import {
   ChildBounty,
   GenericChildBounty,
 } from "./child-sdk-types"
+import { keyedMemo } from "@/util/memo"
 
 export function createChildBountiesSdk(
   typedApi: ChildBountiesSdkTypedApi,
@@ -180,7 +181,7 @@ export function createChildBountiesSdk(
   }
 
   return {
-    watchChildBounties,
+    watch: keyedMemo(watchChildBounties, new Map()),
     getChildBounty,
   }
 }
diff --git a/packages/sdk-governance/src/bounties/child-sdk-types.ts b/packages/sdk-governance/src/bounties/child-sdk-types.ts
@@ -58,7 +58,7 @@ export type ChildBounty =
   | PendingPayoutChildBounty
 
 export interface ChildBountiesSdk {
-  watchChildBounties(parentId: number): {
+  watch(parentId: number): {
     bounties$: Observable<Map<number, ChildBounty>>
     bountyIds$: Observable<number[]>
     getBountyById$: (key: number) => Observable<ChildBounty>

diff --git a/packages/sdk-governance/src/bounties/find-referenda.ts b/packages/sdk-governance/src/bounties/find-referenda.ts
@@ -1,5 +1,5 @@
 import { OngoingReferendum } from "@/referenda/sdk-types"
-import { weakMemo } from "@/util/memo"
+import { keyedMemo } from "@/util/memo"
 import { MultiAddress } from "./descriptors"
 
 const spenderOrigins = [
@@ -11,7 +11,7 @@ const spenderOrigins = [
   "BigTipper",
 ]
 
-const getDecodedSpenderReferenda = weakMemo(
+const getDecodedSpenderReferenda = keyedMemo(
   async (ongoingReferenda: OngoingReferendum[]) => {
     const spenderReferenda = ongoingReferenda.filter(
       (ref) =>
@@ -35,6 +35,7 @@ const getDecodedSpenderReferenda = weakMemo(
     )
     return response.filter((v) => !!v)
   },
+  new WeakMap(),
 )
 
 export async function findApprovingReferenda(

diff --git a/packages/sdk-governance/src/bounties/sdk-types.ts b/packages/sdk-governance/src/bounties/sdk-types.ts
@@ -94,7 +94,7 @@ export type Bounty =
   | PendingPayoutBounty
 
 export interface BountiesSdk {
-  watchBounties(): {
+  watch: {
     bounties$: Observable<Map<number, Bounty>>
     bountyIds$: Observable<number[]>
     getBountyById$: (key: number) => Observable<Bounty>

diff --git a/packages/sdk-governance/src/util/memo.ts b/packages/sdk-governance/src/util/memo.ts
@@ -1,12 +1,14 @@
-export const weakMemo = <Arg extends [object], R>(fn: (...arg: Arg) => R) => {
-  const cache = new WeakMap<Arg[0], R>()
-  return (...arg: Arg) => {
+export const keyedMemo =
+  <Arg extends [any], R>(
+    fn: (...arg: Arg) => R,
+    cache: Map<Arg[0], R> | WeakMap<Arg[0], R>,
+  ) =>
+  (...arg: Arg) => {
     if (cache.has(arg[0])) return cache.get(arg[0])!
     const result = fn(...arg)
     cache.set(arg[0], result)
     return result
   }
-}
 
 export const memo = <Arg extends Array<unknown>, R>(fn: (...arg: Arg) => R) => {
   let cachedKey: Arg | null = null