From bc4992ac65bba9007d44d242d6f0144072bf717b Mon Sep 17 00:00:00 2001
From: Michael FIG <mfig@agoric.com>
Date: Fri, 27 Nov 2020 09:30:56 -0600
Subject: [PATCH] fix: minor fixes while debugging purse notifiers

---
 .../cosmic-swingset/lib/ag-solo/fake-chain.js   |  3 ++-
 packages/cosmic-swingset/lib/ag-solo/start.js   | 17 +++++++++++++++--
 packages/dapp-svelte-wallet/api/deploy.js       |  1 -
 packages/dapp-svelte-wallet/api/package.json    |  3 +++
 packages/dapp-svelte-wallet/api/src/wallet.js   |  5 +++--
 .../api/test/test-lib-wallet.js                 |  4 ++--
 6 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/packages/cosmic-swingset/lib/ag-solo/fake-chain.js b/packages/cosmic-swingset/lib/ag-solo/fake-chain.js
index 48319fe6236..98defa168de 100644
--- a/packages/cosmic-swingset/lib/ag-solo/fake-chain.js
+++ b/packages/cosmic-swingset/lib/ag-solo/fake-chain.js
@@ -6,6 +6,7 @@ import {
   importMailbox,
   exportMailbox,
 } from '@agoric/swingset-vat/src/devices/mailbox';
+
 import anylogger from 'anylogger';
 
 import { launch } from '../launch-chain';
@@ -14,7 +15,7 @@ import { makeWithQueue } from './vats/queue';
 
 const log = anylogger('fake-chain');
 
-const PRETEND_BLOCK_DELAY = 5;
+const PRETEND_BLOCK_DELAY = 2;
 const scaleBlockTime = ms => Math.floor(ms / 1000);
 
 async function makeMapStorage(file) {
diff --git a/packages/cosmic-swingset/lib/ag-solo/start.js b/packages/cosmic-swingset/lib/ag-solo/start.js
index 24c84cb8074..118caabaa53 100644
--- a/packages/cosmic-swingset/lib/ag-solo/start.js
+++ b/packages/cosmic-swingset/lib/ag-solo/start.js
@@ -387,10 +387,20 @@ export default async function start(basedir, argv) {
 
   const agoricCli = require.resolve('.bin/agoric');
 
+  // Use the same verbosity as our caller did for us.
+  let verbosity;
+  if (process.env.DEBUG === undefined) {
+    verbosity = '';
+  } else if (process.env.DEBUG.includes('agoric')) {
+    verbosity = ' -vv';
+  } else {
+    verbosity = ' -v';
+  }
+
   // Launch the agoric wallet deploys (if any).
   exec(
-    `${agoricCli} deploy --provide=wallet --hostport=${hostport} ${agWalletDeploy}`,
-    (err, _stdout, stderr) => {
+    `${agoricCli} deploy${verbosity} --provide=wallet --hostport=${hostport} ${agWalletDeploy}`,
+    (err, stdout, stderr) => {
       if (err) {
         console.error(err);
         return;
@@ -399,6 +409,9 @@ export default async function start(basedir, argv) {
         // Report the error.
         process.stderr.write(stderr);
       }
+      if (stdout) {
+        process.stdout.write(stdout);
+      }
     },
   );
 }
diff --git a/packages/dapp-svelte-wallet/api/deploy.js b/packages/dapp-svelte-wallet/api/deploy.js
index ef807855a00..d4a20e3c107 100644
--- a/packages/dapp-svelte-wallet/api/deploy.js
+++ b/packages/dapp-svelte-wallet/api/deploy.js
@@ -129,6 +129,5 @@ export default async function deployWallet(
   const walletURLHandler = walletVat;
   await E(http).registerWallet(wallet, walletURLHandler, bridgeURLHandler);
   await E(walletVat).setHTTPObject(http);
-  await E(walletVat).setPresences();
   console.log('Deployed Wallet!');
 }
diff --git a/packages/dapp-svelte-wallet/api/package.json b/packages/dapp-svelte-wallet/api/package.json
index ff0c1310629..a025b43ca02 100644
--- a/packages/dapp-svelte-wallet/api/package.json
+++ b/packages/dapp-svelte-wallet/api/package.json
@@ -26,6 +26,9 @@
   },
   "dependencies": {
     "@agoric/eventual-send": "^0.12.0",
+    "@agoric/ertp": "^0.8.0",
+    "@agoric/notifier": "^0.2.3",
+    "@agoric/promise-kit": "^0.1.7",
     "@agoric/store": "^0.3.1",
     "esm": "^3.2.5"
   },
diff --git a/packages/dapp-svelte-wallet/api/src/wallet.js b/packages/dapp-svelte-wallet/api/src/wallet.js
index c2b648ae48e..a5c325590fe 100644
--- a/packages/dapp-svelte-wallet/api/src/wallet.js
+++ b/packages/dapp-svelte-wallet/api/src/wallet.js
@@ -193,7 +193,7 @@ export function buildRootObject(_vatPowers) {
     }
   }
 
-  function setPresences() {
+  function startSubscriptions() {
     // console.debug(`subscribing to walletPurseState`);
     // This provokes an immediate update
     purseSubscribe(
@@ -490,13 +490,14 @@ export function buildRootObject(_vatPowers) {
     });
   }
 
+  startSubscriptions();
+
   return harden({
     startup,
     getWallet,
     setHTTPObject,
     getCommandHandler,
     getBridgeURLHandler,
-    setPresences,
   });
 }
 
diff --git a/packages/dapp-svelte-wallet/api/test/test-lib-wallet.js b/packages/dapp-svelte-wallet/api/test/test-lib-wallet.js
index ca97b302fc6..200bed68539 100644
--- a/packages/dapp-svelte-wallet/api/test/test-lib-wallet.js
+++ b/packages/dapp-svelte-wallet/api/test/test-lib-wallet.js
@@ -95,7 +95,7 @@ async function setupTest() {
  * Run a thunk and wait for the notifier to fire.
  *
  * @param {ERef<Notifier<any>>} notifier
- * @param {() => Promise<void>} thunk
+ * @param {() => Promise<any>} thunk
  */
 const waitForUpdate = async (notifier, thunk) => {
   const { updateCount } = await E(notifier).getUpdateSince();
@@ -176,7 +176,7 @@ test('lib-wallet issuer and purse methods', async t => {
     moolaBundle.amountMath.make(100),
     `deposit successful`,
   );
-  t.is(pursesStateChangeLog.length, 4, `pursesStateChangeLog length`);
+  t.is(pursesStateChangeLog.length, 6, `pursesStateChangeLog length`);
   t.deepEqual(
     JSON.parse(pursesStateChangeLog[pursesStateChangeLog.length - 1]),
     [