@agoric/wallet 0.18.4-mainnet1B-dev-26244e8.0 → 0.18.4-orchestration-dev-096c4e8.0

package/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/wallet-backend",
-  "version": "0.14.4-mainnet1B-dev-26244e8.0+26244e8",
+  "version": "0.14.4-orchestration-dev-096c4e8.0+096c4e8",
   "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-mainnet1B-dev-26244e8.0+26244e8",
-    "@endo/bundle-source": "2.5.2-upstream-rollup",
-    "@endo/init": "0.5.56",
-    "ava": "^5.2.0"
+    "@agoric/vats": "0.15.2-orchestration-dev-096c4e8.0+096c4e8",
+    "@endo/bundle-source": "^3.1.0",
+    "@endo/far": "^1.0.4",
+    "@endo/init": "^1.0.4",
+    "ava": "^5.3.0"
   },
   "dependencies": {
-    "@agoric/assert": "0.6.1-mainnet1B-dev-26244e8.0+26244e8",
-    "@agoric/cache": "0.3.3-mainnet1B-dev-26244e8.0+26244e8",
-    "@agoric/ertp": "0.16.3-mainnet1B-dev-26244e8.0+26244e8",
-    "@agoric/internal": "0.4.0-mainnet1B-dev-26244e8.0+26244e8",
-    "@agoric/notifier": "0.6.3-mainnet1B-dev-26244e8.0+26244e8",
-    "@agoric/smart-wallet": "0.5.4-mainnet1B-dev-26244e8.0+26244e8",
-    "@agoric/store": "0.9.3-mainnet1B-dev-26244e8.0+26244e8",
-    "@agoric/time": "0.3.3-mainnet1B-dev-26244e8.0+26244e8",
-    "@agoric/vat-data": "0.5.3-mainnet1B-dev-26244e8.0+26244e8",
-    "@agoric/zoe": "0.26.3-mainnet1B-dev-26244e8.0+26244e8",
-    "@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-orchestration-dev-096c4e8.0+096c4e8",
+    "@agoric/cache": "0.3.3-orchestration-dev-096c4e8.0+096c4e8",
+    "@agoric/ertp": "0.16.3-orchestration-dev-096c4e8.0+096c4e8",
+    "@agoric/internal": "0.3.3-orchestration-dev-096c4e8.0+096c4e8",
+    "@agoric/notifier": "0.6.3-orchestration-dev-096c4e8.0+096c4e8",
+    "@agoric/smart-wallet": "0.5.4-orchestration-dev-096c4e8.0+096c4e8",
+    "@agoric/store": "0.9.3-orchestration-dev-096c4e8.0+096c4e8",
+    "@agoric/time": "0.3.3-orchestration-dev-096c4e8.0+096c4e8",
+    "@agoric/vat-data": "0.5.3-orchestration-dev-096c4e8.0+096c4e8",
+    "@agoric/zoe": "0.26.3-orchestration-dev-096c4e8.0+096c4e8",
+    "@agoric/zone": "0.2.3-orchestration-dev-096c4e8.0+096c4e8",
+    "@endo/eventual-send": "^1.1.2",
+    "@endo/marshal": "^1.3.0",
+    "@endo/nat": "^5.0.4",
+    "@endo/promise-kit": "^1.0.4",
     "import-meta-resolve": "^2.2.1"
   },
   "keywords": [],
@@ -51,11 +53,17 @@
     "files": [
       "test/**/test-*.js"
     ],
+    "require": [
+      "@endo/init/debug.js"
+    ],
     "timeout": "2m",
     "workerThreads": false
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "26244e821f1a83cd5868f0c7d54aa480c8c17e5e"
+  "typeCoverage": {
+    "atLeast": 0
+  },
+  "gitHead": "096c4e8fce80e9a509b0e1a30fda11736c4570e1"
 }

package/api/src/internal-types.js

@@ -7,7 +7,7 @@
  * @property {PurseActions} actions
  */
 
-/** @typedef {import('@agoric/deploy-script-support/src/externalTypes').Petname} Petname */
+/** @typedef {import('@agoric/deploy-script-support/src/externalTypes.js').Petname} Petname */
 
 /**
  * @typedef {PursesJSONState & PursesAddedState} PursesFullState
@@ -93,6 +93,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/lib-wallet.js

@@ -1,4 +1,5 @@
 // @ts-check
+/* eslint @typescript-eslint/no-floating-promises: "warn" */
 
 /**
  * This file defines the wallet internals without dependency on the ag-solo on
@@ -46,7 +47,7 @@ import '@agoric/store/exported.js';
 import '@agoric/zoe/exported.js';
 
 import './internal-types.js';
-import './types.js';
+/// <reference path="./types.js" />
 
 // does nothing
 const noActionStateChangeHandler = _newState => {};
@@ -502,9 +503,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,
@@ -726,7 +726,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);
     };
@@ -1209,6 +1209,7 @@ export function makeWalletRoot({
       updateInboxState(id, rejectOffer);
     };
 
+    await null;
     try {
       const pendingOffer = addMeta({
         ...offer,
@@ -1372,6 +1373,7 @@ export function makeWalletRoot({
       brandToAutoDepositPurse.init(brand, purse);
     }
 
+    await null;
     if (updateState) {
       await updateAllPurseState();
     }
@@ -1893,28 +1895,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'));
+    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

@@ -1,4 +1,5 @@
 // @ts-check
+/* eslint @typescript-eslint/no-floating-promises: "warn" */
 
 /**
  * This file defines the vat launched by the spawner in the ../deploy.js script.
@@ -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,
@@ -164,6 +165,7 @@ export function buildRootObject(vatPowers) {
         yield state;
       }
     }
+    harden(makeApprovedNotifier);
 
     /** @type {WalletBridge} */
     const bridge = Far('bridge', {
@@ -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/test-getPursesNotifier.js

@@ -3,10 +3,8 @@ 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,
@@ -15,7 +13,7 @@ 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

@@ -1,7 +1,7 @@
 // @ts-check
+/* eslint @typescript-eslint/no-floating-promises: "warn" */
 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 +12,20 @@ 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();
@@ -1639,17 +1636,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);
+  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: val1, updateCount: count1 } =
+    await E(paymentNotifier).getUpdateSince(count1a);
 
   // Wait for tick to take effect.
   currentDateMS += 1234;
@@ -1657,9 +1651,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

@@ -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,10 @@
 // This file can contain .js-specific Typescript compiler config.
 {
   "extends": "../../../tsconfig.json",
+  "compilerOptions": {
+    "allowSyntheticDefaultImports": true,
+    "maxNodeModuleJsDepth": 2,
+  },
   "include": [
     "*.js",
     "scripts/**/*.js",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/wallet",
-  "version": "0.18.4-mainnet1B-dev-26244e8.0+26244e8",
+  "version": "0.18.4-orchestration-dev-096c4e8.0+096c4e8",
   "type": "module",
   "main": "index.js",
   "license": "Apache-2.0",
@@ -20,7 +20,6 @@
   },
   "dependencies": {
     "@agoric/wallet-ui": "0.1.3-solo.0",
-    "agoric": "0.21.2-mainnet1B-dev-26244e8.0+26244e8",
     "babel-eslint": "^10.0.3",
     "eslint-plugin-eslint-comments": "^3.1.2",
     "import-meta-resolve": "^2.2.1"
@@ -28,5 +27,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "26244e821f1a83cd5868f0c7d54aa480c8c17e5e"
+  "gitHead": "096c4e8fce80e9a509b0e1a30fda11736c4570e1"
 }