@agoric/swingset-vat 0.32.3-dev-31ed402.0 → 0.32.3-dev-af6e3fd.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/swingset-vat",
-  "version": "0.32.3-dev-31ed402.0+31ed402",
+  "version": "0.32.3-dev-af6e3fd.0+af6e3fd",
   "description": "Vat/Container Launcher",
   "type": "module",
   "main": "src/index.js",
@@ -27,16 +27,16 @@
     "@types/yargs-parser": "^21.0.0"
   },
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-31ed402.0+31ed402",
-    "@agoric/internal": "0.3.3-dev-31ed402.0+31ed402",
-    "@agoric/store": "0.9.3-dev-31ed402.0+31ed402",
-    "@agoric/swing-store": "0.9.2-dev-31ed402.0+31ed402",
-    "@agoric/swingset-liveslots": "0.10.3-dev-31ed402.0+31ed402",
-    "@agoric/swingset-xsnap-supervisor": "0.10.3-dev-31ed402.0+31ed402",
-    "@agoric/time": "0.3.3-dev-31ed402.0+31ed402",
-    "@agoric/vat-data": "0.5.3-dev-31ed402.0+31ed402",
-    "@agoric/xsnap": "0.14.3-dev-31ed402.0+31ed402",
-    "@agoric/xsnap-lockdown": "0.14.1-dev-31ed402.0+31ed402",
+    "@agoric/assert": "0.6.1-dev-af6e3fd.0+af6e3fd",
+    "@agoric/internal": "0.3.3-dev-af6e3fd.0+af6e3fd",
+    "@agoric/store": "0.9.3-dev-af6e3fd.0+af6e3fd",
+    "@agoric/swing-store": "0.9.2-dev-af6e3fd.0+af6e3fd",
+    "@agoric/swingset-liveslots": "0.10.3-dev-af6e3fd.0+af6e3fd",
+    "@agoric/swingset-xsnap-supervisor": "0.10.3-dev-af6e3fd.0+af6e3fd",
+    "@agoric/time": "0.3.3-dev-af6e3fd.0+af6e3fd",
+    "@agoric/vat-data": "0.5.3-dev-af6e3fd.0+af6e3fd",
+    "@agoric/xsnap": "0.14.3-dev-af6e3fd.0+af6e3fd",
+    "@agoric/xsnap-lockdown": "0.14.1-dev-af6e3fd.0+af6e3fd",
     "@endo/base64": "^0.2.34",
     "@endo/bundle-source": "^2.7.0",
     "@endo/captp": "^3.1.4",
@@ -97,5 +97,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "31ed40207648bb76e2b37cb82dd068fb1837fdd8"
+  "gitHead": "af6e3fd0cdc9097fd2a3d9fbf8047184e0d9aa4b"
 }

package/src/lib/kmarshal.js

@@ -14,6 +14,85 @@ import { assert, Fail } from '@agoric/assert';
 
 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]
@@ -32,27 +111,7 @@ export const kslot = (kref, iface = 'undefined') => {
     kref.startsWith('lp') ||
     kref.startsWith('rp')
   ) {
-    // 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);
+    return makeStandinPromise(kref);
   } else {
     const o = Far(iface, {
       iface: () => iface,
@@ -69,16 +128,7 @@ export const kslot = (kref, iface = 'undefined') => {
 export const krefOf = obj => {
   switch (passStyleOf(obj)) {
     case 'promise': {
-      // Other half of Bizarro World hack for handling promises.  Note the
-      // peculiar way the @@toStringTag getter is used.
-      const desc = Object.getOwnPropertyDescriptor(obj, 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;
+      return getStandinPromiseTag(obj);
     }
     case 'remotable': {
       const getKref = obj.getKref;