fix: read beansOwing correctly

Agoric · Jun 21, 2023 · 9c22de4 · 9c22de4
1 parent a9aee21
commit 9c22de4
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/wallet/src/rpc/src/batchQuery.ts b/wallet/src/rpc/src/batchQuery.ts
@@ -66,13 +66,19 @@ export const batchVstorageQuery = (
           }
 
           const value = JSON.parse(data.value);
+          const latestValueStr = Object.hasOwn(value, 'values')
+            ? value.values[value.values.length - 1]
+            : value;
+          const parsed = JSON.parse(latestValueStr);
+          const unserialized = Object.hasOwn(parsed, 'slots')
+            ? unserialize(parsed)
+            : parsed;
 
-          const latestValueStr = value.values[value.values.length - 1];
           return [
             pathToKey(paths[index]),
             {
               blockHeight: value.blockHeight,
-              value: unserialize(JSON.parse(latestValueStr)),
+              value: unserialized,
             },
           ];
         }),

diff --git a/wallet/src/util/WalletBackendAdapter.ts b/wallet/src/util/WalletBackendAdapter.ts
@@ -229,9 +229,14 @@ export const makeWalletBridgeFromFollowers = (
       watcher.watchLatest(
         [
           AgoricChainStoragePathKind.Data,
-          `published.beansOwing.${smartWalletKey.address}`,
+          `beansOwing.${smartWalletKey.address}`,
         ],
-        value => beansOwingUpdater.updateState(Number(value)),
+        value => {
+          beansOwingUpdater.updateState(Number(value));
+        },
+        err => {
+          console.error('error watching beansOwing', err);
+        },
       ),
     );
   };
@@ -309,7 +314,7 @@ export const makeWalletBridgeFromFollowers = (
       );
     });
 
-  const watchPendingOffers = async () => {
+  const watchPendingOffers = () => {
     stopWatchingHooks.push(
       watcher.watchLatest<Partial<CurrentWalletRecord>>(
         [
@@ -328,8 +333,8 @@ export const makeWalletBridgeFromFollowers = (
   const fetchCurrent = async () => {
     const resolvedFollower = await currentFollower;
     await assertHasData(resolvedFollower);
-    void watchBeansOwing();
-    void watchPendingOffers();
+    watchBeansOwing();
+    watchPendingOffers();
     watchChainBalances();
 
     const latestIterable = await E(resolvedFollower).getLatestIterable();