@agoric/deploy-script-support 0.10.4-dev-fed2b5e.0 → 0.10.4-dev-35e67be.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/deploy-script-support",
-  "version": "0.10.4-dev-fed2b5e.0+fed2b5e",
+  "version": "0.10.4-dev-35e67be.0+35e67be",
   "description": "Helpers and other support for writing deploy scripts",
   "type": "module",
   "main": "src/helpers.js",
@@ -34,14 +34,14 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-fed2b5e.0+fed2b5e",
-    "@agoric/ertp": "0.16.3-dev-fed2b5e.0+fed2b5e",
-    "@agoric/import-manager": "0.3.12-dev-fed2b5e.0+fed2b5e",
-    "@agoric/internal": "0.3.3-dev-fed2b5e.0+fed2b5e",
-    "@agoric/notifier": "0.6.3-dev-fed2b5e.0+fed2b5e",
-    "@agoric/store": "0.9.3-dev-fed2b5e.0+fed2b5e",
-    "@agoric/time": "0.3.3-dev-fed2b5e.0+fed2b5e",
-    "@agoric/zoe": "0.26.3-dev-fed2b5e.0+fed2b5e",
+    "@agoric/assert": "0.6.1-dev-35e67be.0+35e67be",
+    "@agoric/ertp": "0.16.3-dev-35e67be.0+35e67be",
+    "@agoric/import-manager": "0.3.12-dev-35e67be.0+35e67be",
+    "@agoric/internal": "0.3.3-dev-35e67be.0+35e67be",
+    "@agoric/notifier": "0.6.3-dev-35e67be.0+35e67be",
+    "@agoric/store": "0.9.3-dev-35e67be.0+35e67be",
+    "@agoric/time": "0.3.3-dev-35e67be.0+35e67be",
+    "@agoric/zoe": "0.26.3-dev-35e67be.0+35e67be",
     "@endo/base64": "^0.2.32",
     "@endo/bundle-source": "^2.5.2",
     "@endo/far": "^0.2.19",
@@ -51,7 +51,7 @@
     "@endo/zip": "^0.2.32"
   },
   "devDependencies": {
-    "@agoric/vats": "0.15.2-dev-fed2b5e.0+fed2b5e",
+    "@agoric/vats": "0.15.2-dev-35e67be.0+35e67be",
     "@endo/init": "^0.5.57",
     "ava": "^5.3.0",
     "import-meta-resolve": "^2.2.1"
@@ -69,5 +69,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "fed2b5e4658fc5b55c794622aa1684a8093f1604"
+  "gitHead": "35e67bed9eae0896e32b549ad0d1fd02fb83a905"
 }

package/src/extract-proposal.js

@@ -40,6 +40,19 @@ const findModule = (initDir, srcSpec) =>
     ? pathResolve(initDir, srcSpec)
     : req.resolve(srcSpec);
 
+/**
+ * @param {{ bundleID?: string, bundleName?: string }} handle - mutated then hardened
+ * @param {string} sourceSpec - the specifier of a module to load
+ * @param {number} sequence - the sequence number of the proposal
+ * @param {string} piece - the piece of the proposal
+ * @returns {Promise<[string, any]>}
+ */
+const namedHandleToBundleSpec = async (handle, sourceSpec, sequence, piece) => {
+  handle.bundleName = `coreProposal${sequence}_${piece}`;
+  harden(handle);
+  return harden([handle.bundleName, { sourceSpec }]);
+};
+
 /**
  * Format core proposals to be run at bootstrap:
  * SwingSet `bundles` configuration
@@ -54,26 +67,28 @@ const findModule = (initDir, srcSpec) =>
  * @param {ConfigProposal[]} coreProposals - governance
  * proposals to run at chain bootstrap for scenarios such as sim-chain.
  * @param {FilePath} [dirname]
- * @param {typeof makeEnactCoreProposalsFromBundleRef} [makeEnactCoreProposals]
- * @param {(i: number) => number} [getSequenceForProposal]
+ * @param {object} [opts]
+ * @param {typeof makeEnactCoreProposalsFromBundleRef} [opts.makeEnactCoreProposals]
+ * @param {(i: number) => number} [opts.getSequenceForProposal]
+ * @param {typeof namedHandleToBundleSpec} [opts.handleToBundleSpec]
  */
 export const extractCoreProposalBundles = async (
   coreProposals,
   dirname = '.',
-  makeEnactCoreProposals = makeEnactCoreProposalsFromBundleRef,
-  getSequenceForProposal,
+  opts,
 ) => {
-  if (!getSequenceForProposal) {
-    // Deterministic proposal numbers.
-    getSequenceForProposal = i => i;
-  }
+  const {
+    makeEnactCoreProposals = makeEnactCoreProposalsFromBundleRef,
+    getSequenceForProposal = i => i,
+    handleToBundleSpec = namedHandleToBundleSpec,
+  } = opts || {};
 
   dirname = pathResolve(dirname);
   dirname = await fs.promises
     .stat(dirname)
     .then(stbuf => (stbuf.isDirectory() ? dirname : path.dirname(dirname)));
 
-  /** @type {Map<{ bundleName?: string }, { source: string, bundle?: string }>} */
+  /** @type {Map<{ bundleID?: string, bundleName?: string }, { source: string, bundle?: string }>} */
   const bundleHandleToAbsolutePaths = new Map();
 
   const bundleToSource = new Map();
@@ -151,29 +166,30 @@ export const extractCoreProposalBundles = async (
       );
 
       // Add the proposal bundle handles in sorted order.
-      const bundleSpecEntries = [...thisProposalBundleHandles.keys()]
-        .map(handle => [handle, bundleHandleToAbsolutePaths.get(handle)])
-        .sort(([_hnda, { source: a }], [_hndb, { source: b }]) => {
-          if (a < b) {
-            return -1;
-          }
-          if (a > b) {
-            return 1;
-          }
-          return 0;
-        })
-        .map(([handle, absolutePaths], j) => {
-          // Transform the bundle handle identity into a bundleName reference.
-          handle.bundleName = `coreProposal${thisProposalSequence}_${j}`;
-          harden(handle);
-
-          /** @type {[string, { sourceSpec: string }]} */
-          const specEntry = [
-            handle.bundleName,
-            { sourceSpec: absolutePaths.source },
-          ];
-          return specEntry;
-        });
+      const bundleSpecEntries = await Promise.all(
+        [...thisProposalBundleHandles.keys()]
+          .map(handle => [handle, bundleHandleToAbsolutePaths.get(handle)])
+          .sort(([_hnda, { source: a }], [_hndb, { source: b }]) => {
+            if (a < b) {
+              return -1;
+            }
+            if (a > b) {
+              return 1;
+            }
+            return 0;
+          })
+          .map(async ([handle, absolutePaths], j) => {
+            // Transform the bundle handle identity into a bundleName reference.
+            const specEntry = await handleToBundleSpec(
+              handle,
+              absolutePaths.source,
+              thisProposalSequence,
+              String(j),
+            );
+            harden(handle);
+            return specEntry;
+          }),
+      );
 
       // Now that we've assigned all the bundleNames and hardened the
       // handles, we can extract the behavior bundle.
@@ -184,25 +200,29 @@ export const extractCoreProposalBundles = async (
       const behaviorSource = pathResolve(initDir, sourceSpec);
       const behaviors = await import(behaviorSource);
       const [exportedGetManifest, ...manifestArgs] = getManifestCall;
+      assert(
+        exportedGetManifest in behaviors,
+        `behavior ${behaviorSource} missing ${exportedGetManifest}`,
+      );
       const { manifest: overrideManifest } = await behaviors[
         exportedGetManifest
       ](harden({ restoreRef: () => null }), ...manifestArgs);
 
-      const behaviorBundleHandle = harden({
-        bundleName: `coreProposal${thisProposalSequence}_behaviors`,
-      });
-      const behaviorAbsolutePaths = harden({
-        source: behaviorSource,
-      });
-      bundleHandleToAbsolutePaths.set(
+      const behaviorBundleHandle = {};
+      const specEntry = await handleToBundleSpec(
         behaviorBundleHandle,
-        behaviorAbsolutePaths,
+        behaviorSource,
+        thisProposalSequence,
+        'behaviors',
       );
+      bundleSpecEntries.unshift(specEntry);
 
-      bundleSpecEntries.unshift([
-        behaviorBundleHandle.bundleName,
-        { sourceSpec: behaviorAbsolutePaths.source },
-      ]);
+      bundleHandleToAbsolutePaths.set(
+        behaviorBundleHandle,
+        harden({
+          source: behaviorSource,
+        }),
+      );
 
       return harden({
         ref: behaviorBundleHandle,