@agoric/deploy-script-support 0.10.4-other-dev-3eb1a1d.0 → 0.10.4-other-dev-d15096d.0.d15096d

package/README.md

@@ -70,9 +70,11 @@ or an object whose keys identify child properties and whose corresponding values
 are theirselves (recursive) permits. See `BootstrapManifiest` in
 [lib-boot.js](../vats/src/core/lib-boot.js).
 
-The object returned from a "getManifestCall" invocation may also include
-"installations" to register in `agoricNames`, as is done here with name "game1"
-using the reference passed in via the invocation argument:
+The manifest object returned from a "getManifestCall" invocation may also
+include "installations" (they'll be registered with `agoricNames` and in the
+bootstrap promise space) and/or "options" (they'll be provided as the "options"
+property of the second argument for each call of the manifest's functions):
+
 ```js
 /** @type {import('@agoric/vats/src/core/lib-boot').BootstrapManifest} */
 const gameManifest = harden({
@@ -87,9 +89,12 @@ const gameManifest = harden({
 export const getManifestForGame1 = ({ restoreRef }, { game1Ref }) => {
   return harden({
     manifest: gameManifest,
+    // a reference to the game1 bundle will be published in agoricNames as "game1"
     installations: {
       game1: restoreRef(game1Ref),
     },
+    // the second argument of `startGameContract` will be `{ options: ["foo"] }`
+    options: ["foo"],
   });
 };
 ```

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "@agoric/deploy-script-support",
-  "version": "0.10.4-other-dev-3eb1a1d.0+3eb1a1d",
+  "version": "0.10.4-other-dev-d15096d.0.d15096d",
   "description": "Helpers and other support for writing deploy scripts",
   "type": "module",
   "main": "src/helpers.js",
   "engines": {
-    "node": "^18.12 || ^20.9"
+    "node": "^20.9 || ^22.11"
   },
   "scripts": {
     "build": "exit 0",
     "test": "ava",
     "test:xs": "exit 0",
     "lint-fix": "yarn lint:eslint --fix",
-    "lint:eslint": "eslint .",
-    "lint:types": "tsc",
-    "lint": "run-s --continue-on-error lint:*"
+    "lint:eslint": "yarn run -T eslint .",
+    "lint:types": "yarn run -T tsc",
+    "lint": "yarn run -T run-s --continue-on-error 'lint:*'"
   },
   "repository": {
     "type": "git",
@@ -34,27 +34,28 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/ertp": "0.16.3-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/import-manager": "0.3.12-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/internal": "0.3.3-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/notifier": "0.6.3-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/store": "0.9.3-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/time": "0.3.3-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/zoe": "0.26.3-other-dev-3eb1a1d.0+3eb1a1d",
-    "@endo/base64": "^1.0.9",
-    "@endo/bundle-source": "^3.5.0",
-    "@endo/errors": "^1.2.8",
-    "@endo/far": "^1.1.9",
-    "@endo/marshal": "^1.6.2",
-    "@endo/nat": "^5.0.13",
-    "@endo/promise-kit": "^1.1.8",
-    "@endo/zip": "^1.0.9"
+    "@agoric/ertp": "0.16.3-other-dev-d15096d.0.d15096d",
+    "@agoric/import-manager": "0.3.12-other-dev-d15096d.0.d15096d",
+    "@agoric/internal": "0.3.3-other-dev-d15096d.0.d15096d",
+    "@agoric/notifier": "0.6.3-other-dev-d15096d.0.d15096d",
+    "@agoric/pola-io": "0.1.1-other-dev-d15096d.0.d15096d",
+    "@agoric/store": "0.9.3-other-dev-d15096d.0.d15096d",
+    "@agoric/time": "0.3.3-other-dev-d15096d.0.d15096d",
+    "@agoric/zoe": "0.26.3-other-dev-d15096d.0.d15096d",
+    "@endo/base64": "^1.0.12",
+    "@endo/bundle-source": "^4.1.2",
+    "@endo/errors": "^1.2.13",
+    "@endo/far": "^1.1.14",
+    "@endo/marshal": "^1.8.0",
+    "@endo/nat": "^5.1.3",
+    "@endo/promise-kit": "^1.1.13",
+    "@endo/zip": "^1.0.11"
   },
   "devDependencies": {
-    "@agoric/vats": "0.15.2-other-dev-3eb1a1d.0+3eb1a1d",
-    "@endo/init": "^1.1.7",
+    "@agoric/vats": "0.15.2-other-dev-d15096d.0.d15096d",
+    "@endo/init": "^1.1.12",
     "ava": "^5.3.0",
-    "import-meta-resolve": "^2.2.1"
+    "import-meta-resolve": "^4.1.0"
   },
   "files": [
     "src",
@@ -72,7 +73,7 @@
     "access": "public"
   },
   "typeCoverage": {
-    "atLeast": 83.71
+    "atLeast": 83.14
   },
-  "gitHead": "3eb1a1d2d75b2b4a94807cd3bf759bc9fc531f05"
+  "gitHead": "d15096dc4ff8b96e9b6cd11954c20d3a9efbb393"
 }

package/src/assertOfferResult.js

@@ -2,6 +2,10 @@
 import { Fail } from '@endo/errors';
 import { E } from '@endo/far';
 
+/**
+ * @import {InvitationDetails, PaymentPKeywordRecord, Proposal, UserSeat} from '@agoric/zoe';
+ */
+
 /**
  * @param {ERef<UserSeat>} seat
  * @param {string} expectedOfferResult

package/src/cachedBundleSpec.js

@@ -1,13 +1,19 @@
 import { Fail } from '@endo/errors';
 
+/**
+ * @import {promises} from 'fs';
+ * @import {resolve} from 'path';
+ * @import {BundleSourceResult} from '@endo/bundle-source';
+ */
+
 /**
  * @param {string} cacheDir
- * @param {{ now: typeof Date.now, fs: import('fs').promises, pathResolve: typeof import('path').resolve }} param1
+ * @param {{ now: typeof Date.now, fs: promises, pathResolve: typeof resolve }} param1
  */
 export const makeCacheAndGetBundleSpec =
   (cacheDir, { now, fs, pathResolve }) =>
   /**
-   * @param {Promise<import('@endo/bundle-source').BundleSourceResult<'endoZipBase64'>>} bundleP
+   * @param {Promise<BundleSourceResult<'endoZipBase64'>>} bundleP
    */
   async bundleP => {
     const bundle = await bundleP;

package/src/coreProposalBehavior.js

@@ -3,6 +3,8 @@ const t = 'makeCoreProposalBehavior';
 
 /**
  * @import {Installation} from '@agoric/zoe/src/zoeService/utils.js';
+ * @import {E} from '@endo/far';
+ * @import {ManifestBundleRef} from './externalTypes.js';
  */
 
 /**
@@ -13,7 +15,6 @@ const t = 'makeCoreProposalBehavior';
  */
 
 /**
- * @import {ManifestBundleRef} from './externalTypes.js'
  * @typedef {[methodName: string, ...args: unknown[]]} FlatMethargs
  * @typedef {Record<string, Record<string, unknown>>} Manifest
  */
@@ -44,9 +45,9 @@ export const permits = {
  * @param {ManifestBundleRef} inputs.manifestBundleRef
  * @param {FlatMethargs} inputs.getManifestCall
  * @param {Manifest} [inputs.customManifest]
- * @param {typeof import('@endo/far').E} inputs.E
+ * @param {typeof E} inputs.E
  * @param {(...args: unknown[]) => void} [inputs.log]
- * @param {(ref: import('./externalTypes.js').ManifestBundleRef) => Promise<import('@agoric/zoe/src/zoeService/utils.js').Installation<unknown>>} [inputs.customRestoreRef]
+ * @param {(ref: ManifestBundleRef) => Promise<Installation<unknown>>} [inputs.customRestoreRef]
  * @returns {(vatPowers: unknown) => Promise<unknown>}
  */
 export const makeCoreProposalBehavior = ({
@@ -83,7 +84,7 @@ export const makeCoreProposalBehavior = ({
   };
 
   const makeRestoreRef = (vatAdminSvc, zoe) => {
-    /** @type {(ref: import('./externalTypes.js').ManifestBundleRef) => Promise<Installation<unknown>>} */
+    /** @type {(ref: ManifestBundleRef) => Promise<Installation<unknown>>} */
     const defaultRestoreRef = async bundleRef => {
       // extract-proposal.js creates these records, and bundleName is
       // the optional name under which the bundle was installed into
@@ -193,7 +194,7 @@ export const makeCoreProposalBehavior = ({
 /**
  * @param {object} inputs
  * @param {Array<{ ref: ManifestBundleRef, call: FlatMethargs, customManifest?: Manifest }>} inputs.metadataRecords
- * @param {typeof import('@endo/far').E} inputs.E
+ * @param {typeof E} inputs.E
  */
 export const makeEnactCoreProposalsFromBundleRef = ({ metadataRecords, E }) => {
   /**

package/src/depositInvitation.js

@@ -1,6 +1,11 @@
 // @ts-check
 import { E } from '@endo/far';
 
+/**
+ * @import {Amount, Brand, Issuer, Payment, Purse} from '@agoric/ertp';
+ * @import {InvitationDetails} from '@agoric/zoe';
+ */
+
 /**
  * @param {ERef<Purse>} zoeInvitationPurse
  */

package/src/externalTypes.js

@@ -1,3 +1,4 @@
+/* eslint-disable @agoric/group-jsdoc-imports */
 // @ts-check
 export {};
 
@@ -70,7 +71,7 @@ export {};
  * }} CommonHome
  */
 
-// TODO wallet as import('@agoric/wallet-backend/src/types').WalletAdmin once it's a module
+// TODO wallet as import('@agoric/wallet-backend/src/types.js').WalletAdmin once it's a module
 /**
  * @typedef {CommonHome & {
  * agoricNames: ERef<NameHub>,

package/src/extract-proposal.js

@@ -11,6 +11,11 @@ import {
   makeEnactCoreProposalsFromBundleRef,
 } from './coreProposalBehavior.js';
 
+/**
+ * @import {CoreEvalBuilder} from './externalTypes.js';
+ * @import {PublishBundleRef} from './externalTypes.js';
+ */
+
 /**
  * @typedef {string | {module: string, entrypoint?: string, args?: Array<unknown>}} ConfigProposal
  */
@@ -155,7 +160,7 @@ export const extractCoreProposalBundles = async (
           const thisProposalSequence = getSequenceForProposal(key);
           const initPath = findModule(dirname, module);
           const initDir = path.dirname(initPath);
-          /** @type {Record<string, import('./externalTypes.js').CoreEvalBuilder>} */
+          /** @type {Record<string, CoreEvalBuilder>} */
           const ns = await import(initPath);
           const install = (srcSpec, bundlePath) => {
             const absoluteSrc = findModule(initDir, srcSpec);
@@ -181,7 +186,7 @@ export const extractCoreProposalBundles = async (
             );
             return bundleHandle;
           };
-          /** @type {import('./externalTypes.js').PublishBundleRef} */
+          /** @type {PublishBundleRef} */
           const publishRef = async handleP => {
             const handle = await handleP;
             bundleHandleToAbsolutePaths.has(handle) ||

package/src/getBundlerMaker.js

@@ -13,7 +13,7 @@
 import { E } from '@endo/far';
 import url from 'url';
 
-/** @typedef {ReturnType<import('./endo-pieces-contract.js')['start']>['publicFacet']} BundleMaker */
+/** @typedef {ReturnType<typeof import('./endo-pieces-contract.js').start>['publicFacet']} BundleMaker */
 /** @typedef {ReturnType<BundleMaker['makeBundler']>} Bundler */
 
 export const makeGetBundlerMaker =

package/src/helpers.js

@@ -1,6 +1,6 @@
 // @ts-check
 
-/// <reference path="../../zoe/exported.js" />
+/// <reference types="@agoric/zoe/exported.js" />
 
 import { E } from '@endo/far';
 import bundleSource from '@endo/bundle-source';
@@ -19,7 +19,15 @@ import { assertOfferResult } from './assertOfferResult.js';
 import { installInPieces } from './installInPieces.js';
 import { makeWriteCoreEval } from './writeCoreEvalParts.js';
 
+/**
+ * @import {CommonHome} from './externalTypes.js';
+ * @import {AgSoloHome} from './externalTypes.js';
+ * @import {DeployScriptEndownments} from './externalTypes.js';
+ * @import {WriteCoreEval} from './writeCoreEvalParts.js';
+ */
+
 export * from '@agoric/internal/src/node/createBundles.js';
+export { parseScriptArgs } from './parseCoreEvalArgs.js';
 
 // These are also hard-coded in lib-wallet.js.
 // TODO: Add methods to the wallet to access these without hard-coding
@@ -53,8 +61,8 @@ const makeLazyObject = sourceObject => {
 };
 
 /**
- * @param {Promise<import('./externalTypes.js').CommonHome | import('./externalTypes.js').AgSoloHome>} homePromise
- * @param {import('./externalTypes.js').DeployScriptEndownments} endowments
+ * @param {Promise<CommonHome | AgSoloHome>} homePromise
+ * @param {DeployScriptEndownments} endowments
  */
 export const makeHelpers = async (homePromise, endowments) => {
   // Endowments provided via `agoric run` or `agoric deploy`.
@@ -145,7 +153,7 @@ export const makeHelpers = async (homePromise, endowments) => {
     get getBundlerMaker() {
       return makeGetBundlerMaker(homePromise, { bundleSource, lookup });
     },
-    /** @returns {import('./writeCoreEvalParts.js').WriteCoreEval} */
+    /** @returns {WriteCoreEval} */
     get writeCoreEval() {
       return makeWriteCoreEval(homePromise, endowments, {
         getBundleSpec: deps.cacheAndGetBundleSpec,

package/src/install.js

@@ -3,13 +3,16 @@ import './externalTypes.js';
 
 import { E } from '@endo/far';
 
-/** @import {Petname} from '@agoric/deploy-script-support/src/externalTypes.js' */
+/**
+ * @import {Petname} from '@agoric/deploy-script-support/src/externalTypes.js'
+ * @import {InstallationManager} from './startInstance.js';
+ */
 
 // XXX board is Board but specifying that leads to type errors with imports which aren't worth fixing right now
 /**
  * @param {typeof import('@endo/bundle-source')['default']} bundleSource
  * @param {ERef<ZoeService>} zoe
- * @param {ERef<import('./startInstance.js').InstallationManager>} installationManager
+ * @param {ERef<InstallationManager>} installationManager
  * @param {ERef<any>} board
  * @param {(bundle: any) => any} [publishBundle]
  * @param {(path: string) => string} [pathResolve]

package/src/offer.js

@@ -4,7 +4,11 @@ import { E } from '@endo/far';
 // Avoid pulling in too many dependencies like notifiers
 import { AmountMath } from '@agoric/ertp/src/amountMath.js';
 
-/** @import {Petname} from '@agoric/deploy-script-support/src/externalTypes.js' */
+/**
+ * @import {Petname} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {Amount, Brand, Issuer, Payment, Purse} from '@agoric/ertp';
+ * @import {InvitationDetails, Keyword, Proposal} from '@agoric/zoe';
+ */
 
 /**
  * @typedef {object} OfferHelperConfig

package/src/parseCoreEvalArgs.js

@@ -0,0 +1,40 @@
+/**
+ * To customize proposals for multiple environments, we pass the "variant"
+ * identifier in scriptArgs. The variant must match a knownVariant.
+ *
+ * @param {DeployScriptEndownments} endowments
+ * @param {string} name a name to use in error messages or Usage suggestions.
+ * @param {string[]} knownVariants
+ */
+export const parseScriptArgs = async (endowments, name, knownVariants) => {
+  const { scriptArgs } = endowments;
+  // const variantOrConfig = scriptArgs?.[0];
+  const variantOrConfig =
+    scriptArgs && scriptArgs.length > 0 ? scriptArgs : undefined;
+
+  /**
+   * @import {DeployScriptEndownments} from './externalTypes.js';
+   */
+
+  console.log(`${name}`, variantOrConfig);
+
+  const Usage = `agoric run ${name}.js ${[...knownVariants, '<json-config>'].join(' | ')}`;
+  const opts = {};
+
+  if (typeof variantOrConfig === 'string') {
+    if (variantOrConfig[0] === '{') {
+      try {
+        opts.config = JSON.parse(variantOrConfig);
+      } catch (err) {
+        throw Error(`Failed to parse config argument ${variantOrConfig}`);
+      }
+    } else {
+      opts.variant = variantOrConfig;
+    }
+  } else {
+    console.error(Usage);
+    throw Error(Usage);
+  }
+
+  return opts;
+};

package/src/permissioned-deployment.js

@@ -0,0 +1,168 @@
+/**
+ * @file support for Contract Deployment Process
+ *
+ * 1. `agoric run XYZ.build.js` produces:
+ *    - `b1-123.json` bundle x 2: contract, aux
+ *    - `XYZ-permit.json`, `XYZ.js` script
+ * 2. Install bundles
+ *    - permissionless with per-byte fee in IST
+ * 3. Submit CoreEval proposal to BLD stakers
+ *    - `XYZ-permit.json`, `XYZ.js`
+ *
+ * @see {runBuilder}
+ * @see {installBundles}
+ * @see {submitCoreEval}
+ */
+import { toCLIOptions } from '@agoric/internal/src/cli-utils.js';
+
+/**
+ * @import {CmdRunner} from '@agoric/pola-io';
+ * @import {FileRd} from '@agoric/pola-io';
+ */
+
+/**
+ *
+ * TODO: builder should be a FileRd
+ * TODO: parameterize dest dir
+ *
+ * @example
+ * to use npx to find `agoric` in node_modules/.bin:
+ *   const execP = promisify(childProcess.execFile)
+ *   const agoric = makeCmdRunner('npx', { execFile: execP }).subCommand('agoric');
+ *
+ * XXX use a different name from execFile since the meaning is different
+ *
+ * @param {CmdRunner} agoric
+ * @param {FileRd} builder
+ * @param {string[]} [builderOpts]
+ * @param {{cwd?: FileRd}} [io]
+ *
+ * @returns {Promise<Plan>}
+ *
+ * @typedef {{
+ *   name: string,
+ *   script: string,
+ *   permit: string,
+ *   bundles: { entrypoint:string, bundleID:string, fileName:string}[];
+ * }} Plan
+ */
+export const runBuilder = async (
+  agoric,
+  builder,
+  builderOpts = [],
+  { cwd = builder.join('../../') } = {},
+) => {
+  const cmd = agoric.withFlags(...builderOpts);
+  const { stdout } = await cmd.exec(['run', String(builder)]);
+  const match = stdout?.match(/ (?<name>[-\w]+)-permit.json/);
+  if (!(match && match.groups)) {
+    throw Error('no permit found');
+  }
+  /** @type {Plan} */
+  const plan = await cwd.join(`${match.groups.name}-plan.json`).readJSON();
+  return plan;
+};
+
+export const txFlags = ({
+  node,
+  from,
+  chainId,
+  keyringBackend = 'test',
+  broadcastMode = 'block',
+}) => ({
+  node,
+  from,
+  'chain-id': chainId,
+  'keyring-backend': keyringBackend,
+  'broadcast-mode': broadcastMode,
+  // TODO: parameterize these?
+  gas: 'auto',
+  'gas-adjustment': '1.4',
+});
+
+/**
+ * @param {CmdRunner} agd
+ * @param {number} n
+ */
+export const waitForBlock = async (agd, n = 1) => {
+  const getHeight = async () => {
+    const { stdout } = await agd.exec(['status']);
+    const status = JSON.parse(stdout);
+    const { latest_block_height: height } = status.sync_info || status.SyncInfo;
+    return height;
+  };
+  const initialHeight = await getHeight();
+  const SEC = 1000;
+  let currentHeight;
+  do {
+    await new Promise(resolve => setTimeout(resolve, 1 * SEC)); // XXX ambient
+    currentHeight = await getHeight();
+  } while (currentHeight - initialHeight < n);
+  console.log('block height:', initialHeight, currentHeight);
+};
+
+/**
+ * @param {CmdRunner} agd - agd with --from etc.
+ * @param {string[]} txArgs
+ */
+export const runTx = async (agd, txArgs) => {
+  const { stdout } = await agd.withFlags('-o', 'json').exec(['tx', ...txArgs]);
+  const result = JSON.parse(stdout);
+  if (result.code !== 0) {
+    throw Object.assign(Error(result.raw_log), result);
+  }
+  return result;
+};
+
+/**
+ * @param {CmdRunner} agd
+ * @param {FileRd} bundle
+ */
+export const installBundle = async (agd, bundle) =>
+  runTx(agd, ['swingset', 'install-bundle', `@${bundle}`]);
+
+export const txAbbr = tx => {
+  const { txhash, code, height, gas_used: g } = tx;
+
+  return { txhash, code, height, gas_used: g };
+};
+
+/**
+ * @param {CmdRunner} agd
+ * @param {Plan['bundles']} bundles
+ * @param {FileRd} files
+ */
+export const installBundles = (agd, bundles, files) => {
+  const ps = bundles.map(b =>
+    installBundle(agd, files.join(files.relative(b.fileName))),
+  );
+  return Promise.all(ps);
+};
+
+/**
+ * @param {CmdRunner} agd
+ * @param {Pick<Plan, 'permit' | 'script'>[]} evals
+ * @param {object} [opts]
+ * @param {string} [opts.title]
+ * @param {string} [opts.description]
+ * @param {object} [opts.depositOpts]
+ * @param {string} [opts.depositOpts.denom]
+ * @param {number} [opts.depositOpts.unit]
+ * @param {number} [opts.depositOpts.qty]
+ * @param {string} [opts.deposit]
+ */
+export const submitCoreEval = async (
+  agd,
+  evals,
+  {
+    title = evals[0].script,
+    description = title,
+    depositOpts: { denom = 'ubld', unit = 1_000_000, qty = 10 } = {},
+    deposit = `${qty * unit}${denom}`,
+  } = {},
+) =>
+  runTx(agd, [
+    ...'gov submit-proposal swingset-core-eval'.split(' '),
+    ...evals.map(e => [e.permit, e.script]).flat(),
+    ...toCLIOptions({ title, description, deposit }),
+  ]);

package/src/saveIssuer.js

@@ -1,12 +1,16 @@
 // @ts-check
 import { E } from '@endo/far';
 
-/** @import {Petname} from '@agoric/deploy-script-support/src/externalTypes.js' */
+/**
+ * @import {Petname} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {Amount, Brand, Issuer, Payment} from '@agoric/ertp';
+ * @import {IssuerManager} from './startInstance.js';
+ */
 
 /**
  * @param {ERef<any>} walletAdmin - an internal type of the
  * wallet, not defined here
- * @param {ERef<import('./startInstance.js').IssuerManager>} issuerManager
+ * @param {ERef<IssuerManager>} issuerManager
  */
 export const makeSaveIssuer = (walletAdmin, issuerManager) => {
   /**

package/src/startInstance.js

@@ -2,7 +2,11 @@
 import { assert } from '@endo/errors';
 import { E, passStyleOf } from '@endo/far';
 
-/** @import {Petname} from '@agoric/deploy-script-support/src/externalTypes.js' */
+/**
+ * @import {Petname} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {Amount, Brand, Issuer, Payment, Purse} from '@agoric/ertp';
+ * @import {IssuerKeywordRecord, Keyword} from '@agoric/zoe';
+ */
 
 /**
  * @template T

package/src/writeCoreEvalParts.js

@@ -13,6 +13,8 @@ import {
 /**
  * @import {BundleSource, BundleSourceResult} from '@endo/bundle-source';
  * @import {AgSoloHome, CanonicalHome, CommonHome, CoreEvalBuilder, CoreEvalDescriptor, ManifestBundleRef} from './externalTypes.js';
+ * @import {BundleMaker} from './getBundlerMaker.js';
+ * @import {Bundler} from './getBundlerMaker.js';
  */
 
 /**
@@ -40,8 +42,8 @@ import {
  *   pathResolve: (path: string) => string,
  * }} endowments
  * @param {{
- *   getBundlerMaker: () => Promise<import('./getBundlerMaker.js').BundleMaker>,
- *   getBundleSpec: (bundle: Promise<BundleSourceResult<'endoZipBase64'>>, getBundle: () => import('./getBundlerMaker.js').Bundler, opts?: any) => Promise<ManifestBundleRef>,
+ *   getBundlerMaker: () => Promise<BundleMaker>,
+ *   getBundleSpec: (bundle: Promise<BundleSourceResult<'endoZipBase64'>>, getBundle: () => Bundler, opts?: any) => Promise<ManifestBundleRef>,
  *   log?: typeof console.log,
  *   writeFile?: typeof fs.promises.writeFile
  * }} io
@@ -60,7 +62,7 @@ export const makeWriteCoreEval = (
   const { bundleSource, pathResolve } = endowments;
 
   let bundlerCache;
-  /** @returns {import('./getBundlerMaker.js').Bundler} */
+  /** @returns {Bundler} */
   const getBundler = () => {
     if (!bundlerCache) {
       bundlerCache = E(getBundlerMaker()).makeBundler({