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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/vats",
-  "version": "0.15.2-dev-ff43ad7.0.ff43ad7",
+  "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-ff43ad7.0.ff43ad7",
-    "@agoric/ertp": "0.16.3-dev-ff43ad7.0.ff43ad7",
-    "@agoric/governance": "0.10.4-dev-ff43ad7.0.ff43ad7",
-    "@agoric/internal": "0.3.3-dev-ff43ad7.0.ff43ad7",
-    "@agoric/network": "0.1.1-dev-ff43ad7.0.ff43ad7",
-    "@agoric/notifier": "0.6.3-dev-ff43ad7.0.ff43ad7",
-    "@agoric/store": "0.9.3-dev-ff43ad7.0.ff43ad7",
-    "@agoric/swingset-vat": "0.32.3-dev-ff43ad7.0.ff43ad7",
-    "@agoric/time": "0.3.3-dev-ff43ad7.0.ff43ad7",
-    "@agoric/vat-data": "0.5.3-dev-ff43ad7.0.ff43ad7",
-    "@agoric/vow": "0.1.1-dev-ff43ad7.0.ff43ad7",
-    "@agoric/zoe": "0.26.3-dev-ff43ad7.0.ff43ad7",
-    "@agoric/zone": "0.2.3-dev-ff43ad7.0.ff43ad7",
+    "@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-ff43ad7.0.ff43ad7",
+    "@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": "ff43ad7f3e41278b882097f4eb3cb2f62c02cb3e"
+  "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);
     },
   });
 };

package/tools/ibc-utils.d.ts

@@ -16,19 +16,21 @@
  *   IBCConnectionID, IBCPortID} from '../src/types.js';
  * @import {Endpoint} from '@agoric/network';
  */
+/**
+ * @typedef {object} IBCEndpoint
+ * @property {IBCConnectionID[]} hops
+ * @property {IBCPortID} portID
+ * @property {IBCChannelOrdering} [order]
+ * @property {string} [version]
+ * @property {IBCChannelID} [channelID]
+ */
 export const IBC_ADDR_RE: RegExp;
 export const VALID_ORDERS: readonly ["ordered", "unordered", "ORDERED", "UNORDERED"];
 export function encodeSlashes(raw: string): string;
 export function decodeSlashes(encoded: string): string;
 export function validateIbcAddress(addr: any): any;
 export function decodeIbcHops(h: string): IBCConnectionID[];
-export function decodeIbcEndpoint(addr: string): {
-    hops: IBCConnectionID[];
-    portID: IBCPortID;
-    order?: IBCChannelOrdering;
-    version?: string;
-    channelID?: IBCChannelID;
-};
+export function decodeIbcEndpoint(addr: string): IBCEndpoint;
 export function encodeIbcEndpoint({ hops, portID, order: rawOrder, version, channelID, }: {
     hops?: string[] | undefined;
     portID: string;
@@ -61,9 +63,15 @@ export function encodeRemoteIbcAddress(hops: string[], portID: string, order: "o
 export function encodeLocalIbcAddress(portID: string, order: "ordered" | "unordered" | "ORDERED" | "UNORDERED", version: string): string;
 export type RemoteIbcAddress = `/${string}ibc-port/${string}/${"ordered" | "unordered"}/${string}`;
 export type LocalIbcAddress = `/ibc-port/${string}`;
+export type IBCEndpoint = {
+    hops: IBCConnectionID[];
+    portID: IBCPortID;
+    order?: IBCChannelOrdering | undefined;
+    version?: string | undefined;
+    channelID?: `channel-${number}` | undefined;
+};
 import type { IBCConnectionID } from '../src/types.js';
-import type { IBCPortID } from '../src/types.js';
-import type { IBCChannelOrdering } from '../src/types.js';
-import type { IBCChannelID } from '../src/types.js';
 import type { Endpoint } from '@agoric/network';
+import type { IBCChannelOrdering } from '../src/types.js';
+import type { IBCPortID } from '../src/types.js';
 //# sourceMappingURL=ibc-utils.d.ts.map

package/tools/ibc-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ibc-utils.d.ts","sourceRoot":"","sources":["ibc-utils.js"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,sGAAsG;AACtG,uDAAuD;AAEvD;;;;GAIG;AAEH,iCACsJ;AAGtJ,qFAKG;AAII,mCADK,MAAM,UAC8C;AAIzD,uCADK,MAAM,UACsD;AAGjE,mDASN;AAQM,iCAHI,MAAM,GACJ,eAAe,EAAE,CAsB7B;AAaM,wCATI,MAAM,GACJ;IACR,IAAI,EAAE,eAAe,EAAE,CAAC;IACxB,MAAM,EAAE,SAAS,CAAC;IAClB,KAAK,CAAC,EAAE,kBAAkB,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,YAAY,CAAC;CAC1B,CAkBH;AAYM,0FAPJ;IAAwB,IAAI;IACP,MAAM,EAAnB,MAAM;IACkD,KAAK,EAA7D,SAAS,GAAG,WAAW,GAAG,SAAS,GAAG,WAAW;IACpC,OAAO,EAApB,MAAM;IACQ,SAAS;CAC/B,GAAU,QAAQ,CAwCpB;;;;;;;AAIE,qDACQ,MAAM,gBACN,SAAS,GAAG,KAAK,GACf,OAAO,CACnB;;;;;;;AAEE,qDACQ,MAAM,eACN,IAAI,GACF,gBAAgB,CAC5B;AA0BM,mDADK,MAAM;;;;;EAYjB;AAOM,6CAHI,eAAe,GACb,MAAM,CAqBlB;AAWM,6CAPI,MAAM,EAAE,UACR,MAAM,SACN,SAAS,GAAG,WAAW,GAAG,SAAS,GAAG,WAAW,WACjD,MAAM,cACN,MAAM,GACJ,gBAAgB,CAiB5B;AAQM,8CAJI,MAAM,SACN,SAAS,GAAG,WAAW,GAAG,SAAS,GAAG,WAAW,WACjD,MAAM,UAIhB;+BAlQa,IAAI,MAAM,YAAY,MAAM,IAAI,SAAS,GAAG,WAAW,IAAI,MAAM,EAAE;8BACnE,aAAa,MAAM,EAAE;qCAIG,iBAAiB;+BAAjB,iBAAiB;wCAAjB,iBAAiB;kCAAjB,iBAAiB;8BAC5B,iBAAiB"}
+{"version":3,"file":"ibc-utils.d.ts","sourceRoot":"","sources":["ibc-utils.js"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,sGAAsG;AACtG,uDAAuD;AAEvD;;;;GAIG;AAEH;;;;;;;GAOG;AAEH,iCACsJ;AAGtJ,qFAKG;AAII,mCADK,MAAM,UAC8C;AAIzD,uCADK,MAAM,UACsD;AAGjE,mDASN;AAQM,iCAHI,MAAM,GACJ,eAAe,EAAE,CAsB7B;AAOM,wCAHI,MAAM,GACJ,WAAW,CAkBvB;AAYM,0FAPJ;IAAwB,IAAI;IACP,MAAM,EAAnB,MAAM;IACkD,KAAK,EAA7D,SAAS,GAAG,WAAW,GAAG,SAAS,GAAG,WAAW;IACpC,OAAO,EAApB,MAAM;IACQ,SAAS;CAC/B,GAAU,QAAQ,CAwCpB;;;;;;;AAIE,qDACQ,MAAM,gBACN,SAAS,GAAG,KAAK,GACf,OAAO,CACnB;;;;;;;AAEE,qDACQ,MAAM,eACN,IAAI,GACF,gBAAgB,CAC5B;AA0BM,mDADK,MAAM;;;;;EAYjB;AAOM,6CAHI,eAAe,GACb,MAAM,CAqBlB;AAWM,6CAPI,MAAM,EAAE,UACR,MAAM,SACN,SAAS,GAAG,WAAW,GAAG,SAAS,GAAG,WAAW,WACjD,MAAM,cACN,MAAM,GACJ,gBAAgB,CAiB5B;AAQM,8CAJI,MAAM,SACN,SAAS,GAAG,WAAW,GAAG,SAAS,GAAG,WAAW,WACjD,MAAM,UAIhB;+BArQa,IAAI,MAAM,YAAY,MAAM,IAAI,SAAS,GAAG,WAAW,IAAI,MAAM,EAAE;8BACnE,aAAa,MAAM,EAAE;;UAUrB,eAAe,EAAE;YACjB,SAAS;;;;;qCAPe,iBAAiB;8BAC5B,iBAAiB;wCADN,iBAAiB;+BAAjB,iBAAiB"}

package/tools/ibc-utils.js

@@ -19,6 +19,15 @@
  * @import {Endpoint} from '@agoric/network';
  */
 
+/**
+ * @typedef {object} IBCEndpoint
+ * @property {IBCConnectionID[]} hops
+ * @property {IBCPortID} portID
+ * @property {IBCChannelOrdering} [order]
+ * @property {string} [version]
+ * @property {IBCChannelID} [channelID]
+ */
+
 export const IBC_ADDR_RE =
   /^(?<hops>\/ibc-hop\/[^/]+)*\/ibc-port\/(?<portID>[^/]+)(\/(?<order>ordered|unordered)\/(?<version>[^/]+)(\/ibc-channel\/(?<channelID>[^/]+))?)?$/s;
 harden(IBC_ADDR_RE);
@@ -81,13 +90,7 @@ harden(decodeIbcHops);
 
 /**
  * @param {string} addr
- * @returns {{
- *   hops: IBCConnectionID[];
- *   portID: IBCPortID;
- *   order?: IBCChannelOrdering;
- *   version?: string;
- *   channelID?: IBCChannelID;
- * }}
+ * @returns {IBCEndpoint}
  */
 export const decodeIbcEndpoint = addr => {
   const match = validateIbcAddress(addr);