@agoric/wallet 0.18.4-upgrade-14-dev-c8f9e7b.0 → 0.18.4-upgrade-16-dev-8879538.0

package/api/deploy.js

@@ -6,8 +6,7 @@ import { E } from '@endo/eventual-send';
 import { Fail } from '@agoric/assert';
 import path from 'path';
 
-const filename = new URL(import.meta.url).pathname;
-const dirname = path.dirname(filename);
+const dirname = path.dirname(new URL(import.meta.url).pathname);
 
 export default async function deployWallet(
   homePromise,

package/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/wallet-backend",
-  "version": "0.14.4-upgrade-14-dev-c8f9e7b.0+c8f9e7b",
+  "version": "0.14.4-upgrade-16-dev-8879538.0+8879538",
   "description": "Wallet backend",
   "type": "module",
   "scripts": {
@@ -10,30 +10,32 @@
     "test:xs": "exit 0",
     "lint": "run-s --continue-on-error lint:*",
     "lint-fix": "yarn lint:eslint --fix",
-    "lint:types": "tsc -p jsconfig.json",
+    "lint:types": "tsc",
     "lint:eslint": "eslint ."
   },
   "devDependencies": {
-    "@agoric/vats": "0.15.2-upgrade-14-dev-c8f9e7b.0+c8f9e7b",
-    "@endo/bundle-source": "2.5.2-upstream-rollup",
-    "@endo/init": "0.5.56",
-    "ava": "^5.2.0"
+    "@agoric/vats": "0.15.2-upgrade-16-dev-8879538.0+8879538",
+    "@endo/bundle-source": "^3.2.3",
+    "@endo/far": "^1.1.2",
+    "@endo/init": "^1.1.2",
+    "ava": "^5.3.0"
   },
   "dependencies": {
-    "@agoric/assert": "0.6.1-upgrade-14-dev-c8f9e7b.0+c8f9e7b",
-    "@agoric/cache": "0.3.3-upgrade-14-dev-c8f9e7b.0+c8f9e7b",
-    "@agoric/ertp": "0.16.3-upgrade-14-dev-c8f9e7b.0+c8f9e7b",
-    "@agoric/internal": "0.4.0-upgrade-14-dev-c8f9e7b.0+c8f9e7b",
-    "@agoric/notifier": "0.6.3-upgrade-14-dev-c8f9e7b.0+c8f9e7b",
-    "@agoric/smart-wallet": "0.5.4-upgrade-14-dev-c8f9e7b.0+c8f9e7b",
-    "@agoric/store": "0.9.3-upgrade-14-dev-c8f9e7b.0+c8f9e7b",
-    "@agoric/time": "0.3.3-upgrade-14-dev-c8f9e7b.0+c8f9e7b",
-    "@agoric/vat-data": "0.5.3-upgrade-14-dev-c8f9e7b.0+c8f9e7b",
-    "@agoric/zoe": "0.26.3-upgrade-14-dev-c8f9e7b.0+c8f9e7b",
-    "@endo/eventual-send": "0.17.2",
-    "@endo/marshal": "0.8.5",
-    "@endo/nat": "4.1.27",
-    "@endo/promise-kit": "0.2.56",
+    "@agoric/assert": "0.6.1-upgrade-16-dev-8879538.0+8879538",
+    "@agoric/cache": "0.3.3-upgrade-16-dev-8879538.0+8879538",
+    "@agoric/ertp": "0.16.3-upgrade-16-dev-8879538.0+8879538",
+    "@agoric/internal": "0.3.3-upgrade-16-dev-8879538.0+8879538",
+    "@agoric/notifier": "0.6.3-upgrade-16-dev-8879538.0+8879538",
+    "@agoric/smart-wallet": "0.5.4-upgrade-16-dev-8879538.0+8879538",
+    "@agoric/store": "0.9.3-upgrade-16-dev-8879538.0+8879538",
+    "@agoric/time": "0.3.3-upgrade-16-dev-8879538.0+8879538",
+    "@agoric/vat-data": "0.5.3-upgrade-16-dev-8879538.0+8879538",
+    "@agoric/zoe": "0.26.3-upgrade-16-dev-8879538.0+8879538",
+    "@agoric/zone": "0.2.3-upgrade-16-dev-8879538.0+8879538",
+    "@endo/eventual-send": "^1.2.2",
+    "@endo/marshal": "^1.5.0",
+    "@endo/nat": "^5.0.7",
+    "@endo/promise-kit": "^1.1.2",
     "import-meta-resolve": "^2.2.1"
   },
   "keywords": [],
@@ -49,7 +51,10 @@
   "homepage": "https://github.com/Agoric/agoric#readme",
   "ava": {
     "files": [
-      "test/**/test-*.js"
+      "test/**/*.test.*"
+    ],
+    "require": [
+      "@endo/init/debug.js"
     ],
     "timeout": "2m",
     "workerThreads": false
@@ -57,5 +62,8 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c8f9e7be1645e0be23f47de197409a7d4874add5"
+  "typeCoverage": {
+    "atLeast": 0
+  },
+  "gitHead": "8879538cd1d125a08346f02dd5701d0d70c90bb8"
 }

package/api/src/findOrMakeInvitation.js

@@ -101,7 +101,9 @@ const makeInvitation = async (
   board,
   zoe,
 ) => {
-  const instance = E(board).getValue(instanceHandleBoardId);
+  const instance = /** @type {Promise<Instance>} */ (
+    E(board).getValue(instanceHandleBoardId)
+  );
   const publicFacet = E(zoe).getPublicFacet(instance);
   const { method, args = [] } = invitationMaker;
 

package/api/src/internal-types.js

@@ -7,7 +7,10 @@
  * @property {PurseActions} actions
  */
 
-/** @typedef {import('@agoric/deploy-script-support/src/externalTypes').Petname} Petname */
+/**
+ * @import {Petname} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {Key} from '@endo/patterns';
+ */
 
 /**
  * @typedef {PursesJSONState & PursesAddedState} PursesFullState
@@ -15,7 +18,7 @@
 
 /**
  * @typedef {object} PurseActions
- * @property {(receiverP: ERef<{ receive: (payment: Payment) => void }>, valueToSend: AmountValue) => Promise<void>} send
+ * @property {(receiverP: ERef<{ receive: (payment: Payment) => void }>, valueToSend: import('@agoric/ertp/src/types.js').AmountValue) => Promise<void>} send
  * @property {(payment: Payment) => Promise<Amount>} receive
  * @property {(payment: Payment, amount?: Amount) => Promise<Amount>} deposit
  */
@@ -51,7 +54,7 @@
  */
 
 /**
- * @template T
+ * @template {Key} T
  * @typedef {object} Mapping
  * @property {(petname: Petname) => string} implode
  * @property {(str: string) => Petname} explode
@@ -82,7 +85,7 @@
  * @property {string} [issuerBoardId]
  *
  * @typedef {object} PaymentActions
- * @property {(purseOrPetname?: (Purse | Petname)) => Promise<AmountValue>} deposit
+ * @property {(purseOrPetname?: (Purse | Petname)) => Promise<import('@agoric/ertp/src/types.js').AmountValue>} deposit
  * @property {() => Promise<boolean>} refresh
  * @property {() => Promise<boolean>} getAmountOf
  */
@@ -93,6 +96,6 @@
  * would make them part of the WalletUser available as `home.wallet` in the
  * REPL.  Then, the Wallet UI could use that instead.
  *
- * @typedef {import('./lib-wallet').WalletRoot['admin']}
+ * @typedef {import('./lib-wallet.js').WalletRoot['admin']}
  * WalletAdminFacet
  */

package/api/src/issuerTable.js

@@ -5,7 +5,6 @@ import { E } from '@endo/eventual-send';
 
 import { makeScalarWeakMapStore } from '@agoric/store';
 
-import '../exported.js';
 import './internal-types.js';
 
 /**

package/api/src/lib-dehydrate.js

@@ -86,10 +86,9 @@ export const makeDehydrator = (initialUnnamedCount = 0) => {
   };
 
   /**
-   * @template T
    * @param {string} kind
    * @param {{ useLegacyMap?: boolean }} [legacyOptions]
-   * @returns {Mapping<T>}
+   * @returns {Mapping<any>}
    */
   const makeMapping = (kind, { useLegacyMap = false } = {}) => {
     typeof kind === 'string' || `kind ${kind} must be a string`;
@@ -97,9 +96,9 @@ export const makeDehydrator = (initialUnnamedCount = 0) => {
     // These are actually either a LegacyMap or a MapStore depending on
     // useLegacyMap. Fortunately, the LegacyMap type is approximately the
     // intersection of these, so we can just use it.
-    /** @type {LegacyMap<T, string>} */
+    /** @type {LegacyMap<any, string>} */
     const rawValToPetname = makeMap('value');
-    /** @type {LegacyMap<T, string | Path>} */
+    /** @type {LegacyMap<any, string | Path>} */
     const valToPetname = {
       ...rawValToPetname,
       set(key, val) {
@@ -121,9 +120,9 @@ export const makeDehydrator = (initialUnnamedCount = 0) => {
         return mapIterable(rawValToPetname.values(), val => explode(val));
       },
     };
-    /** @type {MapStore<string, T>} */
+    /** @type {MapStore<string, any>} */
     const rawPetnameToVal = makeScalarMapStore('petname');
-    /** @type {MapStore<Path | string, T>} */
+    /** @type {MapStore<Path | string, any>} */
     const petnameToVal = {
       ...rawPetnameToVal,
       init(key, val) {
@@ -270,7 +269,7 @@ export const makeDehydrator = (initialUnnamedCount = 0) => {
       petnameToVal.delete(petname);
       valToPetname.delete(val);
     };
-    /** @type {Mapping<T>} */
+    /** @type {Mapping<any>} */
     const mapping = harden({
       implode,
       explode,
@@ -340,7 +339,7 @@ export const makeDehydrator = (initialUnnamedCount = 0) => {
       marshalName: 'hydration',
       // TODO Temporary hack.
       // See https://github.com/Agoric/agoric-sdk/issues/2780
-      errorIdNum: 30000,
+      errorIdNum: 30_000,
       serializeBodyFormat: 'smallcaps',
     },
   );

package/api/src/lib-wallet.js

@@ -42,11 +42,7 @@ import { makeId, findOrMakeInvitation } from './findOrMakeInvitation.js';
 import { bigintStringify } from './bigintStringify.js';
 import { makePaymentActions } from './actions.js';
 
-import '@agoric/store/exported.js';
-import '@agoric/zoe/exported.js';
-
 import './internal-types.js';
-import './types.js';
 
 // does nothing
 const noActionStateChangeHandler = _newState => {};
@@ -73,7 +69,7 @@ const cmp = (a, b) => {
  * zoe: ERef<ZoeService>,
  * }} opt
  *
- * @typedef {import('@agoric/vats').NameHub} NameHub
+ * @import {NameHub} from '@agoric/vats'
  */
 export function makeWalletRoot({
   zoe,
@@ -502,9 +498,8 @@ export function makeWalletRoot({
     const alreadyDisplayed =
       inboxState.has(id) && inboxState.get(id).proposalForDisplay;
 
-    const augmentedInvitationDetails = await expandInvitationBrands(
-      invitationDetails,
-    );
+    const augmentedInvitationDetails =
+      await expandInvitationBrands(invitationDetails);
 
     const offerForDisplay = {
       ...offer,
@@ -583,7 +578,7 @@ export function makeWalletRoot({
       status: 'complete',
     });
     idToOffer.set(id, completedOffer);
-    updateInboxState(id, completedOffer);
+    void updateInboxState(id, completedOffer);
   }
 
   /**
@@ -592,8 +587,8 @@ export function makeWalletRoot({
    * @param {string} id
    * @param {ERef<UserSeat>} seat
    */
-  async function subscribeToUpdates(id, seat) {
-    E(E(seat).getExitSubscriber())
+  function subscribeToUpdates(id, seat) {
+    return E(E(seat).getExitSubscriber())
       .subscribeAfter()
       .then(update => updateOrResubscribe(id, seat, update));
   }
@@ -680,7 +675,7 @@ export function makeWalletRoot({
     );
     // By the time Zoe settles the seat promise, the escrow should be complete.
     // Reclaim if it is somehow not.
-    seat.finally(tryReclaimingWithdrawnPayments);
+    void seat.finally(tryReclaimingWithdrawnPayments);
 
     // Even if the seat doesn't settle, we can still pipeline our request for
     // payouts.
@@ -702,7 +697,7 @@ export function makeWalletRoot({
     // Regardless of the status of the offer, we try to clean up any of our
     // unclaimed payments.  Defensively, we want to do this as soon as possible
     // even if the seat doesn't settle.
-    depositedP.finally(tryReclaimingWithdrawnPayments);
+    void depositedP.finally(tryReclaimingWithdrawnPayments);
 
     // Return a promise that will resolve after successful deposit, as well as
     // the promise for the seat.
@@ -726,7 +721,7 @@ export function makeWalletRoot({
         // eslint-disable-next-line no-use-before-define
         p = makeEmptyPurse(petnameForBrand, petnameForBrand, true);
       } else {
-        p = Promise.resolve();
+        p = Promise.resolve(undefined);
       }
       return E.when(p, _ => petnameForBrand);
     };
@@ -754,7 +749,9 @@ export function makeWalletRoot({
    * @param {string} [address]
    */
   const addContact = async (petname, actions, address = undefined) => {
+    // @ts-expect-error XXX ERef
     const already = await E(board).has(actions);
+    /** @type {any} */
     let depositFacet;
     if (already) {
       depositFacet = actions;
@@ -793,7 +790,7 @@ export function makeWalletRoot({
     // possible display in the wallet.
     petname = instanceMapping.suggestPetname(petname, instanceHandle);
     // We don't wait for the update before returning.
-    updateAllState();
+    void updateAllState();
     return `instance ${q(petname)} successfully added to wallet`;
   };
 
@@ -831,7 +828,7 @@ export function makeWalletRoot({
     await updatePursesState(petnameForPurse, purse);
 
     // Just notice the balance updates for the purse.
-    observeNotifier(E(purse).getCurrentAmountNotifier(), {
+    void observeNotifier(E(purse).getCurrentAmountNotifier(), {
       updateState(_balance) {
         updatePursesState(purseMapping.valToPetname.get(purse), purse).catch(
           e => console.error('cannot updateState', e),
@@ -1031,7 +1028,7 @@ export function makeWalletRoot({
               petname,
             });
             updateDapp(dappRecord);
-            updateAllState();
+            void updateAllState();
             return dappRecord.actions;
           },
           enable() {
@@ -1153,7 +1150,7 @@ export function makeWalletRoot({
       status: 'decline',
     });
     idToOffer.set(id, declinedOffer);
-    updateInboxState(id, declinedOffer);
+    void updateInboxState(id, declinedOffer);
 
     // Try to reclaim the invitation.
     const compiledOfferP = idToCompiledOfferP.get(id);
@@ -1180,7 +1177,7 @@ export function makeWalletRoot({
           status: 'cancel',
         });
         idToOffer.set(id, cancelledOffer);
-        updateInboxState(id, cancelledOffer);
+        return updateInboxState(id, cancelledOffer);
       })
       .catch(e => console.error(`Cannot cancel offer ${id}:`, e));
 
@@ -1206,16 +1203,17 @@ export function makeWalletRoot({
         error: `${e}`,
       });
       idToOffer.set(id, rejectOffer);
-      updateInboxState(id, rejectOffer);
+      void updateInboxState(id, rejectOffer);
     };
 
+    await null;
     try {
       const pendingOffer = addMeta({
         ...offer,
         status: 'pending',
       });
       idToOffer.set(id, pendingOffer);
-      updateInboxState(id, pendingOffer);
+      void updateInboxState(id, pendingOffer);
       const compiledOffer = await idToCompiledOfferP.get(id);
 
       const { depositedP, seat } = await executeOffer(compiledOffer);
@@ -1227,11 +1225,11 @@ export function makeWalletRoot({
       idToSeat.set(id, seat);
       // The offer might have been postponed, or it might have been immediately
       // consummated. Only subscribe if it was postponed.
-      E(seat)
+      void E(seat)
         .hasExited()
         .then(exited => {
           if (!exited) {
-            subscribeToUpdates(id, seat);
+            return subscribeToUpdates(id, seat);
           }
         });
 
@@ -1254,7 +1252,7 @@ export function makeWalletRoot({
               status: 'accept',
             });
             idToOffer.set(id, acceptedOffer);
-            updateInboxState(id, acceptedOffer);
+            void updateInboxState(id, acceptedOffer);
           }
         })
         .catch(rejected);
@@ -1372,6 +1370,7 @@ export function makeWalletRoot({
       brandToAutoDepositPurse.init(brand, purse);
     }
 
+    await null;
     if (updateState) {
       await updateAllPurseState();
     }
@@ -1406,11 +1405,13 @@ export function makeWalletRoot({
     boardId,
     dappOrigin = undefined,
   ) {
+    /** @type {Petname} */
     let petname;
     if (dappOrigin === undefined) {
       petname = suggestedPetname;
     } else {
       const edgename = edgeMapping.valToPetname.get(dappOrigin);
+      // @ts-expect-error if suggestedPetname is itself an array, this nests
       petname = [edgename, suggestedPetname];
     }
 
@@ -1893,28 +1894,32 @@ export function makeWalletRoot({
   // don't really trust.
   // The param is{import('@agoric/vats/src/vat-bank.js').Bank} but that here triggers https://github.com/Agoric/agoric-sdk/issues/4620
   const importBankAssets = async bank => {
-    observeIteration(subscribeEach(E(bank).getAssetSubscription()), {
-      async updateState({ proposedName, issuerName, issuer, brand }) {
-        try {
-          issuerName = await addIssuer(issuerName, issuer);
-          const purse = await E(bank).getPurse(brand);
-          // We can import this purse, because we trust the bank.
-          await internalUnsafeImportPurse(
-            issuerName,
-            proposedName,
-            true,
-            purse,
-          );
-        } catch (e) {
-          console.error('/// could not add bank asset purse', e, {
-            issuerName,
-            proposedName,
-            issuer,
-            brand,
-          });
-        }
-      },
-    }).finally(() => console.error('/// This is the end of the bank assets'));
+    void observeIteration(
+      subscribeEach(E(bank).getAssetSubscription()),
+      harden({
+        async updateState({ proposedName, issuerName, issuer, brand }) {
+          await null;
+          try {
+            issuerName = await addIssuer(issuerName, issuer);
+            const purse = await E(bank).getPurse(brand);
+            // We can import this purse, because we trust the bank.
+            await internalUnsafeImportPurse(
+              issuerName,
+              proposedName,
+              true,
+              purse,
+            );
+          } catch (e) {
+            console.error('/// could not add bank asset purse', e, {
+              issuerName,
+              proposedName,
+              issuer,
+              brand,
+            });
+          }
+        },
+      }),
+    ).finally(() => console.error('/// This is the end of the bank assets'));
   };
   return {
     admin: wallet,

package/api/src/wallet.js

@@ -25,7 +25,7 @@ import './internal-types.js';
  * board: ERef<import('@agoric/vats').Board>,
  * cacheStorageNode: ERef<StorageNode>,
  * localTimerPollInterval?: bigint,
- * localTimerService?: import('@agoric/time/src/types').TimerService,
+ * localTimerService?: import('@agoric/time').TimerService,
  * myAddressNameAdmin: ERef<import('@agoric/vats').MyAddressNameAdmin>,
  * namesByAddress: ERef<NameHub>,
  * timerDevice?: unknown,
@@ -33,7 +33,7 @@ import './internal-types.js';
  * zoe: ERef<ZoeService>,
  * }} StartupTerms
  *
- * @typedef {import('@agoric/vats').NameHub} NameHub
+ * @import {NameHub} from '@agoric/vats'
  */
 
 export function buildRootObject(vatPowers) {
@@ -164,6 +164,7 @@ export function buildRootObject(vatPowers) {
         yield state;
       }
     }
+    harden(makeApprovedNotifier);
 
     /** @type {WalletBridge} */
     const bridge = Far('bridge', {
@@ -171,7 +172,7 @@ export function buildRootObject(vatPowers) {
         await approve();
         const pursesNotifier = walletAdmin.getAttenuatedPursesNotifier();
         const { notifier, updater } = makeNotifierKit();
-        observeIteration(makeApprovedNotifier(pursesNotifier), updater);
+        void observeIteration(makeApprovedNotifier(pursesNotifier), updater);
         return notifier;
       },
       async getCacheCoordinator() {
@@ -200,7 +201,7 @@ export function buildRootObject(vatPowers) {
           }));
         };
 
-        observeIteration(makeApprovedNotifier(offerNotifier), {
+        void observeIteration(makeApprovedNotifier(offerNotifier), {
           updateState(offers) {
             updater.updateState(filteredOffers(offers));
           },
@@ -439,7 +440,7 @@ export function buildRootObject(vatPowers) {
             },
           );
           if (notYetEnabled) {
-            E(otherSide).dappApproved(dappOrigin);
+            await E(otherSide).dappApproved(dappOrigin);
           }
         };
 
@@ -587,9 +588,8 @@ export function buildRootObject(vatPowers) {
 
               case 'walletGetDepositFacetId': {
                 const { brandBoardId } = obj;
-                const result = await walletAdmin.getDepositFacetId(
-                  brandBoardId,
-                );
+                const result =
+                  await walletAdmin.getDepositFacetId(brandBoardId);
                 return {
                   type: 'walletDepositFacetIdResponse',
                   data: result,

package/api/test/continuingInvitationExample.js

@@ -3,8 +3,6 @@
 import { makeNotifierFromSubscriber, makePublishKit } from '@agoric/notifier';
 import { Far } from '@endo/marshal';
 
-import '@agoric/zoe/exported.js';
-
 export const start = zcf => {
   const { subscriber, publisher } = makePublishKit();
   const notifier = makeNotifierFromSubscriber(subscriber);

package/api/test/{test-getPursesNotifier.js → getPursesNotifier.test.js}

@@ -3,19 +3,15 @@ import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
 
 import { makeIssuerKit } from '@agoric/ertp';
 import { makeZoeForTest } from '@agoric/zoe/tools/setup-zoe.js';
-// eslint-disable-next-line import/no-extraneous-dependencies
 import { makeFakeBoard } from '@agoric/vats/tools/board-utils.js';
-// eslint-disable-next-line import/no-extraneous-dependencies
-import { heapZone } from '@agoric/zone';
+import { makeHeapZone } from '@agoric/zone';
 import {
   makeNameHubKit,
   prepareMixinMyAddress,
 } from '@agoric/vats/src/nameHub.js';
 import { makeWalletRoot } from '../src/lib-wallet.js';
 
-import '../src/types.js';
-
-const mixinMyAddress = prepareMixinMyAddress(heapZone);
+const mixinMyAddress = prepareMixinMyAddress(makeHeapZone());
 
 function makeFakeMyAddressNameAdmin() {
   const { nameAdmin } = makeNameHubKit();

package/api/test/{test-lib-wallet.js → lib-wallet.test.js}

@@ -1,7 +1,6 @@
 // @ts-check
 import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
 
-// eslint-disable-next-line import/no-extraneous-dependencies
 import bundleSource from '@endo/bundle-source';
 import { makeCache } from '@agoric/cache';
 import { makeIssuerKit, AmountMath, AssetKind } from '@agoric/ertp';
@@ -12,23 +11,18 @@ import { makeZoeForTest } from '@agoric/zoe/tools/setup-zoe.js';
 import { E } from '@endo/eventual-send';
 
 import { assert } from '@agoric/assert';
-// eslint-disable-next-line import/no-extraneous-dependencies
 import { makeFakeBoard } from '@agoric/vats/tools/board-utils.js';
-// eslint-disable-next-line import/no-extraneous-dependencies
 import {
   makeNameHubKit,
   prepareMixinMyAddress,
 } from '@agoric/vats/src/nameHub.js';
 import { resolve as importMetaResolve } from 'import-meta-resolve';
-// eslint-disable-next-line import/no-extraneous-dependencies
-import { heapZone } from '@agoric/zone';
+import { makeHeapZone } from '@agoric/zone';
 import { makeWalletRoot } from '../src/lib-wallet.js';
 
-import '../src/types.js';
-
 const ZOE_INVITE_PURSE_PETNAME = 'Default Zoe invite purse';
 
-const mixinMyAddress = prepareMixinMyAddress(heapZone);
+const mixinMyAddress = prepareMixinMyAddress(makeHeapZone());
 
 function makeFakeMyAddressNameAdmin() {
   const { nameAdmin } = makeNameHubKit();
@@ -303,12 +297,12 @@ test('lib-wallet dapp suggests issuer, instance, installation petnames', async t
   const {
     board,
     automaticRefundInvitation,
-    autoswapInstallationHandle,
     automaticRefundInstance,
     wallet,
     pursesStateChangeLog,
     inboxStateChangeLog,
   } = await setupTest(t, { autoswap: true, automaticRefund: true });
+  const { autoswapInstallation: autoswapInstallationHandle } = t.context;
 
   const { issuer: bucksIssuer } = makeIssuerKit('bucks');
   const bucksIssuerBoardId = await E(board).getId(bucksIssuer);
@@ -1639,17 +1633,14 @@ test('stamps from dateNow', async t => {
   const paymentNotifier = E(wallet).getPaymentsNotifier();
 
   const date0 = currentDateMS;
-  const { value: val0, updateCount: count0 } = await E(
-    paymentNotifier,
-  ).getUpdateSince();
+  const { value: val0, updateCount: count0 } =
+    await E(paymentNotifier).getUpdateSince();
   await E(wallet).addPayment(pmt1);
-  const { value: val1a, updateCount: count1a } = await E(
-    paymentNotifier,
-  ).getUpdateSince(count0);
-  E(wallet).addPayment(pmt4);
-  const { value: val1, updateCount: count1 } = await E(
-    paymentNotifier,
-  ).getUpdateSince(count1a);
+  const { value: val1a, updateCount: count1a } =
+    await E(paymentNotifier).getUpdateSince(count0);
+  void E(wallet).addPayment(pmt4);
+  const { value: val1, updateCount: count1 } =
+    await E(paymentNotifier).getUpdateSince(count1a);
 
   // Wait for tick to take effect.
   currentDateMS += 1234;
@@ -1657,9 +1648,8 @@ test('stamps from dateNow', async t => {
   t.is(dateNow(), startDateMS + 1234);
 
   await E(wallet).addPayment(pmt2);
-  const { value: val2, updateCount: count2 } = await E(
-    paymentNotifier,
-  ).getUpdateSince(count1);
+  const { value: val2, updateCount: count2 } =
+    await E(paymentNotifier).getUpdateSince(count1);
   await E(wallet).addPayment(pmt3);
   const { value: payments } = await E(paymentNotifier).getUpdateSince(count2);
 

package/api/test/{test-middleware.js → middleware.test.js}

@@ -1,6 +1,5 @@
 // @ts-check
 import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-// eslint-disable-next-line import/no-extraneous-dependencies
 import { E, Far } from '@endo/far';
 import {
   makeExportContext,

package/api/{jsconfig.json → tsconfig.json}

@@ -1,6 +1,7 @@
 // This file can contain .js-specific Typescript compiler config.
 {
   "extends": "../../../tsconfig.json",
+  "compilerOptions": {},
   "include": [
     "*.js",
     "scripts/**/*.js",