@agoric/builders 0.1.1-dev-754698c.0.754698c → 0.1.1-dev-1d67c2a.0.1d67c2a

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/builders",
-  "version": "0.1.1-dev-754698c.0.754698c",
+  "version": "0.1.1-dev-1d67c2a.0.1d67c2a",
   "description": "Build scripts for proposals to an Agoric chain",
   "type": "module",
   "main": "./index.js",
@@ -20,14 +20,14 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/client-utils": "0.1.1-dev-754698c.0.754698c",
-    "@agoric/ertp": "0.16.3-dev-754698c.0.754698c",
-    "@agoric/internal": "0.3.3-dev-754698c.0.754698c",
-    "@agoric/notifier": "0.6.3-dev-754698c.0.754698c",
-    "@agoric/smart-wallet": "0.5.4-dev-754698c.0.754698c",
-    "@agoric/vat-data": "0.5.3-dev-754698c.0.754698c",
-    "@agoric/vats": "0.15.2-dev-754698c.0.754698c",
-    "@agoric/zoe": "0.26.3-dev-754698c.0.754698c",
+    "@agoric/client-utils": "0.1.1-dev-1d67c2a.0.1d67c2a",
+    "@agoric/ertp": "0.16.3-dev-1d67c2a.0.1d67c2a",
+    "@agoric/internal": "0.3.3-dev-1d67c2a.0.1d67c2a",
+    "@agoric/notifier": "0.6.3-dev-1d67c2a.0.1d67c2a",
+    "@agoric/smart-wallet": "0.5.4-dev-1d67c2a.0.1d67c2a",
+    "@agoric/vat-data": "0.5.3-dev-1d67c2a.0.1d67c2a",
+    "@agoric/vats": "0.15.2-dev-1d67c2a.0.1d67c2a",
+    "@agoric/zoe": "0.26.3-dev-1d67c2a.0.1d67c2a",
     "@endo/bundle-source": "^4.1.2",
     "@endo/captp": "^4.4.8",
     "@endo/eventual-send": "^1.3.4",
@@ -41,14 +41,15 @@
     "import-meta-resolve": "^4.1.0"
   },
   "devDependencies": {
-    "@agoric/deploy-script-support": "0.10.4-dev-754698c.0.754698c",
-    "@agoric/governance": "0.10.4-dev-754698c.0.754698c",
-    "@agoric/inter-protocol": "0.16.2-dev-754698c.0.754698c",
-    "@agoric/orchestration": "0.1.1-dev-754698c.0.754698c",
-    "@agoric/store": "0.9.3-dev-754698c.0.754698c",
-    "@agoric/swing-store": "0.9.2-dev-754698c.0.754698c",
-    "@agoric/swingset-liveslots": "0.10.3-dev-754698c.0.754698c",
-    "@agoric/time": "0.3.3-dev-754698c.0.754698c",
+    "@agoric/deploy-script-support": "0.10.4-dev-1d67c2a.0.1d67c2a",
+    "@agoric/governance": "0.10.4-dev-1d67c2a.0.1d67c2a",
+    "@agoric/inter-protocol": "0.16.2-dev-1d67c2a.0.1d67c2a",
+    "@agoric/orchestration": "0.1.1-dev-1d67c2a.0.1d67c2a",
+    "@agoric/store": "0.9.3-dev-1d67c2a.0.1d67c2a",
+    "@agoric/swing-store": "0.9.2-dev-1d67c2a.0.1d67c2a",
+    "@agoric/swingset-liveslots": "0.10.3-dev-1d67c2a.0.1d67c2a",
+    "@agoric/swingset-vat": "0.32.3-dev-1d67c2a.0.1d67c2a",
+    "@agoric/time": "0.3.3-dev-1d67c2a.0.1d67c2a",
     "@endo/errors": "^1.2.13",
     "ava": "^6.4.1",
     "c8": "^10.1.3"
@@ -78,5 +79,5 @@
   "typeCoverage": {
     "atLeast": 89.7
   },
-  "gitHead": "754698ceecae0bf068be0022082e672ff4bc71cb"
+  "gitHead": "1d67c2a384e8486c7638ab8e424f46e15f4b321d"
 }

package/scripts/inter-protocol/add-collateral-core.js

@@ -1,9 +1,12 @@
 /* eslint-env node */
 import { makeHelpers } from '@agoric/deploy-script-support';
 
+import { interProtocolBundleSpecs } from '@agoric/inter-protocol/source-spec-registry.js';
 import { getManifestForAddAssetToVault } from '@agoric/inter-protocol/src/proposals/addAssetToVault.js';
 import { getManifestForPsm } from '@agoric/inter-protocol/src/proposals/startPSM.js';
 import { makeInstallCache } from '@agoric/inter-protocol/src/proposals/utils.js';
+import { vatsSourceSpecRegistry } from '@agoric/vats/source-spec-registry.js';
+import { buildBundlePath } from '../lib/build-bundle.js';
 
 /**
  * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
@@ -38,6 +41,11 @@ export const defaultProposalBuilder = async (
   }
 
   const install = wrapInstall ? wrapInstall(install0) : install0;
+  const scaledPriceAuthorityPath = await buildBundlePath(
+    import.meta.url,
+    '@agoric/zoe/src/contracts/scaledPriceAuthority.js',
+    'scaledPriceAuthority',
+  );
 
   return harden({
     sourceSpec: '@agoric/inter-protocol/src/proposals/addAssetToVault.js',
@@ -59,7 +67,7 @@ export const defaultProposalBuilder = async (
         scaledPriceAuthorityRef: publishRef(
           install(
             '@agoric/zoe/src/contracts/scaledPriceAuthority.js',
-            '../bundles/bundle-scaledPriceAuthority.js',
+            scaledPriceAuthorityPath,
             { persist: true },
           ),
         ),
@@ -79,6 +87,10 @@ export const psmProposalBuilder = async (
   assert(denom, 'ANCHOR_DENOM is required');
 
   const install = wrapInstall ? wrapInstall(install0) : install0;
+  const psm = interProtocolBundleSpecs.psm;
+  const mintHolder = vatsSourceSpecRegistry.mintHolder;
+  const psmPath = await buildBundlePath(import.meta.url, psm);
+  const mintHolderPath = await buildBundlePath(import.meta.url, mintHolder);
 
   return harden({
     sourceSpec: '@agoric/inter-protocol/src/proposals/startPSM.js',
@@ -91,17 +103,9 @@ export const psmProposalBuilder = async (
           decimalPlaces,
         },
         installKeys: {
-          psm: publishRef(
-            install(
-              '@agoric/inter-protocol/src/psm/psm.js',
-              '../bundles/bundle-psm.js',
-            ),
-          ),
+          psm: publishRef(install(psm.packagePath, psmPath)),
           mintHolder: publishRef(
-            install(
-              '@agoric/vats/src/mintHolder.js',
-              '../../vats/bundles/bundle-mintHolder.js',
-            ),
+            install(mintHolder.packagePath, mintHolderPath),
           ),
         },
       },

package/scripts/inter-protocol/init-core.js

@@ -5,7 +5,8 @@
  *   governance votes (n/a on sim-chain).
  */
 import { makeHelpers } from '@agoric/deploy-script-support';
-import { objectMap } from '@agoric/internal';
+import { governanceSourceSpecRegistry } from '@agoric/governance/source-spec-registry.js';
+import { interProtocolBundleSpecs } from '@agoric/inter-protocol/source-spec-registry.js';
 
 import {
   getManifestForInterProtocol,
@@ -13,6 +14,7 @@ import {
   getManifestForMain,
 } from '@agoric/inter-protocol/src/proposals/core-proposal.js';
 import { makeInstallCache } from '@agoric/inter-protocol/src/proposals/utils.js';
+import { buildBundlePath } from '../lib/build-bundle.js';
 
 /**
  * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
@@ -21,38 +23,58 @@ import { makeInstallCache } from '@agoric/inter-protocol/src/proposals/utils.js'
 
 // TODO end inter-package filesystem references https://github.com/Agoric/agoric-sdk/issues/8178
 
-/** @type {Record<string, Record<string, [string, string]>>} */
+/**
+ * @typedef {{
+ *   sourceSpec?: string;
+ *   packagePath?: string;
+ *   bundleName?: string;
+ * }} BundleRegistryEntry
+ */
+
+/** @type {Record<string, Record<string, BundleRegistryEntry>>} */
 const installKeyGroups = {
   econCommittee: {
-    contractGovernor: [
-      '@agoric/governance/src/contractGovernor.js',
-      '../../governance/bundles/bundle-contractGovernor.js',
-    ],
-    committee: [
-      '@agoric/governance/src/committee.js',
-      '../../governance/bundles/bundle-committee.js',
-    ],
-    binaryVoteCounter: [
-      '@agoric/governance/src/binaryVoteCounter.js',
-      '../../governance/bundles/bundle-binaryVoteCounter.js',
-    ],
+    contractGovernor: governanceSourceSpecRegistry.contractGovernor,
+    committee: governanceSourceSpecRegistry.committee,
+    binaryVoteCounter: governanceSourceSpecRegistry.binaryVoteCounter,
   },
   main: {
-    vaultFactory: [
-      '@agoric/inter-protocol/src/vaultFactory/vaultFactory.js',
-      '../../inter-protocol/bundles/bundle-vaultFactory.js',
-    ],
-    feeDistributor: [
-      '@agoric/inter-protocol/src/feeDistributor.js',
-      '../../inter-protocol/bundles/bundle-feeDistributor.js',
-    ],
-    reserve: [
-      '@agoric/inter-protocol/src/reserve/assetReserve.js',
-      '../../inter-protocol/bundles/bundle-reserve.js',
-    ],
+    vaultFactory: interProtocolBundleSpecs.vaultFactory,
+    feeDistributor: interProtocolBundleSpecs.feeDistributor,
+    reserve: interProtocolBundleSpecs.reserve,
   },
 };
 
+/**
+ * @template I
+ * @template R
+ * @param {object} opts
+ * @param {(i: I) => R} opts.publishRef
+ * @param {(m: string, b: string, opts?: any) => I} opts.install
+ * @param {Record<string, BundleRegistryEntry>} opts.group
+ * @param {boolean} [opts.persist]
+ */
+const publishInstallGroup = async ({ publishRef, install, group, persist }) =>
+  Object.fromEntries(
+    // eslint-disable-next-line @jessie.js/safe-await-separator
+    await Promise.all(
+      Object.entries(group).map(async ([key, entry]) => {
+        const bundlePath = await buildBundlePath(import.meta.url, entry);
+        assert(entry.packagePath, `${key} missing packagePath`);
+        return [
+          key,
+          publishRef(
+            install(
+              entry.packagePath,
+              bundlePath,
+              persist === undefined ? undefined : { persist },
+            ),
+          ),
+        ];
+      }),
+    ),
+  );
+
 /**
  * @template I
  * @template R
@@ -68,12 +90,12 @@ export const committeeProposalBuilder = async (
   { econCommitteeOptions } = {},
 ) => {
   const install = wrapInstall ? wrapInstall(install0) : install0;
-
-  /** @param {Record<string, [string, string]>} group */
-  const publishGroup = group =>
-    objectMap(group, ([mod, bundle]) =>
-      publishRef(install(mod, bundle, { persist: true })),
-    );
+  const econCommitteeInstallKeys = await publishInstallGroup({
+    publishRef,
+    install,
+    group: installKeyGroups.econCommittee,
+    persist: true,
+  });
   return harden({
     sourceSpec: '@agoric/inter-protocol/src/proposals/core-proposal.js',
     getManifestCall: [
@@ -81,7 +103,7 @@ export const committeeProposalBuilder = async (
       {
         econCommitteeOptions,
         installKeys: {
-          ...publishGroup(installKeyGroups.econCommittee),
+          ...econCommitteeInstallKeys,
         },
       },
     ],
@@ -104,13 +126,12 @@ export const mainProposalBuilder = async ({
   const { VAULT_FACTORY_CONTROLLER_ADDR } = process.env;
 
   const install = wrapInstall ? wrapInstall(install0) : install0;
-
-  const persist = true;
-  /** @param {Record<string, [string, string]>} group */
-  const publishGroup = group =>
-    objectMap(group, ([mod, bundle]) =>
-      publishRef(install(mod, bundle, { persist })),
-    );
+  const mainInstallKeys = await publishInstallGroup({
+    publishRef,
+    install,
+    group: installKeyGroups.main,
+    persist: true,
+  });
   return harden({
     sourceSpec: '@agoric/inter-protocol/src/proposals/core-proposal.js',
     getManifestCall: [
@@ -118,7 +139,7 @@ export const mainProposalBuilder = async ({
       {
         vaultFactoryControllerAddress: VAULT_FACTORY_CONTROLLER_ADDR,
         installKeys: {
-          ...publishGroup(installKeyGroups.main),
+          ...mainInstallKeys,
         },
       },
     ],
@@ -150,10 +171,6 @@ export const defaultProposalBuilder = async (
     } = {},
   } = options;
 
-  /** @param {Record<string, [string, string]>} group */
-  const publishGroup = group =>
-    objectMap(group, ([mod, bundle]) => publishRef(install(mod, bundle)));
-
   const anchorOptions = anchorDenom && {
     denom: anchorDenom,
     decimalPlaces: parseInt(anchorDecimalPlaces, 10),
@@ -165,6 +182,16 @@ export const defaultProposalBuilder = async (
   const econCommitteeOptions = {
     committeeSize: parseInt(econCommitteeSize, 10),
   };
+  const econCommitteeInstallKeys = await publishInstallGroup({
+    publishRef,
+    install,
+    group: installKeyGroups.econCommittee,
+  });
+  const mainInstallKeys = await publishInstallGroup({
+    publishRef,
+    install,
+    group: installKeyGroups.main,
+  });
 
   return harden({
     sourceSpec: '@agoric/inter-protocol/src/proposals/core-proposal.js',
@@ -177,8 +204,8 @@ export const defaultProposalBuilder = async (
         anchorOptions,
         econCommitteeOptions,
         installKeys: {
-          ...publishGroup(installKeyGroups.econCommittee),
-          ...publishGroup(installKeyGroups.main),
+          ...econCommitteeInstallKeys,
+          ...mainInstallKeys,
         },
       },
     ],

package/scripts/inter-protocol/invite-committee-core.js

@@ -2,6 +2,8 @@
 import { makeHelpers } from '@agoric/deploy-script-support';
 
 import { getManifestForInviteCommittee } from '@agoric/inter-protocol/src/proposals/committee-proposal.js';
+import { interProtocolBundleSpecs } from '@agoric/inter-protocol/source-spec-registry.js';
+import { buildBundlePath } from '../lib/build-bundle.js';
 
 /**
  * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
@@ -21,6 +23,12 @@ export const defaultProposalBuilder = async (
 
   assert(voterAddresses, 'ECON_COMMITTEE_ADDRESSES is required');
 
+  const econCommitteeCharter = interProtocolBundleSpecs.econCommitteeCharter;
+  const econCommitteeCharterPath = await buildBundlePath(
+    import.meta.url,
+    econCommitteeCharter,
+  );
+
   return harden({
     sourceSpec: '@agoric/inter-protocol/src/proposals/committee-proposal.js',
     getManifestCall: [
@@ -28,13 +36,9 @@ export const defaultProposalBuilder = async (
       {
         voterAddresses,
         econCommitteeCharterRef: publishRef(
-          install(
-            '@agoric/inter-protocol/src/econCommitteeCharter.js',
-            '../bundles/bundle-econCommitteeCharter.js',
-            {
-              persist: true,
-            },
-          ),
+          install(econCommitteeCharter.packagePath, econCommitteeCharterPath, {
+            persist: true,
+          }),
         ),
       },
     ],

package/scripts/inter-protocol/price-feed-core.js

@@ -1,5 +1,7 @@
 /* eslint-env node */
 import { makeHelpers } from '@agoric/deploy-script-support';
+import { interProtocolBundleSpecs } from '@agoric/inter-protocol/source-spec-registry.js';
+import { buildBundlePath } from '../lib/build-bundle.js';
 
 /**
  * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
@@ -45,6 +47,12 @@ export const defaultProposalBuilder = async (
     assert(OUT_BRAND_NAME);
   }
 
+  const priceAggregator = interProtocolBundleSpecs.priceAggregator;
+  const priceAggregatorPath = await buildBundlePath(
+    import.meta.url,
+    priceAggregator,
+  );
+
   return harden({
     sourceSpec: '@agoric/inter-protocol/src/proposals/price-feed-proposal.js',
     getManifestCall: [
@@ -61,10 +69,7 @@ export const defaultProposalBuilder = async (
         brandInRef: brandIn && publishRef(brandIn),
         brandOutRef: brandOut && publishRef(brandOut),
         priceAggregatorRef: publishRef(
-          install(
-            '@agoric/inter-protocol/src/price/fluxAggregatorContract.js',
-            '../bundles/bundle-fluxAggregatorKit.js',
-          ),
+          install(priceAggregator.packagePath, priceAggregatorPath),
         ),
       },
     ],

package/scripts/inter-protocol/replace-electorate-core.js

@@ -14,7 +14,9 @@
  *     agoric run replace-electorate-core.js MAINNET
  */
 import { makeHelpers } from '@agoric/deploy-script-support';
+import { governanceSourceSpecRegistry } from '@agoric/governance/source-spec-registry.js';
 import { getManifestForReplaceAllElectorates } from '@agoric/inter-protocol/src/proposals/replaceElectorate.js';
+import { buildBundlePath } from '../lib/build-bundle.js';
 
 /**
  * @import {replaceAllElectorates} from '@agoric/inter-protocol/src/proposals/replaceElectorate.js';
@@ -108,6 +110,11 @@ export const defaultProposalBuilder = async ({ publishRef, install }, opts) => {
     throw Error(error);
   }
   const { committeeName, voterAddresses, highPrioritySendersConfig } = config;
+  const committee = governanceSourceSpecRegistry.committee;
+  const economicCommitteePath = await buildBundlePath(
+    import.meta.url,
+    committee,
+  );
   console.log(
     'Generating replace committee proposal with config',
     JSON.stringify({
@@ -125,10 +132,7 @@ export const defaultProposalBuilder = async ({ publishRef, install }, opts) => {
         voterAddresses,
         highPrioritySendersConfig,
         economicCommitteeRef: publishRef(
-          install(
-            '@agoric/governance/src/committee.js',
-            '../bundles/bundle-committee.js',
-          ),
+          install(committee.packagePath, economicCommitteePath),
         ),
       },
     ],

package/scripts/inter-protocol/updatePriceFeeds.js

@@ -1,5 +1,7 @@
 import { makeHelpers } from '@agoric/deploy-script-support';
+import { interProtocolBundleSpecs } from '@agoric/inter-protocol/source-spec-registry.js';
 import { getManifestForPriceFeeds } from '@agoric/inter-protocol/src/proposals/deploy-price-feeds.js';
+import { buildBundlePath } from '../lib/build-bundle.js';
 
 /**
  * @import {PriceFeedConfig} from '@agoric/inter-protocol/src/proposals/deploy-price-feeds.js';
@@ -69,6 +71,16 @@ export const defaultProposalBuilder = async ({ publishRef, install }, opts) => {
     throw Error(error);
   }
   const { oracleAddresses, inBrandNames, contractTerms } = config;
+  const priceAggregator = interProtocolBundleSpecs.priceAggregator;
+  const priceAggregatorPath = await buildBundlePath(
+    import.meta.url,
+    priceAggregator,
+  );
+  const scaledPriceAuthorityPath = await buildBundlePath(
+    import.meta.url,
+    '@agoric/zoe/src/contracts/scaledPriceAuthority.js',
+    'scaledPriceAuthority',
+  );
   console.log(
     'Generating price feeds update proposal with config',
     JSON.stringify({ oracleAddresses, inBrandNames, contractTerms }),
@@ -82,15 +94,12 @@ export const defaultProposalBuilder = async ({ publishRef, install }, opts) => {
         inBrandNames,
         contractTerms,
         priceAggregatorRef: publishRef(
-          install(
-            '@agoric/inter-protocol/src/price/fluxAggregatorContract.js',
-            '../bundles/bundle-fluxAggregatorKit.js',
-          ),
+          install(priceAggregator.packagePath, priceAggregatorPath),
         ),
         scaledPARef: publishRef(
           install(
             '@agoric/zoe/src/contracts/scaledPriceAuthority.js',
-            '../bundles/bundle-scaledPriceAuthority.js',
+            scaledPriceAuthorityPath,
           ),
         ),
       },

package/scripts/lib/build-bundle.js

@@ -0,0 +1,87 @@
+/* eslint-env node */
+import { dirname, resolve as pathResolve } from 'path';
+import { fileURLToPath } from 'url';
+
+import { unsafeMakeBundleCache } from '@agoric/swingset-vat/tools/bundleTool.js';
+
+/** @type {Map<string, Promise<Awaited<ReturnType<typeof unsafeMakeBundleCache>>>>} */
+const bundleCaches = new Map();
+/** @type {Map<string, Promise<string>>} */
+const bundlePathCache = new Map();
+
+/**
+ * @typedef {{
+ *   sourceSpec?: string;
+ *   packagePath?: string;
+ *   bundleName?: string;
+ * }} BundleRegistryEntry
+ */
+
+/**
+ * Build (or validate) a cached bundle and return the absolute pathname.
+ *
+ * @param {string} fromMetaUrl
+ * @param {string | BundleRegistryEntry} moduleSpecifierOrEntry
+ * @param {string} [bundleName]
+ * @param {{ bundleDirRel?: string }} [options]
+ */
+export const buildBundlePath = async (
+  fromMetaUrl,
+  moduleSpecifierOrEntry,
+  bundleName = undefined,
+  options = {},
+) => {
+  const { bundleDirRel = '../bundles' } = options;
+  const fromDir = dirname(fileURLToPath(fromMetaUrl));
+  /** @type {string | undefined} */
+  let sourceSpec;
+  /** @type {string | undefined} */
+  let resolvedBundleName;
+
+  if (typeof moduleSpecifierOrEntry === 'string') {
+    sourceSpec = fileURLToPath(import.meta.resolve(moduleSpecifierOrEntry));
+    if (typeof bundleName !== 'string') {
+      throw TypeError('bundleName is required when using a module specifier');
+    }
+    resolvedBundleName = bundleName;
+  } else {
+    const {
+      sourceSpec: sourceSpec0,
+      packagePath,
+      bundleName: entryBundleName,
+    } = /** @type {BundleRegistryEntry} */ (moduleSpecifierOrEntry);
+    sourceSpec =
+      sourceSpec0 ||
+      (packagePath && fileURLToPath(import.meta.resolve(packagePath)));
+    resolvedBundleName = entryBundleName;
+  }
+  if (!sourceSpec || !resolvedBundleName) {
+    throw TypeError(
+      'registry entry must provide sourceSpec/packagePath and bundleName',
+    );
+  }
+
+  const bundleDir = pathResolve(fromDir, bundleDirRel);
+  // Use '\0' to avoid ambiguity between key components.
+  const cacheKey = [bundleDir, sourceSpec, resolvedBundleName].join('\0');
+  const cached = bundlePathCache.get(cacheKey);
+  if (cached) {
+    return cached;
+  }
+
+  const bundlePathP = (async () => {
+    if (!bundleCaches.has(bundleDir)) {
+      bundleCaches.set(bundleDir, unsafeMakeBundleCache(bundleDir));
+    }
+    const bundleCacheP = bundleCaches.get(bundleDir);
+    assert(bundleCacheP, `missing bundle cache for ${bundleDir}`);
+    const bundleCache = await bundleCacheP;
+    const { bundleFileName } = await bundleCache.validateOrAdd(
+      sourceSpec,
+      resolvedBundleName,
+    );
+    return pathResolve(bundleDir, bundleFileName);
+  })();
+  bundlePathCache.set(cacheKey, bundlePathP);
+  return bundlePathP;
+};

package/scripts/pegasus/init-core.js

@@ -1,4 +1,5 @@
 import { makeHelpers } from '@agoric/deploy-script-support';
+import { buildBundlePath } from '../lib/build-bundle.js';
 
 /**
  * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
@@ -6,21 +7,24 @@ import { makeHelpers } from '@agoric/deploy-script-support';
  */
 
 /** @type {CoreEvalBuilder} */
-export const defaultProposalBuilder = async ({ publishRef, install }) =>
-  harden({
+export const defaultProposalBuilder = async ({ publishRef, install }) => {
+  const pegasusPath = await buildBundlePath(
+    import.meta.url,
+    '@agoric/pegasus/src/contract.js',
+    'pegasus',
+  );
+  return harden({
     sourceSpec: '@agoric/pegasus/src/proposals/core-proposal.js',
     getManifestCall: [
       'getManifestForPegasus',
       {
         pegasusRef: publishRef(
-          install(
-            '@agoric/pegasus/src/contract.js',
-            '../bundles/bundle-pegasus.js',
-          ),
+          install('@agoric/pegasus/src/contract.js', pegasusPath),
         ),
       },
     ],
   });
+};
 
 /** @type {DeployScriptFunction} */
 export default async (homeP, endowments) => {

package/scripts/smart-wallet/build-game1-start.js

@@ -7,6 +7,7 @@
 
 import { makeHelpers } from '@agoric/deploy-script-support';
 import { getManifestForGame1 } from '@agoric/smart-wallet/test/start-game1-proposal.js';
+import { buildBundlePath } from '../lib/build-bundle.js';
 
 /**
  * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
@@ -15,17 +16,20 @@ import { getManifestForGame1 } from '@agoric/smart-wallet/test/start-game1-propo
 
 /** @type {CoreEvalBuilder} */
 const game1ProposalBuilder = async ({ publishRef, install }) => {
+  const game1Path = await buildBundlePath(
+    import.meta.url,
+    '@agoric/smart-wallet/test/gameAssetContract.js',
+    'game1',
+  );
   return harden({
     sourceSpec: '@agoric/smart-wallet/test/start-game1-proposal.js',
     getManifestCall: [
       getManifestForGame1.name,
       {
         game1Ref: publishRef(
-          install(
-            '@agoric/smart-wallet/test/gameAssetContract.js',
-            '../bundles/bundle-game1.js',
-            { persist: true },
-          ),
+          install('@agoric/smart-wallet/test/gameAssetContract.js', game1Path, {
+            persist: true,
+          }),
         ),
       },
     ],

package/scripts/smart-wallet/build-walletFactory-upgrade.js

@@ -6,7 +6,9 @@
  */
 
 import { makeHelpers } from '@agoric/deploy-script-support';
+import { smartWalletSourceSpecRegistry } from '@agoric/smart-wallet/source-spec-registry.js';
 import { getManifestForUpgrade } from '@agoric/smart-wallet/src/proposals/upgrade-walletFactory-proposal.js';
+import { buildBundlePath } from '../lib/build-bundle.js';
 
 /**
  * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
@@ -15,6 +17,11 @@ import { getManifestForUpgrade } from '@agoric/smart-wallet/src/proposals/upgrad
 
 /** @type {CoreEvalBuilder} */
 export const defaultProposalBuilder = async ({ publishRef, install }) => {
+  const walletFactory = smartWalletSourceSpecRegistry.walletFactory;
+  const walletFactoryPath = await buildBundlePath(
+    import.meta.url,
+    walletFactory,
+  );
   return harden({
     sourceSpec:
       '@agoric/smart-wallet/src/proposals/upgrade-walletFactory-proposal.js',
@@ -22,11 +29,9 @@ export const defaultProposalBuilder = async ({ publishRef, install }) => {
       getManifestForUpgrade.name,
       {
         walletFactoryRef: publishRef(
-          install(
-            '@agoric/smart-wallet/src/walletFactory.js',
-            '../bundles/bundle-walletFactory.js',
-            { persist: true },
-          ),
+          install(walletFactory.packagePath, walletFactoryPath, {
+            persist: true,
+          }),
         ),
       },
     ],

package/scripts/vats/init-core.js

@@ -1,4 +1,7 @@
 import { makeHelpers } from '@agoric/deploy-script-support';
+import { interProtocolBundleSpecs } from '@agoric/inter-protocol/source-spec-registry.js';
+import { smartWalletSourceSpecRegistry } from '@agoric/smart-wallet/source-spec-registry.js';
+import { buildBundlePath } from '../lib/build-bundle.js';
 
 /**
  * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
@@ -6,29 +9,35 @@ import { makeHelpers } from '@agoric/deploy-script-support';
  */
 
 /** @type {CoreEvalBuilder} */
-export const defaultProposalBuilder = async ({ publishRef, install }) =>
-  harden({
+export const defaultProposalBuilder = async ({ publishRef, install }) => {
+  const provisionPool = interProtocolBundleSpecs.provisionPool;
+  const walletFactory = smartWalletSourceSpecRegistry.walletFactory;
+  const provisionPoolPath = await buildBundlePath(
+    import.meta.url,
+    provisionPool,
+  );
+  const walletFactoryPath = await buildBundlePath(
+    import.meta.url,
+    walletFactory,
+  );
+
+  return harden({
     sourceSpec: '@agoric/vats/src/core/startWalletFactory.js',
     getManifestCall: [
       'getManifestForWalletFactory',
       {
         installKeys: {
           provisionPool: publishRef(
-            install(
-              '@agoric/inter-protocol/src/provisionPool.js',
-              '../bundles/bundle-provisionPool.js',
-            ),
+            install(provisionPool.packagePath, provisionPoolPath),
           ),
           walletFactory: publishRef(
-            install(
-              '@agoric/smart-wallet/src/walletFactory.js',
-              '../../smart-wallet/bundles/bundle-walletFactory.js',
-            ),
+            install(walletFactory.packagePath, walletFactoryPath),
           ),
         },
       },
     ],
   });
+};
 
 /** @type {DeployScriptFunction} */
 export default async (homeP, endowments) => {

package/scripts/vats/priceFeedSupport.js

@@ -1,6 +1,8 @@
 /* global process */
 
+import { interProtocolBundleSpecs } from '@agoric/inter-protocol/source-spec-registry.js';
 import { DEFAULT_CONTRACT_TERMS } from '../inter-protocol/price-feed-core.js';
+import { buildBundlePath } from '../lib/build-bundle.js';
 
 /**
  * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
@@ -34,6 +36,12 @@ export const strictPriceFeedProposalBuilder = async (
   Array.isArray(IN_BRAND_LOOKUP) ||
     Fail`IN_BRAND_NAME array is required; got ${IN_BRAND_LOOKUP}`;
 
+  const priceAggregator = interProtocolBundleSpecs.priceAggregator;
+  const priceAggregatorPath = await buildBundlePath(
+    import.meta.url,
+    priceAggregator,
+  );
+
   return harden({
     sourceSpec: '@agoric/inter-protocol/src/proposals/price-feed-proposal.js',
     getManifestCall: [
@@ -47,10 +55,7 @@ export const strictPriceFeedProposalBuilder = async (
         OUT_BRAND_DECIMALS: 4,
         OUT_BRAND_NAME: 'USD',
         priceAggregatorRef: publishRef(
-          install(
-            '@agoric/inter-protocol/src/price/fluxAggregatorContract.js',
-            '../bundles/bundle-fluxAggregatorKit.js',
-          ),
+          install(priceAggregator.packagePath, priceAggregatorPath),
         ),
       },
     ],