From 4f12b72caabaf98535888120384cb57b46c175f0 Mon Sep 17 00:00:00 2001
From: Turadg Aleahmad <turadg@agoric.com>
Date: Tue, 6 Jun 2023 11:41:30 -0700
Subject: [PATCH 1/5] test(bootstrap): refactor buildProposal for re-use

---
 packages/vats/test/bootstrapTests/supports.js | 111 +++++++++++++++++-
 .../test/bootstrapTests/test-vats-restart.js  | 106 +----------------
 2 files changed, 110 insertions(+), 107 deletions(-)

diff --git a/packages/vats/test/bootstrapTests/supports.js b/packages/vats/test/bootstrapTests/supports.js
index 2ad85a28a13..9e41b7652b1 100644
--- a/packages/vats/test/bootstrapTests/supports.js
+++ b/packages/vats/test/bootstrapTests/supports.js
@@ -1,8 +1,10 @@
 // @ts-check
-import { promises as fs } from 'fs';
+/* global process */
+import * as fsAmbient from 'fs';
 import { resolve as importMetaResolve } from 'import-meta-resolve';
 import { basename } from 'path';
 import { inspect } from 'util';
+import childProcessAmbient from 'child_process';
 
 import { Fail } from '@agoric/assert';
 import { buildSwingset } from '@agoric/cosmic-swingset/src/launch-chain.js';
@@ -191,7 +193,7 @@ export const getNodeTestVaultsConfig = async (
   config.defaultManagerType = 'local';
   // speed up build (60s down to 10s in testing)
   config.bundleCachePath = bundleDir;
-  await fs.mkdir(bundleDir, { recursive: true });
+  await fsAmbient.promises.mkdir(bundleDir, { recursive: true });
 
   if (config.coreProposals) {
     // remove Pegasus because it relies on IBC to Golang that isn't running
@@ -201,10 +203,107 @@ export const getNodeTestVaultsConfig = async (
   }
 
   const testConfigPath = `${bundleDir}/${basename(specifier)}`;
-  await fs.writeFile(testConfigPath, JSON.stringify(config), 'utf-8');
+  await fsAmbient.promises.writeFile(
+    testConfigPath,
+    JSON.stringify(config),
+    'utf-8',
+  );
   return testConfigPath;
 };
 
+/**
+ * @param {object} powers
+ * @param {Pick<typeof import('node:child_process'), 'execFileSync' >} powers.childProcess
+ * @param {typeof import('node:fs/promises')} powers.fs
+ */
+const makeProposalExtractor = ({ childProcess, fs }) => {
+  const getPkgPath = (pkg, fileName = '') =>
+    new URL(`../../../${pkg}/${fileName}`, import.meta.url).pathname;
+
+  const runPackageScript = async (pkg, name, env) => {
+    console.warn(pkg, 'running package script:', name);
+    const pkgPath = getPkgPath(pkg);
+    return childProcess.execFileSync('yarn', ['run', name], {
+      cwd: pkgPath,
+      env,
+    });
+  };
+
+  const loadJSON = async filePath =>
+    harden(JSON.parse(await fs.readFile(filePath, 'utf8')));
+
+  // XXX parses the output to find the files but could write them to a path that can be traversed
+  /** @param {string} txt */
+  const parseProposalParts = txt => {
+    const evals = [
+      ...txt.matchAll(/swingset-core-eval (?<permit>\S+) (?<script>\S+)/g),
+    ].map(m => {
+      if (!m.groups) throw Fail`Invalid proposal output ${m[0]}`;
+      const { permit, script } = m.groups;
+      return { permit, script };
+    });
+    evals.length ||
+      Fail`No swingset-core-eval found in proposal output: ${txt}`;
+
+    const bundles = [
+      ...txt.matchAll(/swingset install-bundle @([^\n]+)/gm),
+    ].map(([, bundle]) => bundle);
+    bundles.length || Fail`No bundles found in proposal output: ${txt}`;
+
+    return { evals, bundles };
+  };
+
+  /**
+   * @param {object} options
+   * @param {string} options.package
+   * @param {string} options.packageScriptName
+   * @param {Record<string, string>} [options.env]
+   */
+  const buildAndExtract = async ({
+    package: packageName,
+    packageScriptName,
+    env = {},
+  }) => {
+    const scriptEnv = Object.assign(Object.create(process.env), env);
+    // XXX use '@agoric/inter-protocol'?
+    const out = await runPackageScript(
+      packageName,
+      packageScriptName,
+      scriptEnv,
+    );
+    const built = parseProposalParts(out.toString());
+
+    const loadAndRmPkgFile = async fileName => {
+      const filePath = getPkgPath(packageName, fileName);
+      const content = await fs.readFile(filePath, 'utf8');
+      await fs.rm(filePath);
+      return content;
+    };
+
+    const evalsP = Promise.all(
+      built.evals.map(async ({ permit, script }) => {
+        const [permits, code] = await Promise.all([
+          loadAndRmPkgFile(permit),
+          loadAndRmPkgFile(script),
+        ]);
+        return { json_permits: permits, js_code: code };
+      }),
+    );
+
+    const bundlesP = Promise.all(
+      built.bundles.map(
+        async bundleFile =>
+          /** @type {Promise<EndoZipBase64Bundle>} */ (loadJSON(bundleFile)),
+      ),
+    );
+    return Promise.all([evalsP, bundlesP]).then(([evals, bundles]) => ({
+      evals,
+      bundles,
+    }));
+  };
+  return buildAndExtract;
+};
+
 /**
  * Start a SwingSet kernel to be shared across all tests. By default Ava tests
  * run in parallel, so be careful to avoid ordering dependencies between them.
@@ -328,6 +427,11 @@ export const makeSwingsetTestKit = async (
 
   const runUtils = makeRunUtils(controller, t.log);
 
+  const buildProposal = makeProposalExtractor({
+    childProcess: childProcessAmbient,
+    fs: fsAmbient.promises,
+  });
+
   console.timeEnd('makeSwingsetTestKit');
 
   let currentTime = 0n;
@@ -374,6 +478,7 @@ export const makeSwingsetTestKit = async (
   return {
     advanceTimeBy,
     advanceTimeTo,
+    buildProposal,
     controller,
     jumpTimeTo,
     readLatest,
diff --git a/packages/vats/test/bootstrapTests/test-vats-restart.js b/packages/vats/test/bootstrapTests/test-vats-restart.js
index 9131b396c0c..95b089d884b 100644
--- a/packages/vats/test/bootstrapTests/test-vats-restart.js
+++ b/packages/vats/test/bootstrapTests/test-vats-restart.js
@@ -1,18 +1,15 @@
 // @ts-check
-/* global process */
 /**
  * @file Bootstrap test of restarting (almost) all vats
  */
 import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
 
-import * as processAmbient from 'child_process';
-import * as fsAmbient from 'fs';
 import { Fail } from '@agoric/assert';
-import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
 import { Offers } from '@agoric/inter-protocol/src/clientSupport.js';
+import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
 import { makeAgoricNamesRemotesFromFakeStorage } from '../../tools/board-utils.js';
-import { makeSwingsetTestKit } from './supports.js';
 import { makeWalletFactoryDriver } from './drivers.js';
+import { makeSwingsetTestKit } from './supports.js';
 
 /**
  * @type {import('ava').TestFn<Awaited<ReturnType<typeof makeTestContext>>>}
@@ -25,99 +22,6 @@ const PLATFORM_CONFIG = '@agoric/vats/decentral-itest-vaults-config.json';
 // presently all these tests use one collateral manager
 const collateralBrandKey = 'ATOM';
 
-/**
- * @param {object} powers
- * @param {Pick<typeof import('node:child_process'), 'execFileSync' >} powers.childProcess
- * @param {typeof import('node:fs/promises')} powers.fs
- */
-const makeProposalExtractor = ({ childProcess, fs }) => {
-  const getPkgPath = (pkg, fileName = '') =>
-    new URL(`../../../${pkg}/${fileName}`, import.meta.url).pathname;
-
-  const runPackageScript = async (pkg, name, env) => {
-    console.warn(pkg, 'running package script:', name);
-    const pkgPath = getPkgPath(pkg);
-    return childProcess.execFileSync('yarn', ['run', name], {
-      cwd: pkgPath,
-      env,
-    });
-  };
-
-  const loadJSON = async filePath =>
-    harden(JSON.parse(await fs.readFile(filePath, 'utf8')));
-
-  // XXX parses the output to find the files but could write them to a path that can be traversed
-  /** @param {string} txt */
-  const parseProposalParts = txt => {
-    const evals = [
-      ...txt.matchAll(/swingset-core-eval (?<permit>\S+) (?<script>\S+)/g),
-    ].map(m => {
-      if (!m.groups) throw Fail`Invalid proposal output ${m[0]}`;
-      const { permit, script } = m.groups;
-      return { permit, script };
-    });
-    evals.length ||
-      Fail`No swingset-core-eval found in proposal output: ${txt}`;
-
-    const bundles = [
-      ...txt.matchAll(/swingset install-bundle @([^\n]+)/gm),
-    ].map(([, bundle]) => bundle);
-    bundles.length || Fail`No bundles found in proposal output: ${txt}`;
-
-    return { evals, bundles };
-  };
-
-  /**
-   * @param {object} options
-   * @param {string} options.package
-   * @param {string} options.packageScriptName
-   * @param {Record<string, string>} [options.env]
-   */
-  const buildAndExtract = async ({
-    package: packageName,
-    packageScriptName,
-    env = {},
-  }) => {
-    const scriptEnv = Object.assign(Object.create(process.env), env);
-    // XXX use '@agoric/inter-protocol'?
-    const out = await runPackageScript(
-      packageName,
-      packageScriptName,
-      scriptEnv,
-    );
-    const built = parseProposalParts(out.toString());
-
-    const loadAndRmPkgFile = async fileName => {
-      const filePath = getPkgPath(packageName, fileName);
-      const content = await fs.readFile(filePath, 'utf8');
-      await fs.rm(filePath);
-      return content;
-    };
-
-    const evalsP = Promise.all(
-      built.evals.map(async ({ permit, script }) => {
-        const [permits, code] = await Promise.all([
-          loadAndRmPkgFile(permit),
-          loadAndRmPkgFile(script),
-        ]);
-        return { json_permits: permits, js_code: code };
-      }),
-    );
-
-    const bundlesP = Promise.all(
-      built.bundles.map(
-        async bundleFile =>
-          /** @type {Promise<EndoZipBase64Bundle>} */ (loadJSON(bundleFile)),
-      ),
-    );
-    return Promise.all([evalsP, bundlesP]).then(([evals, bundles]) => ({
-      evals,
-      bundles,
-    }));
-  };
-  return buildAndExtract;
-};
-
 const makeTestContext = async t => {
   console.time('DefaultTestContext');
   const swingsetTestKit = await makeSwingsetTestKit(t, 'bundles/vaults', {
@@ -150,16 +54,10 @@ const makeTestContext = async t => {
 
   console.timeEnd('DefaultTestContext');
 
-  const buildProposal = makeProposalExtractor({
-    childProcess: processAmbient,
-    fs: fsAmbient.promises,
-  });
-
   return {
     ...swingsetTestKit,
     agoricNamesRemotes,
     walletFactoryDriver,
-    buildProposal,
   };
 };
 

From 10e19d76e9737e33c5d361f7788b34e92fd094b6 Mon Sep 17 00:00:00 2001
From: Turadg Aleahmad <turadg@agoric.com>
Date: Tue, 6 Jun 2023 18:47:32 -0700
Subject: [PATCH 2/5] feat(proposals): signal of price feed availability

---
 .../src/proposals/addAssetToVault.js          | 16 +++++++-
 .../src/proposals/price-feed-proposal.js      | 38 ++++++++++++-------
 .../test/smartWallet/contexts.js              | 13 ++++++-
 .../smartWallet/test-oracle-integration.js    |  9 +++--
 4 files changed, 55 insertions(+), 21 deletions(-)

diff --git a/packages/inter-protocol/src/proposals/addAssetToVault.js b/packages/inter-protocol/src/proposals/addAssetToVault.js
index 2d983c2a42c..ff825fb3320 100644
--- a/packages/inter-protocol/src/proposals/addAssetToVault.js
+++ b/packages/inter-protocol/src/proposals/addAssetToVault.js
@@ -1,11 +1,11 @@
 // @jessie-check
 
 import { AmountMath, AssetKind } from '@agoric/ertp';
-import { makeRatio } from '@agoric/zoe/src/contractSupport/index.js';
 import { deeplyFulfilledObject } from '@agoric/internal';
 import { Stable } from '@agoric/vats/src/tokens.js';
-import { E } from '@endo/far';
+import { makeRatio } from '@agoric/zoe/src/contractSupport/index.js';
 import { parseRatio } from '@agoric/zoe/src/contractSupport/ratio.js';
+import { E } from '@endo/far';
 import { reserveThenGetNames } from './utils.js';
 
 export * from './startPSM.js';
@@ -219,6 +219,7 @@ export const addAssetToVault = async (
     brand: {
       consume: { [Stable.symbol]: stableP },
     },
+    instance: { consume: consumeInstance },
   },
   {
     options: {
@@ -239,6 +240,12 @@ export const addAssetToVault = async (
     [keyword],
   );
 
+  // XXX copied from price-feed-proposal
+  const oracleInstanceName = `${oracleBrand}-USD price feed`;
+  // 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, {
@@ -321,6 +328,11 @@ 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: {
diff --git a/packages/inter-protocol/src/proposals/price-feed-proposal.js b/packages/inter-protocol/src/proposals/price-feed-proposal.js
index 6cd47379d3c..6cdb6cd7066 100644
--- a/packages/inter-protocol/src/proposals/price-feed-proposal.js
+++ b/packages/inter-protocol/src/proposals/price-feed-proposal.js
@@ -1,10 +1,10 @@
 // @ts-nocheck -- lots of type errors. low prio b/c proposals are like scripts
-import { E } from '@endo/far';
+import { makeTracer } from '@agoric/internal';
 import {
-  makeStorageNodeChild,
   assertPathSegment,
+  makeStorageNodeChild,
 } from '@agoric/internal/src/lib-chainStorage.js';
-import { makeTracer } from '@agoric/internal';
+import { E } from '@endo/far';
 
 import { unitAmount } from '@agoric/zoe/src/contractSupport/priceQuote.js';
 import { reserveThenDeposit, reserveThenGetNames } from './utils.js';
@@ -95,6 +95,7 @@ export const createPriceFeed = async (
       priceAuthorityAdmin,
       startGovernedUpgradable,
     },
+    instance: { produce: produceInstance },
   },
   {
     options: {
@@ -160,11 +161,27 @@ export const createPriceFeed = async (
     installation: priceAggregator,
   });
 
-  E(E(agoricNamesAdmin).lookupAdmin('instance'))
+  // Publish price feed in home.priceAuthority.
+  const forceReplace = true;
+  // Make sure this PA is registered before sharing the instance in agoricNames,
+  // which allows contracts that depend on the registry value to wait for it and
+  // prevent a race.
+  await E(priceAuthorityAdmin).registerPriceAuthority(
+    E(faKit.publicFacet).getPriceAuthority(),
+    brandIn,
+    brandOut,
+    forceReplace,
+  );
+
+  await E(E(agoricNamesAdmin).lookupAdmin('instance'))
     .update(AGORIC_INSTANCE_NAME, faKit.instance)
     .catch(err =>
       console.error(`🚨 failed to update ${AGORIC_INSTANCE_NAME}`, err),
     );
+  // being after the above awaits means that when this resolves, the consumer
+  // gets notified that the authority is in the registry and its instance is in
+  // agoricNames.
+  produceInstance[AGORIC_INSTANCE_NAME].resolve(faKit.instance);
 
   E(E.get(econCharterKit).creatorFacet).addInstance(
     faKit.instance,
@@ -173,15 +190,6 @@ export const createPriceFeed = async (
   );
   trace('registered', AGORIC_INSTANCE_NAME, faKit.instance);
 
-  // Publish price feed in home.priceAuthority.
-  const forceReplace = true;
-  void E(priceAuthorityAdmin).registerPriceAuthority(
-    E(faKit.publicFacet).getPriceAuthority(),
-    brandIn,
-    brandOut,
-    forceReplace,
-  );
-
   /**
    * Initialize a new oracle and send an invitation to administer it.
    *
@@ -231,6 +239,9 @@ export const getManifestForPriceFeed = async (
         priceAuthorityAdmin: t,
         startGovernedUpgradable: t,
       },
+      instance: {
+        produce: t,
+      },
     },
     [ensureOracleBrands.name]: {
       namedVat: {
@@ -242,6 +253,7 @@ export const getManifestForPriceFeed = async (
     },
   },
   installations: {
+    // ??? will every eval of price-feed-proposal install priceAggregator ?
     priceAggregator: restoreRef(priceFeedOptions.priceAggregatorRef),
   },
   options: {
diff --git a/packages/inter-protocol/test/smartWallet/contexts.js b/packages/inter-protocol/test/smartWallet/contexts.js
index 35f0d8d4958..37bf757da2d 100644
--- a/packages/inter-protocol/test/smartWallet/contexts.js
+++ b/packages/inter-protocol/test/smartWallet/contexts.js
@@ -42,7 +42,8 @@ export const makeDefaultTestContext = async (t, makeSpace) => {
 
   const bundleCache = await unsafeMakeBundleCache('bundles/');
 
-  const { consume, produce } = await makeSpace(log, bundleCache);
+  // @ts-expect-error xxx
+  const { consume, produce, instance } = await makeSpace(log, bundleCache);
   const { agoricNames, zoe } = consume;
 
   await produceDiagnostics({ produce });
@@ -155,8 +156,16 @@ export const makeDefaultTestContext = async (t, makeSpace) => {
     const paInstallation = E(zoe).install(paBundle);
     await E(installAdmin).update('priceAggregator', paInstallation);
 
+    const mockPriceAuthorityAdmin = /** @type {any} */ ({
+      registerPriceAuthority() {
+        // noop mock
+      },
+    });
+    produce.priceAuthorityAdmin.resolve(mockPriceAuthorityAdmin);
+
     await createPriceFeed(
-      { consume, produce },
+      // @ts-expect-error xxx
+      { consume, produce, instance },
       {
         options: {
           priceFeedOptions: {
diff --git a/packages/inter-protocol/test/smartWallet/test-oracle-integration.js b/packages/inter-protocol/test/smartWallet/test-oracle-integration.js
index d7a13525b86..0ed23df2dd1 100644
--- a/packages/inter-protocol/test/smartWallet/test-oracle-integration.js
+++ b/packages/inter-protocol/test/smartWallet/test-oracle-integration.js
@@ -22,9 +22,10 @@ import {
 } from './contexts.js';
 
 /**
- * @type {import('ava').TestFn<Awaited<ReturnType<makeDefaultTestContext>>
- * & {consume: import('@agoric/inter-protocol/src/proposals/econ-behaviors.js').EconomyBootstrapPowers['consume']}>
- * }
+ * @typedef {Awaited<ReturnType<typeof makeDefaultTestContext>>
+  & { consume: import('@agoric/inter-protocol/src/proposals/econ-behaviors.js').EconomyBootstrapPowers['consume'] } } TestContext */
+/**
+ * @type {import('ava').TestFn<TestContext>}
  */
 const test = anyTest;
 
@@ -104,7 +105,7 @@ test.before(async t => {
 });
 
 /**
- * @param {import('ava').ExecutionContext<*>} t
+ * @param {import('ava').ExecutionContext<TestContext>} t
  * @param {string[]} oracleAddresses
  */
 const setupFeedWithWallets = async (t, oracleAddresses) => {

From daf56fc3806b006febe3fb7bae8a78cca0bf991e Mon Sep 17 00:00:00 2001
From: Turadg Aleahmad <turadg@agoric.com>
Date: Wed, 7 Jun 2023 09:19:21 -0700
Subject: [PATCH 3/5] refactor: extract price feed name helper

---
 packages/agoric-cli/src/commands/oracle.js     |  3 ++-
 .../src/proposals/addAssetToVault.js           |  4 ++--
 .../src/proposals/price-feed-proposal.js       |  5 ++++-
 .../test/smartWallet/contexts.js               |  7 +++++--
 .../smartWallet/test-oracle-integration.js     | 18 +++++++++++-------
 packages/vats/test/bootstrapTests/drivers.js   |  3 ++-
 6 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/packages/agoric-cli/src/commands/oracle.js b/packages/agoric-cli/src/commands/oracle.js
index c0b13a34690..2c458070e06 100644
--- a/packages/agoric-cli/src/commands/oracle.js
+++ b/packages/agoric-cli/src/commands/oracle.js
@@ -7,6 +7,7 @@ import { Nat } from '@endo/nat';
 import { Command } from 'commander';
 import * as cp from 'child_process';
 import { inspect } from 'util';
+import { instanceNameFor } from '@agoric/inter-protocol/src/proposals/price-feed-proposal.js';
 import { normalizeAddressWithOptions } from '../lib/chain.js';
 import { getNetworkConfig, makeRpcUtils, storageHelper } from '../lib/rpc.js';
 import {
@@ -75,7 +76,7 @@ export const makeOracleCommand = (logger, io = {}) => {
     const utils = await makeRpcUtils({ fetch });
 
     const lookupPriceAggregatorInstance = ([brandIn, brandOut]) => {
-      const name = `${brandIn}-${brandOut} price feed`;
+      const name = instanceNameFor(brandIn, brandOut);
       const instance = utils.agoricNames.instance[name];
       if (!instance) {
         logger.debug('known instances:', utils.agoricNames.instance);
diff --git a/packages/inter-protocol/src/proposals/addAssetToVault.js b/packages/inter-protocol/src/proposals/addAssetToVault.js
index ff825fb3320..d2a0c2dc527 100644
--- a/packages/inter-protocol/src/proposals/addAssetToVault.js
+++ b/packages/inter-protocol/src/proposals/addAssetToVault.js
@@ -6,6 +6,7 @@ import { Stable } from '@agoric/vats/src/tokens.js';
 import { makeRatio } from '@agoric/zoe/src/contractSupport/index.js';
 import { parseRatio } from '@agoric/zoe/src/contractSupport/ratio.js';
 import { E } from '@endo/far';
+import { instanceNameFor } from './price-feed-proposal.js';
 import { reserveThenGetNames } from './utils.js';
 
 export * from './startPSM.js';
@@ -240,8 +241,7 @@ export const addAssetToVault = async (
     [keyword],
   );
 
-  // XXX copied from price-feed-proposal
-  const oracleInstanceName = `${oracleBrand}-USD price feed`;
+  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];
diff --git a/packages/inter-protocol/src/proposals/price-feed-proposal.js b/packages/inter-protocol/src/proposals/price-feed-proposal.js
index 6cdb6cd7066..751d3c811c8 100644
--- a/packages/inter-protocol/src/proposals/price-feed-proposal.js
+++ b/packages/inter-protocol/src/proposals/price-feed-proposal.js
@@ -18,6 +18,9 @@ const sanitizePathSegment = name => {
   return candidate;
 };
 
+export const instanceNameFor = (inBrandName, outBrandName) =>
+  `${inBrandName}-${outBrandName} price feed`;
+
 /**
  * @typedef {{
  * brandIn?: ERef<Brand<'nat'> | undefined>,
@@ -314,7 +317,7 @@ export const startPriceFeeds = async (
     {
       options: {
         priceFeedOptions: {
-          AGORIC_INSTANCE_NAME: `${inBrandName}-${outBrandName} price feed`,
+          AGORIC_INSTANCE_NAME: instanceNameFor(inBrandName, outBrandName),
           contractTerms: {
             minSubmissionCount: 2,
             minSubmissionValue: 1,
diff --git a/packages/inter-protocol/test/smartWallet/contexts.js b/packages/inter-protocol/test/smartWallet/contexts.js
index 37bf757da2d..f565e32b4f2 100644
--- a/packages/inter-protocol/test/smartWallet/contexts.js
+++ b/packages/inter-protocol/test/smartWallet/contexts.js
@@ -11,7 +11,10 @@ import {
 import { heapZone } from '@agoric/zone';
 import { E } from '@endo/far';
 import path from 'path';
-import { createPriceFeed } from '../../src/proposals/price-feed-proposal.js';
+import {
+  createPriceFeed,
+  instanceNameFor,
+} from '../../src/proposals/price-feed-proposal.js';
 import { withAmountUtils } from '../supports.js';
 
 // referenced by TS
@@ -169,7 +172,7 @@ export const makeDefaultTestContext = async (t, makeSpace) => {
       {
         options: {
           priceFeedOptions: {
-            AGORIC_INSTANCE_NAME: `${inBrandName}-${outBrandName} price feed`,
+            AGORIC_INSTANCE_NAME: instanceNameFor(inBrandName, outBrandName),
             contractTerms: {
               minSubmissionCount: 2,
               minSubmissionValue: 1,
diff --git a/packages/inter-protocol/test/smartWallet/test-oracle-integration.js b/packages/inter-protocol/test/smartWallet/test-oracle-integration.js
index 0ed23df2dd1..81ec5ffeee5 100644
--- a/packages/inter-protocol/test/smartWallet/test-oracle-integration.js
+++ b/packages/inter-protocol/test/smartWallet/test-oracle-integration.js
@@ -3,17 +3,18 @@ import '@agoric/vats/src/core/types.js';
 import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
 
 import { NonNullish } from '@agoric/assert';
-import { coalesceUpdates } from '@agoric/smart-wallet/src/utils.js';
+import { AssetKind, makeIssuerKit } from '@agoric/ertp';
+import { zip } from '@agoric/internal';
 import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
-import buildManualTimer from '@agoric/zoe/tools/manualTimer.js';
+import { coalesceUpdates } from '@agoric/smart-wallet/src/utils.js';
 import { TimeMath } from '@agoric/time';
+import buildManualTimer from '@agoric/zoe/tools/manualTimer.js';
 import { E } from '@endo/far';
-import { zip } from '@agoric/internal';
-import { AssetKind, makeIssuerKit } from '@agoric/ertp';
-import { buildRootObject } from './boot-psm.js';
 import { INVITATION_MAKERS_DESC as EC_INVITATION_MAKERS_DESC } from '../../src/econCommitteeCharter.js';
 import { INVITATION_MAKERS_DESC as ORACLE_INVITATION_MAKERS_DESC } from '../../src/price/fluxAggregatorKit.js';
+import { instanceNameFor } from '../../src/proposals/price-feed-proposal.js';
 import { headValue } from '../supports.js';
+import { buildRootObject } from './boot-psm.js';
 import {
   currentPurseBalance,
   importBootTestUtils,
@@ -122,7 +123,7 @@ const setupFeedWithWallets = async (t, oracleAddresses) => {
   /** @type {import('@agoric/zoe/src/zoeService/utils.js').Instance<import('@agoric/inter-protocol/src/price/fluxAggregatorContract.js').prepare>} */
   const governedPriceAggregator = await E(agoricNames).lookup(
     'instance',
-    'ATOM-USD price feed',
+    instanceNameFor('ATOM', 'USD'),
   );
 
   return { oracleWallets, governedPriceAggregator };
@@ -464,7 +465,10 @@ test.serial('govern oracles list', async t => {
     t.is(usedInvitations.get('acceptVoterOID')?.value[0].description, 'Voter0');
   }
 
-  const feed = await E(agoricNames).lookup('instance', 'ATOM-USD price feed');
+  const feed = await E(agoricNames).lookup(
+    'instance',
+    instanceNameFor('ATOM', 'USD'),
+  );
   t.assert(feed);
 
   // Call for a vote to addOracles ////////////////////////////////
diff --git a/packages/vats/test/bootstrapTests/drivers.js b/packages/vats/test/bootstrapTests/drivers.js
index aa2824d8519..237b2a09999 100644
--- a/packages/vats/test/bootstrapTests/drivers.js
+++ b/packages/vats/test/bootstrapTests/drivers.js
@@ -4,6 +4,7 @@ import { Offers } from '@agoric/inter-protocol/src/clientSupport.js';
 import { SECONDS_PER_MINUTE } from '@agoric/inter-protocol/src/proposals/econ-behaviors.js';
 import { unmarshalFromVstorage } from '@agoric/internal/src/lib-chainStorage.js';
 import { slotToRemotable } from '@agoric/internal/src/storage-test-utils.js';
+import { instanceNameFor } from '@agoric/inter-protocol/src/proposals/price-feed-proposal.js';
 import { boardSlottingMarshaller } from '../../tools/board-utils.js';
 
 /**
@@ -156,7 +157,7 @@ export const makePriceFeedDriver = async (
   oracleAddresses,
 ) => {
   // XXX assumes this one feed
-  const priceFeedName = 'ATOM-USD price feed';
+  const priceFeedName = instanceNameFor('ATOM', 'USD');
 
   const oracleWallets = await Promise.all(
     oracleAddresses.map(addr => walletFactoryDriver.provideSmartWallet(addr)),

From c71145303ec05928e759f7beff7f2e598b36c197 Mon Sep 17 00:00:00 2001
From: Turadg Aleahmad <turadg@agoric.com>
Date: Wed, 7 Jun 2023 12:27:32 -0700
Subject: [PATCH 4/5] chore(vaults): handle missing lockedQuote as valid

---
 .../src/vaultFactory/vaultDirector.js         |  2 ++
 .../src/vaultFactory/vaultManager.js          | 22 +++++++++++++------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/packages/inter-protocol/src/vaultFactory/vaultDirector.js b/packages/inter-protocol/src/vaultFactory/vaultDirector.js
index 86aff7c1b11..0562e7ce153 100644
--- a/packages/inter-protocol/src/vaultFactory/vaultDirector.js
+++ b/packages/inter-protocol/src/vaultFactory/vaultDirector.js
@@ -250,6 +250,7 @@ const prepareVaultDirector = (
     metrics: makeRecorderTopic('Vault Factory metrics', metricsKit),
   });
 
+  /** @param {(vm: VaultManager) => void} fn */
   const allManagersDo = fn => {
     for (const managerIndex of collateralManagers.values()) {
       const vm = vaultManagers.get(managerIndex).self;
@@ -424,6 +425,7 @@ const prepareVaultDirector = (
 
         makeLiquidationWaker() {
           return makeWaker('liquidationWaker', _timestamp => {
+            // XXX floating promise
             allManagersDo(vm => vm.liquidateVaults(auctioneer));
           });
         },
diff --git a/packages/inter-protocol/src/vaultFactory/vaultManager.js b/packages/inter-protocol/src/vaultFactory/vaultManager.js
index 6c41b45ac76..bc998404f1a 100644
--- a/packages/inter-protocol/src/vaultFactory/vaultManager.js
+++ b/packages/inter-protocol/src/vaultFactory/vaultManager.js
@@ -400,7 +400,7 @@ export const prepareVaultManagerKit = (
           // throw. See https://github.com/Agoric/agoric-sdk/issues/4317
           void observeNotifier(quoteNotifier, {
             updateState(value) {
-              trace('vaultManager got new collateral quote', value);
+              trace('storing new quote', value.quoteAmount.value);
               ephemera.storedCollateralQuote = value;
             },
             fail(reason) {
@@ -1036,7 +1036,7 @@ export const prepareVaultManagerKit = (
           if (!storedCollateralQuote)
             throw Fail`lockOraclePrices called before a collateral quote was available`;
           trace(
-            `lockPrice`,
+            `lockOraclePrices`,
             getAmountIn(storedCollateralQuote),
             getAmountOut(storedCollateralQuote),
           );
@@ -1046,7 +1046,7 @@ export const prepareVaultManagerKit = (
           return storedCollateralQuote;
         },
         /**
-         * @param {AuctioneerPublicFacet} auctionPF
+         * @param {ERef<AuctioneerPublicFacet>} auctionPF
          */
         async liquidateVaults(auctionPF) {
           const { state, facets } = this;
@@ -1060,11 +1060,19 @@ export const prepareVaultManagerKit = (
           } = state;
           trace(collateralBrand, 'considering liquidation');
 
+          if (!lockedQuote) {
+            // By design, the first cycle of auction may call this before a quote is locked
+            // because the schedule is global at the vaultDirector level, and if a manager
+            // starts after the price lock time there's nothing to be done.
+            // NB: this message should not log repeatedly.
+            console.error(
+              'Skipping liquidation because no quote is locked yet (may happen with new manager)',
+            );
+            return;
+          }
+
           const { prioritizedVaults } = collateralEphemera(collateralBrand);
-          assert(factoryPowers && prioritizedVaults && zcf);
-          lockedQuote ||
-            Fail`Must have locked a quote before liquidating vaults.`;
-          assert(lockedQuote); // redundant with previous line
+          prioritizedVaults || Fail`prioritizedVaults missing from ephemera`;
 
           const liqMargin = self.getGovernedParams().getLiquidationMargin();
 

From 247970e9534ec251f25b60ac5a801938eb5be66b Mon Sep 17 00:00:00 2001
From: Turadg Aleahmad <turadg@agoric.com>
Date: Wed, 7 Jun 2023 12:27:44 -0700
Subject: [PATCH 5/5] test(bootstrap): liq after add-collateral

---
 packages/inter-protocol/package.json          |   1 +
 packages/inter-protocol/scripts/add-STARS.js  |  43 +++++
 packages/vats/package.json                    |   1 +
 packages/vats/test/bootstrapTests/drivers.js  |  12 +-
 .../vats/test/bootstrapTests/liquidation.js   |  71 +++++---
 .../test/bootstrapTests/test-liquidation-1.js | 163 ++++++++++++------
 .../bootstrapTests/test-liquidation-2b.js     |  14 +-
 7 files changed, 218 insertions(+), 87 deletions(-)
 create mode 100644 packages/inter-protocol/scripts/add-STARS.js

diff --git a/packages/inter-protocol/package.json b/packages/inter-protocol/package.json
index 32ace4e0251..9462af14ee0 100644
--- a/packages/inter-protocol/package.json
+++ b/packages/inter-protocol/package.json
@@ -10,6 +10,7 @@
   "scripts": {
     "build": "yarn build:bundles",
     "build:bundles": "node ./scripts/build-bundles.js",
+    "build:add-STARS-proposal": "agoric run scripts/add-STARS.js",
     "test": "ava",
     "test:c8": "c8 $C8_OPTIONS ava --config=ava-nesm.config.js",
     "test:xs": "exit 0",
diff --git a/packages/inter-protocol/scripts/add-STARS.js b/packages/inter-protocol/scripts/add-STARS.js
new file mode 100644
index 00000000000..8e6b0025bf4
--- /dev/null
+++ b/packages/inter-protocol/scripts/add-STARS.js
@@ -0,0 +1,43 @@
+import { makeHelpers } from '@agoric/deploy-script-support';
+import { defaultProposalBuilder as vaultProposalBuilder } from './add-collateral-core.js';
+import { defaultProposalBuilder as oraclesProposalBuilder } from './price-feed-core.js';
+
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').ProposalBuilder} */
+export const starsVaultProposalBuilder = async powers => {
+  return vaultProposalBuilder(powers, {
+    interchainAssetOptions: {
+      // Values for the Stargaze token on Osmosis
+      denom:
+        'ibc/987C17B11ABC2B20019178ACE62929FE9840202CE79498E29FE8E5CB02B7C0A4',
+      decimalPlaces: 6,
+      keyword: 'STARS',
+      oracleBrand: 'STARS',
+      proposedName: 'STARS',
+    },
+  });
+};
+
+/** @type {import('@agoric/deploy-script-support/src/externalTypes.js').ProposalBuilder} */
+export const starsOraclesProposalBuilder = async powers => {
+  return oraclesProposalBuilder(powers, {
+    AGORIC_INSTANCE_NAME: `STARS-USD price feed`,
+    IN_BRAND_LOOKUP: ['agoricNames', 'oracleBrand', 'STARS'],
+    IN_BRAND_DECIMALS: 6,
+    OUT_BRAND_LOOKUP: ['agoricNames', 'oracleBrand', 'USD'],
+    OUT_BRAND_DECIMALS: 4,
+    oracleAddresses: [
+      // copied from decentral-main-vaults-config.json
+      'agoric1krunjcqfrf7la48zrvdfeeqtls5r00ep68mzkr',
+      'agoric19uscwxdac6cf6z7d5e26e0jm0lgwstc47cpll8',
+      'agoric144rrhh4m09mh7aaffhm6xy223ym76gve2x7y78',
+      'agoric19d6gnr9fyp6hev4tlrg87zjrzsd5gzr5qlfq2p',
+      'agoric1n4fcxsnkxe4gj6e24naec99hzmc4pjfdccy5nj',
+    ],
+  });
+};
+
+export default async (homeP, endowments) => {
+  const { writeCoreProposal } = await makeHelpers(homeP, endowments);
+  await writeCoreProposal('add-STARS', starsVaultProposalBuilder);
+  await writeCoreProposal('add-STARS-oracles', starsOraclesProposalBuilder);
+};
diff --git a/packages/vats/package.json b/packages/vats/package.json
index ad128928217..d712ae3fb0b 100644
--- a/packages/vats/package.json
+++ b/packages/vats/package.json
@@ -14,6 +14,7 @@
     "build:boot-viz-sim": "node src/authorityViz.js --sim-chain >docs/boot-sim.dot && dot -Tsvg docs/boot-sim.dot >docs/boot-sim.dot.svg",
     "build:boot-viz-sim-gov": "node src/authorityViz.js --sim-chain --gov >docs/boot-sim-gov.dot && dot -Tsvg docs/boot-sim-gov.dot >docs/boot-sim-gov.dot.svg",
     "build:restart-vats-proposal": "agoric run scripts/restart-vats.js",
+    "build:add-STARS-proposal": "agoric run scripts/add-STARS.js",
     "prepack": "tsc --build jsconfig.build.json",
     "postpack": "git clean -f '*.d.ts*'",
     "test": "ava",
diff --git a/packages/vats/test/bootstrapTests/drivers.js b/packages/vats/test/bootstrapTests/drivers.js
index 237b2a09999..4bfa1dbb684 100644
--- a/packages/vats/test/bootstrapTests/drivers.js
+++ b/packages/vats/test/bootstrapTests/drivers.js
@@ -145,28 +145,28 @@ export const makeWalletFactoryDriver = async (
 };
 
 /**
- * @param {import('@agoric/internal/src/storage-test-utils.js').FakeStorageKit} storage
+ * @param {string} collateralBrandKey
  * @param {import('../../tools/board-utils.js').AgoricNamesRemotes} agoricNamesRemotes
  * @param {Awaited<ReturnType<typeof makeWalletFactoryDriver>>} walletFactoryDriver
  * @param {string[]} oracleAddresses
  */
 export const makePriceFeedDriver = async (
-  storage,
+  collateralBrandKey,
   agoricNamesRemotes,
   walletFactoryDriver,
   oracleAddresses,
 ) => {
-  // XXX assumes this one feed
-  const priceFeedName = instanceNameFor('ATOM', 'USD');
+  const priceFeedName = instanceNameFor(collateralBrandKey, 'USD');
 
   const oracleWallets = await Promise.all(
     oracleAddresses.map(addr => walletFactoryDriver.provideSmartWallet(addr)),
   );
 
   const priceFeedInstance = agoricNamesRemotes.instance[priceFeedName];
-  const adminOfferId = 'acceptOracleInvitation';
+  priceFeedInstance || Fail`no price feed ${priceFeedName}`;
+  const adminOfferId = `accept-${collateralBrandKey}-oracleInvitation`;
 
-  // accept invitations (TODO move into driver)
+  // accept invitations
   await Promise.all(
     oracleWallets.map(w =>
       w.executeOffer({
diff --git a/packages/vats/test/bootstrapTests/liquidation.js b/packages/vats/test/bootstrapTests/liquidation.js
index 8d4b0724021..972212e1928 100644
--- a/packages/vats/test/bootstrapTests/liquidation.js
+++ b/packages/vats/test/bootstrapTests/liquidation.js
@@ -39,9 +39,15 @@ export const makeLiquidationTestContext = async t => {
   console.timeLog('DefaultTestContext', 'vaultFactoryKit');
 
   // has to be late enough for agoricNames data to have been published
-  const agoricNamesRemotes = makeAgoricNamesRemotesFromFakeStorage(
-    swingsetTestKit.storage,
-  );
+  /** @type {import('../../tools/board-utils.js').AgoricNamesRemotes} */
+  const agoricNamesRemotes = {};
+  const refreshAgoricNamesRemotes = () => {
+    Object.assign(
+      agoricNamesRemotes,
+      makeAgoricNamesRemotesFromFakeStorage(swingsetTestKit.storage),
+    );
+  };
+  refreshAgoricNamesRemotes();
   agoricNamesRemotes.brand.ATOM || Fail`ATOM missing from agoricNames`;
   console.timeLog('DefaultTestContext', 'agoricNamesRemotes');
 
@@ -65,30 +71,43 @@ export const makeLiquidationTestContext = async t => {
   );
   console.timeLog('DefaultTestContext', 'governanceDriver');
 
-  const priceFeedDriver = await makePriceFeedDriver(
-    storage,
-    agoricNamesRemotes,
-    walletFactoryDriver,
-    // TODO read from the config file
-    [
-      'agoric1krunjcqfrf7la48zrvdfeeqtls5r00ep68mzkr',
-      'agoric19uscwxdac6cf6z7d5e26e0jm0lgwstc47cpll8',
-      'agoric144rrhh4m09mh7aaffhm6xy223ym76gve2x7y78',
-      'agoric19d6gnr9fyp6hev4tlrg87zjrzsd5gzr5qlfq2p',
-      'agoric1n4fcxsnkxe4gj6e24naec99hzmc4pjfdccy5nj',
-    ],
-  );
+  /** @type {Record<string, Awaited<ReturnType<typeof makePriceFeedDriver>>>} */
+  const priceFeedDrivers = {};
 
   console.timeLog('DefaultTestContext', 'priceFeedDriver');
 
   console.timeEnd('DefaultTestContext');
 
-  const setupStartingState = async () => {
+  /**
+   *
+   * @param {object} opts
+   * @param {string} opts.collateralBrandKey
+   * @param {number} opts.managerIndex
+   */
+  const setupStartingState = async ({ collateralBrandKey, managerIndex }) => {
+    const managerPath = `published.vaultFactory.managers.manager${managerIndex}`;
     const { advanceTimeBy, readLatest } = swingsetTestKit;
+
+    !priceFeedDrivers[collateralBrandKey] ||
+      Fail`setup for ${collateralBrandKey} already ran`;
+    priceFeedDrivers[collateralBrandKey] = await makePriceFeedDriver(
+      collateralBrandKey,
+      agoricNamesRemotes,
+      walletFactoryDriver,
+      // TODO read from the config file
+      [
+        'agoric1krunjcqfrf7la48zrvdfeeqtls5r00ep68mzkr',
+        'agoric19uscwxdac6cf6z7d5e26e0jm0lgwstc47cpll8',
+        'agoric144rrhh4m09mh7aaffhm6xy223ym76gve2x7y78',
+        'agoric19d6gnr9fyp6hev4tlrg87zjrzsd5gzr5qlfq2p',
+        'agoric1n4fcxsnkxe4gj6e24naec99hzmc4pjfdccy5nj',
+      ],
+    );
+
     // price feed logic treats zero time as "unset" so advance to nonzero
     await advanceTimeBy(1, 'seconds');
 
-    await priceFeedDriver.setPrice(12.34);
+    await priceFeedDrivers[collateralBrandKey].setPrice(12.34);
 
     // raise the VaultFactory DebtLimit
     await governanceDriver.changeParams(
@@ -102,7 +121,7 @@ export const makeLiquidationTestContext = async t => {
       {
         paramPath: {
           key: {
-            collateralBrand: agoricNamesRemotes.brand.ATOM,
+            collateralBrand: agoricNamesRemotes.brand[collateralBrandKey],
           },
         },
       },
@@ -120,7 +139,7 @@ export const makeLiquidationTestContext = async t => {
     );
 
     // confirm Relevant Governance Parameter Assumptions
-    t.like(readLatest('published.vaultFactory.managers.manager0.governance'), {
+    t.like(readLatest(`${managerPath}.governance`), {
       current: {
         DebtLimit: { value: { value: DebtLimitValue } },
         InterestRate: {
@@ -168,11 +187,16 @@ export const makeLiquidationTestContext = async t => {
   };
 
   const check = {
-    vaultNotification(vaultIndex, partial) {
+    /**
+     * @param {number} managerIndex
+     * @param {number} vaultIndex
+     * @param {Record<string, any>} partial
+     */
+    vaultNotification(managerIndex, vaultIndex, partial) {
       const { readLatest } = swingsetTestKit;
 
       const notification = readLatest(
-        `published.vaultFactory.managers.manager0.vaults.vault${vaultIndex}`,
+        `published.vaultFactory.managers.manager${managerIndex}.vaults.vault${vaultIndex}`,
       );
       t.like(notification, partial);
     },
@@ -183,7 +207,8 @@ export const makeLiquidationTestContext = async t => {
     agoricNamesRemotes,
     check,
     governanceDriver,
-    priceFeedDriver,
+    priceFeedDrivers,
+    refreshAgoricNamesRemotes,
     setupStartingState,
     walletFactoryDriver,
   };
diff --git a/packages/vats/test/bootstrapTests/test-liquidation-1.js b/packages/vats/test/bootstrapTests/test-liquidation-1.js
index ecb397d649d..906e69cef63 100644
--- a/packages/vats/test/bootstrapTests/test-liquidation-1.js
+++ b/packages/vats/test/bootstrapTests/test-liquidation-1.js
@@ -1,6 +1,6 @@
 // @ts-check
 /**
- * @file Bootstrap test integration vaults with smart-wallet
+ * @file Bootstrap test of liquidation across multiple collaterals
  */
 import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
 
@@ -9,6 +9,7 @@ import {
   makeParseAmount,
   Offers,
 } from '@agoric/inter-protocol/src/clientSupport.js';
+import process from 'process';
 import {
   likePayouts,
   makeLiquidationTestContext,
@@ -20,9 +21,6 @@ import {
  */
 const test = anyTest;
 
-// presently all these tests use one collateral manager
-const collateralBrandKey = 'ATOM';
-
 //#region Product spec
 const setup = /** @type {const} */ ({
   vaults: [
@@ -92,6 +90,7 @@ const outcome = /** @type {const} */ ({
   reserve: {
     allocations: {
       ATOM: 0.309852,
+      STARS: 0.309852,
     },
     shortfall: 0,
   },
@@ -129,24 +128,38 @@ test.after.always(t => {
 });
 
 // Reference: Flow 1 from https://github.com/Agoric/agoric-sdk/issues/7123
-test.serial('scenario: Flow 1', async t => {
+const checkFlow1 = async (
+  t,
+  { collateralBrandKey, managerIndex },
+  _expected,
+) => {
+  // fail if there are any unhandled rejections
+  process.on('unhandledRejection', error => {
+    t.fail(/** @type {Error} */ (error).message);
+  });
+
   const {
     advanceTimeBy,
     advanceTimeTo,
     agoricNamesRemotes,
     check,
     setupStartingState,
-    priceFeedDriver,
+    priceFeedDrivers,
     readLatest,
     walletFactoryDriver,
   } = t.context;
 
-  await setupStartingState();
+  const metricsPath = `published.vaultFactory.managers.manager${managerIndex}.metrics`;
+
+  await setupStartingState({
+    collateralBrandKey,
+    managerIndex,
+  });
 
   const minter = await walletFactoryDriver.provideSmartWallet('agoric1minter');
 
   for (let i = 0; i < setup.vaults.length; i += 1) {
-    const offerId = `open-vault${i}`;
+    const offerId = `open-${collateralBrandKey}-vault${i}`;
     await minter.executeOfferMaker(Offers.vaults.OpenVault, {
       offerId,
       collateralBrandKey,
@@ -161,7 +174,7 @@ test.serial('scenario: Flow 1', async t => {
 
   // Verify starting balances
   for (let i = 0; i < setup.vaults.length; i += 1) {
-    check.vaultNotification(i, {
+    check.vaultNotification(managerIndex, i, {
       debtSnapshot: { debt: { value: scale6(setup.vaults[i].debt) } },
       locked: { value: scale6(setup.vaults[i].atom) },
       vaultState: 'active',
@@ -180,18 +193,18 @@ test.serial('scenario: Flow 1', async t => {
         agoricNamesRemotes.instance['psm-IST-USDC_axl'],
         agoricNamesRemotes.brand,
         {
-          offerId: 'print-ist',
+          offerId: `print-${collateralBrandKey}-ist`,
           wantMinted: 1_000,
           pair: ['IST', 'USDC_axl'],
         },
       ),
     );
 
-    const maxBuy = '10000ATOM';
+    const maxBuy = `10000${collateralBrandKey}`;
 
     // bids are long-lasting offers so we can't wait here for completion
     await buyer.sendOfferMaker(Offers.auction.Bid, {
-      offerId: 'bid1',
+      offerId: `${collateralBrandKey}-bid1`,
       ...setup.bids[0],
       maxBuy,
       parseAmount,
@@ -199,33 +212,33 @@ test.serial('scenario: Flow 1', async t => {
 
     t.like(readLatest('published.wallet.agoric1buyer'), {
       status: {
-        id: 'bid1',
+        id: `${collateralBrandKey}-bid1`,
         result: 'Your bid has been accepted',
         payouts: undefined,
       },
     });
     await buyer.sendOfferMaker(Offers.auction.Bid, {
-      offerId: 'bid2',
+      offerId: `${collateralBrandKey}-bid2`,
       ...setup.bids[1],
       maxBuy,
       parseAmount,
     });
     t.like(readLatest('published.wallet.agoric1buyer'), {
       status: {
-        id: 'bid2',
+        id: `${collateralBrandKey}-bid2`,
         result: 'Your bid has been accepted',
         payouts: undefined,
       },
     });
     await buyer.sendOfferMaker(Offers.auction.Bid, {
-      offerId: 'bid3',
+      offerId: `${collateralBrandKey}-bid3`,
       ...setup.bids[2],
       maxBuy,
       parseAmount,
     });
     t.like(readLatest('published.wallet.agoric1buyer'), {
       status: {
-        id: 'bid3',
+        id: `${collateralBrandKey}-bid3`,
         result: 'Your bid has been accepted',
         payouts: undefined,
       },
@@ -237,22 +250,21 @@ test.serial('scenario: Flow 1', async t => {
     //  Change price to trigger liquidation
     // ---------------
 
-    await priceFeedDriver.setPrice(9.99);
+    await priceFeedDrivers[collateralBrandKey].setPrice(9.99);
 
     // check nothing liquidating yet
     /** @type {import('@agoric/inter-protocol/src/auction/scheduler.js').ScheduleNotification} */
     const liveSchedule = readLatest('published.auction.schedule');
     t.is(liveSchedule.activeStartTime, null);
-    t.like(readLatest('published.vaultFactory.managers.manager0.metrics'), {
+    t.like(readLatest(metricsPath), {
       numActiveVaults: setup.vaults.length,
       numLiquidatingVaults: 0,
-      lockedQuote: null,
     });
 
     // advance time to start an auction
-    console.log('step 0 of 10');
+    console.log(collateralBrandKey, 'step 1 of 10');
     await advanceTimeTo(NonNullish(liveSchedule.nextDescendingStepTime));
-    t.like(readLatest('published.vaultFactory.managers.manager0.metrics'), {
+    t.like(readLatest(metricsPath), {
       numActiveVaults: 0,
       numLiquidatingVaults: setup.vaults.length,
       liquidatingCollateral: {
@@ -262,24 +274,24 @@ test.serial('scenario: Flow 1', async t => {
       lockedQuote: null,
     });
 
-    console.log('step 1 of 10');
+    console.log(collateralBrandKey, 'step 2 of 10');
     await advanceTimeBy(3, 'minutes');
-    t.like(readLatest('published.auction.book0'), {
+    t.like(readLatest(`published.auction.book${managerIndex}`), {
       collateralAvailable: { value: scale6(setup.auction.start.collateral) },
       startCollateral: { value: scale6(setup.auction.start.collateral) },
       startProceedsGoal: { value: scale6(setup.auction.start.debt) },
     });
 
-    console.log('step 2 of 10');
+    console.log(collateralBrandKey, 'step 3 of 10');
     await advanceTimeBy(3, 'minutes');
 
-    console.log('step 3 of 10');
+    console.log(collateralBrandKey, 'step 4 of 10');
     await advanceTimeBy(3, 'minutes');
     // XXX updates for bid1 and bid2 are appended in the same turn so readLatest gives bid2
     // NB: console output shows 8897786n payout which matches spec 8.897ATOM
     // t.like(readLatest('published.wallet.agoric1buyer'), {
     //   status: {
-    //     id: 'bid1',
+    //     id: `${collateralBrandKey}-bid1`,
     //     payouts: {
     //       Bid: { value: 0n },
     //       Collateral: { value: scale6(outcome.bids[0].payouts.Collateral) },
@@ -289,30 +301,30 @@ test.serial('scenario: Flow 1', async t => {
 
     t.like(readLatest('published.wallet.agoric1buyer'), {
       status: {
-        id: 'bid2',
+        id: `${collateralBrandKey}-bid2`,
         payouts: likePayouts(outcome.bids[1].payouts),
       },
     });
 
-    console.log('step 4 of 10');
+    console.log(collateralBrandKey, 'step 5 of 10');
     await advanceTimeBy(3, 'minutes');
 
-    console.log('step 5 of 10');
+    console.log(collateralBrandKey, 'step 6 of 10');
     await advanceTimeBy(3, 'minutes');
-    t.like(readLatest('published.auction.book0'), {
+    t.like(readLatest(`published.auction.book${managerIndex}`), {
       collateralAvailable: { value: 9659301n },
     });
 
-    console.log('step 6 of 10');
+    console.log(collateralBrandKey, 'step 7 of 10');
     await advanceTimeBy(3, 'minutes');
 
-    console.log('step 7 of 10');
+    console.log(collateralBrandKey, 'step 8 of 10');
     await advanceTimeBy(3, 'minutes');
 
-    console.log('step 8 of 10');
+    console.log(collateralBrandKey, 'step 9 of 10');
     await advanceTimeBy(3, 'minutes');
     // Not part of product spec
-    t.like(readLatest('published.vaultFactory.managers.manager0.metrics'), {
+    t.like(readLatest(metricsPath), {
       numActiveVaults: 0,
       numLiquidationsCompleted: setup.vaults.length,
       numLiquidatingVaults: 0,
@@ -325,36 +337,37 @@ test.serial('scenario: Flow 1', async t => {
       totalShortfallReceived: { value: 0n },
     });
 
-    console.log('step 9 of 10');
-    await advanceTimeBy(3, 'minutes');
-
-    console.log('step 10 of 10');
-    await advanceTimeBy(3, 'minutes');
-
-    console.log('step 11 of 10');
-    await advanceTimeBy(3, 'minutes');
+    console.log(collateralBrandKey, 'step 10 of 10');
+    // continuing after now would start a new auction
+    {
+      /** @type {Record<string, import('@agoric/time/src/types.js').TimestampRecord>} */
+      const { nextDescendingStepTime, nextStartTime } = readLatest(
+        'published.auction.schedule',
+      );
+      t.is(nextDescendingStepTime.absValue, nextStartTime.absValue);
+    }
 
     // bid3 still live because it's not fully satisfied
     const { liveOffers } = readLatest('published.wallet.agoric1buyer.current');
-    t.is(liveOffers[0][1].id, 'bid3');
+    t.is(liveOffers[0][1].id, `${collateralBrandKey}-bid3`);
     // exit to get payouts
-    await buyer.tryExitOffer('bid3');
+    await buyer.tryExitOffer(`${collateralBrandKey}-bid3`);
     t.like(readLatest('published.wallet.agoric1buyer'), {
       status: {
-        id: 'bid3',
+        id: `${collateralBrandKey}-bid3`,
         payouts: likePayouts(outcome.bids[2].payouts),
       },
     });
 
     // TODO express spec up top in a way it can be passed in here
-    check.vaultNotification(0, {
+    check.vaultNotification(managerIndex, 0, {
       debt: undefined,
       vaultState: 'liquidated',
       locked: {
         value: scale6(outcome.vaultsActual[0].locked),
       },
     });
-    check.vaultNotification(1, {
+    check.vaultNotification(managerIndex, 1, {
       debt: undefined,
       vaultState: 'liquidated',
       locked: {
@@ -366,10 +379,58 @@ test.serial('scenario: Flow 1', async t => {
   // check reserve balances
   t.like(readLatest('published.reserve.metrics'), {
     allocations: {
-      ATOM: { value: scale6(outcome.reserve.allocations.ATOM) },
-      // not part of product spec
-      Fee: { value: scale6(1.54) },
+      [collateralBrandKey]: {
+        value: scale6(outcome.reserve.allocations[collateralBrandKey]),
+      },
     },
     shortfallBalance: { value: scale6(outcome.reserve.shortfall) },
   });
+};
+
+test.serial(
+  'liquidate ATOM',
+  checkFlow1,
+  { collateralBrandKey: 'ATOM', managerIndex: 0 },
+  {},
+);
+
+test.serial('add STARS collateral', async t => {
+  const { controller, buildProposal } = t.context;
+
+  t.log('building proposal');
+  const proposal = await buildProposal({
+    package: 'inter-protocol',
+    packageScriptName: 'build:add-STARS-proposal',
+  });
+
+  for await (const bundle of proposal.bundles) {
+    await controller.validateAndInstallBundle(bundle);
+  }
+  t.log('installed', proposal.bundles.length, 'bundles');
+
+  t.log('launching proposal');
+  const bridgeMessage = {
+    type: 'CORE_EVAL',
+    evals: proposal.evals,
+  };
+  t.log({ bridgeMessage });
+
+  const { EV } = t.context.runUtils;
+  /** @type {ERef<import('../../src/types.js').BridgeHandler>} */
+  const coreEvalBridgeHandler = await EV.vat('bootstrap').consumeItem(
+    'coreEvalBridgeHandler',
+  );
+  await EV(coreEvalBridgeHandler).fromBridge(bridgeMessage);
+
+  t.context.refreshAgoricNamesRemotes();
+
+  t.log('restart-vats proposal executed');
+  t.pass(); // reached here without throws
 });
+
+test.serial(
+  'liquidate STARS',
+  checkFlow1,
+  { collateralBrandKey: 'STARS', managerIndex: 1 },
+  {},
+);
diff --git a/packages/vats/test/bootstrapTests/test-liquidation-2b.js b/packages/vats/test/bootstrapTests/test-liquidation-2b.js
index 354dd2b6b7e..c958c5e3076 100644
--- a/packages/vats/test/bootstrapTests/test-liquidation-2b.js
+++ b/packages/vats/test/bootstrapTests/test-liquidation-2b.js
@@ -127,12 +127,12 @@ test.serial('scenario: Flow 2b', async t => {
     agoricNamesRemotes,
     check,
     setupStartingState,
-    priceFeedDriver,
+    priceFeedDrivers,
     readLatest,
     walletFactoryDriver,
   } = t.context;
 
-  await setupStartingState();
+  await setupStartingState({ collateralBrandKey: 'ATOM', managerIndex: 0 });
 
   const minter = await walletFactoryDriver.provideSmartWallet('agoric1minter');
 
@@ -152,7 +152,7 @@ test.serial('scenario: Flow 2b', async t => {
 
   // Verify starting balances
   for (let i = 0; i < setup.vaults.length; i += 1) {
-    check.vaultNotification(i, {
+    check.vaultNotification(0, i, {
       debtSnapshot: { debt: { value: scale6(setup.vaults[i].debt) } },
       locked: { value: scale6(setup.vaults[i].atom) },
       vaultState: 'active',
@@ -204,7 +204,7 @@ test.serial('scenario: Flow 2b', async t => {
     //  Change price to trigger liquidation
     // ---------------
 
-    await priceFeedDriver.setPrice(9.99);
+    await priceFeedDrivers.ATOM.setPrice(9.99);
 
     // check nothing liquidating yet
     /** @type {import('@agoric/inter-protocol/src/auction/scheduler.js').ScheduleNotification} */
@@ -269,21 +269,21 @@ test.serial('scenario: Flow 2b', async t => {
     await advanceTimeBy(3, 'minutes');
 
     // TODO express spec up top in a way it can be passed in here
-    check.vaultNotification(0, {
+    check.vaultNotification(0, 0, {
       debt: undefined,
       vaultState: 'active',
       locked: {
         value: scale6(outcome.vaultsActual[0].locked),
       },
     });
-    check.vaultNotification(1, {
+    check.vaultNotification(0, 1, {
       debt: undefined,
       vaultState: 'active',
       locked: {
         value: scale6(outcome.vaultsActual[1].locked),
       },
     });
-    check.vaultNotification(2, {
+    check.vaultNotification(0, 2, {
       debt: undefined,
       vaultState: 'liquidated',
       locked: {