@agoric/vats 0.15.2-dev-fbb1e85.0.fbb1e85 → 0.15.2-dev-486919f.0.486919f

package/package.json

@@ -1,13 +1,11 @@
 {
   "name": "@agoric/vats",
-  "version": "0.15.2-dev-fbb1e85.0.fbb1e85",
+  "version": "0.15.2-dev-486919f.0.486919f",
   "description": "Agoric's Vat library",
   "type": "module",
   "main": "./index.js",
   "repository": "https://github.com/Agoric/agoric-sdk",
   "scripts": {
-    "build": "yarn build:bundles",
-    "build:bundles": "node scripts/build-bundles.js",
     "prepack": "yarn run -T prepack-package",
     "postpack": "yarn run -T postpack-package",
     "test": "ava",
@@ -22,19 +20,19 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/cosmic-proto": "0.4.1-dev-fbb1e85.0.fbb1e85",
-    "@agoric/ertp": "0.16.3-dev-fbb1e85.0.fbb1e85",
-    "@agoric/governance": "0.10.4-dev-fbb1e85.0.fbb1e85",
-    "@agoric/internal": "0.3.3-dev-fbb1e85.0.fbb1e85",
-    "@agoric/network": "0.1.1-dev-fbb1e85.0.fbb1e85",
-    "@agoric/notifier": "0.6.3-dev-fbb1e85.0.fbb1e85",
-    "@agoric/store": "0.9.3-dev-fbb1e85.0.fbb1e85",
-    "@agoric/swingset-vat": "0.32.3-dev-fbb1e85.0.fbb1e85",
-    "@agoric/time": "0.3.3-dev-fbb1e85.0.fbb1e85",
-    "@agoric/vat-data": "0.5.3-dev-fbb1e85.0.fbb1e85",
-    "@agoric/vow": "0.1.1-dev-fbb1e85.0.fbb1e85",
-    "@agoric/zoe": "0.26.3-dev-fbb1e85.0.fbb1e85",
-    "@agoric/zone": "0.2.3-dev-fbb1e85.0.fbb1e85",
+    "@agoric/cosmic-proto": "0.4.1-dev-486919f.0.486919f",
+    "@agoric/ertp": "0.16.3-dev-486919f.0.486919f",
+    "@agoric/governance": "0.10.4-dev-486919f.0.486919f",
+    "@agoric/internal": "0.3.3-dev-486919f.0.486919f",
+    "@agoric/network": "0.1.1-dev-486919f.0.486919f",
+    "@agoric/notifier": "0.6.3-dev-486919f.0.486919f",
+    "@agoric/store": "0.9.3-dev-486919f.0.486919f",
+    "@agoric/swingset-vat": "0.32.3-dev-486919f.0.486919f",
+    "@agoric/time": "0.3.3-dev-486919f.0.486919f",
+    "@agoric/vat-data": "0.5.3-dev-486919f.0.486919f",
+    "@agoric/vow": "0.1.1-dev-486919f.0.486919f",
+    "@agoric/zoe": "0.26.3-dev-486919f.0.486919f",
+    "@agoric/zone": "0.2.3-dev-486919f.0.486919f",
     "@endo/errors": "^1.2.13",
     "@endo/far": "^1.1.14",
     "@endo/import-bundle": "^1.5.2",
@@ -47,7 +45,7 @@
     "jessie.js": "^0.3.4"
   },
   "devDependencies": {
-    "@agoric/swingset-liveslots": "0.10.3-dev-fbb1e85.0.fbb1e85",
+    "@agoric/swingset-liveslots": "0.10.3-dev-486919f.0.486919f",
     "@endo/bundle-source": "^4.1.2",
     "@endo/init": "^1.1.12",
     "ava": "^6.4.1",
@@ -57,6 +55,7 @@
     "CHANGELOG.md",
     "src/",
     "scripts/",
+    "source-spec-registry.*",
     "tools/",
     "index.*"
   ],
@@ -78,5 +77,5 @@
   "typeCoverage": {
     "atLeast": 90.6
   },
-  "gitHead": "fbb1e85663733915182c4f3480c8d16f6ec4b4f1"
+  "gitHead": "486919f1291219236846e56cb4544d24972302c4"
 }

package/source-spec-registry.d.ts

@@ -0,0 +1,115 @@
+export namespace vatsSourceSpecRegistry {
+    namespace bootChain {
+        let packagePath: string;
+        let sourceSpec: string;
+    }
+    namespace bootSim {
+        let packagePath_1: string;
+        export { packagePath_1 as packagePath };
+        let sourceSpec_1: string;
+        export { sourceSpec_1 as sourceSpec };
+    }
+    namespace vatAgoricNames {
+        let packagePath_2: string;
+        export { packagePath_2 as packagePath };
+        let sourceSpec_2: string;
+        export { sourceSpec_2 as sourceSpec };
+    }
+    namespace vatBank {
+        let packagePath_3: string;
+        export { packagePath_3 as packagePath };
+        let sourceSpec_3: string;
+        export { sourceSpec_3 as sourceSpec };
+    }
+    namespace vatBoard {
+        let packagePath_4: string;
+        export { packagePath_4 as packagePath };
+        let sourceSpec_4: string;
+        export { sourceSpec_4 as sourceSpec };
+    }
+    namespace vatBridge {
+        let packagePath_5: string;
+        export { packagePath_5 as packagePath };
+        let sourceSpec_5: string;
+        export { sourceSpec_5 as sourceSpec };
+    }
+    namespace centralSupply {
+        export let bundleName: string;
+        let packagePath_6: string;
+        export { packagePath_6 as packagePath };
+        let sourceSpec_6: string;
+        export { sourceSpec_6 as sourceSpec };
+    }
+    namespace mintHolder {
+        let bundleName_1: string;
+        export { bundleName_1 as bundleName };
+        let packagePath_7: string;
+        export { packagePath_7 as packagePath };
+        let sourceSpec_7: string;
+        export { sourceSpec_7 as sourceSpec };
+    }
+    namespace vatMints {
+        let packagePath_8: string;
+        export { packagePath_8 as packagePath };
+        let sourceSpec_8: string;
+        export { sourceSpec_8 as sourceSpec };
+    }
+    namespace vatPriceAuthority {
+        let packagePath_9: string;
+        export { packagePath_9 as packagePath };
+        let sourceSpec_9: string;
+        export { sourceSpec_9 as sourceSpec };
+    }
+    namespace vatProvisioning {
+        let packagePath_10: string;
+        export { packagePath_10 as packagePath };
+        let sourceSpec_10: string;
+        export { sourceSpec_10 as sourceSpec };
+    }
+    namespace vatZoe {
+        let packagePath_11: string;
+        export { packagePath_11 as packagePath };
+        let sourceSpec_11: string;
+        export { sourceSpec_11 as sourceSpec };
+    }
+}
+export function getVatsSourceSpec(name: keyof typeof vatsSourceSpecRegistry): {
+    packagePath: string;
+    sourceSpec: string;
+} | {
+    packagePath: string;
+    sourceSpec: string;
+} | {
+    packagePath: string;
+    sourceSpec: string;
+} | {
+    packagePath: string;
+    sourceSpec: string;
+} | {
+    packagePath: string;
+    sourceSpec: string;
+} | {
+    packagePath: string;
+    sourceSpec: string;
+} | {
+    bundleName: string;
+    packagePath: string;
+    sourceSpec: string;
+} | {
+    bundleName: string;
+    packagePath: string;
+    sourceSpec: string;
+} | {
+    packagePath: string;
+    sourceSpec: string;
+} | {
+    packagePath: string;
+    sourceSpec: string;
+} | {
+    packagePath: string;
+    sourceSpec: string;
+} | {
+    packagePath: string;
+    sourceSpec: string;
+};
+//# sourceMappingURL=source-spec-registry.d.ts.map

package/source-spec-registry.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"source-spec-registry.d.ts","sourceRoot":"","sources":["source-spec-registry.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAiEO,wCADK,MAAM,OAAO,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EACsB"}

package/source-spec-registry.js

@@ -0,0 +1,66 @@
+import { fileURLToPath } from 'url';
+
+/** @param {string} packagePath */
+const resolveSourceSpec = packagePath =>
+  fileURLToPath(import.meta.resolve(packagePath));
+
+/**
+ * Stable registry of `@agoric/vats` source specs used by configs and tests.
+ *
+ * The `packagePath` field is intended for static config validation.
+ */
+export const vatsSourceSpecRegistry = {
+  bootChain: {
+    packagePath: '@agoric/vats/src/core/boot-chain.js',
+    sourceSpec: resolveSourceSpec('@agoric/vats/src/core/boot-chain.js'),
+  },
+  bootSim: {
+    packagePath: '@agoric/vats/src/core/boot-sim.js',
+    sourceSpec: resolveSourceSpec('@agoric/vats/src/core/boot-sim.js'),
+  },
+  vatAgoricNames: {
+    packagePath: '@agoric/vats/src/vat-agoricNames.js',
+    sourceSpec: resolveSourceSpec('@agoric/vats/src/vat-agoricNames.js'),
+  },
+  vatBank: {
+    packagePath: '@agoric/vats/src/vat-bank.js',
+    sourceSpec: resolveSourceSpec('@agoric/vats/src/vat-bank.js'),
+  },
+  vatBoard: {
+    packagePath: '@agoric/vats/src/vat-board.js',
+    sourceSpec: resolveSourceSpec('@agoric/vats/src/vat-board.js'),
+  },
+  vatBridge: {
+    packagePath: '@agoric/vats/src/vat-bridge.js',
+    sourceSpec: resolveSourceSpec('@agoric/vats/src/vat-bridge.js'),
+  },
+  centralSupply: {
+    bundleName: 'centralSupply',
+    packagePath: '@agoric/vats/src/centralSupply.js',
+    sourceSpec: resolveSourceSpec('@agoric/vats/src/centralSupply.js'),
+  },
+  mintHolder: {
+    bundleName: 'mintHolder',
+    packagePath: '@agoric/vats/src/mintHolder.js',
+    sourceSpec: resolveSourceSpec('@agoric/vats/src/mintHolder.js'),
+  },
+  vatMints: {
+    packagePath: '@agoric/vats/src/vat-mints.js',
+    sourceSpec: resolveSourceSpec('@agoric/vats/src/vat-mints.js'),
+  },
+  vatPriceAuthority: {
+    packagePath: '@agoric/vats/src/vat-priceAuthority.js',
+    sourceSpec: resolveSourceSpec('@agoric/vats/src/vat-priceAuthority.js'),
+  },
+  vatProvisioning: {
+    packagePath: '@agoric/vats/src/vat-provisioning.js',
+    sourceSpec: resolveSourceSpec('@agoric/vats/src/vat-provisioning.js'),
+  },
+  vatZoe: {
+    packagePath: '@agoric/vats/src/vat-zoe.js',
+    sourceSpec: resolveSourceSpec('@agoric/vats/src/vat-zoe.js'),
+  },
+};
+
+/** @param {keyof typeof vatsSourceSpecRegistry} name */
+export const getVatsSourceSpec = name => vatsSourceSpecRegistry[name];

package/tools/boot-test-utils.d.ts

@@ -11,13 +11,8 @@ export namespace vatRoots {
 }
 export function noop(): void;
 export const mockDProxy: DProxy;
-export function makeMock(log: any): {
+export function makeMock(log: any): Promise<{
     devices: {
-        vatAdmin: {
-            getNamedBundleCap: (name: any) => {
-                getBundle: () => any;
-            };
-        };
         command: any;
         mailbox: any;
         timer: any;
@@ -69,12 +64,12 @@ export function makeMock(log: any): {
             makeLoopbackProtocolHandler: () => void;
         }>;
     };
-};
-export function makePopulatedFakeVatAdmin(): {
+}>;
+export function makePopulatedFakeVatAdmin(): Promise<{
     vatAdminService: any;
     vatAdminRoot: any;
-};
-export function mockSwingsetVats(mock: any): any;
+}>;
+export function mockSwingsetVats(mock: any): Promise<any>;
 import { buildRootObject as agoricNamesRoot } from '../src/vat-agoricNames.js';
 import { buildRootObject as bankRoot } from '../src/vat-bank.js';
 import { buildRootObject as boardRoot } from '../src/vat-board.js';

package/tools/boot-test-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"boot-test-utils.d.ts","sourceRoot":"","sources":["boot-test-utils.js"],"names":[],"mappings":";;;;;;;;;;;AAsCO,6BAAqB;AAE5B,yBAAqC,MAAM,CAAc;AAElD;;;;;;;iBAGmB,GAAG;iBACH,GAAG;eAGL,GAAG;gBACF,GAAG;;;eAIJ,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA4BvB;AAEG;;;EAmEN;AAEM,iDAON;mDApJkD,2BAA2B;4CAClC,oBAAoB;6CACnB,qBAAqB;2CACvB,mBAAmB;6CACjB,qBAAqB;+CACnB,uBAAuB;sDAChB,8BAA8B;oDAChC,4BAA4B;2CACrC,mBAAmB;4BAGtB,sBAAsB"}
+{"version":3,"file":"boot-test-utils.d.ts","sourceRoot":"","sources":["boot-test-utils.js"],"names":[],"mappings":";;;;;;;;;;;AAmCO,6BAAqB;AAE5B,yBAAqC,MAAM,CAAc;AAgDlD;;iBAImB,GAAG;iBACH,GAAG;eAGL,GAAG;gBACF,GAAG;;;eAIJ,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6B1B;AAEM;;;GAuEN;AAEM,0DAON;mDAxMkD,2BAA2B;4CAClC,oBAAoB;6CACnB,qBAAqB;2CACvB,mBAAmB;6CACjB,qBAAqB;+CACnB,uBAAuB;sDAChB,8BAA8B;oDAChC,4BAA4B;2CACrC,mBAAmB;4BAGtB,sBAAsB"}

package/tools/boot-test-utils.js

@@ -2,13 +2,10 @@ import { Fail } from '@endo/errors';
 import { E } from '@endo/far';
 import { Far } from '@endo/marshal';
 
-import {
-  makeFakeVatAdmin,
-  zcfBundleCap,
-} from '@agoric/zoe/tools/fakeVatAdmin.js';
 import { buildZoeManualTimer } from '@agoric/zoe/tools/manualTimer.js';
 import { makeScalarBigMapStore } from '@agoric/vat-data';
-import { bundles, devices } from '../test/devices.js';
+import { unsafeSharedBundleCache } from '@agoric/swingset-vat/tools/bundleTool.js';
+import { vatsSourceSpecRegistry } from '../source-spec-registry.js';
 
 import { buildRootObject as agoricNamesRoot } from '../src/vat-agoricNames.js';
 import { buildRootObject as bankRoot } from '../src/vat-bank.js';
@@ -40,8 +37,55 @@ export const noop = () => {};
 
 export const mockDProxy = /** @type {DProxy} */ (d => d);
 
-export const makeMock = log =>
-  harden({
+/** @type {Promise<typeof import('@agoric/zoe/tools/fakeVatAdmin.js')> | undefined} */
+let fakeVatAdminToolsP;
+const getFakeVatAdminTools = () => {
+  if (!fakeVatAdminToolsP) {
+    fakeVatAdminToolsP = import('@agoric/zoe/tools/fakeVatAdmin.js');
+  }
+  return fakeVatAdminToolsP;
+};
+
+/** @type {Promise<{bundles: Record<string, any>; devices: Record<string, any>}> | undefined} */
+let bootTestBundlesP;
+const getBootTestBundles = () => {
+  if (!bootTestBundlesP) {
+    bootTestBundlesP = (async () => {
+      const bundleCache = await unsafeSharedBundleCache;
+      const [centralSupply, mintHolder] = await Promise.all([
+        bundleCache.load(
+          vatsSourceSpecRegistry.centralSupply.sourceSpec,
+          vatsSourceSpecRegistry.centralSupply.bundleName,
+        ),
+        bundleCache.load(
+          vatsSourceSpecRegistry.mintHolder.sourceSpec,
+          vatsSourceSpecRegistry.mintHolder.bundleName,
+        ),
+      ]);
+      const bundles = harden({
+        centralSupply,
+        mintHolder,
+      });
+      const devices = harden({
+        vatAdmin: {
+          getNamedBundleCap: name => ({
+            getBundle: () => {
+              const bundle = bundles[name];
+              assert(bundle, `unknown bundle ${name}`);
+              return bundle;
+            },
+          }),
+        },
+      });
+      return harden({ bundles, devices });
+    })();
+  }
+  return bootTestBundlesP;
+};
+
+export const makeMock = async log => {
+  const { devices } = await getBootTestBundles();
+  return harden({
     devices: {
       command: /** @type {any} */ ({ registerInboundHandler: noop }),
       mailbox: /** @type {any} */ ({
@@ -81,12 +125,17 @@ export const makeMock = log =>
       }),
     },
   });
+};
 
-export const makePopulatedFakeVatAdmin = () => {
+export const makePopulatedFakeVatAdmin = async () => {
   // The .createVat() from zoe/tools/fakeVatAdmin.js only knows how to
   // make ZCF vats, so wrap it in a form that can create the other
   // vats too. We have two types.
 
+  const [{ bundles }, { makeFakeVatAdmin, zcfBundleCap }] = await Promise.all([
+    getBootTestBundles(),
+    getFakeVatAdminTools(),
+  ]);
   const fakeCapToName = new Map(); // cap -> name
   const fakeNameToCap = new Map(); // name -> cap
   const { admin: fakeVatAdmin, vatAdminState } = makeFakeVatAdmin();
@@ -151,8 +200,8 @@ export const makePopulatedFakeVatAdmin = () => {
   return { vatAdminService, vatAdminRoot };
 };
 
-export const mockSwingsetVats = mock => {
-  const { vatAdminRoot } = makePopulatedFakeVatAdmin();
+export const mockSwingsetVats = async mock => {
+  const { vatAdminRoot } = await makePopulatedFakeVatAdmin();
   const vats = {
     ...mock.vats,
     vatAdmin: vatAdminRoot,

package/scripts/build-bundles.d.ts

@@ -1,3 +0,0 @@
-#! /usr/bin/env node
-export {};
-//# sourceMappingURL=build-bundles.d.ts.map

package/scripts/build-bundles.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"build-bundles.d.ts","sourceRoot":"","sources":["build-bundles.js"],"names":[],"mappings":""}

package/scripts/build-bundles.js

@@ -1,19 +0,0 @@
-#! /usr/bin/env node
-import '@endo/init';
-import { createBundles } from '@agoric/internal/src/node/createBundles.js';
-import url from 'url';
-
-const dirname = url.fileURLToPath(new URL('.', import.meta.url));
-
-// TODO end inter-package filesystem references https://github.com/Agoric/agoric-sdk/issues/8178
-
-const sourceToBundle = [
-  ['@agoric/vats/src/centralSupply.js', '../bundles/bundle-centralSupply.js'],
-  ['@agoric/vats/src/mintHolder.js', '../bundles/bundle-mintHolder.js'],
-  [
-    '@agoric/inter-protocol/src/provisionPool.js',
-    '../bundles/bundle-provisionPool.js',
-  ],
-];
-
-await createBundles(sourceToBundle, dirname);