@agoric/inter-protocol 0.13.2-dev-a3f4ef3.0 → 0.13.2-dev-7ccf3ab.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/inter-protocol",
-  "version": "0.13.2-dev-a3f4ef3.0+a3f4ef3",
+  "version": "0.13.2-dev-7ccf3ab.0+7ccf3ab",
   "description": "Core cryptoeconomy contracts",
   "type": "module",
   "main": "src/index.js",
@@ -29,28 +29,28 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/assert": "0.5.2-dev-a3f4ef3.0+a3f4ef3",
-    "@agoric/ertp": "0.15.4-dev-a3f4ef3.0+a3f4ef3",
-    "@agoric/governance": "0.9.2-dev-a3f4ef3.0+a3f4ef3",
-    "@agoric/internal": "0.2.2-dev-a3f4ef3.0+a3f4ef3",
-    "@agoric/notifier": "0.5.2-dev-a3f4ef3.0+a3f4ef3",
-    "@agoric/store": "0.8.4-dev-a3f4ef3.0+a3f4ef3",
-    "@agoric/time": "0.2.2-dev-a3f4ef3.0+a3f4ef3",
-    "@agoric/vat-data": "0.4.4-dev-a3f4ef3.0+a3f4ef3",
-    "@agoric/vats": "0.13.1-dev-a3f4ef3.0+a3f4ef3",
-    "@agoric/zoe": "0.25.4-dev-a3f4ef3.0+a3f4ef3",
+    "@agoric/assert": "0.5.2-dev-7ccf3ab.0+7ccf3ab",
+    "@agoric/ertp": "0.15.4-dev-7ccf3ab.0+7ccf3ab",
+    "@agoric/governance": "0.9.2-dev-7ccf3ab.0+7ccf3ab",
+    "@agoric/internal": "0.2.2-dev-7ccf3ab.0+7ccf3ab",
+    "@agoric/notifier": "0.5.2-dev-7ccf3ab.0+7ccf3ab",
+    "@agoric/store": "0.8.4-dev-7ccf3ab.0+7ccf3ab",
+    "@agoric/time": "0.2.2-dev-7ccf3ab.0+7ccf3ab",
+    "@agoric/vat-data": "0.4.4-dev-7ccf3ab.0+7ccf3ab",
+    "@agoric/vats": "0.13.1-dev-7ccf3ab.0+7ccf3ab",
+    "@agoric/zoe": "0.25.4-dev-7ccf3ab.0+7ccf3ab",
     "@endo/captp": "^3.1.0",
     "@endo/eventual-send": "^0.17.1",
     "@endo/far": "^0.2.17",
     "@endo/marshal": "^0.8.4",
     "@endo/nat": "^4.1.26",
-    "agoric": "0.18.3-dev-a3f4ef3.0+a3f4ef3"
+    "agoric": "0.18.3-dev-7ccf3ab.0+7ccf3ab"
   },
   "devDependencies": {
-    "@agoric/deploy-script-support": "0.9.5-dev-a3f4ef3.0+a3f4ef3",
-    "@agoric/smart-wallet": "0.4.3-dev-a3f4ef3.0+a3f4ef3",
-    "@agoric/swingset-liveslots": "0.9.1-dev-a3f4ef3.0+a3f4ef3",
-    "@agoric/swingset-vat": "0.30.3-dev-a3f4ef3.0+a3f4ef3",
+    "@agoric/deploy-script-support": "0.9.5-dev-7ccf3ab.0+7ccf3ab",
+    "@agoric/smart-wallet": "0.4.3-dev-7ccf3ab.0+7ccf3ab",
+    "@agoric/swingset-liveslots": "0.9.1-dev-7ccf3ab.0+7ccf3ab",
+    "@agoric/swingset-vat": "0.30.3-dev-7ccf3ab.0+7ccf3ab",
     "@endo/bundle-source": "^2.5.0",
     "@endo/init": "^0.5.55",
     "@endo/promise-kit": "^0.2.55",
@@ -76,5 +76,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a3f4ef33984d171fa2c0d7759e232f48ad98f743"
+  "gitHead": "7ccf3ab26ea33c1d148401e0f2a87691a2a7a8e5"
 }

package/src/econCommitteeCharter.js

@@ -40,7 +40,7 @@ const ParamChangesOfferArgsShape = M.splitRecord(
  */
 export const start = async zcf => {
   const { binaryVoteCounterInstallation: counter } = zcf.getTerms();
-  /** @type {MapStore<Instance,GovernedContractFacetAccess<{},{}>>} */
+  /** @type {MapStore<Instance, GovernorCreatorFacet<any>>} */
   const instanceToGovernor = makeScalarMapStore();
 
   const makeParamInvitation = () => {
@@ -140,7 +140,7 @@ export const start = async zcf => {
   const creatorFacet = makeExo('Charter creatorFacet', charterCreatorI, {
     /**
      * @param {Instance} governedInstance
-     * @param {GovernedContractFacetAccess<{},{}>} governorFacet
+     * @param {GovernorCreatorFacet<any>} governorFacet
      * @param {string} [label] for diagnostic use only
      */
     addInstance: (governedInstance, governorFacet, label) => {

package/src/feeDistributor.js

@@ -38,7 +38,7 @@ export const customTermsShape = harden({
 
 /**
  * @typedef {object} CollectibleContractFacet
- * @property {() => Promise<Invitation>} makeCollectFeesInvitation
+ * @property {() => Promise<Invitation<string, never>>} makeCollectFeesInvitation
  */
 
 /**

package/src/proposals/econ-behaviors.js

@@ -35,17 +35,13 @@ const BASIS_POINTS = 10_000n;
  * @typedef {object} PSMKit
  * @property {Instance} psm
  * @property {Instance} psmGovernor
- * @property {Awaited<ReturnType<import('../psm/psm.js').start>>['creatorFacet']} psmCreatorFacet
- * @property {GovernedContractFacetAccess<import('../../src/psm/psm.js').PsmPublicFacet,{}>} psmGovernorCreatorFacet
+ * @property {Awaited<ReturnType<Awaited<ReturnType<import('../psm/psm.js').start>>['creatorFacet']['getLimitedCreatorFacet']>>} psmCreatorFacet
+ * @property {GovernorCreatorFacet<import('../../src/psm/psm.js')['start']>} psmGovernorCreatorFacet
  * @property {AdminFacet} psmAdminFacet
  */
 
 /**
- * @typedef {object} AuctioneerKit
- * @property {Awaited<ReturnType<import('../auction/auctioneer.js').start>>['creatorFacet']} creatorFacet
- * @property {Awaited<ReturnType<import('../auction/auctioneer.js').start>>['publicFacet']} publicFacet
- * @property {GovernedContractFacetAccess<{},{}>} governorCreatorFacet
- * @property {AdminFacet} adminFacet
+ * @typedef {GovernanceFacetKit<import('../auction/auctioneer.js').start>} AuctioneerKit
  */
 
 /**
@@ -63,24 +59,9 @@ const BASIS_POINTS = 10_000n;
  *   bankMints: Mint[],
  *   psmKit: MapStore<Brand, PSMKit>,
  *   econCharterKit: EconCharterStartResult,
- *   reserveKit: {
- *     publicFacet: import('../reserve/assetReserve.js').AssetReservePublicFacet,
- *     creatorFacet: import('../reserve/assetReserve.js').AssetReserveLimitedCreatorFacet,
- *     governorCreatorFacet: GovernedAssetReserveFacetAccess,
- *     adminFacet: AdminFacet,
- *   },
- *   stakeFactoryKit: {
- *     creatorFacet: StakeFactoryCreator,
- *     governorCreatorFacet: GovernedContractFacetAccess<{}, {}>,
- *     adminFacet: AdminFacet,
- *     publicFacet: StakeFactoryPublic,
- *   },
- *   vaultFactoryKit: {
- *     publicFacet: VaultFactoryPublicFacet,
- *     creatorFacet: VaultFactoryCreatorFacet,
- *     governorCreatorFacet: GovernedContractFacetAccess<VaultFactoryPublicFacet, VaultFactoryCreatorFacet>,
- *     adminFacet: AdminFacet,
- *   },
+ *   reserveKit: GovernanceFacetKit<import('../reserve/assetReserve.js')['start']>,
+ *   stakeFactoryKit: GovernanceFacetKit<import('../stakeFactory/stakeFactory.js')['start']>,
+ *   vaultFactoryKit: GovernanceFacetKit<import('../vaultFactory/vaultFactory.js')['start']>,
  *   auctioneerKit: AuctioneerKit,
  *   minInitialDebt: NatValue,
  * }>} EconomyBootstrapSpace
@@ -149,8 +130,7 @@ export const setupReserve = async ({
       },
     }),
   );
-  /** @type {{ creatorFacet: GovernedAssetReserveFacetAccess, publicFacet: GovernorPublic, instance: Instance, adminFacet: AdminFacet }} */
-  // @ts-expect-error XXX governance types https://github.com/Agoric/agoric-sdk/issues/7178
+  /** @type {GovernorStartedInstallationKit<typeof reserveInstallation>} */
   const g = await E(zoe).startInstance(
     governorInstallation,
     {},
@@ -287,6 +267,7 @@ export const startVaultFactory = async (
     }),
   );
 
+  /** @type {GovernorStartedInstallationKit<typeof vaultFactoryInstallation>} */
   const {
     creatorFacet: governorCreatorFacet,
     instance: governorInstance,
@@ -294,7 +275,6 @@ export const startVaultFactory = async (
   } = await E(zoe).startInstance(
     contractGovernorInstallation,
     undefined,
-    // @ts-expect-error XXX governance types https://github.com/Agoric/agoric-sdk/issues/7178
     governorTerms,
     harden({
       electorateCreatorFacet,
@@ -317,7 +297,6 @@ export const startVaultFactory = async (
     ]);
 
   vaultFactoryKit.resolve(
-    // @ts-expect-error XXX governance types https://github.com/Agoric/agoric-sdk/issues/7178
     harden({
       creatorFacet: vaultFactoryCreator,
       governorCreatorFacet,
@@ -590,12 +569,10 @@ export const startAuctioneer = async (
     }),
   );
 
-  /** @type {{ publicFacet: GovernorPublic, creatorFacet: GovernedContractFacetAccess<AuctioneerPublicFacet,AuctioneerCreatorFacet>, adminFacet: AdminFacet}} */
-  // @ts-expect-error XXX governance types https://github.com/Agoric/agoric-sdk/issues/7178
+  /** @type {GovernorStartedInstallationKit<typeof auctionInstallation>} */
   const governorStartResult = await E(zoe).startInstance(
     contractGovernorInstallation,
     undefined,
-    // @ts-expect-error XXX governance types https://github.com/Agoric/agoric-sdk/issues/7178
     governorTerms,
     harden({
       electorateCreatorFacet,
@@ -735,12 +712,10 @@ export const startStakeFactory = async (
     }),
   );
 
-  /** @type {{ publicFacet: GovernorPublic, creatorFacet: GovernedContractFacetAccess<StakeFactoryPublic,StakeFactoryCreator>, adminFacet: AdminFacet}} */
-  // @ts-expect-error XXX governance types https://github.com/Agoric/agoric-sdk/issues/7178
+  /** @type {GovernorStartedInstallationKit<typeof stakeFactoryInstallation>} */
   const governorStartResult = await E(zoe).startInstance(
     contractGovernorInstallation,
     {},
-    // @ts-expect-error XXX governance types https://github.com/Agoric/agoric-sdk/issues/7178
     stakeTerms,
     {
       governed: {

package/src/proposals/startPSM.js

@@ -145,6 +145,7 @@ export const startPSM = async (
       },
     }),
   );
+  /** @type {GovernorStartedInstallationKit<typeof psmInstall>} */
   const governorFacets = await E(zoe).startInstance(
     contractGovernor,
     {},
@@ -174,7 +175,6 @@ export const startPSM = async (
     psmGovernor: governorFacets.instance,
     psmCreatorFacet,
     psmAdminFacet,
-    // @ts-expect-error XXX governance types https://github.com/Agoric/agoric-sdk/issues/7178
     psmGovernorCreatorFacet: governorFacets.creatorFacet,
   };
 

package/src/reserve/assetReserve.js

@@ -295,7 +295,12 @@ const start = async (zcf, privateArgs, baggage) => {
   });
 
   const { creatorFacet, publicFacet: pFacet } = makeAssetReserve();
-  return { creatorFacet, publicFacet: pFacet };
+  return {
+    /** @type {GovernedCreatorFacet<OriginalAssetReserveCreatorFacet>} */
+    // @ts-expect-error cast
+    creatorFacet,
+    publicFacet: pFacet,
+  };
 };
 
 harden(start);
@@ -325,4 +330,4 @@ export { start };
 /** @typedef {Awaited<ReturnType<typeof start>>['publicFacet']} AssetReservePublicFacet */
 /** @typedef {Awaited<ReturnType<typeof start>>['creatorFacet']} AssetReserveCreatorFacet the creator facet for the governor */
 /** @typedef {OriginalAssetReserveCreatorFacet} AssetReserveLimitedCreatorFacet */
-/** @typedef {GovernedContractFacetAccess<AssetReservePublicFacet,AssetReserveLimitedCreatorFacet>} GovernedAssetReserveFacetAccess */
+/** @typedef {GovernorCreatorFacet<typeof start>} GovernedAssetReserveFacetAccess */

package/src/stakeFactory/stakeFactory.js

@@ -71,11 +71,15 @@ import { makeStakeFactoryManager } from './stakeFactoryManager.js';
  * authorizes placing a lien some of the staked assets in that account.
  * @typedef {{
  *   provideAttestationMaker: (addr: string) => AttestationTool,
- *   makeCollectFeesInvitation: () => Promise<Invitation>,
+ *   makeCollectFeesInvitation: () => Promise<Invitation<string, never>>,
  * }} StakeFactoryCreator
  *
- * @type {ContractStartFn<StakeFactoryPublic, ERef<GovernedCreatorFacet<StakeFactoryCreator>>,
- *                        StakeFactoryTerms, StakeFactoryPrivateArgs>}
+ */
+
+/**
+ *
+ * @param {ZCF<StakeFactoryTerms>} zcf
+ * @param {StakeFactoryPrivateArgs} privateArgs
  */
 export const start = async (
   zcf,
@@ -168,7 +172,6 @@ export const start = async (
     zcf,
     debtMint,
     harden({ Attestation: attestBrand, debt: debtBrand, Stake: stakeBrand }),
-    // @ts-expect-error xxx governance types https://github.com/Agoric/agoric-sdk/issues/7178
     mintPowers,
     { timerService, chargingPeriod, recordingPeriod, startTimeStamp },
   );

package/src/vaultFactory/params.js

@@ -32,9 +32,9 @@ export const vaultDirectorParamTypes = {
 harden(vaultDirectorParamTypes);
 
 /**
- * @param {Amount} electorateInvitationAmount
+ * @param {Amount<'set'>} electorateInvitationAmount
  * @param {Amount<'nat'>} minInitialDebt
- * @param {Amount} shortfallInvitationAmount
+ * @param {Amount<'set'>} shortfallInvitationAmount
  * @param {string} endorsedUi
  * @param {InterestTiming} interestTiming
  */
@@ -119,14 +119,14 @@ export const vaultParamPattern = M.splitRecord(
 /**
  * @param {{
  *   auctioneerPublicFacet: ERef<AuctioneerPublicFacet>,
- *   electorateInvitationAmount: Amount,
+ *   electorateInvitationAmount: Amount<'set'>,
  *   minInitialDebt: Amount<'nat'>,
  *   bootstrapPaymentValue: bigint,
  *   priceAuthority: ERef<PriceAuthority>,
  *   timer: ERef<import('@agoric/time/src/types').TimerService>,
  *   reservePublicFacet: AssetReservePublicFacet,
  *   interestTiming: InterestTiming,
- *   shortfallInvitationAmount: Amount,
+ *   shortfallInvitationAmount: Amount<'set'>,
  *   endorsedUi?: string,
  * }} opts
  */

package/src/vaultFactory/types.js

@@ -51,7 +51,7 @@
  * @typedef  {object} VaultFactoryCreatorFacet
  * @property {AddVaultType} addVaultType
  * @property {() => Allocation} getRewardAllocation
- * @property {() => Promise<Invitation>} makeCollectFeesInvitation
+ * @property {() => Promise<Invitation<string, never>>} makeCollectFeesInvitation
  * @property {() => void} updateMetrics
  * @property {() => import('@agoric/time/src/types').TimerWaker} makeLiquidationWaker
  * @property {() => import('@agoric/time/src/types').TimerWaker} makePriceLockWaker

package/src/vaultFactory/vaultDirector.js

@@ -223,7 +223,6 @@ export const prepareVaultDirector = (
         getGovernedParams: M.call({ collateralBrand: BrandShape }).returns(
           M.record(),
         ),
-        getContractGovernor: M.call().returns(M.remotable()),
         getInvitationAmount: M.call(M.string()).returns(AmountShape),
         getPublicTopics: M.call().returns(TopicsRecordShape),
       }),
@@ -258,7 +257,9 @@ export const prepareVaultDirector = (
         getLimitedCreatorFacet() {
           return this.facets.machine;
         },
+        /** @returns {ERef<GovernedApis>} */
         getGovernedApis() {
+          // @ts-expect-error cast
           return Far('governedAPIs', {});
         },
         getGovernedApiNames() {
@@ -507,15 +508,6 @@ export const prepareVaultDirector = (
           // TODO use named getters of TypedParamManager
           return vaultParamManagers.get(collateralBrand).getParams();
         },
-        /**
-         * @returns {Promise<GovernorPublic>}
-         */
-        getContractGovernor() {
-          // PERF consider caching
-          return E(zcf.getZoeService()).getPublicFacet(
-            zcf.getTerms().electionManager,
-          );
-        },
         /**
          * @param {string} name
          */