@agoric/inter-protocol 0.16.2-dev-d6fae11.0.d6fae11 → 0.16.2-dev-64cee5a.0.64cee5a

package/src/vaultFactory/vaultDirector.js

@@ -45,6 +45,16 @@ import {
  * @import {EReturn} from '@endo/far';
  * @import {TypedPattern, ERemote, Remote} from '@agoric/internal';
  * @import {EMarshaller} from '@agoric/internal/src/marshal/wrap-marshaller.js';
+ * @import {GovernedParamGetters} from './vaultManager.js';
+ * @import {ShortfallReporter} from '../reserve/assetReserve.js';
+ * @import {TypedParamManager} from '@agoric/governance/src/contractGovernance/typedParamManager.js';
+ * @import {VaultDirectorParams} from './params.js';
+ * @import {Baggage} from '@agoric/swingset-liveslots';
+ * @import {VaultFactoryZCF} from './vaultFactory.js';
+ * @import {TimerService} from '@agoric/time';
+ * @import {AuctioneerPublicFacet} from '../auction/auctioneer.js';
+ * @import {MakeRecorderKit} from '@agoric/zoe/src/contractSupport/recorder.js';
+ * @import {MakeERecorderKit} from '@agoric/zoe/src/contractSupport/recorder.js';
  */
 
 const trace = makeTracer('VD', true);
@@ -64,13 +74,9 @@ const trace = makeTracer('VD', true);
  *
  * @typedef {{
  *   burnDebt: BurnDebt;
- *   getGovernedParams: (
- *     collateralBrand: Brand,
- *   ) => import('./vaultManager.js').GovernedParamGetters;
+ *   getGovernedParams: (collateralBrand: Brand) => GovernedParamGetters;
  *   mintAndTransfer: MintAndTransfer;
- *   getShortfallReporter: () => Promise<
- *     import('../reserve/assetReserve.js').ShortfallReporter
- *   >;
+ *   getShortfallReporter: () => Promise<ShortfallReporter>;
  * }} FactoryPowersFacet
  *
  *
@@ -78,9 +84,7 @@ const trace = makeTracer('VD', true);
  *   state: State;
  * }>} MethodContext
  *
- * @typedef {import('@agoric/governance/src/contractGovernance/typedParamManager.js').TypedParamManager<
- *     import('./params.js').VaultDirectorParams
- *   >} VaultDirectorParamManager
+ * @typedef {TypedParamManager<VaultDirectorParams>} VaultDirectorParamManager
  */
 
 const shortfallInvitationKey = 'shortfallInvitation';
@@ -101,16 +105,16 @@ export const makeAllManagersDo = (collateralManagers, vaultManagers) => {
 };
 
 /**
- * @param {import('@agoric/swingset-liveslots').Baggage} baggage
- * @param {import('./vaultFactory.js').VaultFactoryZCF} zcf
+ * @param {Baggage} baggage
+ * @param {VaultFactoryZCF} zcf
  * @param {VaultDirectorParamManager} directorParamManager
  * @param {ZCFMint<'nat'>} debtMint
- * @param {ERef<import('@agoric/time').TimerService>} timer
- * @param {ERef<import('../auction/auctioneer.js').AuctioneerPublicFacet>} auctioneer
+ * @param {ERef<TimerService>} timer
+ * @param {ERef<AuctioneerPublicFacet>} auctioneer
  * @param {ERemote<StorageNode>} storageNode
  * @param {ERemote<EMarshaller>} marshaller
- * @param {import('@agoric/zoe/src/contractSupport/recorder.js').MakeRecorderKit} makeRecorderKit
- * @param {import('@agoric/zoe/src/contractSupport/recorder.js').MakeERecorderKit} makeERecorderKit
+ * @param {MakeRecorderKit} makeRecorderKit
+ * @param {MakeERecorderKit} makeERecorderKit
  * @param {Record<string, import('./params.js').VaultManagerParamOverrides>} managerParams
  */
 const prepareVaultDirector = (
@@ -126,7 +130,7 @@ const prepareVaultDirector = (
   makeERecorderKit,
   managerParams,
 ) => {
-  /** @type {import('../reserve/assetReserve.js').ShortfallReporter} */
+  /** @type {ShortfallReporter} */
   let shortfallReporter;
 
   /** For holding newly minted tokens until transferred */
@@ -297,7 +301,7 @@ const prepareVaultDirector = (
   /**
    * "Director" of the vault factory, overseeing "vault managers".
    *
-   * @param {import('./vaultFactory.js').VaultFactoryZCF} zcf
+   * @param {VaultFactoryZCF} zcf
    * @param {VaultDirectorParamManager} directorParamManager
    * @param {ZCFMint<'nat'>} debtMint
    */

package/src/vaultFactory/vaultFactory.d.ts

@@ -1,9 +1,9 @@
 /**
  * @typedef {ZCF<
- *   GovernanceTerms<import('./params.js').VaultDirectorParams> & {
+ *   GovernanceTerms<VaultDirectorParams> & {
  *     priceAuthority: ERef<PriceAuthority>;
  *     reservePublicFacet: AssetReservePublicFacet;
- *     timerService: import('@agoric/time').TimerService;
+ *     timerService: TimerService;
  *   }
  * >} VaultFactoryZCF
  */
@@ -15,51 +15,10 @@ export function start(zcf: VaultFactoryZCF, privateArgs: {
     initialShortfallInvitation: Invitation;
     storageNode: Remote<StorageNode>;
     marshaller: Remote<Marshaller>;
-    auctioneerInstance: Instance<(zcf: ZCF<GovernanceTerms<typeof import("../auction/params.js").auctioneerParamTypes> & {
-        timerService: import("@agoric/time").TimerService;
-        reservePublicFacet: AssetReservePublicFacet;
-        priceAuthority: PriceAuthority;
-    }>, privateArgs: {
-        initialPoserInvitation: Invitation;
-        storageNode: Remote<StorageNode>;
-        marshaller: Remote<Marshaller>;
-    }, baggage: Baggage) => Promise<{
-        publicFacet: globalThis.GovernedPublicFacet<{
-            getElectorate: () => import("@agoric/ertp").SetAmount<import("@endo/patterns").Key>;
-            getStartFrequency: () => RelativeTime;
-            getClockStep: () => RelativeTime;
-            getStartingRate: () => bigint;
-            getLowestRate: () => bigint;
-            getDiscountStep: () => bigint;
-            getAuctionStartDelay: () => RelativeTime;
-            getPriceLockPeriod: () => RelativeTime;
-            makeBidInvitation(collateralBrand: Brand<"nat">): Promise<Invitation<string, import("../auction/auctionBook.js").OfferSpec>>;
-            getSchedules(): {
-                liveAuctionSchedule: import("../auction/scheduler.js").Schedule | null;
-                nextAuctionSchedule: import("../auction/scheduler.js").Schedule | null;
-            };
-            getScheduleUpdates(): globalThis.Subscriber<import("../auction/scheduler.js").ScheduleNotification>;
-            getBookDataUpdates(brand: any): globalThis.Subscriber<import("../auction/auctionBook.js").BookDataNotification>;
-            getPublicTopics(brand: any): {
-                bookData: import("@agoric/zoe/src/contractSupport/topics.js").PublicTopic<import("../auction/auctionBook.js").BookDataNotification>;
-            } | {
-                schedule: import("@agoric/zoe/src/contractSupport/topics.js").PublicTopic<import("../auction/scheduler.js").ScheduleNotification>;
-            };
-            makeDepositInvitation: () => Promise<Invitation<string, {
-                goal: Amount<"nat">;
-            }>>;
-        }>;
-        creatorFacet: globalThis.GovernedCreatorFacet<{
-            addBrand(issuer: Issuer<"nat">, kwd: Keyword): Promise<void>;
-            getSchedule(): Promise<import("../auction/scheduler.js").FullSchedule>;
-        } & RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
-            addBrand(issuer: Issuer<"nat">, kwd: Keyword): Promise<void>;
-            getSchedule(): Promise<import("../auction/scheduler.js").FullSchedule>;
-        }>>;
-    }>>;
-    managerParams: Record<string, import("./params.js").VaultManagerParamOverrides>;
+    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<{
@@ -233,19 +192,24 @@ export function start(zcf: VaultFactoryZCF, privateArgs: {
         getInvitationAmount(name: string): import("@agoric/ertp").SetAmount<import("@agoric/zoe").InvitationDetails>;
     }>;
 }>;
-export type VaultFactoryZCF = ZCF<GovernanceTerms<import("./params.js").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 { PriceAuthority } from '@agoric/zoe/tools/types.js';
-import type { ZCF } from '@agoric/zoe';
+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":"AAyCA;;;;;;;;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,OAAO,WAAW,CAAC,CAAC;IACjC,UAAU,EAAE,OAAO,UAAU,CAAC,CAAC;IAC/B,kBAAkB,EAAE,QAAQ,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAAwC,CAAC,CAAC;IACvE,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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwFtD;8BAlIY,IACR,eAAe,CAAC,OAAO,aAAa,EAAE,mBAAmB,CAAC,GAAG;IAC3D,cAAc,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;IACrC,kBAAkB,EAAE,uBAAuB,CAAC;IAC5C,YAAY,EAAE,OAAO,cAAc,EAAE,YAAY,CAAC;CACnD,CACF;mCA+HU,WAAW,OAAO,KAAK,CAAC;kCA7IoF,aAAa;mCAAb,aAAa;gCAAb,aAAa;4BAD9G,kBAAkB;oCAGkD,4BAA4B;yBAFC,aAAa;6BAAb,aAAa;gCAE1C,4BAA4B;gCAD5F,qCAAqC"}
+{"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

@@ -35,16 +35,21 @@ import { provideDirector } from './vaultDirector.js';
  * @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.js').VaultDirectorParams> & {
+ *   GovernanceTerms<VaultDirectorParams> & {
  *     priceAuthority: ERef<PriceAuthority>;
  *     reservePublicFacet: AssetReservePublicFacet;
- *     timerService: import('@agoric/time').TimerService;
+ *     timerService: TimerService;
  *   }
  * >} VaultFactoryZCF
  */
@@ -75,14 +80,11 @@ harden(meta);
  *   initialShortfallInvitation: Invitation;
  *   storageNode: Remote<StorageNode>;
  *   marshaller: Remote<Marshaller>;
- *   auctioneerInstance: Instance<import('../auction/auctioneer.js').start>;
- *   managerParams: Record<
- *     string,
- *     import('./params.js').VaultManagerParamOverrides
- *   >;
+ *   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()]);

package/src/vaultFactory/vaultHolder.d.ts

@@ -1,4 +1,4 @@
-export function prepareVaultHolder(baggage: import("@agoric/swingset-liveslots").Baggage, makeRecorderKit: import("@agoric/zoe/src/contractSupport/recorder.js").MakeRecorderKit): (vault: import("@endo/exo").Guarded<{
+export function prepareVaultHolder(baggage: Baggage, makeRecorderKit: MakeRecorderKit): (vault: import("@endo/exo").Guarded<{
     getVaultSeat(): globalThis.ZCFSeat;
     initVaultKit(seat: ZCFSeat, storageNode: Remote<StorageNode>): Promise<{
         publicSubscribers: {
@@ -164,8 +164,11 @@ export function prepareVaultHolder(baggage: import("@agoric/swingset-liveslots")
     };
 }>;
 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":"AAsCO,4CAHI,OAAO,4BAA4B,EAAE,OAAO,mBAC5C,OAAO,6CAA6C,EAAE,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;YAqExE;;;eAGG;;;;;;;;;;;;;;;;;;;QA3CH,sDAAsD;;;;;;;;;;;;;;;;;;;;;;;;;;oBAwCtD;;;uBAGG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;gBAHH;;;mBAGG;;;;;;;;;;;;;;;;;;;QAHH;;;WAGG;;;;;;;;;;;;;;;;;;;;;GAoBV;oBAnHY;IACR,QAAQ,EAAE,OAAO,6CAA6C,EAAE,WAAW,CAAC,iBAAiB,CAAC,CAAC;IAC/F,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;CACrB;4BARqB,kBAAkB"}
+{"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

@@ -8,11 +8,14 @@ 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
  */
@@ -33,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(

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: Remote<StorageNode>) => {
+export function prepareVaultKit(baggage: Baggage, makeRecorderKit: MakeRecorderKit): (vault: Vault, storageNode: Remote<StorageNode>) => {
     publicSubscribers: {
         vault: {
             description: string;
@@ -29,6 +29,8 @@ export function prepareVaultKit(baggage: import("@agoric/swingset-liveslots").Ba
     vaultUpdater: import("@agoric/zoe/src/contractSupport/recorder.js").Recorder<VaultNotification>;
 };
 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":"AAqBO,yCAHI,OAAO,4BAA4B,EAAE,OAAO,mBAC5C,OAAO,6CAA6C,EAAE,eAAe,WASnE,KAAK,eACL,OAAO,WAAW,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAoB/B;uBAEa,QAAQ,QAAQ,OAAO,eAAe,CAAC,CAAC;4BAzC7B,kBAAkB;6BACjB,WAAW"}
+{"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

@@ -10,14 +10,16 @@ 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()]);

package/src/vaultFactory/vaultManager.d.ts

@@ -1,10 +1,10 @@
-export function watchQuoteNotifier<T, A extends any[] = unknown[]>(notifierP: ERef<LatestTopic<T>>, watcher: import("@agoric/swingset-liveslots").PromiseWatcher<T, A>, ...args: A): Promise<void>;
-export function prepareVaultManagerKit(baggage: import("@agoric/swingset-liveslots").Baggage, { zcf, marshaller, makeRecorderKit, factoryPowers }: {
-    zcf: import("./vaultFactory.js").VaultFactoryZCF;
+export function watchQuoteNotifier<T, A extends any[] = unknown[]>(notifierP: ERef<LatestTopic<T>>, watcher: PromiseWatcher<T, A>, ...args: A): Promise<void>;
+export function prepareVaultManagerKit(baggage: Baggage, { zcf, marshaller, makeRecorderKit, factoryPowers }: {
+    zcf: VaultFactoryZCF;
     marshaller: ERemote<EMarshaller>;
-    makeRecorderKit: import("@agoric/zoe/src/contractSupport/recorder.js").MakeRecorderKit;
-    makeERecorderKit: import("@agoric/zoe/src/contractSupport/recorder.js").MakeERecorderKit;
-    factoryPowers: import("./vaultDirector.js").FactoryPowersFacet;
+    makeRecorderKit: MakeRecorderKit;
+    makeERecorderKit: MakeERecorderKit;
+    factoryPowers: FactoryPowersFacet;
 }): (externalParams: Omit<Parameters<(params: Readonly<{
     debtMint: ZCFMint<"nat">;
     collateralBrand: Brand<"nat">;
@@ -46,7 +46,7 @@ export function prepareVaultManagerKit(baggage: import("@agoric/swingset-liveslo
             }>;
             vaultUpdater: import("@agoric/zoe/src/contractSupport/recorder.js").Recorder<VaultNotification>;
         }, undefined>>;
-        getQuotes(): import("@agoric/notifier").StoredNotifier<PriceQuote>;
+        getQuotes(): StoredNotifier<PriceQuote>;
         getCompoundedInterest(): Ratio;
         getPublicTopics(): {
             asset: import("@agoric/zoe/src/contractSupport/topics.js").PublicTopic<AssetState>;
@@ -90,7 +90,7 @@ export function prepareVaultManagerKit(baggage: import("@agoric/swingset-liveslo
             collateralAmount: Amount<"nat">;
             debtAmount: Amount<"nat">;
         }>, totalCollateral: Amount<"nat">): {
-            plan: import("./proceeds.js").DistributionPlan;
+            plan: DistributionPlan;
             vaultsInPlan: import("@endo/exo").Guarded<{
                 getVaultSeat(): globalThis.ZCFSeat;
                 initVaultKit(seat: ZCFSeat, storageNode: Remote<StorageNode>): Promise<{
@@ -131,7 +131,7 @@ export function prepareVaultManagerKit(baggage: import("@agoric/swingset-liveslo
                 makeTransferInvitation(): Promise<Invitation<VaultKit>>;
                 getCollateralAmount(): Amount<"nat">;
                 getCurrentDebt(): Amount<"nat">;
-                getNormalizedDebt(): import("./storeUtils.js").NormalizedDebt;
+                getNormalizedDebt(): NormalizedDebt;
             }>[];
         };
         /**
@@ -141,7 +141,7 @@ export function prepareVaultManagerKit(baggage: import("@agoric/swingset-liveslo
          * manually in dev and verified this function recovers as expected.
          *
          * @param {object} obj
-         * @param {import('./proceeds.js').DistributionPlan} obj.plan
+         * @param {DistributionPlan} obj.plan
          * @param {Vault[]} obj.vaultsInPlan
          * @param {ZCFSeat} obj.liqSeat
          * @param {Amount<'nat'>} obj.totalCollateral
@@ -149,7 +149,7 @@ export function prepareVaultManagerKit(baggage: import("@agoric/swingset-liveslo
          * @returns {void}
          */
         distributeProceeds({ plan, vaultsInPlan, liqSeat, totalCollateral, totalDebt, }: {
-            plan: import("./proceeds.js").DistributionPlan;
+            plan: DistributionPlan;
             vaultsInPlan: Vault[];
             liqSeat: ZCFSeat;
             totalCollateral: Amount<"nat">;
@@ -260,7 +260,7 @@ export function prepareVaultManagerKit(baggage: import("@agoric/swingset-liveslo
                 }>;
                 vaultUpdater: import("@agoric/zoe/src/contractSupport/recorder.js").Recorder<VaultNotification>;
             }, undefined>>;
-            getQuotes(): import("@agoric/notifier").StoredNotifier<PriceQuote>;
+            getQuotes(): StoredNotifier<PriceQuote>;
             getCompoundedInterest(): Ratio;
             getPublicTopics(): {
                 asset: import("@agoric/zoe/src/contractSupport/topics.js").PublicTopic<AssetState>;
@@ -303,7 +303,7 @@ export function prepareVaultManagerKit(baggage: import("@agoric/swingset-liveslo
             }>;
             vaultUpdater: import("@agoric/zoe/src/contractSupport/recorder.js").Recorder<VaultNotification>;
         }, undefined>>;
-        getQuotes(): import("@agoric/notifier").StoredNotifier<PriceQuote>;
+        getQuotes(): StoredNotifier<PriceQuote>;
         getCompoundedInterest(): Ratio;
         getPublicTopics(): {
             asset: import("@agoric/zoe/src/contractSupport/topics.js").PublicTopic<AssetState>;
@@ -347,7 +347,7 @@ export function prepareVaultManagerKit(baggage: import("@agoric/swingset-liveslo
             collateralAmount: Amount<"nat">;
             debtAmount: Amount<"nat">;
         }>, totalCollateral: Amount<"nat">): {
-            plan: import("./proceeds.js").DistributionPlan;
+            plan: DistributionPlan;
             vaultsInPlan: import("@endo/exo").Guarded<{
                 getVaultSeat(): globalThis.ZCFSeat;
                 initVaultKit(seat: ZCFSeat, storageNode: Remote<StorageNode>): Promise<{
@@ -388,7 +388,7 @@ export function prepareVaultManagerKit(baggage: import("@agoric/swingset-liveslo
                 makeTransferInvitation(): Promise<Invitation<VaultKit>>;
                 getCollateralAmount(): Amount<"nat">;
                 getCurrentDebt(): Amount<"nat">;
-                getNormalizedDebt(): import("./storeUtils.js").NormalizedDebt;
+                getNormalizedDebt(): NormalizedDebt;
             }>[];
         };
         /**
@@ -398,7 +398,7 @@ export function prepareVaultManagerKit(baggage: import("@agoric/swingset-liveslo
          * manually in dev and verified this function recovers as expected.
          *
          * @param {object} obj
-         * @param {import('./proceeds.js').DistributionPlan} obj.plan
+         * @param {DistributionPlan} obj.plan
          * @param {Vault[]} obj.vaultsInPlan
          * @param {ZCFSeat} obj.liqSeat
          * @param {Amount<'nat'>} obj.totalCollateral
@@ -406,7 +406,7 @@ export function prepareVaultManagerKit(baggage: import("@agoric/swingset-liveslo
          * @returns {void}
          */
         distributeProceeds({ plan, vaultsInPlan, liqSeat, totalCollateral, totalDebt, }: {
-            plan: import("./proceeds.js").DistributionPlan;
+            plan: DistributionPlan;
             vaultsInPlan: Vault[];
             liqSeat: ZCFSeat;
             totalCollateral: Amount<"nat">;
@@ -517,7 +517,7 @@ export function prepareVaultManagerKit(baggage: import("@agoric/swingset-liveslo
                 }>;
                 vaultUpdater: import("@agoric/zoe/src/contractSupport/recorder.js").Recorder<VaultNotification>;
             }, undefined>>;
-            getQuotes(): import("@agoric/notifier").StoredNotifier<PriceQuote>;
+            getQuotes(): StoredNotifier<PriceQuote>;
             getCompoundedInterest(): Ratio;
             getPublicTopics(): {
                 asset: import("@agoric/zoe/src/contractSupport/topics.js").PublicTopic<AssetState>;
@@ -632,7 +632,7 @@ export type HeldParams = Readonly<{
     storageNode: Remote<StorageNode>;
 }>;
 export type ImmutableState = {
-    assetTopicKit: import("@agoric/zoe/src/contractSupport/recorder.js").RecorderKit<AssetState>;
+    assetTopicKit: RecorderKit<AssetState>;
     debtBrand: Brand<"nat">;
     liquidatingVaults: SetStore<Vault>;
     metricsTopicKit: import("@agoric/zoe/src/contractSupport/recorder.js").RecorderKit<MetricsNotification>;
@@ -666,14 +666,23 @@ export type VaultManagerKit = EReturn<EReturn<typeof prepareVaultManagerKit>>;
  */
 export type VaultManager = VaultManagerKit["self"];
 export type CollateralManager = VaultManagerKit["collateral"];
+import type { PromiseWatcher } from '@agoric/swingset-liveslots';
+import type { Baggage } from '@agoric/swingset-liveslots';
+import type { VaultFactoryZCF } from './vaultFactory.js';
 import type { EMarshaller } from '@agoric/internal/src/marshal/wrap-marshaller.js';
 import type { ERemote } from '@agoric/internal';
+import type { MakeRecorderKit } from '@agoric/zoe/src/contractSupport/recorder.js';
+import type { MakeERecorderKit } from '@agoric/zoe/src/contractSupport/recorder.js';
+import type { FactoryPowersFacet } from './vaultDirector.js';
 import type { ZCFMint } from '@agoric/zoe';
 import type { Remote } from '@agoric/internal';
 import type { NormalizedDebt } from './storeUtils.js';
 import type { PriceQuote } from '@agoric/zoe/tools/types.js';
+import type { StoredNotifier } from '@agoric/notifier';
 import type { MapStore } from '@agoric/store';
+import type { DistributionPlan } from './proceeds.js';
 import type { RelativeTime } from '@agoric/time';
+import type { RecorderKit } from '@agoric/zoe/src/contractSupport/recorder.js';
 import type { SetStore } from '@agoric/store';
 import type { EReturn } from '@endo/far';
 //# sourceMappingURL=vaultManager.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"vaultManager.d.ts","sourceRoot":"","sources":["vaultManager.js"],"names":[],"mappings":"AAyFO,mCANM,CAAC,EACQ,CAAC,SAAT,GAAG,EAAG,yBACT,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WACpB,OAAO,4BAA4B,EAAE,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,WACzD,CAAC,iBAqBX;AAwHM,gDATI,OAAO,4BAA4B,EAAE,OAAO,uDAC5C;IACN,GAAG,EAAE,OAAO,mBAAmB,EAAE,eAAe,CAAC;IACjD,UAAU,EAAE,QAAQ,WAAW,CAAC,CAAC;IACjC,eAAe,EAAE,OAAO,6CAA6C,EAAE,eAAe,CAAC;IACvF,gBAAgB,EAAE,OAAO,6CAA6C,EAAE,gBAAgB,CAAC;IACzF,aAAa,EAAE,OAAO,oBAAoB,EAAE,kBAAkB,CAAC;CAChE,oBA8iCS,IAAI,CACV,UAAU;cAzmCF,QAAQ,KAAK,CAAC;qBACP,KAAK,CAAC,KAAK,CAAC;oBACb,MAAM,CAAC,KAAK,CAAC;sBACX,MAAM;oBACR,SAAS;iBACZ,OAAO,WAAW,CAAC;;wBAiEW,OAAO,WAAW,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QA4J3D,2EAA2E;;;QAqG3E,oCAAoC;oCAAxB,SAAS;;;;;QAuGrB;;;;;WAKG;kCAJQ,MAAM,CAAC,KAAK,CAAC,cACb,MAAM,CAAC,KAAK,CAAC,WACb,MAAM,CAAC,KAAK,CAAC,aACb,MAAM,CAAC,KAAK,CAAC;;QA8ExB;;;;;;;;;;;;;;WAcG;2CARQ,mBAAmB,aACnB,MAAM,CAAC,KAAK,CAAC,sBACb,IAAI,CAAC,UAAU,EAAE,aAAa,CAAC,aAC/B,SACV,KAAS,EACT;YAAM,gBAAgB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;YAAC,UAAU,EAAE,MAAM,CAAC,KAAK,CAAC,CAAA;SAAE,CAC/D,mBACO,MAAM,CAAC,KAAK,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAsDxB;;;;;;;;;;;;;WAaG;yFANA;YAAsD,IAAI,EAAlD,OAAO,eAAe,EAAE,gBAAgB;YAC3B,YAAY,EAAzB,KAAK,EAAE;YACM,OAAO,EAApB,OAAO;YACY,eAAe,EAAlC,MAAM,CAAC,KAAK,CAAC;YACM,SAAS,EAA5B,MAAM,CAAC,KAAK,CAAC;SACrB,GAAU,IAAI;;;;QA+FjB;;;;;WAKG;qCADQ,MAAM,CAAC,KAAK,CAAC;;QAyCxB;;;WAGG;qBAFQ,MAAM,CAAC,KAAK,CAAC,QACb,OAAO;;;;QAuBlB;;;;WAIG;+BADQ,MAAM;QAMjB,yDAAyD;;QAIzD;;;;;;;;;;WAUG;+CAPQ,cAAc,iBACd,MAAM,CAAC,KAAK,CAAC,WACb,OAAO,cACP,OAAO,YAAY,EAAE,UAAU,SAE/B,KAAK,GACH,IAAI;;;;QAoFjB,4BAA4B;2BAAhB,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAsHnB,qDAAqD;mCAAzC,IAAI,CAAC,qBAAqB,CAAC;;GAqJM,CAAC,CAAC,CAAC,EACrD,oBAAwB,CACrB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAz4BE,2EAA2E;;;QAqG3E,oCAAoC;oCAAxB,SAAS;;;;;QAuGrB;;;;;WAKG;kCAJQ,MAAM,CAAC,KAAK,CAAC,cACb,MAAM,CAAC,KAAK,CAAC,WACb,MAAM,CAAC,KAAK,CAAC,aACb,MAAM,CAAC,KAAK,CAAC;;QA8ExB;;;;;;;;;;;;;;WAcG;2CARQ,mBAAmB,aACnB,MAAM,CAAC,KAAK,CAAC,sBACb,IAAI,CAAC,UAAU,EAAE,aAAa,CAAC,aAC/B,SACV,KAAS,EACT;YAAM,gBAAgB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;YAAC,UAAU,EAAE,MAAM,CAAC,KAAK,CAAC,CAAA;SAAE,CAC/D,mBACO,MAAM,CAAC,KAAK,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAsDxB;;;;;;;;;;;;;WAaG;yFANA;YAAsD,IAAI,EAAlD,OAAO,eAAe,EAAE,gBAAgB;YAC3B,YAAY,EAAzB,KAAK,EAAE;YACM,OAAO,EAApB,OAAO;YACY,eAAe,EAAlC,MAAM,CAAC,KAAK,CAAC;YACM,SAAS,EAA5B,MAAM,CAAC,KAAK,CAAC;SACrB,GAAU,IAAI;;;;QA+FjB;;;;;WAKG;qCADQ,MAAM,CAAC,KAAK,CAAC;;QAyCxB;;;WAGG;qBAFQ,MAAM,CAAC,KAAK,CAAC,QACb,OAAO;;;;QAuBlB;;;;WAIG;+BADQ,MAAM;QAMjB,yDAAyD;;QAIzD;;;;;;;;;;WAUG;+CAPQ,cAAc,iBACd,MAAM,CAAC,KAAK,CAAC,WACb,OAAO,cACP,OAAO,YAAY,EAAE,UAAU,SAE/B,KAAK,GACH,IAAI;;;;QAoFjB,4BAA4B;2BAAhB,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAsHnB,qDAAqD;mCAAzC,IAAI,CAAC,qBAAqB,CAAC;;IAoK9C;AAiBM,yDAFI,OAAO,kBAAkB,EAAE,OAAO;IAczC,6CAA6C;SAAlC,CAAC,GAAG,EAAE,eAAe,KAAK,IAAI;IAIzC,iDAAiD;SAAtC,CAAC,KAAK,EAAE,MAAM,KAAK,eAAe;;EAQhD;;;;;;;iBArtCa,KAAK,GAAG,IAAI;;;;qBAGZ,MAAM;;;;0BACN,MAAM;;;;;qBACN,MAAM,CAAC,KAAK,CAAC;;;;eAEb,MAAM,CAAC,KAAK,CAAC;;;;;;wBACb,MAAM,CAAC,KAAK,CAAC;;;;;2BAGb,MAAM,CAAC,KAAK,CAAC;;;;;qBAEb,MAAM,CAAC,KAAK,CAAC;;;;;yBAEb,MAAM,CAAC,KAAK,CAAC;;;;;0BAEb,MAAM,CAAC,KAAK,CAAC;;;;;2BAEb,MAAM,CAAC,KAAK,CAAC;;;;;4BAEb,MAAM,CAAC,KAAK,CAAC;;;;;8BAEb,MAAM;;;;;4BAEN,MAAM;;yBAKP;IACR,kBAAkB,EAAE,KAAK,CAAC;IAC1B,YAAY,EAAE,KAAK,CAAC;IACpB,oBAAoB,EAAE,SAAS,CAAC;CACjC;mCAGS;IACR,iBAAiB,EAAE,MAAM,YAAY,CAAC;IACtC,kBAAkB,EAAE,MAAM,YAAY,CAAC;IACvC,YAAY,EAAE,MAAM,MAAM,CAAC,KAAK,CAAC,CAAC;IAClC,eAAe,EAAE,MAAM,KAAK,CAAC;IAC7B,qBAAqB,EAAE,MAAM,KAAK,CAAC;IACnC,oBAAoB,EAAE,MAAM,KAAK,CAAC;IAClC,qBAAqB,EAAE,MAAM,KAAK,CAAC;IACnC,UAAU,EAAE,MAAM,KAAK,CAAC;IACxB,iBAAiB,EAAE,MAAM,MAAM,CAAC,KAAK,CAAC,CAAC;CACxC;yBAIS,QAAQ,CAAC;IACjB,QAAQ,EAAE,QAAQ,KAAK,CAAC,CAAC;IACzB,eAAe,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IAC9B,cAAc,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9B,gBAAgB,EAAE,MAAM,CAAC;IACzB,cAAc,EAAE,SAAS,CAAC;IAC1B,WAAW,EAAE,OAAO,WAAW,CAAC,CAAC;CAClC,CAAC;6BAIQ;IACR,aAAa,EAAE,OAAO,6CAA6C,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC;IAC7F,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACxB,iBAAiB,EAAE,SAAS,KAAK,CAAC,CAAC;IACnC,eAAe,EAAE,OAAO,6CAA6C,EAAE,WAAW,CAAC,mBAAmB,CAAC,CAAC;IACxG,iBAAiB,EAAE,OAAO,CAAC;IAC3B,sBAAsB,EAAE,OAAO,CAAC;IAChC,eAAe,EAAE,SAAS,MAAM,EAAE,KAAK,CAAC,CAAC;CAC1C;2BAIS;IACR,kBAAkB,EAAE,KAAK,CAAC;IAC1B,oBAAoB,EAAE,SAAS,CAAC;IAChC,wBAAwB,EAAE,MAAM,CAAC;IACjC,sBAAsB,EAAE,MAAM,CAAC;IAC/B,eAAe,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAC/B,mBAAmB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IACnC,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IACzB,qBAAqB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IACrC,eAAe,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAC/B,oBAAoB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IACpC,qBAAqB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IACrC,sBAAsB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IACtC,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,UAAU,GAAG,SAAS,CAAC;CACrC;8BAqlCU,QAAQ,QAAQ,OAAO,sBAAsB,CAAC,CAAC;;;;;;;;2BAEhD,eAAe,CAAC,MAAM,CAAC;gCAMtB,eAAe,CAAC,YAAY,CAAC;iCAruCb,iDAAiD;6BAD7C,kBAAkB;6BAI1B,aAAa;4BAJL,kBAAkB;oCA0ClB,iBAAiB;gCArCtB,4BAA4B;8BAHpB,eAAe;kCAyCpB,cAAc;8BAzCT,eAAe;6BAC1B,WAAW"}
+{"version":3,"file":"vaultManager.d.ts","sourceRoot":"","sources":["vaultManager.js"],"names":[],"mappings":"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"}

package/src/vaultFactory/vaultManager.js

@@ -72,6 +72,16 @@ import { AuctionPFShape } from '../auction/auctioneer.js';
  * @import {EReturn} from '@endo/far';
  * @import {ZCFMint} from '@agoric/zoe';
  * @import {PriceQuote} from '@agoric/zoe/tools/types.js';
+ * @import {PromiseWatcher} from '@agoric/swingset-liveslots';
+ * @import {RecorderKit} from '@agoric/zoe/src/contractSupport/recorder.js';
+ * @import {StoredNotifier} from '@agoric/notifier';
+ * @import {Baggage} from '@agoric/swingset-liveslots';
+ * @import {VaultFactoryZCF} from './vaultFactory.js';
+ * @import {MakeRecorderKit} from '@agoric/zoe/src/contractSupport/recorder.js';
+ * @import {MakeERecorderKit} from '@agoric/zoe/src/contractSupport/recorder.js';
+ * @import {FactoryPowersFacet} from './vaultDirector.js';
+ * @import {VaultBalances} from './proceeds.js';
+ * @import {DistributionPlan} from './proceeds.js';
  */
 
 const trace = makeTracer('VM');
@@ -84,7 +94,7 @@ const trace = makeTracer('VM');
  * @template T notifier topic
  * @template {any[]} [A=unknown[]] arbitrary arguments
  * @param {ERef<LatestTopic<T>>} notifierP
- * @param {import('@agoric/swingset-liveslots').PromiseWatcher<T, A>} watcher
+ * @param {PromiseWatcher<T, A>} watcher
  * @param {A} args
  */
 export const watchQuoteNotifier = async (notifierP, watcher, ...args) => {
@@ -177,7 +187,7 @@ export const watchQuoteNotifier = async (notifierP, watcher, ...args) => {
 
 /**
  * @typedef {{
- *   assetTopicKit: import('@agoric/zoe/src/contractSupport/recorder.js').RecorderKit<AssetState>;
+ *   assetTopicKit: RecorderKit<AssetState>;
  *   debtBrand: Brand<'nat'>;
  *   liquidatingVaults: SetStore<Vault>;
  *   metricsTopicKit: import('@agoric/zoe/src/contractSupport/recorder.js').RecorderKit<MetricsNotification>;
@@ -209,7 +219,7 @@ export const watchQuoteNotifier = async (notifierP, watcher, ...args) => {
 /**
  * @type {(brand: Brand) => {
  *   prioritizedVaults: ReturnType<typeof makePrioritizedVaults>;
- *   storedQuotesNotifier: import('@agoric/notifier').StoredNotifier<PriceQuote>;
+ *   storedQuotesNotifier: StoredNotifier<PriceQuote>;
  *   storedCollateralQuote: PriceQuote | null;
  * }}
  */
@@ -217,13 +227,13 @@ export const watchQuoteNotifier = async (notifierP, watcher, ...args) => {
 const collateralEphemera = makeEphemeraProvider(() => /** @type {any} */ ({}));
 
 /**
- * @param {import('@agoric/swingset-liveslots').Baggage} baggage
+ * @param {Baggage} baggage
  * @param {{
- *   zcf: import('./vaultFactory.js').VaultFactoryZCF;
+ *   zcf: VaultFactoryZCF;
  *   marshaller: ERemote<EMarshaller>;
- *   makeRecorderKit: import('@agoric/zoe/src/contractSupport/recorder.js').MakeRecorderKit;
- *   makeERecorderKit: import('@agoric/zoe/src/contractSupport/recorder.js').MakeERecorderKit;
- *   factoryPowers: import('./vaultDirector.js').FactoryPowersFacet;
+ *   makeRecorderKit: MakeRecorderKit;
+ *   makeERecorderKit: MakeERecorderKit;
+ *   factoryPowers: FactoryPowersFacet;
  * }} powers
  */
 export const prepareVaultManagerKit = (
@@ -720,8 +730,7 @@ export const prepareVaultManagerKit = (
 
           // unzip the entry tuples
           const vaultsInPlan = /** @type {Vault[]} */ ([]);
-          const vaultsBalances =
-            /** @type {import('./proceeds.js').VaultBalances[]} */ ([]);
+          const vaultsBalances = /** @type {VaultBalances[]} */ ([]);
           for (const [vault, balances] of bestToWorst) {
             vaultsInPlan.push(vault);
             vaultsBalances.push({
@@ -752,7 +761,7 @@ export const prepareVaultManagerKit = (
          * manually in dev and verified this function recovers as expected.
          *
          * @param {object} obj
-         * @param {import('./proceeds.js').DistributionPlan} obj.plan
+         * @param {DistributionPlan} obj.plan
          * @param {Vault[]} obj.vaultsInPlan
          * @param {ZCFSeat} obj.liqSeat
          * @param {Amount<'nat'>} obj.totalCollateral