@agoric/inter-protocol 0.17.0-u20.0 → 0.17.0-u21.0

package/src/provisionPoolKit.js

@@ -15,6 +15,7 @@ import {
   makeScalarBigMapStore,
   makeScalarBigSetStore,
 } from '@agoric/vat-data';
+import { makeAtomicProvider, makeScalarMapStore } from '@agoric/store';
 import { PowerFlags } from '@agoric/vats/src/walletFlags.js';
 import {
   PublicTopicShape,
@@ -149,6 +150,20 @@ export const prepareProvisionPoolKit = (
   { makeRecorderKit, params, poolBank, zcf, makeBridgeProvisionTool },
 ) => {
   const zoe = zcf.getZoeService();
+  const ephemeralPurses = makeScalarMapStore('fundingPurseForBrand');
+  const purseProvider = makeAtomicProvider(ephemeralPurses);
+  const getFundingPurseForBrand = async poolBrand => {
+    await null;
+    try {
+      const purse = await purseProvider.provideAsync(poolBrand, brand =>
+        E(poolBank).getPurse(brand),
+      );
+      return purse;
+    } catch (err) {
+      trace(`🚨 could not get purse for brand ${poolBrand}`, err);
+      throw err;
+    }
+  };
 
   const makeProvisionPoolKitInternal = zone.exoClassKit(
     'ProvisionPoolKit',
@@ -180,7 +195,7 @@ export const prepareProvisionPoolKit = (
     },
     /**
      * @param {object} opts
-     * @param {Purse<'nat'>} opts.fundPurse
+     * @param {Purse<'nat'>} [opts.fundPurse]
      * @param {Brand<'nat'>} opts.poolBrand
      * @param {StorageNode} opts.metricsNode
      */
@@ -335,35 +350,43 @@ export const prepareProvisionPoolKit = (
           );
           facets.helper.publishMetrics();
         },
+        /**
+         * @param {Amount} amount
+         * @param {ERef<Purse>} srcPurse
+         */
+        async onPoolDeposit(amount, srcPurse) {
+          const { helper } = this.facets;
+          const { brandToPSM, poolBrand } = this.state;
+
+          const { brand } = amount;
+          if (AmountMath.isEmpty(amount) || brand === poolBrand) {
+            return;
+          }
+
+          // `amount` doesn't match the current `poolBrand`, so we need to swap
+          // it.
+          if (!brandToPSM.has(brand)) {
+            console.error('funds arrived but no PSM instance', brand);
+            return;
+          }
+          const instance = brandToPSM.get(brand);
+          const payment = E(srcPurse).withdraw(amount);
+          await helper.swap(payment, amount, instance).catch(async reason => {
+            console.error(X`swap failed: ${reason}`);
+            const resolvedPayment = await payment;
+            return E(srcPurse).deposit(resolvedPayment);
+          });
+        },
         /**
          * @param {ERef<Purse>} exchangePurse
          * @param {ERef<Brand>} brand
          */
         watchCurrentAmount(exchangePurse, brand) {
-          const {
-            state: { brandToPSM, poolBrand },
-            facets: { helper },
-          } = this;
-
+          const { helper } = this.facets;
           void observeNotifier(E(exchangePurse).getCurrentAmountNotifier(), {
             updateState: async amount => {
               trace('provisionPool balance update', amount);
-              if (AmountMath.isEmpty(amount) || amount.brand === poolBrand) {
-                return;
-              }
-              if (!brandToPSM.has(brand)) {
-                console.error('funds arrived but no PSM instance', brand);
-                return;
-              }
-              const instance = brandToPSM.get(brand);
-              const payment = E(exchangePurse).withdraw(amount);
-              await helper
-                .swap(payment, amount, instance)
-                .catch(async reason => {
-                  console.error(X`swap failed: ${reason}`);
-                  const resolvedPayment = await payment;
-                  return E(exchangePurse).deposit(resolvedPayment);
-                });
+              await helper.onPoolDeposit(amount, exchangePurse);
             },
             fail: reason => {
               if (isUpgradeDisconnection(reason)) {
@@ -429,40 +452,50 @@ export const prepareProvisionPoolKit = (
           );
         },
         /**
+         * @param {Brand<'nat'>} poolBrand
          * @param {object} [options]
          * @param {MetricsNotification} [options.metrics]
          */
-        start({ metrics } = {}) {
-          const {
-            state: { poolBrand },
-            facets: { helper },
-          } = this;
+        start(poolBrand, { metrics } = {}) {
+          const { facets, state } = this;
+          const { helper } = facets;
+          const lastPoolBrand = state.poolBrand;
 
-          // Must match. poolBrand is from durable state and the param is from
-          // the contract, so it technically can change between incarnations.
-          // That would be a severe bug.
+          // The PerAccountInitialAmount param must use the correct brand for
+          // this incarnation.
           AmountMath.coerce(poolBrand, params.getPerAccountInitialAmount());
 
-          void helper.watchAssetSubscription();
-
+          // Restore old metrics.
           if (metrics) {
-            // Restore state.
-            // we publishMetrics() below
             const {
               walletsProvisioned,
               totalMintedProvided,
               totalMintedConverted,
             } = metrics;
             assert.typeof(walletsProvisioned, 'bigint');
-            AmountMath.coerce(poolBrand, totalMintedProvided);
-            AmountMath.coerce(poolBrand, totalMintedConverted);
-            Object.assign(this.state, {
+            AmountMath.coerce(lastPoolBrand, totalMintedProvided);
+            AmountMath.coerce(lastPoolBrand, totalMintedConverted);
+            Object.assign(state, {
               walletsProvisioned,
               totalMintedProvided,
               totalMintedConverted,
             });
             helper.publishMetrics();
           }
+
+          // Update as needed when `poolBrand` changes.
+          if (poolBrand !== lastPoolBrand) {
+            state.poolBrand = poolBrand;
+            state.fundPurse = undefined;
+            void getFundingPurseForBrand(poolBrand).then(purse =>
+              helper.updateFundPurse(purse, poolBrand),
+            );
+            state.totalMintedProvided = AmountMath.makeEmpty(poolBrand);
+            state.totalMintedConverted = AmountMath.makeEmpty(poolBrand);
+            helper.publishMetrics();
+          }
+
+          void helper.watchAssetSubscription();
         },
         /**
          * @param {ERef<Payment>} payIn
@@ -470,10 +503,13 @@ export const prepareProvisionPoolKit = (
          * @param {PsmInstance} instance
          */
         async swap(payIn, amount, instance) {
+          await null;
+          const { facets, state } = this;
+          const { helper } = facets;
           const {
-            facets: { helper },
-            state: { fundPurse },
-          } = this;
+            poolBrand,
+            fundPurse = await getFundingPurseForBrand(poolBrand),
+          } = state;
           const psmPub = E(zoe).getPublicFacet(instance);
           const proposal = harden({ give: { In: amount } });
           const invitation = E(psmPub).makeWantMintedInvitation();
@@ -483,19 +519,31 @@ export const prepareProvisionPoolKit = (
           helper.onTrade(rxd);
           return rxd;
         },
+        /**
+         * @param {Purse<'nat'>} purse
+         * @param {Brand<'nat'>} brand
+         */
+        updateFundPurse(purse, brand) {
+          const { state } = this;
+          if (brand !== state.poolBrand || state.fundPurse) return;
+          state.fundPurse = purse;
+        },
       },
       forHandler: {
         onProvisioned() {
-          const { state, facets } = this;
+          const { facets, state } = this;
           state.walletsProvisioned += 1n;
           facets.helper.publishMetrics();
         },
         /** @param {ERef<Bank>} destBank */
         async sendInitialPayment(destBank) {
+          await null;
+          const { facets, state } = this;
+          const { helper } = facets;
           const {
-            facets: { helper },
-            state: { fundPurse, poolBrand },
-          } = this;
+            poolBrand,
+            fundPurse = await getFundingPurseForBrand(poolBrand),
+          } = state;
           const perAccountInitialAmount = /** @type {Amount<'nat'>} */ (
             params.getPerAccountInitialAmount()
           );
@@ -545,7 +593,7 @@ export const prepareProvisionPoolKit = (
    * @returns {Promise<ProvisionPoolKit>}
    */
   const makeProvisionPoolKit = async ({ poolBrand, storageNode }) => {
-    const fundPurse = await E(poolBank).getPurse(poolBrand);
+    const fundPurse = await getFundingPurseForBrand(poolBrand);
     const metricsNode = await E(storageNode).makeChildNode('metrics');
 
     return makeProvisionPoolKitInternal({

package/src/psm/psm.d.ts

@@ -51,7 +51,7 @@ export function start(zcf: ZCF<GovernanceTerms<{
             } & {
                 Electorate: "invitation";
             }>;
-        } & import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
+        } & RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
             get: () => import("@agoric/governance/src/contractGovernance/typedParamManager.js").TypedParamManager<{
                 GiveMintedFee: "ratio";
                 MintLimit: "amount";

package/src/psm/psm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"psm.d.ts","sourceRoot":"","sources":["psm.js"],"names":[],"mappings":"AAqCA;;;;;;GAMG;AAEH;;;GAGG;AAEH;;;;;;;;;;;;;GAaG;AAEH;;;GAGG;AAEH,2BAA2B;AAC3B,mBADW,YAAY,CAkCrB;AAsBK,2BAlBI,GAAG,CACT,eAAe,CAAC;IACd,aAAa,EAAE,OAAO,CAAC;IACvB,aAAa,EAAE,OAAO,CAAC;IACvB,SAAS,EAAE,QAAQ,CAAC;CACrB,CAAC,GAAG;IACH,WAAW,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IAC1B,eAAe,EAAE,KAAK,CAAC;CACxB,CACF,eACO;IACN,aAAa,EAAE,aAAa,CAAC;IAC7B,sBAAsB,EAAE,UAAU,CAAC;IACnC,WAAW,EAAE,WAAW,CAAC;IACzB,UAAU,EAAE,UAAU,CAAC;CACxB,WACO,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+CAsUqM,cAAc;kDAAuE,cAAc;;;;;;;;;;;;GAJzT;;;;;;;;;;uBAzYa,MAAM,CAAC,KAAK,CAAC;;;;;uBAEb,MAAM,CAAC,KAAK,CAAC;;;;;oBAEb,MAAM,CAAC,KAAK,CAAC;;;;;yBAEb,MAAM,CAAC,KAAK,CAAC;;;;;yBAEb,MAAM,CAAC,KAAK,CAAC;;6BAoYb,QAAQ,OAAO,KAAK,CAAb,CAAe,aAAa,CAAC;kCAlZU,aAAa;mCAAb,aAAa;6BAoB/C,kBAAkB;kCApBgB,aAAa;6BAD/C,WAAW"}
+{"version":3,"file":"psm.d.ts","sourceRoot":"","sources":["psm.js"],"names":[],"mappings":"AAqCA;;;;;;GAMG;AAEH;;;GAGG;AAEH;;;;;;;;;;;;;GAaG;AAEH;;;GAGG;AAEH,2BAA2B;AAC3B,mBADW,YAAY,CAkCrB;AAsBK,2BAlBI,GAAG,CACT,eAAe,CAAC;IACd,aAAa,EAAE,OAAO,CAAC;IACvB,aAAa,EAAE,OAAO,CAAC;IACvB,SAAS,EAAE,QAAQ,CAAC;CACrB,CAAC,GAAG;IACH,WAAW,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IAC1B,eAAe,EAAE,KAAK,CAAC;CACxB,CACF,eACO;IACN,aAAa,EAAE,aAAa,CAAC;IAC7B,sBAAsB,EAAE,UAAU,CAAC;IACnC,WAAW,EAAE,WAAW,CAAC;IACzB,UAAU,EAAE,UAAU,CAAC;CACxB,WACO,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkUjB;;;;;;;;;;uBAzYa,MAAM,CAAC,KAAK,CAAC;;;;;uBAEb,MAAM,CAAC,KAAK,CAAC;;;;;oBAEb,MAAM,CAAC,KAAK,CAAC;;;;;yBAEb,MAAM,CAAC,KAAK,CAAC;;;;;yBAEb,MAAM,CAAC,KAAK,CAAC;;6BAoYb,QAAQ,OAAO,KAAK,CAAb,CAAe,aAAa,CAAC;kCAlZU,aAAa;mCAAb,aAAa;6BAoB/C,kBAAkB;kCApBgB,aAAa;6BAD/C,WAAW"}

package/src/reserve/assetReserve.d.ts

@@ -16,6 +16,11 @@ export function start(zcf: ZCF<GovernanceTerms<{}> & {
             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<{
@@ -43,9 +48,11 @@ export type AssetReservePublicFacet = EReturn<typeof start>["publicFacet"];
  * the creator facet for the governor
  */
 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 { 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":"AAiBA,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;kCAnHsB,aAAa;mCAAb,aAAa;6BAkB1D,kBAAkB;gCAlB2B,aAAa;6BAD3D,WAAW"}
+{"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"}

package/src/reserve/assetReserve.js

@@ -10,6 +10,7 @@ import { prepareAssetReserveKit } from './assetReserveKit.js';
 
 /**
  * @import {EReturn} from '@endo/far';
+ * @import {ContractOf} from '@agoric/zoe/src/zoeService/utils.js';
  * @import {Allocation, ContractMeta, FeeMintAccess, Installation} from '@agoric/zoe';
  */
 
@@ -128,3 +129,5 @@ harden(start);
  * @typedef {EReturn<typeof start>['creatorFacet']} AssetReserveCreatorFacet
  *   the creator facet for the governor
  */
+
+/** @typedef {ContractOf<typeof start>} ReserveContract */

package/src/reserve/assetReserveKit.d.ts

@@ -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
@@ -35,6 +49,11 @@ export function prepareAssetReserveKit(baggage: import("@agoric/vat-data").Bagga
             /** @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
@@ -72,5 +91,13 @@ export type MetricsNotification = {
 };
 export type AssetReserveKit = EReturn<EReturn<typeof prepareAssetReserveKit>>;
 import type { ZCFMint } from '@agoric/zoe';
+import type { StorageNode } from '@agoric/internal/src/lib-chainStorage.js';
+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":"AAuCO,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;;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,QAAQ,QAAQ,OAAO,sBAAsB,CAAC,CAAC;6BAlRO,aAAa;6BAFvD,WAAW"}
+{"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"}

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,16 +8,25 @@ 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 {EReturn} from '@endo/far';
  * @import {TypedPattern} from '@agoric/internal';
- * @import {AdminFacet, ContractOf, InvitationAmount, ZCFMint} from '@agoric/zoe';
+ * @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';
  */
 
 /**
@@ -45,6 +55,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',
@@ -53,10 +97,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()),
@@ -165,6 +217,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
         /**
@@ -204,6 +294,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

package/src/vaultFactory/liquidation.d.ts

@@ -20,4 +20,6 @@ export function getLiquidatableVaults(zcf: ZCF, collateralizationDetails: {
 import type { TimerService } from '@agoric/time';
 import type { TimerWaker } from '@agoric/time';
 import type { PriceQuote } from '@agoric/zoe/tools/types.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":"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,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;kCAnS8D,cAAc;gCAAd,cAAc;gCAChD,4BAA4B;8BAFpB,eAAe;8BAAf,eAAe"}

package/src/vaultFactory/liquidation.js

@@ -12,11 +12,11 @@ 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';
+ */
 
 const makeCancelToken = makeCancelTokenMaker('liq');
 

package/src/vaultFactory/orderedVaultStore.d.ts

@@ -90,4 +90,5 @@ export function makeOrderedVaultStore(store: MapStore<string, Vault>): {
     }>>;
 };
 import type { Vault } from './vault.js';
+import type { MapStore } from '@agoric/store';
 //# sourceMappingURL=orderedVaultStore.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"orderedVaultStore.d.ts","sourceRoot":"","sources":["orderedVaultStore.js"],"names":[],"mappings":"AAiBO,6CADK,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC;wBAGtB,MAAM,SACN,KAAK;uBAWL,MAAM,KACJ,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oCAkCuv1B,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oCAAjB,iBAAiB;;EAD3x1B;2BApDwB,YAAY"}
+{"version":3,"file":"orderedVaultStore.d.ts","sourceRoot":"","sources":["orderedVaultStore.js"],"names":[],"mappings":"AAmBO,6CADK,SAAS,MAAM,EAAE,KAAK,CAAC;wBAGtB,MAAM,SACN,KAAK;uBAWL,MAAM,KACJ,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAiCnB;2BApDuB,YAAY;8BADT,eAAe"}

package/src/vaultFactory/orderedVaultStore.js

@@ -11,8 +11,10 @@ import { fromVaultKey, toVaultKey } from './storeUtils.js';
  * debt-to-collateral come first.)
  */
 
-/** @import {Vault} from './vault.js' */
-/** @import {CompositeKey} from './storeUtils.js' */
+/**
+ * @import {MapStore} from '@agoric/store';
+ * @import {Vault} from './vault.js';
+ */
 
 /** @param {MapStore<string, Vault>} store */
 export const makeOrderedVaultStore = store => {

package/src/vaultFactory/params.d.ts

@@ -1,4 +1,7 @@
-/** @import {PriceAuthority, PriceDescription, PriceQuote, PriceQuoteValue, PriceQuery,} from '@agoric/zoe/tools/types.js'; */
+/**
+ * @import {MapStore} from '@agoric/store';
+ * @import {PriceAuthority} from '@agoric/zoe/tools/types.js';
+ */
 export const CHARGING_PERIOD_KEY: "ChargingPeriod";
 export const RECORDING_PERIOD_KEY: "RecordingPeriod";
 export const DEBT_LIMIT_KEY: "DebtLimit";

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

@@ -1 +1 @@
-{"version":3,"file":"params.d.ts","sourceRoot":"","sources":["params.js"],"names":[],"mappings":"AAiBA,8HAA8H;AAE9H,kCAAmC,gBAAgB,CAAC;AACpD,mCAAoC,iBAAiB,CAAC;AAEtD,6BAA8B,WAAW,CAAC;AAC1C,qCAAsC,mBAAmB,CAAC;AAC1D,sCAAuC,oBAAoB,CAAC;AAC5D,sCAAuC,oBAAoB,CAAC;AAC5D,gCAAiC,cAAc,CAAC;AAChD,2BAA4B,SAAS,CAAC;AACtC,mCAAoC,gBAAgB,CAAC;AACrD,uCAAwC,qBAAqB,CAAC;AAC9D,gCAAiC,cAAc,CAAC;;;;;;;AAkEzC,oDAHI,OAAO,kBAAkB,EAAE,kBAAkB,CAAC,2BAA2B,CAAC,oGAC1E,uBAAuB;;;;;;;GAoB9B;AACJ,4EAA4E;AAE5E,iEAYE;AAeK,8MAZI;IACN,0BAA0B,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAC1C,cAAc,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,cAAc,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;IACrC,KAAK,EAAE,IAAI,CAAC,OAAO,cAAc,EAAE,YAAY,CAAC,CAAC;IACjD,kBAAkB,EAAE,uBAAuB,CAAC;IAC5C,cAAc,EAAE,cAAc,CAAC;IAC/B,yBAAyB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IACzC,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA0BH;AAeM,mDAJI,OAAO,kBAAkB,EAAE,OAAO,cAClC,IAAI,CAAC,UAAU,CAAC,yBAChB,MAAM,CAAC,MAAM,EAAE,0BAA0B,CAAC;IA+CjD;;;;OAIG;2BAHQ,KAAK,eACL,WAAW,sBACX,uBAAuB;;;;;;;;IAOlC,2BAA2B;eAAf,KAAK;;;;;;;;EAKpB;kCAhKY,OAAO,gEAAgE,EAAE,uBAAuB,CACtG,UAAU,CAAC,OAAO,uBAAuB,CAAC,CAC3C;gCA8BQ,UAAU,CAAC,OAAO,qBAAqB,CAAC;yCAwDxC,uBAAuB,GAAG;IAAE,KAAK,EAAE,KAAK,CAAA;CAAE;oCA1JsC,4BAA4B;AAyB1H;;;;;;GAMG;AACH,qEANW,MAAM,CAAC,KAAK,CAAC,kBACb,MAAM,CAAC,KAAK,CAAC,6BACb,MAAM,CAAC,KAAK,CAAC,gBACb,MAAM,kBACN,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;EAgCxB"}
+{"version":3,"file":"params.d.ts","sourceRoot":"","sources":["params.js"],"names":[],"mappings":"AAiBA;;;GAGG;AAEH,kCAAmC,gBAAgB,CAAC;AACpD,mCAAoC,iBAAiB,CAAC;AAEtD,6BAA8B,WAAW,CAAC;AAC1C,qCAAsC,mBAAmB,CAAC;AAC1D,sCAAuC,oBAAoB,CAAC;AAC5D,sCAAuC,oBAAoB,CAAC;AAC5D,gCAAiC,cAAc,CAAC;AAChD,2BAA4B,SAAS,CAAC;AACtC,mCAAoC,gBAAgB,CAAC;AACrD,uCAAwC,qBAAqB,CAAC;AAC9D,gCAAiC,cAAc,CAAC;;;;;;;AAkEzC,oDAHI,OAAO,kBAAkB,EAAE,kBAAkB,CAAC,2BAA2B,CAAC,oGAC1E,uBAAuB;;;;;;;GAoB9B;AACJ,4EAA4E;AAE5E,iEAYE;AAeK,8MAZI;IACN,0BAA0B,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAC1C,cAAc,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,cAAc,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;IACrC,KAAK,EAAE,IAAI,CAAC,OAAO,cAAc,EAAE,YAAY,CAAC,CAAC;IACjD,kBAAkB,EAAE,uBAAuB,CAAC;IAC5C,cAAc,EAAE,cAAc,CAAC;IAC/B,yBAAyB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IACzC,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA0BH;AAeM,mDAJI,OAAO,kBAAkB,EAAE,OAAO,cAClC,IAAI,CAAC,UAAU,CAAC,yBAChB,MAAM,CAAC,MAAM,EAAE,0BAA0B,CAAC;IA+CjD;;;;OAIG;2BAHQ,KAAK,eACL,WAAW,sBACX,uBAAuB;;;;;;;;IAOlC,2BAA2B;eAAf,KAAK;;;;;;;;EAKpB;kCAhKY,OAAO,gEAAgE,EAAE,uBAAuB,CACtG,UAAU,CAAC,OAAO,uBAAuB,CAAC,CAC3C;gCA8BQ,UAAU,CAAC,OAAO,qBAAqB,CAAC;yCAwDxC,uBAAuB,GAAG;IAAE,KAAK,EAAE,KAAK,CAAA;CAAE;oCA3JvB,4BAA4B;AA0B7D;;;;;;GAMG;AACH,qEANW,MAAM,CAAC,KAAK,CAAC,kBACb,MAAM,CAAC,KAAK,CAAC,6BACb,MAAM,CAAC,KAAK,CAAC,gBACb,MAAM,kBACN,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;EAgCxB"}

package/src/vaultFactory/params.js

@@ -15,7 +15,10 @@ import { subtractRatios } from '@agoric/ertp/src/ratio.js';
 import { makeTracer } from '@agoric/internal/src/index.js';
 import { amountPattern, ratioPattern } from '../contractSupport.js';
 
-/** @import {PriceAuthority, PriceDescription, PriceQuote, PriceQuoteValue, PriceQuery,} from '@agoric/zoe/tools/types.js'; */
+/**
+ * @import {MapStore} from '@agoric/store';
+ * @import {PriceAuthority} from '@agoric/zoe/tools/types.js';
+ */
 
 export const CHARGING_PERIOD_KEY = 'ChargingPeriod';
 export const RECORDING_PERIOD_KEY = 'RecordingPeriod';

package/src/vaultFactory/prioritizedVaults.d.ts

@@ -93,7 +93,7 @@ export function makePrioritizedVaults(store: MapStore<string, Vault>): {
         margin: any;
         quote: any;
         interest: any;
-    }) => globalThis.MapStore<string, import("@endo/exo").Guarded<{
+    }) => MapStore<string, import("@endo/exo").Guarded<{
         getVaultSeat(): globalThis.ZCFSeat;
         initVaultKit(seat: ZCFSeat, storageNode: StorageNode): Promise<{
             publicSubscribers: {
@@ -136,7 +136,7 @@ export function makePrioritizedVaults(store: MapStore<string, Vault>): {
         getNormalizedDebt(): import("./storeUtils.js").NormalizedDebt;
     }>>;
     countVaultsBelow: (crKey: any) => number;
-} & import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
+} & RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
     addVault: (vaultId: VaultId, vault: Vault) => string;
     entries: (keyPatt?: Pattern, valuePatt?: Pattern) => Iterable<[string, import("@endo/exo").Guarded<{
         getVaultSeat(): globalThis.ZCFSeat;
@@ -230,7 +230,7 @@ export function makePrioritizedVaults(store: MapStore<string, Vault>): {
         margin: any;
         quote: any;
         interest: any;
-    }) => globalThis.MapStore<string, import("@endo/exo").Guarded<{
+    }) => MapStore<string, import("@endo/exo").Guarded<{
         getVaultSeat(): globalThis.ZCFSeat;
         initVaultKit(seat: ZCFSeat, storageNode: StorageNode): Promise<{
             publicSubscribers: {
@@ -275,5 +275,6 @@ export function makePrioritizedVaults(store: MapStore<string, Vault>): {
     countVaultsBelow: (crKey: any) => number;
 }>;
 import type { Vault } from './vault.js';
+import type { MapStore } from '@agoric/store';
 import type { NormalizedDebt } from './storeUtils.js';
 //# sourceMappingURL=prioritizedVaults.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"prioritizedVaults.d.ts","sourceRoot":"","sources":["prioritizedVaults.js"],"names":[],"mappings":"AAuCO,+CAHI,KAAK,GACH,KAAK,CAMf;AASI,6CAHI,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC;wBAsDrB,OAAO,SACP,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oCA+Ci2wB,iBAAiB;;;oCA7Ev3wB,cAAc,iBACd,MAAM,CAAC,KAAK,CAAC,WACb,MAAM;wBAlBJ,KAAK,GAAG,SAAS;uBA0BnB,MAAM,KACJ,KAAK;uCAQP,cAAc,iBACd,MAAM,CAAC,KAAK,CAAC,WACb,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oCAwDg2wB,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oCAAjB,iBAAiB;;;;wBAhDv3wB,OAAO,SACP,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oCA+Ci2wB,iBAAiB;;;oCA7Ev3wB,cAAc,iBACd,MAAM,CAAC,KAAK,CAAC,WACb,MAAM;wBAlBJ,KAAK,GAAG,SAAS;uBA0BnB,MAAM,KACJ,KAAK;uCAQP,cAAc,iBACd,MAAM,CAAC,KAAK,CAAC,WACb,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oCAwDg2wB,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oCAAjB,iBAAiB;;;GADn4wB;2BAvIwB,YAAY;oCACH,iBAAiB"}
+{"version":3,"file":"prioritizedVaults.d.ts","sourceRoot":"","sources":["prioritizedVaults.js"],"names":[],"mappings":"AA0CO,+CAHI,KAAK,GACH,KAAK,CAMf;AASI,6CAHI,SAAS,MAAM,EAAE,KAAK,CAAC;wBAsDrB,OAAO,SACP,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oCA9BL,cAAc,iBACd,MAAM,CAAC,KAAK,CAAC,WACb,MAAM;wBAlBJ,KAAK,GAAG,SAAS;uBA0BnB,MAAM,KACJ,KAAK;uCAQP,cAAc,iBACd,MAAM,CAAC,KAAK,CAAC,WACb,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;wBAQN,OAAO,SACP,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oCA9BL,cAAc,iBACd,MAAM,CAAC,KAAK,CAAC,WACb,MAAM;wBAlBJ,KAAK,GAAG,SAAS;uBA0BnB,MAAM,KACJ,KAAK;uCAQP,cAAc,iBACd,MAAM,CAAC,KAAK,CAAC,WACb,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuDlB;2BAxIuB,YAAY;8BADT,eAAe;oCAET,iBAAiB"}