@agoric/inter-protocol 0.17.0 → 0.17.1-upgrade-23-dev-bd79330.0.bd79330

package/src/psm/psm.js

@@ -1,7 +1,3 @@
-// @jessie-check
-/// <reference types="@agoric/governance/exported" />
-/// <reference types="@agoric/zoe/exported" />
-
 import { Fail } from '@endo/errors';
 import { E } from '@endo/eventual-send';
 import { AmountMath, AmountShape, BrandShape, RatioShape } from '@agoric/ertp';
@@ -12,6 +8,7 @@ import {
   publicMixinAPI,
 } from '@agoric/governance';
 import { StorageNodeShape } from '@agoric/internal';
+import { wrapRemoteMarshaller } from '@agoric/internal/src/marshal/wrap-marshaller.js';
 import { M, prepareExo, provide } from '@agoric/vat-data';
 import {
   atomicTransfer,
@@ -45,7 +42,15 @@ import { makeNatAmountShape } from '../contractSupport.js';
 
 /**
  * @import {EReturn} from '@endo/far';
- * @import {ContractMeta, FeeMintAccess, Installation} from '@agoric/zoe';
+ * @import {TypedPattern, Remote} from '@agoric/internal';
+ * @import {Baggage} from '@agoric/vat-data'
+ * @import {ContractMeta, FeeMintAccess, Invitation, ZCF, ZCFSeat} from '@agoric/zoe';
+ * @import {Ratio} from '@agoric/ertp';
+ * @import {GovernanceTerms} from '@agoric/governance/src/types.js';
+ * @import {Amount} from '@agoric/ertp';
+ * @import {Brand} from '@agoric/ertp';
+ * @import {StorageNode} from '@agoric/internal/src/lib-chainStorage.js';
+ * @import {Marshaller} from '@agoric/internal/src/lib-chainStorage.js';
  */
 
 /**
@@ -63,12 +68,7 @@ import { makeNatAmountShape } from '../contractSupport.js';
  *   given by this contract
  */
 
-/**
- * @import {TypedPattern} from '@agoric/internal';
- * @import {Baggage} from '@agoric/vat-data'
- */
-
-/** @type {ContractMeta} */
+/** @type {ContractMeta<typeof start>} */
 export const meta = {
   upgradability: 'canUpgrade',
   customTermsShape: {
@@ -91,6 +91,7 @@ export const meta = {
       MintLimit: { type: ParamTypes.AMOUNT, value: AmountShape },
     },
   },
+  // @ts-expect-error splitRecord loses the property keys
   privateArgsShape: M.splitRecord(
     {
       marshaller: M.remotable('Marshaller'),
@@ -119,8 +120,8 @@ harden(meta);
  * @param {{
  *   feeMintAccess: FeeMintAccess;
  *   initialPoserInvitation: Invitation;
- *   storageNode: StorageNode;
- *   marshaller: Marshaller;
+ *   storageNode: Remote<StorageNode>;
+ *   marshaller: Remote<Marshaller>;
  * }} privateArgs
  * @param {Baggage} baggage
  */
@@ -128,9 +129,12 @@ export const start = async (zcf, privateArgs, baggage) => {
   const { anchorBrand, anchorPerMinted } = zcf.getTerms();
   console.log('PSM Starting', anchorBrand, anchorPerMinted);
 
+  const { marshaller: remoteMarshaller } = privateArgs;
+  const cachingMarshaller = wrapRemoteMarshaller(remoteMarshaller);
+
   const { makeRecorderKit } = prepareRecorderKitMakers(
     baggage,
-    privateArgs.marshaller,
+    cachingMarshaller,
   );
 
   const { stableMint } = await provideAll(baggage, {
@@ -157,7 +161,7 @@ export const start = async (zcf, privateArgs, baggage) => {
         WantMintedFee: ParamTypes.RATIO,
       },
       privateArgs.storageNode,
-      privateArgs.marshaller,
+      cachingMarshaller,
     );
 
   const anchorPool = provideEmptySeat(zcf, baggage, 'anchorPoolSeat');

package/src/reserve/assetReserve.d.ts

@@ -5,26 +5,26 @@ export function start(zcf: ZCF<GovernanceTerms<{}> & {
 }>, privateArgs: {
     feeMintAccess: FeeMintAccess;
     initialPoserInvitation: Invitation;
-    marshaller: ERef<Marshaller>;
-    storageNode: ERef<StorageNode>;
+    marshaller: ERemote<Marshaller>;
+    storageNode: ERemote<StorageNode>;
 }, baggage: Baggage): Promise<{
     /** @type {GovernedCreatorFacet<typeof assetReserveKit.machine>} */
     creatorFacet: GovernedCreatorFacet<import("@endo/exo").Guarded<{
         addIssuer(issuer: Issuer, keyword: string): Promise<void>;
         getAllocations(): Allocation;
-        makeShortfallReportingInvitation(): Promise<globalThis.Invitation<import("@endo/exo").Guarded<{
+        makeShortfallReportingInvitation(): Promise<Invitation<import("@endo/exo").Guarded<{
             increaseLiquidationShortfall(shortfall: Amount<"nat">): void;
             reduceLiquidationShortfall(reduction: Amount<"nat">): void;
         }>, undefined>>;
-        makeSingleWithdrawalInvitation(): Promise<globalThis.Invitation<any, undefined>>;
-        makeRepeatableWithdrawalInvitation(): Promise<globalThis.Invitation<{
+        makeSingleWithdrawalInvitation(): Promise<Invitation<any, undefined>>;
+        makeRepeatableWithdrawalInvitation(): Promise<Invitation<{
             invitationMakers: Partial<any>;
         }, undefined>>;
         revokeOutstandingWithdrawalInvitations(): void;
     }>>;
     /** @type {GovernedPublicFacet<typeof assetReserveKit.public>} */
     publicFacet: GovernedPublicFacet<import("@endo/exo").Guarded<{
-        makeAddCollateralInvitation(): Promise<globalThis.Invitation<string, never>>;
+        makeAddCollateralInvitation(): Promise<Invitation<string, never>>;
         getPublicTopics(): {
             metrics: import("@agoric/zoe/src/contractSupport/topics.js").PublicTopic<import("./assetReserveKit.js").MetricsNotification>;
         };
@@ -50,9 +50,19 @@ export type AssetReservePublicFacet = EReturn<typeof start>["publicFacet"];
 export type AssetReserveCreatorFacet = EReturn<typeof start>["creatorFacet"];
 export type ReserveContract = ContractOf<typeof start>;
 import type { ContractMeta } from '@agoric/zoe';
+import type { GovernanceTerms } from '@agoric/governance/src/types.js';
+import type { ZCF } from '@agoric/zoe';
 import type { FeeMintAccess } from '@agoric/zoe';
+import type { Invitation } from '@agoric/zoe';
+import type { Marshaller } from '@agoric/internal/src/lib-chainStorage.js';
+import type { ERemote } from '@agoric/internal';
+import type { StorageNode } from '@agoric/internal/src/lib-chainStorage.js';
 import type { Baggage } from '@agoric/vat-data';
+import type { Issuer } from '@agoric/ertp';
 import type { Allocation } from '@agoric/zoe';
+import type { Amount } from '@agoric/ertp';
+import type { GovernedCreatorFacet } from '@agoric/governance/src/types.js';
+import type { GovernedPublicFacet } from '@agoric/governance/src/types.js';
 import type { EReturn } from '@endo/far';
 import type { ContractOf } from '@agoric/zoe/src/zoeService/utils.js';
 //# sourceMappingURL=assetReserve.d.ts.map

package/src/reserve/assetReserve.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"assetReserve.d.ts","sourceRoot":"","sources":["assetReserve.js"],"names":[],"mappings":"AAkBA,yCAAyC;AACzC,mBADW,aAAa,OAAO,KAAK,CAAC,CAGnC;AAgCK,2BAbI,GAAG,CACT,eAAe,CAAC,EAAE,CAAC,GAAG;IACpB,YAAY,EAAE,CAAC,2BAA2B,CAAC,CAAC;CAC7C,CACF,eACO;IACN,aAAa,EAAE,aAAa,CAAC;IAC7B,sBAAsB,EAAE,UAAU,CAAC;IACnC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IAC7B,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;CAChC,WACO,OAAO;IAoDd,mEAAmE;kBAAxD,oBAAoB;;;;;;;;;;;;OAAgC;IAE/D,iEAAiE;iBAAtD,mBAAmB;;;;;OAA+B;GAKhE;sCArFY;IACR,4BAA4B,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IACzD,0BAA0B,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;CACzD;;kCAuFU,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI;gCAC3B,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI;;;eAK3B,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI;oBACrC,MAAM,UAAU;sCAChB,MAAM,OAAO,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC;;sCAG5C,QAAQ,OAAO,KAAK,CAAb,CAAe,aAAa,CAAC;;;;uCAErC,QAAQ,OAAO,KAAK,CAAb,CAAe,cAAc,CAAC;8BAIpC,WAAW,OAAO,KAAK,CAAC;kCAvHkC,aAAa;mCAAb,aAAa;6BAkB1D,kBAAkB;gCAlB2B,aAAa;6BAF3D,WAAW;gCACR,qCAAqC"}
+{"version":3,"file":"assetReserve.d.ts","sourceRoot":"","sources":["assetReserve.js"],"names":[],"mappings":"AAyBA,yCAAyC;AACzC,mBADW,aAAa,OAAO,KAAK,CAAC,CAGnC;AA8BK,2BAbI,IACV,gBAAoB,EAAE,CAAC,GAAG;IACpB,YAAY,EAAE,CAAC,2BAA2B,CAAC,CAAC;CAC7C,CACF,eACO;IACN,aAAa,EAAE,aAAa,CAAC;IAC7B,sBAAsB,EAAE,UAAU,CAAC;IACnC,UAAU,EAAE,QAAQ,UAAU,CAAC,CAAC;IAChC,WAAW,EAAE,QAAQ,WAAW,CAAC,CAAC;CACnC,WACO,OAAO;IAuDd,mEAAmE;kBAAxD;;;;;;;;;;;;OAAoD;IAE/D,iEAAiE;iBAAtD;;;;;OAAkD;GAKhE;sCAtFY;IACR,4BAA4B,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IACzD,0BAA0B,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;CACzD;;kCAwFU,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI;gCAC3B,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI;;;eAK3B,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI;oBACrC,MAAM,UAAU;sCAChB,MAAM,OAAO,CAAC,WAAW,iBAAiB,CAAC,CAAC;;sCAG5C,QAAQ,OAAO,KAAK,CAAb,CAAe,aAAa,CAAC;;;;uCAErC,QAAQ,OAAO,KAAK,CAAb,CAAe,cAAc,CAAC;8BAIpC,WAAW,OAAO,KAAK,CAAC;kCA9HqC,aAAa;qCACtD,iCAAiC;yBADQ,aAAa;mCAAb,aAAa;gCAAb,aAAa;gCAM9C,0CAA0C;6BAV1D,kBAAkB;iCAUF,0CAA0C;6BAT1D,kBAAkB;4BAQnB,cAAc;gCALoC,aAAa;4BAI/D,cAAc;0CAFA,iCAAiC;yCAClC,iCAAiC;6BAL7C,WAAW;gCACR,qCAAqC"}

package/src/reserve/assetReserve.js

@@ -1,7 +1,6 @@
-// @jessie-check
-
 import { handleParamGovernance } from '@agoric/governance';
 import { makeTracer } from '@agoric/internal';
+import { wrapRemoteMarshaller } from '@agoric/internal/src/marshal/wrap-marshaller.js';
 import {
   prepareRecorderKitMakers,
   provideAll,
@@ -9,9 +8,17 @@ import {
 import { prepareAssetReserveKit } from './assetReserveKit.js';
 
 /**
+ * @import {ERemote} from '@agoric/internal';
+ * @import {Baggage} from '@agoric/vat-data'
  * @import {EReturn} from '@endo/far';
  * @import {ContractOf} from '@agoric/zoe/src/zoeService/utils.js';
- * @import {Allocation, ContractMeta, FeeMintAccess, Installation} from '@agoric/zoe';
+ * @import {Allocation, ContractMeta, FeeMintAccess, Invitation, ZCF} from '@agoric/zoe';
+ * @import {GovernanceTerms} from '@agoric/governance/src/types.js';
+ * @import {GovernedCreatorFacet} from '@agoric/governance/src/types.js';
+ * @import {GovernedPublicFacet} from '@agoric/governance/src/types.js';
+ * @import {Amount} from '@agoric/ertp';
+ * @import {Issuer} from '@agoric/ertp';
+ * @import {Marshaller, StorageNode} from '@agoric/internal/src/lib-chainStorage.js';
  */
 
 const trace = makeTracer('AR', true);
@@ -29,8 +36,6 @@ harden(meta);
  * }} ShortfallReportingFacet
  */
 
-/** @import {Baggage} from '@agoric/vat-data' */
-
 /**
  * Asset Reserve holds onto assets for the Inter Protocol, and can dispense it
  * for various purposes under governance control.
@@ -46,8 +51,8 @@ harden(meta);
  * @param {{
  *   feeMintAccess: FeeMintAccess;
  *   initialPoserInvitation: Invitation;
- *   marshaller: ERef<Marshaller>;
- *   storageNode: ERef<StorageNode>;
+ *   marshaller: ERemote<Marshaller>;
+ *   storageNode: ERemote<StorageNode>;
  * }} privateArgs
  * @param {Baggage} baggage
  */
@@ -58,9 +63,12 @@ export const start = async (zcf, privateArgs, baggage) => {
   // accessed via the `state` object. The latter means updates are made directly
   // to state and don't require reference to baggage.
 
+  const { marshaller: remoteMarshaller } = privateArgs;
+  const cachingMarshaller = wrapRemoteMarshaller(remoteMarshaller);
+
   const { makeRecorderKit } = prepareRecorderKitMakers(
     baggage,
-    privateArgs.marshaller,
+    cachingMarshaller,
   );
 
   const storageNode = await privateArgs.storageNode;
@@ -87,7 +95,7 @@ export const start = async (zcf, privateArgs, baggage) => {
     privateArgs.initialPoserInvitation,
     {},
     privateArgs.storageNode,
-    privateArgs.marshaller,
+    cachingMarshaller,
   );
 
   const { governorFacet } = makeDurableGovernorFacet(

package/src/reserve/assetReserveKit.d.ts

@@ -1,7 +1,7 @@
-export function prepareAssetReserveKit(baggage: import("@agoric/vat-data").Baggage, { feeMint, makeRecorderKit, storageNode, zcf }: {
+export function prepareAssetReserveKit(baggage: Baggage, { feeMint, makeRecorderKit, storageNode, zcf }: {
     feeMint: ZCFMint<"nat">;
-    makeRecorderKit: import("@agoric/zoe/src/contractSupport/recorder.js").MakeRecorderKit;
-    storageNode: StorageNode;
+    makeRecorderKit: MakeRecorderKit;
+    storageNode: ERemote<StorageNode>;
     zcf: ZCF;
 }): Promise<() => Promise<import("@endo/exo").GuardedKit<{
     helper: {
@@ -25,7 +25,7 @@ export function prepareAssetReserveKit(baggage: import("@agoric/vat-data").Bagga
         handle(seat: any): Promise<string>;
     };
     withdrawalFacet: {
-        Withdraw(): Promise<globalThis.Invitation<any, undefined>>;
+        Withdraw(): Promise<import("@agoric/zoe").Invitation<any, undefined>>;
     };
     repeatableWithdrawalHandler: {
         /**
@@ -42,15 +42,15 @@ export function prepareAssetReserveKit(baggage: import("@agoric/vat-data").Bagga
          */
         addIssuer(issuer: Issuer, keyword: string): Promise<void>;
         /** XXX redundant with getPublicTopics metrics `allocation` */
-        getAllocations(): Allocation;
-        makeShortfallReportingInvitation(): Promise<globalThis.Invitation<import("@endo/exo").Guarded<{
+        getAllocations(): import("@agoric/zoe").Allocation;
+        makeShortfallReportingInvitation(): Promise<import("@agoric/zoe").Invitation<import("@endo/exo").Guarded<{
             /** @param {Amount<'nat'>} shortfall */
             increaseLiquidationShortfall(shortfall: Amount<"nat">): void;
             /** @param {Amount<'nat'>} reduction */
             reduceLiquidationShortfall(reduction: Amount<"nat">): void;
         }>, undefined>>;
-        makeSingleWithdrawalInvitation(): Promise<globalThis.Invitation<any, undefined>>;
-        makeRepeatableWithdrawalInvitation(): Promise<globalThis.Invitation<{
+        makeSingleWithdrawalInvitation(): Promise<import("@agoric/zoe").Invitation<any, undefined>>;
+        makeRepeatableWithdrawalInvitation(): Promise<import("@agoric/zoe").Invitation<{
             invitationMakers: Partial<any>;
         }, undefined>>;
         revokeOutstandingWithdrawalInvitations(): void;
@@ -61,9 +61,9 @@ export function prepareAssetReserveKit(baggage: import("@agoric/vat-data").Bagga
      */
     public: {
         /** Anyone can deposit any assets to the reserve */
-        makeAddCollateralInvitation(): Promise<globalThis.Invitation<string, never>>;
+        makeAddCollateralInvitation(): Promise<import("@agoric/zoe").Invitation<string, never>>;
         getPublicTopics(): {
-            metrics: import("@agoric/zoe/src/contractSupport").PublicTopic<MetricsNotification>;
+            metrics: import("@agoric/zoe/src/contractSupport/topics.js").PublicTopic<MetricsNotification>;
         };
     };
     shortfallReportingFacet: {
@@ -90,8 +90,11 @@ export type MetricsNotification = {
     totalFeeBurned: Amount<"nat">;
 };
 export type AssetReserveKit = EReturn<EReturn<typeof prepareAssetReserveKit>>;
+import type { Baggage } from '@agoric/vat-data';
 import type { ZCFMint } from '@agoric/zoe';
+import type { MakeRecorderKit } from '@agoric/zoe/src/contractSupport/recorder.js';
 import type { StorageNode } from '@agoric/internal/src/lib-chainStorage.js';
+import type { ERemote } from '@agoric/internal';
 import type { ZCF } from '@agoric/zoe';
 import type { Brand } from '@agoric/ertp';
 import type { Keyword } from '@agoric/zoe';

package/src/reserve/assetReserveKit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"assetReserveKit.d.ts","sourceRoot":"","sources":["assetReserveKit.js"],"names":[],"mappings":"AAiDO,gDARI,OAAO,kBAAkB,EAAE,OAAO,kDAClC;IACN,OAAO,EAAE,QAAQ,KAAK,CAAC,CAAC;IACxB,eAAe,EAAE,OAAO,6CAA6C,EAAE,eAAe,CAAC;IACvF,WAAW,EAAE,WAAW,CAAC;IACzB,GAAG,EAAE,GAAG,CAAC;CACV;;QA8GI,2BAA2B;kCAAf,KAAK;QAUjB;;;WAGG;gCAFQ,KAAK,WACL,OAAO;;;;QAqBlB;;;WAGG;6CAFQ,OAAO,KAAK,CAAC,GACX,IAAI;;;;;;;;;QAsDjB;;WAEG;qBADQ,OAAO;;;;;QAYlB;;;WAGG;0BAFQ,MAAM,WACN,MAAM;QAmBjB,8DAA8D;;;YA2E9D,uCAAuC;oDAA3B,OAAO,KAAK,CAAC;YAWzB,uCAAuC;kDAA3B,OAAO,KAAK,CAAC;;;;;;;;IArD3B;;;OAGG;;QAED,mDAAmD;;;;;;;QAqCnD,uCAAuC;gDAA3B,OAAO,KAAK,CAAC;QAWzB,uCAAuC;8CAA3B,OAAO,KAAK,CAAC;;KA8BhC;;iBA3Wa,mBAAmB;;;;;sBACnB,OAAO,KAAK,CAAC;;;;oBAEb,OAAO,KAAK,CAAC;;;;oBACb,OAAO,KAAK,CAAC;;8BAyWb,QAAQ,QAAQ,OAAO,sBAAsB,CAAC,CAAC;6BAlXE,aAAa;iCAJ9C,0CAA0C;yBAIT,aAAa;2BAHpC,cAAc;6BAGS,aAAa;4BAHpC,cAAc;6BAGS,aAAa;4BAHpC,cAAc;yCAEhB,qCAAqC;6BALjD,WAAW"}
+{"version":3,"file":"assetReserveKit.d.ts","sourceRoot":"","sources":["assetReserveKit.js"],"names":[],"mappings":"AAmDO,gDARI,OAAO,kDACP;IACN,OAAO,EAAE,QAAQ,KAAK,CAAC,CAAC;IACxB,eAAe,EAAE,eAAe,CAAC;IACjC,WAAW,EAAE,QAAQ,WAAW,CAAC,CAAC;IAClC,GAAG,EAAE,GAAG,CAAC;CACV;;QA8GI,2BAA2B;kCAAf,KAAK;QAUjB;;;WAGG;gCAFQ,KAAK,WACL,OAAO;;;;QAqBlB;;;WAGG;6CAFQ,OAAO,KAAK,CAAC,GACX,IAAI;;;;;;;;;QAsDjB;;WAEG;qBADQ,OAAO;;;;;QAYlB;;;WAGG;0BAFQ,MAAM,WACN,MAAM;QAmBjB,8DAA8D;;;YA2E9D,uCAAuC;oDAA3B,OAAO,KAAK,CAAC;YAWzB,uCAAuC;kDAA3B,OAAO,KAAK,CAAC;;;;;;;;IArD3B;;;OAGG;;QAED,mDAAmD;;;;;;;QAqCnD,uCAAuC;gDAA3B,OAAO,KAAK,CAAC;QAWzB,uCAAuC;8CAA3B,OAAO,KAAK,CAAC;;KA8BhC;;iBA3Wa,mBAAmB;;;;;sBACnB,OAAO,KAAK,CAAC;;;;oBAEb,OAAO,KAAK,CAAC;;;;oBACb,OAAO,KAAK,CAAC;;8BAyWb,QAAQ,QAAQ,OAAO,sBAAsB,CAAC,CAAC;6BAnXnC,kBAAkB;6BADmB,aAAa;qCAE1C,6CAA6C;iCANjD,0CAA0C;6BADxB,kBAAkB;yBAKH,aAAa;2BAHpC,cAAc;6BAGS,aAAa;4BAHpC,cAAc;6BAGS,aAAa;4BAHpC,cAAc;yCAEhB,qCAAqC;6BALjD,WAAW"}

package/src/reserve/assetReserveKit.js

@@ -21,12 +21,14 @@ const trace = makeTracer('ReserveKit', true);
 
 /**
  * @import {EReturn} from '@endo/far';
- * @import {TypedPattern} from '@agoric/internal';
+ * @import {TypedPattern, ERemote, Remote} from '@agoric/internal';
  * @import {StorageNode} from '@agoric/internal/src/lib-chainStorage.js';
  * @import {Amount, Brand, Issuer} from '@agoric/ertp';
  * @import {MapStore, SetStore} from '@agoric/store';
  * @import {AmountKeywordRecord} from '@agoric/zoe/src/zoeService/types.js';
  * @import {ZCF, OfferHandler, Keyword, ZCFMint, ZCFSeat} from '@agoric/zoe';
+ * @import {Baggage} from '@agoric/vat-data';
+ * @import {MakeRecorderKit} from '@agoric/zoe/src/contractSupport/recorder.js';
  */
 
 /**
@@ -39,11 +41,11 @@ const trace = makeTracer('ReserveKit', true);
  */
 
 /**
- * @param {import('@agoric/vat-data').Baggage} baggage
+ * @param {Baggage} baggage
  * @param {{
  *   feeMint: ZCFMint<'nat'>;
- *   makeRecorderKit: import('@agoric/zoe/src/contractSupport/recorder.js').MakeRecorderKit;
- *   storageNode: StorageNode;
+ *   makeRecorderKit: MakeRecorderKit;
+ *   storageNode: ERemote<StorageNode>;
  *   zcf: ZCF;
  * }} powers
  */
@@ -119,7 +121,7 @@ export const prepareAssetReserveKit = async (
         reduceLiquidationShortfall: M.call(AmountShape).returns(),
       }),
     },
-    /** @param {StorageNode} metricsNode */
+    /** @param {Remote<StorageNode>} metricsNode */
     metricsNode => {
       /**
        * Used to look up the unique keyword for each brand, including Fee brand.

package/src/reserve/params.d.ts

@@ -1,5 +1,5 @@
 /**
- * @import {AdminFacet, ContractOf, InvitationAmount, ZCFMint} from '@agoric/zoe';
+ * @import {AdminFacet, InvitationAmount, ZCFMint} from '@agoric/zoe';
  */
 /**
  * @param {InvitationAmount} poserInvitationAmount

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

@@ -1 +1 @@
-{"version":3,"file":"params.d.ts","sourceRoot":"","sources":["params.js"],"names":[],"mappings":"AAIA;;GAEG;AAEH;;GAEG;AACH,wDAFW,gBAAgB;;;;;;;EASzB;sCAbkE,aAAa"}
+{"version":3,"file":"params.d.ts","sourceRoot":"","sources":["params.js"],"names":[],"mappings":"AAEA;;GAEG;AAEH;;GAEG;AACH,wDAFW,gBAAgB;;;;;;;EASzB;sCAbsD,aAAa"}

package/src/reserve/params.js

@@ -1,9 +1,7 @@
-// @jessie-check
-
 import { CONTRACT_ELECTORATE, ParamTypes } from '@agoric/governance';
 
 /**
- * @import {AdminFacet, ContractOf, InvitationAmount, ZCFMint} from '@agoric/zoe';
+ * @import {AdminFacet, InvitationAmount, ZCFMint} from '@agoric/zoe';
  */
 
 /**

package/src/vaultFactory/burn.d.ts

@@ -1,2 +1,5 @@
-export function paymentFromZCFMint(zcf: ZCF, zcfMint: ZCFMint, amount: Amount): Promise<globalThis.Payment<any, any>>;
+export function paymentFromZCFMint(zcf: ZCF, zcfMint: ZCFMint, amount: Amount): Promise<import("@agoric/ertp").Payment<any, any>>;
+import type { ZCF } from '@agoric/zoe';
+import type { ZCFMint } from '@agoric/zoe';
+import type { Amount } from '@agoric/ertp';
 //# sourceMappingURL=burn.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"burn.d.ts","sourceRoot":"","sources":["burn.js"],"names":[],"mappings":"AAWO,wCAJI,GAAG,WACH,OAAO,UACP,MAAM,yCAOhB"}
+{"version":3,"file":"burn.d.ts","sourceRoot":"","sources":["burn.js"],"names":[],"mappings":"AAYO,wCAJI,GAAG,WACH,OAAO,UACP,MAAM,qDAOhB;yBAd8B,aAAa;6BAAb,aAAa;4BACnB,cAAc"}

package/src/vaultFactory/burn.js

@@ -1,9 +1,10 @@
-// @jessie-check
-
-/// <reference types="@agoric/zoe/exported" />
-
 import { E } from '@endo/eventual-send';
 
+/**
+ * @import {ZCF, ZCFMint} from '@agoric/zoe';
+ * @import {Amount} from '@agoric/ertp';
+ */
+
 /**
  * @param {ZCF} zcf
  * @param {ZCFMint} zcfMint

package/src/vaultFactory/math.d.ts

@@ -7,5 +7,7 @@ export function calculateDebtCosts(currentDebt: Amount<"nat">, give: Amount<"nat
     fee: import("@agoric/ertp").NatAmount;
     surplus: import("@agoric/ertp").NatAmount;
 };
+import type { Ratio } from '@agoric/ertp';
 import type { PriceQuote } from '@agoric/zoe/tools/types.js';
+import type { Amount } from '@agoric/ertp';
 //# sourceMappingURL=math.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"math.d.ts","sourceRoot":"","sources":["math.js"],"names":[],"mappings":"AA4BO,qEAJI,KAAK,sBACL,KAAK,GACH,KAAK,CAKmC;AAS9C,qCAJI,UAAU,WACV,UAAU,GACR,KAAK,CAajB;AAYM,6CALI,UAAU,qBACV,KAAK,sBACL,KAAK,GACH,MAAM,CAAC,KAAK,CAAC,CAczB;AAaM,gDALI,MAAM,CAAC,KAAK,CAAC,QACb,MAAM,CAAC,KAAK,CAAC,QACb,MAAM,CAAC,KAAK,CAAC,WACb,KAAK;;;;;EASf;gCA7E6F,4BAA4B"}
+{"version":3,"file":"math.d.ts","sourceRoot":"","sources":["math.js"],"names":[],"mappings":"AA8BO,qEAJI,KAAK,sBACL,KAAK,GACH,KAAK,CAKmC;AAS9C,qCAJI,UAAU,WACV,UAAU,GACR,KAAK,CAajB;AAYM,6CALI,UAAU,qBACV,KAAK,sBACL,KAAK,GACH,OAAO,KAAK,CAAC,CAczB;AAaM,gDALI,OAAO,KAAK,CAAC,QACb,OAAO,KAAK,CAAC,QACb,OAAO,KAAK,CAAC,WACb,KAAK;;;;;EASf;2BA/EuB,cAAc;gCADuD,4BAA4B;4BAEhG,cAAc"}

package/src/vaultFactory/math.js

@@ -1,5 +1,3 @@
-// @jessie-check
-
 /**
  * @file calculations specific to the Vault Factory contract See also
  *   ../interest-math.js
@@ -16,7 +14,11 @@ import {
 import { priceFrom } from '../auction/util.js';
 import { addSubtract } from '../contractSupport.js';
 
-/** @import {PriceAuthority, PriceDescription, PriceQuote, PriceQuoteValue, PriceQuery,} from '@agoric/zoe/tools/types.js'; */
+/**
+ * @import {PriceAuthority, PriceDescription, PriceQuote, PriceQuoteValue, PriceQuery,} from '@agoric/zoe/tools/types.js';
+ * @import {Ratio} from '@agoric/ertp';
+ * @import {Amount} from '@agoric/ertp';
+ */
 
 /**
  * Calculate the minimum collateralization given the liquidation margin and the

package/src/vaultFactory/orderedVaultStore.d.ts

@@ -2,90 +2,90 @@ export function makeOrderedVaultStore(store: MapStore<string, Vault>): {
     addVault: (vaultId: string, vault: Vault) => string;
     removeByKey: (key: string) => Vault;
     has: (key: string) => boolean;
-    keys: (keyPatt?: Pattern, valuePatt?: Pattern) => Iterable<string>;
-    entries: (keyPatt?: Pattern, valuePatt?: Pattern) => Iterable<[string, import("@endo/exo").Guarded<{
-        getVaultSeat(): globalThis.ZCFSeat;
-        initVaultKit(seat: ZCFSeat, storageNode: StorageNode): Promise<{
+    keys: (keyPatt?: import("@endo/patterns").Pattern, valuePatt?: import("@endo/patterns").Pattern) => Iterable<string>;
+    entries: (keyPatt?: import("@endo/patterns").Pattern, valuePatt?: import("@endo/patterns").Pattern) => Iterable<[string, import("@endo/exo").Guarded<{
+        getVaultSeat(): import("@agoric/zoe").ZCFSeat;
+        initVaultKit(seat: import("@agoric/zoe").ZCFSeat, storageNode: import("@agoric/internal").Remote<import("@agoric/internal/src/lib-chainStorage.js").StorageNode>): Promise<{
             publicSubscribers: {
                 vault: {
                     description: string;
-                    subscriber: globalThis.Subscriber<VaultNotification>;
+                    subscriber: import("@agoric/notifier").Subscriber<import("./vault.js").VaultNotification>;
                     storagePath: Promise<string>;
                 };
             };
             invitationMakers: import("@endo/exo").Guarded<{
-                AdjustBalances(): Promise<globalThis.Invitation<string, undefined>>;
-                CloseVault(): Promise<globalThis.Invitation<string, undefined>>;
-                TransferVault(): Promise<globalThis.Invitation</*elided*/ any>>;
+                AdjustBalances(): Promise<import("@agoric/zoe").Invitation<string, undefined>>;
+                CloseVault(): Promise<import("@agoric/zoe").Invitation<string, undefined>>;
+                TransferVault(): Promise<import("@agoric/zoe").Invitation</*elided*/ any>>;
             }>;
             vault: import("@endo/exo").Guarded<{
                 getPublicTopics(): {
                     vault: {
                         description: string;
-                        subscriber: globalThis.Subscriber<VaultNotification>;
+                        subscriber: import("@agoric/notifier").Subscriber<import("./vault.js").VaultNotification>;
                         storagePath: Promise<string>;
                     };
                 };
-                makeAdjustBalancesInvitation(): Promise<globalThis.Invitation<string, undefined>>;
-                makeCloseInvitation(): Promise<globalThis.Invitation<string, undefined>>;
-                makeTransferInvitation(): Promise<globalThis.Invitation</*elided*/ any>>;
+                makeAdjustBalancesInvitation(): Promise<import("@agoric/zoe").Invitation<string, undefined>>;
+                makeCloseInvitation(): Promise<import("@agoric/zoe").Invitation<string, undefined>>;
+                makeTransferInvitation(): Promise<import("@agoric/zoe").Invitation</*elided*/ any>>;
                 getCollateralAmount(): import("@agoric/ertp").NatAmount;
                 getCurrentDebt(): import("@agoric/ertp").NatAmount;
                 getNormalizedDebt(): import("./storeUtils.js").NormalizedDebt;
             }>;
-            vaultUpdater: import("@agoric/zoe/src/contractSupport/recorder.js").Recorder<VaultNotification>;
+            vaultUpdater: import("@agoric/zoe/src/contractSupport/recorder.js").Recorder<import("./vault.js").VaultNotification>;
         }>;
         liquidating(): void;
         liquidated(): void;
         abortLiquidation(): string;
-        makeAdjustBalancesInvitation(): Promise<globalThis.Invitation<string, undefined>>;
-        makeCloseInvitation(): Promise<globalThis.Invitation<string, undefined>>;
-        makeTransferInvitation(): Promise<Invitation<VaultKit>>;
-        getCollateralAmount(): Amount<"nat">;
-        getCurrentDebt(): Amount<"nat">;
+        makeAdjustBalancesInvitation(): Promise<import("@agoric/zoe").Invitation<string, undefined>>;
+        makeCloseInvitation(): Promise<import("@agoric/zoe").Invitation<string, undefined>>;
+        makeTransferInvitation(): Promise<import("@agoric/zoe").Invitation<import("./vaultKit.js").VaultKit>>;
+        getCollateralAmount(): import("@agoric/ertp").Amount<"nat">;
+        getCurrentDebt(): import("@agoric/ertp").Amount<"nat">;
         getNormalizedDebt(): import("./storeUtils.js").NormalizedDebt;
     }>]>;
-    getSize: (keyPatt?: Pattern, valuePatt?: Pattern) => number;
-    values: (keyPatt?: Pattern, valuePatt?: Pattern) => Iterable<import("@endo/exo").Guarded<{
-        getVaultSeat(): globalThis.ZCFSeat;
-        initVaultKit(seat: ZCFSeat, storageNode: StorageNode): Promise<{
+    getSize: (keyPatt?: import("@endo/patterns").Pattern, valuePatt?: import("@endo/patterns").Pattern) => number;
+    values: (keyPatt?: import("@endo/patterns").Pattern, valuePatt?: import("@endo/patterns").Pattern) => Iterable<import("@endo/exo").Guarded<{
+        getVaultSeat(): import("@agoric/zoe").ZCFSeat;
+        initVaultKit(seat: import("@agoric/zoe").ZCFSeat, storageNode: import("@agoric/internal").Remote<import("@agoric/internal/src/lib-chainStorage.js").StorageNode>): Promise<{
             publicSubscribers: {
                 vault: {
                     description: string;
-                    subscriber: globalThis.Subscriber<VaultNotification>;
+                    subscriber: import("@agoric/notifier").Subscriber<import("./vault.js").VaultNotification>;
                     storagePath: Promise<string>;
                 };
             };
             invitationMakers: import("@endo/exo").Guarded<{
-                AdjustBalances(): Promise<globalThis.Invitation<string, undefined>>;
-                CloseVault(): Promise<globalThis.Invitation<string, undefined>>;
-                TransferVault(): Promise<globalThis.Invitation</*elided*/ any>>;
+                AdjustBalances(): Promise<import("@agoric/zoe").Invitation<string, undefined>>;
+                CloseVault(): Promise<import("@agoric/zoe").Invitation<string, undefined>>;
+                TransferVault(): Promise<import("@agoric/zoe").Invitation</*elided*/ any>>;
             }>;
             vault: import("@endo/exo").Guarded<{
                 getPublicTopics(): {
                     vault: {
                         description: string;
-                        subscriber: globalThis.Subscriber<VaultNotification>;
+                        subscriber: import("@agoric/notifier").Subscriber<import("./vault.js").VaultNotification>;
                         storagePath: Promise<string>;
                     };
                 };
-                makeAdjustBalancesInvitation(): Promise<globalThis.Invitation<string, undefined>>;
-                makeCloseInvitation(): Promise<globalThis.Invitation<string, undefined>>;
-                makeTransferInvitation(): Promise<globalThis.Invitation</*elided*/ any>>;
+                makeAdjustBalancesInvitation(): Promise<import("@agoric/zoe").Invitation<string, undefined>>;
+                makeCloseInvitation(): Promise<import("@agoric/zoe").Invitation<string, undefined>>;
+                makeTransferInvitation(): Promise<import("@agoric/zoe").Invitation</*elided*/ any>>;
                 getCollateralAmount(): import("@agoric/ertp").NatAmount;
                 getCurrentDebt(): import("@agoric/ertp").NatAmount;
                 getNormalizedDebt(): import("./storeUtils.js").NormalizedDebt;
             }>;
-            vaultUpdater: import("@agoric/zoe/src/contractSupport/recorder.js").Recorder<VaultNotification>;
+            vaultUpdater: import("@agoric/zoe/src/contractSupport/recorder.js").Recorder<import("./vault.js").VaultNotification>;
         }>;
         liquidating(): void;
         liquidated(): void;
         abortLiquidation(): string;
-        makeAdjustBalancesInvitation(): Promise<globalThis.Invitation<string, undefined>>;
-        makeCloseInvitation(): Promise<globalThis.Invitation<string, undefined>>;
-        makeTransferInvitation(): Promise<Invitation<VaultKit>>;
-        getCollateralAmount(): Amount<"nat">;
-        getCurrentDebt(): Amount<"nat">;
+        makeAdjustBalancesInvitation(): Promise<import("@agoric/zoe").Invitation<string, undefined>>;
+        makeCloseInvitation(): Promise<import("@agoric/zoe").Invitation<string, undefined>>;
+        makeTransferInvitation(): Promise<import("@agoric/zoe").Invitation<import("./vaultKit.js").VaultKit>>;
+        getCollateralAmount(): import("@agoric/ertp").Amount<"nat">;
+        getCurrentDebt(): import("@agoric/ertp").Amount<"nat">;
         getNormalizedDebt(): import("./storeUtils.js").NormalizedDebt;
     }>>;
 };