give up

Agoric · Feb 10, 2023 · 00cc7c1 · 00cc7c1
1 parent fbfddb6
commit 00cc7c1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/packages/inter-protocol/src/proposals/econ-behaviors.js b/packages/inter-protocol/src/proposals/econ-behaviors.js
@@ -312,6 +312,7 @@ export const setupReserve = async ({
     }),
   );
   /** @type {{ creatorFacet: GovernedAssetReserveFacetAccess, publicFacet: GovernorPublic, instance: Instance, adminFacet: AdminFacet }} */
+  // @ts-expect-error XXX governance types for governed contract
   const g = await E(zoe).startInstance(
     governorInstallation,
     {},
@@ -486,6 +487,7 @@ export const startVaultFactory = async (
     ]);
 
   vaultFactoryKit.resolve(
+    // @ts-expect-error XXX governance types for governed contract
     harden({
       creatorFacet: vaultFactoryCreator,
       governorCreatorFacet,
@@ -630,6 +632,7 @@ export const startRewardDistributor = async ({
     Object.entries(collectorKit).map(async ([debugName, collectorFacet]) => {
       const collector = E(instanceKit.creatorFacet).makeContractFeeCollector(
         zoe,
+        // @ts-expect-error FIXME seems like a bug
         collectorFacet,
       );
       const periodicCollector = await E(
@@ -773,6 +776,7 @@ export const startStakeFactory = async (
   );
 
   /** @type {{ publicFacet: GovernorPublic, creatorFacet: GovernedContractFacetAccess<StakeFactoryPublic,StakeFactoryCreator>, adminFacet: AdminFacet}} */
+  // @ts-expect-error XXX governance types for governed contract
   const governorStartResult = await E(zoe).startInstance(
     contractGovernorInstallation,
     {},

diff --git a/packages/inter-protocol/src/vaultFactory/params.js b/packages/inter-protocol/src/vaultFactory/params.js
@@ -28,11 +28,11 @@ export const SHORTFALL_INVITATION_KEY = 'ShortfallInvitation';
 export const ENDORSED_UI_KEY = 'EndorsedUI';
 
 /**
- * @param {Amount} electorateInvitationAmount
+ * @param {Amount<'set'>} electorateInvitationAmount
  * @param {Installation} liquidationInstall
  * @param {import('./liquidation.js').LiquidationTerms} liquidationTerms
- * @param {Amount} minInitialDebt
- * @param {Amount} shortfallInvitationAmount
+ * @param {Amount<'nat'>} minInitialDebt
+ * @param {Amount<'set'>} shortfallInvitationAmount
  * @param {string} endorsedUi
  */
 const makeVaultDirectorParams = (
@@ -152,8 +152,8 @@ harden(makeVaultDirectorParamManager);
 /**
  * @param {{storageNode: ERef<StorageNode>, marshaller: ERef<Marshaller>}} caps
  * @param {{
- *   electorateInvitationAmount: Amount,
- *   minInitialDebt: Amount,
+ *   electorateInvitationAmount: Amount<'set'>,
+ *   minInitialDebt: Amount<'nat'>,
  *   bootstrapPaymentValue: bigint,
  *   priceAuthority: ERef<PriceAuthority>,
  *   timer: ERef<import('@agoric/time/src/types').TimerService>,
@@ -162,7 +162,7 @@ harden(makeVaultDirectorParamManager);
  *   loanTiming: LoanTiming,
  *   liquidationTerms: import('./liquidation.js').LiquidationTerms,
  *   ammPublicFacet: XYKAMMPublicFacet,
- *   shortfallInvitationAmount: Amount,
+ *   shortfallInvitationAmount: Amount<'set'>,
  *   endorsedUi?: string,
  * }} opts
  */

diff --git a/packages/inter-protocol/test/psm/test-governedPsm.js b/packages/inter-protocol/test/psm/test-governedPsm.js
@@ -192,6 +192,8 @@ test('replace electorate of Economic Committee', async t => {
 
   const { governorCreatorFacet } = governor;
   await E(governorCreatorFacet).replaceElectorate(newPoserInvitation);
+  /** @type {GovernedPublicFacet<unknown>} */
+  // TODO this should come from the call
   const pf = await E(governorCreatorFacet).getPublicFacet();
   const { Electorate: newElectorate } = await E(pf).getGovernedParams();
   t.is(newElectorate.type, 'invitation');