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

package/src/provisionPool.d.ts

@@ -1,19 +1,25 @@
 /**
- * @import {Marshal} from '@endo/marshal';
+ * @import {Remote} from '@agoric/internal';
  * @import {Amount, Brand, Payment, Purse} from '@agoric/ertp';
  * @import {ContractMeta, Invitation, StandardTerms, ZCF} from '@agoric/zoe';
  * @import {GovernanceTerms} from '@agoric/governance/src/types.js';
+ * @import {ERef} from '@endo/far';
+ * @import {Bank} from '@agoric/vats/src/vat-bank.js';
+ * @import {MetricsNotification} from './provisionPoolKit.js';
+ * @import {Baggage} from '@agoric/vat-data';
+ * @import {StorageNode} from '@agoric/internal/src/lib-chainStorage.js';
+ * @import {Marshaller} from '@agoric/internal/src/lib-chainStorage.js';
  */
-/** @type {ContractMeta} */
-export const meta: ContractMeta;
+/** @type {ContractMeta<typeof start>} */
+export const meta: ContractMeta<typeof start>;
 export function start(zcf: ZCF<ProvisionTerms>, privateArgs: {
-    poolBank: import("@endo/far").ERef<import("@agoric/vats/src/vat-bank.js").Bank>;
+    poolBank: ERef<Bank>;
     initialPoserInvitation: Invitation;
-    storageNode: StorageNode;
-    marshaller: Marshal<any>;
-    metricsOverride?: import("./provisionPoolKit.js").MetricsNotification;
+    storageNode: Remote<StorageNode>;
+    marshaller: Remote<Marshaller>;
+    metricsOverride?: MetricsNotification;
     governedParamOverrides?: Record<string, Amount | undefined>;
-}, baggage: import("@agoric/vat-data").Baggage): Promise<{
+}, baggage: Baggage): Promise<{
     creatorFacet: import("@endo/exo").Guarded<{
         getParamMgrRetriever: () => {
             get: () => import("@agoric/governance/src/contractGovernance/typedParamManager.js").TypedParamManager<{
@@ -21,7 +27,7 @@ export function start(zcf: ZCF<ProvisionTerms>, privateArgs: {
             } & {
                 Electorate: "invitation";
             }>;
-        } & RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
+        } & import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
             get: () => import("@agoric/governance/src/contractGovernance/typedParamManager.js").TypedParamManager<{
                 PerAccountInitialAmount: "amount";
             } & {
@@ -29,25 +35,31 @@ export function start(zcf: ZCF<ProvisionTerms>, privateArgs: {
             }>;
         }>;
         getInvitation: (name: any) => Promise<Invitation>;
-        getLimitedCreatorFacet: () => any;
-        getGovernedApis: () => GovernedApis;
+        getLimitedCreatorFacet: () => {
+            addRevivableAddresses: (oldAddresses: string[]) => void;
+            getWalletReviver: () => ERef<any>;
+            setReferences: (erefs: import("./provisionPoolKit.js").ProvisionPoolKitReferences) => Promise<void>;
+            makeHandler: () => ERef<import("@agoric/vats").BridgeHandler>;
+            initPSM: (brand: Brand, instance: import("@agoric/zoe/src/zoeService/utils.js").Instance<typeof import("./psm/psm.js").start>) => void;
+        };
+        getGovernedApis: () => import("@agoric/governance").GovernedApis;
         getGovernedApiNames: () => string[];
         setOfferFilter: (strings: any) => Promise<void>;
     }>;
     publicFacet: import("@endo/exo").Guarded<{
         getAmount: (name: string) => Amount;
         getBrand: (name: string) => Brand;
-        getInstance: (name: string) => Instance;
-        getInstallation: (name: string) => Installation;
-        getInvitationAmount: (name: string) => InvitationAmount;
+        getInstance: (name: string) => import("@agoric/zoe").Instance;
+        getInstallation: (name: string) => import("@agoric/zoe").Installation;
+        getInvitationAmount: (name: string) => import("@agoric/zoe").InvitationAmount;
         getNat: (name: string) => bigint;
-        getRatio: (name: string) => Ratio;
+        getRatio: (name: string) => import("@agoric/ertp").Ratio;
         getString: (name: string) => string;
         getTimestamp: (name: string) => import("@agoric/time").TimestampRecord;
         getRelativeTime: (name: string) => import("@agoric/time").RelativeTimeRecord;
         getUnknown: (name: string) => any;
-        getSubscription: () => globalThis.StoredSubscription<globalThis.GovernanceSubscriptionState>;
-        getGovernedParams: () => globalThis.ERef<globalThis.ParamStateRecord>;
+        getSubscription: () => import("@agoric/notifier").StoredSubscription<import("@agoric/governance").GovernanceSubscriptionState>;
+        getGovernedParams: () => ERef<import("@agoric/governance").ParamStateRecord>;
         getMetrics(): Promise<any>;
         getPublicTopics(): Promise<any>;
     }>;
@@ -60,9 +72,15 @@ export type ProvisionTerms = StandardTerms & GovernanceTerms<{
 }>;
 import type { ContractMeta } from '@agoric/zoe';
 import type { ZCF } from '@agoric/zoe';
+import type { Bank } from '@agoric/vats/src/vat-bank.js';
+import type { ERef } from '@endo/far';
 import type { Invitation } from '@agoric/zoe';
-import type { Marshal } from '@endo/marshal';
+import type { StorageNode } from '@agoric/internal/src/lib-chainStorage.js';
+import type { Remote } from '@agoric/internal';
+import type { Marshaller } from '@agoric/internal/src/lib-chainStorage.js';
+import type { MetricsNotification } from './provisionPoolKit.js';
 import type { Amount } from '@agoric/ertp';
+import type { Baggage } from '@agoric/vat-data';
 import type { Brand } from '@agoric/ertp';
 import type { StandardTerms } from '@agoric/zoe';
 import type { GovernanceTerms } from '@agoric/governance/src/types.js';

package/src/provisionPool.d.ts.map

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"provisionPool.d.ts","sourceRoot":"","sources":["provisionPool.js"],"names":[],"mappings":"AAkBA;;;;;;;;;;;GAWG;AAEH,yCAAyC;AACzC,mBADW,aAAa,OAAO,KAAK,CAAC,CAgBnC;AAoBK,2BAXI,IAAI,cAAc,CAAC,eACnB;IACN,QAAQ,EAAE,KAAK,IAAI,CAAC,CAAC;IACrB,sBAAsB,EAAE,UAAU,CAAC;IACnC,WAAW,EAAE,OAAO,WAAW,CAAC,CAAC;IACjC,UAAU,EAAE,OAAO,UAAU,CAAC,CAAC;IAC/B,eAAe,CAAC,EAAE,mBAAmB,CAAC;IACtC,sBAAsB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;CAC7D,WACO,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6EjB;;;;6BA3FY,aAAa,GACzB,gBAAoB;IACd,uBAAuB,EAAE,QAAQ,CAAC;CACnC,CAAC;kCAjCwD,aAAa;yBAAb,aAAa;0BAGrD,8BAA8B;0BAD9B,WAAW;gCAF6B,aAAa;iCAM9C,0CAA0C;4BAR/C,kBAAkB;gCASd,0CAA0C;yCAHjC,uBAAuB;4BALb,cAAc;6BAMpC,kBAAkB;2BANI,cAAc;mCACC,aAAa;qCAC1C,iCAAiC"}

package/src/provisionPool.js

@@ -1,11 +1,10 @@
-// @jessie-check
-
 import {
   handleParamGovernance,
   ParamTypes,
   publicMixinAPI,
 } from '@agoric/governance';
 import { InvitationShape } from '@agoric/governance/src/typeGuards.js';
+import { wrapRemoteMarshaller } from '@agoric/internal/src/marshal/wrap-marshaller.js';
 import { M } from '@agoric/store';
 import { prepareExo } from '@agoric/vat-data';
 import { provideSingleton } from '@agoric/zoe/src/contractSupport/durability.js';
@@ -18,14 +17,21 @@ import {
 } from './provisionPoolKit.js';
 
 /**
- * @import {Marshal} from '@endo/marshal';
+ * @import {Remote} from '@agoric/internal';
  * @import {Amount, Brand, Payment, Purse} from '@agoric/ertp';
  * @import {ContractMeta, Invitation, StandardTerms, ZCF} from '@agoric/zoe';
  * @import {GovernanceTerms} from '@agoric/governance/src/types.js';
+ * @import {ERef} from '@endo/far';
+ * @import {Bank} from '@agoric/vats/src/vat-bank.js';
+ * @import {MetricsNotification} from './provisionPoolKit.js';
+ * @import {Baggage} from '@agoric/vat-data';
+ * @import {StorageNode} from '@agoric/internal/src/lib-chainStorage.js';
+ * @import {Marshaller} from '@agoric/internal/src/lib-chainStorage.js';
  */
 
-/** @type {ContractMeta} */
+/** @type {ContractMeta<typeof start>} */
 export const meta = {
+  // @ts-expect-error splitRecord loses the property keys
   privateArgsShape: M.splitRecord(
     {
       poolBank: M.eref(M.remotable('bank')),
@@ -50,23 +56,24 @@ harden(meta);
  *   TODO: ERef<GovernedCreatorFacet<ProvisionCreator>>
  * @param {ZCF<ProvisionTerms>} zcf
  * @param {{
- *   poolBank: import('@endo/far').ERef<
- *     import('@agoric/vats/src/vat-bank.js').Bank
- *   >;
+ *   poolBank: ERef<Bank>;
  *   initialPoserInvitation: Invitation;
- *   storageNode: StorageNode;
- *   marshaller: Marshal<any>;
- *   metricsOverride?: import('./provisionPoolKit.js').MetricsNotification;
+ *   storageNode: Remote<StorageNode>;
+ *   marshaller: Remote<Marshaller>;
+ *   metricsOverride?: MetricsNotification;
  *   governedParamOverrides?: Record<string, Amount | undefined>;
  * }} privateArgs
- * @param {import('@agoric/vat-data').Baggage} baggage
+ * @param {Baggage} baggage
  */
 export const start = async (zcf, privateArgs, baggage) => {
   const { poolBank, metricsOverride } = privateArgs;
 
+  const { marshaller: remoteMarshaller } = privateArgs;
+  const cachingMarshaller = wrapRemoteMarshaller(remoteMarshaller);
+
   const { makeRecorderKit } = prepareRecorderKitMakers(
     baggage,
-    privateArgs.marshaller,
+    cachingMarshaller,
   );
 
   // Governance

package/src/provisionPoolKit.d.ts

@@ -1,101 +1,44 @@
-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>>;
+export function prepareBridgeProvisionTool(zone: Zone): (bankManager: ERef<import("@endo/exo").Guarded<{
+    getAssetSubscription(): import("@agoric/notifier").IterableEachTopic<AssetDescriptor>;
+    getRewardDistributorDepositFacet(denom: string, feeKit: AssetIssuerKit): ERef<import("@endo/far").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<{
+    provideSmartWallet(address: string, bank: ERef<Bank>, namesByAddressAdmin: ERef<NameAdmin>): Promise<[wallet: import("@agoric/smart-wallet/src/smartWallet.js").SmartWallet, isNew: boolean]>;
+}>>, namesByAddressAdmin: ERef<NameAdmin>, forHandler: any) => import("@endo/exo").Guarded<{
     /** @param {BridgeMessage} obj */
     fromBridge(obj: BridgeMessage): Promise<void>;
 }>;
-export function prepareProvisionPoolKit(zone: import("@agoric/zone").Zone, { makeRecorderKit, params, poolBank, zcf, makeBridgeProvisionTool }: {
-    makeRecorderKit: import("@agoric/zoe/src/contractSupport/recorder.js").MakeRecorderKit;
+export function prepareProvisionPoolKit(zone: Zone, { makeRecorderKit, params, poolBank, zcf, makeBridgeProvisionTool }: {
+    makeRecorderKit: MakeRecorderKit;
     params: any;
-    poolBank: import("@endo/far").ERef<Bank>;
+    poolBank: ERef<Bank>;
     zcf: ZCF;
     makeBridgeProvisionTool: ReturnType<typeof prepareBridgeProvisionTool>;
 }): ({ poolBrand, storageNode }: {
     poolBrand: Brand<"nat">;
-    storageNode: ERef<StorageNode>;
+    storageNode: ERemote<StorageNode>;
 }) => Promise<ProvisionPoolKit>;
 export type ProvisionPoolKit = {
-    machine: any;
+    machine: {
+        addRevivableAddresses: (oldAddresses: string[]) => void;
+        getWalletReviver: () => ERef<any>;
+        setReferences: (erefs: ProvisionPoolKitReferences) => Promise<void>;
+        makeHandler: () => ERef<BridgeHandler>;
+        initPSM: (brand: Brand, instance: Instance<typeof psmStart>) => void;
+    };
     helper: any;
     forHandler: any;
     public: any;
 };
-export type PsmInstance = import("@agoric/zoe/src/zoeService/utils.js").Instance<(zcf: ZCF<GovernanceTerms<{
-    GiveMintedFee: "ratio";
-    WantMintedFee: "ratio";
-    MintLimit: "amount";
-}> & {
-    anchorBrand: Brand<"nat">;
-    anchorPerMinted: Ratio;
-}>, privateArgs: {
-    feeMintAccess: FeeMintAccess;
-    initialPoserInvitation: Invitation;
-    storageNode: StorageNode;
-    marshaller: Marshaller;
-}, baggage: Baggage) => Promise<{
-    creatorFacet: import("@endo/exo").Guarded<{
-        getParamMgrRetriever: () => {
-            get: () => import("@agoric/governance/src/contractGovernance/typedParamManager").TypedParamManager<{
-                GiveMintedFee: "ratio";
-                MintLimit: "amount";
-                WantMintedFee: "ratio";
-            } & {
-                Electorate: "invitation";
-            }>;
-        } & RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
-            get: () => import("@agoric/governance/src/contractGovernance/typedParamManager").TypedParamManager<{
-                GiveMintedFee: "ratio";
-                MintLimit: "amount";
-                WantMintedFee: "ratio";
-            } & {
-                Electorate: "invitation";
-            }>;
-        }>;
-        getInvitation: (name: any) => Promise<globalThis.Invitation>;
-        getLimitedCreatorFacet: () => import("@endo/exo").Guarded<{
-            getRewardAllocation(): Allocation;
-            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[];
-        setOfferFilter: (strings: any) => Promise<void>;
-    }>;
-    publicFacet: import("@endo/exo").Guarded<{
-        getAmount: (name: string) => Amount;
-        getBrand: (name: string) => Brand;
-        getInstance: (name: string) => Instance;
-        getInstallation: (name: string) => Installation;
-        getInvitationAmount: (name: string) => InvitationAmount;
-        getNat: (name: string) => bigint;
-        getRatio: (name: string) => Ratio;
-        getString: (name: string) => string;
-        getTimestamp: (name: string) => import("@agoric/time").TimestampRecord;
-        getRelativeTime: (name: string) => import("@agoric/time").RelativeTimeRecord;
-        getUnknown: (name: string) => any;
-        getSubscription: () => globalThis.StoredSubscription<globalThis.GovernanceSubscriptionState>;
-        getGovernedParams: () => ERef<globalThis.ParamStateRecord>;
-        getMetrics(): globalThis.Subscriber<import("@agoric/inter-protocol/src/psm/psm.js").MetricsNotification>;
-        getPoolBalance(): import("@agoric/ertp").NatAmount;
-        getPublicTopics(): {
-            metrics: import("@agoric/zoe/src/contractSupport").PublicTopic<import("@agoric/inter-protocol/src/psm/psm.js").MetricsNotification>;
-        };
-        makeWantMintedInvitation(): Promise<globalThis.Invitation<void, undefined>>;
-        makeGiveMintedInvitation(): Promise<globalThis.Invitation<void, undefined>>;
-    }>;
-}>>;
+export type PsmInstance = Instance<typeof psmStart>;
 export type ProvisionPoolKitReferences = {
     bankManager: ERef<BankManager>;
-    namesByAddressAdmin: ERef<import("@agoric/vats").NameAdmin>;
-    walletFactory: ERef<import("@agoric/vats/src/core/startWalletFactory.js").WalletFactoryStartResult["creatorFacet"]>;
+    namesByAddressAdmin: ERef<NameAdmin>;
+    walletFactory: ERef<WalletFactoryStartResult["creatorFacet"]>;
 };
 /**
  * Metrics naming scheme is that nouns are
@@ -117,13 +60,22 @@ export type MetricsNotification = {
      */
     totalMintedConverted: Amount<"nat">;
 };
+import type { Zone } from '@agoric/zone';
+import type { AssetDescriptor } from '@agoric/vats/src/vat-bank.js';
 import type { ERef } from '@endo/far';
 import type { Payment } from '@agoric/ertp';
 import type { Bank } from '@agoric/vats/src/vat-bank.js';
+import type { NameAdmin } from '@agoric/vats';
 import type { BridgeMessage } from '@agoric/cosmic-swingset/src/types.js';
+import type { MakeRecorderKit } from '@agoric/zoe/src/contractSupport/recorder.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 { ERemote } from '@agoric/internal';
+import type { BridgeHandler } from '@agoric/vats';
+import type { start as psmStart } from '@agoric/inter-protocol/src/psm/psm.js';
+import type { Instance } from '@agoric/zoe/src/zoeService/utils.js';
 import type { BankManager } from '@agoric/vats/src/vat-bank.js';
+import type { WalletFactoryStartResult } from '@agoric/vats/src/core/startWalletFactory.js';
+import type { Amount } from '@agoric/ertp';
 //# 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":"AAoFO,iDAFI,OAAO,cAAc,EAAE,IAAI;;;;;eA8gB8mB,CAAC;;;;;;IArf/oB,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;;0BA1CJ,WAAW;6BAHc,cAAc;0BAI1B,8BAA8B;mCALlC,sCAAsC;yBAGhD,aAAa;2BAFa,cAAc;iCAChC,0CAA0C;4BADxB,cAAc;iCAI1B,8BAA8B"}
+{"version":3,"file":"provisionPoolKit.d.ts","sourceRoot":"","sources":["provisionPoolKit.js"],"names":[],"mappings":"AAiGO,iDAFI,IAAI;;;;;eA2gBgY,CAAC;;;;;;IAtf1Y,iCAAiC;oBAArB,aAAa;GA6B5B;AAYI,8CATI,IAAI,uEACJ;IACN,eAAe,EAAE,eAAe,CAAC;IACjC,MAAM,EAAE,GAAG,CAAC;IACZ,QAAQ,EAAE,KAAK,IAAI,CAAC,CAAC;IACrB,GAAG,EAAE,GAAG,CAAC;IACT,uBAAuB,EAAE,UAAU,CAAC,OAAO,0BAA0B,CAAC,CAAC;CACxE,gCA6bC;IAA2B,SAAS,EAA5B,MAAM,KAAK,CAAC;IACe,WAAW,EAAtC,QAAQ,WAAW,CAAC;CAC5B,KAAU,OAAO,CAAC,gBAAgB,CAAC,CAevC;+BAjjBY;IACR,OAAO,EAAE;QACP,qBAAqB,EAAE,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;QACxD,gBAAgB,EAAE,MAAM,KAAK,GAAG,CAAC,CAAC;QAClC,aAAa,EAAE,CAAC,KAAK,EAAE,0BAA0B,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;QACpE,WAAW,EAAE,MAAM,KAAK,aAAa,CAAC,CAAC;QACvC,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,eAAe,CAAC,KAAK,IAAI,CAAC;KACtE,CAAC;IACF,MAAM,EAAE,GAAG,CAAC;IACZ,UAAU,EAAE,GAAG,CAAC;IAChB,MAAM,EAAE,GAAG,CAAC;CACb;0BAIS,SAAS,eAAe,CAAC;;iBAKxB,KAAK,WAAW,CAAC;yBACjB,KAAK,SAAS,CAAC;mBACf,KAAK,wBAAwB,CAAC,cAAc,CAAC,CAAC;;;;;;;;;;wBAM9C,MAAM;;;;;yBACN,OAAO,KAAK,CAAC;;;;;0BAEb,OAAO,KAAK,CAAC;;0BA/CJ,cAAc;qCAKH,8BAA8B;0BAZzC,WAAW;6BAJc,cAAc;0BAK1B,8BAA8B;+BAItC,cAAc;mCAVV,sCAAsC;qCAcpC,6CAA6C;yBAVzD,aAAa;2BAHa,cAAc;iCAEhC,0CAA0C;6BADtC,kBAAkB;mCAcpB,cAAc;uCAPV,uCAAuC;8BADhD,qCAAqC;iCAF5B,8BAA8B;8CAKvB,6CAA6C;4BAVxC,cAAc"}

package/src/provisionPoolKit.js

@@ -28,11 +28,22 @@ 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 {ERemote, Remote} from '@agoric/internal';
  * @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'
  * @import {MapStore, SetStore} from '@agoric/store';
+ * @import {Instance} from '@agoric/zoe/src/zoeService/utils.js';
+ * @import {start as psmStart} from '@agoric/inter-protocol/src/psm/psm.js';
+ * @import {NameAdmin} from '@agoric/vats';
+ * @import {WalletFactoryStartResult} from '@agoric/vats/src/core/startWalletFactory.js';
+ * @import {Zone} from '@agoric/zone';
+ * @import {start as StartWalletFactory} from '@agoric/smart-wallet/src/walletFactory.js';
+ * @import {MakeRecorderKit} from '@agoric/zoe/src/contractSupport/recorder.js';
+ * @import {RecorderKit} from '@agoric/zoe/src/contractSupport/recorder.js';
+ * @import {BridgeHandler} from '@agoric/vats';
+ * @import {AssetDescriptor} from '@agoric/vats/src/vat-bank.js';
  */
 
 const trace = makeTracer('ProvPool');
@@ -44,7 +55,13 @@ const FIRST_LOWER_NEAR_KEYWORD = /^[a-z][a-zA-Z0-9_$]*$/;
 // 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;
+ *   machine: {
+ *     addRevivableAddresses: (oldAddresses: string[]) => void;
+ *     getWalletReviver: () => ERef<any>;
+ *     setReferences: (erefs: ProvisionPoolKitReferences) => Promise<void>;
+ *     makeHandler: () => ERef<BridgeHandler>;
+ *     initPSM: (brand: Brand, instance: Instance<typeof psmStart>) => void;
+ *   };
  *   helper: any;
  *   forHandler: any;
  *   public: any;
@@ -52,18 +69,14 @@ const FIRST_LOWER_NEAR_KEYWORD = /^[a-z][a-zA-Z0-9_$]*$/;
  */
 
 /**
- * @typedef {import('@agoric/zoe/src/zoeService/utils.js').Instance<
- *   import('@agoric/inter-protocol/src/psm/psm.js').start
- * >} PsmInstance
+ * @typedef {Instance<typeof psmStart>} PsmInstance
  */
 
 /**
  * @typedef {object} ProvisionPoolKitReferences
  * @property {ERef<BankManager>} bankManager
- * @property {ERef<import('@agoric/vats').NameAdmin>} namesByAddressAdmin
- * @property {ERef<
- *   import('@agoric/vats/src/core/startWalletFactory.js').WalletFactoryStartResult['creatorFacet']
- * >} walletFactory
+ * @property {ERef<NameAdmin>} namesByAddressAdmin
+ * @property {ERef<WalletFactoryStartResult['creatorFacet']>} walletFactory
  */
 
 /**
@@ -80,7 +93,7 @@ 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 {import('@agoric/zone').Zone} zone
+ * @param {Zone} zone
  */
 export const prepareBridgeProvisionTool = zone =>
   zone.exoClass(
@@ -90,12 +103,8 @@ export const prepareBridgeProvisionTool = zone =>
     }),
     /**
      * @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 {ERef<EReturn<StartWalletFactory>['creatorFacet']>} walletFactory
+     * @param {ERef<NameAdmin>} namesByAddressAdmin
      * @param {ProvisionPoolKit['forHandler']} forHandler
      */
     (bankManager, walletFactory, namesByAddressAdmin, forHandler) => ({
@@ -137,11 +146,11 @@ export const prepareBridgeProvisionTool = zone =>
   );
 
 /**
- * @param {import('@agoric/zone').Zone} zone
+ * @param {Zone} zone
  * @param {{
- *   makeRecorderKit: import('@agoric/zoe/src/contractSupport/recorder.js').MakeRecorderKit;
+ *   makeRecorderKit: MakeRecorderKit;
  *   params: any;
- *   poolBank: import('@endo/far').ERef<Bank>;
+ *   poolBank: ERef<Bank>;
  *   zcf: ZCF;
  *   makeBridgeProvisionTool: ReturnType<typeof prepareBridgeProvisionTool>;
  * }} powers
@@ -198,10 +207,10 @@ export const prepareProvisionPoolKit = (
      * @param {object} opts
      * @param {Purse<'nat'>} [opts.fundPurse]
      * @param {Brand<'nat'>} opts.poolBrand
-     * @param {StorageNode} opts.metricsNode
+     * @param {Remote<StorageNode>} opts.metricsNode
      */
     ({ fundPurse, poolBrand, metricsNode }) => {
-      /** @type {import('@agoric/zoe/src/contractSupport/recorder.js').RecorderKit<MetricsNotification>} */
+      /** @type {RecorderKit<MetricsNotification>} */
       const metricsRecorderKit = makeRecorderKit(metricsNode);
 
       /** @type {MapStore<ERef<Brand>, PsmInstance>} */
@@ -256,7 +265,7 @@ export const prepareProvisionPoolKit = (
           const refs = await deeplyFulfilledObject(obj);
           Object.assign(this.state, refs);
         },
-        /** @returns {import('@agoric/vats').BridgeHandler} */
+        /** @returns {BridgeHandler} */
         makeHandler() {
           const { bankManager, namesByAddressAdmin, walletFactory } =
             this.state;
@@ -402,7 +411,7 @@ export const prepareProvisionPoolKit = (
           const { facets } = this;
           const { helper } = facets;
 
-          /** @param {import('@agoric/vats/src/vat-bank.js').AssetDescriptor} desc */
+          /** @param {AssetDescriptor} desc */
           const repairDesc = desc => {
             if (desc.issuerName.match(FIRST_UPPER_KEYWORD)) {
               trace(`Saving Issuer ${desc.issuerName}`);
@@ -590,11 +599,12 @@ export const prepareProvisionPoolKit = (
    *
    * @param {object} opts
    * @param {Brand<'nat'>} opts.poolBrand
-   * @param {ERef<StorageNode>} opts.storageNode
+   * @param {ERemote<StorageNode>} opts.storageNode
    * @returns {Promise<ProvisionPoolKit>}
    */
   const makeProvisionPoolKit = async ({ poolBrand, storageNode }) => {
     const fundPurse = await getFundingPurseForBrand(poolBrand);
+    /** @type {Remote<StorageNode>} */
     const metricsNode = await E(storageNode).makeChildNode('metrics');
 
     return makeProvisionPoolKitInternal({

package/src/psm/psm.d.ts

@@ -7,7 +7,15 @@
  */
 /**
  * @import {EReturn} from '@endo/far';
- * @import {ContractMeta, FeeMintAccess, Installation} from '@agoric/zoe';
+ * @import {TypedPattern, Remote} from '@agoric/internal';
+ * @import {Baggage} from '@agoric/vat-data'
+ * @import {ContractMeta, FeeMintAccess, Invitation, ZCF, ZCFSeat} from '@agoric/zoe';
+ * @import {Ratio} from '@agoric/ertp';
+ * @import {GovernanceTerms} from '@agoric/governance/src/types.js';
+ * @import {Amount} from '@agoric/ertp';
+ * @import {Brand} from '@agoric/ertp';
+ * @import {StorageNode} from '@agoric/internal/src/lib-chainStorage.js';
+ * @import {Marshaller} from '@agoric/internal/src/lib-chainStorage.js';
  */
 /**
  * @typedef {object} MetricsNotification Metrics naming scheme is that nouns are
@@ -23,12 +31,8 @@
  * @property {Amount<'nat'>} totalMintedProvided running sum of Minted ever
  *   given by this contract
  */
-/**
- * @import {TypedPattern} from '@agoric/internal';
- * @import {Baggage} from '@agoric/vat-data'
- */
-/** @type {ContractMeta} */
-export const meta: ContractMeta;
+/** @type {ContractMeta<typeof start>} */
+export const meta: ContractMeta<typeof start>;
 export function start(zcf: ZCF<GovernanceTerms<{
     GiveMintedFee: "ratio";
     WantMintedFee: "ratio";
@@ -39,8 +43,8 @@ export function start(zcf: ZCF<GovernanceTerms<{
 }>, privateArgs: {
     feeMintAccess: FeeMintAccess;
     initialPoserInvitation: Invitation;
-    storageNode: StorageNode;
-    marshaller: Marshaller;
+    storageNode: Remote<StorageNode>;
+    marshaller: Remote<Marshaller>;
 }, baggage: Baggage): Promise<{
     creatorFacet: import("@endo/exo").Guarded<{
         getParamMgrRetriever: () => {
@@ -51,7 +55,7 @@ export function start(zcf: ZCF<GovernanceTerms<{
             } & {
                 Electorate: "invitation";
             }>;
-        } & RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
+        } & import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
             get: () => import("@agoric/governance/src/contractGovernance/typedParamManager.js").TypedParamManager<{
                 GiveMintedFee: "ratio";
                 MintLimit: "amount";
@@ -60,37 +64,37 @@ export function start(zcf: ZCF<GovernanceTerms<{
                 Electorate: "invitation";
             }>;
         }>;
-        getInvitation: (name: any) => Promise<globalThis.Invitation>;
+        getInvitation: (name: any) => Promise<Invitation>;
         getLimitedCreatorFacet: () => import("@endo/exo").Guarded<{
-            getRewardAllocation(): Allocation;
-            makeCollectFeesInvitation(): Promise<globalThis.Invitation<string>>;
-            makeRestoreMetricsInvitation(): Promise<globalThis.Invitation<void, Omit<MetricsNotification, "anchorPoolBalance">>>;
+            getRewardAllocation(): import("@agoric/zoe").Allocation;
+            makeCollectFeesInvitation(): Promise<Invitation<string>>;
+            makeRestoreMetricsInvitation(): Promise<Invitation<void, Omit<MetricsNotification, "anchorPoolBalance">>>;
         }>;
-        getGovernedApis: () => GovernedApis;
+        getGovernedApis: () => import("@agoric/governance").GovernedApis;
         getGovernedApiNames: () => string[];
         setOfferFilter: (strings: any) => Promise<void>;
     }>;
     publicFacet: import("@endo/exo").Guarded<{
         getAmount: (name: string) => Amount;
         getBrand: (name: string) => Brand;
-        getInstance: (name: string) => Instance;
-        getInstallation: (name: string) => Installation;
-        getInvitationAmount: (name: string) => InvitationAmount;
+        getInstance: (name: string) => import("@agoric/zoe").Instance;
+        getInstallation: (name: string) => import("@agoric/zoe").Installation;
+        getInvitationAmount: (name: string) => import("@agoric/zoe").InvitationAmount;
         getNat: (name: string) => bigint;
         getRatio: (name: string) => Ratio;
         getString: (name: string) => string;
         getTimestamp: (name: string) => import("@agoric/time").TimestampRecord;
         getRelativeTime: (name: string) => import("@agoric/time").RelativeTimeRecord;
         getUnknown: (name: string) => any;
-        getSubscription: () => globalThis.StoredSubscription<globalThis.GovernanceSubscriptionState>;
-        getGovernedParams: () => globalThis.ERef<globalThis.ParamStateRecord>;
-        getMetrics(): globalThis.Subscriber<MetricsNotification>;
+        getSubscription: () => import("@agoric/notifier").StoredSubscription<import("@agoric/governance").GovernanceSubscriptionState>;
+        getGovernedParams: () => import("@endo/eventual-send").ERef<import("@agoric/governance").ParamStateRecord>;
+        getMetrics(): import("@agoric/notifier").Subscriber<MetricsNotification>;
         getPoolBalance(): import("@agoric/ertp").NatAmount;
         getPublicTopics(): {
             metrics: import("@agoric/zoe/src/contractSupport/topics.js").PublicTopic<MetricsNotification>;
         };
-        makeWantMintedInvitation(): Promise<globalThis.Invitation<void, undefined>>;
-        makeGiveMintedInvitation(): Promise<globalThis.Invitation<void, undefined>>;
+        makeWantMintedInvitation(): Promise<Invitation<void, undefined>>;
+        makeGiveMintedInvitation(): Promise<Invitation<void, undefined>>;
     }>;
 }>;
 /**
@@ -126,8 +130,16 @@ export type MetricsNotification = {
 };
 export type PsmPublicFacet = EReturn<typeof start>["publicFacet"];
 import type { ContractMeta } from '@agoric/zoe';
+import type { GovernanceTerms } from '@agoric/governance/src/types.js';
+import type { Brand } from '@agoric/ertp';
+import type { Ratio } from '@agoric/ertp';
+import type { ZCF } from '@agoric/zoe';
 import type { FeeMintAccess } from '@agoric/zoe';
+import type { Invitation } from '@agoric/zoe';
+import type { StorageNode } from '@agoric/internal/src/lib-chainStorage.js';
+import type { Remote } from '@agoric/internal';
+import type { Marshaller } from '@agoric/internal/src/lib-chainStorage.js';
 import type { Baggage } from '@agoric/vat-data';
-import type { Installation } from '@agoric/zoe';
+import type { Amount } from '@agoric/ertp';
 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;;;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"}
+{"version":3,"file":"psm.d.ts","sourceRoot":"","sources":["psm.js"],"names":[],"mappings":"AAkCA;;;;;;GAMG;AAEH;;;;;;;;;;;GAWG;AAEH;;;;;;;;;;;;;GAaG;AAEH,yCAAyC;AACzC,mBADW,aAAa,OAAO,KAAK,CAAC,CAmCnC;AAsBK,2BAlBI,IACV,gBAAoB;IACd,aAAa,EAAE,OAAO,CAAC;IACvB,aAAa,EAAE,OAAO,CAAC;IACvB,SAAS,EAAE,QAAQ,CAAC;CACrB,CAAC,GAAG;IACH,WAAW,EAAE,MAAM,KAAK,CAAC,CAAC;IAC1B,eAAe,EAAE,KAAK,CAAC;CACxB,CACF,eACO;IACN,aAAa,EAAE,aAAa,CAAC;IAC7B,sBAAsB,EAAE,UAAU,CAAC;IACnC,WAAW,EAAE,OAAO,WAAW,CAAC,CAAC;IACjC,UAAU,EAAE,OAAO,UAAU,CAAC,CAAC;CAChC,WACO,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqUjB;;;;;;;;;;uBAxYa,OAAO,KAAK,CAAC;;;;;uBAEb,OAAO,KAAK,CAAC;;;;;oBAEb,OAAO,KAAK,CAAC;;;;;yBAEb,OAAO,KAAK,CAAC;;;;;yBAEb,OAAO,KAAK,CAAC;;6BAmYb,QAAQ,OAAO,KAAK,CAAb,CAAe,aAAa,CAAC;kCAvZsB,aAAa;qCAEnD,iCAAiC;2BAE3C,cAAc;2BAHd,cAAc;yBADkC,aAAa;mCAAb,aAAa;gCAAb,aAAa;iCAKvD,0CAA0C;4BAPjC,kBAAkB;gCAQ5B,0CAA0C;6BAP7C,kBAAkB;4BAInB,cAAc;6BANb,WAAW"}