@agoric/vats 0.15.2-dev-aa6629d.0.aa6629d → 0.15.2-dev-f212cfd.0.f212cfd

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/vats",
-  "version": "0.15.2-dev-aa6629d.0.aa6629d",
+  "version": "0.15.2-dev-f212cfd.0.f212cfd",
   "description": "Agoric's Vat library",
   "type": "module",
   "main": "./index.js",
@@ -22,19 +22,19 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/cosmic-proto": "0.4.1-dev-aa6629d.0.aa6629d",
-    "@agoric/ertp": "0.16.3-dev-aa6629d.0.aa6629d",
-    "@agoric/governance": "0.10.4-dev-aa6629d.0.aa6629d",
-    "@agoric/internal": "0.3.3-dev-aa6629d.0.aa6629d",
-    "@agoric/network": "0.1.1-dev-aa6629d.0.aa6629d",
-    "@agoric/notifier": "0.6.3-dev-aa6629d.0.aa6629d",
-    "@agoric/store": "0.9.3-dev-aa6629d.0.aa6629d",
-    "@agoric/swingset-vat": "0.32.3-dev-aa6629d.0.aa6629d",
-    "@agoric/time": "0.3.3-dev-aa6629d.0.aa6629d",
-    "@agoric/vat-data": "0.5.3-dev-aa6629d.0.aa6629d",
-    "@agoric/vow": "0.1.1-dev-aa6629d.0.aa6629d",
-    "@agoric/zoe": "0.26.3-dev-aa6629d.0.aa6629d",
-    "@agoric/zone": "0.2.3-dev-aa6629d.0.aa6629d",
+    "@agoric/cosmic-proto": "0.4.1-dev-f212cfd.0.f212cfd",
+    "@agoric/ertp": "0.16.3-dev-f212cfd.0.f212cfd",
+    "@agoric/governance": "0.10.4-dev-f212cfd.0.f212cfd",
+    "@agoric/internal": "0.3.3-dev-f212cfd.0.f212cfd",
+    "@agoric/network": "0.1.1-dev-f212cfd.0.f212cfd",
+    "@agoric/notifier": "0.6.3-dev-f212cfd.0.f212cfd",
+    "@agoric/store": "0.9.3-dev-f212cfd.0.f212cfd",
+    "@agoric/swingset-vat": "0.32.3-dev-f212cfd.0.f212cfd",
+    "@agoric/time": "0.3.3-dev-f212cfd.0.f212cfd",
+    "@agoric/vat-data": "0.5.3-dev-f212cfd.0.f212cfd",
+    "@agoric/vow": "0.1.1-dev-f212cfd.0.f212cfd",
+    "@agoric/zoe": "0.26.3-dev-f212cfd.0.f212cfd",
+    "@agoric/zone": "0.2.3-dev-f212cfd.0.f212cfd",
     "@endo/errors": "^1.2.13",
     "@endo/far": "^1.1.14",
     "@endo/import-bundle": "^1.5.2",
@@ -47,7 +47,7 @@
     "jessie.js": "^0.3.4"
   },
   "devDependencies": {
-    "@agoric/swingset-liveslots": "0.10.3-dev-aa6629d.0.aa6629d",
+    "@agoric/swingset-liveslots": "0.10.3-dev-f212cfd.0.f212cfd",
     "@endo/bundle-source": "^4.1.2",
     "@endo/init": "^1.1.12",
     "ava": "^5.3.0",
@@ -79,5 +79,5 @@
   "typeCoverage": {
     "atLeast": 90.22
   },
-  "gitHead": "aa6629dd5d80a450843e2916ff9507265610503f"
+  "gitHead": "f212cfdd1987748d593ba731f0a9e837065ce0a6"
 }

package/tools/bootstrap-chain-reflective.js

@@ -116,6 +116,63 @@ export const buildRootObject = (vatPowers, bootstrapParameters, baggage) => {
 
   const reflectionMethods = makeReflectionMethods(vatPowers, baggage);
 
+  /**
+   * @param {string} bundleIdOrName
+   * @returns {Promise<import('@agoric/swingset-vat').BundleCap>}
+   */
+  const getBundleCapByIdOrName = bundleIdOrName =>
+    bundleIdOrName.startsWith('b1-')
+      ? E(vatAdminP).getBundleCap(bundleIdOrName)
+      : E(vatAdminP).getNamedBundleCap(bundleIdOrName);
+
+  /**
+   * @template BundleIdentifier
+   * @callback CreateVat
+   * @param {string} vatName
+   * @param {BundleIdentifier} bundleIdentifier
+   * @param {{ vatParameters?: object } & Record<string, unknown>} [vatOptions]
+   * @returns {Promise<DynamicVatRecord['root']>} root object of the new vat
+   */
+
+  /** @type {CreateVat<import('@agoric/swingset-vat').BundleCap>} */
+  const createVat = async (vatName, bundleCap, vatOptions = {}) => {
+    const { root, adminNode } = await E(vatAdminP).createVat(bundleCap, {
+      vatParameters: {},
+      ...vatOptions,
+    });
+    vatRecords.set(vatName, { root, adminNode, bundleCap });
+    return root;
+  };
+
+  /**
+   * @template BundleIdentifier
+   * @callback UpgradeVat
+   * @param {string} vatName
+   * @param {BundleIdentifier} bundleIdentifier
+   * @param {{ vatParameters?: object } & Record<string, unknown>} [vatOptions]
+   * @returns {Promise<number>} the resulting incarnation number
+   */
+
+  /**
+   * @type {UpgradeVat<
+   *   import('@agoric/swingset-vat').BundleCap | undefined
+   * >}
+   */
+  const upgradeVat = async (vatName, bundleCap, vatOptions = {}) => {
+    const vatRecord = /** @type {DynamicVatRecord} */ (
+      vatRecords.get(vatName) || Fail`unknown vat name: ${q(vatName)}`
+    );
+    vatRecord.adminNode ||
+      Fail`no adminNode for vat ${q(vatName)}; is it static?`;
+    const upgradeOptions = { vatParameters: {}, ...vatOptions };
+    const { incarnationNumber } = await E(vatRecord.adminNode).upgrade(
+      bundleCap || vatRecord.bundleCap,
+      upgradeOptions,
+    );
+    vatRecord.incarnationNumber = incarnationNumber;
+    return incarnationNumber;
+  };
+
   return Far('root', {
     ...reflectionMethods,
 
@@ -157,42 +214,49 @@ export const buildRootObject = (vatPowers, bootstrapParameters, baggage) => {
       return root;
     },
 
-    /**
-     * @param {string} vatName
-     * @param {string} [bundleCapName]
-     * @param {{ vatParameters?: object } & Record<string, unknown>} [vatOptions]
-     * @returns {Promise<DynamicVatRecord['root']>} root object of the new vat
-     */
-    createVat: async (vatName, bundleCapName = vatName, vatOptions = {}) => {
-      const bundleCap = await E(vatAdminP).getNamedBundleCap(bundleCapName);
-      const { root, adminNode } = await E(vatAdminP).createVat(bundleCap, {
-        vatParameters: {},
-        ...vatOptions,
-      });
-      vatRecords.set(vatName, { root, adminNode, bundleCap });
-      return root;
+    /** @type {CreateVat<string>} */
+    createVatByBundleID: async (vatName, bundleID, vatOptions) => {
+      const bundleCap = await E(vatAdminP).getBundleCap(bundleID);
+      return createVat(vatName, bundleCap, vatOptions);
+    },
+
+    /** @type {CreateVat<string | undefined>} */
+    createVatByBundleName: async (
+      vatName,
+      bundleName = vatName,
+      vatOptions,
+    ) => {
+      const bundleCap = await E(vatAdminP).getNamedBundleCap(bundleName);
+      return createVat(vatName, bundleCap, vatOptions);
+    },
+
+    /** @type {CreateVat<string | undefined>} */
+    createVat: async (vatName, bundleIdOrName = vatName, vatOptions) => {
+      const bundleCap = await getBundleCapByIdOrName(bundleIdOrName);
+      return createVat(vatName, bundleCap, vatOptions);
+    },
+
+    /** @type {UpgradeVat<string | undefined>} */
+    upgradeVatByBundleID: async (vatName, bundleID, vatOptions) => {
+      vatRecords.has(vatName) || Fail`unknown vat name: ${q(vatName)}`;
+      const bundleCap = await (bundleID && E(vatAdminP).getBundleCap(bundleID));
+      return upgradeVat(vatName, bundleCap, vatOptions);
+    },
+
+    /** @type {UpgradeVat<string | undefined>} */
+    upgradeVatByBundleName: async (vatName, bundleName, vatOptions) => {
+      vatRecords.has(vatName) || Fail`unknown vat name: ${q(vatName)}`;
+      const bundleCap = await (bundleName &&
+        E(vatAdminP).getNamedBundleCap(bundleName));
+      return upgradeVat(vatName, bundleCap, vatOptions);
     },
 
-    /**
-     * @param {string} vatName
-     * @param {string} [bundleCapName]
-     * @param {{ vatParameters?: object } & Record<string, unknown>} [vatOptions]
-     * @returns {Promise<number>} the resulting incarnation number
-     */
-    upgradeVat: async (vatName, bundleCapName, vatOptions = {}) => {
-      const vatRecord = /** @type {DynamicVatRecord} */ (
-        vatRecords.get(vatName) || Fail`unknown vat name: ${q(vatName)}`
-      );
-      const bundleCap = await (bundleCapName
-        ? E(vatAdminP).getNamedBundleCap(bundleCapName)
-        : vatRecord.bundleCap);
-      const upgradeOptions = { vatParameters: {}, ...vatOptions };
-      const { incarnationNumber } = await E(vatRecord.adminNode).upgrade(
-        bundleCap,
-        upgradeOptions,
-      );
-      vatRecord.incarnationNumber = incarnationNumber;
-      return incarnationNumber;
+    /** @type {UpgradeVat<string | undefined>} */
+    upgradeVat: async (vatName, bundleIdOrName, vatOptions) => {
+      vatRecords.has(vatName) || Fail`unknown vat name: ${q(vatName)}`;
+      const bundleCap = await (bundleIdOrName &&
+        getBundleCapByIdOrName(bundleIdOrName));
+      return upgradeVat(vatName, bundleCap, vatOptions);
     },
   });
 };