@agoric/wallet 0.18.4-other-dev-1f26562.0 → 0.18.4-other-dev-3eb1a1d.0

package/api/src/wallet.js

@@ -9,8 +9,9 @@
  * types.js file.
  */
 import { E } from '@endo/eventual-send';
-import { makeNotifierKit, observeIteration } from '@agoric/notifier';
 import { Far } from '@endo/marshal';
+import { deepCopyJsonable } from '@agoric/internal/src/js-utils.js';
+import { makeNotifierKit, observeIteration } from '@agoric/notifier';
 
 import { makeWalletRoot } from './lib-wallet.js';
 import pubsub from './pubsub.js';
@@ -25,7 +26,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 +34,7 @@ import './internal-types.js';
  * zoe: ERef<ZoeService>,
  * }} StartupTerms
  *
- * @typedef {import('@agoric/vats').NameHub} NameHub
+ * @import {NameHub} from '@agoric/vats'
  */
 
 export function buildRootObject(vatPowers) {
@@ -54,11 +55,11 @@ export function buildRootObject(vatPowers) {
   const offerSubscriptions = new Map();
 
   const httpSend = (obj, channelHandles) =>
-    E(http).send(JSON.parse(JSON.stringify(obj)), channelHandles);
+    E(http).send(deepCopyJsonable(obj), channelHandles);
 
   const pushOfferSubscriptions = (channelHandle, offers) => {
     const subs = offerSubscriptions.get(channelHandle);
-    (subs || []).forEach(({ origin, status }) => {
+    for (const { origin, status } of subs || []) {
       // Filter by optional status and origin.
       const result = harden(
         offers.filter(
@@ -75,7 +76,7 @@ export function buildRootObject(vatPowers) {
         },
         [channelHandle],
       );
-    });
+    }
   };
 
   const subscribeToOffers = (channelHandle, { origin, status = null }) => {
@@ -164,6 +165,7 @@ export function buildRootObject(vatPowers) {
         yield state;
       }
     }
+    harden(makeApprovedNotifier);
 
     /** @type {WalletBridge} */
     const bridge = Far('bridge', {
@@ -171,7 +173,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 +202,7 @@ export function buildRootObject(vatPowers) {
           }));
         };
 
-        observeIteration(makeApprovedNotifier(offerNotifier), {
+        void observeIteration(makeApprovedNotifier(offerNotifier), {
           updateState(offers) {
             updater.updateState(filteredOffers(offers));
           },
@@ -439,7 +441,7 @@ export function buildRootObject(vatPowers) {
             },
           );
           if (notYetEnabled) {
-            E(otherSide).dappApproved(dappOrigin);
+            await E(otherSide).dappApproved(dappOrigin);
           }
         };
 
@@ -587,9 +589,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,34 +1,27 @@
 // @ts-check
 import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
 
-// eslint-disable-next-line import/no-extraneous-dependencies
+import { assert } from '@endo/errors';
+import { E } from '@endo/eventual-send';
 import bundleSource from '@endo/bundle-source';
-import { makeCache } from '@agoric/cache';
-import { makeIssuerKit, AmountMath, AssetKind } from '@agoric/ertp';
 
 import { M } from '@agoric/store';
-
+import { makeCache } from '@agoric/cache';
+import { makeIssuerKit, AmountMath, AssetKind } from '@agoric/ertp';
 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 +296,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 +1632,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 +1647,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",

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@agoric/wallet",
-  "version": "0.18.4-other-dev-1f26562.0+1f26562",
+  "version": "0.18.4-other-dev-3eb1a1d.0+3eb1a1d",
   "type": "module",
   "main": "index.js",
   "license": "Apache-2.0",
   "author": "Agoric",
   "agoric-wallet": {
-    "htmlBasedir": "../../node_modules/@agoric/wallet-ui/build",
+    "htmlBasedir": "@agoric/wallet-ui/build",
     "deploy": [
       "./api/deploy.js"
     ]
@@ -19,8 +19,8 @@
     "build": "exit 0"
   },
   "dependencies": {
+    "@agoric/internal": "0.3.3-other-dev-3eb1a1d.0+3eb1a1d",
     "@agoric/wallet-ui": "0.1.3-solo.0",
-    "agoric": "0.21.2-other-dev-1f26562.0+1f26562",
     "babel-eslint": "^10.0.3",
     "eslint-plugin-eslint-comments": "^3.1.2",
     "import-meta-resolve": "^2.2.1"
@@ -28,5 +28,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "1f265627270d514ab48943f86c668eb58a280552"
+  "gitHead": "3eb1a1d2d75b2b4a94807cd3bf759bc9fc531f05"
 }

package/api/exported.js

@@ -1 +0,0 @@
-import './src/types.js';