@agoric/wallet-backend 0.14.4-dev-b2b928a.0 → 0.14.4-dev-a07bcaa.0.a07bcaa

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/wallet-backend",
-  "version": "0.14.4-dev-b2b928a.0+b2b928a",
+  "version": "0.14.4-dev-a07bcaa.0.a07bcaa",
   "description": "Wallet backend",
   "type": "module",
   "scripts": {
@@ -14,23 +14,23 @@
     "lint:eslint": "yarn run -T eslint ."
   },
   "devDependencies": {
-    "@agoric/vats": "0.15.2-dev-b2b928a.0+b2b928a",
+    "@agoric/vats": "0.15.2-dev-a07bcaa.0.a07bcaa",
     "@endo/bundle-source": "^4.1.2",
     "@endo/far": "^1.1.14",
     "@endo/init": "^1.1.12",
     "ava": "^5.3.0"
   },
   "dependencies": {
-    "@agoric/cache": "0.3.3-dev-b2b928a.0+b2b928a",
-    "@agoric/ertp": "0.16.3-dev-b2b928a.0+b2b928a",
-    "@agoric/internal": "0.3.3-dev-b2b928a.0+b2b928a",
-    "@agoric/notifier": "0.6.3-dev-b2b928a.0+b2b928a",
-    "@agoric/smart-wallet": "0.5.4-dev-b2b928a.0+b2b928a",
-    "@agoric/store": "0.9.3-dev-b2b928a.0+b2b928a",
-    "@agoric/time": "0.3.3-dev-b2b928a.0+b2b928a",
-    "@agoric/vat-data": "0.5.3-dev-b2b928a.0+b2b928a",
-    "@agoric/zoe": "0.26.3-dev-b2b928a.0+b2b928a",
-    "@agoric/zone": "0.2.3-dev-b2b928a.0+b2b928a",
+    "@agoric/cache": "0.3.3-dev-a07bcaa.0.a07bcaa",
+    "@agoric/ertp": "0.16.3-dev-a07bcaa.0.a07bcaa",
+    "@agoric/internal": "0.3.3-dev-a07bcaa.0.a07bcaa",
+    "@agoric/notifier": "0.6.3-dev-a07bcaa.0.a07bcaa",
+    "@agoric/smart-wallet": "0.5.4-dev-a07bcaa.0.a07bcaa",
+    "@agoric/store": "0.9.3-dev-a07bcaa.0.a07bcaa",
+    "@agoric/time": "0.3.3-dev-a07bcaa.0.a07bcaa",
+    "@agoric/vat-data": "0.5.3-dev-a07bcaa.0.a07bcaa",
+    "@agoric/zoe": "0.26.3-dev-a07bcaa.0.a07bcaa",
+    "@agoric/zone": "0.2.3-dev-a07bcaa.0.a07bcaa",
     "@endo/errors": "^1.2.13",
     "@endo/eventual-send": "^1.3.4",
     "@endo/marshal": "^1.8.0",
@@ -65,5 +65,8 @@
   "typeCoverage": {
     "atLeast": 0
   },
-  "gitHead": "b2b928a9d8f18400bb67d23787b169bb184217cd"
+  "engines": {
+    "node": "^20.9 || ^22.11"
+  },
+  "gitHead": "a07bcaafea902c18b6d1c5233636240237bc8a6e"
 }

package/src/findOrMakeInvitation.js

@@ -3,6 +3,10 @@ import { E } from '@endo/eventual-send';
 import { passStyleOf } from '@endo/marshal';
 import { AmountMath } from '@agoric/ertp';
 
+/**
+ * @import {Board} from '@agoric/vats';
+ */
+
 export const makeId = (dappOrigin, rawId) => `${dappOrigin}#${rawId}`;
 
 const assertFirstCapASCII = str => {
@@ -19,7 +23,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 +95,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,7 @@
 // @ts-check
 
+/** @import {PursesJSONState, RecordMetadata} from './types-ambient.js'; */
+
 /**
  * @typedef {object} PursesAddedState
  * @property {Purse} purse
@@ -8,8 +10,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 {AmountValue} from '@agoric/ertp/src/types.js';
+ * @import {ZoeIssuerRecord} from '@agoric/zoe';
+ * @import {WalletRoot} from './lib-wallet.js';
  */
 
 /**
@@ -18,7 +24,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 +48,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 +91,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 +102,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,10 @@ import { E } from '@endo/eventual-send';
 
 import { makeScalarWeakMapStore } from '@agoric/store';
 
-import './internal-types.js';
+/**
+ * @import {ZoeIssuerRecord} from '@agoric/zoe';
+ * @import {IssuerTable} from './types-ambient.js';
+ */
 
 /**
  * IssuerTable

package/src/lib-dehydrate.js

@@ -4,6 +4,11 @@ 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';
+ */
+
 /**
  * @typedef {string[]} Path
  * @typedef {{} & 'Strongname'} Strongname

package/src/lib-wallet.js

@@ -42,7 +42,12 @@ 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 {UserSeat} from '@agoric/zoe';
+ * @import {BrandRecord, Contact, DappRecord, Mapping, PaymentRecord, PursesFullState} from './internal-types.js';
+ * @import {InstallationManager, InstanceManager, IssuerManager, OfferState, PursesJSONState, RecordMetadata} from './types-ambient.js';
+ */
 
 // does nothing
 const noActionStateChangeHandler = _newState => {};
@@ -57,13 +62,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>,
@@ -1264,11 +1275,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 +1700,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

@@ -1,5 +1,13 @@
 // @ts-check
 
+/**
+ * @import {Coordinator} from '@agoric/cache';
+ * @import {Petname} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {Board} from '@agoric/vats';
+ * @import {ZoeIssuerRecord} from '@agoric/zoe';
+ * @import {BrandRecord, WalletAdminFacet} from './internal-types.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 +65,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 +93,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

package/src/wallet.js

@@ -18,16 +18,27 @@ 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-ambient.js';
+ */
+
+/**
+ * @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 +52,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;

package/test/lib-wallet.test.js

@@ -19,6 +19,11 @@ import { resolve as importMetaResolve } from 'import-meta-resolve';
 import { makeHeapZone } from '@agoric/zone';
 import { makeWalletRoot } from '../src/lib-wallet.js';
 
+/**
+ * @import {TestFn} from 'ava';
+ * @import {ExecutionContext} from 'ava';
+ */
+
 const ZOE_INVITE_PURSE_PETNAME = 'Default Zoe invite purse';
 
 const mixinMyAddress = prepareMixinMyAddress(makeHeapZone());
@@ -28,7 +33,7 @@ function makeFakeMyAddressNameAdmin() {
   return mixinMyAddress(nameAdmin, 'agoric1test1');
 }
 
-/** @type {import('ava').TestFn<Awaited<LibWalletTestContext>>} */
+/** @type {TestFn<Awaited<LibWalletTestContext>>} */
 const test = anyTest;
 
 /**
@@ -40,7 +45,7 @@ const test = anyTest;
  */
 
 async function setupTest(
-  /** @type {import('ava').ExecutionContext<LibWalletTestContext>} */ t,
+  /** @type {ExecutionContext<LibWalletTestContext>} */ t,
   { autoswap = false, automaticRefund = false } = {},
 ) {
   const pursesStateChangeLog = [];