@agoric/inter-protocol 0.13.2-dev-44ea14f.0 → 0.13.2-dev-bdb08a7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/inter-protocol",
-  "version": "0.13.2-dev-44ea14f.0+44ea14f",
+  "version": "0.13.2-dev-bdb08a7.0+bdb08a7",
   "description": "Core cryptoeconomy contracts",
   "type": "module",
   "main": "src/index.js",
@@ -29,18 +29,18 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/assert": "0.5.2-dev-44ea14f.0+44ea14f",
-    "@agoric/ertp": "0.15.4-dev-44ea14f.0+44ea14f",
-    "@agoric/governance": "0.9.2-dev-44ea14f.0+44ea14f",
-    "@agoric/internal": "0.2.2-dev-44ea14f.0+44ea14f",
-    "@agoric/notifier": "0.5.2-dev-44ea14f.0+44ea14f",
-    "@agoric/store": "0.8.4-dev-44ea14f.0+44ea14f",
-    "@agoric/swingset-liveslots": "0.9.1-dev-44ea14f.0+44ea14f",
-    "@agoric/swingset-vat": "0.30.3-dev-44ea14f.0+44ea14f",
-    "@agoric/time": "0.2.2-dev-44ea14f.0+44ea14f",
-    "@agoric/vat-data": "0.4.4-dev-44ea14f.0+44ea14f",
-    "@agoric/vats": "0.13.1-dev-44ea14f.0+44ea14f",
-    "@agoric/zoe": "0.25.4-dev-44ea14f.0+44ea14f",
+    "@agoric/assert": "0.5.2-dev-bdb08a7.0+bdb08a7",
+    "@agoric/ertp": "0.15.4-dev-bdb08a7.0+bdb08a7",
+    "@agoric/governance": "0.9.2-dev-bdb08a7.0+bdb08a7",
+    "@agoric/internal": "0.2.2-dev-bdb08a7.0+bdb08a7",
+    "@agoric/notifier": "0.5.2-dev-bdb08a7.0+bdb08a7",
+    "@agoric/store": "0.8.4-dev-bdb08a7.0+bdb08a7",
+    "@agoric/swingset-liveslots": "0.9.1-dev-bdb08a7.0+bdb08a7",
+    "@agoric/swingset-vat": "0.30.3-dev-bdb08a7.0+bdb08a7",
+    "@agoric/time": "0.2.2-dev-bdb08a7.0+bdb08a7",
+    "@agoric/vat-data": "0.4.4-dev-bdb08a7.0+bdb08a7",
+    "@agoric/vats": "0.13.1-dev-bdb08a7.0+bdb08a7",
+    "@agoric/zoe": "0.25.4-dev-bdb08a7.0+bdb08a7",
     "@endo/bundle-source": "^2.4.2",
     "@endo/captp": "^2.0.18",
     "@endo/eventual-send": "^0.16.8",
@@ -50,8 +50,8 @@
     "@endo/promise-kit": "^0.2.52"
   },
   "devDependencies": {
-    "@agoric/deploy-script-support": "0.9.5-dev-44ea14f.0+44ea14f",
-    "@agoric/smart-wallet": "0.4.3-dev-44ea14f.0+44ea14f",
+    "@agoric/deploy-script-support": "0.9.5-dev-bdb08a7.0+bdb08a7",
+    "@agoric/smart-wallet": "0.4.3-dev-bdb08a7.0+bdb08a7",
     "@endo/init": "^0.5.52",
     "@fast-check/ava": "^1.1.3",
     "ava": "^5.1.0",
@@ -78,5 +78,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "44ea14f142526a69500b3029274dd1ed260930b4"
+  "gitHead": "bdb08a7f80da1a20faea1139b3381b982c7fc203"
 }

package/scripts/build-bundles.js

@@ -29,7 +29,10 @@ await createBundles(
       '../src/econCommitteeCharter.js',
       '../bundles/bundle-econCommitteeCharter.js',
     ],
-    ['../src/price/fluxAggregator.js', '../bundles/bundle-fluxAggregator.js'],
+    [
+      '../src/price/fluxAggregatorContract.js',
+      '../bundles/bundle-fluxAggregator.js',
+    ],
   ],
   dirname,
 );

package/scripts/price-feed-core.js

@@ -57,7 +57,7 @@ export const defaultProposalBuilder = async (
         brandOutRef: brandOut && publishRef(brandOut),
         priceAggregatorRef: publishRef(
           install(
-            '@agoric/inter-protocol/src/price/fluxAggregator.js',
+            '@agoric/inter-protocol/src/price/fluxAggregatorContract.js',
             '../bundles/bundle-fluxAggregator.js',
           ),
         ),

package/src/econCommitteeCharter.js

@@ -79,6 +79,32 @@ export const start = async zcf => {
     return zcf.makeInvitation(voteOnOfferFilterHandler, 'vote on offer filter');
   };
 
+  /**
+   * @param {Instance} instance
+   * @param {string} methodName
+   * @param {string[]} methodArgs
+   * @param {import('@agoric/time').TimestampValue} deadline
+   */
+  const makeApiInvocationInvitation = (
+    instance,
+    methodName,
+    methodArgs,
+    deadline,
+  ) => {
+    const handler = seat => {
+      seat.exit();
+
+      const governor = instanceToGovernor.get(instance);
+      return E(governor).voteOnApiInvocation(
+        methodName,
+        methodArgs,
+        counter,
+        deadline,
+      );
+    };
+    return zcf.makeInvitation(handler, 'vote on API invocation');
+  };
+
   const MakerI = M.interface('Charter InvitationMakers', {
     VoteOnParamChange: M.call().returns(M.promise()),
     VoteOnPauseOffers: M.call(
@@ -86,10 +112,17 @@ export const start = async zcf => {
       M.arrayOf(M.string()),
       TimestampShape,
     ).returns(M.promise()),
+    VoteOnApiCall: M.call(
+      InstanceHandleShape,
+      M.string(),
+      M.arrayOf(M.any()),
+      TimestampShape,
+    ).returns(M.promise()),
   });
   const invitationMakers = makeExo('Charter Invitation Makers', MakerI, {
     VoteOnParamChange: makeParamInvitation,
     VoteOnPauseOffers: makeOfferFilterInvitation,
+    VoteOnApiCall: makeApiInvocationInvitation,
   });
 
   const charterMemberHandler = seat => {

package/src/price/fluxAggregator.js

@@ -2,8 +2,8 @@
  * 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, AssetKind, makeIssuerKit } from '@agoric/ertp';
-import { assertAllDefined } from '@agoric/internal';
+import { AmountMath } from '@agoric/ertp';
+import { assertAllDefined, makeTracer } from '@agoric/internal';
 import {
   makeNotifierFromSubscriber,
   observeNotifier,
@@ -20,6 +20,8 @@ import { Far } from '@endo/marshal';
 import { makeOracleAdmin } from './priceOracleAdmin.js';
 import { makeRoundsManagerKit } from './roundsManager.js';
 
+const trace = makeTracer('FlxAgg', false);
+
 export const INVITATION_MAKERS_DESC = 'oracle invitation';
 
 /**
@@ -63,20 +65,26 @@ const priceDescriptionFromQuote = quote => quote.quoteAmount.value[0];
  * 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 {{
- * marshaller: Marshaller,
- * quoteMint?: ERef<Mint<'set'>>,
- * storageNode: ERef<StorageNode>,
- * }} privateArgs
- * @param {Baggage} baggage
+ * @param {TimerService} timerPresence
+ * @param {IssuerRecord<'set'> & { mint: Mint<'set'> }} quoteKit
+ * @param {StorageNode} storageNode
+ * @param {Marshaller} marshaller
  */
-export const start = async (zcf, privateArgs, baggage) => {
+export const provideFluxAggregator = (
+  baggage,
+  zcf,
+  timerPresence,
+  quoteKit,
+  storageNode,
+  marshaller,
+) => {
   // brands come from named terms instead of `brands` key because the latter is
   // a StandardTerm that Zoe creates from the `issuerKeywordRecord` argument and
   // Oracle brands are inert (without issuers or mints).
@@ -89,7 +97,6 @@ export const start = async (zcf, privateArgs, baggage) => {
     minSubmissionValue,
     restartDelay,
     timeout,
-    timer,
 
     unitAmountIn = AmountMath.make(brandIn, 1n),
   } = zcf.getTerms();
@@ -103,27 +110,9 @@ export const start = async (zcf, privateArgs, baggage) => {
     minSubmissionValue,
     restartDelay,
     timeout,
-    timer,
     unitAmountIn,
   });
 
-  // Get the timer's identity.
-  const timerPresence = await timer;
-
-  const quoteMint =
-    privateArgs.quoteMint || makeIssuerKit('quote', AssetKind.SET).mint;
-  const quoteIssuerRecord = await zcf.saveIssuer(
-    E(quoteMint).getIssuer(),
-    'Quote',
-  );
-  const quoteKit = {
-    ...quoteIssuerRecord,
-    mint: quoteMint,
-  };
-
-  const { marshaller, storageNode } = privateArgs;
-  assertAllDefined({ marshaller, storageNode });
-
   const makeDurablePublishKit = prepareDurablePublishKit(
     baggage,
     'Price Aggregator publish kit',
@@ -180,7 +169,7 @@ export const start = async (zcf, privateArgs, baggage) => {
     createQuote: roundsManagerKit.contract.makeCreateQuote(),
     notifier: makeNotifierFromSubscriber(answerSubscriber),
     quoteIssuer: quoteKit.issuer,
-    timer,
+    timer: timerPresence,
     actualBrandIn: brandIn,
     actualBrandOut: brandOut,
   });
@@ -212,6 +201,7 @@ export const start = async (zcf, privateArgs, baggage) => {
      * @param {string} oracleId unique per contract instance
      */
     makeOracleInvitation: async oracleId => {
+      trace('makeOracleInvitation', oracleId);
       /**
        * If custom arguments are supplied to the `zoe.offer` call, they can
        * indicate an OraclePriceSubmission notifier and a corresponding
@@ -258,6 +248,7 @@ export const start = async (zcf, privateArgs, baggage) => {
 
     /** @param {string} oracleId */
     async initOracle(oracleId) {
+      trace('initOracle', oracleId);
       assert.typeof(oracleId, 'string');
 
       const oracleAdmin = makeOracleAdmin(
@@ -266,7 +257,7 @@ export const start = async (zcf, privateArgs, baggage) => {
           maxSubmissionValue,
           oracleId, // must be unique per vat
           roundPowers: roundsManagerKit.oracle,
-          timer,
+          timer: timerPresence,
         }),
       );
       oracles.init(oracleId, oracleAdmin);
@@ -283,7 +274,7 @@ export const start = async (zcf, privateArgs, baggage) => {
      * @returns {Promise<RoundState>}
      */
     async oracleRoundState(oracleId, queriedRoundId) {
-      const blockTimestamp = await E(timer).getCurrentTimestamp();
+      const blockTimestamp = await E(timerPresence).getCurrentTimestamp();
       const status = await E(oracles.get(oracleId)).getStatus();
 
       const oracleCount = oracles.getSize();
@@ -342,4 +333,5 @@ export const start = async (zcf, privateArgs, baggage) => {
 
   return harden({ creatorFacet, publicFacet });
 };
-harden(start);
+harden(provideFluxAggregator);
+/** @typedef {ReturnType<typeof provideFluxAggregator>} FluxAggregator */

package/src/price/fluxAggregatorContract.js

@@ -0,0 +1,118 @@
+import { AssetKind, makeIssuerKit } from '@agoric/ertp';
+import { handleParamGovernance } from '@agoric/governance';
+import { assertAllDefined, makeTracer } from '@agoric/internal';
+import { E } from '@endo/eventual-send';
+import { reserveThenDeposit } from '../proposals/utils.js';
+import { provideFluxAggregator } from './fluxAggregator.js';
+
+const trace = makeTracer('FluxAgg', false);
+/**
+ * @typedef {import('@agoric/vat-data').Baggage} Baggage
+ * @typedef {import('@agoric/time/src/types').TimerService} TimerService
+ */
+
+/**
+ * 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('./fluxAggregator.js').ChainlinkConfig & {
+ * timer: TimerService,
+ * brandIn: Brand<'nat'>,
+ * brandOut: Brand<'nat'>,
+ * unitAmountIn?: Amount<'nat'>,
+ * }>} zcf
+ * @param {{
+ * initialPoserInvitation: Invitation,
+ * marshaller: Marshaller,
+ * namesByAddressAdmin: ERef<import('@agoric/vats').NameAdmin>,
+ * quoteMint?: ERef<Mint<'set'>>,
+ * storageNode: ERef<StorageNode>,
+ * }} privateArgs
+ * @param {Baggage} baggage
+ */
+export const start = async (zcf, privateArgs, baggage) => {
+  trace('start');
+  const { timer: timerP } = zcf.getTerms();
+
+  const quoteMintP =
+    privateArgs.quoteMint || makeIssuerKit('quote', AssetKind.SET).mint;
+  const [quoteMint, quoteIssuerRecord] = await Promise.all([
+    quoteMintP,
+    zcf.saveIssuer(E(quoteMintP).getIssuer(), 'Quote'),
+  ]);
+  const quoteKit = {
+    ...quoteIssuerRecord,
+    mint: quoteMint,
+  };
+
+  const {
+    initialPoserInvitation,
+    marshaller,
+    namesByAddressAdmin,
+    storageNode: storageNodeP,
+  } = privateArgs;
+  assertAllDefined({ initialPoserInvitation, marshaller, storageNodeP });
+
+  const timer = await timerP;
+  const storageNode = await storageNodeP;
+
+  trace('awaited args');
+
+  const fa = provideFluxAggregator(
+    baggage,
+    zcf,
+    timer,
+    quoteKit,
+    storageNode,
+    marshaller,
+  );
+  trace('got fa', fa);
+
+  const { makeGovernorFacet } = await handleParamGovernance(
+    // @ts-expect-error FIXME include Governance params
+    zcf,
+    initialPoserInvitation,
+    {
+      // No governed parameters. Governance just for API methods.
+    },
+    storageNode,
+    marshaller,
+  );
+
+  /**
+   * Initialize a new oracle and send an invitation to administer it.
+   *
+   * @param {string} addr
+   */
+  const addOracle = async addr => {
+    const invitation = await E(fa.creatorFacet).makeOracleInvitation(addr);
+    // XXX imported from 'proposals' path
+    await reserveThenDeposit(
+      `fluxAggregator oracle ${addr}`,
+      namesByAddressAdmin,
+      addr,
+      [invitation],
+    );
+    return `added ${addr}`;
+  };
+
+  const governedApis = {
+    /**
+     * Add the specified oracles. May partially fail, such that some oracles are added and others aren't.
+     *
+     * @param {string[]} oracleIds
+     * @returns {Promise<Array<PromiseSettledResult<string>>>}
+     */
+    addOracles: oracleIds => {
+      return Promise.allSettled(oracleIds.map(addOracle));
+    },
+  };
+
+  const governorFacet = makeGovernorFacet(fa.creatorFacet, governedApis);
+  return harden({
+    creatorFacet: governorFacet,
+    publicFacet: fa.publicFacet,
+  });
+};
+harden(start);

package/src/price/roundsManager.js

@@ -75,9 +75,13 @@ const validRoundId = roundId => {
  * @property {number} roundTimeout
  */
 
+/**
+ * @typedef {IssuerRecord<'set'> & { mint: Mint<'set'> }} QuoteKit
+ */
+
 /**
  * @typedef {Readonly<import('./fluxAggregator.js').ChainlinkConfig & {
- * quoteKit: IssuerRecord<'set'> & { mint: ERef<Mint<'set'>> },
+ * quoteKit: QuoteKit,
  * answerPublisher: Publisher<void>,
  * brandIn: Brand<'nat'>,
  * brandOut: Brand<'nat'>,

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

@@ -8,9 +8,10 @@ import {
 import { deeplyFulfilledObject, makeTracer } from '@agoric/internal';
 
 import { unitAmount } from '@agoric/zoe/src/contractSupport/priceQuote.js';
+import { CONTRACT_ELECTORATE, ParamTypes } from '@agoric/governance';
 import { reserveThenDeposit, reserveThenGetNames } from './utils.js';
 
-const trace = makeTracer('RunPriceFeed');
+const trace = makeTracer('RunPriceFeed', false);
 
 /** @type {(name: string) => string} */
 const sanitizePathSegment = name => {
@@ -92,17 +93,17 @@ export const createPriceFeed = async (
   {
     consume: {
       agoricNamesAdmin,
-      aggregators,
       board,
       chainStorage,
       chainTimerService,
       client,
+      econCharterKit,
+      economicCommitteeCreatorFacet,
       namesByAddressAdmin,
       priceAuthority,
       priceAuthorityAdmin,
       zoe,
     },
-    produce: { aggregators: produceAggregators },
   },
   {
     options: {
@@ -119,8 +120,6 @@ export const createPriceFeed = async (
   trace('createPriceFeed');
   const STORAGE_PATH = 'priceFeed';
 
-  // Default to an empty Map and home.priceAuthority.
-  produceAggregators.resolve(new Map());
   void E(client).assignBundle([_addr => ({ priceAuthority })]);
 
   const timer = await chainTimerService;
@@ -128,62 +127,111 @@ export const createPriceFeed = async (
   /**
    * Values come from economy-template.json, which at this writing had IN:ATOM, OUT:USD
    *
-   * @type {[[Brand<'nat'>, Brand<'nat'>], [Installation<import('@agoric/inter-protocol/src/price/fluxAggregator.js').start>]]}
+   * @type {[[Brand<'nat'>, Brand<'nat'>], [Installation<import('@agoric/governance/src/contractGovernor.js').start>, Installation<import('@agoric/inter-protocol/src/price/fluxAggregatorContract.js').start>]]}
    */
-  const [[brandIn, brandOut], [priceAggregator]] = await Promise.all([
-    reserveThenGetNames(E(agoricNamesAdmin).lookupAdmin('oracleBrand'), [
-      IN_BRAND_NAME,
-      OUT_BRAND_NAME,
-    ]),
-    reserveThenGetNames(E(agoricNamesAdmin).lookupAdmin('installation'), [
-      'priceAggregator',
-    ]),
-  ]);
+  const [[brandIn, brandOut], [contractGovernor, priceAggregator]] =
+    await Promise.all([
+      reserveThenGetNames(E(agoricNamesAdmin).lookupAdmin('oracleBrand'), [
+        IN_BRAND_NAME,
+        OUT_BRAND_NAME,
+      ]),
+      reserveThenGetNames(E(agoricNamesAdmin).lookupAdmin('installation'), [
+        'contractGovernor',
+        'priceAggregator',
+      ]),
+    ]);
+
+  trace('getPoserInvitation');
+  const poserInvitationP = E(
+    economicCommitteeCreatorFacet,
+  ).getPoserInvitation();
+  const [initialPoserInvitation, electorateInvitationAmount] =
+    await Promise.all([
+      poserInvitationP,
+      E(E(zoe).getInvitationIssuer()).getAmountOf(poserInvitationP),
+    ]);
+  trace('got initialPoserInvitation');
 
   const unitAmountIn = await unitAmount(brandIn);
-  const terms = await deeplyFulfilledObject(
+  const terms = harden({
+    ...contractTerms,
+    description: AGORIC_INSTANCE_NAME,
+    brandIn,
+    brandOut,
+    timer,
+    unitAmountIn,
+    governedParams: {
+      [CONTRACT_ELECTORATE]: {
+        type: ParamTypes.INVITATION,
+        value: electorateInvitationAmount,
+      },
+    },
+  });
+  trace('got terms');
+
+  const governorTerms = await deeplyFulfilledObject(
     harden({
-      ...contractTerms,
-      description: AGORIC_INSTANCE_NAME,
-      brandIn,
-      brandOut,
-      timer,
-      unitAmountIn,
+      timer: chainTimerService,
+      governedContractInstallation: priceAggregator,
+      governed: {
+        terms,
+      },
     }),
   );
+  trace('got governorTerms', governorTerms);
 
   const storageNode = await makeStorageNodeChild(chainStorage, STORAGE_PATH);
   const marshaller = E(board).getReadonlyMarshaller();
 
+  trace('got contractGovernor', contractGovernor);
+
+  trace('awaiting startInstance');
   // Create the price feed.
-  const aggregator = await E(zoe).startInstance(
-    priceAggregator,
+  /** @type {{ creatorFacet: import('@agoric/governance/src/contractGovernor.js').GovernedContractFnFacetAccess<import('@agoric/inter-protocol/src/price/fluxAggregator.contract.js').start>, publicFacet: GovernorPublic, instance: Instance, adminFacet: AdminFacet }} */
+  const aggregatorGovernor = await E(zoe).startInstance(
+    contractGovernor,
     undefined,
-    terms,
+    governorTerms,
     {
-      storageNode: E(storageNode).makeChildNode(
-        sanitizePathSegment(AGORIC_INSTANCE_NAME),
-      ),
-      marshaller,
+      governed: {
+        initialPoserInvitation,
+        marshaller,
+        namesByAddressAdmin,
+        storageNode: E(storageNode).makeChildNode(
+          sanitizePathSegment(AGORIC_INSTANCE_NAME),
+        ),
+      },
     },
   );
-  await E(aggregators).set(terms, { aggregator });
+  const faCreatorFacet = await E(
+    aggregatorGovernor.creatorFacet,
+  ).getCreatorFacet();
+  trace('got aggregator', faCreatorFacet);
+
+  const faPublic = await E(aggregatorGovernor.creatorFacet).getPublicFacet();
+  const faInstance = await E(aggregatorGovernor.creatorFacet).getInstance();
+  trace('got', { faInstance, faPublic });
 
   E(E(agoricNamesAdmin).lookupAdmin('instance')).update(
     AGORIC_INSTANCE_NAME,
-    aggregator.instance,
+    faInstance,
   );
 
+  E(E.get(econCharterKit).creatorFacet).addInstance(
+    faInstance,
+    aggregatorGovernor.creatorFacet,
+    AGORIC_INSTANCE_NAME,
+  );
+  trace('registered', AGORIC_INSTANCE_NAME, faInstance);
+
   // Publish price feed in home.priceAuthority.
   const forceReplace = true;
-  void E(priceAuthorityAdmin)
-    .registerPriceAuthority(
-      E(aggregator.publicFacet).getPriceAuthority(),
-      brandIn,
-      brandOut,
-      forceReplace,
-    )
-    .then(deleter => E(aggregators).set(terms, { aggregator, deleter }));
+  void E(priceAuthorityAdmin).registerPriceAuthority(
+    E(faPublic).getPriceAuthority(),
+    brandIn,
+    brandOut,
+    forceReplace,
+  );
 
   /**
    * Initialize a new oracle and send an invitation to administer it.
@@ -191,9 +239,7 @@ export const createPriceFeed = async (
    * @param {string} addr
    */
   const addOracle = async addr => {
-    const invitation = await E(aggregator.creatorFacet).makeOracleInvitation(
-      addr,
-    );
+    const invitation = await E(faCreatorFacet).makeOracleInvitation(addr);
     await reserveThenDeposit(
       `${AGORIC_INSTANCE_NAME} member ${addr}`,
       namesByAddressAdmin,
@@ -222,18 +268,19 @@ export const getManifestForPriceFeed = async (
   manifest: {
     [createPriceFeed.name]: {
       consume: {
-        aggregators: t,
         agoricNamesAdmin: t,
         board: t,
         chainStorage: t,
         chainTimerService: t,
         client: t,
+        contractGovernor: t,
+        econCharterKit: t,
+        economicCommitteeCreatorFacet: t,
         namesByAddressAdmin: t,
         priceAuthority: t,
         priceAuthorityAdmin: t,
         zoe: t,
       },
-      produce: { aggregators: t },
     },
     [ensureOracleBrands.name]: {
       consume: {
@@ -321,22 +368,3 @@ export const startPriceFeeds = async (
   trace('startPriceFeeds complete');
 };
 harden(startPriceFeeds);
-
-export const PRICE_FEEDS_MANIFEST = harden({
-  [startPriceFeeds.name]: {
-    consume: {
-      agoricNamesAdmin: true,
-      aggregators: true,
-      board: true,
-      chainStorage: true,
-      chainTimerService: true,
-      client: true,
-      namesByAddressAdmin: true,
-      priceAuthority: true,
-      priceAuthorityAdmin: true,
-      zoe: true,
-    },
-    produce: { aggregators: true },
-    installation: { consume: { priceAggregator: true } },
-  },
-});

package/src/proposals/utils.js

@@ -1,9 +1,7 @@
+import { WalletName } from '@agoric/internal';
 import { getCopyMapEntries, makeCopyMap } from '@agoric/store';
 import { E } from '@endo/far';
 
-// must match packages/wallet/api/src/lib-wallet.js
-export const DEPOSIT_FACET = 'depositFacet';
-
 const { Fail } = assert;
 
 /**
@@ -52,6 +50,12 @@ export const reserveThenGetNames = async (nameAdmin, names) =>
     names.map(name => [name]),
   );
 
+/**
+ * @param {string} debugName
+ * @param {ERef<import('@agoric/vats').NameAdmin>} namesByAddressAdmin
+ * @param {string} addr
+ * @param {Array<ERef<Payment>>} payments
+ */
 export const reserveThenDeposit = async (
   debugName,
   namesByAddressAdmin,
@@ -60,7 +64,7 @@ export const reserveThenDeposit = async (
 ) => {
   console.info('awaiting depositFacet for', debugName);
   const [depositFacet] = await reserveThenGetNamePaths(namesByAddressAdmin, [
-    [addr, DEPOSIT_FACET],
+    [addr, WalletName.depositFacet],
   ]);
   console.info('depositing to', debugName);
   await Promise.allSettled(