From 28d3efdab7f7f91e17ba49cdb57408988dc5c58e Mon Sep 17 00:00:00 2001 From: Michael FIG Date: Wed, 12 Jan 2022 13:48:30 -0600 Subject: [PATCH] feat(cosmic-swingset): use `bootMsg.params.bootstrap_vat_config` --- packages/cosmic-swingset/src/chain-main.js | 12 ++++++------ packages/cosmic-swingset/src/sim-chain.js | 14 ++++++++------ packages/cosmic-swingset/src/sim-params.js | 3 +++ 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/packages/cosmic-swingset/src/chain-main.js b/packages/cosmic-swingset/src/chain-main.js index 1d8ad261674..e2d9a54d528 100644 --- a/packages/cosmic-swingset/src/chain-main.js +++ b/packages/cosmic-swingset/src/chain-main.js @@ -236,17 +236,17 @@ export default async function main(progname, args, { env, homedir, agcc }) { } } - const vatconfig = new URL( - await importMetaResolve( - '@agoric/vats/decentral-config.json', - import.meta.url, - ), - ).pathname; const argv = { ROLE: 'chain', noFakeCurrencies: !env.FAKE_CURRENCIES, bootMsg, }; + const vatconfig = new URL( + await importMetaResolve( + argv.bootMsg.params.bootstrap_vat_config, + import.meta.url, + ), + ).pathname; const meterProvider = getMeterProvider(console, env); const slogFile = env.SLOGFILE; const consensusMode = env.DEBUG === undefined; diff --git a/packages/cosmic-swingset/src/sim-chain.js b/packages/cosmic-swingset/src/sim-chain.js index c87987d3a40..c99641f2d01 100644 --- a/packages/cosmic-swingset/src/sim-chain.js +++ b/packages/cosmic-swingset/src/sim-chain.js @@ -53,12 +53,6 @@ export async function connectToFakeChain(basedir, GCI, delay, inbound) { const mailboxStorage = await makeMapStorage(mailboxFile); - const vatconfig = new URL( - await importMetaResolve( - '@agoric/vats/decentral-config.json', - import.meta.url, - ), - ).pathname; const argv = { ROLE: 'sim-chain', giveMeAllTheAgoricPowers: true, @@ -69,8 +63,16 @@ export async function connectToFakeChain(basedir, GCI, delay, inbound) { { denom: 'ubld', amount: `${50_000n * 10n ** 6n}` }, { denom: 'urun', amount: `${1_000_000n * 10n ** 6n}` }, ], + params: DEFAULT_SIM_SWINGSET_PARAMS, }, }; + + const vatconfig = new URL( + await importMetaResolve( + argv.bootMsg.params.bootstrap_vat_config, + import.meta.url, + ), + ).pathname; const stateDBdir = path.join(basedir, `fake-chain-${GCI}-state`); function flushChainSends(replay) { assert(!replay, X`Replay not implemented`); diff --git a/packages/cosmic-swingset/src/sim-params.js b/packages/cosmic-swingset/src/sim-params.js index eb16c0790d5..1f0522eb333 100644 --- a/packages/cosmic-swingset/src/sim-params.js +++ b/packages/cosmic-swingset/src/sim-params.js @@ -57,7 +57,10 @@ export const defaultFeeUnitPrice = [ }, ]; +export const defaultBootstrapVatConfig = '@agoric/vats/decentral-config.json'; + export const DEFAULT_SIM_SWINGSET_PARAMS = { beans_per_unit: defaultBeansPerUnit, fee_unit_price: defaultFeeUnitPrice, + bootstrap_vat_config: defaultBootstrapVatConfig, };