@agoric/inter-protocol 0.16.2-dev-eb7e9eb.0 → 0.16.2-u11.0

package/src/price/fluxAggregatorContract.js

@@ -18,56 +18,48 @@ import { prepareFluxAggregatorKit } from './fluxAggregatorKit.js';
 const trace = makeTracer('FluxAgg', false);
 /**
  * @typedef {import('@agoric/vat-data').Baggage} Baggage
- *
  * @typedef {import('@agoric/time/src/types').TimerService} TimerService
  */
 
-/** @type {ContractMeta} */
-export const meta = {
-  privateArgsShape: M.splitRecord(
-    {
-      storageNode: StorageNodeShape,
-      marshaller: M.eref(M.remotable('marshaller')),
-      namesByAddressAdmin: M.any(),
-    },
-    {
-      // always optional. XXX some code is including the key, set to null
-      highPrioritySendersManager: M.or(
-        M.remotable('prioritySenders manager'),
-        M.null(),
-      ),
-      // only necessary on first invocation, not subsequent
-      initialPoserInvitation: M.remotable('Invitation'),
-    },
-  ),
-  upgradability: 'canUpgrade',
-};
-harden(meta);
+export const privateArgsShape = M.splitRecord(
+  harden({
+    storageNode: StorageNodeShape,
+    marshaller: M.eref(M.remotable('marshaller')),
+    namesByAddressAdmin: M.any(),
+  }),
+  harden({
+    // always optional. XXX some code is including the key, set to null
+    highPrioritySendersManager: M.or(
+      M.remotable('prioritySenders manager'),
+      M.null(),
+    ),
+    // only necessary on first invocation, not subsequent
+    initialPoserInvitation: M.remotable('Invitation'),
+  }),
+);
 
 /**
- * PriceAuthority for their median. Unlike the simpler `priceAggregator.js`,
- * this approximates the _Node Operator Aggregation_ logic of [Chainlink price
+ * PriceAuthority for their median. Unlike the simpler `priceAggregator.js`, this approximates
+ * the *Node Operator Aggregation* logic of [Chainlink price
  * feeds](https://blog.chain.link/levels-of-data-aggregation-in-chainlink-price-feeds/).
  *
- * @param {ZCF<
- *   import('./fluxAggregatorKit.js').ChainlinkConfig & {
- *     timer: TimerService;
- *     brandIn: Brand<'nat'>;
- *     brandOut: Brand<'nat'>;
- *     description: string;
- *     unitAmountIn?: Amount<'nat'>;
- *   }
- * >} zcf
+ * @param {ZCF<import('./fluxAggregatorKit.js').ChainlinkConfig & {
+ * timer: TimerService,
+ * brandIn: Brand<'nat'>,
+ * brandOut: Brand<'nat'>,
+ * description: string,
+ * unitAmountIn?: Amount<'nat'>,
+ * }>} zcf
  * @param {{
- *   highPrioritySendersManager?: import('@agoric/internal/src/priority-senders.js').PrioritySendersManager;
- *   initialPoserInvitation: Invitation;
- *   marshaller: ERef<Marshaller>;
- *   namesByAddressAdmin: ERef<import('@agoric/vats').NameAdmin>;
- *   storageNode: StorageNode;
+ * highPrioritySendersManager?: import('@agoric/internal/src/priority-senders.js').PrioritySendersManager,
+ * initialPoserInvitation: Invitation,
+ * marshaller: ERef<Marshaller>,
+ * namesByAddressAdmin: ERef<import('@agoric/vats').NameAdmin>,
+ * storageNode: StorageNode,
  * }} privateArgs
  * @param {Baggage} baggage
  */
-export const start = async (zcf, privateArgs, baggage) => {
+export const prepare = async (zcf, privateArgs, baggage) => {
   trace('prepare with baggage keys', [...baggage.keys()]);
 
   // xxx uses contract baggage as issuerBagage, assumes one issuer in this contract
@@ -139,8 +131,10 @@ export const start = async (zcf, privateArgs, baggage) => {
       addr,
       [invitation],
     );
-    await (highPrioritySendersManager &&
-      E(highPrioritySendersManager).add(description, addr));
+    if (highPrioritySendersManager) {
+      // eslint-disable-next-line @jessie.js/no-nested-await -- after another await
+      await E(highPrioritySendersManager).add(description, addr);
+    }
     return `added ${addr}`;
   };
 
@@ -152,29 +146,29 @@ export const start = async (zcf, privateArgs, baggage) => {
   const removeOracle = async addr => {
     trace('removeOracle', addr);
     await E(faKit.creator).removeOracle(addr);
-    await (highPrioritySendersManager &&
-      E(highPrioritySendersManager).remove(description, addr));
+    if (highPrioritySendersManager) {
+      // eslint-disable-next-line @jessie.js/no-nested-await -- after another await
+      await E(highPrioritySendersManager).remove(description, addr);
+    }
     return `removed ${addr}`;
   };
 
   const governedApis = {
     /**
-     * Add the specified oracles. May partially fail, such that some oracles are
-     * added and others aren't.
+     * Add the specified oracles. May partially fail, such that some oracles are added and others aren't.
      *
      * @param {string[]} addrs
-     * @returns {Promise<PromiseSettledResult<string>[]>}
+     * @returns {Promise<Array<PromiseSettledResult<string>>>}
      */
     addOracles: addrs => {
       return Promise.allSettled(addrs.map(addOracle));
     },
     /**
-     * Remove the specified oracles. May partially fail, such that some oracles
-     * are removed and others aren't. If the oracle was never part of the set
-     * that's a PromiseRejectedResult
+     * Remove the specified oracles. May partially fail, such that some oracles are removed and others aren't.
+     * If the oracle was never part of the set that's a PromiseRejectedResult
      *
      * @param {string[]} addrs
-     * @returns {Promise<PromiseSettledResult<string>[]>}
+     * @returns {Promise<Array<PromiseSettledResult<string>>>}
      */
     removeOracles: addrs => {
       return Promise.allSettled(addrs.map(removeOracle));
@@ -193,4 +187,4 @@ export const start = async (zcf, privateArgs, baggage) => {
     publicFacet: faKit.public,
   });
 };
-harden(start);
+harden(prepare);

package/src/price/fluxAggregatorKit.js

@@ -1,7 +1,7 @@
 /**
- * @file Adaptation of Chainlink algorithm to the Agoric platform. Modeled on
- *   https://github.com/smartcontractkit/chainlink/blob/master/contracts/src/v0.6/FluxAggregator.sol
- *   (version?)
+ * @file
+ * Adaptation of Chainlink algorithm to the Agoric platform.
+ * Modeled on https://github.com/smartcontractkit/chainlink/blob/master/contracts/src/v0.6/FluxAggregator.sol (version?)
  */
 import { AmountMath } from '@agoric/ertp';
 import { assertAllDefined, makeTracer } from '@agoric/internal';
@@ -24,14 +24,10 @@ export const INVITATION_MAKERS_DESC = 'oracle invitation';
 
 /**
  * @typedef {import('@agoric/vat-data').Baggage} Baggage
- *
  * @typedef {import('@agoric/time/src/types').Timestamp} Timestamp
- *
- * @typedef {import('@agoric/time/src/types').RelativeTime} RelativeTime //
- *   TODO: use RelativeTime, not RelativeTimeValue
- *
+ * @typedef {import('@agoric/time/src/types').RelativeTime} RelativeTime
+ * // TODO: use RelativeTime, not RelativeTimeValue
  * @typedef {import('@agoric/time/src/types').RelativeTimeValue} RelativeTimeValue
- *
  * @typedef {import('@agoric/time/src/types').TimerService} TimerService
  */
 
@@ -53,35 +49,30 @@ const priceDescriptionFromQuote = quote => quote.quoteAmount.value[0];
  * @typedef {object} ChainlinkConfig
  * @property {number} maxSubmissionCount
  * @property {number} minSubmissionCount
- * @property {bigint} restartDelay the number of rounds an Oracle has to wait
- *   before they can initiate a round
- * @property {number} minSubmissionValue an immutable check for a lower bound of
- *   what submission values are accepted from an oracle
- * @property {number} maxSubmissionValue an immutable check for an upper bound
- *   of what submission values are accepted from an oracle
- * @property {number} timeout the number of seconds after the previous round
- *   that allowed to lapse before allowing an oracle to skip an unfinished
- *   round
+ * @property {bigint} restartDelay the number of rounds an Oracle has to wait before they can initiate a round
+ * @property {number} minSubmissionValue an immutable check for a lower bound of what
+ * submission values are accepted from an oracle
+ * @property {number} maxSubmissionValue an immutable check for an upper bound of what
+ * submission values are accepted from an oracle
+ * @property {number} timeout the number of seconds after the previous round that
+ * allowed to lapse before allowing an oracle to skip an unfinished round
  */
 
 /**
- * Returns a maker for a single durable FluxAggregatorKit, closed over the
- * prepare() arguments.
+ * Returns a maker for a single durable FluxAggregatorKit, closed over the prepare() arguments.
  *
  * The kit aggregates price inputs to produce a PriceAuthority. Unlike the
- * simpler `priceAggregator.js`, this approximates the _Node Operator
- * Aggregation_ logic of [Chainlink price
+ * simpler `priceAggregator.js`, this approximates the *Node Operator
+ * Aggregation* logic of [Chainlink price
  * feeds](https://blog.chain.link/levels-of-data-aggregation-in-chainlink-price-feeds/).
  *
  * @param {Baggage} baggage
- * @param {ZCF<
- *   ChainlinkConfig & {
- *     timer: TimerService;
- *     brandIn: Brand<'nat'>;
- *     brandOut: Brand<'nat'>;
- *     unitAmountIn?: Amount<'nat'>;
- *   }
- * >} zcf
+ * @param {ZCF<ChainlinkConfig & {
+ * timer: TimerService,
+ * brandIn: Brand<'nat'>,
+ * brandOut: Brand<'nat'>,
+ * unitAmountIn?: Amount<'nat'>,
+ * }>} zcf
  * @param {TimerService} timerPresence
  * @param {import('./roundsManager.js').QuoteKit} quoteKit
  * @param {StorageNode} storageNode
@@ -137,10 +128,7 @@ export const prepareFluxAggregatorKit = async (
   // end of maker definitions /////////////////////////////////
 
   const { answerKit, latestRoundKit, priceKit } = await provideAll(baggage, {
-    /**
-     * This is just a signal that there's a new answer, which is read from
-     * `lastValueOutForUnitIn`
-     */
+    /** This is just a signal that there's a new answer, which is read from `lastValueOutForUnitIn` */
     answerKit: () => makeDurablePublishKit(),
     /** For publishing priceAuthority values to off-chain storage */
     priceKit: () =>
@@ -154,11 +142,9 @@ export const prepareFluxAggregatorKit = async (
       E.when(E(storageNode).makeChildNode('latestRound'), node =>
         makeRecorderKit(
           node,
-          /**
-           * @type {import('@agoric/zoe/src/contractSupport/recorder.js').TypedMatcher<
-           *     import('./roundsManager.js').LatestRound
-           *   >}
-           */ (M.any()),
+          /** @type {import('@agoric/zoe/src/contractSupport/recorder.js').TypedMatcher<import('./roundsManager.js').LatestRound>} */ (
+            M.any()
+          ),
         ),
       ),
   });
@@ -237,9 +223,9 @@ export const prepareFluxAggregatorKit = async (
          * An "oracle invitation" is an invitation to be able to submit data to
          * include in the priceAggregator's results.
          *
-         * The offer result from this invitation is a OracleAdmin, which can be
-         * used directly to manage the price submissions as well as to terminate
-         * the relationship.
+         * The offer result from this invitation is a OracleAdmin, which can be used
+         * directly to manage the price submissions as well as to terminate the
+         * relationship.
          *
          * @param {string} oracleId unique per contract instance
          */
@@ -249,8 +235,8 @@ export const prepareFluxAggregatorKit = async (
           /**
            * If custom arguments are supplied to the `zoe.offer` call, they can
            * indicate an OraclePriceSubmission notifier and a corresponding
-           * `shiftValueOut` that should be adapted as part of the
-           * priceAuthority's reported data.
+           * `shiftValueOut` that should be adapted as part of the priceAuthority's
+           * reported data.
            *
            * @param {ZCFSeat} seat
            */
@@ -313,9 +299,8 @@ export const prepareFluxAggregatorKit = async (
         },
 
         /**
-         * a method to provide all current info oracleStatuses need. Intended
-         * only only to be callable by oracleStatuses. Not for use by contracts
-         * to read state.
+         * a method to provide all current info oracleStatuses need. Intended only
+         * only to be callable by oracleStatuses. Not for use by contracts to read state.
          *
          * @param {string} oracleId
          * @param {bigint} queriedRoundId

package/src/price/priceOracleKit.js

@@ -8,17 +8,14 @@ export const INVITATION_MAKERS_DESC = 'oracle invitation';
 
 /**
  * @typedef {{
- *   oracleId: string;
- *   roundPowers: {
- *     handlePush: (
- *       status: OracleStatus,
- *       result: import('./roundsManager.js').PriceRound,
- *     ) => Promise<OracleStatus>;
- *   };
+ *   oracleId: string,
+ *   roundPowers: { handlePush: (status: OracleStatus, result: import('./roundsManager.js').PriceRound) => Promise<OracleStatus> }
  * }} HeldParams
  */
 
-/** @typedef {{ roundId: number | undefined; unitPrice: NatValue }} PriceDatum */
+/**
+ * @typedef {{ roundId: number | undefined, unitPrice: NatValue }} PriceDatum
+ */
 
 /**
  * @typedef {object} OracleStatus
@@ -29,9 +26,11 @@ export const INVITATION_MAKERS_DESC = 'oracle invitation';
  * @property {string} oracleId
  */
 /**
- * @typedef {Readonly<HeldParams & {}>} ImmutableState
+ * @typedef {Readonly<HeldParams & {
+ * }>} ImmutableState
  *
- * @typedef {OracleStatus & {}} MutableState
+ * @typedef {OracleStatus & {
+ * }} MutableState
  */
 /** @typedef {ImmutableState & MutableState} State */
 
@@ -107,7 +106,10 @@ export const prepareOracleAdminKit = baggage =>
           state.lastStartedRound = result.lastStartedRound;
           state.latestSubmission = result.latestSubmission;
         },
-        /** @returns {OracleStatus} */
+        /**
+         *
+         * @returns {OracleStatus}
+         */
         getStatus() {
           const { state } = this;
           return {

package/src/price/roundsManager.js

@@ -10,14 +10,13 @@ import {
 import { E } from '@endo/eventual-send';
 import { Far } from '@endo/marshal';
 import { isNat, Nat } from '@endo/nat';
-import { UnguardedHelperI } from '@agoric/internal/src/typeGuards.js';
+import { UnguardedHelperI } from '../typeGuards.js';
 
 const { add, subtract, multiply, floorDivide, ceilDivide, isGTE } = natSafeMath;
 
 /** @typedef {import('./priceOracleKit.js').OracleStatus} OracleStatus */
 /**
  * @typedef {import('@agoric/time/src/types').Timestamp} Timestamp
- *
  * @typedef {import('@agoric/time/src/types').TimerService} TimerService
  */
 
@@ -29,30 +28,34 @@ export const ROUND_MAX = BigInt(2 ** 32 - 1);
 
 const trace = makeTracer('RoundsM', false);
 
-/** @param {bigint} roundId */
+/**
+ * @param {bigint} roundId
+ */
 const validRoundId = roundId => {
   return roundId <= ROUND_MAX;
 };
 
 /**
- * @typedef {{ roundId: number | undefined; unitPrice: NatValue }} PriceRound
+ * @typedef {{ roundId: number | undefined, unitPrice: NatValue }} PriceRound
  *
- * @typedef {Pick<RoundData, 'roundId' | 'startedAt'> & { startedBy: string }} LatestRound
+ * @typedef {Pick<RoundData, 'roundId' | 'startedAt'> &  { startedBy: string }} LatestRound
  */
 
-/** @typedef {Round & { roundId: bigint }} RoundData */
+/**
+ * @typedef {Round & {roundId: bigint}} RoundData
+ */
 
 /**
  * @typedef {object} Round
  * @property {bigint} answer the answer for the given round
- * @property {Timestamp} startedAt the timestamp when the round was started.
- *   This is 0 if the round hasn't been started yet.
- * @property {Timestamp} updatedAt the timestamp when the round last was updated
- *   (i.e. answer was last computed)
- * @property {bigint} answeredInRound the round ID of the round in which the
- *   answer was computed. answeredInRound may be smaller than roundId when the
- *   round timed out. answeredInRound is equal to roundId when the round didn't
- *   time out and was completed regularly.
+ * @property {Timestamp} startedAt the timestamp when the round was started. This is 0
+ * if the round hasn't been started yet.
+ * @property {Timestamp} updatedAt the timestamp when the round last was updated (i.e.
+ * answer was last computed)
+ * @property {bigint} answeredInRound the round ID of the round in which the answer
+ * was computed. answeredInRound may be smaller than roundId when the round
+ * timed out. answeredInRound is equal to roundId when the round didn't time out
+ * and was completed regularly.
  */
 
 /**
@@ -63,31 +66,29 @@ const validRoundId = roundId => {
  * @property {number} roundTimeout
  */
 
-/** @typedef {IssuerKit<'set'>} QuoteKit */
+/**
+ * @typedef {IssuerKit<'set'>} QuoteKit
+ */
 
 /**
- * @typedef {Readonly<
- *   import('./fluxAggregatorKit.js').ChainlinkConfig & {
- *     quoteKit: QuoteKit;
- *     answerPublisher: Publisher<void>;
- *     brandIn: Brand<'nat'>;
- *     brandOut: Brand<'nat'>;
- *     latestRoundPublisher: import('@agoric/zoe/src/contractSupport/recorder.js').Recorder<LatestRound>;
- *     timerPresence: TimerService;
- *   }
- * >} HeldParams
+ * @typedef {Readonly<import('./fluxAggregatorKit.js').ChainlinkConfig & {
+ * quoteKit: QuoteKit,
+ * answerPublisher: Publisher<void>,
+ * brandIn: Brand<'nat'>,
+ * brandOut: Brand<'nat'>,
+ * latestRoundPublisher: import('@agoric/zoe/src/contractSupport/recorder.js').Recorder<LatestRound>,
+ * timerPresence: TimerService,
+ * }>} HeldParams
  *
- * @typedef {Readonly<
- *   HeldParams & {
- *     details: MapStore<bigint, RoundDetails>;
- *     rounds: MapStore<bigint, Round>;
- *     unitIn: bigint;
- *   }
- * >} ImmutableState
+ * @typedef {Readonly<HeldParams & {
+ * details: MapStore<bigint, RoundDetails>,
+ * rounds: MapStore<bigint, Round>,
+ * unitIn: bigint,
+ * }>} ImmutableState
  *
  * @typedef {{
- *   lastValueOutForUnitIn: bigint?;
- *   reportingRoundId: bigint;
+ * lastValueOutForUnitIn: bigint?,
+ * reportingRoundId: bigint,
  * }} MutableState
  */
 /** @typedef {ImmutableState & MutableState} State */
@@ -115,11 +116,7 @@ export const prepareRoundsManagerKit = baggage =>
         handlePush: M.call(M.record(), M.record()).returns(M.promise()),
       }),
     },
-    /**
-     * @type {(
-     *   opts: HeldParams & { unitAmountIn: Amount<'nat'> },
-     * ) => State}
-     */
+    /** @type {(opts: HeldParams & { unitAmountIn: Amount<'nat'> }) => State} */
     ({
       // ChainlinkConfig
       maxSubmissionCount,
@@ -173,7 +170,9 @@ export const prepareRoundsManagerKit = baggage =>
     },
     {
       helper: {
-        /** @param {bigint} roundId */
+        /**
+         * @param {bigint} roundId
+         */
         acceptingSubmissions(roundId) {
           const { details } = this.state;
           return (
@@ -191,7 +190,9 @@ export const prepareRoundsManagerKit = baggage =>
           return roundId > add(lastStarted, restartDelay) || lastStarted === 0n;
         },
 
-        /** @param {bigint} roundId */
+        /**
+         * @param {bigint} roundId
+         */
         deleteRoundDetails(roundId) {
           const { details } = this.state;
           const roundDetails = details.get(roundId);
@@ -200,7 +201,9 @@ export const prepareRoundsManagerKit = baggage =>
           details.delete(roundId);
         },
 
-        /** @param {bigint} roundId */
+        /**
+         * @param {bigint} roundId
+         */
         isNextRound(roundId) {
           const { reportingRoundId } = this.state;
           return roundId === add(reportingRoundId, 1);
@@ -418,7 +421,7 @@ export const prepareRoundsManagerKit = baggage =>
          * @param {OracleStatus} status
          * @param {bigint} roundId
          * @param {Timestamp} blockTimestamp
-         * @returns {string | null} error message, if there is one
+         * @returns {string?} error message, if there is one
          */
         validateOracleRound(status, roundId, blockTimestamp) {
           const { reportingRoundId } = this.state;
@@ -446,7 +449,10 @@ export const prepareRoundsManagerKit = baggage =>
         },
       },
       contract: {
-        /** @param {PriceQuoteValue} quote */
+        /**
+         *
+         * @param {PriceQuoteValue} quote
+         */
         async authenticateQuote(quote) {
           const { quoteKit } = this.state;
           const quoteAmount = AmountMath.make(quoteKit.brand, harden(quote));
@@ -464,7 +470,9 @@ export const prepareRoundsManagerKit = baggage =>
           const { brandIn, brandOut, timerPresence } = state;
           const { contract } = this.facets;
 
-          /** @param {PriceQuery} priceQuery */
+          /**
+           * @param {PriceQuery} priceQuery
+           */
           return Far('createQuote', priceQuery => {
             const { lastValueOutForUnitIn, unitIn } = state;
 
@@ -478,7 +486,9 @@ export const prepareRoundsManagerKit = baggage =>
               return undefined;
             }
 
-            /** @param {Amount<'nat'>} amountIn the given amountIn */
+            /**
+             * @param {Amount<'nat'>} amountIn the given amountIn
+             */
             const calcAmountOut = amountIn => {
               const valueIn = AmountMath.getValue(brandIn, amountIn);
               return AmountMath.make(
@@ -487,7 +497,9 @@ export const prepareRoundsManagerKit = baggage =>
               );
             };
 
-            /** @param {Amount<'nat'>} amountOut the wanted amountOut */
+            /**
+             * @param {Amount<'nat'>} amountOut the wanted amountOut
+             */
             const calcAmountIn = amountOut => {
               const valueOut = AmountMath.getValue(brandOut, amountOut);
               return AmountMath.make(
@@ -552,8 +564,9 @@ export const prepareRoundsManagerKit = baggage =>
         },
 
         /**
-         * consumers are encouraged to check that they're receiving fresh data
-         * by inspecting the updatedAt and answeredInRound return values.
+         * consumers are encouraged to check
+         * that they're receiving fresh data by inspecting the updatedAt and
+         * answeredInRound return values.
          *
          * @param {bigint | number} roundIdRaw
          * @returns {Promise<RoundData>}
@@ -590,9 +603,8 @@ export const prepareRoundsManagerKit = baggage =>
         },
 
         /**
-         * a method to provide all current info oracleStatuses need. Intended
-         * only only to be callable by oracleStatuses. Not for use by contracts
-         * to read state.
+         * a method to provide all current info oracleStatuses need. Intended only
+         * only to be callable by oracleStatuses. Not for use by contracts to read state.
          *
          * @param {OracleStatus} status
          * @param {Timestamp} blockTimestamp

package/src/proposals/addAssetToVault.js

@@ -1,12 +1,11 @@
 // @jessie-check
 
 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 { deeplyFulfilledObject } from '@agoric/internal';
+import { Stable } from '@agoric/vats/src/tokens.js';
 import { E } from '@endo/far';
-import { Stable } from '@agoric/internal/src/tokens.js';
-import { instanceNameFor } from './price-feed-proposal.js';
+import { parseRatio } from '@agoric/zoe/src/contractSupport/ratio.js';
 import { reserveThenGetNames } from './utils.js';
 
 export * from './startPSM.js';
@@ -220,7 +219,6 @@ export const addAssetToVault = async (
     brand: {
       consume: { [Stable.symbol]: stableP },
     },
-    instance: { consume: consumeInstance },
   },
   {
     options: {
@@ -241,11 +239,6 @@ export const addAssetToVault = async (
     [keyword],
   );
 
-  const oracleInstanceName = instanceNameFor(oracleBrand, 'USD');
-  // don't add the collateral offering to vaultFactory until its price feed is available
-  // eslint-disable-next-line no-restricted-syntax -- allow this computed property
-  await consumeInstance[oracleInstanceName];
-
   const stable = await stableP;
   const vaultFactoryCreator = E.get(vaultFactoryKit).creatorFacet;
   await E(vaultFactoryCreator).addVaultType(interchainIssuer, oracleBrand, {
@@ -328,11 +321,6 @@ export const getManifestForAddAssetToVault = (
         brand: {
           consume: { [Stable.symbol]: true },
         },
-        instance: {
-          // allow any instance because the AGORIC_INSTANCE_NAME of
-          // priceFeedOptions cannot be known statically.
-          consume: true,
-        },
       },
     },
     installations: {

package/src/proposals/committee-proposal.js

@@ -4,14 +4,14 @@ import { reserveThenDeposit } from './utils.js';
 
 const { values } = Object;
 
-/** @type {<X, Y>(xs: X[], ys: Y[]) => [X, Y][]} */
+/** @type { <X, Y>(xs: X[], ys: Y[]) => [X, Y][]} */
 const zip = (xs, ys) => xs.map((x, i) => [x, ys[i]]);
 
 const EC_HIGH_PRIORITY_SENDERS_NAMESPACE = 'economicCommittee';
 
 /**
  * @param {import('./econ-behaviors').EconomyBootstrapPowers} powers
- * @param {{ options: { voterAddresses: Record<string, string> } }} param1
+ * @param {{ options: { voterAddresses: Record<string, string> }}} param1
  */
 export const inviteCommitteeMembers = async (
   {
@@ -26,7 +26,9 @@ export const inviteCommitteeMembers = async (
 
   const highPrioritySendersManager = await consume.highPrioritySendersManager;
 
-  /** @param {[string, Promise<Invitation>][]} addrInvitations */
+  /**
+   * @param {[string, Promise<Invitation>][]} addrInvitations
+   */
   const distributeInvitations = async addrInvitations => {
     await Promise.all(
       addrInvitations.map(async ([addr, invitationP]) => {
@@ -51,7 +53,9 @@ export const inviteCommitteeMembers = async (
 
 harden(inviteCommitteeMembers);
 
-/** @param {import('./econ-behaviors').EconomyBootstrapPowers} powers */
+/**
+ * @param {import('./econ-behaviors').EconomyBootstrapPowers} powers
+ */
 export const startEconCharter = async ({
   consume: { zoe },
   produce: { econCharterKit },
@@ -127,7 +131,7 @@ harden(addGovernorsToEconCharter);
 
 /**
  * @param {import('./econ-behaviors').EconomyBootstrapPowers} powers
- * @param {{ options: { voterAddresses: Record<string, string> } }} param1
+ * @param {{ options: { voterAddresses: Record<string, string> }}} param1
  */
 export const inviteToEconCharter = async (
   { consume: { namesByAddressAdmin, econCharterKit } },