@agoric/cosmic-swingset 0.41.4-dev-f20cc05.0 → 0.41.4-dev-9f8a76e.0

package/Makefile

@@ -141,18 +141,18 @@ scenario2-setup:
 
 t1/decentral-economy-config.json: $(ECONOMY_PROPOSALS)
 	jq -s '.[0] * { coreProposals: .[1] }' \
-		../vats/decentral-core-config.json \
+		../boot/decentral-core-config.json \
 		'$(ECONOMY_PROPOSALS)' > t1/decentral-economy-config.json
 
 scenario2-run-chain-economy: t1/decentral-economy-config.json
-	echo "DEPRECATED use: CHAIN_BOOTSTRAP_VAT_CONFIG=@agoric/vats/decentral-itest-vaults-config.json scenario2-run-chain"
+	echo "DEPRECATED use: CHAIN_BOOTSTRAP_VAT_CONFIG=@agoric/boot/decentral-itest-vaults-config.json scenario2-run-chain"
 	CHAIN_BOOTSTRAP_VAT_CONFIG="$$PWD/t1/decentral-economy-config.json" \
 		$(MAKE) scenario2-run-chain
 
 # We want to use the same configuration that will be deployed to the next
 # devnet.agoric.net so that developers can test their code against it locally.
-scenario2-run-chain: ../vats/decentral-devnet-config.json
-	CHAIN_BOOTSTRAP_VAT_CONFIG="$${CHAIN_BOOTSTRAP_VAT_CONFIG-$$PWD/../vats/decentral-devnet-config.json}" \
+scenario2-run-chain: ../boot/decentral-devnet-config.json
+	CHAIN_BOOTSTRAP_VAT_CONFIG="$${CHAIN_BOOTSTRAP_VAT_CONFIG-$$PWD/../boot/decentral-devnet-config.json}" \
 		OTEL_EXPORTER_PROMETHEUS_PORT=$(OTEL_EXPORTER_PROMETHEUS_PORT) \
 		$(AGC) --home=t1/n0 start --log_level=warn $(AGC_START_ARGS)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/cosmic-swingset",
-  "version": "0.41.4-dev-f20cc05.0+f20cc05",
+  "version": "0.41.4-dev-9f8a76e.0+9f8a76e",
   "description": "Agoric's Cosmos blockchain integration",
   "type": "module",
   "bin": {
@@ -22,14 +22,14 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-f20cc05.0+f20cc05",
-    "@agoric/cosmos": "0.34.2-dev-f20cc05.0+f20cc05",
-    "@agoric/deploy-script-support": "0.10.4-dev-f20cc05.0+f20cc05",
-    "@agoric/internal": "0.3.3-dev-f20cc05.0+f20cc05",
-    "@agoric/store": "0.9.3-dev-f20cc05.0+f20cc05",
-    "@agoric/swing-store": "0.9.2-dev-f20cc05.0+f20cc05",
-    "@agoric/swingset-vat": "0.32.3-dev-f20cc05.0+f20cc05",
-    "@agoric/telemetry": "0.6.3-dev-f20cc05.0+f20cc05",
+    "@agoric/assert": "0.6.1-dev-9f8a76e.0+9f8a76e",
+    "@agoric/cosmos": "0.34.2-dev-9f8a76e.0+9f8a76e",
+    "@agoric/deploy-script-support": "0.10.4-dev-9f8a76e.0+9f8a76e",
+    "@agoric/internal": "0.3.3-dev-9f8a76e.0+9f8a76e",
+    "@agoric/store": "0.9.3-dev-9f8a76e.0+9f8a76e",
+    "@agoric/swing-store": "0.9.2-dev-9f8a76e.0+9f8a76e",
+    "@agoric/swingset-vat": "0.32.3-dev-9f8a76e.0+9f8a76e",
+    "@agoric/telemetry": "0.6.3-dev-9f8a76e.0+9f8a76e",
     "@endo/far": "^0.2.19",
     "@endo/import-bundle": "^0.3.5",
     "@endo/init": "^0.5.57",
@@ -60,5 +60,5 @@
     ],
     "timeout": "20m"
   },
-  "gitHead": "f20cc0580a0a6cb947f3a5c1ef1281fccca879f0"
+  "gitHead": "9f8a76ee66bd74f028158b689c4b437921613f63"
 }

package/src/chain-main.js

@@ -353,12 +353,15 @@ export default async function main(progname, args, { env, homedir, agcc }) {
     const argv = {
       bootMsg,
     };
-    const vatHref = await importMetaResolve(
-      env.CHAIN_BOOTSTRAP_VAT_CONFIG ||
-        argv.bootMsg.params.bootstrap_vat_config,
-      import.meta.url,
-    );
-    const vatconfig = new URL(vatHref).pathname;
+    const getVatConfig = async () => {
+      const vatHref = await importMetaResolve(
+        env.CHAIN_BOOTSTRAP_VAT_CONFIG ||
+          argv.bootMsg.params.bootstrap_vat_config,
+        import.meta.url,
+      );
+      const vatconfig = new URL(vatHref).pathname;
+      return vatconfig;
+    };
 
     // Delay makeShutdown to override the golang interrupts
     const { registerShutdown } = makeShutdown();
@@ -457,7 +460,7 @@ export default async function main(progname, args, { env, homedir, agcc }) {
       clearChainSends,
       replayChainSends,
       bridgeOutbound: doOutboundBridge,
-      vatconfig,
+      vatconfig: getVatConfig,
       argv,
       env,
       verboseBlocks: true,

package/src/launch-chain.js

@@ -67,7 +67,7 @@ const getHostKey = path => `host.${path}`;
  * @param {Map<*, *>} mailboxStorage
  * @param {undefined | ((dstID: string, obj: any) => any)} bridgeOutbound
  * @param {SwingStoreKernelStorage} kernelStorage
- * @param {string} vatconfig absolute path
+ * @param {string | (() => string | Promise<string>)} vatconfig absolute path
  * @param {unknown} bootstrapArgs JSON-serializable data
  * @param {{}} env
  * @param {*} options
@@ -82,42 +82,48 @@ export async function buildSwingset(
   { debugName = undefined, slogCallbacks, slogSender },
 ) {
   const debugPrefix = debugName === undefined ? '' : `${debugName}:`;
-  let config = await loadSwingsetConfigFile(vatconfig);
-  if (config === null) {
-    config = loadBasedir(vatconfig);
-  }
-
   const mbs = buildMailboxStateMap(mailboxStorage);
-  const timer = buildTimer();
-  const mb = buildMailbox(mbs);
-  config.devices = {
-    mailbox: {
-      sourceSpec: mb.srcPath,
-    },
-    timer: {
-      sourceSpec: timer.srcPath,
-    },
-  };
+
+  const bridgeDevice = bridgeOutbound && buildBridge(bridgeOutbound);
+  const mailboxDevice = buildMailbox(mbs);
+  const timerDevice = buildTimer();
+
   const deviceEndowments = {
-    mailbox: { ...mb.endowments },
-    timer: { ...timer.endowments },
+    mailbox: { ...mailboxDevice.endowments },
+    timer: { ...timerDevice.endowments },
   };
-
-  let bridgeInbound;
-  if (bridgeOutbound) {
-    const bd = buildBridge(bridgeOutbound);
-    config.devices.bridge = {
-      sourceSpec: bd.srcPath,
-    };
-    deviceEndowments.bridge = { ...bd.endowments };
-    bridgeInbound = bd.deliverInbound;
+  if (bridgeDevice) {
+    deviceEndowments.bridge = { ...bridgeDevice.endowments };
   }
 
   async function ensureSwingsetInitialized() {
     if (swingsetIsInitialized(kernelStorage)) {
       return;
     }
-    if (!config) throw Fail`config not yet set`;
+
+    const configLocation = await (typeof vatconfig === 'function'
+      ? vatconfig()
+      : vatconfig);
+    let config = await loadSwingsetConfigFile(configLocation);
+    if (config === null) {
+      config = loadBasedir(configLocation);
+    }
+
+    config.devices = {
+      mailbox: {
+        sourceSpec: mailboxDevice.srcPath,
+      },
+      timer: {
+        sourceSpec: timerDevice.srcPath,
+      },
+    };
+
+    if (bridgeDevice) {
+      config.devices.bridge = {
+        sourceSpec: bridgeDevice.srcPath,
+      };
+    }
+
     const {
       coreProposals,
       clearStorageSubtrees,
@@ -131,11 +137,10 @@ export async function buildSwingset(
       swingsetConfig.vats[swingsetConfig.bootstrap || 'bootstrap'];
 
     // Find the entrypoints for all the core proposals.
-    await null;
     if (coreProposals) {
       const { bundles, code } = await extractCoreProposalBundles(
         coreProposals,
-        vatconfig, // for path resolution
+        configLocation, // for path resolution
       );
       swingsetConfig.bundles = { ...swingsetConfig.bundles, ...bundles };
 
@@ -162,6 +167,7 @@ export async function buildSwingset(
       debugPrefix,
     });
   }
+
   await ensureSwingsetInitialized();
   const controller = await makeSwingsetController(
     kernelStorage,
@@ -176,7 +182,12 @@ export async function buildSwingset(
   // We DON'T want to run the kernel yet, only when the application decides
   // (either on bootstrap block (0) or in endBlock).
 
-  return { controller, mb, bridgeInbound, timer };
+  return {
+    controller,
+    mb: mailboxDevice,
+    bridgeInbound: bridgeDevice && bridgeDevice.deliverInbound,
+    timer: timerDevice,
+  };
 }
 
 /**

package/src/sim-chain.js

@@ -33,7 +33,9 @@ async function makeMapStorage(file) {
   const map = new Map();
   map.commit = async () => {
     const obj = {};
-    [...map.entries()].forEach(([k, v]) => (obj[k] = exportMailbox(v)));
+    for (const [k, v] of map.entries()) {
+      obj[k] = exportMailbox(v);
+    }
     const json = stringify(obj);
     await fs.promises.writeFile(file, json);
   };
@@ -42,8 +44,11 @@ async function makeMapStorage(file) {
     content = await fs.promises.readFile(file);
     return JSON.parse(content);
   })().then(
-    obj =>
-      Object.entries(obj).forEach(([k, v]) => map.set(k, importMailbox(v))),
+    obj => {
+      for (const [k, v] of Object.entries(obj)) {
+        map.set(k, importMailbox(v));
+      }
+    },
     () => {},
   );
 
@@ -69,12 +74,15 @@ export async function connectToFakeChain(basedir, GCI, delay, inbound) {
     },
   };
 
-  const url = await importMetaResolve(
-    process.env.CHAIN_BOOTSTRAP_VAT_CONFIG ||
-      argv.bootMsg.params.bootstrap_vat_config,
-    import.meta.url,
-  );
-  const vatconfig = new URL(url).pathname;
+  const getVatConfig = async () => {
+    const url = await importMetaResolve(
+      process.env.CHAIN_BOOTSTRAP_VAT_CONFIG ||
+        argv.bootMsg.params.bootstrap_vat_config,
+      import.meta.url,
+    );
+    const vatconfig = new URL(url).pathname;
+    return vatconfig;
+  };
   const stateDBdir = path.join(basedir, `fake-chain-${GCI}-state`);
   function replayChainSends() {
     Fail`Replay not implemented`;
@@ -107,7 +115,7 @@ export async function connectToFakeChain(basedir, GCI, delay, inbound) {
     mailboxStorage,
     clearChainSends,
     replayChainSends,
-    vatconfig,
+    vatconfig: getVatConfig,
     argv,
     debugName: GCI,
     metricsProvider,

package/src/sim-params.js

@@ -60,7 +60,7 @@ export const defaultBeansPerUnit = [
   makeStringBeans(BeansPerXsnapComputron, defaultBeansPerXsnapComputron),
 ];
 
-const defaultBootstrapVatConfig = '@agoric/vats/decentral-demo-config.json';
+const defaultBootstrapVatConfig = '@agoric/boot/decentral-demo-config.json';
 
 export const defaultPowerFlagFees = [
   makePowerFlagFee('SMART_WALLET', [makeCoin('ubld', 10_000_000n)]),