@agoric/swingset-liveslots 0.10.3-dev-3e909dc.0 → 0.10.3-dev-d4b32f1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/swingset-liveslots",
-  "version": "0.10.3-dev-3e909dc.0+3e909dc",
+  "version": "0.10.3-dev-d4b32f1.0+d4b32f1",
   "description": "SwingSet ocap support layer",
   "type": "module",
   "main": "src/index.js",
@@ -17,9 +17,9 @@
     "lint:eslint": "eslint ."
   },
   "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/assert": "0.6.1-dev-d4b32f1.0+d4b32f1",
+    "@agoric/internal": "0.3.3-dev-d4b32f1.0+d4b32f1",
+    "@agoric/store": "0.9.3-dev-d4b32f1.0+d4b32f1",
     "@endo/eventual-send": "^0.17.5",
     "@endo/exo": "^0.2.5",
     "@endo/far": "^0.2.21",
@@ -31,6 +31,7 @@
     "@endo/promise-kit": "^0.2.59"
   },
   "devDependencies": {
+    "@agoric/kmarshal": "0.1.1-dev-d4b32f1.0+d4b32f1",
     "ava": "^5.3.0"
   },
   "files": [
@@ -66,5 +67,5 @@
   "typeCoverage": {
     "atLeast": 71.48
   },
-  "gitHead": "3e909dcf51841f5c062c6f31bc89cacae18394ff"
+  "gitHead": "d4b32f129868ed2faa32f1bcad51b5d2248d4c14"
 }

package/test/gc-helpers.js

@@ -2,7 +2,7 @@
 
 import { Far } from '@endo/marshal';
 import { M } from '@agoric/store';
-import { kslot, kser } from './kmarshal.js';
+import { kslot, kser } from '@agoric/kmarshal';
 import { parseVatSlot } from '../src/parseVatSlots.js';
 
 // These tests follow the model described in

package/test/liveslots-helpers.js

@@ -1,6 +1,7 @@
 /* global WeakRef, FinalizationRegistry */
-import engineGC from './engine-gc.js';
+import { kser } from '@agoric/kmarshal';
 
+import engineGC from './engine-gc.js';
 import { waitUntilQuiescent } from './waitUntilQuiescent.js';
 import { makeGcAndFinalize } from './gc-and-finalize.js';
 import { makeDummyMeterControl } from './dummyMeterControl.js';
@@ -12,7 +13,6 @@ import {
   makeRetireExports,
   makeBringOutYourDead,
 } from './util.js';
-import { kser } from './kmarshal.js';
 
 /**
  * @param {object} [options]

package/test/storeGC/test-lifecycle.js

@@ -1,12 +1,12 @@
 // @ts-nocheck
 import test from 'ava';
 
+import { kslot, kunser } from '@agoric/kmarshal';
 import {
   setupTestLiveslots,
   findSyscallsByType,
 } from '../liveslots-helpers.js';
 import { buildRootObject, mainHeldIdx, mapRef } from '../gc-helpers.js';
-import { kslot, kunser } from '../kmarshal.js';
 import { parseVatSlot } from '../../src/parseVatSlots.js';
 
 // These tests follow the model described in

package/test/storeGC/test-refcount-management.js

@@ -1,5 +1,6 @@
 import test from 'ava';
 
+import { kslot } from '@agoric/kmarshal';
 import {
   findSyscallsByType,
   setupTestLiveslots,
@@ -11,7 +12,6 @@ import {
   refValString,
   assertCollectionDeleted,
 } from '../gc-helpers.js';
-import { kslot } from '../kmarshal.js';
 import { vstr } from '../util.js';
 
 // These tests follow the model described in

package/test/storeGC/test-weak-key.js

@@ -1,5 +1,6 @@
 import test from 'ava';
 
+import { kslot } from '@agoric/kmarshal';
 import { setupTestLiveslots } from '../liveslots-helpers.js';
 import {
   buildRootObject,
@@ -7,7 +8,6 @@ import {
   assertCollectionDeleted,
   deduceCollectionID,
 } from '../gc-helpers.js';
-import { kslot } from '../kmarshal.js';
 import { vstr } from '../util.js';
 
 // These tests follow the model described in test-virtualObjectGC.js

package/test/test-baggage.js

@@ -1,9 +1,9 @@
 import test from 'ava';
 
 import { Far } from '@endo/marshal';
+import { kunser } from '@agoric/kmarshal';
 import { setupTestLiveslots } from './liveslots-helpers.js';
 import { vstr } from './util.js';
-import { kunser } from './kmarshal.js';
 import { parseVatSlot } from '../src/parseVatSlots.js';
 
 function buildRootObject(vatPowers, vatParameters, baggage) {

package/test/test-collection-schema-refcount.js

@@ -1,9 +1,9 @@
 import test from 'ava';
 
 import { Far } from '@endo/marshal';
+import { kser } from '@agoric/kmarshal';
 import { makeLiveSlots } from '../src/liveslots.js';
 import { parseVatSlot } from '../src/parseVatSlots.js';
-import { kser } from './kmarshal.js';
 import { buildSyscall } from './liveslots-helpers.js';
 import { makeStartVat, makeBringOutYourDead } from './util.js';
 import { makeMockGC } from './mock-gc.js';

package/test/test-collection-upgrade.js

@@ -1,10 +1,10 @@
 import test from 'ava';
 
 import { Far } from '@endo/marshal';
+import { kser } from '@agoric/kmarshal';
 import { M } from '@agoric/store';
 import { makeLiveSlots } from '../src/liveslots.js';
 import { parseVatSlot } from '../src/parseVatSlots.js';
-import { kser } from './kmarshal.js';
 import { buildSyscall } from './liveslots-helpers.js';
 import { makeStartVat } from './util.js';
 import { makeMockGC } from './mock-gc.js';

package/test/test-dropped-collection-weakrefs.js

@@ -1,7 +1,7 @@
 import test from 'ava';
 import { Far } from '@endo/marshal';
+import { kser } from '@agoric/kmarshal';
 import { makeLiveSlots } from '../src/liveslots.js';
-import { kser } from './kmarshal.js';
 import { buildSyscall } from './liveslots-helpers.js';
 import { makeStartVat } from './util.js';
 import { makeMockGC } from './mock-gc.js';

package/test/test-gc-sensitivity.js

@@ -1,9 +1,9 @@
 // @ts-nocheck
 import test from 'ava';
 import { Far } from '@endo/marshal';
+import { kser } from '@agoric/kmarshal';
 import { buildSyscall } from './liveslots-helpers.js';
 import { makeLiveSlots } from '../src/liveslots.js';
-import { kser } from './kmarshal.js';
 import { makeMockGC } from './mock-gc.js';
 import { makeMessage, makeStartVat } from './util.js';
 

package/test/test-handled-promises.js

@@ -7,7 +7,7 @@ import { makePromiseKit } from '@endo/promise-kit';
 // Disabled to avoid circular dependencies.
 // import { makeStoreUtils } from '@agoric/vat-data/src/vat-data-bindings.js';
 // import { makeExoUtils } from '@agoric/vat-data/src/exo-utils.js';
-import { kslot, kser } from './kmarshal.js';
+import { kslot, kser } from '@agoric/kmarshal';
 import { setupTestLiveslots } from './liveslots-helpers.js';
 import { makeResolve, makeReject } from './util.js';
 

package/test/test-initial-vrefs.js

@@ -1,9 +1,9 @@
 import test from 'ava';
 
 import { Far } from '@endo/far';
+import { kunser } from '@agoric/kmarshal';
 import { M } from '@agoric/store';
 import { setupTestLiveslots } from './liveslots-helpers.js';
-import { kunser } from './kmarshal.js';
 
 function buildRootObject(vatPowers, vatParameters, baggage) {
   const vd = vatPowers.VatData;

package/test/test-liveslots-mock-gc.js

@@ -2,9 +2,9 @@
 import test from 'ava';
 
 import { Far } from '@endo/marshal';
+import { kslot, kser } from '@agoric/kmarshal';
 import { makeLiveSlots } from '../src/liveslots.js';
 import { parseVatSlot } from '../src/parseVatSlots.js';
-import { kslot, kser } from './kmarshal.js';
 import { buildSyscall } from './liveslots-helpers.js';
 import {
   makeMessage,

package/test/test-liveslots-real-gc.js

@@ -4,9 +4,9 @@ import test from 'ava';
 
 import { Far } from '@endo/marshal';
 import { makePromiseKit } from '@endo/promise-kit';
+import { kslot, kser } from '@agoric/kmarshal';
 import engineGC from './engine-gc.js';
 import { makeGcAndFinalize } from './gc-and-finalize.js';
-import { kslot, kser } from './kmarshal.js';
 import { buildSyscall, makeDispatch } from './liveslots-helpers.js';
 import {
   makeMessage,

package/test/test-liveslots.js

@@ -5,9 +5,9 @@ import { E } from '@endo/eventual-send';
 import { Far } from '@endo/marshal';
 import { makePromiseKit } from '@endo/promise-kit';
 import { Fail } from '@agoric/assert';
+import { kslot, kser, kunser } from '@agoric/kmarshal';
 import { M } from '@agoric/store';
 import { makeLiveSlots, makeMarshaller } from '../src/liveslots.js';
-import { kslot, kser, kunser } from './kmarshal.js';
 import { buildSyscall, makeDispatch } from './liveslots-helpers.js';
 import { makeMessage, makeStartVat, makeResolve, makeReject } from './util.js';
 import { makeMockGC } from './mock-gc.js';

package/test/test-vpid-liveslots.js

@@ -3,11 +3,11 @@ import test from 'ava';
 
 import { E } from '@endo/eventual-send';
 import { makePromiseKit } from '@endo/promise-kit';
-import { Fail } from '@agoric/assert';
 import { Far } from '@endo/marshal';
+import { Fail } from '@agoric/assert';
+import { kser, kslot } from '@agoric/kmarshal';
 import { buildSyscall, makeDispatch } from './liveslots-helpers.js';
 import { makeMessage, makeResolve, makeReject } from './util.js';
-import { kser, kslot } from './kmarshal.js';
 
 function hush(p) {
   p.then(

package/test/util.js

@@ -1,5 +1,5 @@
+import { kser } from '@agoric/kmarshal';
 import { vstr } from './vat-util.js';
-import { kser } from './kmarshal.js';
 
 export { vstr };
 

package/test/vat-util.js

@@ -2,7 +2,7 @@
 // modules
 
 import { Fail } from '@agoric/assert';
-import { kser, kunser } from './kmarshal.js';
+import { kser, kunser } from '@agoric/kmarshal';
 
 export function extractMessage(vatDeliverObject) {
   const [type, ...vdoargs] = vatDeliverObject;

package/test/virtual-objects/test-kind-changes.js

@@ -1,10 +1,10 @@
 // @ts-nocheck
 import test from 'ava';
 import { Far } from '@endo/marshal';
+import { kser } from '@agoric/kmarshal';
 import { makeFakeVirtualStuff } from '../../tools/fakeVirtualSupport.js';
 import { makeLiveSlots } from '../../src/liveslots.js';
 import { parseVatSlot } from '../../src/parseVatSlots.js';
-import { kser } from '../kmarshal.js';
 import { buildSyscall } from '../liveslots-helpers.js';
 import { makeStartVat, makeMessage } from '../util.js';
 import { makeMockGC } from '../mock-gc.js';

package/test/virtual-objects/test-state-shape.js

@@ -2,9 +2,9 @@
 import test from 'ava';
 
 import { Far } from '@endo/marshal';
+import { kser, kslot } from '@agoric/kmarshal';
 import { M } from '@agoric/store';
 import { makeLiveSlots } from '../../src/liveslots.js';
-import { kser, kslot } from '../kmarshal.js';
 import { buildSyscall } from '../liveslots-helpers.js';
 import { makeStartVat, makeMessage } from '../util.js';
 import { makeMockGC } from '../mock-gc.js';

package/test/virtual-objects/test-virtualObjectGC.js

@@ -2,11 +2,11 @@
 import test from 'ava';
 
 import { Far } from '@endo/marshal';
+import { krefOf, kser, kslot } from '@agoric/kmarshal';
 import {
   setupTestLiveslots,
   findSyscallsByType,
 } from '../liveslots-helpers.js';
-import { krefOf, kser, kslot } from '../kmarshal.js';
 import { parseVatSlot } from '../../src/parseVatSlots.js';
 
 // Legs:

package/test/virtual-objects/test-virtualObjectManager.js

@@ -1,12 +1,12 @@
 // @ts-nocheck
 import test from 'ava';
 
+import { kser, kslot } from '@agoric/kmarshal';
 import {
   makeFakeVirtualObjectManager,
   makeFakeVirtualStuff,
 } from '../../tools/fakeVirtualSupport.js';
 
-import { kser, kslot } from '../kmarshal.js';
 import { vstr } from '../util.js';
 
 function initThing(label = 'thing', counter = 0) {

package/test/virtual-objects/test-vo-real-gc.js

@@ -3,7 +3,7 @@
 import test from 'ava';
 
 import { Far } from '@endo/marshal';
-import { kser, kunser } from '../kmarshal.js';
+import { kser, kunser } from '@agoric/kmarshal';
 import { setupTestLiveslots } from '../liveslots-helpers.js';
 
 test('virtual object state writes', async t => {

package/test/kmarshal.js

@@ -1,79 +0,0 @@
-import { Far, makeMarshal, passStyleOf } from '@endo/marshal';
-import { assert } 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.
-
-const refMap = new WeakMap();
-
-export const kslot = (kref, iface) => {
-  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')
-  ) {
-    // TODO: temporary hack 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 the overhead of a map to keep track of it
-    // with.  This behavior is in service of defense against a hypothesized
-    // security issue whose exact nature has largely been forgotton in the
-    // months since it was first encountered.  MarkM is currently researching
-    // what the problem was thought to have been, to see if it is real and to
-    // understand it if so.  This will eventually result in either changes to
-    // the smallcaps encoding or to the marshal setup API to support the purely
-    // manipulative use case.  In the meantime, this ugliness...
-    const p = new Promise(() => undefined);
-    refMap.set(p, kref);
-    return harden(p);
-  } else {
-    const o = Far(iface, {
-      iface: () => iface,
-      getKref: () => `${kref}`,
-    });
-    return o;
-  }
-};
-
-export const krefOf = obj => {
-  const fromMap = refMap.get(obj);
-  if (fromMap) {
-    return fromMap;
-  }
-  // 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 Far
-  // objects created by our kslot().
-  assert.equal(passStyleOf(obj), 'remotable', obj);
-  const getKref = obj.getKref;
-  assert.typeof(getKref, 'function');
-  return getKref();
-};
-
-const kmarshal = makeMarshal(krefOf, kslot, {
-  serializeBodyFormat: 'smallcaps',
-  errorTagging: 'off',
-});
-
-export const kser = value => kmarshal.serialize(harden(value));
-
-export const kunser = serializedValue => kmarshal.unserialize(serializedValue);
-
-export function makeError(message) {
-  assert.typeof(message, 'string');
-  return kser(Error(message));
-}