@agoric/wallet-backend 0.15.0 → 0.15.1-upgrade-23-dev-bd79330.0.bd79330

package/package.json

@@ -1,36 +1,34 @@
 {
   "name": "@agoric/wallet-backend",
-  "version": "0.15.0",
+  "version": "0.15.1-upgrade-23-dev-bd79330.0.bd79330",
   "description": "Wallet backend",
   "type": "module",
   "scripts": {
-    "build": "yarn build:bundles",
-    "build:bundles": "node scripts/build-bundles.js",
     "test": "ava",
     "test:xs": "exit 0",
     "lint": "yarn run -T run-s --continue-on-error 'lint:*'",
     "lint-fix": "yarn lint:eslint --fix",
     "lint:types": "yarn run -T tsc",
-    "lint:eslint": "yarn run -T eslint ."
+    "lint:eslint": "node ../../../scripts/eslint-repo.mjs ."
   },
   "devDependencies": {
-    "@agoric/vats": "0.16.0",
+    "@agoric/vats": "0.16.1-upgrade-23-dev-bd79330.0.bd79330",
     "@endo/bundle-source": "^4.1.2",
     "@endo/far": "^1.1.14",
     "@endo/init": "^1.1.12",
-    "ava": "^5.3.0"
+    "ava": "^6.4.1"
   },
   "dependencies": {
-    "@agoric/cache": "0.4.0",
-    "@agoric/ertp": "0.17.0",
-    "@agoric/internal": "0.4.0",
-    "@agoric/notifier": "0.7.0",
-    "@agoric/smart-wallet": "0.6.0",
-    "@agoric/store": "0.10.0",
-    "@agoric/time": "0.4.0",
-    "@agoric/vat-data": "0.6.0",
-    "@agoric/zoe": "0.27.0",
-    "@agoric/zone": "0.3.0",
+    "@agoric/cache": "0.4.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/ertp": "0.17.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/internal": "0.4.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/notifier": "0.7.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/smart-wallet": "0.6.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/store": "0.10.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/time": "0.4.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/vat-data": "0.6.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/zoe": "0.27.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/zone": "0.3.1-upgrade-23-dev-bd79330.0.bd79330",
     "@endo/errors": "^1.2.13",
     "@endo/eventual-send": "^1.3.4",
     "@endo/marshal": "^1.8.0",
@@ -38,6 +36,9 @@
     "@endo/promise-kit": "^1.1.13",
     "import-meta-resolve": "^4.1.0"
   },
+  "files": [
+    "src"
+  ],
   "keywords": [],
   "repository": {
     "type": "git",
@@ -56,8 +57,7 @@
     "require": [
       "@endo/init/debug.js"
     ],
-    "timeout": "2m",
-    "workerThreads": false
+    "timeout": "2m"
   },
   "publishConfig": {
     "access": "public"
@@ -68,5 +68,5 @@
   "engines": {
     "node": "^20.9 || ^22.11"
   },
-  "gitHead": "0922d0447ab8fae9d2d87415964403330b5ca313"
+  "gitHead": "bd79330f78dae2faf9cc3d8b10063567700da07b"
 }

package/src/actions.js

@@ -4,6 +4,10 @@ import { makePromiseKit } from '@endo/promise-kit';
 import { Far } from '@endo/marshal';
 import { E } from '@endo/eventual-send';
 
+/**
+ * @import {Purse} from '@agoric/ertp';
+ */
+
 export const makePaymentActions = ({
   getBrandRecord,
   getPurseByPetname,

package/src/date-now.js

@@ -2,6 +2,10 @@ import { E } from '@endo/eventual-send';
 import { observeNotifier } from '@agoric/notifier';
 import { makePromiseKit } from '@endo/promise-kit';
 
+/**
+ * @import {PromiseRecord} from '@endo/promise-kit';
+ */
+
 export const DEFAULT_TIMER_SERVICE_POLL_INTERVAL = 60_000n;
 export const DEFAULT_TIMER_DEVICE_SCALE = 1;
 

package/src/findOrMakeInvitation.js

@@ -3,6 +3,14 @@ import { E } from '@endo/eventual-send';
 import { passStyleOf } from '@endo/marshal';
 import { AmountMath } from '@agoric/ertp';
 
+/**
+ * @import {Board} from '@agoric/vats';
+ * @import {Amount} from '@agoric/ertp';
+ * @import {ZoeService} from '@agoric/zoe';
+ * @import {Invitation} from '@agoric/zoe';
+ * @import {Instance} from '@agoric/zoe';
+ */
+
 export const makeId = (dappOrigin, rawId) => `${dappOrigin}#${rawId}`;
 
 const assertFirstCapASCII = str => {
@@ -19,7 +27,7 @@ const assertFirstCapASCII = str => {
 /**
  * @param {Amount<'set'>} invitationPurseBalance
  * @param {object} query
- * @param {import('@agoric/vats').Board} query.board
+ * @param {Board} query.board
  * @param {string} query.boardId
  * @returns {Promise<Array>}
  * @deprecated
@@ -91,7 +99,7 @@ const makeContinuingInvitation = async (
 /**
  * @param {InvitationMaker} invitationMaker
  * @param {string} instanceHandleBoardId
- * @param {import('@agoric/vats').Board} board
+ * @param {Board} board
  * @param {ZoeService} zoe
  * @returns {Promise<Invitation>}
  */

package/src/internal-types.js

@@ -1,5 +1,14 @@
 // @ts-check
 
+/**
+ * @import {PursesJSONState, RecordMetadata} from './types.js';
+ * @import {ERef} from '@agoric/vow';
+ * @import {LegacyWeakMap} from '@agoric/store';
+ * @import {WeakMapStore} from '@agoric/store';
+ * @import {MapStore} from '@agoric/store';
+ */
+/** @import {Purse} from '@agoric/ertp'; */
+
 /**
  * @typedef {object} PursesAddedState
  * @property {Purse} purse
@@ -8,8 +17,12 @@
  */
 
 /**
- * @import {Petname} from '@agoric/deploy-script-support/src/externalTypes.js';
  * @import {Key} from '@endo/patterns';
+ * @import {Coordinator} from '@agoric/cache';
+ * @import {Petname} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {Amount, AmountValue, Brand, Issuer, Payment} from '@agoric/ertp/src/types.js';
+ * @import {ZoeIssuerRecord} from '@agoric/zoe';
+ * @import {WalletRoot} from './lib-wallet.js';
  */
 
 /**
@@ -18,7 +31,7 @@
 
 /**
  * @typedef {object} PurseActions
- * @property {(receiverP: ERef<{ receive: (payment: Payment) => void }>, valueToSend: import('@agoric/ertp/src/types.js').AmountValue) => Promise<void>} send
+ * @property {(receiverP: ERef<{ receive: (payment: Payment) => void }>, valueToSend: AmountValue) => Promise<void>} send
  * @property {(payment: Payment) => Promise<Amount>} receive
  * @property {(payment: Payment, amount?: Amount) => Promise<Amount>} deposit
  */
@@ -42,7 +55,7 @@
  * @property {Petname} petname
  * @property {boolean} enable
  * @property {string} origin
- * @property {ERef<import('@agoric/cache').Coordinator>} cacheCoordinator
+ * @property {ERef<Coordinator>} cacheCoordinator
  * @property {DappActions} actions
  */
 
@@ -85,7 +98,7 @@
  * @property {string} [issuerBoardId]
  *
  * @typedef {object} PaymentActions
- * @property {(purseOrPetname?: (Purse | Petname)) => Promise<import('@agoric/ertp/src/types.js').AmountValue>} deposit
+ * @property {(purseOrPetname?: (Purse | Petname)) => Promise<AmountValue>} deposit
  * @property {() => Promise<boolean>} refresh
  * @property {() => Promise<boolean>} getAmountOf
  */
@@ -96,6 +109,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.js').WalletRoot['admin']}
+ * @typedef {WalletRoot['admin']}
  * WalletAdminFacet
  */

package/src/issuerTable.js

@@ -5,7 +5,14 @@ import { E } from '@endo/eventual-send';
 
 import { makeScalarWeakMapStore } from '@agoric/store';
 
-import './internal-types.js';
+/**
+ * @import {ZoeIssuerRecord} from '@agoric/zoe';
+ * @import {IssuerTable} from './types.js';
+ * @import {WeakMapStore} from '@agoric/store';
+ * @import {Brand} from '@agoric/ertp';
+ * @import {Issuer} from '@agoric/ertp';
+ * @import {DisplayInfo} from '@agoric/ertp';
+ */
 
 /**
  * IssuerTable

package/src/lib-dehydrate.js

@@ -4,6 +4,13 @@ import { assert, Fail, q } from '@endo/errors';
 import { makeMarshal, mapIterable } from '@endo/marshal';
 import { makeLegacyMap, makeScalarMapStore } from '@agoric/store';
 
+/**
+ * @import {Petname} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {Mapping} from './internal-types.js';
+ * @import {MapStore} from '@agoric/store';
+ * @import {LegacyMap} from '@agoric/store';
+ */
+
 /**
  * @typedef {string[]} Path
  * @typedef {{} & 'Strongname'} Strongname

package/src/lib-wallet.js

@@ -42,7 +42,26 @@ import { makeId, findOrMakeInvitation } from './findOrMakeInvitation.js';
 import { bigintStringify } from './bigintStringify.js';
 import { makePaymentActions } from './actions.js';
 
-import './internal-types.js';
+/**
+ * @import {Petname} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {Handle, UserSeat, ZoeService} from '@agoric/zoe';
+ * @import {Purse} from '@agoric/ertp';
+ * @import {BrandRecord, Contact, DappRecord, Mapping, PaymentRecord, PursesFullState} from './internal-types.js';
+ * @import {InstallationManager, InstanceManager, IssuerManager, OfferState, PursesJSONState, RecordMetadata} from './types.js';
+ * @import {ERef} from '@agoric/vow';
+ * @import {Brand} from '@agoric/ertp';
+ * @import {Instance} from '@agoric/zoe/src/zoeService/utils.js';
+ * @import {Installation} from '@agoric/zoe/src/zoeService/utils.js';
+ * @import {WeakMapStore} from '@agoric/store';
+ * @import {Issuer} from '@agoric/ertp';
+ * @import {MapStore} from '@agoric/store';
+ * @import {LegacyMap} from '@agoric/store';
+ * @import {NotifierRecord} from '@agoric/notifier';
+ * @import {Payment} from '@agoric/ertp';
+ * @import {Subscriber} from '@agoric/notifier';
+ * @import {Notifier} from '@agoric/notifier';
+ * @import {PromiseRecord} from '@endo/promise-kit';
+ */
 
 // does nothing
 const noActionStateChangeHandler = _newState => {};
@@ -57,13 +76,19 @@ const cmp = (a, b) => {
   return -1;
 };
 
+/**
+ * @import {Board} from '@agoric/vats';
+ * @import {MyAddressNameAdmin} from '@agoric/vats';
+ * @import {makeMarshal} from '@endo/marshal';
+ */
+
 /**
  * @param {{
  * agoricNames?: ERef<NameHub>
- * board: ERef<import('@agoric/vats').Board>
+ * board: ERef<Board>
  * dateNow?: () => number,
  * inboxStateChangeHandler?: (state: any) => void,
- * myAddressNameAdmin: ERef<import('@agoric/vats').MyAddressNameAdmin>
+ * myAddressNameAdmin: ERef<MyAddressNameAdmin>
  * namesByAddress?: ERef<NameHub>
  * pursesStateChangeHandler?: (state: any) => void,
  * zoe: ERef<ZoeService>,
@@ -131,9 +156,9 @@ export function makeWalletRoot({
     'contact',
     { useLegacyMap: true }, // because contacts have identity!
   );
-  /** @type {Mapping<Instance>} */
+  /** @type {Mapping<Instance<any>>} */
   const instanceMapping = makeMapping('instance');
-  /** @type {Mapping<Installation>} */
+  /** @type {Mapping<Installation<any>>} */
   const installationMapping = makeMapping('installation');
 
   const brandTable = makeIssuerTable();
@@ -566,7 +591,7 @@ export function makeWalletRoot({
 
   // handle the update, which has already resolved to a record. The update means
   // the offer is 'done'.
-  function updateOrResubscribe(id, seat, update) {
+  function updateOrResubscribe(id, _seat, update) {
     const { updateCount } = update;
     assert(updateCount === undefined);
     idToSeat.delete(id);
@@ -1224,6 +1249,7 @@ export function makeWalletRoot({
           if (!exited) {
             return subscribeToUpdates(id, seat);
           }
+          return undefined;
         });
 
       const offerResultP = E(seat).getOfferResult();
@@ -1264,11 +1290,10 @@ export function makeWalletRoot({
   const { updater: paymentsUpdater, notifier: paymentsNotifier } =
     /** @type {NotifierRecord<PaymentRecord[]>} */ (makeNotifierKit([]));
   /**
-   * @param {PaymentRecord} param0
+   * @param {PaymentRecord & {displayPayment?: ReturnType<typeof fillInSlots>}} param0
    */
   const updatePaymentRecord = ({ actions, ...preDisplay }) => {
     // in case we have been here before...
-    // @ts-expect-error
     delete preDisplay.displayPayment;
     const displayPayment = fillInSlots(dehydrate(harden(preDisplay)));
     const paymentRecord = addMeta({
@@ -1690,7 +1715,7 @@ export function makeWalletRoot({
 
   const firstPathToLookup = createRootLookups();
 
-  /** @type {ReturnType<typeof import('@endo/marshal').makeMarshal>} */
+  /** @type {ReturnType<typeof makeMarshal>} */
   const marshaller = harden({
     fromCapData: context.fromCapData,
     toCapData: context.toCapData,

package/src/{types-ambient.js → types.js}

@@ -1,5 +1,19 @@
 // @ts-check
 
+/**
+ * @import {Coordinator} from '@agoric/cache';
+ * @import {Petname} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {Board} from '@agoric/vats';
+ * @import {ZoeIssuerRecord, ZoeService} from '@agoric/zoe';
+ * @import {Brand, Issuer, Payment, Purse} from '@agoric/ertp';
+ * @import {BrandRecord, WalletAdminFacet} from './internal-types.js';
+ * @import {Marshaller} from '@agoric/internal/src/lib-chainStorage.js';
+ * @import {ERef} from '@agoric/vow';
+ * @import {Notifier} from '@agoric/notifier';
+ * @import {Installation} from '@agoric/zoe/src/zoeService/utils.js';
+ * @import {Instance} from '@agoric/zoe/src/zoeService/utils.js';
+ */
+
 /**
  * This is the complete wallet, including the means to get the WalletAdminFacet
  * (necessary for the operation of the Wallet UI, and useful for the REPL).
@@ -57,7 +71,7 @@
  * wallet.
  *
  * @property {(offer: OfferState) => Promise<string>} addOffer
- * @property {() => Promise<import('@agoric/cache').Coordinator>} getCacheCoordinator
+ * @property {() => Promise<Coordinator>} getCacheCoordinator
  * @property {(brandBoardId: string) => Promise<string>} getDepositFacetId
  * Return the board ID to use to receive payments of the specified brand.
  * @property {() => Promise<Notifier<Array<PursesJSONState>>>} getPursesNotifier
@@ -85,7 +99,7 @@
  * is safe to pass to the dapp UI.
  * @property {() => Promise<ZoeService>} getZoe
  * Get the Zoe Service
- * @property {() => Promise<import('@agoric/vats').Board>} getBoard
+ * @property {() => Promise<Board>} getBoard
  * Get the Board
  * @property {(...path: Array<unknown>) => Promise<unknown>} getAgoricNames
  * Get the curated Agoric public naming hub
@@ -147,11 +161,11 @@
  */
 
 /**
- * @typedef {PetnameManager<Installation>} InstallationManager
+ * @typedef {PetnameManager<Installation<any>>} InstallationManager
  */
 
 /**
- * @typedef {PetnameManager<Instance>} InstanceManager
+ * @typedef {PetnameManager<Instance<any>>} InstanceManager
  */
 
 /**

package/src/wallet.js

@@ -18,16 +18,30 @@ import pubsub from './pubsub.js';
 import { bigintStringify } from './bigintStringify.js';
 import { makeTimerDeviceDateNow, makeTimerServiceDateNow } from './date-now.js';
 
-import './internal-types.js';
+/**
+ * @import {Petname} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {WalletAdminFacet} from './internal-types.js';
+ * @import {OfferState, PursesJSONState, WalletAdmin, WalletBridge} from './types.js';
+ * @import {ERef} from '@agoric/vow';
+ * @import {StorageNode} from '@agoric/internal/src/lib-chainStorage.js';
+ * @import {ZoeService} from '@agoric/zoe';
+ */
+
+/**
+ * @import {Board} from '@agoric/vats';
+ * @import {TimerService} from '@agoric/time';
+ * @import {MyAddressNameAdmin} from '@agoric/vats';
+ * @import {WalletRoot} from './lib-wallet.js';
+ */
 
 /**
  * @typedef {{
  * agoricNames: ERef<NameHub>,
- * board: ERef<import('@agoric/vats').Board>,
+ * board: ERef<Board>,
  * cacheStorageNode: ERef<StorageNode>,
  * localTimerPollInterval?: bigint,
- * localTimerService?: import('@agoric/time').TimerService,
- * myAddressNameAdmin: ERef<import('@agoric/vats').MyAddressNameAdmin>,
+ * localTimerService?: TimerService,
+ * myAddressNameAdmin: ERef<MyAddressNameAdmin>,
  * namesByAddress: ERef<NameHub>,
  * timerDevice?: unknown,
  * timerDeviceScale?: number,
@@ -41,7 +55,7 @@ export function buildRootObject(vatPowers) {
   // See if we have the device vat power.
   const { D } = vatPowers || {};
 
-  /** @type {import('./lib-wallet.js').WalletRoot} */
+  /** @type {WalletRoot} */
   let walletRoot;
   /** @type {WalletAdminFacet} */
   let walletAdmin;