@agoric/inter-protocol 0.17.0-u19.2 → 0.17.0-u21.0

package/src/price/fluxAggregatorKit.d.ts

@@ -16,13 +16,13 @@ export function prepareFluxAggregatorKit(baggage: Baggage, zcf: ZCF<ChainlinkCon
          *
          * @param {string} oracleId unique per contract instance
          */
-        makeOracleInvitation(oracleId: string): Promise<Invitation<{
+        makeOracleInvitation(oracleId: string): Promise<globalThis.Invitation<{
             invitationMakers: {
                 /** @param {import('./roundsManager.js').PriceRound} result */
-                PushPrice(result: import("./roundsManager.js").PriceRound): Promise<Invitation<void, undefined>>;
-            } & import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
+                PushPrice(result: import("./roundsManager.js").PriceRound): Promise<globalThis.Invitation<void, undefined>>;
+            } & RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
                 /** @param {import('./roundsManager.js').PriceRound} result */
-                PushPrice(result: import("./roundsManager.js").PriceRound): Promise<Invitation<void, undefined>>;
+                PushPrice(result: import("./roundsManager.js").PriceRound): Promise<globalThis.Invitation<void, undefined>>;
             }>;
             oracle: import("@endo/exo").Guarded<{
                 pushPrice({ roundId: roundIdRaw, unitPrice: valueRaw, }: PriceDatum): Promise<void>;

package/src/price/roundsManager.d.ts

@@ -92,7 +92,7 @@ export function prepareRoundsManagerKit(baggage: any): (args_0: Readonly<import(
         }): ((priceQuery: any) => Promise<{
             quoteAmount: import("@agoric/ertp").SetAmount<PriceDescription>;
             quotePayment: globalThis.Payment<"set", PriceDescription>;
-        }> | undefined) & import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, (priceQuery: any) => Promise<{
+        }> | undefined) & RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, (priceQuery: any) => Promise<{
             quoteAmount: import("@agoric/ertp").SetAmount<PriceDescription>;
             quotePayment: globalThis.Payment<"set", PriceDescription>;
         }> | undefined>;

package/src/proposals/addAssetToVault.js

@@ -7,7 +7,7 @@ import { Far } from '@endo/marshal';
 import { AmountMath, AssetKind } from '@agoric/ertp';
 import { deeplyFulfilledObject } from '@agoric/internal';
 import { makeRatio } from '@agoric/zoe/src/contractSupport/index.js';
-import { parseRatio } from '@agoric/zoe/src/contractSupport/ratio.js';
+import { parseRatio } from '@agoric/ertp/src/ratio.js';
 import { E } from '@endo/far';
 import { Stable } from '@agoric/internal/src/tokens.js';
 import { TimeMath } from '@agoric/time/src/timeMath.js';

package/src/proposals/econ-behaviors.js

@@ -10,7 +10,19 @@ import { makeGovernedTerms as makeGovernedATerms } from '../auction/params.js';
 import { makeReserveTerms } from '../reserve/params.js';
 import { makeGovernedTerms as makeGovernedVFTerms } from '../vaultFactory/params.js';
 
-/** @import {StartedInstanceKit} from '@agoric/zoe/src/zoeService/utils.js' */
+/**
+ * @import {GovernorCreatorFacet, GovernanceFacetKit, GovernorStartedInstallationKit} from '@agoric/governance/src/types.js';
+ * @import {StartedInstanceKit} from '@agoric/zoe/src/zoeService/utils.js';
+ * @import {AdminFacet} from '@agoric/zoe';
+ */
+
+// Duplicated from vaultFactory/types-ambient.js to solve a CI problem.
+// Not worth refactoring to DRY because vaultFactory is going away.
+/**
+ * @typedef {object} InterestTiming
+ * @property {import('@agoric/time').RelativeTime} chargingPeriod in seconds
+ * @property {import('@agoric/time').RelativeTime} recordingPeriod in seconds
+ */
 
 const trace = makeTracer('RunEconBehaviors', true);
 
@@ -25,8 +37,10 @@ export const SECONDS_PER_WEEK = 7n * SECONDS_PER_DAY;
 /**
  * @typedef {object} PSMKit
  * @property {string} label
- * @property {Instance} psm
- * @property {Instance} psmGovernor
+ * @property {Instance<import('../psm/psm.js').start>} psm
+ * @property {Instance<
+ *   import('../../../governance/src/contractGovernor.js').start
+ * >} psmGovernor
  * @property {Awaited<
  *   ReturnType<
  *     Awaited<

package/src/proposals/upgrade-vaults.js

@@ -55,10 +55,10 @@ export const upgradeVaults = async (
 
   await priceAuthority8400;
 
+  /** @type {Instance<import('../auction/auctioneer.js').start>} */
   const auctionNewInstance = await auctionUpgradeNewInstance;
   auctionUpgradeNewInstanceProducer.reset();
   const publicFacet = E(zoe).getPublicFacet(auctionNewInstance);
-  /** @type {import('@agoric/inter-protocol/src/auction/scheduler.js').FullSchedule} */
   const schedules = await E(publicFacet).getSchedules();
   const now = await E(chainTimerService).getCurrentTimestamp();
   (schedules.nextAuctionSchedule &&
@@ -97,7 +97,6 @@ export const upgradeVaults = async (
     for (const kwd of Object.keys(vaultBrands)) {
       const collateralBrand = vaultBrands[kwd];
 
-      /** @type {any} */
       const governedParams = await E(directorPF).getGovernedParams({
         collateralBrand,
       });

package/src/provisionPool.d.ts

@@ -1,4 +1,9 @@
-/** @import {Marshal} from '@endo/marshal'; */
+/**
+ * @import {Marshal} from '@endo/marshal';
+ * @import {Amount, Brand, Payment, Purse} from '@agoric/ertp';
+ * @import {ContractMeta, Invitation, StandardTerms, ZCF} from '@agoric/zoe';
+ * @import {GovernanceTerms} from '@agoric/governance/src/types.js';
+ */
 /** @type {ContractMeta} */
 export const meta: ContractMeta;
 export function start(zcf: ZCF<ProvisionTerms>, privateArgs: {
@@ -16,14 +21,14 @@ export function start(zcf: ZCF<ProvisionTerms>, privateArgs: {
             } & {
                 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<{
                 PerAccountInitialAmount: "amount";
             } & {
                 Electorate: "invitation";
             }>;
         }>;
-        getInvitation: (name: any) => Promise<Invitation<unknown, undefined>>;
+        getInvitation: (name: any) => Promise<Invitation>;
         getLimitedCreatorFacet: () => any;
         getGovernedApis: () => GovernedApis;
         getGovernedApiNames: () => string[];
@@ -43,8 +48,8 @@ export function start(zcf: ZCF<ProvisionTerms>, privateArgs: {
         getUnknown: (name: string) => any;
         getSubscription: () => globalThis.StoredSubscription<globalThis.GovernanceSubscriptionState>;
         getGovernedParams: () => globalThis.ERef<globalThis.ParamStateRecord>;
-        getMetrics(): any;
-        getPublicTopics(): any;
+        getMetrics(): Promise<any>;
+        getPublicTopics(): Promise<any>;
     }>;
 }>;
 /**
@@ -53,5 +58,12 @@ export function start(zcf: ZCF<ProvisionTerms>, privateArgs: {
 export type ProvisionTerms = StandardTerms & GovernanceTerms<{
     PerAccountInitialAmount: "amount";
 }>;
+import type { ContractMeta } from '@agoric/zoe';
+import type { ZCF } from '@agoric/zoe';
+import type { Invitation } from '@agoric/zoe';
 import type { Marshal } from '@endo/marshal';
+import type { Amount } from '@agoric/ertp';
+import type { Brand } from '@agoric/ertp';
+import type { StandardTerms } from '@agoric/zoe';
+import type { GovernanceTerms } from '@agoric/governance/src/types.js';
 //# sourceMappingURL=provisionPool.d.ts.map

package/src/provisionPool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"provisionPool.d.ts","sourceRoot":"","sources":["provisionPool.js"],"names":[],"mappings":"AAoBA,8CAA8C;AAE9C,2BAA2B;AAC3B,mBADW,YAAY,CAerB;AAsBK,2BAbI,GAAG,CAAC,cAAc,CAAC,eACnB;IACN,QAAQ,EAAE,OAAO,WAAW,EAAE,IAAI,CACtC,OAAa,8BAA8B,EAAE,IAAI,CAC5C,CAAC;IACF,sBAAsB,EAAE,UAAU,CAAC;IACnC,WAAW,EAAE,WAAW,CAAC;IACzB,UAAU,EAAE,QAAQ,GAAG,CAAC,CAAC;IACzB,eAAe,CAAC,EAAE,OAAO,uBAAuB,EAAE,mBAAmB,CAAC;IACtE,sBAAsB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;CAC7D,WACO,OAAO,kBAAkB,EAAE,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+CA2EktT,cAAc;kDAAuE,cAAc;;;;;;;GAHj2T;;;;6BAxFY,aAAa,GACrB,eAAe,CAAC;IACd,uBAAuB,EAAE,QAAQ,CAAC;CACnC,CAAC;6BAxBoB,eAAe"}
+{"version":3,"file":"provisionPool.d.ts","sourceRoot":"","sources":["provisionPool.js"],"names":[],"mappings":"AAmBA;;;;;GAKG;AAEH,2BAA2B;AAC3B,mBADW,YAAY,CAerB;AAsBK,2BAbI,IAAI,cAAc,CAAC,eACnB;IACN,QAAQ,EAAE,OAAO,WAAW,EAAE,IAAI,CACtC,OAAa,8BAA8B,EAAE,IAAI,CAC5C,CAAC;IACF,sBAAsB,EAAE,UAAU,CAAC;IACnC,WAAW,EAAE,WAAW,CAAC;IACzB,UAAU,EAAE,QAAQ,GAAG,CAAC,CAAC;IACzB,eAAe,CAAC,EAAE,OAAO,uBAAuB,EAAE,mBAAmB,CAAC;IACtE,sBAAsB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;CAC7D,WACO,OAAO,kBAAkB,EAAE,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0E5C;;;;6BA1FY,aAAa,GACzB,gBAAoB;IACd,uBAAuB,EAAE,QAAQ,CAAC;CACnC,CAAC;kCA1BwD,aAAa;yBAAb,aAAa;gCAAb,aAAa;6BAFlD,eAAe;4BACO,cAAc;2BAAd,cAAc;mCACC,aAAa;qCAC1C,iCAAiC"}

package/src/provisionPool.js

@@ -1,5 +1,4 @@
 // @jessie-check
-// @ts-check
 
 import {
   handleParamGovernance,
@@ -18,7 +17,12 @@ import {
   prepareProvisionPoolKit,
 } from './provisionPoolKit.js';
 
-/** @import {Marshal} from '@endo/marshal'; */
+/**
+ * @import {Marshal} from '@endo/marshal';
+ * @import {Amount, Brand, Payment, Purse} from '@agoric/ertp';
+ * @import {ContractMeta, Invitation, StandardTerms, ZCF} from '@agoric/zoe';
+ * @import {GovernanceTerms} from '@agoric/governance/src/types.js';
+ */
 
 /** @type {ContractMeta} */
 export const meta = {
@@ -89,33 +93,35 @@ export const start = async (zcf, privateArgs, baggage) => {
     makeBridgeProvisionTool,
   });
 
+  const poolBrand = /** @type {Brand<'nat'>} */ (
+    params.getPerAccountInitialAmount().brand
+  );
   const provisionPoolKit = await provideSingleton(
     baggage,
     'provisionPoolKit',
     () =>
       makeProvisionPoolKit({
-        // XXX governance can change the brand of the amount but should only be able to change the value
-        // NB: changing the brand will break this pool
-        // @ts-expect-error XXX Brand AssetKind
-        poolBrand: params.getPerAccountInitialAmount().brand,
+        poolBrand,
         storageNode: privateArgs.storageNode,
       }),
-    kit => kit.helper.start({ metrics: metricsOverride }),
   );
+  provisionPoolKit.helper.start(poolBrand, { metrics: metricsOverride });
 
   const publicFacet = prepareExo(
     baggage,
     'Provisioning Pool public',
     M.interface('ProvisionPool', {
-      getMetrics: M.call().returns(M.remotable('MetricsSubscriber')),
-      getPublicTopics: M.call().returns(TopicsRecordShape),
+      getMetrics: M.callWhen().returns(M.remotable('MetricsSubscriber')),
+      getPublicTopics: M.callWhen().returns(TopicsRecordShape),
       ...publicMixinAPI,
     }),
     {
-      getMetrics() {
+      async getMetrics() {
+        await null;
         return provisionPoolKit.public.getPublicTopics().metrics.subscriber;
       },
-      getPublicTopics() {
+      async getPublicTopics() {
+        await null;
         return provisionPoolKit.public.getPublicTopics();
       },
       ...publicMixin,

package/src/provisionPoolKit.d.ts

@@ -1,4 +1,14 @@
-export function prepareBridgeProvisionTool(zone: import("@agoric/zone").Zone): (bankManager?: any, walletFactory?: any, namesByAddressAdmin?: any, forHandler?: any) => import("@endo/exo").Guarded<{
+export function prepareBridgeProvisionTool(zone: import("@agoric/zone").Zone): (bankManager: ERef<import("@endo/exo").Guarded<{
+    getAssetSubscription(): IterableEachTopic<AssetDescriptor>;
+    getRewardDistributorDepositFacet(denom: string, feeKit: AssetIssuerKit): ERef<import("jessie.js").EOnly<import("@agoric/ertp").DepositFacet>>;
+    getModuleAccountAddress(moduleName: string): Promise<string | null>;
+    addAsset(denom: string, issuerName: string, proposedName: string, kit: AssetIssuerKit & {
+        payment?: ERef<Payment<"nat">>;
+    }): Promise<void>;
+    getBankForAddress(address: string): Promise<Bank>;
+}>>, walletFactory: ERef<import("@endo/exo").Guarded<{
+    provideSmartWallet(address: string, bank: ERef<import("@agoric/vats/src/vat-bank.js").Bank>, namesByAddressAdmin: ERef<import("@agoric/vats").NameAdmin>): Promise<[wallet: import("@agoric/smart-wallet/src/smartWallet").SmartWallet, isNew: boolean]>;
+}>>, namesByAddressAdmin: ERef<import("@agoric/vats").NameAdmin>, forHandler: any) => import("@endo/exo").Guarded<{
     /** @param {BridgeMessage} obj */
     fromBridge(obj: BridgeMessage): Promise<void>;
 }>;
@@ -15,6 +25,7 @@ export function prepareProvisionPoolKit(zone: import("@agoric/zone").Zone, { mak
 export type ProvisionPoolKit = {
     machine: any;
     helper: any;
+    forHandler: any;
     public: any;
 };
 export type PsmInstance = import("@agoric/zoe/src/zoeService/utils.js").Instance<(zcf: ZCF<GovernanceTerms<{
@@ -29,7 +40,7 @@ export type PsmInstance = import("@agoric/zoe/src/zoeService/utils.js").Instance
     initialPoserInvitation: Invitation;
     storageNode: StorageNode;
     marshaller: Marshaller;
-}, baggage: import("@agoric/vat-data").Baggage) => Promise<{
+}, baggage: Baggage) => Promise<{
     creatorFacet: import("@endo/exo").Guarded<{
         getParamMgrRetriever: () => {
             get: () => import("@agoric/governance/src/contractGovernance/typedParamManager").TypedParamManager<{
@@ -39,7 +50,7 @@ export type PsmInstance = import("@agoric/zoe/src/zoeService/utils.js").Instance
             } & {
                 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").TypedParamManager<{
                 GiveMintedFee: "ratio";
                 MintLimit: "amount";
@@ -48,11 +59,11 @@ export type PsmInstance = import("@agoric/zoe/src/zoeService/utils.js").Instance
                 Electorate: "invitation";
             }>;
         }>;
-        getInvitation: (name: any) => Promise<Invitation<unknown, undefined>>;
+        getInvitation: (name: any) => Promise<globalThis.Invitation>;
         getLimitedCreatorFacet: () => import("@endo/exo").Guarded<{
             getRewardAllocation(): Allocation;
-            makeCollectFeesInvitation(): Promise<Invitation<string, undefined>>;
-            makeRestoreMetricsInvitation(): Promise<Invitation<void, Omit<import("@agoric/inter-protocol/src/psm/psm.js").MetricsNotification, "anchorPoolBalance">>>;
+            makeCollectFeesInvitation(): Promise<globalThis.Invitation<string>>;
+            makeRestoreMetricsInvitation(): Promise<globalThis.Invitation<void, Omit<import("@agoric/inter-protocol/src/psm/psm.js").MetricsNotification, "anchorPoolBalance">>>;
         }>;
         getGovernedApis: () => GovernedApis;
         getGovernedApiNames: () => string[];
@@ -77,8 +88,8 @@ export type PsmInstance = import("@agoric/zoe/src/zoeService/utils.js").Instance
         getPublicTopics(): {
             metrics: import("@agoric/zoe/src/contractSupport").PublicTopic<import("@agoric/inter-protocol/src/psm/psm.js").MetricsNotification>;
         };
-        makeWantMintedInvitation(): Promise<Invitation<void, undefined>>;
-        makeGiveMintedInvitation(): Promise<Invitation<void, undefined>>;
+        makeWantMintedInvitation(): Promise<globalThis.Invitation<void, undefined>>;
+        makeGiveMintedInvitation(): Promise<globalThis.Invitation<void, undefined>>;
     }>;
 }>>;
 export type ProvisionPoolKitReferences = {
@@ -106,9 +117,13 @@ export type MetricsNotification = {
      */
     totalMintedConverted: Amount<"nat">;
 };
-import type { BridgeMessage } from '@agoric/cosmic-swingset/src/types.js';
-import type { Bank } from '@agoric/vats/src/vat-bank.js';
 import type { ERef } from '@endo/far';
-import type { Amount } from '@agoric/ertp/src/types.js';
+import type { Payment } from '@agoric/ertp';
+import type { Bank } from '@agoric/vats/src/vat-bank.js';
+import type { BridgeMessage } from '@agoric/cosmic-swingset/src/types.js';
+import type { ZCF } from '@agoric/zoe';
+import type { Brand } from '@agoric/ertp';
+import type { StorageNode } from '@agoric/internal/src/lib-chainStorage.js';
+import type { Amount } from '@agoric/ertp';
 import type { BankManager } from '@agoric/vats/src/vat-bank.js';
 //# sourceMappingURL=provisionPoolKit.d.ts.map

package/src/provisionPoolKit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"provisionPoolKit.d.ts","sourceRoot":"","sources":["provisionPoolKit.js"],"names":[],"mappings":"AAiFO,iDAFI,OAAO,cAAc,EAAE,IAAI;IAehC,iCAAiC;oBAArB,aAAa;GA6B5B;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;+BAvfY;IACR,OAAO,EAAE,GAAG,CAAC;IACb,MAAM,EAAE,GAAG,CAAC;IACZ,MAAM,EAAE,GAAG,CAAC;CACb;0BAIS,OAAO,qCAAqC,EAAE,QAAQ,CAClE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+CAiWmB,cAAC;kDAIS,cAC7B;;;;;;;;;;;;EAtWyD,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;;mCA7CK,sCAAsC;0BAYlC,8BAA8B;0BAF3C,WAAW;4BACT,2BAA2B;iCAChB,8BAA8B"}
+{"version":3,"file":"provisionPoolKit.d.ts","sourceRoot":"","sources":["provisionPoolKit.js"],"names":[],"mappings":"AAmFO,iDAFI,OAAO,cAAc,EAAE,IAAI;;;;;eA8gBoqB,CAAC;;;;;;IArfrsB,iCAAiC;oBAArB,aAAa;GA6B5B;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,gCA6bC;IAA2B,SAAS,EAA5B,MAAM,KAAK,CAAC;IACY,WAAW,EAAnC,KAAK,WAAW,CAAC;CACzB,KAAU,OAAO,CAAC,gBAAgB,CAAC,CAcvC;+BAljBY;IACR,OAAO,EAAE,GAAG,CAAC;IACb,MAAM,EAAE,GAAG,CAAC;IACZ,UAAU,EAAE,GAAG,CAAC;IAChB,MAAM,EAAE,GAAG,CAAC;CACb;0BAIS,OAAO,qCAAqC,EAAE,QAAQ,CAClE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAAyD,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;;0BAzCJ,WAAW;6BAHc,cAAc;0BAI1B,8BAA8B;mCALlC,sCAAsC;yBAGhD,aAAa;2BAFa,cAAc;iCAChC,0CAA0C;4BADxB,cAAc;iCAI1B,8BAA8B"}

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,
@@ -24,7 +25,13 @@ import { InstanceHandleShape } from '@agoric/zoe/src/typeGuards.js';
 import { isUpgradeDisconnection } from '@agoric/internal/src/upgrade-api.js';
 
 /**
+ * @import {EReturn} from '@endo/far';
  * @import {BridgeMessage} from '@agoric/cosmic-swingset/src/types.js';
+ * @import {Amount, Brand, Payment, Purse} from '@agoric/ertp';
+ * @import {StorageNode} from '@agoric/internal/src/lib-chainStorage.js';
+ * @import {ZCF} from '@agoric/zoe';
+ * @import {ERef} from '@endo/far'
+ * @import {Bank, BankManager} from '@agoric/vats/src/vat-bank.js'
  */
 
 const trace = makeTracer('ProvPool');
@@ -33,17 +40,12 @@ const FIRST_UPPER_KEYWORD = /^[A-Z][a-zA-Z0-9_$]*$/;
 // see https://github.com/Agoric/agoric-sdk/issues/8238
 const FIRST_LOWER_NEAR_KEYWORD = /^[a-z][a-zA-Z0-9_$]*$/;
 
-/**
- * @import {ERef} from '@endo/far'
- * @import {Amount} from '@agoric/ertp/src/types.js'
- * @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;
+ *   forHandler: any;
  *   public: any;
  * }} ProvisionPoolKit
  */
@@ -85,6 +87,16 @@ export const prepareBridgeProvisionTool = zone =>
     M.interface('ProvisionBridgeHandlerMaker', {
       fromBridge: M.callWhen(M.record()).returns(),
     }),
+    /**
+     * @param {ERef<BankManager>} bankManager
+     * @param {ERef<
+     *   EReturn<
+     *     import('@agoric/smart-wallet/src/walletFactory.js').start
+     *   >['creatorFacet']
+     * >} walletFactory
+     * @param {ERef<import('@agoric/vats').NameAdmin>} namesByAddressAdmin
+     * @param {ProvisionPoolKit['forHandler']} forHandler
+     */
     (bankManager, walletFactory, namesByAddressAdmin, forHandler) => ({
       bankManager,
       walletFactory,
@@ -138,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',
@@ -169,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
      */
@@ -324,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)) {
@@ -418,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
@@ -459,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();
@@ -472,22 +519,35 @@ 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()
           );
+          trace('sendInitialPayment withdrawing', perAccountInitialAmount);
           const initialPmt = await E(fundPurse).withdraw(
             perAccountInitialAmount,
           );
@@ -533,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

@@ -7,6 +7,7 @@
  */
 /**
  * @import {EReturn} from '@endo/far';
+ * @import {ContractMeta, FeeMintAccess, Installation} from '@agoric/zoe';
  */
 /**
  * @typedef {object} MetricsNotification Metrics naming scheme is that nouns are
@@ -50,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";
@@ -59,11 +60,11 @@ export function start(zcf: ZCF<GovernanceTerms<{
                 Electorate: "invitation";
             }>;
         }>;
-        getInvitation: (name: any) => Promise<Invitation<unknown, undefined>>;
+        getInvitation: (name: any) => Promise<globalThis.Invitation>;
         getLimitedCreatorFacet: () => import("@endo/exo").Guarded<{
             getRewardAllocation(): Allocation;
-            makeCollectFeesInvitation(): Promise<Invitation<string, undefined>>;
-            makeRestoreMetricsInvitation(): Promise<Invitation<void, Omit<MetricsNotification, "anchorPoolBalance">>>;
+            makeCollectFeesInvitation(): Promise<globalThis.Invitation<string>>;
+            makeRestoreMetricsInvitation(): Promise<globalThis.Invitation<void, Omit<MetricsNotification, "anchorPoolBalance">>>;
         }>;
         getGovernedApis: () => GovernedApis;
         getGovernedApiNames: () => string[];
@@ -88,8 +89,8 @@ export function start(zcf: ZCF<GovernanceTerms<{
         getPublicTopics(): {
             metrics: import("@agoric/zoe/src/contractSupport/topics.js").PublicTopic<MetricsNotification>;
         };
-        makeWantMintedInvitation(): Promise<Invitation<void, undefined>>;
-        makeGiveMintedInvitation(): Promise<Invitation<void, undefined>>;
+        makeWantMintedInvitation(): Promise<globalThis.Invitation<void, undefined>>;
+        makeGiveMintedInvitation(): Promise<globalThis.Invitation<void, undefined>>;
     }>;
 }>;
 /**
@@ -124,6 +125,9 @@ export type MetricsNotification = {
     totalMintedProvided: Amount<"nat">;
 };
 export type PsmPublicFacet = EReturn<typeof start>["publicFacet"];
+import type { ContractMeta } from '@agoric/zoe';
+import type { FeeMintAccess } from '@agoric/zoe';
 import type { Baggage } from '@agoric/vat-data';
+import type { Installation } from '@agoric/zoe';
 import type { EReturn } from '@endo/far';
 //# sourceMappingURL=psm.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"psm.d.ts","sourceRoot":"","sources":["psm.js"],"names":[],"mappings":"AAqCA;;;;;;GAMG;AAEH;;GAEG;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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+CAsUwD,cAAc;kDAAuE,cAAc;;;;;;;;;;;;GAJ5K;;;;;;;;;;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;6BA9XxB,kBAAkB;6BApBlB,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"}