@agoric/inter-protocol 0.16.2-dev-14b75b9.0.14b75b9 → 0.16.2-dev-64cee5a.0.64cee5a

package/src/vaultFactory/liquidation.js

@@ -16,6 +16,10 @@ const trace = makeTracer('LIQ');
  * @import {MapStore, SetStore} from '@agoric/store';
  * @import {RelativeTimeRecord, TimerService, TimerWaker} from '@agoric/time';
  * @import {PriceQuote} from '@agoric/zoe/tools/types.js';
+ * @import {Schedule} from '../auction/scheduler.js';
+ * @import {TimestampRecord} from '@agoric/time';
+ * @import {AuctioneerPublicFacet} from '../auction/auctioneer.js';
+ * @import {makePrioritizedVaults} from './prioritizedVaults.js';
  */
 
 const makeCancelToken = makeCancelTokenMaker('liq');
@@ -64,8 +68,8 @@ const cancelWakeups = timer => {
  * @param {TimerWaker} opts.priceLockWaker
  * @param {TimerWaker} opts.liquidationWaker
  * @param {TimerWaker} opts.reschedulerWaker
- * @param {import('../auction/scheduler.js').Schedule} opts.nextAuctionSchedule
- * @param {import('@agoric/time').TimestampRecord} opts.now
+ * @param {Schedule} opts.nextAuctionSchedule
+ * @param {TimestampRecord} opts.now
  * @param {ParamStateRecord} opts.params
  * @returns {void}
  */
@@ -139,7 +143,7 @@ const setWakeups = ({
  * Called by vaultDirector's resetWakeupsForNextAuction at start() and every
  * time there's a "reschedule" wakeup.
  *
- * @param {ERef<import('../auction/auctioneer.js').AuctioneerPublicFacet>} auctioneerPublicFacet
+ * @param {ERef<AuctioneerPublicFacet>} auctioneerPublicFacet
  * @param {ERef<TimerService>} timer
  * @param {TimerWaker} priceLockWaker
  * @param {TimerWaker} liquidationWaker
@@ -205,7 +209,7 @@ harden(liquidationResults);
 /**
  * Watch governed params for change
  *
- * @param {ERef<import('../auction/auctioneer.js').AuctioneerPublicFacet>} auctioneerPublicFacet
+ * @param {ERef<AuctioneerPublicFacet>} auctioneerPublicFacet
  * @param {ERef<TimerService>} timer
  * @param {TimerWaker} reschedulerWaker
  * @returns {void}
@@ -242,9 +246,7 @@ export const watchForGovernanceChange = (
  * @param {PriceQuote} collateralizationDetails.quote
  * @param {Ratio} collateralizationDetails.interest
  * @param {Ratio} collateralizationDetails.margin
- * @param {ReturnType<
- *   typeof import('./prioritizedVaults.js').makePrioritizedVaults
- * >} prioritizedVaults
+ * @param {ReturnType<typeof makePrioritizedVaults>} prioritizedVaults
  * @param {SetStore<Vault>} liquidatingVaults
  * @param {Brand<'nat'>} debtBrand
  * @param {Brand<'nat'>} collateralBrand

package/src/vaultFactory/params.d.ts

@@ -3,6 +3,10 @@
  * @import {EMarshaller} from '@agoric/internal/src/marshal/wrap-marshaller.js';
  * @import {MapStore} from '@agoric/store';
  * @import {PriceAuthority} from '@agoric/zoe/tools/types.js';
+ * @import {ParamTypesMapFromRecord} from '@agoric/governance/src/contractGovernance/typedParamManager.js';
+ * @import {StoredPublisherKit} from '@agoric/notifier';
+ * @import {TimerService} from '@agoric/time';
+ * @import {Baggage} from '@agoric/vat-data';
  */
 export const CHARGING_PERIOD_KEY: "ChargingPeriod";
 export const RECORDING_PERIOD_KEY: "RecordingPeriod";
@@ -21,7 +25,7 @@ export namespace vaultDirectorParamTypes {
     let RecordingPeriod: "nat";
     let ReferencedUI: "string";
 }
-export function makeVaultParamManager(publisherKit: import("@agoric/notifier").StoredPublisherKit<GovernanceSubscriptionState>, { debtLimit, interestRate, liquidationMargin, liquidationPadding, liquidationPenalty, mintFee, }: VaultManagerParamValues): import("@agoric/governance/src/contractGovernance/typedParamManager.js").TypedParamManager<{
+export function makeVaultParamManager(publisherKit: StoredPublisherKit<GovernanceSubscriptionState>, { debtLimit, interestRate, liquidationMargin, liquidationPadding, liquidationPenalty, mintFee, }: VaultManagerParamValues): import("@agoric/governance/src/contractGovernance/typedParamManager.js").TypedParamManager<{
     DebtLimit: "amount";
     InterestRate: "ratio";
     LiquidationPadding: "ratio";
@@ -36,7 +40,7 @@ export function makeGovernedTerms({ bootstrapPaymentValue, electorateInvitationA
     minInitialDebt: Amount<"nat">;
     bootstrapPaymentValue: bigint;
     priceAuthority: ERef<PriceAuthority>;
-    timer: ERef<import("@agoric/time").TimerService>;
+    timer: ERef<TimerService>;
     reservePublicFacet: AssetReservePublicFacet;
     interestTiming: InterestTiming;
     shortfallInvitationAmount: Amount<"set">;
@@ -49,7 +53,7 @@ export function makeGovernedTerms({ bootstrapPaymentValue, electorateInvitationA
             metrics: import("@agoric/zoe/src/contractSupport/topics.js").PublicTopic<import("../reserve/assetReserveKit.js").MetricsNotification>;
         };
     }>>;
-    timerService: globalThis.ERef<import("@agoric/time").TimerService>;
+    timerService: globalThis.ERef<TimerService>;
     governedParams: {
         Electorate: {
             type: "invitation";
@@ -78,7 +82,7 @@ export function makeGovernedTerms({ bootstrapPaymentValue, electorateInvitationA
     };
     bootstrapPaymentValue: bigint;
 };
-export function provideVaultParamManagers(baggage: import("@agoric/vat-data").Baggage, marshaller: ERemote<EMarshaller>, managerParamOverrides: Record<string, VaultManagerParamOverrides>): {
+export function provideVaultParamManagers(baggage: Baggage, marshaller: ERemote<EMarshaller>, managerParamOverrides: Record<string, VaultManagerParamOverrides>): {
     /**
      * @param {Brand} brand
      * @param {Remote<StorageNode>} storageNode
@@ -102,12 +106,15 @@ export function provideVaultParamManagers(baggage: import("@agoric/vat-data").Ba
         MintFee: "ratio";
     }>;
 };
-export type VaultDirectorParams = import("@agoric/governance/src/contractGovernance/typedParamManager.js").ParamTypesMapFromRecord<ReturnType<typeof makeVaultDirectorParams>>;
+export type VaultDirectorParams = ParamTypesMapFromRecord<ReturnType<typeof makeVaultDirectorParams>>;
 export type VaultParamManager = ReturnType<typeof makeVaultParamManager>;
 export type VaultManagerParamOverrides = VaultManagerParamValues & {
     brand: Brand;
 };
+import type { StoredPublisherKit } from '@agoric/notifier';
 import type { PriceAuthority } from '@agoric/zoe/tools/types.js';
+import type { TimerService } from '@agoric/time';
+import type { Baggage } from '@agoric/vat-data';
 import type { EMarshaller } from '@agoric/internal/src/marshal/wrap-marshaller.js';
 import type { ERemote } from '@agoric/internal';
 import type { Remote } from '@agoric/internal';
@@ -144,5 +151,6 @@ declare function makeVaultDirectorParams(electorateInvitationAmount: Amount<"set
         value: bigint;
     };
 };
+import type { ParamTypesMapFromRecord } from '@agoric/governance/src/contractGovernance/typedParamManager.js';
 export {};
 //# sourceMappingURL=params.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"params.d.ts","sourceRoot":"","sources":["params.js"],"names":[],"mappings":"AAiBA;;;;;GAKG;AAEH,kCAAmC,gBAAgB,CAAC;AACpD,mCAAoC,iBAAiB,CAAC;AAEtD,6BAA8B,WAAW,CAAC;AAC1C,qCAAsC,mBAAmB,CAAC;AAC1D,sCAAuC,oBAAoB,CAAC;AAC5D,sCAAuC,oBAAoB,CAAC;AAC5D,gCAAiC,cAAc,CAAC;AAChD,2BAA4B,SAAS,CAAC;AACtC,mCAAoC,gBAAgB,CAAC;AACrD,uCAAwC,qBAAqB,CAAC;AAC9D,gCAAiC,cAAc,CAAC;;;;;;;AAkEzC,oDAHI,OAAO,kBAAkB,EAAE,kBAAkB,CAAC,2BAA2B,CAAC,oGAC1E,uBAAuB;;;;;;;GAoB9B;AACJ,4EAA4E;AAE5E,iEAYE;AAeK,8MAZI;IACN,0BAA0B,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAC1C,cAAc,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,cAAc,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;IACrC,KAAK,EAAE,IAAI,CAAC,OAAO,cAAc,EAAE,YAAY,CAAC,CAAC;IACjD,kBAAkB,EAAE,uBAAuB,CAAC;IAC5C,cAAc,EAAE,cAAc,CAAC;IAC/B,yBAAyB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IACzC,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA0BH;AAeM,mDAJI,OAAO,kBAAkB,EAAE,OAAO,cAClC,QAAQ,WAAW,CAAC,yBACpB,MAAM,CAAC,MAAM,EAAE,0BAA0B,CAAC;IAwDjD;;;;OAIG;2BAHQ,KAAK,eACL,OAAO,WAAW,CAAC,sBACnB,uBAAuB;;;;;;;;IAOlC,2BAA2B;eAAf,KAAK;;;;;;;;EAKpB;kCAzKY,OAAO,gEAAgE,EAAE,uBAAuB,CACtG,UAAU,CAAC,OAAO,uBAAuB,CAAC,CAC3C;gCA8BQ,UAAU,CAAC,OAAO,qBAAqB,CAAC;yCAwDxC,uBAAuB,GAAG;IAAE,KAAK,EAAE,KAAK,CAAA;CAAE;oCA3JvB,4BAA4B;iCAF/B,iDAAiD;6BAD7C,kBAAkB;4BAAlB,kBAAkB;AA6BpD;;;;;;GAMG;AACH,qEANW,MAAM,CAAC,KAAK,CAAC,kBACb,MAAM,CAAC,KAAK,CAAC,6BACb,MAAM,CAAC,KAAK,CAAC,gBACb,MAAM,kBACN,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;EAgCxB"}
+{"version":3,"file":"params.d.ts","sourceRoot":"","sources":["params.js"],"names":[],"mappings":"AAiBA;;;;;;;;;GASG;AAEH,kCAAmC,gBAAgB,CAAC;AACpD,mCAAoC,iBAAiB,CAAC;AAEtD,6BAA8B,WAAW,CAAC;AAC1C,qCAAsC,mBAAmB,CAAC;AAC1D,sCAAuC,oBAAoB,CAAC;AAC5D,sCAAuC,oBAAoB,CAAC;AAC5D,gCAAiC,cAAc,CAAC;AAChD,2BAA4B,SAAS,CAAC;AACtC,mCAAoC,gBAAgB,CAAC;AACrD,uCAAwC,qBAAqB,CAAC;AAC9D,gCAAiC,cAAc,CAAC;;;;;;;AAkEzC,oDAHI,mBAAmB,2BAA2B,CAAC,oGAC/C,uBAAuB;;;;;;;GAoB9B;AACJ,4EAA4E;AAE5E,iEAYE;AAeK,8MAZI;IACN,0BAA0B,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAC1C,cAAc,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,cAAc,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;IACrC,KAAK,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IAC1B,kBAAkB,EAAE,uBAAuB,CAAC;IAC5C,cAAc,EAAE,cAAc,CAAC;IAC/B,yBAAyB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IACzC,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA0BH;AAeM,mDAJI,OAAO,cACP,QAAQ,WAAW,CAAC,yBACpB,MAAM,CAAC,MAAM,EAAE,0BAA0B,CAAC;IAwDjD;;;;OAIG;2BAHQ,KAAK,eACL,OAAO,WAAW,CAAC,sBACnB,uBAAuB;;;;;;;;IAOlC,2BAA2B;eAAf,KAAK;;;;;;;;EAKpB;kCAzKY,wBACR,UAAU,CAAC,OAAO,uBAAuB,CAAC,CAC3C;gCA8BU,UAAU,CAAC,OAAO,qBAAqB,CAAC;yCAwDxC,uBAAuB,GAAG;IAAE,KAAK,EAAE,KAAK,CAAA;CAAE;wCA7JnB,kBAAkB;oCAFtB,4BAA4B;kCAG9B,cAAc;6BACnB,kBAAkB;iCANd,iDAAiD;6BAD7C,kBAAkB;4BAAlB,kBAAkB;AAiCpD;;;;;;GAMG;AACH,qEANW,MAAM,CAAC,KAAK,CAAC,kBACb,MAAM,CAAC,KAAK,CAAC,6BACb,MAAM,CAAC,KAAK,CAAC,gBACb,MAAM,kBACN,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;EAgCxB;6CAlEyC,gEAAgE"}

package/src/vaultFactory/params.js

@@ -20,6 +20,10 @@ import { amountPattern, ratioPattern } from '../contractSupport.js';
  * @import {EMarshaller} from '@agoric/internal/src/marshal/wrap-marshaller.js';
  * @import {MapStore} from '@agoric/store';
  * @import {PriceAuthority} from '@agoric/zoe/tools/types.js';
+ * @import {ParamTypesMapFromRecord} from '@agoric/governance/src/contractGovernance/typedParamManager.js';
+ * @import {StoredPublisherKit} from '@agoric/notifier';
+ * @import {TimerService} from '@agoric/time';
+ * @import {Baggage} from '@agoric/vat-data';
  */
 
 export const CHARGING_PERIOD_KEY = 'ChargingPeriod';
@@ -86,9 +90,9 @@ const makeVaultDirectorParams = (
 harden(makeVaultDirectorParams);
 
 /**
- * @typedef {import('@agoric/governance/src/contractGovernance/typedParamManager.js').ParamTypesMapFromRecord<
- *     ReturnType<typeof makeVaultDirectorParams>
- *   >} VaultDirectorParams
+ * @typedef {ParamTypesMapFromRecord<
+ *   ReturnType<typeof makeVaultDirectorParams>
+ * >} VaultDirectorParams
  */
 
 /** @type {(liquidationMargin: Ratio) => Ratio} */
@@ -96,7 +100,7 @@ const zeroRatio = liquidationMargin =>
   subtractRatios(liquidationMargin, liquidationMargin);
 
 /**
- * @param {import('@agoric/notifier').StoredPublisherKit<GovernanceSubscriptionState>} publisherKit
+ * @param {StoredPublisherKit<GovernanceSubscriptionState>} publisherKit
  * @param {VaultManagerParamValues} initial
  */
 export const makeVaultParamManager = (
@@ -140,7 +144,7 @@ export const vaultParamPattern = M.splitRecord(
  *   minInitialDebt: Amount<'nat'>;
  *   bootstrapPaymentValue: bigint;
  *   priceAuthority: ERef<PriceAuthority>;
- *   timer: ERef<import('@agoric/time').TimerService>;
+ *   timer: ERef<TimerService>;
  *   reservePublicFacet: AssetReservePublicFacet;
  *   interestTiming: InterestTiming;
  *   shortfallInvitationAmount: Amount<'set'>;
@@ -182,7 +186,7 @@ harden(makeGovernedTerms);
  *
  * NB: changes from initial values will be lost upon restart
  *
- * @param {import('@agoric/vat-data').Baggage} baggage
+ * @param {Baggage} baggage
  * @param {ERemote<EMarshaller>} marshaller
  * @param {Record<string, VaultManagerParamOverrides>} managerParamOverrides
  */

package/src/vaultFactory/prioritizedVaults.d.ts

@@ -41,7 +41,7 @@ export function makePrioritizedVaults(store: MapStore<string, Vault>): {
         makeTransferInvitation(): Promise<Invitation<VaultKit>>;
         getCollateralAmount(): Amount<"nat">;
         getCurrentDebt(): Amount<"nat">;
-        getNormalizedDebt(): import("./storeUtils.js").NormalizedDebt;
+        getNormalizedDebt(): NormalizedDebt;
     }>]>;
     getCount: (keyPatt?: Pattern, valuePatt?: Pattern) => number;
     hasVaultByAttributes: (oldDebt: NormalizedDebt, oldCollateral: Amount<"nat">, vaultId: string) => boolean;
@@ -87,7 +87,7 @@ export function makePrioritizedVaults(store: MapStore<string, Vault>): {
         makeTransferInvitation(): Promise<Invitation<VaultKit>>;
         getCollateralAmount(): Amount<"nat">;
         getCurrentDebt(): Amount<"nat">;
-        getNormalizedDebt(): import("./storeUtils.js").NormalizedDebt;
+        getNormalizedDebt(): NormalizedDebt;
     }>;
     removeVaultsBelow: ({ margin, quote, interest }: {
         margin: any;
@@ -133,7 +133,7 @@ export function makePrioritizedVaults(store: MapStore<string, Vault>): {
         makeTransferInvitation(): Promise<Invitation<VaultKit>>;
         getCollateralAmount(): Amount<"nat">;
         getCurrentDebt(): Amount<"nat">;
-        getNormalizedDebt(): import("./storeUtils.js").NormalizedDebt;
+        getNormalizedDebt(): NormalizedDebt;
     }>>;
     countVaultsBelow: (crKey: any) => number;
 } & RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
@@ -178,7 +178,7 @@ export function makePrioritizedVaults(store: MapStore<string, Vault>): {
         makeTransferInvitation(): Promise<Invitation<VaultKit>>;
         getCollateralAmount(): Amount<"nat">;
         getCurrentDebt(): Amount<"nat">;
-        getNormalizedDebt(): import("./storeUtils.js").NormalizedDebt;
+        getNormalizedDebt(): NormalizedDebt;
     }>]>;
     getCount: (keyPatt?: Pattern, valuePatt?: Pattern) => number;
     hasVaultByAttributes: (oldDebt: NormalizedDebt, oldCollateral: Amount<"nat">, vaultId: string) => boolean;
@@ -224,7 +224,7 @@ export function makePrioritizedVaults(store: MapStore<string, Vault>): {
         makeTransferInvitation(): Promise<Invitation<VaultKit>>;
         getCollateralAmount(): Amount<"nat">;
         getCurrentDebt(): Amount<"nat">;
-        getNormalizedDebt(): import("./storeUtils.js").NormalizedDebt;
+        getNormalizedDebt(): NormalizedDebt;
     }>;
     removeVaultsBelow: ({ margin, quote, interest }: {
         margin: any;
@@ -270,7 +270,7 @@ export function makePrioritizedVaults(store: MapStore<string, Vault>): {
         makeTransferInvitation(): Promise<Invitation<VaultKit>>;
         getCollateralAmount(): Amount<"nat">;
         getCurrentDebt(): Amount<"nat">;
-        getNormalizedDebt(): import("./storeUtils.js").NormalizedDebt;
+        getNormalizedDebt(): NormalizedDebt;
     }>>;
     countVaultsBelow: (crKey: any) => number;
 }>;

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

@@ -1 +1 @@
-{"version":3,"file":"types-ambient.d.ts","sourceRoot":"","sources":["types-ambient.js"],"names":[],"mappings":"+BAGa,OAAO,mBAAmB,EAAE,oBAAoB,CAAC,aAAa,CAAC;;mBAe9D,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,KAAK,MAAM;wBACxC,MAAM,UAAU;;;;;;;uBAKhB,KAAK;;;;;wBAEL,KAAK;;;;;kBAEL,KAAK;;;;;aAEL,KAAK;eAEL,MAAM,CAAC,KAAK,CAAC;;;;;;;uCAOhB,MAAM,qBACN,OAAO,UACP,uBAAuB,KACrB,OAAO,CAAC,YAAY,CAAC;;kBAKpB,YAAY;yBACZ,MAAM,OAAO,aAAa,EAAE,UAAU;+BACtC,MAAM,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;0BACxC,MAAM,OAAO,cAAc,EAAE,UAAU;wBACvC,MAAM,OAAO,cAAc,EAAE,UAAU;;;;;;;;sCAQ1C,OAAO,UACP,MAAM,CAAC,KAAK,CAAC,OACb,MAAM,CAAC,KAAK,CAAC,aACb,YAAY,EAAE,KACZ,IAAI;;;;;yBAMN,MAAM,YACN,OAAO,KACL,IAAI;;0BAKH,MAAM,KAAK;gBACX,MAAM,KAAK;wBACX,MAAM,OAAO,CAAC,OAAO,4BAA4B,EAAE,UAAU,CAAC;;;;;qBAC9D,MAAM,KAAK;;;;;uBAEX,MAAM,YAAY;;;;;wBAElB,MAAM,YAAY;;eAIlB,MAAM;;;;;oBAIN,YAAY;;;;qBACZ,YAAY;;;oBAKZ,MAAM,oBAAoB;kBAC1B,CACT,UAAU,EAAE,MAAM,EAClB,GAAG,EAAE,MAAM,KACR,OAAO,aAAa,EAAE,QAAQ;oBACxB,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC;;;6BAKrC,MAAM,OAAO,CACtB,UAAU,CAAC,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;QAAC,WAAW,EAAE,KAAK,CAAA;KAAE,CAAC,CAC9D;;;0BAKU,SAAS;;;;cACT,QAAQ;;;;aACR,QAAQ;;8BAKX,UAAU,eACV,SAAS,KACP,UAAU;;;;;;eAKT,SAAS;;;;;;;8BAET,SAAS;;6BAMT;IAAE,GAAG,EAAE,gBAAgB,GAAG;QAAE,eAAe,EAAE,KAAK,CAAA;KAAE,CAAA;CAAE;uCApIhC,YAAY;2BACxB,YAAY;8BACT,eAAe;kCACX,mBAAmB;uCACd,mBAAmB;qDACL,4BAA4B;6CACpC,4BAA4B;2CAC9B,0BAA0B;+BACtC,cAAc;kCACX,cAAc"}
+{"version":3,"file":"types-ambient.d.ts","sourceRoot":"","sources":["types-ambient.js"],"names":[],"mappings":"+BAIa,OAAO,mBAAmB,EAAE,oBAAoB,CAAC,aAAa,CAAC;;mBAe9D,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,KAAK,MAAM;wBACxC,MAAM,UAAU;;;;;;;uBAKhB,KAAK;;;;;wBAEL,KAAK;;;;;kBAEL,KAAK;;;;;aAEL,KAAK;eAEL,MAAM,CAAC,KAAK,CAAC;;;;;;;uCAOhB,MAAM,qBACN,OAAO,UACP,uBAAuB,KACrB,OAAO,CAAC,YAAY,CAAC;;kBAKpB,YAAY;yBACZ,MAAM,OAAO,aAAa,EAAE,UAAU;+BACtC,MAAM,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;0BACxC,MAAM,OAAO,cAAc,EAAE,UAAU;wBACvC,MAAM,OAAO,cAAc,EAAE,UAAU;;;;;;;;sCAQ1C,OAAO,UACP,MAAM,CAAC,KAAK,CAAC,OACb,MAAM,CAAC,KAAK,CAAC,aACb,YAAY,EAAE,KACZ,IAAI;;;;;yBAMN,MAAM,YACN,OAAO,KACL,IAAI;;0BAKH,MAAM,KAAK;gBACX,MAAM,KAAK;wBACX,MAAM,OAAO,CAAC,OAAO,4BAA4B,EAAE,UAAU,CAAC;;;;;qBAC9D,MAAM,KAAK;;;;;uBAEX,MAAM,YAAY;;;;;wBAElB,MAAM,YAAY;;eAIlB,MAAM;;;;;oBAIN,YAAY;;;;qBACZ,YAAY;;;oBAKZ,MAAM,oBAAoB;kBAC1B,CACT,UAAU,EAAE,MAAM,EAClB,GAAG,EAAE,MAAM,KACR,OAAO,aAAa,EAAE,QAAQ;oBACxB,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC;;;6BAKrC,MAAM,OAAO,CACtB,UAAU,CAAC,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;QAAC,WAAW,EAAE,KAAK,CAAA;KAAE,CAAC,CAC9D;;;0BAKU,SAAS;;;;cACT,QAAQ;;;;aACR,QAAQ;;8BAKX,UAAU,eACV,SAAS,KACP,UAAU;;;;;;eAKT,SAAS;;;;;;;8BAET,SAAS;;6BAMT;IAAE,GAAG,EAAE,gBAAgB,GAAG;QAAE,eAAe,EAAE,KAAK,CAAA;KAAE,CAAA;CAAE;uCApIhC,YAAY;2BACxB,YAAY;8BACT,eAAe;kCACX,mBAAmB;uCACd,mBAAmB;qDACL,4BAA4B;6CACpC,4BAA4B;2CAC9B,0BAA0B;+BACtC,cAAc;kCACX,cAAc"}

package/src/vaultFactory/types-ambient.js

@@ -1,3 +1,4 @@
+/* eslint-disable @agoric/group-jsdoc-imports */
 // @jessie-check
 
 /**

package/src/vaultFactory/vault.d.ts

@@ -28,7 +28,7 @@ export namespace Phase {
  */
 /**
  * @typedef {object} VaultManager
- * @property {() => Subscriber<import('./vaultManager.js').AssetState>} getAssetSubscriber
+ * @property {() => Subscriber<AssetState>} getAssetSubscriber
  * @property {(collateralAmount: Amount) => Amount<'nat'>} maxDebtFor
  * @property {() => Brand<'nat'>} getCollateralBrand
  * @property {(base: string) => string} scopeDescription
@@ -37,13 +37,13 @@ export namespace Phase {
  * @property {(amount: Amount, seat: ZCFSeat) => void} burn
  * @property {() => Ratio} getCompoundedInterest
  * @property {(
- *   oldDebt: import('./storeUtils.js').NormalizedDebt,
+ *   oldDebt: NormalizedDebt,
  *   oldCollateral: Amount<'nat'>,
  *   vaultId: VaultId,
  *   vaultPhase: VaultPhase,
  *   vault: Vault,
  * ) => void} handleBalanceChange
- * @property {() => import('./vaultManager.js').GovernedParamGetters} getGovernedParams
+ * @property {() => GovernedParamGetters} getGovernedParams
  */
 /**
  * @typedef {Readonly<{
@@ -61,9 +61,7 @@ export namespace Phase {
  *   interestSnapshot: Ratio;
  *   phase: VaultPhase;
  *   debtSnapshot: Amount<'nat'>;
- *   outerUpdater:
- *     | import('@agoric/zoe/src/contractSupport/recorder.js').Recorder<VaultNotification>
- *     | null;
+ *   outerUpdater: Recorder<VaultNotification> | null;
  * }} MutableState
  */
 export const VaultI: import("@endo/patterns").InterfaceGuard<{
@@ -79,7 +77,7 @@ export const VaultI: import("@endo/patterns").InterfaceGuard<{
     makeTransferInvitation: import("@endo/patterns").MethodGuard;
     abortLiquidation: import("@endo/patterns").MethodGuard;
 }>;
-export function prepareVault(baggage: import("@agoric/swingset-liveslots").Baggage, makeRecorderKit: import("@agoric/zoe/src/contractSupport/recorder.js").MakeRecorderKit, zcf: ZCF): (manager: VaultManager, idInManager: string, storageNode: Remote<globalThis.StorageNode>) => import("@endo/exo").GuardedKit<{
+export function prepareVault(baggage: Baggage, makeRecorderKit: MakeRecorderKit, zcf: ZCF): (manager: VaultManager, idInManager: string, storageNode: Remote<globalThis.StorageNode>) => import("@endo/exo").GuardedKit<{
     helper: {
         collateralBrand(): Brand<"nat">;
         debtBrand(): Brand<"nat">;
@@ -242,7 +240,7 @@ export function prepareVault(baggage: import("@agoric/swingset-liveslots").Bagga
                 getCurrentDebt(): import("@agoric/ertp").NatAmount;
                 getNormalizedDebt(): NormalizedDebt;
             }>;
-            vaultUpdater: import("@agoric/zoe/src/contractSupport/recorder.js").Recorder<VaultNotification>;
+            vaultUpdater: Recorder<VaultNotification>;
         }>;
         /** Called by manager at start of liquidation. */
         liquidating(): void;
@@ -284,12 +282,11 @@ export function prepareVault(baggage: import("@agoric/swingset-liveslots").Bagga
          * order vaults by their debt-to-collateral ratios without having to
          * mutate the debts as the interest accrues.
          *
-         * @returns {import('./storeUtils.js').NormalizedDebt} as if the vault
-         *   was open at the launch of this manager, before any interest
-         *   accrued
+         * @returns {NormalizedDebt} as if the vault was open at the launch of
+         *   this manager, before any interest accrued
          * @see getActualDebAmount
          */
-        getNormalizedDebt(): import("./storeUtils.js").NormalizedDebt;
+        getNormalizedDebt(): NormalizedDebt;
     };
 }>;
 export type VaultPhase = Exclude<Phase, "transfer">;
@@ -309,7 +306,7 @@ export type VaultNotification = {
     vaultState: Phase;
 };
 export type VaultManager = {
-    getAssetSubscriber: () => Subscriber<import("./vaultManager.js").AssetState>;
+    getAssetSubscriber: () => Subscriber<AssetState>;
     maxDebtFor: (collateralAmount: Amount) => Amount<"nat">;
     getCollateralBrand: () => Brand<"nat">;
     scopeDescription: (base: string) => string;
@@ -317,8 +314,8 @@ export type VaultManager = {
     mintAndTransfer: MintAndTransfer;
     burn: (amount: Amount, seat: ZCFSeat) => void;
     getCompoundedInterest: () => Ratio;
-    handleBalanceChange: (oldDebt: import("./storeUtils.js").NormalizedDebt, oldCollateral: Amount<"nat">, vaultId: VaultId, vaultPhase: VaultPhase, vault: Vault) => void;
-    getGovernedParams: () => import("./vaultManager.js").GovernedParamGetters;
+    handleBalanceChange: (oldDebt: NormalizedDebt, oldCollateral: Amount<"nat">, vaultId: VaultId, vaultPhase: VaultPhase, vault: Vault) => void;
+    getGovernedParams: () => GovernedParamGetters;
 };
 export type ImmutableState = Readonly<{
     idInManager: VaultId;
@@ -334,12 +331,17 @@ export type MutableState = {
     interestSnapshot: Ratio;
     phase: VaultPhase;
     debtSnapshot: Amount<"nat">;
-    outerUpdater: import("@agoric/zoe/src/contractSupport/recorder.js").Recorder<VaultNotification> | null;
+    outerUpdater: Recorder<VaultNotification> | null;
 };
 export type Vault = EReturn<EReturn<typeof prepareVault>>["self"];
+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 { Brand } from '@agoric/ertp/src/types.js';
 import type { NormalizedDebt } from './storeUtils.js';
 import { calculateDebtCosts } from './math.js';
+import type { Recorder } from '@agoric/zoe/src/contractSupport/recorder.js';
+import type { AssetState } from './vaultManager.js';
+import type { GovernedParamGetters } from './vaultManager.js';
 import type { EReturn } from '@endo/far';
 //# sourceMappingURL=vault.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"vault.d.ts","sourceRoot":"","sources":["vault.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"vault.d.ts","sourceRoot":"","sources":["vault.js"],"names":[],"mappings":"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"}

package/src/vaultFactory/vault.js

@@ -21,6 +21,11 @@ const trace = makeTracer('Vault', true);
  * @import {EReturn} from '@endo/far';
  * @import {Brand} from '@agoric/ertp/src/types.js';
  * @import {NormalizedDebt} from './storeUtils.js';
+ * @import {AssetState} from './vaultManager.js';
+ * @import {GovernedParamGetters} from './vaultManager.js';
+ * @import {Recorder} from '@agoric/zoe/src/contractSupport/recorder.js';
+ * @import {Baggage} from '@agoric/swingset-liveslots';
+ * @import {MakeRecorderKit} from '@agoric/zoe/src/contractSupport/recorder.js';
  */
 
 /**
@@ -88,7 +93,7 @@ const validTransitions = {
 // XXX masks typedef from types.js, but using that causes circular def problems
 /**
  * @typedef {object} VaultManager
- * @property {() => Subscriber<import('./vaultManager.js').AssetState>} getAssetSubscriber
+ * @property {() => Subscriber<AssetState>} getAssetSubscriber
  * @property {(collateralAmount: Amount) => Amount<'nat'>} maxDebtFor
  * @property {() => Brand<'nat'>} getCollateralBrand
  * @property {(base: string) => string} scopeDescription
@@ -97,13 +102,13 @@ const validTransitions = {
  * @property {(amount: Amount, seat: ZCFSeat) => void} burn
  * @property {() => Ratio} getCompoundedInterest
  * @property {(
- *   oldDebt: import('./storeUtils.js').NormalizedDebt,
+ *   oldDebt: NormalizedDebt,
  *   oldCollateral: Amount<'nat'>,
  *   vaultId: VaultId,
  *   vaultPhase: VaultPhase,
  *   vault: Vault,
  * ) => void} handleBalanceChange
- * @property {() => import('./vaultManager.js').GovernedParamGetters} getGovernedParams
+ * @property {() => GovernedParamGetters} getGovernedParams
  */
 
 /**
@@ -123,9 +128,7 @@ const validTransitions = {
  *   interestSnapshot: Ratio;
  *   phase: VaultPhase;
  *   debtSnapshot: Amount<'nat'>;
- *   outerUpdater:
- *     | import('@agoric/zoe/src/contractSupport/recorder.js').Recorder<VaultNotification>
- *     | null;
+ *   outerUpdater: Recorder<VaultNotification> | null;
  * }} MutableState
  */
 
@@ -155,8 +158,8 @@ const VaultStateShape = harden({
 });
 
 /**
- * @param {import('@agoric/swingset-liveslots').Baggage} baggage
- * @param {import('@agoric/zoe/src/contractSupport/recorder.js').MakeRecorderKit} makeRecorderKit
+ * @param {Baggage} baggage
+ * @param {MakeRecorderKit} makeRecorderKit
  * @param {ZCF} zcf
  */
 export const prepareVault = (baggage, makeRecorderKit, zcf) => {
@@ -857,9 +860,8 @@ export const prepareVault = (baggage, makeRecorderKit, zcf) => {
          * order vaults by their debt-to-collateral ratios without having to
          * mutate the debts as the interest accrues.
          *
-         * @returns {import('./storeUtils.js').NormalizedDebt} as if the vault
-         *   was open at the launch of this manager, before any interest
-         *   accrued
+         * @returns {NormalizedDebt} as if the vault was open at the launch of
+         *   this manager, before any interest accrued
          * @see getActualDebAmount
          */
         getNormalizedDebt() {

package/src/vaultFactory/vaultDirector.d.ts

@@ -17,33 +17,33 @@ export type MutableState = {};
 export type State = ImmutableState & MutableState;
 export type FactoryPowersFacet = {
     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>;
 };
 export type MethodContext = Readonly<{
     state: State;
 }>;
-export type VaultDirectorParamManager = import("@agoric/governance/src/contractGovernance/typedParamManager.js").TypedParamManager<import("./params.js").VaultDirectorParams>;
+export type VaultDirectorParamManager = TypedParamManager<VaultDirectorParams>;
 export type VaultDirector = EReturn<EReturn<typeof prepareVaultDirector>>;
 /**
- * @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
  */
-declare function prepareVaultDirector(baggage: import("@agoric/swingset-liveslots").Baggage, zcf: import("./vaultFactory.js").VaultFactoryZCF, directorParamManager: VaultDirectorParamManager, debtMint: ZCFMint<"nat">, timer: ERef<import("@agoric/time").TimerService>, auctioneer: ERef<import("../auction/auctioneer.js").AuctioneerPublicFacet>, storageNode: ERemote<StorageNode>, marshaller: ERemote<EMarshaller>, makeRecorderKit: import("@agoric/zoe/src/contractSupport/recorder.js").MakeRecorderKit, makeERecorderKit: import("@agoric/zoe/src/contractSupport/recorder.js").MakeERecorderKit, managerParams: Record<string, import("./params.js").VaultManagerParamOverrides>): () => import("@endo/exo").GuardedKit<{
+declare function prepareVaultDirector(baggage: Baggage, zcf: VaultFactoryZCF, directorParamManager: VaultDirectorParamManager, debtMint: ZCFMint<"nat">, timer: ERef<TimerService>, auctioneer: ERef<AuctioneerPublicFacet>, storageNode: ERemote<StorageNode>, marshaller: ERemote<EMarshaller>, makeRecorderKit: MakeRecorderKit, makeERecorderKit: MakeERecorderKit, managerParams: Record<string, import("./params.js").VaultManagerParamOverrides>): () => import("@endo/exo").GuardedKit<{
     creator: {
         getParamMgrRetriever: () => {
             /** @param {VaultFactoryParamPath} paramPath */
-            get: (paramPath?: VaultFactoryParamPath) => VaultDirectorParamManager | import("@agoric/governance/src/contractGovernance/typedParamManager.js").TypedParamManager<{
+            get: (paramPath?: VaultFactoryParamPath) => VaultDirectorParamManager | TypedParamManager<{
                 DebtLimit: "amount";
                 InterestRate: "ratio";
                 LiquidationPadding: "ratio";
@@ -53,7 +53,7 @@ declare function prepareVaultDirector(baggage: import("@agoric/swingset-liveslot
             }>;
         } & RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
             /** @param {VaultFactoryParamPath} paramPath */
-            get: (paramPath?: VaultFactoryParamPath) => VaultDirectorParamManager | import("@agoric/governance/src/contractGovernance/typedParamManager.js").TypedParamManager<{
+            get: (paramPath?: VaultFactoryParamPath) => VaultDirectorParamManager | TypedParamManager<{
                 DebtLimit: "amount";
                 InterestRate: "ratio";
                 LiquidationPadding: "ratio";
@@ -71,7 +71,7 @@ declare function prepareVaultDirector(baggage: import("@agoric/swingset-liveslot
              * @param {VaultManagerParamValues} initialParamValues
              */
             addVaultType(collateralIssuer: Issuer<"nat">, collateralKeyword: Keyword, initialParamValues: VaultManagerParamValues): Promise<import("@endo/exo").Guarded<{
-                getGovernedParams(): import("./vaultManager.js").GovernedParamGetters;
+                getGovernedParams(): GovernedParamGetters;
                 makeVaultKit(seat: ZCFSeat): Promise<{
                     publicSubscribers: {
                         vault: {
@@ -175,7 +175,7 @@ declare function prepareVaultDirector(baggage: import("@agoric/swingset-liveslot
          * @param {VaultManagerParamValues} initialParamValues
          */
         addVaultType(collateralIssuer: Issuer<"nat">, collateralKeyword: Keyword, initialParamValues: VaultManagerParamValues): Promise<import("@endo/exo").Guarded<{
-            getGovernedParams(): import("./vaultManager.js").GovernedParamGetters;
+            getGovernedParams(): GovernedParamGetters;
             makeVaultKit(seat: ZCFSeat): Promise<{
                 publicSubscribers: {
                     vault: {
@@ -340,10 +340,20 @@ declare function prepareVaultDirector(baggage: import("@agoric/swingset-liveslot
         start(): Promise<void>;
     };
 }>;
+import type { GovernedParamGetters } from './vaultManager.js';
+import type { ShortfallReporter } from '../reserve/assetReserve.js';
+import type { VaultDirectorParams } from './params.js';
+import type { TypedParamManager } from '@agoric/governance/src/contractGovernance/typedParamManager.js';
 import type { EReturn } from '@endo/far';
+import type { Baggage } from '@agoric/swingset-liveslots';
+import type { VaultFactoryZCF } from './vaultFactory.js';
 import type { ZCFMint } from '@agoric/zoe';
+import type { TimerService } from '@agoric/time';
+import type { AuctioneerPublicFacet } from '../auction/auctioneer.js';
 import type { ERemote } from '@agoric/internal';
 import type { EMarshaller } from '@agoric/internal/src/marshal/wrap-marshaller.js';
+import type { MakeRecorderKit } from '@agoric/zoe/src/contractSupport/recorder.js';
+import type { MakeERecorderKit } from '@agoric/zoe/src/contractSupport/recorder.js';
 import type { ZCFSeat } from '@agoric/zoe';
 export {};
 //# sourceMappingURL=vaultDirector.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"vaultDirector.d.ts","sourceRoot":"","sources":["vaultDirector.js"],"names":[],"mappings":"AA2FO,iFAEE,IADK,CAAC,EAAE,EAAE,YAAY,KAAK,IACzB,UAOV;AAocD,6EAA6E;AAE7E;;;;;;GAMG;AACH,8BAJU,CACT,GAAO,OAAO,EAAE,UAAU,CAAC,OAAO,oBAAoB,CAAC,KAChD,aAAa,CAQnB;kCAngBW;IACR,WAAW,EAAE,KAAK,EAAE,CAAC;IACrB,oBAAoB,EAAE,mBAAmB,CAAC;CAC3C;6BAGS,QAAQ,CAAC,EAAE,CAAC;2BAEZ,EAAE;oBAEF,cAAc,GAAG,YAAY;iCAE7B;IACR,QAAQ,EAAE,QAAQ,CAAC;IACnB,iBAAiB,EAAE,CACjB,eAAe,EAAE,KAAK,KACnB,OAAO,mBAAmB,EAAE,oBAAoB,CAAC;IACtD,eAAe,EAAE,eAAe,CAAC;IACjC,oBAAoB,EAAE,MAAM,OAAO,CACvC,OAAa,4BAA4B,EAAE,iBAAiB,CACvD,CAAC;CACH;4BAGS,QAAQ,CAAC;IACjB,KAAK,EAAE,KAAK,CAAC;CACd,CAAC;wCAEQ,OAAO,gEAAgE,EAAE,iBAAiB,CACtG,OAAa,aAAa,EAAE,mBAAmB,CAC1C;4BAsdQ,QAAQ,QAAQ,OAAO,oBAAoB,CAAC,CAAC;AAlc3D;;;;;;;;;;;;GAYG;AACH,+CAZW,OAAO,4BAA4B,EAAE,OAAO,OAC5C,OAAO,mBAAmB,EAAE,eAAe,wBAC3C,yBAAyB,YACzB,QAAQ,KAAK,CAAC,SACd,IAAI,CAAC,OAAO,cAAc,EAAE,YAAY,CAAC,cACzC,IAAI,CAAC,OAAO,0BAA0B,EAAE,qBAAqB,CAAC,eAC9D,QAAQ,WAAW,CAAC,cACpB,QAAQ,WAAW,CAAC,mBACpB,OAAO,6CAA6C,EAAE,eAAe,oBACrE,OAAO,6CAA6C,EAAE,gBAAgB,iBACtE,MAAM,CAAC,MAAM,EAAE,OAAO,aAAa,EAAE,0BAA0B,CAAC;;;YAwO/D,+CAA+C;8BAAnC,qBAAqB;;;;;;;;;YAAjC,+CAA+C;8BAAnC,qBAAqB;;;;;;;;;QAarC,2BAA2B;4BAAf,MAAM;;YAmBlB;;;;eAIG;2CAHQ,MAAM,CAAC,KAAK,CAAC,qBACb,OAAO,sBACP,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAflC,oCAAoC;2BAAtB,IAAI,CAAC,YAAY,CAAC;;;;;QAYhC;;;;WAIG;uCAHQ,MAAM,CAAC,KAAK,CAAC,qBACb,OAAO,sBACP,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QA6FlC,6BAA6B;sCAAjB,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAUjB;;;;WAIG;6CADQ;YAAE,eAAe,EAAE,KAAK,CAAA;SAAE;;;;QAQrC,0EAA0E;;QAI1E;;;;;WAKG;+CADQ;YAAE,eAAe,EAAE,KAAK,CAAA;SAAE;;QASrC,2BAA2B;kCAAf,MAAM;;;;QAoBlB,2EAA2E;;;GAmBlF;6BA1fyB,WAAW;6BADiB,aAAa;6BAEnB,kBAAkB;iCACpC,iDAAiD;6BAHzB,aAAa"}
+{"version":3,"file":"vaultDirector.d.ts","sourceRoot":"","sources":["vaultDirector.js"],"names":[],"mappings":"AA+FO,iFAEE,IADK,CAAC,EAAE,EAAE,YAAY,KAAK,IACzB,UAOV;AAocD,6EAA6E;AAE7E;;;;;;GAMG;AACH,8BAJU,CACT,GAAO,OAAO,EAAE,UAAU,CAAC,OAAO,oBAAoB,CAAC,KAChD,aAAa,CAQnB;kCA7fW;IACR,WAAW,EAAE,KAAK,EAAE,CAAC;IACrB,oBAAoB,EAAE,mBAAmB,CAAC;CAC3C;6BAGS,QAAQ,CAAC,EAAE,CAAC;2BAEZ,EAAE;oBAEF,cAAc,GAAG,YAAY;iCAE7B;IACR,QAAQ,EAAE,QAAQ,CAAC;IACnB,iBAAiB,EAAE,CAAC,eAAe,EAAE,KAAK,KAAK,oBAAoB,CAAC;IACpE,eAAe,EAAE,eAAe,CAAC;IACjC,oBAAoB,EAAE,MAAM,OAAO,CAAC,iBAAiB,CAAC,CAAC;CACxD;4BAGS,QAAQ,CAAC;IACjB,KAAK,EAAE,KAAK,CAAC;CACd,CAAC;wCAEQ,kBAAkB,mBAAmB,CAAC;4BAsdrC,QAAQ,QAAQ,OAAO,oBAAoB,CAAC,CAAC;AAlc3D;;;;;;;;;;;;GAYG;AACH,+CAZW,OAAO,OACP,eAAe,wBACf,yBAAyB,YACzB,QAAQ,KAAK,CAAC,SACd,IAAI,CAAC,YAAY,CAAC,cAClB,IAAI,CAAC,qBAAqB,CAAC,eAC3B,QAAQ,WAAW,CAAC,cACpB,QAAQ,WAAW,CAAC,mBACpB,eAAe,oBACf,gBAAgB,iBAChB,MAAM,CAAC,MAAM,EAAE,OAAO,aAAa,EAAE,0BAA0B,CAAC;;;YAwO/D,+CAA+C;8BAAnC,qBAAqB;;;;;;;;;YAAjC,+CAA+C;8BAAnC,qBAAqB;;;;;;;;;QAarC,2BAA2B;4BAAf,MAAM;;YAmBlB;;;;eAIG;2CAHQ,MAAM,CAAC,KAAK,CAAC,qBACb,OAAO,sBACP,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAflC,oCAAoC;2BAAtB,IAAI,CAAC,YAAY,CAAC;;;;;QAYhC;;;;WAIG;uCAHQ,MAAM,CAAC,KAAK,CAAC,qBACb,OAAO,sBACP,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QA6FlC,6BAA6B;sCAAjB,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAUjB;;;;WAIG;6CADQ;YAAE,eAAe,EAAE,KAAK,CAAA;SAAE;;;;QAQrC,0EAA0E;;QAI1E;;;;;WAKG;+CADQ;YAAE,eAAe,EAAE,KAAK,CAAA;SAAE;;QASrC,2BAA2B;kCAAf,MAAM;;;;QAoBlB,2EAA2E;;;GAmBlF;0CA3fsC,mBAAmB;uCACtB,4BAA4B;yCAE1B,aAAa;uCADf,gEAAgE;6BAL1E,WAAW;6BAOX,4BAA4B;qCACpB,mBAAmB;6BATC,aAAa;kCAUpC,cAAc;2CACL,0BAA0B;6BATlB,kBAAkB;iCACpC,iDAAiD;qCAS7C,6CAA6C;sCAC5C,6CAA6C;6BAb1B,aAAa"}

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
    */