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

package/src/proposals/econ-behaviors.js

@@ -1,4 +1,4 @@
-// @jessie-check
+/* eslint-disable @agoric/group-jsdoc-imports -- due to conflicting `start` values */
 
 import { AmountMath } from '@agoric/ertp';
 import { deeplyFulfilledObject, makeTracer } from '@agoric/internal';
@@ -6,23 +6,29 @@ import { makeStorageNodeChild } from '@agoric/internal/src/lib-chainStorage.js';
 import { E } from '@endo/far';
 import { makeScalarBigMapStore } from '@agoric/vat-data';
 import { Stable } from '@agoric/internal/src/tokens.js';
-import { makeGovernedTerms as makeGovernedATerms } from '../auction/params.js';
 import { makeReserveTerms } from '../reserve/params.js';
 import { makeGovernedTerms as makeGovernedVFTerms } from '../vaultFactory/params.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';
+ * @import {Amount, Brand, NatValue, Payment} from '@agoric/ertp';
+ * @import {AdminFacet, Instance} from '@agoric/zoe';
  * @import {MapStore, SetStore} from '@agoric/store';
+ * @import {RelativeTime} from '@agoric/time';
+ * @import {WellKnownSpaces} from '@agoric/vats/src/core/types.js';
+ * @import {ChainBootstrapSpace} from '@agoric/vats/src/core/types.js';
+ * @import {PromiseSpaceOf} from '@agoric/vats/src/core/types.js';
+ * @import {CommitteeElectorateCreatorFacet} from '@agoric/governance/src/committee.js';
+ * @import {PeriodicFeeCollector} from '../feeDistributor.js';
  */
 
-// Duplicated from vaultFactory/types-ambient.js to solve a CI problem.
+// Duplicated from vaultFactory/types.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
+ * @property {RelativeTime} chargingPeriod in seconds
+ * @property {RelativeTime} recordingPeriod in seconds
  */
 
 const trace = makeTracer('RunEconBehaviors', true);
@@ -38,58 +44,53 @@ export const SECONDS_PER_WEEK = 7n * SECONDS_PER_DAY;
 /**
  * @typedef {object} PSMKit
  * @property {string} label
- * @property {Instance<import('../psm/psm.js').start>} psm
+ * @property {Instance<typeof import('../psm/psm.js').start>} psm
  * @property {Instance<
- *   import('../../../governance/src/contractGovernor.js').start
+ *   typeof import('../../../governance/src/contractGovernor.js').start
  * >} psmGovernor
  * @property {Awaited<
  *   ReturnType<
  *     Awaited<
- *       ReturnType<import('../psm/psm.js')['start']>
+ *       ReturnType<typeof import('../psm/psm.js').start>
  *     >['creatorFacet']['getLimitedCreatorFacet']
  *   >
  * >} psmCreatorFacet
- * @property {GovernorCreatorFacet<import('../../src/psm/psm.js')['start']>} psmGovernorCreatorFacet
+ * @property {GovernorCreatorFacet<
+ *   typeof import('../../src/psm/psm.js').start
+ * >} psmGovernorCreatorFacet
  * @property {AdminFacet} psmAdminFacet
  */
 
-/** @typedef {GovernanceFacetKit<import('../auction/auctioneer.js').start>} AuctioneerKit */
-
 /**
  * @typedef {WellKnownSpaces & ChainBootstrapSpace & EconomyBootstrapSpace} EconomyBootstrapPowers
  *
  *
  * @typedef {PromiseSpaceOf<{
  *   economicCommitteeKit: CommitteeStartResult;
- *   economicCommitteeCreatorFacet: import('@agoric/governance/src/committee.js').CommitteeElectorateCreatorFacet;
+ *   economicCommitteeCreatorFacet: CommitteeElectorateCreatorFacet;
  *   feeDistributorKit: StartedInstanceKit<
  *     typeof import('../feeDistributor.js').start
  *   >;
- *   periodicFeeCollectors: MapStore<
- *     number,
- *     import('../feeDistributor.js').PeriodicFeeCollector
- *   >;
+ *   periodicFeeCollectors: MapStore<number, PeriodicFeeCollector>;
  *   psmKit: MapStore<Brand, PSMKit>;
  *   anchorBalancePayments: MapStore<Brand, Payment<'nat'>>;
  *   econCharterKit: EconCharterStartResult;
  *   reserveKit: GovernanceFacetKit<
- *     import('../reserve/assetReserve.js')['start']
+ *     typeof import('../reserve/assetReserve.js').start
  *   >;
  *   vaultFactoryKit: GovernanceFacetKit<VFStart>;
- *   auctioneerKit: AuctioneerKit;
- *   newAuctioneerKit: AuctioneerKit | undefined;
  *   minInitialDebt: NatValue;
  * }>} EconomyBootstrapSpace
  */
 
 /**
  * @typedef {StartedInstanceKit<
- *   import('../econCommitteeCharter.js')['start']
+ *   typeof import('../econCommitteeCharter.js').start
  * >} EconCharterStartResult
  */
 /**
  * @typedef {StartedInstanceKit<
- *   import('@agoric/governance/src/committee.js')['start']
+ *   typeof import('@agoric/governance/src/committee.js').start
  * >} CommitteeStartResult
  */
 
@@ -232,7 +233,6 @@ export const setupVaultFactoryArguments = async (
     feeMintAccess: feeMintAccessP,
     economicCommitteeCreatorFacet: electorateCreatorFacet,
     reserveKit,
-    auctioneerKit,
   } = consume;
 
   const poserInvitationP = E(electorateCreatorFacet).getPoserInvitation();
@@ -246,14 +246,12 @@ export const setupVaultFactoryArguments = async (
     initialShortfallInvitation,
     shortfallInvitationAmount,
     feeMintAccess,
-    auctioneerInstance,
   ] = await Promise.all([
     poserInvitationP,
     E(E(zoe).getInvitationIssuer()).getAmountOf(poserInvitationP),
     shortfallInvitationP,
     E(E(zoe).getInvitationIssuer()).getAmountOf(shortfallInvitationP),
     feeMintAccessP,
-    E.get(auctioneerKit).instance,
   ]);
 
   const reservePublicFacet = await E.get(reserveKit).publicFacet;
@@ -273,7 +271,6 @@ export const setupVaultFactoryArguments = async (
   });
 
   const vaultFactoryPrivateArgs = {
-    auctioneerInstance,
     feeMintAccess,
     initialPoserInvitation,
     initialShortfallInvitation,
@@ -479,7 +476,6 @@ export const startRewardDistributor = async ({
   const instanceKit = await E(zoe).startInstance(
     feeDistributor,
     { Fee: centralIssuer },
-    // @ts-expect-error XXX
     feeDistributorTerms,
     undefined,
     'feeDistributor',
@@ -526,130 +522,3 @@ export const startRewardDistributor = async ({
   );
 };
 harden(startRewardDistributor);
-
-/**
- * @param {EconomyBootstrapPowers} powers
- * @param {object} config
- * @param {any} [config.auctionParams]
- */
-export const startAuctioneer = async (
-  {
-    consume: {
-      zoe,
-      board,
-      chainTimerService,
-      priceAuthority,
-      chainStorage,
-      economicCommitteeCreatorFacet: electorateCreatorFacet,
-    },
-    produce: { auctioneerKit },
-    instance: {
-      produce: { auctioneer: auctionInstance },
-      consume: { reserve: reserveInstance },
-    },
-    installation: {
-      consume: {
-        auctioneer: auctionInstallation,
-        contractGovernor: contractGovernorInstallation,
-      },
-    },
-    issuer: {
-      consume: { [Stable.symbol]: stableIssuerP },
-    },
-  },
-  {
-    auctionParams = {
-      StartFrequency: 1n * SECONDS_PER_HOUR,
-      ClockStep: 3n * SECONDS_PER_MINUTE,
-      StartingRate: 10500n,
-      LowestRate: 6500n,
-      DiscountStep: 500n,
-      AuctionStartDelay: 2n,
-      PriceLockPeriod: SECONDS_PER_HOUR / 2n,
-    },
-  } = {},
-) => {
-  trace('startAuctioneer');
-  const STORAGE_PATH = 'auction';
-
-  const poserInvitationP = E(electorateCreatorFacet).getPoserInvitation();
-
-  const [initialPoserInvitation, electorateInvitationAmount, stableIssuer] =
-    await Promise.all([
-      poserInvitationP,
-      E(E(zoe).getInvitationIssuer()).getAmountOf(poserInvitationP),
-      stableIssuerP,
-    ]);
-
-  const timerBrand = await E(chainTimerService).getTimerBrand();
-
-  const storageNode = await makeStorageNodeChild(chainStorage, STORAGE_PATH);
-  const marshaller = await E(board).getReadonlyMarshaller();
-
-  const reservePublicFacet = await E(zoe).getPublicFacet(reserveInstance);
-
-  const auctionTerms = makeGovernedATerms(
-    { storageNode, marshaller },
-    chainTimerService,
-    priceAuthority,
-    reservePublicFacet,
-    {
-      ...auctionParams,
-      ElectorateInvitationAmount: electorateInvitationAmount,
-      TimerBrand: timerBrand,
-    },
-  );
-
-  const governorTerms = await deeplyFulfilledObject(
-    harden({
-      timer: chainTimerService,
-      governedContractInstallation: auctionInstallation,
-      governed: {
-        terms: auctionTerms,
-        issuerKeywordRecord: { Bid: stableIssuer },
-        storageNode,
-        marshaller,
-        label: 'auctioneer',
-      },
-    }),
-  );
-
-  /** @type {GovernorStartedInstallationKit<typeof auctionInstallation>} */
-  const governorStartResult = await E(zoe).startInstance(
-    contractGovernorInstallation,
-    undefined,
-    governorTerms,
-    harden({
-      electorateCreatorFacet,
-      governed: {
-        initialPoserInvitation,
-        storageNode,
-        marshaller,
-      },
-    }),
-    'auctioneer.governor',
-  );
-
-  const [governedInstance, governedCreatorFacet, governedPublicFacet] =
-    await Promise.all([
-      E(governorStartResult.creatorFacet).getInstance(),
-      E(governorStartResult.creatorFacet).getCreatorFacet(),
-      E(governorStartResult.creatorFacet).getPublicFacet(),
-    ]);
-
-  auctioneerKit.resolve(
-    harden({
-      label: 'auctioneer',
-      creatorFacet: governedCreatorFacet,
-      adminFacet: governorStartResult.adminFacet,
-      publicFacet: governedPublicFacet,
-      instance: governedInstance,
-
-      governor: governorStartResult.instance,
-      governorCreatorFacet: governorStartResult.creatorFacet,
-      governorAdminFacet: governorStartResult.adminFacet,
-    }),
-  );
-
-  auctionInstance.resolve(governedInstance);
-};

package/src/proposals/price-feed-proposal.js

@@ -13,6 +13,14 @@ import {
   reserveThenGetNames,
 } from './utils.js';
 
+/**
+ * @import {ChainlinkConfig} from '@agoric/inter-protocol/src/price/fluxAggregatorKit.js';
+ * @import {EconomyBootstrapPowers} from './econ-behaviors.js';
+ * @import {start} from '@agoric/inter-protocol/src/price/fluxAggregatorContract.js';
+ * @import {Installation} from '@agoric/zoe';
+ * @import {ChainBootstrapSpace} from '@agoric/vats/src/core/types.js';
+ */
+
 // backwards compatibility
 export { oracleBrandFeedName as instanceNameFor };
 
@@ -88,10 +96,10 @@ export const ensureOracleBrands = async (
  *     priceFeedOptions: {
  *       AGORIC_INSTANCE_NAME: string;
  *       oracleAddresses: string[];
- *       contractTerms: import('@agoric/inter-protocol/src/price/fluxAggregatorKit.js').ChainlinkConfig;
+ *       contractTerms: ChainlinkConfig;
  *       IN_BRAND_NAME: string;
  *       OUT_BRAND_NAME: string;
- *       priceAggregatorRef: Installation;
+ *       priceAggregatorRef?: Installation;
  *     };
  *   };
  * }} config
@@ -167,7 +175,9 @@ export const createPriceFeed = async (
   /**
    * @type {[
    *   [Brand<'nat'>, Brand<'nat'>],
-   *   Installation<import('@agoric/inter-protocol/src/price/fluxAggregatorContract.js')['start]>,
+   *   Installation<
+   *     typeof start
+   *   >,
    *   Timer,
    * ]}
    */
@@ -316,7 +326,7 @@ export const getManifestForPriceFeed = async (
 });
 
 /**
- * @param {import('./econ-behaviors.js').EconomyBootstrapPowers} powers
+ * @param {EconomyBootstrapPowers} powers
  * @param {object} [config]
  * @param {object} [config.options]
  * @param {string[]} [config.options.demoOracleAddresses]

package/src/proposals/replace-fee-distributor.js

@@ -3,12 +3,18 @@ import { Stable } from '@agoric/internal/src/tokens.js';
 import { makeScalarBigMapStore } from '@agoric/vat-data';
 import { getInterfaceOf, E } from '@endo/far';
 
+/**
+ * @import {EconomyBootstrapPowers} from './econ-behaviors.js';
+ * @import {start} from '@agoric/inter-protocol/src/feeDistributor.js';
+ * @import {StartedInstanceKit} from '@agoric/vats/src/core/types.js';
+ */
+
 const trace = makeTracer('ReplaceFeeDistributer', true);
 
 /**
  * Start the reward distributor.
  *
- * @param {import('./econ-behaviors').EconomyBootstrapPowers} powers
+ * @param {EconomyBootstrapPowers} powers
  * @param {{
  *   options: {
  *     keywordShares: Record<string, bigint>;
@@ -76,9 +82,7 @@ export const replaceFeeDistributor = async (
     });
 
   /**
-   * @type {StartedInstanceKit<
-   *   typeof import('@agoric/inter-protocol/src/feeDistributor.js').start
-   * >}
+   * @type {StartedInstanceKit<typeof start>}
    */
   const instanceKit = await E(zoe).startInstance(
     feeDistributor,

package/src/proposals/replace-scaledPriceAuthorities.js

@@ -4,10 +4,16 @@ import { E } from '@endo/far';
 import { startScaledPriceAuthority } from './addAssetToVault.js';
 import { scaledPriceFeedName } from './utils.js';
 
+/**
+ * @import {BootstrapPowers} from '@agoric/vats/src/core/types.js';
+ * @import {ChainBootstrapSpace} from '@agoric/vats/src/core/types.js';
+ * @import {EconomyBootstrapPowers} from './core-proposal.js';
+ */
+
 const trace = makeTracer('replaceScaledPA', true);
 
 /**
- * @param {BootstrapPowers} powers
+ * @param {EconomyBootstrapPowers} powers
  * @param {object} config
  * @param {object} config.options
  */
@@ -32,7 +38,7 @@ export const replaceScaledPriceAuthority = async (powers, { options }) => {
  * scaledPriceAuthorities. The existing contracts will be left behind to be
  * cleaned up later.
  *
- * @param {ChainBootstrapSpace & BootstrapPowers} powers
+ * @param {EconomyBootstrapPowers} powers
  * @param {{ options: { scaledPARef: { bundleID: string } } }} options
  */
 export const replaceScaledPriceAuthorities = async (powers, { options }) => {

package/src/proposals/replaceElectorate.js

@@ -17,7 +17,12 @@ import {
 } from '@agoric/internal/src/lib-chainStorage.js';
 import { provideRetiredInstances, reserveThenDeposit } from './utils.js';
 
-/** @import {EconomyBootstrapPowers} from './econ-behaviors.js' */
+/**
+ * @import {EconomyBootstrapPowers} from './econ-behaviors.js'
+ * @import {Instance, Invitation} from '@agoric/zoe';
+ * @import {MapStore} from '@agoric/store';
+ * @import {PromiseSpaceOf} from '@agoric/vats/src/core/types.js';
+ */
 /** @import {EconCharterStartResult} from './econ-behaviors.js' */
 /** @import {CommitteeElectorateCreatorFacet} from '@agoric/governance/src/committee.js'; */
 
@@ -368,6 +373,7 @@ const startNewEconCharter = async ({
   const terms = harden({
     binaryVoteCounterInstallation: counterInstall,
   });
+  /** @type {EconCharterStartResult} */
   const startResult = await E(startUpgradable)({
     label,
     installation: charterInstall,

package/src/proposals/startEconCommittee.js

@@ -5,6 +5,10 @@ import {
 } from '@agoric/internal/src/lib-chainStorage.js';
 import { E } from '@endo/far';
 
+/**
+ * @import {EconomyBootstrapPowers} from './econ-behaviors.js';
+ */
+
 const trace = makeTracer('RunEconCommittee', true);
 
 /** @type {(name: string) => string} */
@@ -21,7 +25,7 @@ const sanitizePathSegment = name => {
  */
 
 /**
- * @param {import('./econ-behaviors.js').EconomyBootstrapPowers} powers
+ * @param {EconomyBootstrapPowers} powers
  * @param {object} config
  * @param {object} [config.options]
  * @param {EconCommitteeOptions} [config.options.econCommitteeOptions]

package/src/proposals/startPSM.js

@@ -1,5 +1,3 @@
-// @jessie-check
-
 import { makeMap } from 'jessie.js';
 import { X } from '@endo/errors';
 import { E } from '@endo/far';
@@ -11,7 +9,7 @@ import {
   makeHistoryReviver,
   makeBoardRemote,
   slotToBoardRemote,
-} from '@agoric/internal/src/marshal.js';
+} from '@agoric/internal/src/marshal/board-client-utils.js';
 import { deeplyFulfilledObject } from '@agoric/internal';
 import { makeScalarBigMapStore } from '@agoric/vat-data';
 import { Stable } from '@agoric/internal/src/tokens.js';
@@ -24,7 +22,18 @@ import {
   inviteToEconCharter,
 } from './committee-proposal.js';
 
-/** @import {BootstrapManifest} from '@agoric/vats/src/core/lib-boot.js' */
+/**
+ * @import {BootstrapManifest} from '@agoric/vats/src/core/lib-boot.js'
+ * @import {PSMKit} from './econ-behaviors.js';
+ * @import {FeeMintAccess} from '@agoric/zoe';
+ * @import {GovernanceSubscriptionState, GovernorStartedInstallationKit} from '@agoric/governance/src/types.js';
+ * @import {Brand} from '@agoric/ertp';
+ * @import {Issuer} from '@agoric/ertp';
+ * @import {Mint} from '@agoric/ertp';
+ * @import {MapStore} from '@agoric/store';
+ * @import {ChainStorageVatParams, WellKnownSpaces} from '@agoric/vats/src/core/types.js';
+ * @import {ERef} from '@agoric/vow';
+ */
 /** @import {MetricsNotification} from '../psm/psm.js' */
 /** @import {EconomyBootstrapPowers} from './econ-behaviors.js' */
 
@@ -249,7 +258,7 @@ export const startPSM = async (
   };
   await (oldState.metrics && restoreMetrics(oldState.metrics));
 
-  /** @type {import('./econ-behaviors.js').PSMKit} */
+  /** @type {PSMKit} */
   const newpsmKit = harden({
     label: instanceKey,
     psm,
@@ -262,7 +271,7 @@ export const startPSM = async (
   // Provide pattern with a promise.
   producepsmKit.resolve(makeScalarBigMapStore('PSM Kits', { durable: true }));
 
-  /** @type {MapStore<Brand, import('./econ-behaviors.js').PSMKit>} */
+  /** @type {MapStore<Brand, PSMKit>} */
   const psmKitMap = await psmKit;
 
   // TODO init into governedContractKits too to simplify testing

package/src/proposals/upgrade-scaledPriceAuthorities.js

@@ -1,6 +1,11 @@
 import { makeTracer } from '@agoric/internal';
 import { E } from '@endo/far';
 
+/**
+ * @import {ChainBootstrapSpace} from '@agoric/vats/src/core/types.js';
+ * @import {StartedInstanceKit} from '@agoric/zoe/src/zoeService/utils.js';
+ */
+
 const trace = makeTracer('upgradeScaledPA', true);
 
 /**

package/src/proposals/utils.d.ts

@@ -1,8 +1,8 @@
-export function reserveThenGetNamePaths(nameAdmin: ERef<import("@agoric/vats").NameAdmin>, paths: string[][]): Promise<any[]>;
-export function reserveThenGetNames(nameAdmin: ERef<import("@agoric/vats").NameAdmin>, names: string[]): Promise<any[]>;
-export function reserveThenDeposit(debugName: string, namesByAddressAdmin: ERef<import("@agoric/vats").NameAdmin>, addr: string, payments: ERef<Payment>[]): Promise<void>;
+export function reserveThenGetNamePaths(nameAdmin: ERef<NameAdmin>, paths: string[][]): Promise<unknown[]>;
+export function reserveThenGetNames(nameAdmin: ERef<NameAdmin>, names: string[]): Promise<any[]>;
+export function reserveThenDeposit(debugName: string, namesByAddressAdmin: ERef<NameAdmin>, addr: string, payments: ERef<Payment>[]): Promise<void>;
 export function makeInstallCache(homeP: Promise<{
-    scratch: ERef<import("@agoric/internal/src/scratch.js").ScratchPad>;
+    scratch: ERef<ScratchPad>;
 }>, { installCacheKey, loadBundle }: {
     loadBundle: (specifier: string) => Promise<{
         default: Bundle;
@@ -17,5 +17,11 @@ export function scaledPriceFeedName(issuerName: any): string;
 /** @type {(name: string) => string} */
 export const sanitizePathSegment: (name: string) => string;
 export function provideRetiredInstances(consume: Promise<MapStore>, produce: Producer<MapStore>): Promise<MapStore>;
+import type { NameAdmin } from '@agoric/vats';
+import type { ERef } from '@agoric/vow';
+import type { Payment } from '@agoric/ertp';
+import type { ScratchPad } from '@agoric/internal/src/scratch.js';
+import type { Bundle } from '@agoric/swingset-vat';
 import type { MapStore } from '@agoric/store';
+import type { Producer } from '@agoric/vats/src/core/types.js';
 //# sourceMappingURL=utils.d.ts.map

package/src/proposals/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["utils.js"],"names":[],"mappings":"AAgBO,mDAHI,IAAI,CAAC,OAAO,cAAc,EAAE,SAAS,CAAC,SACtC,MAAM,EAAE,EAAE,kBA+BpB;AAMM,+CAHI,IAAI,CAAC,OAAO,cAAc,EAAE,SAAS,CAAC,SACtC,MAAM,EAAE,kBAMhB;AAQI,8CALI,MAAM,uBACN,IAAI,CAAC,OAAO,cAAc,EAAE,SAAS,CAAC,QACtC,MAAM,YACN,IAAI,CAAC,OAAO,CAAC,EAAE,iBAuBzB;AA6BM,wCAPI,OAAO,CAAC;IACd,OAAO,EAAE,IAAI,CAAC,OAAO,iCAAiC,EAAE,UAAU,CAAC,CAAC;CACrE,CAAC,mCAEF;IAAkE,UAAU,EAApE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IACrC,eAAe;CAAC;oCAkCD,UAAK,EAAE,UAAK,EAAE,SAAI;;GAkBzD;AAEM,iFACsC;AAEtC,6DAC+B;AAEtC,uCAAuC;AACvC,kCADW,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAKjC;AAUK,iDAJI,OAAO,CAAC,QAAQ,CAAC,WACjB,QAAQ,CAAC,QAAQ,CAAC,GAChB,OAAO,CAAC,QAAQ,CAAC,CAW7B;8BA1LoC,eAAe"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["utils.js"],"names":[],"mappings":"AAuBO,mDAHI,KAAK,SAAS,CAAC,SACf,MAAM,EAAE,EAAE,sBAgCpB;AAOM,+CAJI,KAAK,SAAS,CAAC,SACf,MAAM,EAAE,GACN,OAAO,CAAC,GAAG,EAAE,CAAC,CAMxB;AAQI,8CALI,MAAM,uBACN,KAAK,SAAS,CAAC,QACf,MAAM,YACN,KAAK,OAAO,CAAC,EAAE,iBAwBzB;AA2BM,wCAPI,OAAO,CAAC;IACd,OAAO,EAAE,KAAK,UAAU,CAAC,CAAC;CAC3B,CAAC,mCAEF;IAAkE,UAAU,EAApE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IACrC,eAAe;CAAC;oCAkCD,UAAK,EAAE,UAAK,EAAE,SAAI;;GAkBzD;AAEM,iFACsC;AAEtC,6DAC+B;AAEtC,uCAAuC;AACvC,kCADW,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAKjC;AAUK,iDAJI,OAAO,CAAC,QAAQ,CAAC,WACjB,SAAS,QAAQ,CAAC,GAChB,OAAO,CAAC,QAAQ,CAAC,CAW7B;+BAjM2B,cAAc;0BAKnB,aAAa;6BADV,cAAc;gCAHX,iCAAiC;4BACrC,sBAAsB;8BAHV,eAAe;8BAOzB,gCAAgC"}

package/src/proposals/utils.js

@@ -8,16 +8,24 @@ import { makeScalarBigMapStore } from '@agoric/vat-data';
 /**
  * @import {CopyMap} from '@endo/patterns';
  * @import {MapStore, SetStore} from '@agoric/store';
+ * @import {NameAdmin} from '@agoric/vats';
+ * @import {ScratchPad} from '@agoric/internal/src/scratch.js';
+ * @import {Bundle} from '@agoric/swingset-vat';
+ * @import {Installation} from '@agoric/zoe';
+ * @import {Payment} from '@agoric/ertp';
+ * @import {ERef} from '@agoric/vow';
+ * @import {Producer} from '@agoric/vats/src/core/types.js';
  */
 
 /**
- * @param {ERef<import('@agoric/vats').NameAdmin>} nameAdmin
+ * @param {ERef<NameAdmin>} nameAdmin
  * @param {string[][]} paths
  */
 export const reserveThenGetNamePaths = async (nameAdmin, paths) => {
   /**
-   * @param {ERef<import('@agoric/vats').NameAdmin>} nextAdmin
+   * @param {ERef<NameAdmin>} nextAdmin
    * @param {string[]} path
+   * @returns {Promise<unknown>}
    */
   const nextPath = async (nextAdmin, path) => {
     const [nextName, ...rest] = path;
@@ -46,8 +54,9 @@ export const reserveThenGetNamePaths = async (nameAdmin, paths) => {
 };
 
 /**
- * @param {ERef<import('@agoric/vats').NameAdmin>} nameAdmin
+ * @param {ERef<NameAdmin>} nameAdmin
  * @param {string[]} names
+ * @returns {Promise<any[]>}
  */
 export const reserveThenGetNames = async (nameAdmin, names) =>
   reserveThenGetNamePaths(
@@ -57,7 +66,7 @@ export const reserveThenGetNames = async (nameAdmin, names) =>
 
 /**
  * @param {string} debugName
- * @param {ERef<import('@agoric/vats').NameAdmin>} namesByAddressAdmin
+ * @param {ERef<NameAdmin>} namesByAddressAdmin
  * @param {string} addr
  * @param {ERef<Payment>[]} payments
  */
@@ -68,6 +77,7 @@ export const reserveThenDeposit = async (
   payments,
 ) => {
   console.info('awaiting depositFacet for', debugName);
+  /** @type {any} */
   const [depositFacet] = await reserveThenGetNamePaths(namesByAddressAdmin, [
     [addr, WalletName.depositFacet],
   ]);
@@ -86,9 +96,7 @@ export const reserveThenDeposit = async (
 
 /**
  * @type {<T>(
- *   store: ERef<
- *     Map<string, T> | import('@agoric/internal/src/scratch.js').ScratchPad
- *   >,
+ *   store: ERef<Map<string, T> | ScratchPad>,
  *   key: string,
  *   make: () => T,
  * ) => Promise<T>}
@@ -105,7 +113,7 @@ const provideWhen = async (store, key, make) => {
 
 /**
  * @param {Promise<{
- *   scratch: ERef<import('@agoric/internal/src/scratch.js').ScratchPad>;
+ *   scratch: ERef<ScratchPad>;
  * }>} homeP
  * @param {object} opts
  * @param {(specifier: string) => Promise<{ default: Bundle }>} opts.loadBundle

package/src/proposals/withdraw-reserve-proposal.js

@@ -2,11 +2,16 @@ import { E } from '@endo/far';
 import { makeTracer } from '@agoric/internal/src/debug.js';
 import { reserveThenDeposit } from './utils.js';
 
+/**
+ * @import {start} from '../reserve/assetReserve.js';
+ * @import {BootstrapPowers} from '@agoric/vats/src/core/types.js';
+ */
+
 /**
  * @param {BootstrapPowers & {
  *   consume: {
  *     reserveKit: Promise<
- *       ReturnType<import('../reserve/assetReserve.js')['start']>
+ *       ReturnType<typeof start>
  *     >;
  *   };
  * }} powers