@agoric/zoe 0.26.2 → 0.26.3-calypso-dev-84eb287.0

package/src/zoeService/startInstance.js

@@ -1,3 +1,4 @@
+/* eslint @typescript-eslint/no-floating-promises: "warn" */
 import { E } from '@endo/eventual-send';
 import { passStyleOf } from '@endo/marshal';
 import {
@@ -5,14 +6,23 @@ import {
   makeScalarBigMapStore,
   provideDurableWeakMapStore,
   prepareExoClass,
+  prepareExo,
+  watchPromise,
 } from '@agoric/vat-data';
 import { initEmpty } from '@agoric/store';
+import { isUpgradeDisconnection } from '@agoric/internal/src/upgrade-api.js';
 
 import { defineDurableHandle } from '../makeHandle.js';
 import { makeInstanceAdminMaker } from './instanceAdminStorage.js';
-import { AdminFacetI, InstanceAdminI } from '../typeGuards.js';
+import {
+  AdminFacetI,
+  InstanceAdminI,
+  InstanceAdminShape,
+} from '../typeGuards.js';
+
+// import '../internal-types.js';
 
-/** @typedef {import('@agoric/vat-data').Baggage} Baggage */
+/** @import {Baggage} from '@agoric/vat-data' */
 /** @typedef { import('@agoric/swingset-vat').BundleCap} BundleCap */
 
 const { Fail, quote: q } = assert;
@@ -22,7 +32,7 @@ const { Fail, quote: q } = assert;
  * @param {() => ERef<BundleCap>} getZcfBundleCapP
  * @param {(id: string) => BundleCap} getBundleCapByIdNow
  * @param {Baggage} zoeBaggage
- * @returns {import('./utils').StartInstance}
+ * @returns {import('./utils.js').StartInstance}
  */
 export const makeStartInstance = (
   startInstanceAccess,
@@ -43,13 +53,54 @@ export const makeStartInstance = (
     seatHandleToZoeSeatAdmin,
   );
 
+  const getFreshZcfBundleCap = async () => {
+    const settledBundleCap = await getZcfBundleCapP();
+    settledBundleCap !== undefined || Fail`the ZCF bundle cap was broken`;
+    return settledBundleCap;
+  };
+
   const InstanceAdminStateShape = harden({
     instanceStorage: M.remotable('ZoeInstanceStorageManager'),
     instanceAdmin: M.remotable('InstanceAdmin'),
-    seatHandleToSeatAdmin: M.remotable(),
+    seatHandleToSeatAdmin: M.remotable(), // seatHandleToSeatAdmin, but putting that string here is backwards-incompatible
     adminNode: M.remotable('adminNode'),
   });
 
+  /** @type {import('@agoric/swingset-liveslots').PromiseWatcher<Completion, [InstanceAdmin, Handle<'adminNode'>]>} */
+  const watcher = prepareExo(
+    zoeBaggage,
+    'InstanceCompletionWatcher',
+    M.interface('InstanceCompletionWatcher', {
+      onFulfilled: M.call(
+        M.any(),
+        InstanceAdminShape,
+        M.remotable('adminNode'),
+      ).returns(),
+      onRejected: M.call(
+        M.any(),
+        InstanceAdminShape,
+        M.remotable('adminNode'),
+      ).returns(),
+    }),
+    {
+      onFulfilled: (completion, instanceAdmin) =>
+        instanceAdmin.exitAllSeats(completion),
+      onRejected: (/** @type {Error} */ reason, instanceAdmin, adminNode) => {
+        if (isUpgradeDisconnection(reason)) {
+          console.log(`resetting promise watcher after upgrade`, reason);
+          // eslint-disable-next-line no-use-before-define
+          watchForAdminNodeDone(adminNode, instanceAdmin);
+        } else {
+          instanceAdmin.failAllSeats(reason);
+        }
+      },
+    },
+  );
+
+  const watchForAdminNodeDone = (adminNode, instAdmin) => {
+    watchPromise(E(adminNode).done(), watcher, instAdmin, adminNode);
+  };
+
   const makeZoeInstanceAdmin = prepareExoClass(
     zoeBaggage,
     'zoeInstanceAdmin',
@@ -124,10 +175,10 @@ export const makeStartInstance = (
       replaceAllocations(seatHandleAllocations) {
         const { state } = this;
         try {
-          seatHandleAllocations.forEach(({ seatHandle, allocation }) => {
+          for (const { seatHandle, allocation } of seatHandleAllocations) {
             const zoeSeatAdmin = state.seatHandleToSeatAdmin.get(seatHandle);
             zoeSeatAdmin.replaceAllocation(allocation);
-          });
+          }
         } catch (err) {
           // nothing for Zoe to do if the termination fails
           void E(state.adminNode).terminateWithFailure(err);
@@ -154,6 +205,10 @@ export const makeStartInstance = (
         const { state } = this;
         return state.instanceAdmin.isBlocked(string);
       },
+      repairContractCompletionWatcher() {
+        const { state, self } = this;
+        void watchForAdminNodeDone(state.adminNode, self);
+      },
     },
     {
       stateShape: InstanceAdminStateShape,
@@ -178,12 +233,10 @@ export const makeStartInstance = (
     /**
      *
      * @param {import('@agoric/swingset-vat').VatAdminFacet} adminNode
-     * @param {*} zcfBundleCap
      * @param {*} contractBundleCap
      */
-    (adminNode, zcfBundleCap, contractBundleCap) => ({
+    (adminNode, contractBundleCap) => ({
       adminNode,
-      zcfBundleCap,
       contractBundleCap,
     }),
     {
@@ -200,36 +253,40 @@ export const makeStartInstance = (
           privateArgs: newPrivateArgs,
         };
 
-        return E(state.adminNode).upgrade(state.zcfBundleCap, {
-          vatParameters,
-        });
+        return E.when(getFreshZcfBundleCap(), bCap =>
+          E(state.adminNode).upgrade(bCap, { vatParameters }),
+        );
       },
       async upgradeContract(contractBundleId, newPrivateArgs = undefined) {
         const { state } = this;
-        const newContractBundleCap = await getBundleCapByIdNow(
-          contractBundleId,
-        );
+
+        const newContractBundleCap =
+          await getBundleCapByIdNow(contractBundleId);
         const vatParameters = {
           contractBundleCap: newContractBundleCap,
           privateArgs: newPrivateArgs,
         };
-        return E(state.adminNode).upgrade(state.zcfBundleCap, {
-          vatParameters,
-        });
+        state.contractBundleCap = newContractBundleCap;
+        return E.when(getFreshZcfBundleCap(), bCap =>
+          E(state.adminNode).upgrade(bCap, { vatParameters }),
+        );
       },
     },
   );
 
+  /**
+   * @type {import('./utils.js').StartInstance}
+   */
   const startInstance = async (
     installationP,
     uncleanIssuerKeywordRecord = harden({}),
+    // @ts-expect-error FIXME may not match the expected terms of SF
     customTerms = harden({}),
     privateArgs = undefined,
     instanceLabel = '',
   ) => {
-    const { installation, bundle, bundleCap } = await E(
-      startInstanceAccess,
-    ).unwrapInstallation(installationP);
+    const { installation, bundle, bundleCap } =
+      await E(startInstanceAccess).unwrapInstallation(installationP);
     // AWAIT ///
 
     const contractBundleCap = bundle || bundleCap;
@@ -274,15 +331,10 @@ export const makeStartInstance = (
     );
     zoeInstanceStorageManager.initInstanceAdmin(instanceHandle, instanceAdmin);
 
-    E.when(
-      E(adminNode).done(),
-      completion => {
-        instanceAdmin.exitAllSeats(completion);
-      },
-      reason => instanceAdmin.failAllSeats(reason),
-    );
+    void watchForAdminNodeDone(adminNode, instanceAdmin);
 
     /** @type {ZoeInstanceAdmin} */
+    // @ts-expect-error XXX saveIssuer
     const zoeInstanceAdminForZcf = makeZoeInstanceAdmin(
       zoeInstanceStorageManager,
       instanceAdmin,
@@ -306,11 +358,9 @@ export const makeStartInstance = (
 
     instanceAdmin.initDelayedState(handleOfferObj, publicFacet);
 
-    const settledBundleCap = await getZcfBundleCapP();
-    settledBundleCap !== undefined || Fail`the bundle cap was broken`;
-
     // creatorInvitation can be undefined, but if it is defined,
     // let's make sure it is an invitation.
+    // @ts-expect-error cast
     return E.when(
       Promise.all([
         creatorInvitationP,
@@ -324,11 +374,7 @@ export const makeStartInstance = (
           isLiveResult ||
           Fail`The contract did not correctly return a creatorInvitation`;
 
-        const adminFacet = makeAdminFacet(
-          adminNode,
-          harden(settledBundleCap),
-          contractBundleCap,
-        );
+        const adminFacet = makeAdminFacet(adminNode, contractBundleCap);
 
         // Actually returned to the user.
         return harden({
@@ -343,6 +389,5 @@ export const makeStartInstance = (
       },
     );
   };
-  // @ts-expect-error cast
   return harden(startInstance);
 };

package/src/zoeService/{types.d.ts → types-ambient.d.ts}

@@ -23,12 +23,12 @@ type ZoeService = {
     getInvitationIssuer: GetInvitationIssuer;
     install: InstallBundle;
     installBundleID: InstallBundleID;
-    startInstance: import('./utils').StartInstance;
+    startInstance: import("./utils.js").StartInstance;
     offer: Offer;
-    getPublicFacet: import('./utils').GetPublicFacet;
+    getPublicFacet: import("./utils.js").GetPublicFacet;
     getIssuers: GetIssuers;
     getBrands: GetBrands;
-    getTerms: import('./utils').GetTerms;
+    getTerms: import("./utils.js").GetTerms;
     getOfferFilter: GetOfferFilter;
     getInstallationForInstance: GetInstallationForInstance;
     getInstance: GetInstance;
@@ -43,19 +43,19 @@ type ZoeService = {
     getBundleIDFromInstallation: GetBundleIDFromInstallation;
     getProposalShapeForInvitation: (invitationHandle: InvitationHandle) => Pattern | undefined;
 };
-type GetInvitationIssuer = () => Promise<Issuer<'set'>>;
-type GetFeeIssuer = () => Promise<Issuer<'nat'>>;
+type GetInvitationIssuer = () => Promise<Issuer<"set", InvitationDetails>>;
+type GetFeeIssuer = () => Promise<Issuer<"nat">>;
 type GetConfiguration = () => {
     feeIssuerConfig: FeeIssuerConfig;
 };
-type GetIssuers = (instance: import('./utils').Instance<any>) => Promise<IssuerKeywordRecord>;
-type GetBrands = (instance: import('./utils').Instance<any>) => Promise<BrandKeywordRecord>;
-type GetOfferFilter = (instance: import('./utils').Instance<any>) => string[];
+type GetIssuers = (instance: import("./utils.js").Instance<any>) => Promise<IssuerKeywordRecord>;
+type GetBrands = (instance: import("./utils.js").Instance<any>) => Promise<BrandKeywordRecord>;
+type GetOfferFilter = (instance: import("./utils.js").Instance<any>) => string[];
 type SetOfferFilter = (instance: Instance, strings: string[]) => any;
-type GetInstallationForInstance = (instance: import('./utils').Instance<any>) => Promise<Installation>;
-type GetInstance = (invitation: ERef<Invitation>) => Promise<import('./utils').Instance<any>>;
+type GetInstallationForInstance = (instance: import("./utils.js").Instance<any>) => Promise<Installation>;
+type GetInstance = (invitation: ERef<Invitation>) => Promise<import("./utils.js").Instance<any>>;
 type GetInstallation = (invitation: ERef<Invitation>) => Promise<Installation>;
-type GetInvitationDetails = (invitation: ERef<Invitation>) => Promise<InvitationDetails>;
+type GetInvitationDetails = (invitation: ERef<Invitation<any, any>>) => Promise<InvitationDetails>;
 /**
  * Create an installation by safely evaluating the code and
  * registering it with Zoe. Returns an installation.
@@ -85,7 +85,7 @@ type GetBundleIDFromInstallation = (allegedInstallation: ERef<Installation>) =>
  * values are the actual payments to be escrowed. A payment is
  * expected for every rule under `give`.
  */
-type Offer = <Args, Result>(invitation: ERef<Invitation<Result, Args>>, proposal?: Proposal, paymentKeywordRecord?: PaymentPKeywordRecord, offerArgs?: Args | undefined) => Promise<UserSeat<Result>>;
+type Offer = <Result, Args = undefined>(invitation: ERef<Invitation<Result, Args>>, proposal?: Proposal, paymentKeywordRecord?: PaymentPKeywordRecord, offerArgs?: Args) => Promise<UserSeat<Result>>;
 /**
  * Zoe uses seats to access or manipulate offers. They let contracts and users
  * interact with them. Zoe has two kinds of seats. ZCFSeats are used within
@@ -161,14 +161,10 @@ type ProposalRecord = {
  * { Asset: AmountMath.make(assetBrand, 5n), Price:
  * AmountMath.make(priceBrand, 9n) }
  */
-type AmountKeywordRecord = Record<Keyword, Amount<any>>;
+type AmountKeywordRecord = Record<Keyword, import("@agoric/ertp/src/types.js").AnyAmount>;
 type Waker = {
     wake: () => void;
 };
-type Deadline = import('@agoric/time/src/types').Timestamp;
-type Timer = {
-    setWakeup: (deadline: Deadline, wakerP: ERef<Waker>) => void;
-};
 type OnDemandExitRule = {
     onDemand: null;
 };
@@ -177,8 +173,8 @@ type WaivedExitRule = {
 };
 type AfterDeadlineExitRule = {
     afterDeadline: {
-        timer: Timer;
-        deadline: Deadline;
+        timer: import("@agoric/time").TimerService;
+        deadline: import("@agoric/time").Timestamp;
     };
 };
 /**
@@ -187,13 +183,12 @@ type AfterDeadlineExitRule = {
  * The possible records are:
  * `{ waived: null }`
  * `{ onDemand: null }`
- * `{ afterDeadline: { timer :Timer<Deadline>, deadline :Deadline } }
+ * `{ afterDeadline: { timer :Timer<Deadline>, deadline :Deadline } }`
  */
 type ExitRule = OnDemandExitRule | WaivedExitRule | AfterDeadlineExitRule;
-type Instance = import('./utils').Instance<any>;
-type VatAdminSvc = import('@agoric/swingset-vat').VatAdminSvc;
+type Instance = import("./utils.js").Instance<any>;
 type ZCFSpec = {
-    bundleCap: import('@agoric/swingset-vat').BundleCap;
+    bundleCap: import("@agoric/swingset-vat").BundleCap;
 } | {
     name: string;
 } | {
@@ -207,13 +202,13 @@ type PaymentPKeywordRecord = Record<Keyword, ERef<Payment<any>>>;
 type PaymentKeywordRecord = Record<Keyword, Payment<any>>;
 type InvitationDetails = {
     installation: Installation;
-    instance: import('./utils').Instance<any>;
+    instance: import("./utils.js").Instance<any>;
     handle: InvitationHandle;
     description: string;
     customDetails?: Record<string, any> | undefined;
 };
-type Installation<SF = any> = import('./utils').Installation<SF>;
-type InstallationStart<I extends Installation<any>> = import('./utils').InstallationStart<I>;
+type Installation<SF = any> = import("./utils.js").Installation<SF>;
+type InstallationStart<I extends Installation> = import("./utils.js").InstallationStart<I>;
 type FeeIssuerConfig = {
     name: string;
     assetKind: AssetKind;
@@ -222,5 +217,5 @@ type FeeIssuerConfig = {
 type ZoeFeesConfig = {
     getPublicFacetFee: NatValue;
 };
-type FeeMintAccess = Handle<'feeMintAccess'>;
-//# sourceMappingURL=types.d.ts.map
+type FeeMintAccess = Handle<"feeMintAccess">;
+//# sourceMappingURL=types-ambient.d.ts.map

package/src/zoeService/types-ambient.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types-ambient.d.ts","sourceRoot":"","sources":["types-ambient.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;yBAmBc,mBAAmB;aASnB,aAAa;qBACb,eAAe;mBACf,OAAO,YAAY,EAAE,aAAa;WAClC,KAAK;oBACL,OAAO,YAAY,EAAE,cAAc;gBACnC,UAAU;eACV,SAAS;cACT,OAAO,YAAY,EAAE,QAAQ;oBAC7B,cAAc;gCACd,0BAA0B;iBAC1B,WAAW;qBACX,eAAe;;;;;0BACf,oBAAoB;kBAGpB,YAAY;sBACZ,gBAAgB;iCAChB,2BAA2B;mCAC3B,CAAC,gBAAgB,EAAE,gBAAgB,KAAK,OAAO,GAAG,SAAS;;iCAK5D,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC;0BAKzC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;8BAKtB;IACZ,eAAmB,EAAE,eAAe,CAAC;CAClC;6BAKO,OAAO,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC,KAChC,OAAO,CAAC,mBAAmB,CAAC;4BAK9B,OAAO,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC,KAChC,OAAO,CAAC,kBAAkB,CAAC;iCAK7B,OAAO,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC,KAChC,MAAM,EAAE;iCAKV,QAAQ,WACR,MAAM,EAAE;6CAKR,OAAO,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC,KAChC,OAAO,CAAC,YAAY,CAAC;gCAKvB,IAAI,CAAC,UAAU,CAAC,KACd,OAAO,CAAC,OAAO,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;oCAK7C,IAAI,CAAC,UAAU,CAAC,KACd,OAAO,CAAC,YAAY,CAAC;yCAKvB,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,KACxB,OAAO,CAAC,iBAAiB,CAAC;;;;;8BAW5B,MAAM,GAAG,YAAY,uCAEnB,OAAO,CAAC,YAAY,CAAC;;;;kCAUvB,QAAQ,uCAEN,OAAO,CAAC,YAAY,CAAC;;;;;yDASvB,IAAI,CAAC,YAAY,CAAC,KAChB,OAAO,CAAC,QAAQ,CAAC;;;;;;;;;;;;;;;;aAIjB,CAAC,MAAM,EAAE,IAAgB,GAAT,SAAS,EACrC,UAAc,EAAE,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,EAC9C,QAAY,CAAC,EAAE,QAAQ,EACvB,oBAAwB,CAAC,EAAE,qBAAqB,EAChD,SAAa,CAAC,EAAE,IAAI,KACX,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;cAsCZ,EAAE;iBAEX,MAAM,OAAO,CAAC,cAAc,CAAC;;;;;gBAC7B,MAAM,OAAO,CAAC,qBAAqB,CAAC;;;;;eAGpC,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;oBAG3C,MAAM,OAAO,CAAC,EAAE,CAAC;;;;;;;;;qBACX,IAAI;;;;eAOV,MAAM,OAAO,CAAC,OAAO,CAAC;;;;;;;;uBAEtB,MAAM,OAAO,CAAC,CAAC,GAAC,CAAC,CAAC;;;;;wBAKlB,MAAM,OAAO,CAAC,UAAU,CAAC;;;;;uBAGzB,MAAM,UAAU,CAAC,UAAU,CAAC;;gBAK7B,OAAO,CAAC,cAAc,CAAC;sBAEvB;IAAC,IAAI,EAAE,mBAAmB,CAAC;IACvC,IAAiB,EAAE,mBAAmB,CAAC;IACvC,IAAiB,EAAE,QAAQ,CAAA;CACd;;;;;;2BAID,MAAM,CAAC,OAAO,EAAE,OAAO,2BAA2B,EAAE,SAAS,CAAC;;UAS7D,MAAM,IAAI;;;cAKV,IAAI;;;YAKJ,IAAI;;;mBAKJ;QAAC,KAAK,EAAE,OAAO,cAAc,EAAE,YAAY,CAAC;QAAC,QAAQ,EAAE,OAAO,cAAc,EAAE,SAAS,CAAA;KAAC;;;;;;;;;;gBAIzF,gBAAgB,GAAG,cAAc,GAAG,qBAAqB;gBAWzD,OAAO,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC;eAIlC;IAAC,SAAS,EAAE,OAAO,sBAAsB,EAAE,SAAS,CAAA;CAAE,GAAG;IAAC,IAAI,EAAE,MAAM,CAAA;CAAC,GAAG;IAAC,EAAE,EAAE,QAAQ,CAAA;CAAC;;;;oBAIxF,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;6BAKnB,MAAM,CAAC,OAAO,EAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;4BAClC,MAAM,CAAC,OAAO,EAAC,OAAO,CAAC,GAAG,CAAC,CAAC;;kBAK3B,YAAY;cACZ,OAAO,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC;YAClC,gBAAgB;iBAChB,MAAM;;;kBAKN,EAAE,UACH,OAAO,YAAY,EAAE,YAAY,CAAC,EAAE,CAAC;uBAItB,CAAC,SAAf,YAAa,IACd,OAAO,YAAY,EAAE,iBAAiB,CAAC,CAAC,CAAC;;UAKxC,MAAM;eACN,SAAS;iBACT,WAAW;;;uBAKX,QAAQ;;qBAIT,MAAM,CAAC,eAAe,CAAC"}

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

@@ -1,6 +1,6 @@
 // @jessie-check
 
-/// <reference types="ses"/>
+/// <reference types="ses" />
 
 /**
  * @typedef {object} ZoeService
@@ -28,12 +28,12 @@
  *
  * @property {InstallBundle} install
  * @property {InstallBundleID} installBundleID
- * @property {import('./utils').StartInstance} startInstance
+ * @property {import('./utils.js').StartInstance} startInstance
  * @property {Offer} offer
- * @property {import('./utils').GetPublicFacet} getPublicFacet
+ * @property {import('./utils.js').GetPublicFacet} getPublicFacet
  * @property {GetIssuers} getIssuers
  * @property {GetBrands} getBrands
- * @property {import('./utils').GetTerms} getTerms
+ * @property {import('./utils.js').GetTerms} getTerms
  * @property {GetOfferFilter} getOfferFilter
  * @property {GetInstallationForInstance} getInstallationForInstance
  * @property {GetInstance} getInstance
@@ -49,7 +49,7 @@
 
 /**
  * @callback GetInvitationIssuer
- * @returns {Promise<Issuer<'set'>>}
+ * @returns {Promise<Issuer<'set', InvitationDetails>>}
  */
 
 /**
@@ -66,19 +66,19 @@
 
 /**
  * @callback GetIssuers
- * @param {import('./utils').Instance<any>} instance
+ * @param {import('./utils.js').Instance<any>} instance
  * @returns {Promise<IssuerKeywordRecord>}
  */
 
 /**
  * @callback GetBrands
- * @param {import('./utils').Instance<any>} instance
+ * @param {import('./utils.js').Instance<any>} instance
  * @returns {Promise<BrandKeywordRecord>}
  */
 
 /**
  * @callback GetOfferFilter
- * @param {import('./utils').Instance<any>} instance
+ * @param {import('./utils.js').Instance<any>} instance
  * @returns {string[]}
  */
 
@@ -90,14 +90,14 @@
 
 /**
  * @callback GetInstallationForInstance
- * @param {import('./utils').Instance<any>} instance
+ * @param {import('./utils.js').Instance<any>} instance
  * @returns {Promise<Installation>}
  */
 
 /**
  * @callback GetInstance
  * @param {ERef<Invitation>} invitation
- * @returns {Promise<import('./utils').Instance<any>>}
+ * @returns {Promise<import('./utils.js').Instance<any>>}
  */
 
 /**
@@ -108,7 +108,7 @@
 
 /**
  * @callback GetInvitationDetails
- * @param {ERef<Invitation>} invitation
+ * @param {ERef<Invitation<any, any>>} invitation
  * @returns {Promise<InvitationDetails>}
  */
 
@@ -148,7 +148,7 @@
  */
 
 /**
- * @typedef {<Args, Result>(
+ * @typedef {<Result, Args = undefined>(
  *   invitation: ERef<Invitation<Result, Args>>,
  *   proposal?: Proposal,
  *   paymentKeywordRecord?: PaymentPKeywordRecord,
@@ -232,7 +232,7 @@
  */
 
 /**
- * @typedef {Record<Keyword, Amount<any>>} AmountKeywordRecord
+ * @typedef {Record<Keyword, import('@agoric/ertp/src/types.js').AnyAmount>} AmountKeywordRecord
  *
  * The keys are keywords, and the values are amounts. For example:
  * { Asset: AmountMath.make(assetBrand, 5n), Price:
@@ -244,15 +244,6 @@
  * @property {() => void} wake
  */
 
-/**
- * @typedef {import('@agoric/time/src/types').Timestamp} Deadline
- */
-
-/**
- * @typedef {object} Timer
- * @property {(deadline: Deadline, wakerP: ERef<Waker>) => void} setWakeup
- */
-
 /**
  * @typedef {object} OnDemandExitRule
  * @property {null} onDemand
@@ -265,7 +256,7 @@
 
 /**
  * @typedef {object} AfterDeadlineExitRule
- * @property {{timer:Timer, deadline:Deadline}} afterDeadline
+ * @property {{timer: import('@agoric/time').TimerService, deadline: import('@agoric/time').Timestamp}} afterDeadline
  */
 
 /**
@@ -276,15 +267,11 @@
  * The possible records are:
  * `{ waived: null }`
  * `{ onDemand: null }`
- * `{ afterDeadline: { timer :Timer<Deadline>, deadline :Deadline } }
- */
-
-/**
- * @typedef {import('./utils').Instance<any>} Instance
+ * `{ afterDeadline: { timer :Timer<Deadline>, deadline :Deadline } }`
  */
 
 /**
- * @typedef {import('@agoric/swingset-vat').VatAdminSvc} VatAdminSvc
+ * @typedef {import('./utils.js').Instance<any>} Instance
  */
 
 /**
@@ -304,7 +291,7 @@
 /**
  * @typedef {object} InvitationDetails
  * @property {Installation} installation
- * @property {import('./utils').Instance<any>} instance
+ * @property {import('./utils.js').Instance<any>} instance
  * @property {InvitationHandle} handle
  * @property {string} description
  * @property {Record<string, any>} [customDetails]
@@ -312,12 +299,12 @@
 
 /**
  * @template [SF=any] contract start function
- * @typedef {import('./utils').Installation<SF>} Installation
+ * @typedef {import('./utils.js').Installation<SF>} Installation
  */
 
 /**
  * @template {Installation} I
- * @typedef {import('./utils').InstallationStart<I>} InstallationStart
+ * @typedef {import('./utils.js').InstallationStart<I>} InstallationStart
  */
 
 /**