@agoric/inter-protocol 0.16.2-other-dev-3eb1a1d.0 → 0.16.2-other-dev-d15096d.0.d15096d

package/src/vaultFactory/vaultFactory.d.ts

@@ -1,9 +1,9 @@
 /**
  * @typedef {ZCF<
- *   GovernanceTerms<import('./params').VaultDirectorParams> & {
+ *   GovernanceTerms<VaultDirectorParams> & {
  *     priceAuthority: ERef<PriceAuthority>;
  *     reservePublicFacet: AssetReservePublicFacet;
- *     timerService: import('@agoric/time').TimerService;
+ *     timerService: TimerService;
  *   }
  * >} VaultFactoryZCF
  */
@@ -13,12 +13,12 @@ export function start(zcf: VaultFactoryZCF, privateArgs: {
     feeMintAccess: FeeMintAccess;
     initialPoserInvitation: Invitation;
     initialShortfallInvitation: Invitation;
-    storageNode: ERef<StorageNode>;
-    marshaller: ERef<Marshaller>;
-    auctioneerInstance: Instance;
-    managerParams: Record<string, import("./params.js").VaultManagerParamOverrides>;
+    storageNode: Remote<StorageNode>;
+    marshaller: Remote<Marshaller>;
+    auctioneerInstance: Instance<typeof auctioneerStart>;
+    managerParams: Record<string, VaultManagerParamOverrides>;
     directorParamOverrides: [object];
-}, baggage: import("@agoric/swingset-liveslots").Baggage): Promise<{
+}, baggage: Baggage): Promise<{
     creatorFacet: import("@endo/exo").Guarded<{
         getParamMgrRetriever: () => {
             get: (paramPath?: VaultFactoryParamPath) => import("./vaultDirector.js").VaultDirectorParamManager | import("@agoric/governance/src/contractGovernance/typedParamManager.js").TypedParamManager<{
@@ -29,7 +29,7 @@ export function start(zcf: VaultFactoryZCF, privateArgs: {
                 LiquidationPenalty: "ratio";
                 MintFee: "ratio";
             }>;
-        } & import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
+        } & RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
             get: (paramPath?: VaultFactoryParamPath) => import("./vaultDirector.js").VaultDirectorParamManager | import("@agoric/governance/src/contractGovernance/typedParamManager.js").TypedParamManager<{
                 DebtLimit: "amount";
                 InterestRate: "ratio";
@@ -39,7 +39,7 @@ export function start(zcf: VaultFactoryZCF, privateArgs: {
                 MintFee: "ratio";
             }>;
         }>;
-        getInvitation(name: string): Promise<Invitation<unknown, undefined>>;
+        getInvitation(name: string): Promise<Invitation>;
         getLimitedCreatorFacet(): import("@endo/exo").Guarded<{
             addVaultType(collateralIssuer: Issuer<"nat">, collateralKeyword: Keyword, initialParamValues: VaultManagerParamValues): Promise<import("@endo/exo").Guarded<{
                 getGovernedParams(): import("./vaultManager.js").GovernedParamGetters;
@@ -54,7 +54,7 @@ export function start(zcf: VaultFactoryZCF, privateArgs: {
                     invitationMakers: import("@endo/exo").Guarded<{
                         AdjustBalances(): Promise<Invitation<string, undefined>>;
                         CloseVault(): Promise<Invitation<string, undefined>>;
-                        TransferVault(): Promise<Invitation<any, undefined>>;
+                        TransferVault(): Promise<Invitation</*elided*/ any>>;
                     }>;
                     vault: import("@endo/exo").Guarded<{
                         getPublicTopics(): {
@@ -66,7 +66,7 @@ export function start(zcf: VaultFactoryZCF, privateArgs: {
                         };
                         makeAdjustBalancesInvitation(): Promise<Invitation<string, undefined>>;
                         makeCloseInvitation(): Promise<Invitation<string, undefined>>;
-                        makeTransferInvitation(): Promise<Invitation<any, undefined>>;
+                        makeTransferInvitation(): Promise<Invitation</*elided*/ any>>;
                         getCollateralAmount(): import("@agoric/ertp").NatAmount;
                         getCurrentDebt(): import("@agoric/ertp").NatAmount;
                         getNormalizedDebt(): import("./storeUtils.js").NormalizedDebt;
@@ -86,7 +86,7 @@ export function start(zcf: VaultFactoryZCF, privateArgs: {
                         invitationMakers: import("@endo/exo").Guarded<{
                             AdjustBalances(): Promise<Invitation<string, undefined>>;
                             CloseVault(): Promise<Invitation<string, undefined>>;
-                            TransferVault(): Promise<Invitation<any, undefined>>;
+                            TransferVault(): Promise<Invitation</*elided*/ any>>;
                         }>;
                         vault: import("@endo/exo").Guarded<{
                             getPublicTopics(): {
@@ -98,7 +98,7 @@ export function start(zcf: VaultFactoryZCF, privateArgs: {
                             };
                             makeAdjustBalancesInvitation(): Promise<Invitation<string, undefined>>;
                             makeCloseInvitation(): Promise<Invitation<string, undefined>>;
-                            makeTransferInvitation(): Promise<Invitation<any, undefined>>;
+                            makeTransferInvitation(): Promise<Invitation</*elided*/ any>>;
                             getCollateralAmount(): import("@agoric/ertp").NatAmount;
                             getCurrentDebt(): import("@agoric/ertp").NatAmount;
                             getNormalizedDebt(): import("./storeUtils.js").NormalizedDebt;
@@ -115,21 +115,21 @@ export function start(zcf: VaultFactoryZCF, privateArgs: {
                 lockOraclePrices(): PriceQuote;
                 liquidateVaults(auctionPF: ERef<AuctioneerPublicFacet>): Promise<void>;
             }>>;
-            makeCollectFeesInvitation(): Promise<Invitation<string, undefined>>;
+            makeCollectFeesInvitation(): Promise<Invitation<string>>;
             getRewardAllocation(): Allocation;
             makeLiquidationWaker(): {
                 wake: (timestamp: any) => any;
-            } & import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
+            } & RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
                 wake: (timestamp: any) => any;
             }>;
             makeReschedulerWaker(): {
                 wake: (timestamp: any) => any;
-            } & import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
+            } & RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
                 wake: (timestamp: any) => any;
             }>;
             makePriceLockWaker(): {
                 wake: (timestamp: any) => any;
-            } & import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
+            } & RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
                 wake: (timestamp: any) => any;
             }>;
             setShortfallReporter(newInvitation: any): Promise<void>;
@@ -151,7 +151,7 @@ export function start(zcf: VaultFactoryZCF, privateArgs: {
                 invitationMakers: import("@endo/exo").Guarded<{
                     AdjustBalances(): Promise<Invitation<string, undefined>>;
                     CloseVault(): Promise<Invitation<string, undefined>>;
-                    TransferVault(): Promise<Invitation<any, undefined>>;
+                    TransferVault(): Promise<Invitation</*elided*/ any>>;
                 }>;
                 vault: import("@endo/exo").Guarded<{
                     getPublicTopics(): {
@@ -163,7 +163,7 @@ export function start(zcf: VaultFactoryZCF, privateArgs: {
                     };
                     makeAdjustBalancesInvitation(): Promise<Invitation<string, undefined>>;
                     makeCloseInvitation(): Promise<Invitation<string, undefined>>;
-                    makeTransferInvitation(): Promise<Invitation<any, undefined>>;
+                    makeTransferInvitation(): Promise<Invitation</*elided*/ any>>;
                     getCollateralAmount(): import("@agoric/ertp").NatAmount;
                     getCurrentDebt(): import("@agoric/ertp").NatAmount;
                     getNormalizedDebt(): import("./storeUtils.js").NormalizedDebt;
@@ -188,15 +188,28 @@ export function start(zcf: VaultFactoryZCF, privateArgs: {
         getGovernedParams({ collateralBrand }: {
             collateralBrand: Brand;
         }): globalThis.ERef<globalThis.ParamStateRecord>;
-        getInvitationAmount(name: string): import("@agoric/ertp").SetAmount<InvitationDetails>;
+        getDirectorGovernedParams(): globalThis.ERef<globalThis.ParamStateRecord>;
+        getInvitationAmount(name: string): import("@agoric/ertp").SetAmount<import("@agoric/zoe").InvitationDetails>;
     }>;
 }>;
-export type VaultFactoryZCF = ZCF<GovernanceTerms<import("./params").VaultDirectorParams> & {
+export type VaultFactoryZCF = ZCF<GovernanceTerms<VaultDirectorParams> & {
     priceAuthority: ERef<PriceAuthority>;
     reservePublicFacet: AssetReservePublicFacet;
-    timerService: import("@agoric/time").TimerService;
+    timerService: TimerService;
 }>;
 export type VaultFactoryContract = ContractOf<typeof start>;
+import type { ContractMeta } from '@agoric/zoe';
+import type { FeeMintAccess } from '@agoric/zoe';
+import type { Invitation } from '@agoric/zoe';
+import type { Remote } from '@agoric/internal';
+import type { start as auctioneerStart } from '../auction/auctioneer.js';
+import type { VaultManagerParamOverrides } from './params.js';
+import type { Baggage } from '@agoric/swingset-liveslots';
+import type { ZCFSeat } from '@agoric/zoe';
 import type { PriceQuote } from '@agoric/zoe/tools/types.js';
+import type { VaultDirectorParams } from './params.js';
 import type { PriceAuthority } from '@agoric/zoe/tools/types.js';
+import type { TimerService } from '@agoric/time';
+import type { ZCF } from '@agoric/zoe';
+import type { ContractOf } from '@agoric/zoe/src/zoeService/utils.js';
 //# sourceMappingURL=vaultFactory.d.ts.map

package/src/vaultFactory/vaultFactory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vaultFactory.d.ts","sourceRoot":"","sources":["vaultFactory.js"],"names":[],"mappings":"AAmCA;;;;;;;;GAQG;AAEH,2BAA2B;AAC3B,mBADW,YAAY,CAerB;AAoBK,2BAhBI,eAAe,eACf;IACN,aAAa,EAAE,aAAa,CAAC;IAC7B,sBAAsB,EAAE,UAAU,CAAC;IACnC,0BAA0B,EAAE,UAAU,CAAC;IACvC,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IAC/B,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IAC7B,kBAAkB,EAAE,QAAQ,CAAC;IAC7B,aAAa,EAAE,MAAM,CACzB,MAAY,EACZ,OAAa,aAAa,EAAE,0BAA0B,CACjD,CAAC;IACF,sBAAsB,EAAE,CAAC,MAAM,CAAC,CAAC;CAClC,WACO,OAAO,4BAA4B,EAAE,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsFtD;8BAhIY,GAAG,CACX,eAAe,CAAC,OAAO,UAAU,EAAE,mBAAmB,CAAC,GAAG;IACxD,cAAc,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;IACrC,kBAAkB,EAAE,uBAAuB,CAAC;IAC5C,YAAY,EAAE,OAAO,cAAc,EAAE,YAAY,CAAC;CACnD,CACF;mCA6HU,UAAU,CAAC,OAAO,KAAK,CAAC;gCAxIwD,4BAA4B;oCAA5B,4BAA4B"}
+{"version":3,"file":"vaultFactory.d.ts","sourceRoot":"","sources":["vaultFactory.js"],"names":[],"mappings":"AA8CA;;;;;;;;GAQG;AAEH,2BAA2B;AAC3B,mBADW,YAAY,CAerB;AAiBK,2BAbI,eAAe,eACf;IACN,aAAa,EAAE,aAAa,CAAC;IAC7B,sBAAsB,EAAE,UAAU,CAAC;IACnC,0BAA0B,EAAE,UAAU,CAAC;IACvC,WAAW,EAAE,OAAO,WAAW,CAAC,CAAC;IACjC,UAAU,EAAE,OAAO,UAAU,CAAC,CAAC;IAC/B,kBAAkB,EAAE,QAAQ,CAAC,sBAAsB,CAAC,CAAC;IACrD,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,0BAA0B,CAAC,CAAC;IAC1D,sBAAsB,EAAE,CAAC,MAAM,CAAC,CAAC;CAClC,WACO,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwFjB;8BA/HY,IACR,eAAe,CAAC,mBAAmB,CAAC,GAAG;IACrC,cAAc,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;IACrC,kBAAkB,EAAE,uBAAuB,CAAC;IAC5C,YAAY,EAAE,YAAY,CAAC;CAC5B,CACF;mCA4HU,WAAW,OAAO,KAAK,CAAC;kCA/IoF,aAAa;mCAAb,aAAa;gCAAb,aAAa;4BAD9G,kBAAkB;8CAMA,0BAA0B;gDACxB,aAAa;6BAChC,4BAA4B;6BAPoE,aAAa;gCAE1C,4BAA4B;yCACnF,aAAa;oCAD0C,4BAA4B;kCAE1F,cAAc;yBAJ6E,aAAa;gCAC1G,qCAAqC"}

package/src/vaultFactory/vaultFactory.js

@@ -1,6 +1,6 @@
 // @jessie-check
-/// <reference types="@agoric/governance/exported" />
-/// <reference types="@agoric/zoe/exported" />
+/// <reference types="@agoric/governance/exported.js" />
+/// <reference types="@agoric/zoe/exported.js" />
 
 // The vaultFactory owns a number of VaultManagers and a mint for Minted.
 //
@@ -19,6 +19,7 @@ import { CONTRACT_ELECTORATE } from '@agoric/governance';
 import { makeParamManagerFromTerms } from '@agoric/governance/src/contractGovernance/typedParamManager.js';
 import { validateElectorate } from '@agoric/governance/src/contractHelper.js';
 import { makeTracer, StorageNodeShape } from '@agoric/internal';
+import { wrapRemoteMarshaller } from '@agoric/internal/src/marshal/wrap-marshaller.js';
 import { makeStoredSubscription, makeSubscriptionKit } from '@agoric/notifier';
 import { M } from '@agoric/store';
 import { provideAll } from '@agoric/zoe/src/contractSupport/durability.js';
@@ -29,16 +30,26 @@ import { InvitationShape } from '../auction/params.js';
 import { SHORTFALL_INVITATION_KEY, vaultDirectorParamTypes } from './params.js';
 import { provideDirector } from './vaultDirector.js';
 
-/** @import {PriceAuthority, PriceDescription, PriceQuote, PriceQuoteValue, PriceQuery,} from '@agoric/zoe/tools/types.js'; */
+/**
+ * @import {Remote} from '@agoric/internal';
+ * @import {ContractMeta, FeeMintAccess, HandleOffer, Invitation, OfferHandler, TransferPart, ZCF, ZCFMint, ZCFSeat} from '@agoric/zoe';
+ * @import {ContractOf} from '@agoric/zoe/src/zoeService/utils.js';
+ * @import {PriceAuthority, PriceDescription, PriceQuote, PriceQuoteValue, PriceQuery,} from '@agoric/zoe/tools/types.js';
+ * @import {VaultDirectorParams} from './params.js';
+ * @import {TimerService} from '@agoric/time';
+ * @import {start as auctioneerStart} from '../auction/auctioneer.js';
+ * @import {VaultManagerParamOverrides} from './params.js';
+ * @import {Baggage} from '@agoric/swingset-liveslots';
+ */
 
 const trace = makeTracer('VF', true);
 
 /**
  * @typedef {ZCF<
- *   GovernanceTerms<import('./params').VaultDirectorParams> & {
+ *   GovernanceTerms<VaultDirectorParams> & {
  *     priceAuthority: ERef<PriceAuthority>;
  *     reservePublicFacet: AssetReservePublicFacet;
- *     timerService: import('@agoric/time').TimerService;
+ *     timerService: TimerService;
  *   }
  * >} VaultFactoryZCF
  */
@@ -67,29 +78,28 @@ harden(meta);
  *   feeMintAccess: FeeMintAccess;
  *   initialPoserInvitation: Invitation;
  *   initialShortfallInvitation: Invitation;
- *   storageNode: ERef<StorageNode>;
- *   marshaller: ERef<Marshaller>;
- *   auctioneerInstance: Instance;
- *   managerParams: Record<
- *     string,
- *     import('./params.js').VaultManagerParamOverrides
- *   >;
+ *   storageNode: Remote<StorageNode>;
+ *   marshaller: Remote<Marshaller>;
+ *   auctioneerInstance: Instance<typeof auctioneerStart>;
+ *   managerParams: Record<string, VaultManagerParamOverrides>;
  *   directorParamOverrides: [object];
  * }} privateArgs
- * @param {import('@agoric/swingset-liveslots').Baggage} baggage
+ * @param {Baggage} baggage
  */
 export const start = async (zcf, privateArgs, baggage) => {
   trace('prepare start', privateArgs, [...baggage.keys()]);
   const {
     initialPoserInvitation,
     initialShortfallInvitation,
-    marshaller,
+    marshaller: remoteMarshaller,
     storageNode,
     auctioneerInstance,
     managerParams,
     directorParamOverrides,
   } = privateArgs;
 
+  const cachingMarshaller = wrapRemoteMarshaller(remoteMarshaller);
+
   trace('awaiting debtMint');
   const { debtMint } = await provideAll(baggage, {
     debtMint: () => zcf.registerFeeMint('Minted', privateArgs.feeMintAccess),
@@ -106,7 +116,7 @@ export const start = async (zcf, privateArgs, baggage) => {
 
   const { makeRecorderKit, makeERecorderKit } = prepareRecorderKitMakers(
     baggage,
-    marshaller,
+    cachingMarshaller,
   );
 
   trace('making non-durable publishers');
@@ -116,7 +126,7 @@ export const start = async (zcf, privateArgs, baggage) => {
   const governanceSubscriber = makeStoredSubscription(
     governanceSubscriptionKit.subscription,
     governanceNode,
-    marshaller,
+    cachingMarshaller,
   );
   /** a powerful object; can modify the invitation */
   const vaultDirectorParamManager = await makeParamManagerFromTerms(
@@ -142,7 +152,7 @@ export const start = async (zcf, privateArgs, baggage) => {
     auctioneerPublicFacet,
     storageNode,
     // XXX remove Recorder makers; remove once we excise deprecated kits for governance
-    marshaller,
+    cachingMarshaller,
     makeRecorderKit,
     makeERecorderKit,
     managerParams,

package/src/vaultFactory/vaultHolder.d.ts

@@ -1,6 +1,6 @@
-export function prepareVaultHolder(baggage: import("@agoric/swingset-liveslots").Baggage, makeRecorderKit: import("@agoric/zoe/src/contractSupport/recorder.js").MakeRecorderKit): (vault: import("@endo/exo").Guarded<{
-    getVaultSeat(): ZCFSeat;
-    initVaultKit(seat: ZCFSeat, storageNode: StorageNode): Promise<{
+export function prepareVaultHolder(baggage: Baggage, makeRecorderKit: MakeRecorderKit): (vault: import("@endo/exo").Guarded<{
+    getVaultSeat(): globalThis.ZCFSeat;
+    initVaultKit(seat: ZCFSeat, storageNode: Remote<StorageNode>): Promise<{
         publicSubscribers: {
             vault: {
                 description: string;
@@ -9,9 +9,9 @@ export function prepareVaultHolder(baggage: import("@agoric/swingset-liveslots")
             };
         };
         invitationMakers: import("@endo/exo").Guarded<{
-            AdjustBalances(): Promise<Invitation<string, undefined>>;
-            CloseVault(): Promise<Invitation<string, undefined>>;
-            TransferVault(): Promise<Invitation<any, undefined>>;
+            AdjustBalances(): Promise<globalThis.Invitation<string, undefined>>;
+            CloseVault(): Promise<globalThis.Invitation<string, undefined>>;
+            TransferVault(): Promise<globalThis.Invitation</*elided*/ any>>;
         }>;
         vault: import("@endo/exo").Guarded<{
             getPublicTopics(): {
@@ -21,13 +21,13 @@ export function prepareVaultHolder(baggage: import("@agoric/swingset-liveslots")
                     storagePath: Promise<string>;
                 };
             };
-            makeAdjustBalancesInvitation(): Promise<Invitation<string, undefined>>;
-            makeCloseInvitation(): Promise<Invitation<string, undefined>>;
+            makeAdjustBalancesInvitation(): Promise<globalThis.Invitation<string, undefined>>;
+            makeCloseInvitation(): Promise<globalThis.Invitation<string, undefined>>;
             /**
              * Starting a transfer revokes the vault holder. The associated updater
              * will get a special notification that the vault is being transferred.
              */
-            makeTransferInvitation(): Promise<Invitation<any, undefined>>;
+            makeTransferInvitation(): Promise<globalThis.Invitation</*elided*/ any>>;
             getCollateralAmount(): import("@agoric/ertp").NatAmount;
             getCurrentDebt(): import("@agoric/ertp").NatAmount;
             getNormalizedDebt(): import("./storeUtils").NormalizedDebt;
@@ -37,18 +37,18 @@ export function prepareVaultHolder(baggage: import("@agoric/swingset-liveslots")
     liquidating(): void;
     liquidated(): void;
     abortLiquidation(): string;
-    makeAdjustBalancesInvitation(): Promise<Invitation<string, undefined>>;
-    makeCloseInvitation(): Promise<Invitation<string, undefined>>;
+    makeAdjustBalancesInvitation(): Promise<globalThis.Invitation<string, undefined>>;
+    makeCloseInvitation(): Promise<globalThis.Invitation<string, undefined>>;
     makeTransferInvitation(): Promise<Invitation<VaultKit>>;
     getCollateralAmount(): Amount<"nat">;
     getCurrentDebt(): Amount<"nat">;
     getNormalizedDebt(): import("./storeUtils").NormalizedDebt;
-}>, storageNode: globalThis.StorageNode) => import("@endo/exo").GuardedKit<{
+}>, storageNode: Remote<globalThis.StorageNode>) => import("@endo/exo").GuardedKit<{
     helper: {
         /** @throws if this holder no longer owns the vault */
         owned(): import("@endo/exo").Guarded<{
-            getVaultSeat(): ZCFSeat;
-            initVaultKit(seat: ZCFSeat, storageNode: StorageNode): Promise<{
+            getVaultSeat(): globalThis.ZCFSeat;
+            initVaultKit(seat: ZCFSeat, storageNode: Remote<StorageNode>): Promise<{
                 publicSubscribers: {
                     vault: {
                         description: string;
@@ -57,9 +57,9 @@ export function prepareVaultHolder(baggage: import("@agoric/swingset-liveslots")
                     };
                 };
                 invitationMakers: import("@endo/exo").Guarded<{
-                    AdjustBalances(): Promise<Invitation<string, undefined>>;
-                    CloseVault(): Promise<Invitation<string, undefined>>;
-                    TransferVault(): Promise<Invitation<any, undefined>>;
+                    AdjustBalances(): Promise<globalThis.Invitation<string, undefined>>;
+                    CloseVault(): Promise<globalThis.Invitation<string, undefined>>;
+                    TransferVault(): Promise<globalThis.Invitation</*elided*/ any>>;
                 }>;
                 vault: import("@endo/exo").Guarded<{
                     getPublicTopics(): {
@@ -69,13 +69,13 @@ export function prepareVaultHolder(baggage: import("@agoric/swingset-liveslots")
                             storagePath: Promise<string>;
                         };
                     };
-                    makeAdjustBalancesInvitation(): Promise<Invitation<string, undefined>>;
-                    makeCloseInvitation(): Promise<Invitation<string, undefined>>;
+                    makeAdjustBalancesInvitation(): Promise<globalThis.Invitation<string, undefined>>;
+                    makeCloseInvitation(): Promise<globalThis.Invitation<string, undefined>>;
                     /**
                      * Starting a transfer revokes the vault holder. The associated updater
                      * will get a special notification that the vault is being transferred.
                      */
-                    makeTransferInvitation(): Promise<Invitation<any, undefined>>;
+                    makeTransferInvitation(): Promise<globalThis.Invitation</*elided*/ any>>;
                     getCollateralAmount(): import("@agoric/ertp").NatAmount;
                     getCurrentDebt(): import("@agoric/ertp").NatAmount;
                     getNormalizedDebt(): import("./storeUtils").NormalizedDebt;
@@ -85,8 +85,8 @@ export function prepareVaultHolder(baggage: import("@agoric/swingset-liveslots")
             liquidating(): void;
             liquidated(): void;
             abortLiquidation(): string;
-            makeAdjustBalancesInvitation(): Promise<Invitation<string, undefined>>;
-            makeCloseInvitation(): Promise<Invitation<string, undefined>>;
+            makeAdjustBalancesInvitation(): Promise<globalThis.Invitation<string, undefined>>;
+            makeCloseInvitation(): Promise<globalThis.Invitation<string, undefined>>;
             makeTransferInvitation(): Promise<Invitation<VaultKit>>;
             getCollateralAmount(): Amount<"nat">;
             getCurrentDebt(): Amount<"nat">;
@@ -95,9 +95,38 @@ export function prepareVaultHolder(baggage: import("@agoric/swingset-liveslots")
         getUpdater(): import("@agoric/zoe/src/contractSupport/recorder.js").Recorder<VaultNotification>;
     };
     invitationMakers: {
-        AdjustBalances(): Promise<Invitation<string, undefined>>;
-        CloseVault(): Promise<Invitation<string, undefined>>;
-        TransferVault(): Promise<Invitation<any, undefined>>;
+        AdjustBalances(): Promise<globalThis.Invitation<string, undefined>>;
+        CloseVault(): Promise<globalThis.Invitation<string, undefined>>;
+        TransferVault(): Promise<globalThis.Invitation<{
+            publicSubscribers: {
+                vault: {
+                    description: string;
+                    subscriber: globalThis.Subscriber<VaultNotification>;
+                    storagePath: Promise<string>;
+                };
+            };
+            invitationMakers: import("@endo/exo").Guarded</*elided*/ any>;
+            vault: import("@endo/exo").Guarded<{
+                getPublicTopics(): {
+                    vault: {
+                        description: string;
+                        subscriber: globalThis.Subscriber<VaultNotification>;
+                        storagePath: Promise<string>;
+                    };
+                };
+                makeAdjustBalancesInvitation(): Promise<globalThis.Invitation<string, undefined>>;
+                makeCloseInvitation(): Promise<globalThis.Invitation<string, undefined>>;
+                /**
+                 * Starting a transfer revokes the vault holder. The associated updater
+                 * will get a special notification that the vault is being transferred.
+                 */
+                makeTransferInvitation(): Promise<globalThis.Invitation</*elided*/ any>>;
+                getCollateralAmount(): import("@agoric/ertp").NatAmount;
+                getCurrentDebt(): import("@agoric/ertp").NatAmount;
+                getNormalizedDebt(): import("./storeUtils").NormalizedDebt;
+            }>;
+            vaultUpdater: import("@agoric/zoe/src/contractSupport/recorder.js").Recorder<VaultNotification>;
+        }>>;
     };
     holder: {
         getPublicTopics(): {
@@ -107,20 +136,39 @@ export function prepareVaultHolder(baggage: import("@agoric/swingset-liveslots")
                 storagePath: Promise<string>;
             };
         };
-        makeAdjustBalancesInvitation(): Promise<Invitation<string, undefined>>;
-        makeCloseInvitation(): Promise<Invitation<string, undefined>>;
+        makeAdjustBalancesInvitation(): Promise<globalThis.Invitation<string, undefined>>;
+        makeCloseInvitation(): Promise<globalThis.Invitation<string, undefined>>;
         /**
          * Starting a transfer revokes the vault holder. The associated updater
          * will get a special notification that the vault is being transferred.
          */
-        makeTransferInvitation(): Promise<Invitation<any, undefined>>;
+        makeTransferInvitation(): Promise<globalThis.Invitation<{
+            publicSubscribers: {
+                vault: {
+                    description: string;
+                    subscriber: globalThis.Subscriber<VaultNotification>;
+                    storagePath: Promise<string>;
+                };
+            };
+            invitationMakers: import("@endo/exo").Guarded<{
+                AdjustBalances(): Promise<globalThis.Invitation<string, undefined>>;
+                CloseVault(): Promise<globalThis.Invitation<string, undefined>>;
+                TransferVault(): Promise<globalThis.Invitation</*elided*/ any>>;
+            }>;
+            vault: import("@endo/exo").Guarded</*elided*/ any>;
+            vaultUpdater: import("@agoric/zoe/src/contractSupport/recorder.js").Recorder<VaultNotification>;
+        }>>;
         getCollateralAmount(): import("@agoric/ertp").NatAmount;
         getCurrentDebt(): import("@agoric/ertp").NatAmount;
         getNormalizedDebt(): import("./storeUtils").NormalizedDebt;
     };
 }>;
 export type State = {
-    topicKit: import("@agoric/zoe/src/contractSupport/recorder.js").RecorderKit<VaultNotification>;
+    topicKit: RecorderKit<VaultNotification>;
     vault: Vault | null;
 };
+import type { Baggage } from '@agoric/swingset-liveslots';
+import type { MakeRecorderKit } from '@agoric/zoe/src/contractSupport/recorder.js';
+import type { Remote } from '@agoric/internal';
+import type { RecorderKit } from '@agoric/zoe/src/contractSupport/recorder.js';
 //# sourceMappingURL=vaultHolder.d.ts.map

package/src/vaultFactory/vaultHolder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vaultHolder.d.ts","sourceRoot":"","sources":["vaultHolder.js"],"names":[],"mappings":"AAiCO,4CAHI,OAAO,4BAA4B,EAAE,OAAO,mBAC5C,OAAO,6CAA6C,EAAE,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;YAqExE;;;eAGG;;;;;;;;;;;;;;;;gCAqB4ywB,cAAiB;;;QAhEh0wB,sDAAsD;;;;;;;;;;;;;;;;;;;;;;;;;;oBAwCtD;;;uBAGG;;;;;;;;;;;;;;;;wCAqB4ywB,cAAiB;;;;;;;;;;;;;;;;;;;QAxBh0wB;;;WAGG;;;;;;GAoBV;oBAnHY;IACR,QAAQ,EAAE,OAAO,6CAA6C,EAAE,WAAW,CAAC,iBAAiB,CAAC,CAAC;IAC/F,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;CACrB"}
+{"version":3,"file":"vaultHolder.d.ts","sourceRoot":"","sources":["vaultHolder.js"],"names":[],"mappings":"AAyCO,4CAHI,OAAO,mBACP,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;YAqElB;;;eAGG;;;;;;;;;;;;;;;;;;;QA3CH,sDAAsD;;;;;;;;;;;;;;;;;;;;;;;;;;oBAwCtD;;;uBAGG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;gBAHH;;;mBAGG;;;;;;;;;;;;;;;;;;;QAHH;;;WAGG;;;;;;;;;;;;;;;;;;;;;GAoBV;oBAnHY;IACR,QAAQ,EAAE,YAAY,iBAAiB,CAAC,CAAC;IACzC,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;CACrB;6BARsB,4BAA4B;qCACpB,6CAA6C;4BAJtD,kBAAkB;iCAEb,6CAA6C"}

package/src/vaultFactory/vaultHolder.js

@@ -5,9 +5,17 @@ import { M, prepareExoClassKit } from '@agoric/vat-data';
 import { TopicsRecordShape } from '@agoric/zoe/src/contractSupport/index.js';
 import { UnguardedHelperI } from '@agoric/internal/src/typeGuards.js';
 
+/**
+ * @import {Remote} from '@agoric/internal';
+ * @import {Key, Pattern} from '@endo/patterns';
+ * @import {RecorderKit} from '@agoric/zoe/src/contractSupport/recorder.js';
+ * @import {Baggage} from '@agoric/swingset-liveslots';
+ * @import {MakeRecorderKit} from '@agoric/zoe/src/contractSupport/recorder.js';
+ */
+
 /**
  * @typedef {{
- *   topicKit: import('@agoric/zoe/src/contractSupport/recorder.js').RecorderKit<VaultNotification>;
+ *   topicKit: RecorderKit<VaultNotification>;
  *   vault: Vault | null;
  * }} State
  */
@@ -28,8 +36,8 @@ const PUBLIC_TOPICS = {
 };
 
 /**
- * @param {import('@agoric/swingset-liveslots').Baggage} baggage
- * @param {import('@agoric/zoe/src/contractSupport/recorder.js').MakeRecorderKit} makeRecorderKit
+ * @param {Baggage} baggage
+ * @param {MakeRecorderKit} makeRecorderKit
  */
 export const prepareVaultHolder = (baggage, makeRecorderKit) => {
   const makeVaultHolderKit = prepareExoClassKit(
@@ -46,7 +54,7 @@ export const prepareVaultHolder = (baggage, makeRecorderKit) => {
     },
     /**
      * @param {Vault} vault
-     * @param {StorageNode} storageNode
+     * @param {Remote<StorageNode>} storageNode
      * @returns {State}
      */
     (vault, storageNode) => {

package/src/vaultFactory/vaultKit.d.ts

@@ -1,4 +1,4 @@
-export function prepareVaultKit(baggage: import("@agoric/swingset-liveslots").Baggage, makeRecorderKit: import("@agoric/zoe/src/contractSupport/recorder.js").MakeRecorderKit): (vault: Vault, storageNode: StorageNode) => {
+export function prepareVaultKit(baggage: Baggage, makeRecorderKit: MakeRecorderKit): (vault: Vault, storageNode: Remote<StorageNode>) => {
     publicSubscribers: {
         vault: {
             description: string;
@@ -7,9 +7,9 @@ export function prepareVaultKit(baggage: import("@agoric/swingset-liveslots").Ba
         };
     };
     invitationMakers: import("@endo/exo").Guarded<{
-        AdjustBalances(): Promise<Invitation<string, undefined>>;
-        CloseVault(): Promise<Invitation<string, undefined>>;
-        TransferVault(): Promise<Invitation<any, undefined>>;
+        AdjustBalances(): Promise<globalThis.Invitation<string, undefined>>;
+        CloseVault(): Promise<globalThis.Invitation<string, undefined>>;
+        TransferVault(): Promise<globalThis.Invitation</*elided*/ any>>;
     }>;
     vault: import("@endo/exo").Guarded<{
         getPublicTopics(): {
@@ -19,14 +19,18 @@ export function prepareVaultKit(baggage: import("@agoric/swingset-liveslots").Ba
                 storagePath: Promise<string>;
             };
         };
-        makeAdjustBalancesInvitation(): Promise<Invitation<string, undefined>>;
-        makeCloseInvitation(): Promise<Invitation<string, undefined>>;
-        makeTransferInvitation(): Promise<Invitation<any, undefined>>;
+        makeAdjustBalancesInvitation(): Promise<globalThis.Invitation<string, undefined>>;
+        makeCloseInvitation(): Promise<globalThis.Invitation<string, undefined>>;
+        makeTransferInvitation(): Promise<globalThis.Invitation</*elided*/ any>>;
         getCollateralAmount(): import("@agoric/ertp").NatAmount;
         getCurrentDebt(): import("@agoric/ertp").NatAmount;
         getNormalizedDebt(): import("./storeUtils.js").NormalizedDebt;
     }>;
     vaultUpdater: import("@agoric/zoe/src/contractSupport/recorder.js").Recorder<VaultNotification>;
 };
-export type VaultKit = ReturnType<ReturnType<typeof prepareVaultKit>>;
+export type VaultKit = EReturn<EReturn<typeof prepareVaultKit>>;
+import type { Baggage } from '@agoric/swingset-liveslots';
+import type { MakeRecorderKit } from '@agoric/zoe/src/contractSupport/recorder.js';
+import type { Remote } from '@agoric/internal';
+import type { EReturn } from '@endo/far';
 //# sourceMappingURL=vaultKit.d.ts.map

package/src/vaultFactory/vaultKit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vaultKit.d.ts","sourceRoot":"","sources":["vaultKit.js"],"names":[],"mappings":"AAgBO,yCAHI,OAAO,4BAA4B,EAAE,OAAO,mBAC5C,OAAO,6CAA6C,EAAE,eAAe,WASnE,KAAK,eACL,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAoBvB;uBAEa,UAAU,CAAC,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC"}
+{"version":3,"file":"vaultKit.d.ts","sourceRoot":"","sources":["vaultKit.js"],"names":[],"mappings":"AAuBO,yCAHI,OAAO,mBACP,eAAe,WASb,KAAK,eACL,OAAO,WAAW,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAoB/B;uBAEa,QAAQ,QAAQ,OAAO,eAAe,CAAC,CAAC;6BAzC5B,4BAA4B;qCACpB,6CAA6C;4BAHtD,kBAAkB;6BACjB,WAAW"}

package/src/vaultFactory/vaultKit.js

@@ -1,18 +1,25 @@
 // @jessie-check
 
-/// <reference types="@agoric/zoe/exported" />
+/// <reference types="@agoric/zoe/exported.js" />
 
 import { makeTracer } from '@agoric/internal';
 import { prepareVaultHolder } from './vaultHolder.js';
 
 const trace = makeTracer('VK', true);
 
+/**
+ * @import {Remote} from '@agoric/internal';
+ * @import {EReturn} from '@endo/far';
+ * @import {Baggage} from '@agoric/swingset-liveslots';
+ * @import {MakeRecorderKit} from '@agoric/zoe/src/contractSupport/recorder.js';
+ */
+
 /**
  * Wrap the VaultHolder duration object in a record suitable for the result of
  * an invitation.
  *
- * @param {import('@agoric/swingset-liveslots').Baggage} baggage
- * @param {import('@agoric/zoe/src/contractSupport/recorder.js').MakeRecorderKit} makeRecorderKit
+ * @param {Baggage} baggage
+ * @param {MakeRecorderKit} makeRecorderKit
  */
 export const prepareVaultKit = (baggage, makeRecorderKit) => {
   trace('prepareVaultKit', [...baggage.keys()]);
@@ -22,7 +29,7 @@ export const prepareVaultKit = (baggage, makeRecorderKit) => {
    * Create a kit of utilities for use of the vault.
    *
    * @param {Vault} vault
-   * @param {StorageNode} storageNode
+   * @param {Remote<StorageNode>} storageNode
    */
   const makeVaultKit = (vault, storageNode) => {
     trace('prepareVaultKit makeVaultKit');
@@ -44,4 +51,4 @@ export const prepareVaultKit = (baggage, makeRecorderKit) => {
   return makeVaultKit;
 };
 
-/** @typedef {ReturnType<ReturnType<typeof prepareVaultKit>>} VaultKit */
+/** @typedef {EReturn<EReturn<typeof prepareVaultKit>>} VaultKit */