@agoric/swingset-liveslots 0.10.3-dev-8358d20.0 → 0.10.3-dev-5eb596e.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/swingset-liveslots",
-  "version": "0.10.3-dev-8358d20.0+8358d20",
+  "version": "0.10.3-dev-5eb596e.0+5eb596e",
   "description": "SwingSet ocap support layer",
   "type": "module",
   "main": "src/index.js",
@@ -17,10 +17,10 @@
     "lint:eslint": "eslint ."
   },
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-8358d20.0+8358d20",
-    "@agoric/internal": "0.3.3-dev-8358d20.0+8358d20",
-    "@agoric/store": "0.9.3-dev-8358d20.0+8358d20",
-    "@agoric/vat-data": "0.5.3-dev-8358d20.0+8358d20",
+    "@agoric/assert": "0.6.1-dev-5eb596e.0+5eb596e",
+    "@agoric/internal": "0.3.3-dev-5eb596e.0+5eb596e",
+    "@agoric/store": "0.9.3-dev-5eb596e.0+5eb596e",
+    "@agoric/vat-data": "0.5.3-dev-5eb596e.0+5eb596e",
     "@endo/eventual-send": "^0.17.3",
     "@endo/exo": "^0.2.3",
     "@endo/far": "^0.2.19",
@@ -61,5 +61,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8358d208a105af24bc267ba4ef928ca7ecf6a4e3"
+  "gitHead": "5eb596e63bf4d5b416d4eff187e87af366b34928"
 }

package/tools/fakeVirtualSupport.js

@@ -1,4 +1,4 @@
-/* global WeakRef */
+/* global globalThis */
 /* eslint-disable max-classes-per-file */
 import { makeMarshal } from '@endo/marshal';
 import { assert } from '@agoric/assert';
@@ -9,6 +9,14 @@ import { makeWatchedPromiseManager } from '../src/watchedPromises.js';
 import { makeFakeVirtualObjectManager } from './fakeVirtualObjectManager.js';
 import { makeFakeCollectionManager } from './fakeCollectionManager.js';
 
+const { Fail } = assert;
+
+const {
+  WeakRef: RealWeakRef,
+  WeakMap: RealWeakMap,
+  WeakSet: RealWeakSet,
+} = globalThis;
+
 class FakeFinalizationRegistry {
   // eslint-disable-next-line no-useless-constructor, no-empty-function
   constructor() {}
@@ -30,8 +38,6 @@ class FakeWeakRef {
   }
 }
 
-const RealWeakRef = WeakRef;
-
 export function makeFakeLiveSlotsStuff(options = {}) {
   let vrm;
   function setVrm(vrmToUse) {
@@ -45,6 +51,8 @@ export function makeFakeLiveSlotsStuff(options = {}) {
     log,
     FinalizationRegistry = FakeFinalizationRegistry,
     WeakRef = FakeWeakRef, // VRM uses this
+    WeakMap = RealWeakMap,
+    WeakSet = RealWeakSet,
     addToPossiblyDeadSet = () => {},
     addToPossiblyRetiredSet = () => {},
   } = options;
@@ -206,17 +214,23 @@ export function makeFakeLiveSlotsStuff(options = {}) {
       }
       return val;
     }
+    let result;
     if (virtual || durable) {
       if (vrm) {
         val = vrm.reanimate(slot);
         if (facet !== undefined) {
-          return vrm.getFacet(id, val, facet);
+          result = vrm.getFacet(id, val, facet);
         }
       } else {
         assert.fail('fake liveSlots stuff configured without vrm');
       }
     }
-    return val;
+    // eslint-disable-next-line no-use-before-define
+    registerEntry(baseRef, val, facet !== undefined);
+    if (!result) {
+      result = val;
+    }
+    return result;
   }
 
   const marshal = makeMarshal(convertValToSlot, convertSlotToVal, {
@@ -224,6 +238,9 @@ export function makeFakeLiveSlotsStuff(options = {}) {
   });
 
   function registerEntry(baseRef, val, valIsCohort) {
+    const { facet } = parseVatSlot(baseRef);
+    !facet ||
+      Fail`registerEntry(${baseRef} should not receive individual facets`;
     setValForSlot(baseRef, val);
     if (valIsCohort) {
       const { id } = parseVatSlot(baseRef);
@@ -264,6 +281,8 @@ export function makeFakeLiveSlotsStuff(options = {}) {
     deleteEntry,
     FinalizationRegistry,
     WeakRef,
+    WeakMap,
+    WeakSet,
     addToPossiblyDeadSet,
     addToPossiblyRetiredSet,
     dumpStore,
@@ -311,6 +330,10 @@ export function makeFakeWatchedPromiseManager(
  * @param {object} [options]
  * @param {number} [options.cacheSize]
  * @param {boolean} [options.relaxDurabilityRules]
+ * @param {Map<any, any>} [options.fakeStore]
+ * @param {WeakMapConstructor} [options.WeakMap]
+ * @param {WeakSetConstructor} [options.WeakSet]
+ * @param {boolean} [options.weak]
  */
 export function makeFakeVirtualStuff(options = {}) {
   const actualOptions = {