@agoric/cosmic-swingset 0.41.4-dev-0c96ea5.0 → 0.41.4-dev-bf791ed.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/cosmic-swingset",
-  "version": "0.41.4-dev-0c96ea5.0+0c96ea5",
+  "version": "0.41.4-dev-bf791ed.0+bf791ed",
   "description": "Agoric's Cosmos blockchain integration",
   "type": "module",
   "bin": {
@@ -22,15 +22,15 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/builders": "0.1.1-dev-0c96ea5.0+0c96ea5",
-    "@agoric/cosmos": "0.34.2-dev-0c96ea5.0+0c96ea5",
-    "@agoric/deploy-script-support": "0.10.4-dev-0c96ea5.0+0c96ea5",
-    "@agoric/internal": "0.3.3-dev-0c96ea5.0+0c96ea5",
-    "@agoric/store": "0.9.3-dev-0c96ea5.0+0c96ea5",
-    "@agoric/swing-store": "0.9.2-dev-0c96ea5.0+0c96ea5",
-    "@agoric/swingset-vat": "0.32.3-dev-0c96ea5.0+0c96ea5",
-    "@agoric/telemetry": "0.6.3-dev-0c96ea5.0+0c96ea5",
-    "@agoric/vm-config": "0.1.1-dev-0c96ea5.0+0c96ea5",
+    "@agoric/builders": "0.1.1-dev-bf791ed.0+bf791ed",
+    "@agoric/cosmos": "0.34.2-dev-bf791ed.0+bf791ed",
+    "@agoric/deploy-script-support": "0.10.4-dev-bf791ed.0+bf791ed",
+    "@agoric/internal": "0.3.3-dev-bf791ed.0+bf791ed",
+    "@agoric/store": "0.9.3-dev-bf791ed.0+bf791ed",
+    "@agoric/swing-store": "0.9.2-dev-bf791ed.0+bf791ed",
+    "@agoric/swingset-vat": "0.32.3-dev-bf791ed.0+bf791ed",
+    "@agoric/telemetry": "0.6.3-dev-bf791ed.0+bf791ed",
+    "@agoric/vm-config": "0.1.1-dev-bf791ed.0+bf791ed",
     "@endo/bundle-source": "^3.2.3",
     "@endo/env-options": "^1.1.4",
     "@endo/errors": "^1.2.2",
@@ -70,5 +70,5 @@
   "typeCoverage": {
     "atLeast": 80.6
   },
-  "gitHead": "0c96ea5a63bb001d5f11e99a1fa58de4cce475c1"
+  "gitHead": "bf791ed1c7dac4e69fefd5bf478724a273679579"
 }

package/src/launch-chain.js

@@ -96,7 +96,7 @@ const getHostKey = path => `host.${path}`;
 
 /**
  * @param {Map<*, *>} mailboxStorage
- * @param {undefined | ((dstID: string, obj: any) => any)} bridgeOutbound
+ * @param {((dstID: string, obj: any) => any)} bridgeOutbound
  * @param {SwingStoreKernelStorage} kernelStorage
  * @param {string | (() => string | Promise<string>)} vatconfig absolute path or thunk
  * @param {unknown} bootstrapArgs JSON-serializable data
@@ -123,17 +123,15 @@ export async function buildSwingset(
   const debugPrefix = debugName === undefined ? '' : `${debugName}:`;
   const mbs = buildMailboxStateMap(mailboxStorage);
 
-  const bridgeDevice = bridgeOutbound && buildBridge(bridgeOutbound);
+  const bridgeDevice = buildBridge(bridgeOutbound);
   const mailboxDevice = buildMailbox(mbs);
   const timerDevice = buildTimer();
 
   const deviceEndowments = {
     mailbox: { ...mailboxDevice.endowments },
     timer: { ...timerDevice.endowments },
+    bridge: { ...bridgeDevice.endowments },
   };
-  if (bridgeDevice) {
-    deviceEndowments.bridge = { ...bridgeDevice.endowments };
-  }
 
   async function ensureSwingsetInitialized() {
     if (swingsetIsInitialized(kernelStorage)) {
@@ -175,18 +173,16 @@ export async function buildSwingset(
     const bootVat =
       swingsetConfig.vats[swingsetConfig.bootstrap || 'bootstrap'];
 
-    if (bridgeOutbound) {
-      const batchChainStorage = (method, args) =>
-        bridgeOutbound(BRIDGE_ID.STORAGE, { method, args });
+    const batchChainStorage = (method, args) =>
+      bridgeOutbound(BRIDGE_ID.STORAGE, { method, args });
 
-      // Extract data from chain storage as [path, value?] pairs.
-      const chainStorageEntries = exportStorage(
-        batchChainStorage,
-        exportStorageSubtrees,
-        clearStorageSubtrees,
-      );
-      bootVat.parameters = { ...bootVat.parameters, chainStorageEntries };
-    }
+    // Extract data from chain storage as [path, value?] pairs.
+    const chainStorageEntries = exportStorage(
+      batchChainStorage,
+      exportStorageSubtrees,
+      clearStorageSubtrees,
+    );
+    bootVat.parameters = { ...bootVat.parameters, chainStorageEntries };
 
     // Since only on-chain swingsets like `agd` have a bridge (and thereby
     // `CORE_EVAL` support), things like `ag-solo` will need to do the
@@ -238,7 +234,7 @@ export async function buildSwingset(
     coreProposals,
     controller,
     mb: mailboxDevice,
-    bridgeInbound: bridgeDevice && bridgeDevice.deliverInbound,
+    bridgeInbound: bridgeDevice.deliverInbound,
     timer: timerDevice,
   };
 }