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

package/src/reserve/assetReserve.d.ts

@@ -5,21 +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<Invitation<import("@endo/exo").Guarded<{
+        makeShortfallReportingInvitation(): Promise<globalThis.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<{
+            invitationMakers: Partial<any>;
+        }, undefined>>;
+        revokeOutstandingWithdrawalInvitations(): void;
     }>>;
     /** @type {GovernedPublicFacet<typeof assetReserveKit.public>} */
     publicFacet: GovernedPublicFacet<import("@endo/exo").Guarded<{
-        makeAddCollateralInvitation(): Promise<Invitation<string, never>>;
+        makeAddCollateralInvitation(): Promise<globalThis.Invitation<string, never>>;
         getPublicTopics(): {
             metrics: import("@agoric/zoe/src/contractSupport/topics.js").PublicTopic<import("./assetReserveKit.js").MetricsNotification>;
         };
@@ -38,10 +43,17 @@ export type AssetReserveLimitedCreatorFacet = {
     getAllocations: () => Allocation;
     makeShortfallReportingInvitation: () => Promise<Invitation<ShortfallReporter>>;
 };
-export type AssetReservePublicFacet = Awaited<ReturnType<typeof start>>["publicFacet"];
+export type AssetReservePublicFacet = EReturn<typeof start>["publicFacet"];
 /**
  * the creator facet for the governor
  */
-export type AssetReserveCreatorFacet = Awaited<ReturnType<typeof start>>["creatorFacet"];
+export type AssetReserveCreatorFacet = EReturn<typeof start>["creatorFacet"];
+export type ReserveContract = ContractOf<typeof start>;
+import type { ContractMeta } from '@agoric/zoe';
+import type { FeeMintAccess } from '@agoric/zoe';
+import type { ERemote } from '@agoric/internal';
 import type { Baggage } from '@agoric/vat-data';
+import type { Allocation } from '@agoric/zoe';
+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":"AAYA,yCAAyC;AACzC,mBADW,YAAY,CAAC,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;IA6Dd,mEAAmE;kBAAxD,oBAAoB;;;;;;;OAAgC;IAE/D,iEAAiE;iBAAtD,mBAAmB;;;;;OAA+B;GAKhE;sCA9FY;IACR,4BAA4B,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IACzD,0BAA0B,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;CACzD;;kCAgGU,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,OAAO,CAAC,UAAU,CAAC,OAAO,KAAK,CAAC,CAAC,CAAC,aAAa,CAAC;;;;uCAEjD,OAAO,CAAC,UAAU,CAAC,OAAO,KAAK,CAAC,CAAC,CAAC,cAAc,CAAC;6BA1GnC,kBAAkB"}
+{"version":3,"file":"assetReserve.d.ts","sourceRoot":"","sources":["assetReserve.js"],"names":[],"mappings":"AAqBA,yCAAyC;AACzC,mBADW,aAAa,OAAO,KAAK,CAAC,CAGnC;AA8BK,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,QAAQ,UAAU,CAAC,CAAC;IAChC,WAAW,EAAE,QAAQ,WAAW,CAAC,CAAC;CACnC,WACO,OAAO;IAuDd,mEAAmE;kBAAxD,oBAAoB;;;;;;;;;;;;OAAgC;IAE/D,iEAAiE;iBAAtD,mBAAmB;;;;;OAA+B;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,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;kCAxHkC,aAAa;mCAAb,aAAa;6BAJ3D,kBAAkB;6BAClB,kBAAkB;gCAG4B,aAAa;6BAF3D,WAAW;gCACR,qCAAqC"}

package/src/reserve/assetReserve.js

@@ -2,12 +2,21 @@
 
 import { handleParamGovernance } from '@agoric/governance';
 import { makeTracer } from '@agoric/internal';
+import { wrapRemoteMarshaller } from '@agoric/internal/src/marshal/wrap-marshaller.js';
 import {
   prepareRecorderKitMakers,
   provideAll,
 } from '@agoric/zoe/src/contractSupport/index.js';
 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';
+ */
+
 const trace = makeTracer('AR', true);
 
 /** @type {ContractMeta<typeof start>} */
@@ -23,8 +32,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.
@@ -40,8 +47,8 @@ harden(meta);
  * @param {{
  *   feeMintAccess: FeeMintAccess;
  *   initialPoserInvitation: Invitation;
- *   marshaller: ERef<Marshaller>;
- *   storageNode: ERef<StorageNode>;
+ *   marshaller: ERemote<Marshaller>;
+ *   storageNode: ERemote<StorageNode>;
  * }} privateArgs
  * @param {Baggage} baggage
  */
@@ -52,27 +59,21 @@ 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,
   );
 
-  /** @type {() => Promise<ZCFMint<'nat'>>} */
-  const takeFeeMint = async () => {
-    if (baggage.has('feeMint')) {
-      return baggage.get('feeMint');
-    }
-
-    const feeMintTemp = await zcf.registerFeeMint(
-      'Fee',
-      privateArgs.feeMintAccess,
-    );
-    baggage.init('feeMint', feeMintTemp);
-    return feeMintTemp;
-  };
-  trace('awaiting takeFeeMint');
-  const feeMint = await takeFeeMint();
   const storageNode = await privateArgs.storageNode;
+
+  trace('awaiting feeMint');
+  const { feeMint } = await provideAll(baggage, {
+    feeMint: () => zcf.registerFeeMint('Fee', privateArgs.feeMintAccess),
+  });
+
   const makeAssetReserveKit = await prepareAssetReserveKit(baggage, {
     feeMint,
     makeRecorderKit,
@@ -90,7 +91,7 @@ export const start = async (zcf, privateArgs, baggage) => {
     privateArgs.initialPoserInvitation,
     {},
     privateArgs.storageNode,
-    privateArgs.marshaller,
+    cachingMarshaller,
   );
 
   const { governorFacet } = makeDurableGovernorFacet(
@@ -127,8 +128,10 @@ harden(start);
  * @property {() => Promise<Invitation<ShortfallReporter>>} makeShortfallReportingInvitation
  */
 
-/** @typedef {Awaited<ReturnType<typeof start>>['publicFacet']} AssetReservePublicFacet */
+/** @typedef {EReturn<typeof start>['publicFacet']} AssetReservePublicFacet */
 /**
- * @typedef {Awaited<ReturnType<typeof start>>['creatorFacet']} AssetReserveCreatorFacet
+ * @typedef {EReturn<typeof start>['creatorFacet']} AssetReserveCreatorFacet
  *   the creator facet for the governor
  */
+
+/** @typedef {ContractOf<typeof start>} ReserveContract */

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: {
@@ -21,6 +21,20 @@ export function prepareAssetReserveKit(baggage: import("@agoric/vat-data").Bagga
          */
         burnFeesToReduceShortfall(reduction: Amount<"nat">): void;
     };
+    withdrawalHandler: {
+        handle(seat: any): Promise<string>;
+    };
+    withdrawalFacet: {
+        Withdraw(): Promise<globalThis.Invitation<any, undefined>>;
+    };
+    repeatableWithdrawalHandler: {
+        /**
+         * @param {ZCFSeat} seat
+         */
+        handle(seat: ZCFSeat): {
+            invitationMakers: Partial<any>;
+        };
+    };
     machine: {
         /**
          * @param {Issuer} issuer
@@ -29,12 +43,17 @@ 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<Invitation<import("@endo/exo").Guarded<{
+        makeShortfallReportingInvitation(): Promise<globalThis.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<{
+            invitationMakers: Partial<any>;
+        }, undefined>>;
+        revokeOutstandingWithdrawalInvitations(): void;
     };
     /**
      * XXX missing governance public methods
@@ -42,7 +61,7 @@ export function prepareAssetReserveKit(baggage: import("@agoric/vat-data").Bagga
      */
     public: {
         /** Anyone can deposit any assets to the reserve */
-        makeAddCollateralInvitation(): Promise<Invitation<string, never>>;
+        makeAddCollateralInvitation(): Promise<globalThis.Invitation<string, never>>;
         getPublicTopics(): {
             metrics: import("@agoric/zoe/src/contractSupport").PublicTopic<MetricsNotification>;
         };
@@ -70,5 +89,18 @@ export type MetricsNotification = {
      */
     totalFeeBurned: Amount<"nat">;
 };
-export type AssetReserveKit = ReturnType<Awaited<ReturnType<typeof prepareAssetReserveKit>>>;
+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';
+import type { Amount } from '@agoric/ertp';
+import type { ZCFSeat } from '@agoric/zoe';
+import type { Issuer } from '@agoric/ertp';
+import type { AmountKeywordRecord } from '@agoric/zoe/src/zoeService/types.js';
+import type { EReturn } from '@endo/far';
 //# sourceMappingURL=assetReserveKit.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"assetReserveKit.d.ts","sourceRoot":"","sources":["assetReserveKit.js"],"names":[],"mappings":"AAqCO,gDARI,OAAO,kBAAkB,EAAE,OAAO,kDAClC;IACN,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IACxB,eAAe,EAAE,OAAO,6CAA6C,EAAE,eAAe,CAAC;IACvF,WAAW,EAAE,WAAW,CAAC;IACzB,GAAG,EAAE,GAAG,CAAC;CACV;;QAoEI,2BAA2B;kCAAf,KAAK;QAUjB;;;WAGG;gCAFQ,KAAK,WACL,OAAO;;;;QAqBlB;;;WAGG;6CAFQ,MAAM,CAAC,KAAK,CAAC,GACX,IAAI;;;QA6BjB;;;WAGG;0BAFQ,MAAM,WACN,MAAM;QAmBjB,8DAA8D;;;YA2D9D,uCAAuC;oDAA3B,MAAM,CAAC,KAAK,CAAC;YAWzB,uCAAuC;kDAA3B,MAAM,CAAC,KAAK,CAAC;;;IArD3B;;;OAGG;;QAED,mDAAmD;;;;;;;QAqCnD,uCAAuC;gDAA3B,MAAM,CAAC,KAAK,CAAC;QAWzB,uCAAuC;8CAA3B,MAAM,CAAC,KAAK,CAAC;;KA8BhC;;iBA3Qa,mBAAmB;;;;;sBACnB,MAAM,CAAC,KAAK,CAAC;;;;oBAEb,MAAM,CAAC,KAAK,CAAC;;;;oBACb,MAAM,CAAC,KAAK,CAAC;;8BAyQb,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAC,CAAC"}
+{"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

@@ -1,3 +1,4 @@
+// @ts-check
 import { Fail, q } from '@endo/errors';
 import { AmountMath, AmountShape, IssuerShape } from '@agoric/ertp';
 import { makeTracer } from '@agoric/internal';
@@ -7,14 +8,27 @@ import {
   makeRecorderTopic,
   TopicsRecordShape,
 } from '@agoric/zoe/src/contractSupport/topics.js';
-import { AmountKeywordRecordShape } from '@agoric/zoe/src/typeGuards.js';
+import {
+  AmountKeywordRecordShape,
+  OfferHandlerI,
+} from '@agoric/zoe/src/typeGuards.js';
 import { E } from '@endo/eventual-send';
 import { UnguardedHelperI } from '@agoric/internal/src/typeGuards.js';
+import { prepareRevocableMakerKit } from '@agoric/base-zone/zone-helpers.js';
+import { makeDurableZone } from '@agoric/zone/durable.js';
 
 const trace = makeTracer('ReserveKit', true);
 
 /**
- * @import {TypedPattern} from '@agoric/internal';
+ * @import {EReturn} from '@endo/far';
+ * @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';
  */
 
 /**
@@ -27,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
  */
@@ -43,6 +57,40 @@ export const prepareAssetReserveKit = async (
   const feeKit = feeMint.getIssuerRecord();
   const emptyAmount = AmountMath.makeEmpty(feeKit.brand);
 
+  const zone = makeDurableZone(baggage);
+
+  // Durable revocation bookkeeping for the revocable single and repeatable
+  // invitations.
+  /** @type {SetStore<{ revoke: () => boolean }>} */
+  const outstandingRevokers = zone.setStore('outstandingRevokers');
+
+  const { makeRevocableKit: makeRevocableWithdrawalFacet } =
+    prepareRevocableMakerKit(zone, 'WithdrawalFacet', ['Withdraw']);
+
+  const { makeRevocableKit: makeRevocableWithdrawalHandler } =
+    prepareRevocableMakerKit(zone, 'WithdrawalHandler', ['handle'], {
+      extraMethods: {
+        /**
+         * Add some additional cleanup to avoid proliferation of revokers for
+         * spent invitations.
+         *
+         * @param {ZCFSeat} seat
+         * @param {never} offerArgs
+         */
+        handle(seat, offerArgs) {
+          const { revoker } = this.facets;
+          // We remove our outstanding revoker because we are consumed by Zoe
+          // and cannot be used again.
+          if (this.state.underlying === undefined) {
+            Fail`${q('WithdrawalHandler_caretaker')} revoked`;
+          }
+
+          outstandingRevokers.delete(revoker);
+          return this.state.underlying.handle(seat, offerArgs);
+        },
+      },
+    });
+
   const makeAssetReserveKitInternal = prepareExoClassKit(
     baggage,
     'AssetReserveKit',
@@ -51,10 +99,18 @@ export const prepareAssetReserveKit = async (
       governedApis: M.interface('AssetReserve governedApis', {
         burnFeesToReduceShortfall: M.call(AmountShape).returns(),
       }),
+      withdrawalFacet: M.interface('AssetReserve withdrawalFacet', {
+        Withdraw: M.call().returns(M.promise()),
+      }),
+      withdrawalHandler: OfferHandlerI,
+      repeatableWithdrawalHandler: OfferHandlerI,
       machine: M.interface('AssetReserve machine', {
         addIssuer: M.call(IssuerShape, M.string()).returns(M.promise()),
         getAllocations: M.call().returns(AmountKeywordRecordShape),
         makeShortfallReportingInvitation: M.call().returns(M.promise()),
+        makeSingleWithdrawalInvitation: M.call().returns(M.promise()),
+        makeRepeatableWithdrawalInvitation: M.call().returns(M.promise()),
+        revokeOutstandingWithdrawalInvitations: M.call().returns(),
       }),
       public: M.interface('AssetReserve public', {
         makeAddCollateralInvitation: M.call().returns(M.promise()),
@@ -65,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.
@@ -163,6 +219,44 @@ export const prepareAssetReserveKit = async (
           facets.helper.writeMetrics();
         },
       },
+      withdrawalHandler: {
+        async handle(seat) {
+          const { collateralSeat } = this.state;
+          const { helper } = this.facets;
+          const { want } = seat.getProposal();
+
+          // COMMIT POINT
+          // UNTIL #10684: ability to terminate an incarnation w/o terminating the contract
+          zcf.atomicRearrange(harden([[collateralSeat, seat, want]]));
+
+          helper.writeMetrics();
+          seat.exit();
+
+          trace('withdrew collateral', want);
+          return 'withdrew Collateral from the Reserve';
+        },
+      },
+      withdrawalFacet: {
+        Withdraw() {
+          const { revoker, revocable: handler } =
+            makeRevocableWithdrawalHandler(this.facets.withdrawalHandler);
+          outstandingRevokers.add(revoker);
+          // @ts-expect-error Argument of type Guarded<
+          return zcf.makeInvitation(handler, 'Withdraw Collateral');
+        },
+      },
+      repeatableWithdrawalHandler: {
+        /**
+         * @param {ZCFSeat} seat
+         */
+        handle(seat) {
+          seat.exit();
+          const { revoker, revocable: invitationMakers } =
+            makeRevocableWithdrawalFacet(this.facets.withdrawalFacet);
+          outstandingRevokers.add(revoker);
+          return harden({ invitationMakers });
+        },
+      },
       machine: {
         // add makeRedeemLiquidityTokensInvitation later. For now just store them
         /**
@@ -202,6 +296,22 @@ export const prepareAssetReserveKit = async (
             'getFacetForReportingShortfalls',
           );
         },
+
+        makeSingleWithdrawalInvitation() {
+          return this.facets.withdrawalFacet.Withdraw();
+        },
+
+        makeRepeatableWithdrawalInvitation() {
+          const handler = this.facets.repeatableWithdrawalHandler;
+          return zcf.makeInvitation(handler, 'Repeatable Withdraw Collateral');
+        },
+
+        revokeOutstandingWithdrawalInvitations() {
+          for (const revoker of outstandingRevokers.keys()) {
+            revoker.revoke();
+          }
+          outstandingRevokers.clear();
+        },
       },
       /**
        * XXX missing governance public methods
@@ -288,4 +398,4 @@ export const prepareAssetReserveKit = async (
   return makeAssetReserveKit;
 };
 harden(prepareAssetReserveKit);
-/** @typedef {ReturnType<Awaited<ReturnType<typeof prepareAssetReserveKit>>>} AssetReserveKit */
+/** @typedef {EReturn<EReturn<typeof prepareAssetReserveKit>>} AssetReserveKit */

package/src/reserve/params.d.ts

@@ -1,10 +1,16 @@
-export function makeReserveTerms(poserInvitationAmount: any, timer: any): {
-    timer: any;
+/**
+ * @import {AdminFacet, ContractOf, InvitationAmount, ZCFMint} from '@agoric/zoe';
+ */
+/**
+ * @param {InvitationAmount} poserInvitationAmount
+ */
+export function makeReserveTerms(poserInvitationAmount: InvitationAmount): {
     governedParams: {
         Electorate: {
             type: "invitation";
-            value: any;
+            value: import("@agoric/ertp").SetAmount<import("@agoric/zoe").InvitationDetails>;
         };
     };
 };
+import type { InvitationAmount } from '@agoric/zoe';
 //# sourceMappingURL=params.d.ts.map

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

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

package/src/reserve/params.js

@@ -2,8 +2,14 @@
 
 import { CONTRACT_ELECTORATE, ParamTypes } from '@agoric/governance';
 
-const makeReserveTerms = (poserInvitationAmount, timer) => ({
-  timer,
+/**
+ * @import {AdminFacet, ContractOf, InvitationAmount, ZCFMint} from '@agoric/zoe';
+ */
+
+/**
+ * @param {InvitationAmount} poserInvitationAmount
+ */
+const makeReserveTerms = poserInvitationAmount => ({
   governedParams: harden({
     [CONTRACT_ELECTORATE]: {
       type: ParamTypes.INVITATION,

package/src/vaultFactory/burn.d.ts

@@ -1,2 +1,2 @@
-export function paymentFromZCFMint(zcf: ZCF, zcfMint: ZCFMint, amount: Amount): Promise<globalThis.Payment<any>>;
+export function paymentFromZCFMint(zcf: ZCF, zcfMint: ZCFMint, amount: Amount): Promise<globalThis.Payment<any, any>>;
 //# 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,oCAOhB"}
+{"version":3,"file":"burn.d.ts","sourceRoot":"","sources":["burn.js"],"names":[],"mappings":"AAWO,wCAJI,GAAG,WACH,OAAO,UACP,MAAM,yCAOhB"}

package/src/vaultFactory/burn.js

@@ -1,6 +1,6 @@
 // @jessie-check
 
-/// <reference types="@agoric/zoe/exported" />
+/// <reference types="@agoric/zoe/exported.js" />
 
 import { E } from '@endo/eventual-send';
 

package/src/vaultFactory/liquidation.d.ts

@@ -1,14 +1,14 @@
-export function setWakeupsForNextAuction(auctioneerPublicFacet: ERef<import("../auction/auctioneer.js").AuctioneerPublicFacet>, timer: ERef<TimerService>, priceLockWaker: TimerWaker, liquidationWaker: TimerWaker, reschedulerWaker: TimerWaker): Promise<void>;
+export function setWakeupsForNextAuction(auctioneerPublicFacet: ERef<AuctioneerPublicFacet>, timer: ERef<TimerService>, priceLockWaker: TimerWaker, liquidationWaker: TimerWaker, reschedulerWaker: TimerWaker): Promise<void>;
 export function liquidationResults(debt: Amount<"nat">, minted: Amount<"nat">): {
     overage: Amount<"nat">;
     shortfall: Amount<"nat">;
 };
-export function watchForGovernanceChange(auctioneerPublicFacet: ERef<import("../auction/auctioneer.js").AuctioneerPublicFacet>, timer: ERef<TimerService>, reschedulerWaker: TimerWaker): void;
+export function watchForGovernanceChange(auctioneerPublicFacet: ERef<AuctioneerPublicFacet>, timer: ERef<TimerService>, reschedulerWaker: TimerWaker): void;
 export function getLiquidatableVaults(zcf: ZCF, collateralizationDetails: {
     quote: PriceQuote;
     interest: Ratio;
     margin: Ratio;
-}, prioritizedVaults: ReturnType<typeof import("./prioritizedVaults.js").makePrioritizedVaults>, liquidatingVaults: SetStore<Vault>, debtBrand: Brand<"nat">, collateralBrand: Brand<"nat">): {
+}, prioritizedVaults: ReturnType<typeof makePrioritizedVaults>, liquidatingVaults: SetStore<Vault>, debtBrand: Brand<"nat">, collateralBrand: Brand<"nat">): {
     vaultData: MapStore<Vault, {
         collateralAmount: Amount<"nat">;
         debtAmount: Amount<"nat">;
@@ -17,7 +17,11 @@ export function getLiquidatableVaults(zcf: ZCF, collateralizationDetails: {
     totalCollateral: Amount<"nat">;
     liqSeat: ZCFSeat;
 };
+import type { AuctioneerPublicFacet } from '../auction/auctioneer.js';
 import type { TimerService } from '@agoric/time';
 import type { TimerWaker } from '@agoric/time';
 import type { PriceQuote } from '@agoric/zoe/tools/types.js';
+import type { makePrioritizedVaults } from './prioritizedVaults.js';
+import type { SetStore } from '@agoric/store';
+import type { MapStore } from '@agoric/store';
 //# sourceMappingURL=liquidation.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"liquidation.d.ts","sourceRoot":"","sources":["liquidation.js"],"names":[],"mappings":"AAoJO,gEAPI,IAAI,CAAC,OAAO,0BAA0B,EAAE,qBAAqB,CAAC,SAC9D,IAAI,CAAC,YAAY,CAAC,kBAClB,UAAU,oBACV,UAAU,oBACV,UAAU,GACR,OAAO,CAAC,IAAI,CAAC,CAqCzB;AAQM,yCAJI,MAAM,CAAC,KAAK,CAAC,UACb,MAAM,CAAC,KAAK,CAAC,GACX;IAAE,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,CAAA;CAAE,CAYhE;AAWM,gEALI,IAAI,CAAC,OAAO,0BAA0B,EAAE,qBAAqB,CAAC,SAC9D,IAAI,CAAC,YAAY,CAAC,oBAClB,UAAU,GACR,IAAI,CA0BhB;AAwBM,2CArBI,GAAG,4BAEX;IAA6C,KAAK,EAA1C,UAAU;IACsB,QAAQ,EAAxC,KAAK;IAC2B,MAAM,EAAtC,KAAK;CACb,qBAAQ,UAAU,CACpB,cAAkB,wBAAwB,EAAE,qBAAqB,CAC9D,qBACO,QAAQ,CAAC,KAAK,CAAC,aACf,KAAK,CAAC,KAAK,CAAC,mBACZ,KAAK,CAAC,KAAK,CAAC,GACV;IACR,SAAS,EAAE,QAAQ,CACvB,KAAW,EACX;QAAQ,gBAAgB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC,KAAK,CAAC,CAAA;KAAE,CAC/D,CAAC;IACF,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAC/B,OAAO,EAAE,OAAO,CAAC;CAClB,CAiDH;kCArS+B,cAAc;gCAChB,cAAc;gCAGkD,4BAA4B"}
+{"version":3,"file":"liquidation.d.ts","sourceRoot":"","sources":["liquidation.js"],"names":[],"mappings":"AAwJO,gEAPI,IAAI,CAAC,qBAAqB,CAAC,SAC3B,IAAI,CAAC,YAAY,CAAC,kBAClB,UAAU,oBACV,UAAU,oBACV,UAAU,GACR,OAAO,CAAC,IAAI,CAAC,CAqCzB;AAQM,yCAJI,MAAM,CAAC,KAAK,CAAC,UACb,MAAM,CAAC,KAAK,CAAC,GACX;IAAE,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,CAAA;CAAE,CAYhE;AAWM,gEALI,IAAI,CAAC,qBAAqB,CAAC,SAC3B,IAAI,CAAC,YAAY,CAAC,oBAClB,UAAU,GACR,IAAI,CA0BhB;AAsBM,2CAnBI,GAAG,4BAEX;IAA6C,KAAK,EAA1C,UAAU;IACsB,QAAQ,EAAxC,KAAK;IAC2B,MAAM,EAAtC,KAAK;CACb,qBAAQ,UAAU,CAAC,4BAA4B,CAAC,qBACxC,SAAS,KAAK,CAAC,aACf,KAAK,CAAC,KAAK,CAAC,mBACZ,KAAK,CAAC,KAAK,CAAC,GACV;IACR,SAAS,EAAE,SACf,KAAW,EACX;QAAQ,gBAAgB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC,KAAK,CAAC,CAAA;KAAE,CAC/D,CAAC;IACF,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAC/B,OAAO,EAAE,OAAO,CAAC;CAClB,CAiDH;2CAjSuC,0BAA0B;kCAJH,cAAc;gCAAd,cAAc;gCAChD,4BAA4B;2CAIjB,wBAAwB;8BAN3B,eAAe;8BAAf,eAAe"}

package/src/vaultFactory/liquidation.js

@@ -12,11 +12,15 @@ import { makeCancelTokenMaker } from '../auction/util.js';
 
 const trace = makeTracer('LIQ');
 
-/** @import {TimerService} from '@agoric/time' */
-/** @import {TimerWaker} from '@agoric/time' */
-/** @import {CancelToken} from '@agoric/time' */
-/** @import {RelativeTimeRecord} from '@agoric/time' */
-/** @import {PriceAuthority, PriceDescription, PriceQuote, PriceQuoteValue, PriceQuery,} from '@agoric/zoe/tools/types.js'; */
+/**
+ * @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/math.d.ts

@@ -1,5 +1,5 @@
 export function calculateMinimumCollateralization(liquidationMargin: Ratio, liquidationPadding: Ratio): Ratio;
-export function minimumPrice(quoteA: PriceQuote, quoteB?: PriceQuote | undefined): Ratio;
+export function minimumPrice(quoteA: PriceQuote, quoteB?: PriceQuote): Ratio;
 export function maxDebtForVault(quoteAmount: PriceQuote, liquidationMargin: Ratio, liquidationPadding: Ratio): Amount<"nat">;
 export function calculateDebtCosts(currentDebt: Amount<"nat">, give: Amount<"nat">, want: Amount<"nat">, debtFee: Ratio): {
     newDebt: import("@agoric/ertp").NatAmount;

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,oCAER,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":"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"}

package/src/vaultFactory/math.js

@@ -12,7 +12,7 @@ import {
   ceilMultiplyBy,
   floorDivideBy,
   ratioGTE,
-} from '@agoric/zoe/src/contractSupport/ratio.js';
+} from '@agoric/ertp/src/ratio.js';
 import { priceFrom } from '../auction/util.js';
 import { addSubtract } from '../contractSupport.js';