Agoric · dckc · Feb 23, 2023 · Feb 24, 2023 · Feb 25, 2023 · Feb 21, 2023
diff --git a/packages/SwingSet/src/controller/initializeSwingset.js b/packages/SwingSet/src/controller/initializeSwingset.js
@@ -282,22 +282,23 @@ function sortObjectProperties(obj, firsts = []) {
   return result;
 }
 
-/** @typedef {{ kernelBundles?: Record<string, Bundle>, verbose?: boolean,
+/**
+ * @typedef {{ kernelBundles?: Record<string, Bundle>, verbose?: boolean,
  *              addVatAdmin?: boolean, addComms?: boolean, addVattp?: boolean,
  *              addTimer?: boolean,
  *            }} InitializationOptions
  */
 
 /**
  * @param {SwingSetConfig} config
- * @param {string[]} argv
+ * @param {unknown} bootstrapArgs
  * @param {SwingStoreKernelStorage} kernelStorage
  * @param {InitializationOptions} initializationOptions
  * @param {{ env?: Record<string, string | undefined > }} runtimeOptions
  */
 export async function initializeSwingset(
   config,
-  argv = [],
+  bootstrapArgs,
   kernelStorage,
   initializationOptions = {},
   runtimeOptions = {},
@@ -353,13 +354,13 @@ export async function initializeSwingset(
   kvStore.set('lockdownBundle', JSON.stringify(kernelBundles.lockdown));
   kvStore.set('supervisorBundle', JSON.stringify(kernelBundles.supervisor));
 
-  if (config.bootstrap && argv) {
+  if (config.bootstrap && bootstrapArgs) {
     const bootConfig = config.vats[config.bootstrap];
     if (bootConfig) {
       if (!bootConfig.parameters) {
         bootConfig.parameters = {};
       }
-      bootConfig.parameters.argv = argv;
+      bootConfig.parameters.argv = bootstrapArgs;
     }
   }
 

diff --git a/packages/cosmic-swingset/src/chain-main.js b/packages/cosmic-swingset/src/chain-main.js
@@ -302,7 +302,6 @@ export default async function main(progname, args, { env, homedir, agcc }) {
     };
 
     const argv = {
-      ROLE: 'chain',
       bootMsg,
     };
     const vatHref = await importMetaResolve(

diff --git a/packages/cosmic-swingset/src/launch-chain.js b/packages/cosmic-swingset/src/launch-chain.js
@@ -53,23 +53,19 @@ const getHostKey = path => `host.${path}`;
  * @param {*} bridgeOutbound
  * @param {SwingStoreKernelStorage} kernelStorage
  * @param {string} vatconfig absolute path
- * @param {Record<string, any>} argv XXX argv should be an array but it's being called with object
- * @param {{ ROLE: string }} env
+ * @param {unknown} bootstrapArgs JSON-serializable data
+ * @param {{}} env
  * @param {*} options
  */
 export async function buildSwingset(
   mailboxStorage,
   bridgeOutbound,
   kernelStorage,
   vatconfig,
-  argv,
+  bootstrapArgs,
   env,
   { debugName = undefined, slogCallbacks, slogSender },
 ) {
-  // FIXME: Find a better way to propagate the role.
-  process.env.ROLE = argv.ROLE;
-  env.ROLE = argv.ROLE;
-
   const debugPrefix = debugName === undefined ? '' : `${debugName}:`;
   /** @type {import('@agoric/swingset-vat').SwingSetConfig | null} */
   let config = await loadSwingsetConfigFile(vatconfig);
@@ -122,8 +118,10 @@ export async function buildSwingset(
     }
     config.pinBootstrapRoot = true;
 
-    // @ts-expect-error XXX argv object
-    await initializeSwingset(config, argv, kernelStorage, { debugPrefix });
+    await initializeSwingset(config, bootstrapArgs, kernelStorage, {
+      // @ts-expect-error debugPrefix? what's that?
+      debugPrefix,
+    });
   }
   await ensureSwingsetInitialized();
   const controller = await makeSwingsetController(
@@ -275,7 +273,6 @@ export async function launch({
     kernelStorage,
     vatconfig,
     argv,
-    // @ts-expect-error process.env default
     env,
     {
       debugName,

diff --git a/packages/cosmic-swingset/src/sim-chain.js b/packages/cosmic-swingset/src/sim-chain.js
@@ -58,7 +58,6 @@ export async function connectToFakeChain(basedir, GCI, delay, inbound) {
   const mailboxStorage = await makeMapStorage(mailboxFile);
 
   const argv = {
-    ROLE: 'sim-chain',
     giveMeAllTheAgoricPowers: true,
     hardcodedClientAddresses: [bootAddress],
     bootMsg: {

diff --git a/packages/cosmic-swingset/src/sim-params.js b/packages/cosmic-swingset/src/sim-params.js
@@ -58,8 +58,7 @@ export const defaultBeansPerUnit = [
   makeStringBeans(BeansPerXsnapComputron, defaultBeansPerXsnapComputron),
 ];
 
-export const defaultBootstrapVatConfig =
-  '@agoric/vats/decentral-devnet-config.json';
+const defaultBootstrapVatConfig = '@agoric/vats/decentral-demo-config.json';
 
 export const defaultPowerFlagFees = [
   makePowerFlagFee('SMART_WALLET', [makeCoin('ubld', 10_000_000n)]),

diff --git a/packages/inter-protocol/scripts/init-core.js b/packages/inter-protocol/scripts/init-core.js
@@ -104,7 +104,7 @@ export const mainProposalBuilder = async ({
   install: install0,
   wrapInstall,
 }) => {
-  const { ROLE = 'chain', VAULT_FACTORY_CONTROLLER_ADDR } = process.env;
+  const { VAULT_FACTORY_CONTROLLER_ADDR } = process.env;
 
   const install = wrapInstall ? wrapInstall(install0) : install0;
 
@@ -119,7 +119,6 @@ export const mainProposalBuilder = async ({
     getManifestCall: [
       getManifestForMain.name,
       {
-        ROLE,
         vaultFactoryControllerAddress: VAULT_FACTORY_CONTROLLER_ADDR,
         installKeys: {
           ...publishGroup(installKeyGroups.main),
@@ -139,7 +138,6 @@ export const defaultProposalBuilder = async (
   /** @param {string|undefined} s */
   const optBigInt = s => s && BigInt(s);
   const {
-    ROLE = env.ROLE || 'chain',
     vaultFactoryControllerAddress = env.VAULT_FACTORY_CONTROLLER_ADDR,
     minInitialPoolLiquidity = env.MIN_INITIAL_POOL_LIQUIDITY,
     endorsedUi,
@@ -176,7 +174,6 @@ export const defaultProposalBuilder = async (
     getManifestCall: [
       getManifestForInterProtocol.name,
       {
-        ROLE,
         vaultFactoryControllerAddress,
         minInitialPoolLiquidity: optBigInt(minInitialPoolLiquidity),
         endorsedUi,

diff --git a/packages/inter-protocol/src/proposals/core-proposal.js b/packages/inter-protocol/src/proposals/core-proposal.js
@@ -3,15 +3,14 @@ import * as econBehaviors from './econ-behaviors.js';
 import { ECON_COMMITTEE_MANIFEST } from './startEconCommittee.js';
 
 export * from './econ-behaviors.js';
-export * from './sim-behaviors.js';
 // @ts-expect-error Module './econ-behaviors.js' has already exported a member
 // named 'EconomyBootstrapPowers'.
 export * from './startPSM.js'; // eslint-disable-line import/export
 export * from './startEconCommittee.js'; // eslint-disable-line import/export
 
-/** @type {import('@agoric/vats/src/core/manifest.js').BootstrapManifest} */
+/** @type {import('@agoric/vats/src/core/lib-boot.js').BootstrapManifest} */
 const SHARED_MAIN_MANIFEST = harden({
-  /** @type {import('@agoric/vats/src/core/manifest.js').BootstrapManifestPermit} */
+  /** @type {import('@agoric/vats/src/core/lib-boot.js').BootstrapManifestPermit} */
   [econBehaviors.startVaultFactory.name]: {
     consume: {
       board: 'board',
@@ -200,19 +199,9 @@ export const getManifestForMain = (
   };
 };
 
-const roleToManifest = harden({
-  chain: {
-    ...REWARD_MANIFEST,
-    ...STAKE_FACTORY_MANIFEST,
-  },
-  'sim-chain': SIM_CHAIN_MANIFEST,
-  client: {},
-});
-
 export const getManifestForInterProtocol = (
   { restoreRef },
   {
-    ROLE = 'chain',
     econCommitteeOptions,
     installKeys,
     vaultFactoryControllerAddress,
@@ -237,7 +226,8 @@ export const getManifestForInterProtocol = (
     manifest: {
       ...econCommitteeManifest.manifest,
       ...mainManifest.manifest,
-      ...roleToManifest[ROLE],
+      ...REWARD_MANIFEST,
+      ...STAKE_FACTORY_MANIFEST,
     },
     installations: {
       ...econCommitteeManifest.installations,

diff --git a/packages/inter-protocol/src/proposals/price-feed-proposal.js b/packages/inter-protocol/src/proposals/price-feed-proposal.js
@@ -272,7 +272,6 @@ export const getManifestForPriceFeed = async (
         chainStorage: t,
         chainTimerService: t,
         client: t,
-        contractGovernor: t,
         econCharterKit: t,
         economicCommitteeCreatorFacet: t,
         namesByAddressAdmin: t,

diff --git a/packages/inter-protocol/src/proposals/sim-behaviors.js b/packages/inter-protocol/src/proposals/sim-behaviors.js
diff --git a/packages/inter-protocol/src/proposals/startEconCommittee.js b/packages/inter-protocol/src/proposals/startEconCommittee.js
@@ -74,6 +74,7 @@ export const startEconomicCommittee = async (
 };
 harden(startEconomicCommittee);
 
+/** @type {import('@agoric/vats/src/core/lib-boot.js').BootstrapManifest} */
 export const ECON_COMMITTEE_MANIFEST = harden({
   [startEconomicCommittee.name]: {
     consume: {

diff --git a/packages/inter-protocol/src/proposals/startPSM.js b/packages/inter-protocol/src/proposals/startPSM.js
@@ -15,6 +15,8 @@ import {
   inviteToEconCharter,
 } from './committee-proposal.js';
 
+/** @typedef {import('@agoric/vats/src/core/lib-boot.js').BootstrapManifest} BootstrapManifest */
+
 const BASIS_POINTS = 10000n;
 const { details: X } = assert;
 
@@ -314,7 +316,7 @@ export const installGovAndPSMContracts = async ({
  * named swingset bundles only in
  * decentral-psm-config.json
  *
- * @type {import('@agoric/vats/src/core/manifest.js').BootstrapManifest}
+ * @type {BootstrapManifest}
  */
 export const PSM_GOV_MANIFEST = {
   [installGovAndPSMContracts.name]: {
@@ -345,8 +347,7 @@ export const PSM_GOV_MANIFEST = {
 };
 
 export const INVITE_PSM_COMMITTEE_MANIFEST = harden(
-  /** @type {import('@agoric/vats/src/core/manifest.js').BootstrapManifest} */
-  ({
+  /** @type {BootstrapManifest} */ ({
     [inviteCommitteeMembers.name]: {
       consume: {
         namesByAddressAdmin: true,
@@ -363,9 +364,8 @@ export const INVITE_PSM_COMMITTEE_MANIFEST = harden(
   }),
 );
 
-/** @type {import('@agoric/vats/src/core/manifest.js').BootstrapManifest} */
-export const PSM_MANIFEST = harden({
-  /** @type {import('@agoric/vats/src/core/manifest.js').BootstrapManifestPermit} */
+/** @type {BootstrapManifest} */
+export const PSM_MANIFEST = {
   [makeAnchorAsset.name]: {
     consume: { agoricNamesAdmin: true, bankManager: 'bank', zoe: 'zoe' },
     installation: { consume: { mintHolder: 'zoe' } },
@@ -395,7 +395,8 @@ export const PSM_MANIFEST = harden({
       consume: { [Stable.symbol]: 'zoe' },
     },
   },
-});
+};
+harden(PSM_MANIFEST);
 
 export const getManifestForPsmGovernance = (
   { restoreRef },

diff --git a/packages/inter-protocol/test/psm/setupPsm.js b/packages/inter-protocol/test/psm/setupPsm.js
@@ -1,10 +1,7 @@
 import { Far, makeLoopback } from '@endo/captp';
 import { E } from '@endo/eventual-send';
 
-import {
-  makeAgoricNamesAccess,
-  makePromiseSpace,
-} from '@agoric/vats/src/core/utils.js';
+import { makeAgoricNamesAccess, makePromiseSpace } from '@agoric/vats';
 import { makeBoard } from '@agoric/vats/src/lib-board.js';
 import { Stable } from '@agoric/vats/src/tokens.js';
 import { makeScalarMapStore } from '@agoric/vat-data';

diff --git a/packages/inter-protocol/test/reserve/setup.js b/packages/inter-protocol/test/reserve/setup.js
@@ -1,9 +1,6 @@
 import buildManualTimer from '@agoric/zoe/tools/manualTimer.js';
 import { E } from '@endo/eventual-send';
-import {
-  makeAgoricNamesAccess,
-  makePromiseSpace,
-} from '@agoric/vats/src/core/utils.js';
+import { makeAgoricNamesAccess, makePromiseSpace } from '@agoric/vats';
 import { makeBoard } from '@agoric/vats/src/lib-board.js';
 import { setupReserve } from '../../src/proposals/econ-behaviors.js';
 

diff --git a/packages/inter-protocol/test/stakeFactory/test-stakeFactory.js b/packages/inter-protocol/test/stakeFactory/test-stakeFactory.js
@@ -9,10 +9,7 @@ import { makeCopyBag } from '@agoric/store';
 import { unsafeMakeBundleCache } from '@agoric/swingset-vat/tools/bundleTool.js';
 import centralSupplyBundle from '@agoric/vats/bundles/bundle-centralSupply.js';
 import mintHolderBundle from '@agoric/vats/bundles/bundle-mintHolder.js';
-import {
-  makeAgoricNamesAccess,
-  makePromiseSpace,
-} from '@agoric/vats/src/core/utils.js';
+import { makeAgoricNamesAccess, makePromiseSpace } from '@agoric/vats';
 import { makeBoard } from '@agoric/vats/src/lib-board.js';
 import { Stable } from '@agoric/vats/src/tokens.js';
 import { makeRatio } from '@agoric/zoe/src/contractSupport/index.js';

diff --git a/packages/inter-protocol/test/supports.js b/packages/inter-protocol/test/supports.js
@@ -4,10 +4,7 @@ import committeeBundle from '@agoric/governance/bundles/bundle-committee.js';
 import contractGovernorBundle from '@agoric/governance/bundles/bundle-contractGovernor.js';
 import puppetContractGovernorBundle from '@agoric/governance/bundles/bundle-puppetContractGovernor.js';
 import * as utils from '@agoric/vats/src/core/utils.js';
-import {
-  makeAgoricNamesAccess,
-  makePromiseSpace,
-} from '@agoric/vats/src/core/utils.js';
+import { makePromiseSpace, makeAgoricNamesAccess } from '@agoric/vats';
 import { makeBoard } from '@agoric/vats/src/lib-board.js';
 import { Stable } from '@agoric/vats/src/tokens.js';
 import { makeMockChainStorageRoot } from '@agoric/internal/src/storage-test-utils.js';

diff --git a/packages/inter-protocol/test/test-gov-collateral.js b/packages/inter-protocol/test/test-gov-collateral.js
@@ -202,8 +202,6 @@ const makeScenario = async (t, { env = process.env } = {}) => {
       t.context.installation.mintHolder,
     );
 
-    space.produce.initialSupply.resolve(emptyRunPayment());
-
     return Promise.all([
       // @ts-expect-error TODO: align types better
       addBankAssets(space),

diff --git a/packages/internal/src/magic-cookie-test-only.js b/packages/internal/src/magic-cookie-test-only.js
@@ -0,0 +1,9 @@
+const cookie = harden({});
+
+/**
+ * Facilitate static analysis to prevent
+ * demo/test facilities from being bundled in production.
+ */
+export const notForProductionUse = () => {
+  return cookie;
+};
diff --git a/packages/smart-wallet/src/walletFactory.js b/packages/smart-wallet/src/walletFactory.js
@@ -9,7 +9,7 @@ import { observeIteration } from '@agoric/notifier';
 import { M, makeExo, makeScalarMapStore, mustMatch } from '@agoric/store';
 import { makeAtomicProvider } from '@agoric/store/src/stores/store-utils.js';
 import { prepareExo, provideDurableMapStore } from '@agoric/vat-data';
-import { makeMyAddressNameAdminKit } from '@agoric/vats/src/core/basic-behaviors.js';
+import { makeMyAddressNameAdminKit } from '@agoric/vats/src/core/utils.js';
 import { provideAll } from '@agoric/zoe/src/contractSupport/durability.js';
 import { E } from '@endo/far';
 import { prepareSmartWallet } from './smartWallet.js';

diff --git a/packages/smart-wallet/test/supports.js b/packages/smart-wallet/test/supports.js
@@ -8,10 +8,7 @@ import {
 } from '@agoric/vats/src/core/basic-behaviors.js';
 import { setupClientManager } from '@agoric/vats/src/core/chain-behaviors.js';
 import '@agoric/vats/src/core/types.js';
-import {
-  makeAgoricNamesAccess,
-  makePromiseSpace,
-} from '@agoric/vats/src/core/utils.js';
+import { makeAgoricNamesAccess, makePromiseSpace } from '@agoric/vats';
 import { buildRootObject as boardRoot } from '@agoric/vats/src/vat-board.js';
 import { buildRootObject as mintsRoot } from '@agoric/vats/src/vat-mints.js';
 import { makeMockChainStorageRoot } from '@agoric/internal/src/storage-test-utils.js';

diff --git a/packages/solo/solo-config.json b/packages/solo/solo-config.json
@@ -16,7 +16,7 @@
       "sourceSpec": "./src/vat-uploads.js"
     },
     "bootstrap": {
-      "sourceSpec": "@agoric/vats/src/core/boot.js"
+      "sourceSpec": "@agoric/vats/src/core/boot-solo.js"
     }
   }
 }