feat: allow subscribing to wallet offer changes

Author: michaelfig

packages/cosmic-swingset/lib/ag-solo/start.js

@@ -252,9 +252,7 @@ export default async function start(basedir, withSES, argv) {
           }
           break;
         case 'fake-chain': {
-          log(
-            `adding follower/sender for fake chain ${c.role} ${c.GCI}`,
-          );
+          log(`adding follower/sender for fake chain ${c.role} ${c.GCI}`);
           const deliverator = await connectToFakeChain(
             basedir,
             c.GCI,

packages/cosmic-swingset/lib/ag-solo/vats/lib-wallet.js

@@ -205,15 +205,14 @@ export async function makeWallet(
     return petnameToPurse.entries();
   }
 
-  function getOffers({ status = 'accept', origin = null } = {}) {
+  function getOffers({ origin = null } = {}) {
     // return the offers sorted by id
     return idToOffer
       .entries()
       .filter(
         ([_id, offer]) =>
-          (status === null || offer.status === status) &&
-          (origin === null ||
-            (offer.requestContext && offer.requestContext.origin === origin)),
+          origin === null ||
+          (offer.requestContext && offer.requestContext.origin === origin),
       )
       .sort(([id1], [id2]) => id1 > id2)
       .map(([_id, offer]) => harden(offer));

packages/cosmic-swingset/lib/ag-solo/vats/vat-wallet.js

@@ -9,6 +9,40 @@ function build(E, _D, _log) {
   let http;
   const adminHandles = new Set();
   const bridgeHandles = new Set();
+  const offerSubscriptions = new Map();
+
+  const pushOfferSubscriptions = (channelHandle, offersStr) => {
+    const offers = JSON.parse(offersStr);
+    const subs = offerSubscriptions.get(channelHandle);
+    (subs || []).forEach(({ origin, status }) => {
+      // Filter by optional status and origin.
+      const result = harden(
+        offers.filter(
+          offer =>
+            (status === null || offer.status === status) &&
+            offer.requestContext &&
+            offer.requestContext.origin === origin,
+        ),
+      );
+      E(http).send(
+        {
+          type: 'walletOfferDescriptions',
+          data: result,
+        },
+        [channelHandle],
+      );
+    });
+  };
+
+  const subscribeToOffers = (channelHandle, { origin, status = null }) => {
+    let subs = offerSubscriptions.get(channelHandle);
+    if (!subs) {
+      subs = [];
+      offerSubscriptions.set(channelHandle, subs);
+    }
+    subs.push({ origin, status });
+    pushOfferSubscriptions(channelHandle, inboxState);
+  };
 
   const { publish: pursesPublish, subscribe: purseSubscribe } = pubsub(E);
   const { publish: inboxPublish, subscribe: inboxSubscribe } = pubsub(E);
@@ -70,7 +104,7 @@ function build(E, _D, _log) {
 
       case 'walletGetOffers':
       case 'walletGetOfferDescriptions': {
-        const result = await wallet.getOffers(data);
+        const result = await wallet.getOffers({ origin: meta.origin });
         return {
           type: 'walletOfferDescriptions',
           data: result,
@@ -118,7 +152,10 @@ function build(E, _D, _log) {
               [...adminHandles.keys()],
             );
 
-            // TODO: Get subscribed offers, too.
+            // Get subscribed offers, too.
+            for (const channelHandle of offerSubscriptions.keys()) {
+              pushOfferSubscriptions(channelHandle, inboxState);
+            }
           }
         },
       }),
@@ -148,26 +185,50 @@ function build(E, _D, _log) {
           },
           onClose(_obj, meta) {
             bridgeHandles.delete(meta.channelHandle);
+            offerSubscriptions.delete(meta.channelHandle);
           },
 
           async onMessage(obj, meta) {
             const { type } = obj;
             switch (type) {
               case 'walletGetPurses':
               case 'walletAddOffer':
-                // Override the origin since we got it from the bridge.
-                return adminOnMessage(obj, {
-                  ...meta,
-                  origin: obj.dappOrigin,
+                return adminOnMessage(obj, meta);
+
+              case 'walletSubscribeOffers': {
+                const { status = null, dappOrigin } = obj;
+                const { channelHandle } = meta;
+
+                if (!channelHandle) {
+                  return {
+                    type: 'walletSubscribedOffers',
+                    data: false,
+                  };
+                }
+
+                // TODO: Maybe use the contract instanceId instead.
+                subscribeToOffers(channelHandle, {
+                  origin: dappOrigin,
+                  status,
                 });
+                return {
+                  type: 'walletSubscribedOffers',
+                  data: true,
+                };
+              }
 
               case 'walletGetOffers': {
-                const { status = null } = obj;
+                const { dappOrigin, status = null } = obj;
+
                 // Override the origin since we got it from the bridge.
-                const result = await wallet.getOffers({
-                  origin: obj.dappOrigin,
-                  status,
-                });
+                let result = await wallet.getOffers({ origin: dappOrigin });
+                if (status !== null) {
+                  // Filter by status.
+                  result = harden(
+                    result.filter(offer => offer.status === status),
+                  );
+                }
+
                 return {
                   type: 'walletOfferDescriptions',
                   data: result,