fix(vats): move startPriceAuthority earlier in the boot sequence

Agoric · Mar 25, 2022 · 3d15399 · 3d15399
1 parent 935dd05
commit 3d15399
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 30 deletions.
diff --git a/packages/run-protocol/src/econ-behaviors.js b/packages/run-protocol/src/econ-behaviors.js
@@ -132,28 +132,6 @@ export const setupAmm = async ({
   return ammInstallation.then(i => ammInstallationProducer.resolve(i));
 };
 
-/**
- * @param {BootstrapPowers & {
- *   consume: { loadVat: ERef<VatLoader<PriceAuthorityVat>>},
- * }} powers
- *
- * @typedef {ERef<ReturnType<import('../../vats/src/vat-priceAuthority.js').buildRootObject>>} PriceAuthorityVat
- */
-export const startPriceAuthority = async ({
-  consume: { loadVat },
-  produce,
-}) => {
-  const vats = { priceAuthority: E(loadVat)('priceAuthority') };
-  const { priceAuthority, adminFacet } = await E(
-    vats.priceAuthority,
-  ).makePriceAuthorityRegistry();
-
-  produce.priceAuthorityVat.resolve(vats.priceAuthority);
-  produce.priceAuthority.resolve(priceAuthority);
-  produce.priceAuthorityAdmin.resolve(adminFacet);
-};
-harden(startPriceAuthority);
-
 /**
  * @param { EconomyBootstrapPowers } powers
  * @param { Object } config

diff --git a/packages/vats/src/core/basic-behaviors.js b/packages/vats/src/core/basic-behaviors.js
@@ -98,6 +98,28 @@ export const buildZoe = async ({
 };
 harden(buildZoe);
 
+/**
+ * @param {BootstrapPowers & {
+ *   consume: { loadVat: ERef<VatLoader<PriceAuthorityVat>>},
+ * }} powers
+ *
+ * @typedef {ERef<ReturnType<import('../vat-priceAuthority.js').buildRootObject>>} PriceAuthorityVat
+ */
+export const startPriceAuthority = async ({
+  consume: { loadVat },
+  produce,
+}) => {
+  const vats = { priceAuthority: E(loadVat)('priceAuthority') };
+  const { priceAuthority, adminFacet } = await E(
+    vats.priceAuthority,
+  ).makePriceAuthorityRegistry();
+
+  produce.priceAuthorityVat.resolve(vats.priceAuthority);
+  produce.priceAuthority.resolve(priceAuthority);
+  produce.priceAuthorityAdmin.resolve(adminFacet);
+};
+harden(startPriceAuthority);
+
 /**
  * Create inert brands (no mint or issuer) referred to by price oracles.
  *

diff --git a/packages/vats/src/core/manifest.js b/packages/vats/src/core/manifest.js
@@ -9,6 +9,14 @@ const SHARED_BOOTSTRAP_MANIFEST = harden({
       },
     },
   },
+  startPriceAuthority: {
+    consume: { loadVat: true },
+    produce: {
+      priceAuthorityVat: 'priceAuthority',
+      priceAuthority: 'priceAuthority',
+      priceAuthorityAdmin: 'priceAuthority',
+    },
+  },
   makeVatsFromBundles: {
     vats: {
       vatAdmin: 'vatAdmin',
@@ -294,14 +302,6 @@ const SHARED_POST_BOOT_MANIFEST = harden({
       produce: { amm: 'amm', ammGovernor: 'ammGovernor' },
     },
   },
-  startPriceAuthority: {
-    consume: { loadVat: true },
-    produce: {
-      priceAuthorityVat: 'priceAuthority',
-      priceAuthority: 'priceAuthority',
-      priceAuthorityAdmin: 'priceAuthority',
-    },
-  },
   startVaultFactory: {
     consume: {
       feeMintAccess: 'zoe',