agoric 0.21.2-dev-347404a.0.347404a → 0.21.2-dev-9fb3baa.0.9fb3baa

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agoric",
-  "version": "0.21.2-dev-347404a.0.347404a",
+  "version": "0.21.2-dev-9fb3baa.0.9fb3baa",
   "description": "Manage the Agoric Javascript smart contract platform",
   "type": "module",
   "main": "src/main.js",
@@ -30,27 +30,27 @@
     "lint:eslint": "node ../../scripts/eslint-repo.mjs ."
   },
   "devDependencies": {
-    "@agoric/cosmic-swingset": "0.41.4-dev-347404a.0.347404a",
-    "@agoric/deploy-script-support": "0.10.4-dev-347404a.0.347404a",
+    "@agoric/cosmic-swingset": "0.41.4-dev-9fb3baa.0.9fb3baa",
+    "@agoric/deploy-script-support": "0.10.4-dev-9fb3baa.0.9fb3baa",
     "ava": "^8.0.1",
     "c8": "^10.1.2"
   },
   "dependencies": {
-    "@agoric/access-token": "0.4.22-dev-347404a.0.347404a",
-    "@agoric/cache": "0.3.3-dev-347404a.0.347404a",
-    "@agoric/casting": "0.4.3-dev-347404a.0.347404a",
-    "@agoric/client-utils": "0.1.1-dev-347404a.0.347404a",
-    "@agoric/cosmic-proto": "0.4.1-dev-347404a.0.347404a",
-    "@agoric/ertp": "0.16.3-dev-347404a.0.347404a",
-    "@agoric/governance": "0.10.4-dev-347404a.0.347404a",
-    "@agoric/internal": "0.3.3-dev-347404a.0.347404a",
-    "@agoric/network": "0.1.1-dev-347404a.0.347404a",
-    "@agoric/smart-wallet": "0.5.4-dev-347404a.0.347404a",
-    "@agoric/store": "0.9.3-dev-347404a.0.347404a",
-    "@agoric/swingset-vat": "0.32.3-dev-347404a.0.347404a",
-    "@agoric/vats": "0.15.2-dev-347404a.0.347404a",
-    "@agoric/zoe": "0.26.3-dev-347404a.0.347404a",
-    "@agoric/zone": "0.2.3-dev-347404a.0.347404a",
+    "@agoric/access-token": "0.4.22-dev-9fb3baa.0.9fb3baa",
+    "@agoric/cache": "0.3.3-dev-9fb3baa.0.9fb3baa",
+    "@agoric/casting": "0.4.3-dev-9fb3baa.0.9fb3baa",
+    "@agoric/client-utils": "0.1.1-dev-9fb3baa.0.9fb3baa",
+    "@agoric/cosmic-proto": "0.4.1-dev-9fb3baa.0.9fb3baa",
+    "@agoric/ertp": "0.16.3-dev-9fb3baa.0.9fb3baa",
+    "@agoric/governance": "0.10.4-dev-9fb3baa.0.9fb3baa",
+    "@agoric/internal": "0.3.3-dev-9fb3baa.0.9fb3baa",
+    "@agoric/network": "0.1.1-dev-9fb3baa.0.9fb3baa",
+    "@agoric/smart-wallet": "0.5.4-dev-9fb3baa.0.9fb3baa",
+    "@agoric/store": "0.9.3-dev-9fb3baa.0.9fb3baa",
+    "@agoric/swingset-vat": "0.32.3-dev-9fb3baa.0.9fb3baa",
+    "@agoric/vats": "0.15.2-dev-9fb3baa.0.9fb3baa",
+    "@agoric/zoe": "0.26.3-dev-9fb3baa.0.9fb3baa",
+    "@agoric/zone": "0.2.3-dev-9fb3baa.0.9fb3baa",
     "@cosmjs/crypto": "^0.36.0",
     "@cosmjs/encoding": "^0.36.0",
     "@cosmjs/math": "^0.36.0",
@@ -94,5 +94,5 @@
   "engines": {
     "node": "^22.11 || ^24.14"
   },
-  "gitHead": "347404a8fa25a95cfde941ae0874f37505c67f53"
+  "gitHead": "9fb3baacf4cc0fa79fb14193c6404ed7ac9829d6"
 }

package/src/proposals.js

@@ -151,65 +151,6 @@ const materializeFromRecords = (records, resolvedBuilderPath, cwd) => {
   });
 };
 
-/**
- * @param {typeof FsPromises} fs
- * @param {string} outputDir
- * @param {string} resolvedBuilderPath
- */
-const readProposalMaterialsFromPlans = async (
-  fs,
-  outputDir,
-  resolvedBuilderPath,
-) => {
-  const files = await fs.readdir(outputDir);
-  const planFiles = files.filter(f => f.endsWith('-plan.json')).sort();
-
-  // TODO: Replace this with metadata capture during writeCoreEval execution.
-  if (!planFiles.length) {
-    throw Error(`No core-eval plan files found in ${outputDir}`);
-  }
-
-  const dependencySet = new Set([resolvedBuilderPath]);
-
-  /** @type {CoreEvalSDKType[]} */
-  const evals = [];
-  /** @type {EndoZipBase64Bundle[]} */
-  const bundles = [];
-
-  for (const planFile of planFiles) {
-    /**
-     * @type {{
-     *   permit: string;
-     *   script: string;
-     *   bundles: Array<{ entrypoint: string; fileName: string }>;
-     * }}
-     */
-    const plan = await readJSONFile(fs, path.join(outputDir, planFile));
-
-    const [jsonPermits, jsCode] = await Promise.all([
-      readTextFromCwd(fs, outputDir, plan.permit),
-      readTextFromCwd(fs, outputDir, plan.script),
-    ]);
-    evals.push({ json_permits: jsonPermits, js_code: jsCode });
-
-    for (const bundleInfo of plan.bundles) {
-      bundles.push(await readJSONFromCwd(fs, outputDir, bundleInfo.fileName));
-
-      const resolvedEntrypoint = resolveModuleSpecifier(bundleInfo.entrypoint, [
-        path.dirname(resolvedBuilderPath),
-        outputDir,
-      ]);
-      dependencySet.add(resolvedEntrypoint);
-    }
-  }
-
-  return harden({
-    evals,
-    bundles,
-    dependencies: [...dependencySet].sort(),
-  });
-};
-
 /**
  * @param {{ fs: typeof FsPromises; cwd: string; }} param0
  */
@@ -272,11 +213,13 @@ const runInProcess = async ({
     resolvedBuilderPath,
     cwd,
   );
-  if (materialized) {
-    return materialized;
+  if (!materialized) {
+    throw Error(
+      `No core-eval proposal materials were emitted by ${resolvedBuilderPath}`,
+    );
   }
 
-  return readProposalMaterialsFromPlans(fs, cwd, resolvedBuilderPath);
+  return materialized;
 };
 
 /**