@agoric/inter-protocol 0.17.0-u18.4 → 0.17.0-u18.6

package/src/provisionPoolKit.d.ts

@@ -1,268 +1,21 @@
-export function makeBridgeProvisionTool(sendInitialPayment: (depositBank: ERef<Bank>) => Promise<void>, onProvisioned: () => void): ({ bankManager, namesByAddressAdmin, walletFactory, }: ProvisionPoolKitReferences) => {
-    fromBridge: (obj: any) => Promise<void>;
-} & import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
-    fromBridge: (obj: any) => Promise<void>;
+export function prepareBridgeProvisionTool(zone: import("@agoric/zone").Zone): (bankManager?: any, walletFactory?: any, namesByAddressAdmin?: any, forHandler?: any) => import("@endo/exo").Guarded<{
+    fromBridge(obj: any): Promise<void>;
 }>;
-export function prepareProvisionPoolKit(baggage: import("@agoric/vat-data").Baggage, { makeRecorderKit, params, poolBank, zcf }: {
+export function prepareProvisionPoolKit(zone: import("@agoric/zone").Zone, { makeRecorderKit, params, poolBank, zcf, makeBridgeProvisionTool }: {
     makeRecorderKit: import("@agoric/zoe/src/contractSupport/recorder.js").MakeRecorderKit;
     params: any;
     poolBank: import("@endo/far").ERef<Bank>;
     zcf: ZCF;
+    makeBridgeProvisionTool: ReturnType<typeof prepareBridgeProvisionTool>;
 }): ({ poolBrand, storageNode }: {
     poolBrand: Brand<"nat">;
     storageNode: ERef<StorageNode>;
-}) => Promise<import("@endo/exo").GuardedKit<{
-    machine: {
-        /** @param {string[]} oldAddresses */
-        addRevivableAddresses(oldAddresses: string[]): void;
-        getWalletReviver(): import("@endo/exo").Guarded<{
-            /** @param {string} address */
-            reviveWallet(address: string): Promise<{
-                handleBridgeAction(actionCapData: import("@endo/marshal").CapData<string | null>, canSpend?: boolean | undefined): Promise<void>;
-                getDepositFacet(): import("@endo/exo").Guarded<{
-                    receive(payment: Payment): Promise<Amount>;
-                }>;
-                getOffersFacet(): import("@endo/exo").Guarded<{
-                    executeOffer(offerSpec: OfferSpec): Promise<void>;
-                    tryExitOffer(offerId: import("@agoric/smart-wallet/src/offers").OfferId): Promise<void>;
-                }>;
-                getCurrentSubscriber(): globalThis.Subscriber<import("@agoric/smart-wallet/src/smartWallet").CurrentWalletRecord>;
-                getUpdatesSubscriber(): globalThis.Subscriber<import("@agoric/smart-wallet/src/smartWallet").UpdateRecord>;
-                getPublicTopics(): {
-                    current: {
-                        description: string;
-                        subscriber: globalThis.Subscriber<import("@agoric/smart-wallet/src/smartWallet").CurrentWalletRecord>;
-                        storagePath: Promise<string>;
-                    };
-                    updates: {
-                        description: string;
-                        subscriber: globalThis.Subscriber<import("@agoric/smart-wallet/src/smartWallet").UpdateRecord>;
-                        storagePath: Promise<string>;
-                    };
-                };
-            } & import("../../../node_modules/@endo/exo/src/get-interface").GetInterfaceGuard<{
-                handleBridgeAction(actionCapData: import("@endo/marshal").CapData<string | null>, canSpend?: boolean | undefined): Promise<void>;
-                getDepositFacet(): import("@endo/exo").Guarded<{
-                    receive(payment: Payment): Promise<Amount>;
-                }>;
-                getOffersFacet(): import("@endo/exo").Guarded<{
-                    executeOffer(offerSpec: OfferSpec): Promise<void>;
-                    tryExitOffer(offerId: import("@agoric/smart-wallet/src/offers").OfferId): Promise<void>;
-                }>;
-                getCurrentSubscriber(): globalThis.Subscriber<import("@agoric/smart-wallet/src/smartWallet").CurrentWalletRecord>;
-                getUpdatesSubscriber(): globalThis.Subscriber<import("@agoric/smart-wallet/src/smartWallet").UpdateRecord>;
-                getPublicTopics(): {
-                    current: {
-                        description: string;
-                        subscriber: globalThis.Subscriber<import("@agoric/smart-wallet/src/smartWallet").CurrentWalletRecord>;
-                        storagePath: Promise<string>;
-                    };
-                    updates: {
-                        description: string;
-                        subscriber: globalThis.Subscriber<import("@agoric/smart-wallet/src/smartWallet").UpdateRecord>;
-                        storagePath: Promise<string>;
-                    };
-                };
-            }> & import("@endo/eventual-send").RemotableBrand<{}, {
-                handleBridgeAction(actionCapData: import("@endo/marshal").CapData<string | null>, canSpend?: boolean | undefined): Promise<void>;
-                getDepositFacet(): import("@endo/exo").Guarded<{
-                    receive(payment: Payment): Promise<Amount>;
-                }>;
-                getOffersFacet(): import("@endo/exo").Guarded<{
-                    executeOffer(offerSpec: OfferSpec): Promise<void>;
-                    tryExitOffer(offerId: import("@agoric/smart-wallet/src/offers").OfferId): Promise<void>;
-                }>;
-                getCurrentSubscriber(): globalThis.Subscriber<import("@agoric/smart-wallet/src/smartWallet").CurrentWalletRecord>;
-                getUpdatesSubscriber(): globalThis.Subscriber<import("@agoric/smart-wallet/src/smartWallet").UpdateRecord>;
-                getPublicTopics(): {
-                    current: {
-                        description: string;
-                        subscriber: globalThis.Subscriber<import("@agoric/smart-wallet/src/smartWallet").CurrentWalletRecord>;
-                        storagePath: Promise<string>;
-                    };
-                    updates: {
-                        description: string;
-                        subscriber: globalThis.Subscriber<import("@agoric/smart-wallet/src/smartWallet").UpdateRecord>;
-                        storagePath: Promise<string>;
-                    };
-                };
-            } & import("../../../node_modules/@endo/exo/src/get-interface").GetInterfaceGuard<{
-                handleBridgeAction(actionCapData: import("@endo/marshal").CapData<string | null>, canSpend?: boolean | undefined): Promise<void>;
-                getDepositFacet(): import("@endo/exo").Guarded<{
-                    receive(payment: Payment): Promise<Amount>;
-                }>;
-                getOffersFacet(): import("@endo/exo").Guarded<{
-                    executeOffer(offerSpec: OfferSpec): Promise<void>;
-                    tryExitOffer(offerId: import("@agoric/smart-wallet/src/offers").OfferId): Promise<void>;
-                }>;
-                getCurrentSubscriber(): globalThis.Subscriber<import("@agoric/smart-wallet/src/smartWallet").CurrentWalletRecord>;
-                getUpdatesSubscriber(): globalThis.Subscriber<import("@agoric/smart-wallet/src/smartWallet").UpdateRecord>;
-                getPublicTopics(): {
-                    current: {
-                        description: string;
-                        subscriber: globalThis.Subscriber<import("@agoric/smart-wallet/src/smartWallet").CurrentWalletRecord>;
-                        storagePath: Promise<string>;
-                    };
-                    updates: {
-                        description: string;
-                        subscriber: globalThis.Subscriber<import("@agoric/smart-wallet/src/smartWallet").UpdateRecord>;
-                        storagePath: Promise<string>;
-                    };
-                };
-            }>> & import("@endo/pass-style").RemotableObject>;
-            /**
-             * @param {string} address
-             * @returns {boolean} isRevive
-             */
-            ackWallet(address: string): boolean;
-        }>;
-        /** @param {ProvisionPoolKitReferences} erefs */
-        setReferences(erefs: ProvisionPoolKitReferences): Promise<void>;
-        makeHandler(): {
-            fromBridge: (obj: any) => Promise<void>;
-        } & import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
-            fromBridge: (obj: any) => Promise<void>;
-        }>;
-        /**
-         * @param {Brand} brand
-         * @param {PsmInstance} instance
-         */
-        initPSM(brand: Brand, instance: PsmInstance): void;
-    };
-    walletReviver: {
-        /** @param {string} address */
-        reviveWallet(address: string): Promise<{
-            handleBridgeAction(actionCapData: import("@endo/marshal").CapData<string | null>, canSpend?: boolean | undefined): Promise<void>;
-            getDepositFacet(): import("@endo/exo").Guarded<{
-                receive(payment: Payment): Promise<Amount>;
-            }>;
-            getOffersFacet(): import("@endo/exo").Guarded<{
-                executeOffer(offerSpec: OfferSpec): Promise<void>;
-                tryExitOffer(offerId: import("@agoric/smart-wallet/src/offers").OfferId): Promise<void>;
-            }>;
-            getCurrentSubscriber(): globalThis.Subscriber<import("@agoric/smart-wallet/src/smartWallet").CurrentWalletRecord>;
-            getUpdatesSubscriber(): globalThis.Subscriber<import("@agoric/smart-wallet/src/smartWallet").UpdateRecord>;
-            getPublicTopics(): {
-                current: {
-                    description: string;
-                    subscriber: globalThis.Subscriber<import("@agoric/smart-wallet/src/smartWallet").CurrentWalletRecord>;
-                    storagePath: Promise<string>;
-                };
-                updates: {
-                    description: string;
-                    subscriber: globalThis.Subscriber<import("@agoric/smart-wallet/src/smartWallet").UpdateRecord>;
-                    storagePath: Promise<string>;
-                };
-            };
-        } & import("../../../node_modules/@endo/exo/src/get-interface").GetInterfaceGuard<{
-            handleBridgeAction(actionCapData: import("@endo/marshal").CapData<string | null>, canSpend?: boolean | undefined): Promise<void>;
-            getDepositFacet(): import("@endo/exo").Guarded<{
-                receive(payment: Payment): Promise<Amount>;
-            }>;
-            getOffersFacet(): import("@endo/exo").Guarded<{
-                executeOffer(offerSpec: OfferSpec): Promise<void>;
-                tryExitOffer(offerId: import("@agoric/smart-wallet/src/offers").OfferId): Promise<void>;
-            }>;
-            getCurrentSubscriber(): globalThis.Subscriber<import("@agoric/smart-wallet/src/smartWallet").CurrentWalletRecord>;
-            getUpdatesSubscriber(): globalThis.Subscriber<import("@agoric/smart-wallet/src/smartWallet").UpdateRecord>;
-            getPublicTopics(): {
-                current: {
-                    description: string;
-                    subscriber: globalThis.Subscriber<import("@agoric/smart-wallet/src/smartWallet").CurrentWalletRecord>;
-                    storagePath: Promise<string>;
-                };
-                updates: {
-                    description: string;
-                    subscriber: globalThis.Subscriber<import("@agoric/smart-wallet/src/smartWallet").UpdateRecord>;
-                    storagePath: Promise<string>;
-                };
-            };
-        }> & import("@endo/eventual-send").RemotableBrand<{}, {
-            handleBridgeAction(actionCapData: import("@endo/marshal").CapData<string | null>, canSpend?: boolean | undefined): Promise<void>;
-            getDepositFacet(): import("@endo/exo").Guarded<{
-                receive(payment: Payment): Promise<Amount>;
-            }>;
-            getOffersFacet(): import("@endo/exo").Guarded<{
-                executeOffer(offerSpec: OfferSpec): Promise<void>;
-                tryExitOffer(offerId: import("@agoric/smart-wallet/src/offers").OfferId): Promise<void>;
-            }>;
-            getCurrentSubscriber(): globalThis.Subscriber<import("@agoric/smart-wallet/src/smartWallet").CurrentWalletRecord>;
-            getUpdatesSubscriber(): globalThis.Subscriber<import("@agoric/smart-wallet/src/smartWallet").UpdateRecord>;
-            getPublicTopics(): {
-                current: {
-                    description: string;
-                    subscriber: globalThis.Subscriber<import("@agoric/smart-wallet/src/smartWallet").CurrentWalletRecord>;
-                    storagePath: Promise<string>;
-                };
-                updates: {
-                    description: string;
-                    subscriber: globalThis.Subscriber<import("@agoric/smart-wallet/src/smartWallet").UpdateRecord>;
-                    storagePath: Promise<string>;
-                };
-            };
-        } & import("../../../node_modules/@endo/exo/src/get-interface").GetInterfaceGuard<{
-            handleBridgeAction(actionCapData: import("@endo/marshal").CapData<string | null>, canSpend?: boolean | undefined): Promise<void>;
-            getDepositFacet(): import("@endo/exo").Guarded<{
-                receive(payment: Payment): Promise<Amount>;
-            }>;
-            getOffersFacet(): import("@endo/exo").Guarded<{
-                executeOffer(offerSpec: OfferSpec): Promise<void>;
-                tryExitOffer(offerId: import("@agoric/smart-wallet/src/offers").OfferId): Promise<void>;
-            }>;
-            getCurrentSubscriber(): globalThis.Subscriber<import("@agoric/smart-wallet/src/smartWallet").CurrentWalletRecord>;
-            getUpdatesSubscriber(): globalThis.Subscriber<import("@agoric/smart-wallet/src/smartWallet").UpdateRecord>;
-            getPublicTopics(): {
-                current: {
-                    description: string;
-                    subscriber: globalThis.Subscriber<import("@agoric/smart-wallet/src/smartWallet").CurrentWalletRecord>;
-                    storagePath: Promise<string>;
-                };
-                updates: {
-                    description: string;
-                    subscriber: globalThis.Subscriber<import("@agoric/smart-wallet/src/smartWallet").UpdateRecord>;
-                    storagePath: Promise<string>;
-                };
-            };
-        }>> & import("@endo/pass-style").RemotableObject>;
-        /**
-         * @param {string} address
-         * @returns {boolean} isRevive
-         */
-        ackWallet(address: string): boolean;
-    };
-    helper: {
-        publishMetrics(): void;
-        onTrade(converted: any): void;
-        onSendFunds(provided: any): void;
-        onProvisioned(): void;
-        /** @param {ERef<Bank>} destBank */
-        sendInitialPayment(destBank: ERef<Bank>): Promise<void>;
-        /**
-         * @param {ERef<Purse>} exchangePurse
-         * @param {ERef<Brand>} brand
-         */
-        watchCurrentAmount(exchangePurse: ERef<Purse>, brand: ERef<Brand>): void;
-        watchAssetSubscription(): Promise<undefined>;
-        /**
-         * @param {object} [options]
-         * @param {MetricsNotification} [options.metrics]
-         */
-        start({ metrics }?: {
-            metrics?: MetricsNotification | undefined;
-        } | undefined): void;
-        /**
-         * @param {ERef<Payment>} payIn
-         * @param {Amount} amount
-         * @param {PsmInstance} instance
-         */
-        swap(payIn: ERef<Payment>, amount: Amount, instance: PsmInstance): Promise<import("@agoric/ertp").NatAmount>;
-    };
-    public: {
-        getPublicTopics(): {
-            metrics: import("@agoric/zoe/src/contractSupport").PublicTopic<MetricsNotification>;
-        };
-    };
-}>>;
+}) => Promise<ProvisionPoolKit>;
+export type ProvisionPoolKit = {
+    machine: any;
+    helper: any;
+    public: any;
+};
 export type PsmInstance = import("@agoric/zoe/src/zoeService/utils.js").Instance<(zcf: ZCF<GovernanceTerms<{
     GiveMintedFee: "ratio";
     WantMintedFee: "ratio";

package/src/provisionPoolKit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"provisionPoolKit.d.ts","sourceRoot":"","sources":["provisionPoolKit.js"],"names":[],"mappings":"AAuEO,4DAHI,CAAC,WAAW,EAAE,KAAK,IAAI,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,iBAC1C,MAAM,IAAI,0DAGP,0BAA0B;;;;GA+BvC;AAWM,iDARI,OAAO,kBAAkB,EAAE,OAAO,8CAClC;IACN,eAAe,EAAE,OAAO,6CAA6C,EAAE,eAAe,CAAC;IACvF,MAAM,EAAE,GAAG,CAAC;IACZ,QAAQ,EAAE,OAAO,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IACzC,GAAG,EAAE,GAAG,CAAC;CACV,gCA0YC;IAA2B,SAAS,EAA5B,KAAK,CAAC,KAAK,CAAC;IACY,WAAW,EAAnC,KAAK,WAAW,CAAC;CAC3B;;QA7TK,qCAAqC;4CAAzB,MAAM,EAAE;;YA+CpB,8BAA8B;kCAAlB,MAAM;yDA4R2/gB,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YAvQ5hhB;;;eAGG;+BAFQ,MAAM,GACJ,OAAO;;QA9DpB,gDAAgD;6BAApC,0BAA0B;;;;;;QA6BtC;;;WAGG;uBAFQ,KAAK,YACL,WAAW;;;QAQtB,8BAA8B;8BAAlB,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAqBlB;;;WAGG;2BAFQ,MAAM,GACJ,OAAO;;;;;;;QAgDpB,mCAAmC;qCAAvB,KAAK,IAAI,CAAC;QA0BtB;;;WAGG;0CAFQ,KAAK,KAAK,CAAC,SACX,KAAK,KAAK,CAAC;;QA2FtB;;;WAGG;;;;QAiCH;;;;WAIG;oBAHQ,KAAK,OAAO,CAAC,UACb,MAAM,YACN,WAAW;;;;;;;IAsD7B;0BAjeY,OAAO,qCAAqC,EAAE,QAAQ,CAClE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+CA6WsB,cAAc;kDAEnB,cAAF;;;;;;;;;;;;EA/W0C,CACtD;;iBAKU,KAAK,WAAW,CAAC;yBACjB,KAAK,OAAO,cAAc,EAAE,SAAS,CAAC;mBACtC,KACb,OAAW,6CAA6C,EAAE,wBAAwB,CAAC,cAAc,CAAC,CAC/F;;;;;;;;;;wBAMU,MAAM;;;;;yBACN,OAAO,KAAK,CAAC;;;;;0BAEb,OAAO,KAAK,CAAC;;0BAxBS,8BAA8B;0BAF3C,WAAW;4BACT,2BAA2B;iCAChB,8BAA8B"}
+{"version":3,"file":"provisionPoolKit.d.ts","sourceRoot":"","sources":["provisionPoolKit.js"],"names":[],"mappings":"AA6EO,iDAFI,OAAO,cAAc,EAAE,IAAI;;GAyCnC;AAYI,8CATI,OAAO,cAAc,EAAE,IAAI,uEAC3B;IACN,eAAe,EAAE,OAAO,6CAA6C,EAAE,eAAe,CAAC;IACvF,MAAM,EAAE,GAAG,CAAC;IACZ,QAAQ,EAAE,OAAO,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IACzC,GAAG,EAAE,GAAG,CAAC;IACT,uBAAuB,EAAE,UAAU,CAAC,OAAO,0BAA0B,CAAC,CAAC;CACxE,gCA6YC;IAA2B,SAAS,EAA5B,KAAK,CAAC,KAAK,CAAC;IACY,WAAW,EAAnC,KAAK,WAAW,CAAC;CACzB,KAAU,OAAO,CAAC,gBAAgB,CAAC,CAcvC;+BApfY;IACR,OAAO,EAAE,GAAG,CAAC;IACb,MAAM,EAAE,GAAG,CAAC;IACZ,MAAM,EAAE,GAAG,CAAC;CACb;0BAIS,OAAO,qCAAqC,EAAE,QAAQ,CAClE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+CAsWa,cAAW;kDAEX,cACR;;;;;;;;;;;;EAzWoD,CACtD;;iBAKU,KAAK,WAAW,CAAC;yBACjB,KAAK,OAAO,cAAc,EAAE,SAAS,CAAC;mBACtC,KACb,OAAW,6CAA6C,EAAE,wBAAwB,CAAC,cAAc,CAAC,CAC/F;;;;;;;;;;wBAMU,MAAM;;;;;yBACN,OAAO,KAAK,CAAC;;;;;0BAEb,OAAO,KAAK,CAAC;;0BAjCS,8BAA8B;0BAF3C,WAAW;4BACT,2BAA2B;iCAChB,8BAA8B"}

package/src/provisionPoolKit.js

@@ -1,7 +1,6 @@
 // @ts-check
 import { X, q, Fail } from '@endo/errors';
 import { E } from '@endo/far';
-import { Far } from '@endo/marshal';
 
 import { AmountMath, BrandShape } from '@agoric/ertp';
 import { deeplyFulfilledObject, makeTracer } from '@agoric/internal';
@@ -15,7 +14,6 @@ import {
   M,
   makeScalarBigMapStore,
   makeScalarBigSetStore,
-  prepareExoClassKit,
 } from '@agoric/vat-data';
 import { PowerFlags } from '@agoric/vats/src/walletFlags.js';
 import {
@@ -37,6 +35,15 @@ const FIRST_LOWER_NEAR_KEYWORD = /^[a-z][a-zA-Z0-9_$]*$/;
  * @import {Bank, BankManager} from '@agoric/vats/src/vat-bank.js'
  */
 
+// XXX when inferred, error TS2742: cannot be named without a reference to '../../../node_modules/@endo/exo/src/get-interface.js'. This is likely not portable. A type annotation is necessary.
+/**
+ * @typedef {{
+ *   machine: any;
+ *   helper: any;
+ *   public: any;
+ * }} ProvisionPoolKit
+ */
+
 /**
  * @typedef {import('@agoric/zoe/src/zoeService/utils.js').Instance<
  *   import('@agoric/inter-protocol/src/psm/psm.js').start
@@ -66,18 +73,22 @@ const FIRST_LOWER_NEAR_KEYWORD = /^[a-z][a-zA-Z0-9_$]*$/;
  * Given attenuated access to the funding purse, handle requests to provision
  * smart wallets.
  *
- * @param {(depositBank: ERef<Bank>) => Promise<void>} sendInitialPayment
- * @param {() => void} onProvisioned
+ * @param {import('@agoric/zone').Zone} zone
  */
-export const makeBridgeProvisionTool = (sendInitialPayment, onProvisioned) => {
-  /** @param {ProvisionPoolKitReferences} refs */
-  const makeBridgeHandler = ({
-    bankManager,
-    namesByAddressAdmin,
-    walletFactory,
-  }) =>
-    Far('provisioningHandler', {
-      fromBridge: async obj => {
+export const prepareBridgeProvisionTool = zone =>
+  zone.exoClass(
+    'smartWalletProvisioningHandler',
+    M.interface('ProvisionBridgeHandlerMaker', {
+      fromBridge: M.callWhen(M.record()).returns(),
+    }),
+    (bankManager, walletFactory, namesByAddressAdmin, forHandler) => ({
+      bankManager,
+      walletFactory,
+      namesByAddressAdmin,
+      forHandler,
+    }),
+    {
+      async fromBridge(obj) {
         obj.type === 'PLEASE_PROVISION' ||
           Fail`Unrecognized request ${obj.type}`;
         trace('PLEASE_PROVISION', obj);
@@ -85,9 +96,12 @@ export const makeBridgeProvisionTool = (sendInitialPayment, onProvisioned) => {
         powerFlags.includes(PowerFlags.SMART_WALLET) ||
           Fail`missing SMART_WALLET in powerFlags`;
 
+        const { bankManager, walletFactory, namesByAddressAdmin, forHandler } =
+          this.state;
+
         const bank = E(bankManager).getBankForAddress(address);
         // only proceed if we can provide funds
-        await sendInitialPayment(bank);
+        await forHandler.sendInitialPayment(bank);
 
         const [_, created] = await E(walletFactory).provideSmartWallet(
           address,
@@ -95,31 +109,30 @@ export const makeBridgeProvisionTool = (sendInitialPayment, onProvisioned) => {
           namesByAddressAdmin,
         );
         if (created) {
-          onProvisioned();
+          forHandler.onProvisioned();
         }
         trace(created ? 'provisioned' : 're-provisioned', address);
       },
-    });
-  return makeBridgeHandler;
-};
+    },
+  );
 
 /**
- * @param {import('@agoric/vat-data').Baggage} baggage
+ * @param {import('@agoric/zone').Zone} zone
  * @param {{
  *   makeRecorderKit: import('@agoric/zoe/src/contractSupport/recorder.js').MakeRecorderKit;
  *   params: any;
  *   poolBank: import('@endo/far').ERef<Bank>;
  *   zcf: ZCF;
+ *   makeBridgeProvisionTool: ReturnType<typeof prepareBridgeProvisionTool>;
  * }} powers
  */
 export const prepareProvisionPoolKit = (
-  baggage,
-  { makeRecorderKit, params, poolBank, zcf },
+  zone,
+  { makeRecorderKit, params, poolBank, zcf, makeBridgeProvisionTool },
 ) => {
   const zoe = zcf.getZoeService();
 
-  const makeProvisionPoolKitInternal = prepareExoClassKit(
-    baggage,
+  const makeProvisionPoolKitInternal = zone.exoClassKit(
     'ProvisionPoolKit',
     {
       machine: M.interface('ProvisionPoolKit machine', {
@@ -142,6 +155,7 @@ export const prepareProvisionPoolKit = (
         ackWallet: M.call(M.string()).returns(M.boolean()),
       }),
       helper: UnguardedHelperI,
+      forHandler: UnguardedHelperI,
       public: M.interface('ProvisionPoolKit public', {
         getPublicTopics: M.call().returns({ metrics: PublicTopicShape }),
       }),
@@ -208,23 +222,24 @@ export const prepareProvisionPoolKit = (
           const refs = await deeplyFulfilledObject(obj);
           Object.assign(this.state, refs);
         },
+        /** @returns {import('@agoric/vats').BridgeHandler} */
         makeHandler() {
           const { bankManager, namesByAddressAdmin, walletFactory } =
             this.state;
           if (!bankManager || !namesByAddressAdmin || !walletFactory) {
             throw Fail`must set references before handling requests`;
           }
-          const { helper } = this.facets;
-          // a bit obtuse but leave for backwards compatibility with tests
-          const innerMaker = makeBridgeProvisionTool(
-            bank => helper.sendInitialPayment(bank),
-            () => helper.onProvisioned(),
-          );
-          return innerMaker({
+
+          const { forHandler } = this.facets;
+
+          const provisionHandler = makeBridgeProvisionTool(
             bankManager,
-            namesByAddressAdmin,
             walletFactory,
-          });
+            namesByAddressAdmin,
+            forHandler,
+          );
+
+          return provisionHandler;
         },
         /**
          * @param {Brand} brand
@@ -302,37 +317,6 @@ export const prepareProvisionPoolKit = (
           );
           facets.helper.publishMetrics();
         },
-        onProvisioned() {
-          const { state, facets } = this;
-          state.walletsProvisioned += 1n;
-          facets.helper.publishMetrics();
-        },
-        /** @param {ERef<Bank>} destBank */
-        async sendInitialPayment(destBank) {
-          const {
-            facets: { helper },
-            state: { fundPurse, poolBrand },
-          } = this;
-          const perAccountInitialAmount = /** @type {Amount<'nat'>} */ (
-            params.getPerAccountInitialAmount()
-          );
-          const initialPmt = await E(fundPurse).withdraw(
-            perAccountInitialAmount,
-          );
-
-          const destPurse = E(destBank).getPurse(poolBrand);
-          return E(destPurse)
-            .deposit(initialPmt)
-            .then(amt => {
-              helper.onSendFunds(perAccountInitialAmount);
-              trace('provisionPool sent', amt);
-            })
-            .catch(reason => {
-              console.error(X`initial deposit failed: ${q(reason)}`);
-              void E(fundPurse).deposit(initialPmt);
-              throw reason;
-            });
-        },
         /**
          * @param {ERef<Purse>} exchangePurse
          * @param {ERef<Brand>} brand
@@ -482,6 +466,39 @@ export const prepareProvisionPoolKit = (
           return rxd;
         },
       },
+      forHandler: {
+        onProvisioned() {
+          const { state, facets } = this;
+          state.walletsProvisioned += 1n;
+          facets.helper.publishMetrics();
+        },
+        /** @param {ERef<Bank>} destBank */
+        async sendInitialPayment(destBank) {
+          const {
+            facets: { helper },
+            state: { fundPurse, poolBrand },
+          } = this;
+          const perAccountInitialAmount = /** @type {Amount<'nat'>} */ (
+            params.getPerAccountInitialAmount()
+          );
+          const initialPmt = await E(fundPurse).withdraw(
+            perAccountInitialAmount,
+          );
+
+          const destPurse = E(destBank).getPurse(poolBrand);
+          return E(destPurse)
+            .deposit(initialPmt)
+            .then(amt => {
+              helper.onSendFunds(perAccountInitialAmount);
+              trace('provisionPool sent', amt);
+            })
+            .catch(reason => {
+              console.error(X`initial deposit failed: ${q(reason)}`);
+              void E(fundPurse).deposit(initialPmt);
+              throw reason;
+            });
+        },
+      },
       public: {
         getPublicTopics() {
           return {
@@ -506,6 +523,7 @@ export const prepareProvisionPoolKit = (
    * @param {object} opts
    * @param {Brand<'nat'>} opts.poolBrand
    * @param {ERef<StorageNode>} opts.storageNode
+   * @returns {Promise<ProvisionPoolKit>}
    */
   const makeProvisionPoolKit = async ({ poolBrand, storageNode }) => {
     const fundPurse = await E(poolBank).getPurse(poolBrand);

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

@@ -1 +1 @@
-{"version":3,"file":"psm.d.ts","sourceRoot":"","sources":["psm.js"],"names":[],"mappings":"AAsCA;;;;;;GAMG;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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+CAwUyD,cAAc;kDAAuE,cAAc;;;;;;;;;;;;GAJ7K;;;;;;;;;;uBA3Ya,MAAM,CAAC,KAAK,CAAC;;;;;uBAEb,MAAM,CAAC,KAAK,CAAC;;;;;oBAEb,MAAM,CAAC,KAAK,CAAC;;;;;yBAEb,MAAM,CAAC,KAAK,CAAC;;;;;yBAEb,MAAM,CAAC,KAAK,CAAC;;6BAsYb,OAAO,CAAC,UAAU,CAAC,OAAO,KAAK,CAAC,CAAC,CAAC,aAAa,CAAC;6BAhYpC,kBAAkB"}
+{"version":3,"file":"psm.d.ts","sourceRoot":"","sources":["psm.js"],"names":[],"mappings":"AAqCA;;;;;;GAMG;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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+CAsU4F,cAAc;kDAAuE,cAAc;;;;;;;;;;;;GAJhN;;;;;;;;;;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,OAAO,CAAC,UAAU,CAAC,OAAO,KAAK,CAAC,CAAC,CAAC,aAAa,CAAC;6BA9XpC,kBAAkB"}

package/src/psm/psm.js

@@ -14,7 +14,6 @@ import {
 import { StorageNodeShape } from '@agoric/internal';
 import { M, prepareExo, provide } from '@agoric/vat-data';
 import {
-  atomicRearrange,
   atomicTransfer,
   ceilMultiplyBy,
   floorDivideBy,
@@ -273,8 +272,7 @@ export const start = async (zcf, privateArgs, baggage) => {
     const maxAnchor = floorMultiplyBy(afterFee, anchorPerMinted);
     AmountMath.isGTE(maxAnchor, wanted) ||
       Fail`wanted ${wanted} is more than ${given} minus fees ${fee}`;
-    atomicRearrange(
-      zcf,
+    zcf.atomicRearrange(
       harden([
         [seat, stage, { In: afterFee }, { Minted: afterFee }],
         [seat, feePool, { In: fee }, { Minted: fee }],
@@ -305,8 +303,7 @@ export const start = async (zcf, privateArgs, baggage) => {
       Fail`wanted ${wanted} is more than ${given} minus fees ${fee}`;
     mintMinted(asStable);
     try {
-      atomicRearrange(
-        zcf,
+      zcf.atomicRearrange(
         harden([
           [seat, anchorPool, { In: given }, { Anchor: given }],
           [stage, seat, { Minted: afterFee }, { Out: afterFee }],

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":"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;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,OAAO,CAAC,UAAU,CAAC,OAAO,KAAK,CAAC,CAAC,CAAC,aAAa,CAAC;;;;uCAEjD,OAAO,CAAC,UAAU,CAAC,OAAO,KAAK,CAAC,CAAC,CAAC,cAAc,CAAC;6BAjGnC,kBAAkB"}

package/src/reserve/assetReserve.js

@@ -57,22 +57,13 @@ export const start = async (zcf, privateArgs, baggage) => {
     privateArgs.marshaller,
   );
 
-  /** @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,

package/src/reserve/params.d.ts

@@ -1,9 +1,11 @@
-export function makeReserveTerms(poserInvitationAmount: any, timer: any): {
-    timer: any;
+/**
+ * @param {InvitationAmount} poserInvitationAmount
+ */
+export function makeReserveTerms(poserInvitationAmount: InvitationAmount): {
     governedParams: {
         Electorate: {
             type: "invitation";
-            value: any;
+            value: import("@agoric/ertp").SetAmount<InvitationDetails>;
         };
     };
 };

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;AACH,wDAFW,gBAAgB;;;;;;;EASzB"}

package/src/reserve/params.js

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

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"}