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

package/src/vaultFactory/vaultDirector.js

@@ -1,5 +1,5 @@
-/// <reference types="@agoric/governance/exported" />
-/// <reference types="@agoric/zoe/exported" />
+/// <reference types="@agoric/governance/exported.js" />
+/// <reference types="@agoric/zoe/exported.js" />
 
 import { Fail, q } from '@endo/errors';
 import { E } from '@endo/eventual-send';
@@ -43,7 +43,18 @@ import {
  * @import {MapStore} from '@agoric/store';
  * @import {TransferPart, ZCF, ZCFMint, ZCFSeat} from '@agoric/zoe';
  * @import {EReturn} from '@endo/far';
- * @import {TypedPattern} from '@agoric/internal';
+ * @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);
@@ -63,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
  *
  *
@@ -77,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';
@@ -100,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<StorageNode>} storageNode
- * @param {ERef<Marshaller>} marshaller
- * @param {import('@agoric/zoe/src/contractSupport/recorder.js').MakeRecorderKit} makeRecorderKit
- * @param {import('@agoric/zoe/src/contractSupport/recorder.js').MakeERecorderKit} makeERecorderKit
+ * @param {ERef<TimerService>} timer
+ * @param {ERef<AuctioneerPublicFacet>} auctioneer
+ * @param {ERemote<StorageNode>} storageNode
+ * @param {ERemote<EMarshaller>} marshaller
+ * @param {MakeRecorderKit} makeRecorderKit
+ * @param {MakeERecorderKit} makeERecorderKit
  * @param {Record<string, import('./params.js').VaultManagerParamOverrides>} managerParams
  */
 const prepareVaultDirector = (
@@ -125,7 +130,7 @@ const prepareVaultDirector = (
   makeERecorderKit,
   managerParams,
 ) => {
-  /** @type {import('../reserve/assetReserve.js').ShortfallReporter} */
+  /** @type {ShortfallReporter} */
   let shortfallReporter;
 
   /** For holding newly minted tokens until transferred */
@@ -296,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
    */
@@ -401,6 +406,7 @@ const prepareVaultDirector = (
           // zero-based index of the manager being made
           const managerIndex = vaultManagers.length();
           const managerId = `manager${managerIndex}`;
+          /** @type {Remote<StorageNode>} */
           const managerStorageNode =
             await E(managersNode).makeChildNode(managerId);
 

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,53 +13,12 @@ export function start(zcf: VaultFactoryZCF, privateArgs: {
     feeMintAccess: FeeMintAccess;
     initialPoserInvitation: Invitation;
     initialShortfallInvitation: Invitation;
-    storageNode: ERef<StorageNode>;
-    marshaller: ERef<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: StorageNode;
-        marshaller: 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>;
+    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<{
@@ -233,18 +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").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 { PriceAuthority } from '@agoric/zoe/tools/types.js';
-import type { ZCF } 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":"AAuCA;;;;;;;;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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsFtD;8BAhIY,IACR,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,WAAW,OAAO,KAAK,CAAC;kCA3IoF,aAAa;mCAAb,aAAa;gCAAb,aAAa;oCAE1C,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

@@ -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';
@@ -30,19 +31,25 @@ import { SHORTFALL_INVITATION_KEY, vaultDirectorParamTypes } from './params.js';
 import { provideDirector } from './vaultDirector.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
  */
@@ -71,29 +78,28 @@ harden(meta);
  *   feeMintAccess: FeeMintAccess;
  *   initialPoserInvitation: Invitation;
  *   initialShortfallInvitation: Invitation;
- *   storageNode: ERef<StorageNode>;
- *   marshaller: ERef<Marshaller>;
- *   auctioneerInstance: Instance<import('../auction/auctioneer.js').start>;
- *   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),
@@ -110,7 +116,7 @@ export const start = async (zcf, privateArgs, baggage) => {
 
   const { makeRecorderKit, makeERecorderKit } = prepareRecorderKitMakers(
     baggage,
-    marshaller,
+    cachingMarshaller,
   );
 
   trace('making non-durable publishers');
@@ -120,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(
@@ -146,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<{
+export function prepareVaultHolder(baggage: Baggage, makeRecorderKit: MakeRecorderKit): (vault: import("@endo/exo").Guarded<{
     getVaultSeat(): globalThis.ZCFSeat;
-    initVaultKit(seat: ZCFSeat, storageNode: StorageNode): Promise<{
+    initVaultKit(seat: ZCFSeat, storageNode: Remote<StorageNode>): Promise<{
         publicSubscribers: {
             vault: {
                 description: string;
@@ -43,12 +43,12 @@ export function prepareVaultHolder(baggage: import("@agoric/swingset-liveslots")
     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(): globalThis.ZCFSeat;
-            initVaultKit(seat: ZCFSeat, storageNode: StorageNode): Promise<{
+            initVaultKit(seat: ZCFSeat, storageNode: Remote<StorageNode>): Promise<{
                 publicSubscribers: {
                     vault: {
                         description: string;
@@ -164,7 +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":"AAqCO,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"}
+{"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

@@ -6,12 +6,16 @@ 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
  */
@@ -32,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(
@@ -50,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;
@@ -29,5 +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":"AAoBO,yCAHI,OAAO,4BAA4B,EAAE,OAAO,mBAC5C,OAAO,6CAA6C,EAAE,eAAe,WASnE,KAAK,eACL,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAoBvB;uBAEa,QAAQ,QAAQ,OAAO,eAAe,CAAC,CAAC;6BAxC5B,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

@@ -1,6 +1,6 @@
 // @jessie-check
 
-/// <reference types="@agoric/zoe/exported" />
+/// <reference types="@agoric/zoe/exported.js" />
 
 import { makeTracer } from '@agoric/internal';
 import { prepareVaultHolder } from './vaultHolder.js';
@@ -8,15 +8,18 @@ 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()]);
@@ -26,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');

package/src/vaultFactory/vaultManager.d.ts

@@ -1,19 +1,19 @@
-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;
-    marshaller: ERef<Marshaller>;
-    makeRecorderKit: import("@agoric/zoe/src/contractSupport/recorder.js").MakeRecorderKit;
-    makeERecorderKit: import("@agoric/zoe/src/contractSupport/recorder.js").MakeERecorderKit;
-    factoryPowers: import("./vaultDirector.js").FactoryPowersFacet;
+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: MakeRecorderKit;
+    makeERecorderKit: MakeERecorderKit;
+    factoryPowers: FactoryPowersFacet;
 }): (externalParams: Omit<Parameters<(params: Readonly<{
     debtMint: ZCFMint<"nat">;
     collateralBrand: Brand<"nat">;
     collateralUnit: Amount<"nat">;
     descriptionScope: string;
     startTimeStamp: Timestamp;
-    storageNode: StorageNode;
+    storageNode: Remote<StorageNode>;
 }> & {
-    metricsStorageNode: StorageNode;
+    metricsStorageNode: Remote<StorageNode>;
 }) => import("@endo/exo").GuardedKit<{
     collateral: {
         makeVaultInvitation(): Promise<globalThis.Invitation<{
@@ -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,10 +90,10 @@ 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: StorageNode): Promise<{
+                initVaultKit(seat: ZCFSeat, storageNode: Remote<StorageNode>): Promise<{
                     publicSubscribers: {
                         vault: {
                             description: string;
@@ -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,10 +347,10 @@ 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: StorageNode): Promise<{
+                initVaultKit(seat: ZCFSeat, storageNode: Remote<StorageNode>): Promise<{
                     publicSubscribers: {
                         vault: {
                             description: string;
@@ -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>;
@@ -629,10 +629,10 @@ export type HeldParams = Readonly<{
     collateralUnit: Amount<"nat">;
     descriptionScope: string;
     startTimeStamp: Timestamp;
-    storageNode: StorageNode;
+    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,11 +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