feat: support non-vbank purses (#37)

samsiegart · web-flow · commit e2665deeb83c · 2023-08-25T17:46:56.000Z
* feat: support non-vbank purses

* fix: backwards compatible without boardAux
diff --git a/packages/rpc/src/chainStorageWatcher.ts b/packages/rpc/src/chainStorageWatcher.ts
@@ -201,10 +201,37 @@ export const makeAgoricChainStorageWatcher = (
     return () => stopWatching(pathKey, subscriber as Subscriber<unknown>);
   };
 
+  const queryOnce = <T>(path: [AgoricChainStoragePathKind, string]) =>
+    new Promise<T>((res, rej) => {
+      const stop = watchLatest<T>(
+        path,
+        val => {
+          stop();
+          res(val);
+        },
+        e => rej(e),
+      );
+    });
+
+  // Assumes argument is an unserialized presence.
+  const presenceToSlot = (o: unknown) => marshaller.toCapData(o).slots[0];
+
+  const queryBoardAux = <T>(boardObjects: unknown[]) => {
+    const boardIds = boardObjects.map(presenceToSlot);
+    return boardIds.map(id =>
+      queryOnce<T>([
+        AgoricChainStoragePathKind.Data,
+        `published.boardAux.${id}`,
+      ]),
+    );
+  };
+
   return {
     watchLatest,
     chainId,
     rpcAddr,
     marshaller,
+    queryOnce,
+    queryBoardAux,
   };
 };
diff --git a/packages/rpc/test/chainStorageWatcher.test.ts b/packages/rpc/test/chainStorageWatcher.test.ts
@@ -43,7 +43,7 @@ describe('makeAgoricChainStorageWatcher', () => {
   it('can handle multiple paths at once', async () => {
     const expected1 = 'test result';
     const expected2 = ['child1', 'child2'];
-    const path = 'published.vitest.fakePath';
+    const path = 'vitest.fakePath';
 
     fetch.mockResolvedValue(
       createFetchResponse([
@@ -91,7 +91,7 @@ describe('makeAgoricChainStorageWatcher', () => {
 
   it('can handle unserialized values', async () => {
     const expected = 126560000000;
-    const path = 'published.vitest.unserializedValue';
+    const path = 'vitest.unserializedValue';
 
     fetch.mockResolvedValue(
       createUnserializedFetchResponse([
@@ -110,9 +110,32 @@ describe('makeAgoricChainStorageWatcher', () => {
     expect(await value).toEqual(expected);
   });
 
+  it('can do single queries', async () => {
+    const expected = 126560000000;
+    const path = 'vitest.unserializedValue';
+
+    fetch.mockResolvedValue(
+      createUnserializedFetchResponse([
+        { value: expected, kind: AgoricChainStoragePathKind.Data, id: 0 },
+      ]),
+    );
+
+    const value = watcher.queryOnce<string>([
+      AgoricChainStoragePathKind.Data,
+      path,
+    ]);
+
+    vi.advanceTimersToNextTimer();
+    expect(await value).toEqual(expected);
+    expect(fetch).toHaveBeenCalledOnce();
+
+    vi.advanceTimersToNextTimer();
+    expect(fetch).toHaveBeenCalledOnce();
+  });
+
   it('notifies for changed data values', async () => {
     const expected1 = 'test result';
-    const path = 'published.vitest.fakePath';
+    const path = 'vitest.fakePath';
 
     fetch.mockResolvedValue(
       createFetchResponse([
@@ -159,7 +182,7 @@ describe('makeAgoricChainStorageWatcher', () => {
 
   it('notifies for changed children values', async () => {
     const expected1 = ['child1', 'child2'];
-    const path = 'published.vitest.fakePath';
+    const path = 'vitest.fakePath';
 
     fetch.mockResolvedValue(
       createFetchResponse([
@@ -204,7 +227,7 @@ describe('makeAgoricChainStorageWatcher', () => {
 
   it('handles errors', async () => {
     const expected = 'test error log';
-    const path = 'published.vitest.fakePath';
+    const path = 'vitest.fakePath';
 
     fetch.mockResolvedValue(
       createFetchResponse([
@@ -232,7 +255,7 @@ describe('makeAgoricChainStorageWatcher', () => {
 
   it('can unsubscribe from paths', async () => {
     const expected1 = ['child1', 'child2'];
-    const path = 'published.vitest.fakePath';
+    const path = 'vitest.fakePath';
 
     fetch.mockResolvedValue(
       createFetchResponse([
diff --git a/packages/web-components/src/wallet-connection/watchWallet.js b/packages/web-components/src/wallet-connection/watchWallet.js
@@ -7,6 +7,8 @@ import { queryBankBalances } from '../queryBankBalances.js';
 
 /** @typedef {import('@agoric/smart-wallet/src/types.js').Petname} Petname */
 
+/** @typedef {import('@keplr-wallet/types').Coin} Coin */
+
 /**
  * @typedef {{
  *  brand?: unknown,
@@ -17,6 +19,17 @@ import { queryBankBalances } from '../queryBankBalances.js';
  * }} PurseInfo
  */
 
+/**
+ * @typedef {[
+ *  string,
+ *  {
+ *    brand: unknown,
+ *    issuerName: string,
+ *    displayInfo: unknown
+ *  }
+ * ][]} VBankAssets
+ */
+
 const POLL_INTERVAL_MS = 6000;
 
 /**
@@ -82,51 +95,128 @@ export const watchWallet = async (chainStorageWatcher, address) => {
 
   const watchChainBalances = () => {
     const brandToPurse = new Map();
-    let vbankAssets;
-    let bank;
-
-    const possiblyUpdateBankPurses = () => {
-      if (!vbankAssets || !bank) return;
-
-      const bankMap = new Map(bank.map(({ denom, amount }) => [denom, amount]));
-
-      vbankAssets.forEach(([denom, info]) => {
-        const amount = bankMap.get(denom) ?? 0n;
-        const purseInfo = {
-          brand: info.brand,
-          currentAmount: AmountMath.make(info.brand, BigInt(amount)),
-          brandPetname: info.issuerName,
-          pursePetname: info.issuerName,
-          displayInfo: info.displayInfo,
-        };
-        brandToPurse.set(info.brand, purseInfo);
-      });
-
-      updatePurses(brandToPurse);
-    };
-
-    const watchBank = async () => {
-      const balances = await queryBankBalances(
-        address,
-        chainStorageWatcher.rpcAddr,
-      );
-      bank = balances;
-      possiblyUpdateBankPurses();
-      setTimeout(watchBank, POLL_INTERVAL_MS);
-    };
 
-    const watchVbankAssets = async () => {
-      chainStorageWatcher.watchLatest(
-        ['data', 'published.agoricNames.vbankAsset'],
-        value => {
-          vbankAssets = value;
-          possiblyUpdateBankPurses();
-        },
-      );
-    };
+    {
+      /** @type {VBankAssets} */
+      let vbankAssets;
+      /** @type {Coin[]} */
+      let bank;
+
+      const possiblyUpdateBankPurses = () => {
+        if (!vbankAssets || !bank) return;
+
+        const bankMap = new Map(
+          bank.map(({ denom, amount }) => [denom, amount]),
+        );
+
+        vbankAssets.forEach(([denom, info]) => {
+          const amount = bankMap.get(denom) ?? 0n;
+          const purseInfo = {
+            brand: info.brand,
+            currentAmount: AmountMath.make(info.brand, BigInt(amount)),
+            brandPetname: info.issuerName,
+            pursePetname: info.issuerName,
+            displayInfo: info.displayInfo,
+          };
+          brandToPurse.set(info.brand, purseInfo);
+        });
+
+        updatePurses(brandToPurse);
+      };
+
+      const watchBank = async () => {
+        const balances = await queryBankBalances(
+          address,
+          chainStorageWatcher.rpcAddr,
+        );
+        bank = balances;
+        possiblyUpdateBankPurses();
+        setTimeout(watchBank, POLL_INTERVAL_MS);
+      };
+
+      const watchVbankAssets = () => {
+        chainStorageWatcher.watchLatest(
+          ['data', 'published.agoricNames.vbankAsset'],
+          value => {
+            vbankAssets = value;
+            possiblyUpdateBankPurses();
+          },
+        );
+      };
+
+      void watchVbankAssets();
+      void watchBank();
+    }
 
-    void watchVbankAssets();
-    void watchBank();
+    {
+      /** @type { [string, unknown][] } */
+      let agoricBrands;
+      /** @type { {balance: unknown, brand: unknown}[] } */
+      let nonBankPurses;
+      /** @type { Map<unknown, { displayInfo: unknown }> } */
+      let brandToBoardAux;
+
+      const possiblyUpdateNonBankPurses = () => {
+        if (!agoricBrands || !nonBankPurses || !brandToBoardAux) return;
+
+        nonBankPurses.forEach(({ balance, brand }) => {
+          const petname = agoricBrands
+            ?.find(([_petname, b]) => b === brand)
+            ?.at(0);
+          const { displayInfo } = brandToBoardAux.get(brand) ?? {};
+          const purseInfo = {
+            brand,
+            currentAmount: balance,
+            brandPetname: petname,
+            pursePetname: petname,
+            displayInfo,
+          };
+          brandToPurse.set(brand, purseInfo);
+        });
+
+        updatePurses(brandToPurse);
+      };
+
+      const watchBrands = () => {
+        chainStorageWatcher.watchLatest(
+          ['data', 'published.agoricNames.brand'],
+          value => {
+            agoricBrands = value;
+            possiblyUpdateNonBankPurses();
+          },
+        );
+      };
+
+      const watchPurses = () =>
+        chainStorageWatcher.watchLatest(
+          ['data', `published.wallet.${address}.current`],
+          async value => {
+            const { purses } = value;
+            if (nonBankPurses === purses) return;
+
+            await null;
+            if (purses.length !== nonBankPurses?.length) {
+              const brands = purses.map(p => p.brand);
+              try {
+                const boardAux = await Promise.all(
+                  chainStorageWatcher.queryBoardAux(brands),
+                );
+                brandToBoardAux = new Map(
+                  brands.map((brand, index) => [brand, boardAux[index]]),
+                );
+              } catch (e) {
+                console.error('Error getting boardAux for brands', brands, e);
+              }
+            }
+
+            nonBankPurses = purses;
+            possiblyUpdateNonBankPurses();
+          },
+        );
+
+      void watchBrands();
+      void watchPurses();
+    }
   };
 
   const watchWalletUpdates = async () => {
