@agoric/deploy-script-support 0.10.4-dev-3dacdc3.0.3dacdc3 → 0.10.4-dev-2db363c.0.2db363c

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/deploy-script-support",
-  "version": "0.10.4-dev-3dacdc3.0.3dacdc3",
+  "version": "0.10.4-dev-2db363c.0.2db363c",
   "description": "Helpers and other support for writing deploy scripts",
   "type": "module",
   "main": "src/helpers.js",
@@ -34,19 +34,19 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/client-utils": "0.1.1-dev-3dacdc3.0.3dacdc3",
-    "@agoric/ertp": "0.16.3-dev-3dacdc3.0.3dacdc3",
-    "@agoric/import-manager": "0.3.12-dev-3dacdc3.0.3dacdc3",
-    "@agoric/internal": "0.3.3-dev-3dacdc3.0.3dacdc3",
-    "@agoric/notifier": "0.6.3-dev-3dacdc3.0.3dacdc3",
-    "@agoric/orchestration": "0.1.1-dev-3dacdc3.0.3dacdc3",
-    "@agoric/pola-io": "0.1.1-dev-3dacdc3.0.3dacdc3",
-    "@agoric/portfolio-api": "0.1.1-dev-3dacdc3.0.3dacdc3",
-    "@agoric/smart-wallet": "0.5.4-dev-3dacdc3.0.3dacdc3",
-    "@agoric/store": "0.9.3-dev-3dacdc3.0.3dacdc3",
-    "@agoric/time": "0.3.3-dev-3dacdc3.0.3dacdc3",
-    "@agoric/zoe": "0.26.3-dev-3dacdc3.0.3dacdc3",
-    "@agoric/zone": "0.2.3-dev-3dacdc3.0.3dacdc3",
+    "@agoric/client-utils": "0.1.1-dev-2db363c.0.2db363c",
+    "@agoric/ertp": "0.16.3-dev-2db363c.0.2db363c",
+    "@agoric/import-manager": "0.3.12-dev-2db363c.0.2db363c",
+    "@agoric/internal": "0.3.3-dev-2db363c.0.2db363c",
+    "@agoric/notifier": "0.6.3-dev-2db363c.0.2db363c",
+    "@agoric/orchestration": "0.1.1-dev-2db363c.0.2db363c",
+    "@agoric/pola-io": "0.1.1-dev-2db363c.0.2db363c",
+    "@agoric/portfolio-api": "0.1.1-dev-2db363c.0.2db363c",
+    "@agoric/smart-wallet": "0.5.4-dev-2db363c.0.2db363c",
+    "@agoric/store": "0.9.3-dev-2db363c.0.2db363c",
+    "@agoric/time": "0.3.3-dev-2db363c.0.2db363c",
+    "@agoric/zoe": "0.26.3-dev-2db363c.0.2db363c",
+    "@agoric/zone": "0.2.3-dev-2db363c.0.2db363c",
     "@endo/base64": "^1.0.12",
     "@endo/bundle-source": "^4.1.2",
     "@endo/errors": "^1.2.13",
@@ -60,7 +60,7 @@
     "@endo/zip": "^1.0.11"
   },
   "devDependencies": {
-    "@agoric/vats": "0.15.2-dev-3dacdc3.0.3dacdc3",
+    "@agoric/vats": "0.15.2-dev-2db363c.0.2db363c",
     "@endo/init": "^1.1.12",
     "ava": "^6.4.1",
     "import-meta-resolve": "^4.1.0"
@@ -83,5 +83,5 @@
   "typeCoverage": {
     "atLeast": 84.46
   },
-  "gitHead": "3dacdc33b578ee52258e5771192bf8e57beb603b"
+  "gitHead": "2db363cfdc60b99cc644823e99bced301cf748b5"
 }

package/src/cachedBundleSpec.js

@@ -1,4 +1,5 @@
 import { Fail } from '@endo/errors';
+import { writeFileAtomic } from '@agoric/internal/src/build-cache.js';
 
 /**
  * @import {promises} from 'fs';
@@ -30,11 +31,13 @@ export const makeCacheAndGetBundleSpec =
       if (e.code !== 'ENOENT') {
         throw e;
       }
-      const tmpFile = `${cacheFile}.${pid}.${now()}.${Math.random().toString(16).slice(2)}.tmp`;
-      await fs.writeFile(tmpFile, JSON.stringify(bundle, null, 2), {
-        flag: 'wx',
+      await writeFileAtomic({
+        fs,
+        filePath: cacheFile,
+        data: JSON.stringify(bundle, null, 2),
+        now,
+        pid,
       });
-      await fs.rename(tmpFile, cacheFile);
     }
     return harden({ bundleID, fileName: cacheFile });
   };

package/src/externalTypes.js

@@ -5,8 +5,10 @@ export {};
  * @import {NameHub} from '@agoric/vats';
  * @import {ZoeService} from '@agoric/zoe';
  * @import {BundleSource} from '@endo/bundle-source';
+ * @import {writeFile as WriteFile} from 'node:fs/promises';
  * @import {ERef} from '@agoric/vow';
  * @import {ScratchPad} from '@agoric/internal/src/scratch.js';
+ * @import {CoreEvalMaterialRecord} from './writeCoreEvalParts.js';
  * @import {Bank} from '@agoric/vats/src/vat-bank.js';
  * @import {Board} from '@agoric/vats';
  * @import {NameAdmin} from '@agoric/vats';
@@ -64,10 +66,13 @@ export {};
  *  bundleSource: BundleSource,
  *  cacheDir: string,
  *  lookup: (...path: string[]) => unknown,
+ *  log?: typeof console.log,
  *  now: () => number,
+ *  onWriteCoreEval?: (record: CoreEvalMaterialRecord) => void | Promise<void>,
  *  pathResolve: (...path: string[]) => string,
  *  publishBundle: PublishBundleRef,
  *  scriptArgs?: string[],
+ *  writeFile?: WriteFile,
  * }} DeployScriptEndownments
  */
 

package/src/helpers.js

@@ -70,6 +70,9 @@ export const makeHelpers = async (homePromise, endowments) => {
     publishBundle,
     pathResolve,
     cacheDir = pathResolve(os.homedir(), '.agoric/cache'),
+    onWriteCoreEval,
+    writeFile,
+    log,
   } = endowments;
 
   // Internal-to-this-function lazy dependencies.
@@ -156,6 +159,9 @@ export const makeHelpers = async (homePromise, endowments) => {
       return makeWriteCoreEval(homePromise, endowments, {
         getBundleSpec: deps.cacheAndGetBundleSpec,
         getBundlerMaker: helpers.getBundlerMaker,
+        ...(onWriteCoreEval && { onWriteCoreEval }),
+        ...(log && { log }),
+        ...(writeFile && { writeFile }),
       });
     },
     /** @deprecated use writeCoreEval */
@@ -163,6 +169,9 @@ export const makeHelpers = async (homePromise, endowments) => {
       return makeWriteCoreEval(homePromise, endowments, {
         getBundleSpec: deps.cacheAndGetBundleSpec,
         getBundlerMaker: helpers.getBundlerMaker,
+        ...(onWriteCoreEval && { onWriteCoreEval }),
+        ...(log && { log }),
+        ...(writeFile && { writeFile }),
       });
     },
   });

package/src/writeCoreEvalParts.js

@@ -22,7 +22,14 @@ import {
  * @property {string} name
  * @property {string} permit
  * @property {string} script
- * @property {{entrypoint: string, bundleID: string, fileName: string}[]} bundles
+ * @property {{entrypoint: string, bundleID?: string, bundleName?: string, fileName?: string}[]} bundles
+ */
+/**
+ * @typedef {{
+ *   plan: CoreEvalPlan,
+ *   eval: { json_permits: string, js_code: string },
+ *   bundles: { entrypoint: string, bundleID?: string, bundleName?: string, fileName?: string, bundle: BundleSourceResult<'endoZipBase64'> }[],
+ * }} CoreEvalMaterialRecord
  */
 
 /**
@@ -45,6 +52,7 @@ import {
  *   getBundlerMaker: () => Promise<BundleMaker>,
  *   getBundleSpec: (bundle: Promise<BundleSourceResult<'endoZipBase64'>>, getBundle: () => Bundler, opts?: any) => Promise<ManifestBundleRef>,
  *   log?: typeof console.log,
+ *   onWriteCoreEval?: (record: CoreEvalMaterialRecord) => void | Promise<void>,
  *   writeFile?: typeof fs.promises.writeFile
  * }} io
  * @returns {WriteCoreEval}
@@ -56,6 +64,7 @@ export const makeWriteCoreEval = (
     getBundlerMaker,
     getBundleSpec,
     log = console.log,
+    onWriteCoreEval = () => {},
     writeFile = fs.promises.writeFile,
   },
 ) => {
@@ -120,7 +129,8 @@ export const makeWriteCoreEval = (
       return ns.default;
     };
 
-    const bundles = [];
+    /** @type {CoreEvalMaterialRecord['bundles']} */
+    const bundleRecords = [];
 
     /**
      * Install an entrypoint.
@@ -136,9 +146,13 @@ export const makeWriteCoreEval = (
       // Serialise the installations.
       mutex = E.when(mutex, async () => {
         // console.log('installing', { filePrefix, entrypoint, bundlePath });
-        const spec = await getBundleSpec(bundle, getBundler, opts);
-        bundles.push({
+        const [spec, builtBundle] = await Promise.all([
+          getBundleSpec(bundle, getBundler, opts),
+          bundle,
+        ]);
+        bundleRecords.push({
           entrypoint,
+          bundle: builtBundle,
           ...spec,
         });
         return spec;
@@ -205,13 +219,21 @@ behavior;
       name: filePrefix,
       script: codeFile,
       permit: permitFile,
-      bundles,
+      bundles: bundleRecords.map(({ bundle: _bundle, ...spec }) => spec),
     };
 
     await writeFile(
       `${filePrefix}-plan.json`,
       `${JSON.stringify(plan, null, 2)}\n`,
     );
+    await onWriteCoreEval({
+      plan,
+      eval: {
+        json_permits: JSON.stringify(evalPermits, null, 2),
+        js_code: trimmed,
+      },
+      bundles: bundleRecords,
+    });
 
     log(`\
 You can now run a governance submission command like: