@agoric/swingset-vat 0.32.3-dev-3e909dc.0 → 0.32.3-dev-a1dd248.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/swingset-vat",
-  "version": "0.32.3-dev-3e909dc.0+3e909dc",
+  "version": "0.32.3-dev-a1dd248.0+a1dd248",
   "description": "Vat/Container Launcher",
   "type": "module",
   "main": "src/index.js",
@@ -27,16 +27,17 @@
     "@types/yargs-parser": "^21.0.0"
   },
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-3e909dc.0+3e909dc",
-    "@agoric/internal": "0.3.3-dev-3e909dc.0+3e909dc",
-    "@agoric/store": "0.9.3-dev-3e909dc.0+3e909dc",
-    "@agoric/swing-store": "0.9.2-dev-3e909dc.0+3e909dc",
-    "@agoric/swingset-liveslots": "0.10.3-dev-3e909dc.0+3e909dc",
-    "@agoric/swingset-xsnap-supervisor": "0.10.3-dev-3e909dc.0+3e909dc",
-    "@agoric/time": "0.3.3-dev-3e909dc.0+3e909dc",
-    "@agoric/vat-data": "0.5.3-dev-3e909dc.0+3e909dc",
-    "@agoric/xsnap": "0.14.3-dev-3e909dc.0+3e909dc",
-    "@agoric/xsnap-lockdown": "0.14.1-dev-3e909dc.0+3e909dc",
+    "@agoric/assert": "0.6.1-dev-a1dd248.0+a1dd248",
+    "@agoric/internal": "0.3.3-dev-a1dd248.0+a1dd248",
+    "@agoric/kmarshal": "0.1.1-dev-a1dd248.0+a1dd248",
+    "@agoric/store": "0.9.3-dev-a1dd248.0+a1dd248",
+    "@agoric/swing-store": "0.9.2-dev-a1dd248.0+a1dd248",
+    "@agoric/swingset-liveslots": "0.10.3-dev-a1dd248.0+a1dd248",
+    "@agoric/swingset-xsnap-supervisor": "0.10.3-dev-a1dd248.0+a1dd248",
+    "@agoric/time": "0.3.3-dev-a1dd248.0+a1dd248",
+    "@agoric/vat-data": "0.5.3-dev-a1dd248.0+a1dd248",
+    "@agoric/xsnap": "0.14.3-dev-a1dd248.0+a1dd248",
+    "@agoric/xsnap-lockdown": "0.14.1-dev-a1dd248.0+a1dd248",
     "@endo/base64": "^0.2.34",
     "@endo/bundle-source": "^2.7.0",
     "@endo/captp": "^3.1.4",
@@ -100,5 +101,5 @@
   "typeCoverage": {
     "atLeast": 75.26
   },
-  "gitHead": "3e909dcf51841f5c062c6f31bc89cacae18394ff"
+  "gitHead": "a1dd248f1dc5a770760e7520660ca9d4d7f442aa"
 }

package/src/controller/controller.js

@@ -20,7 +20,7 @@ import engineGC from '@agoric/internal/src/lib-nodejs/engine-gc.js';
 import { startSubprocessWorker } from '@agoric/internal/src/lib-nodejs/spawnSubprocessWorker.js';
 import { waitUntilQuiescent } from '@agoric/internal/src/lib-nodejs/waitUntilQuiescent.js';
 import { makeGcAndFinalize } from '@agoric/internal/src/lib-nodejs/gc-and-finalize.js';
-import { kslot, krefOf } from '../lib/kmarshal.js';
+import { kslot, krefOf } from '@agoric/kmarshal';
 import { insistStorageAPI } from '../lib/storageAPI.js';
 import {
   buildKernelBundle,

package/src/controller/initializeKernel.js

@@ -3,9 +3,9 @@
 import { makeMarshal } from '@endo/marshal';
 import { Far } from '@endo/far';
 import { assert, Fail } from '@agoric/assert';
+import { kser, kunser } from '@agoric/kmarshal';
 import { assertKnownOptions } from '../lib/assertOptions.js';
 import { insistVatID } from '../lib/id.js';
-import { kser, kunser } from '../lib/kmarshal.js';
 import { makeVatSlot } from '../lib/parseVatSlots.js';
 import { insistStorageAPI } from '../lib/storageAPI.js';
 import { makeVatOptionRecorder } from '../lib/recordVatOptions.js';

package/src/devices/vat-admin/device-vat-admin.js

@@ -1,8 +1,8 @@
 import { Nat } from '@endo/nat';
 import { assert } from '@agoric/assert';
+import { kunser } from '@agoric/kmarshal';
 import { buildSerializationTools } from '../lib/deviceTools.js';
 import { insistVatID } from '../../lib/id.js';
-import { kunser } from '../../lib/kmarshal.js';
 
 /*
 

package/src/kernel/kernel.js

@@ -2,9 +2,9 @@ import { assert, Fail } from '@agoric/assert';
 import { isNat } from '@endo/nat';
 import { importBundle } from '@endo/import-bundle';
 import { makeUpgradeDisconnection } from '@agoric/internal/src/upgrade-api.js';
+import { kser, kslot, makeError } from '@agoric/kmarshal';
 import { assertKnownOptions } from '../lib/assertOptions.js';
 import { foreverPolicy } from '../lib/runPolicies.js';
-import { kser, kslot, makeError } from '../lib/kmarshal.js';
 import { makeVatManagerFactory } from './vat-loader/manager-factory.js';
 import { makeVatWarehouse } from './vat-warehouse.js';
 import makeDeviceManager from './deviceManager.js';

package/src/kernel/kernelQueue.js

@@ -1,8 +1,8 @@
+import { kser } from '@agoric/kmarshal';
 import { insistKernelType, parseKernelSlot } from './parseKernelSlots.js';
 import { insistCapData } from '../lib/capdata.js';
 import { insistMessage } from '../lib/message.js';
 import { insistVatID } from '../lib/id.js';
-import { kser } from '../lib/kmarshal.js';
 
 /**
  * @param {object} tools

package/src/kernel/notifyTermination.js

@@ -1,5 +1,5 @@
+import { kunser } from '@agoric/kmarshal';
 import { insistCapData } from '../lib/capdata.js';
-import { kunser } from '../lib/kmarshal.js';
 
 /**
  * @param {string} vatID

package/src/kernel/vat-admin-hooks.js

@@ -1,6 +1,6 @@
 import { assert } from '@agoric/assert';
+import { kser, kunser } from '@agoric/kmarshal';
 import { insistVatID } from '../lib/id.js';
-import { kser, kunser } from '../lib/kmarshal.js';
 
 export function makeVatAdminHooks(tools) {
   const { kernelKeeper, terminateVat } = tools;

package/src/lib/capdata.js

@@ -1,6 +1,6 @@
 import { Fail } from '@agoric/assert';
 import { passStyleOf } from '@endo/far';
-import { kunser, krefOf } from './kmarshal.js';
+import { kunser, krefOf } from '@agoric/kmarshal';
 
 /* eslint-disable jsdoc/require-returns-check */
 /**

package/src/lib/makeUndeliverableError.js

@@ -11,7 +11,7 @@
 // "data is not callable" error is kind of unique to the way swingset handles
 // references, so we create a distinct error message.
 
-import { kunser, kser } from './kmarshal.js';
+import { kunser, kser } from '@agoric/kmarshal';
 
 export function makeUndeliverableError(methargs) {
   const method = kunser(methargs)[0];

package/src/vats/comms/controller.js

@@ -1,6 +1,6 @@
 import { Nat } from '@endo/nat';
 import { assert, Fail } from '@agoric/assert';
-import { kser, kunser, kslot, krefOf } from '../../lib/kmarshal.js';
+import { kser, kunser, kslot, krefOf } from '@agoric/kmarshal';
 
 // deliverToController() is used for local vats which want to talk to us as a
 // vat, rather than as a conduit to talk to remote vats. The bootstrap

package/src/vats/comms/delivery.js

@@ -1,12 +1,12 @@
 /* eslint-disable no-use-before-define */
 
 import { assert, Fail } from '@agoric/assert';
+import { kser } from '@agoric/kmarshal';
 import { parseLocalSlot, insistLocalType } from './parseLocalSlots.js';
 import { makeUndeliverableError } from '../../lib/makeUndeliverableError.js';
 import { extractSingleSlot, insistCapData } from '../../lib/capdata.js';
 import { insistRemoteType } from './parseRemoteSlot.js';
 import { insistRemoteID } from './remote.js';
-import { kser } from '../../lib/kmarshal.js';
 
 export function makeDeliveryKit(
   state,

package/src/vats/comms/dispatch.js

@@ -1,10 +1,10 @@
 import { assert, Fail } from '@agoric/assert';
+import { kser, kunser } from '@agoric/kmarshal';
 import { makeVatSlot } from '../../lib/parseVatSlots.js';
 import { insistMessage } from '../../lib/message.js';
 import { makeState } from './state.js';
 import { deliverToController } from './controller.js';
 import { insistCapData } from '../../lib/capdata.js';
-import { kser, kunser } from '../../lib/kmarshal.js';
 
 import { makeCListKit } from './clist.js';
 import { makeDeliveryKit } from './delivery.js';

package/src/lib/kmarshal.js

@@ -1,165 +0,0 @@
-import { Far, passStyleOf } from '@endo/far';
-import { makeMarshal } from '@endo/marshal';
-import { assert, Fail } from '@agoric/assert';
-
-// Simple wrapper for serializing and unserializing marshalled values inside the
-// kernel, where we don't actually want to use clists nor actually allocate real
-// objects, but instead to stay entirely within the domain of krefs.  This is
-// used to enable syntactic manipulation of serialized values while remaining
-// agnostic about the internal details of the serialization encoding.
-
-/**
- * @typedef {{getKref: () => string, iface: () => string} | Promise} KCap
- */
-
-const { toStringTag } = Symbol;
-
-const makeStringStandinPromise = kref => {
-  const p = Promise.resolve(`${kref} stand in`);
-  // eslint-disable-next-line @typescript-eslint/no-floating-promises
-  Object.defineProperty(p, toStringTag, {
-    value: kref,
-    enumerable: false,
-  });
-  return harden(p);
-};
-
-const getStringStandinPromiseTag = p => {
-  const desc = Object.getOwnPropertyDescriptor(p, toStringTag);
-  assert(desc !== undefined, 'promise lacks own @@toStringTag property');
-  const kref = desc.value;
-  assert.typeof(kref, 'string');
-  return kref;
-};
-
-const makeAccessorStandinPromise = kref => {
-  // TODO This Bizarro world hack is only for the version of Endo that
-  // agoric-sdk currently depends on, and is already inconsistent with
-  // the "current" endo. Once agoric-sdk depends only on the next endo,
-  // we should delete this code, and rename `makeStringStandinPromise`
-  // above to `makeStandinPromise`.
-  //
-  // Bizarro World hack for attaching a string property to a Promise, courtesy
-  // of MarkM.  Even though the @@toStringTag property nominally *is* a
-  // string, some unfortunate stuff in our hardened JS safety checks blows up
-  // if it actually is.  Eventually that will be fixed and we'll be able to
-  // use the @@toStringTag property directly, but for now we need to use this
-  // weird construct employing a sneaky getter function.  Note that this is
-  // only necessary in the first place because smallcaps encodes promise
-  // references differently from remotable object references, and the current
-  // version of the smallcaps decoder annoyingly insists that if the encoded
-  // body string says a slot is a promise, then convertSlotToVal had better by
-  // damn return an actual Promise, even if, as in the intended use case here,
-  // we neither want nor need a promise nor are capable of making any use of
-  // the fact that it is one.
-  const p = Promise.resolve(`${kref} stand in`);
-  // Bizarro World makes eslint hallucinate
-  // eslint-disable-next-line @typescript-eslint/no-floating-promises
-  Object.defineProperty(p, toStringTag, {
-    get: reveal => (reveal ? kref : NaN),
-    enumerable: false,
-  });
-  return harden(p);
-};
-
-const getAccessorStandinPromiseTag = p => {
-  // Other half of Bizarro World hack for handling promises.  Note the
-  // peculiar way the @@toStringTag getter is used.
-  const desc = Object.getOwnPropertyDescriptor(p, toStringTag);
-  assert(desc !== undefined, 'promise lacks toStringTag getter');
-
-  const getter = desc.get;
-  assert.typeof(getter, 'function', 'toStringTag getter is not a function');
-  // @ts-expect-error violates the norm that getters have zero parameters
-  const kref = getter(true);
-  assert.typeof(kref, 'string');
-  return kref;
-};
-
-const [makeStandinPromise, getStandinPromiseTag] = (() => {
-  // Use whatever works
-  try {
-    const p = makeStringStandinPromise('string mascot');
-    assert(passStyleOf(p) === 'promise');
-    return [makeStringStandinPromise, getStringStandinPromiseTag];
-  } catch (_1) {
-    try {
-      const p = makeAccessorStandinPromise('accessor mascot');
-      assert(passStyleOf(p) === 'promise');
-      return [makeAccessorStandinPromise, getAccessorStandinPromiseTag];
-    } catch (_2) {
-      throw Error('One of the promise tagging schemes should have worked');
-    }
-  }
-})();
-
-/**
- * @param {string} kref
- * @param {string} [iface]
- * @returns {import('@endo/eventual-send').ERef<KCap>}
- */
-export const kslot = (kref, iface = 'undefined') => {
-  assert.typeof(kref, 'string');
-  if (iface && iface.startsWith('Alleged: ')) {
-    // Encoder prepends "Alleged: " to iface string, but the decoder doesn't strip it
-    // Unclear whether it's the decoder or me who is wrong
-    iface = iface.slice(9);
-  }
-  if (
-    kref.startsWith('p') ||
-    kref.startsWith('kp') ||
-    kref.startsWith('lp') ||
-    kref.startsWith('rp')
-  ) {
-    return makeStandinPromise(kref);
-  } else {
-    const o = Far(iface, {
-      iface: () => iface,
-      getKref: () => `${kref}`,
-    });
-    return o;
-  }
-};
-
-/**
- * @param {any} obj
- * @returns {string}
- */
-export const krefOf = obj => {
-  switch (passStyleOf(obj)) {
-    case 'promise': {
-      return getStandinPromiseTag(obj);
-    }
-    case 'remotable': {
-      const getKref = obj.getKref;
-      assert.typeof(getKref, 'function', 'object lacks getKref function');
-      return getKref();
-    }
-    default:
-      // When krefOf() is called as part of kmarshal.serialize, marshal
-      // will only give it things that are 'remotable' (Promises and the
-      // Far objects created by kslot()).  When krefOf() is called by
-      // kernel code (as part of extractSingleSlot() or the vat-comms
-      // equivalent), it ought to throw if 'obj' is not one of the
-      // objects created by our kslot().
-      return Fail`krefOf requires a promise or remotable`;
-  }
-};
-
-const kmarshal = makeMarshal(krefOf, kslot, {
-  serializeBodyFormat: 'smallcaps',
-  errorTagging: 'off',
-});
-
-export const kser = value => kmarshal.serialize(harden(value));
-
-/**
- * @param {import('@endo/marshal').CapData<string>} serializedValue
- * @returns {any}
- */
-export const kunser = serializedValue => kmarshal.unserialize(serializedValue);
-
-export function makeError(message) {
-  assert.typeof(message, 'string');
-  return kser(Error(message));
-}