@agoric/deploy-script-support 0.10.4-dev-c50674b.0 → 0.10.4-dev-3a87a12.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/deploy-script-support",
-  "version": "0.10.4-dev-c50674b.0+c50674b",
+  "version": "0.10.4-dev-3a87a12.0+3a87a12",
   "description": "Helpers and other support for writing deploy scripts",
   "type": "module",
   "main": "src/helpers.js",
@@ -34,13 +34,13 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-c50674b.0+c50674b",
-    "@agoric/ertp": "0.16.3-dev-c50674b.0+c50674b",
-    "@agoric/import-manager": "0.3.12-dev-c50674b.0+c50674b",
-    "@agoric/internal": "0.3.3-dev-c50674b.0+c50674b",
-    "@agoric/notifier": "0.6.3-dev-c50674b.0+c50674b",
-    "@agoric/store": "0.9.3-dev-c50674b.0+c50674b",
-    "@agoric/zoe": "0.26.3-dev-c50674b.0+c50674b",
+    "@agoric/assert": "0.6.1-dev-3a87a12.0+3a87a12",
+    "@agoric/ertp": "0.16.3-dev-3a87a12.0+3a87a12",
+    "@agoric/import-manager": "0.3.12-dev-3a87a12.0+3a87a12",
+    "@agoric/internal": "0.3.3-dev-3a87a12.0+3a87a12",
+    "@agoric/notifier": "0.6.3-dev-3a87a12.0+3a87a12",
+    "@agoric/store": "0.9.3-dev-3a87a12.0+3a87a12",
+    "@agoric/zoe": "0.26.3-dev-3a87a12.0+3a87a12",
     "@endo/base64": "^0.2.31",
     "@endo/bundle-source": "^2.5.1",
     "@endo/far": "^0.2.18",
@@ -50,7 +50,7 @@
     "@endo/zip": "^0.2.31"
   },
   "devDependencies": {
-    "@agoric/vats": "0.15.2-dev-c50674b.0+c50674b",
+    "@agoric/vats": "0.15.2-dev-3a87a12.0+3a87a12",
     "@endo/init": "^0.5.56",
     "ava": "^5.3.0",
     "import-meta-resolve": "^2.2.1"
@@ -68,5 +68,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c50674b3c9772179825579edfa4281c933464895"
+  "gitHead": "3a87a12543172552103fcd16082d4382d9fa0bd5"
 }

package/src/coreProposalBehavior.js

@@ -24,12 +24,12 @@ export const permits = {
  * definitions.
  *
  * @param {object} opts
- * @param {{ bundleName: string } | { bundleID: string }} opts.manifestBundleRef
+ * @param {import('./externalTypes.js').ManifestBundleRef} opts.manifestBundleRef
  * @param {[string, ...unknown[]]} opts.getManifestCall
  * @param {Record<string, Record<string, unknown>>} [opts.overrideManifest]
  * @param {typeof import('@endo/far').E} opts.E
  * @param {(...args: unknown[]) => void} [opts.log]
- * @param {(ref: unknown) => Promise<unknown>} [opts.restoreRef]
+ * @param {(ref: import('./externalTypes.js').ManifestBundleRef) => Promise<import('@agoric/zoe/src/zoeService/utils.js').Installation<unknown>>} [opts.restoreRef]
  * @returns {(vatPowers: unknown) => Promise<unknown>}
  */
 export const makeCoreProposalBehavior = ({
@@ -70,13 +70,15 @@ export const makeCoreProposalBehavior = ({
     } = allPowers;
     const [exportedGetManifest, ...manifestArgs] = getManifestCall;
 
+    /** @type {(ref: import('./externalTypes.js').ManifestBundleRef) => Promise<Installation<unknown>>} */
     const defaultRestoreRef = async ref => {
       // extract-proposal.js creates these records, and bundleName is
       // the name under which the bundle was installed into
       // config.bundles
-      const p = ref.bundleName
-        ? E(vatAdminSvc).getBundleIDByName(ref.bundleName)
-        : ref.bundleID;
+      const p =
+        'bundleName' in ref
+          ? E(vatAdminSvc).getBundleIDByName(ref.bundleName)
+          : ref.bundleID;
       const bundleID = await p;
       const label = bundleID.slice(0, 8);
       return E(zoe).installBundleID(bundleID, label);

package/src/externalTypes.js

@@ -16,14 +16,13 @@ export {};
  */
 
 /**
- * @typedef BundleHandle
- * @property {string} [bundleName]
+ * @typedef {{ bundleName: string } | { bundleID: string} } ManifestBundleRef
  */
 
 /**
  * @callback PublishBundleRef
- * @param {ERef<BundleHandle>} bundle
- * @returns {Promise<BundleHandle>}
+ * @param {ERef<ManifestBundleRef>} bundle
+ * @returns {Promise<ManifestBundleRef>}
  */
 
 /**
@@ -31,7 +30,7 @@ export {};
  * @param {string} srcSpec
  * @param {string} bundlePath
  * @param {any} [opts]
- * @returns {BundleHandle}
+ * @returns {ManifestBundleRef}
  */
 
 /**

package/src/extract-proposal.js

@@ -135,11 +135,20 @@ export const extractCoreProposalBundles = async (
       /** @type {import('./externalTypes.js').PublishBundleRef} */
       const publishRef = async handleP => {
         const handle = await handleP;
+        // eslint-disable-next-line @typescript-eslint/prefer-ts-expect-error -- https://github.com/Agoric/agoric-sdk/issues/4620 */
+        // @ts-ignore xxx types
         bundleHandleToAbsolutePaths.has(handle) ||
           Fail`${handle} not in installed bundles`;
         return handle;
       };
-      const proposal = await ns[entrypoint]({ publishRef, install }, ...args);
+      const proposal = await ns[entrypoint](
+        {
+          publishRef,
+          // @ts-expect-error not statically verified to return a full obj
+          install,
+        },
+        ...args,
+      );
 
       // Add the proposal bundle handles in sorted order.
       const bundleSpecEntries = [...thisProposalBundleHandles.keys()]