@agoric/zone 0.2.3-dev-129bb20.0 → 0.2.3-dev-4841c87.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/zone",
-  "version": "0.2.3-dev-129bb20.0+129bb20",
+  "version": "0.2.3-dev-4841c87.0+4841c87",
   "description": "Allocation zone abstraction for objects on the heap, persistent stores, etc.",
   "type": "module",
   "repository": "https://github.com/Agoric/agoric-sdk",
@@ -27,14 +27,14 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/base-zone": "0.1.1-dev-129bb20.0+129bb20",
-    "@agoric/vat-data": "0.5.3-dev-129bb20.0+129bb20",
+    "@agoric/base-zone": "0.1.1-dev-4841c87.0+4841c87",
+    "@agoric/vat-data": "0.5.3-dev-4841c87.0+4841c87",
     "@endo/errors": "^1.2.10",
     "@endo/far": "^1.1.11",
     "@endo/pass-style": "^1.5.0"
   },
   "devDependencies": {
-    "@agoric/swingset-vat": "0.32.3-dev-129bb20.0+129bb20",
+    "@agoric/swingset-vat": "0.32.3-dev-4841c87.0+4841c87",
     "@endo/patterns": "^1.5.0",
     "ava": "^5.3.0"
   },
@@ -57,5 +57,5 @@
   "typeCoverage": {
     "atLeast": 98.56
   },
-  "gitHead": "129bb208d14fe7b03fed190c8a507ed1c7269721"
+  "gitHead": "4841c8738923019bcbd3e4d41900381ba677d55f"
 }

package/test/exos.test.js

@@ -1,3 +1,4 @@
+import { M } from '@endo/patterns';
 import {
   annihilate,
   getBaggage,
@@ -123,3 +124,80 @@ test.serial('vatData migrate to durableZone', t => {
   const baggage2 = getBaggage();
   testSecondZoneIncarnation(t, makeDurableZone(baggage2));
 });
+
+test.serial('exoClass stateShape expansion', t => {
+  annihilate();
+
+  // See ../../swingset-liveslots/test/virtual-objects/state-shape.test.js
+  const stateShapeMismatch = { message: /stateShape mismatch/ };
+  const HolderI = M.interface('Holder', {
+    get: M.call().rest(M.arrayOf(M.string())).returns(M.record()),
+    set: M.call(M.record()).returns(),
+  });
+  const initHolder = fields => ({ ...fields });
+  const holderMethods = {
+    get(...fields) {
+      const { state } = this;
+      // We require fields to be explicit because they are currently defined on
+      // the state *prototype*.
+      return Object.fromEntries(
+        fields.flatMap(key => (key in state ? [[key, state[key]]] : [])),
+      );
+    },
+    set(fields) {
+      Object.assign(this.state, fields);
+    },
+  };
+  const prepareHolder = (zone, stateShape) =>
+    zone.exoClass('Holder', HolderI, initHolder, holderMethods, { stateShape });
+
+  const fields = ['foo', 'bar', 'baz']; // but "baz" is not initially present
+  const baggage1 = getBaggage();
+  const zone1 = makeDurableZone(baggage1);
+  const makeHolder1 = prepareHolder(zone1, {
+    foo: M.number(),
+    bar: M.number(),
+  });
+  const holder1 = makeHolder1({ foo: 0, bar: 1 });
+  t.deepEqual(holder1.get(...fields), { foo: 0, bar: 1 });
+  holder1.set({ foo: 2, bar: 2 });
+  t.deepEqual(holder1.get(...fields), { foo: 2, bar: 2 });
+  t.throws(() => makeHolder1({ foo: 0, bar: 1, baz: 2 }));
+  t.throws(() => makeHolder1({ foo: 0, bar: 'string' }));
+
+  nextLife();
+  t.throws(
+    () =>
+      prepareHolder(makeDurableZone(getBaggage()), {
+        foo: M.string(),
+        bar: M.number(),
+      }),
+    stateShapeMismatch,
+    'backwards-incompatible stateShape change',
+  );
+
+  nextLife();
+  t.throws(
+    () =>
+      prepareHolder(makeDurableZone(getBaggage()), {
+        foo: M.or(M.number(), M.string()),
+        bar: M.number(),
+        baz: M.or(undefined, M.number()),
+      }),
+    stateShapeMismatch,
+    'stateShape field value expansion (needs #7407)',
+  );
+
+  nextLife();
+  const baggage2 = getBaggage();
+  const zone2 = makeDurableZone(baggage2);
+  const makeHolder2 = prepareHolder(zone2, {
+    foo: M.number(),
+    bar: M.number(),
+    baz: M.or(undefined, M.number()),
+  });
+  const holder2 = makeHolder2({ foo: 0, bar: 1, baz: 2 });
+  t.deepEqual(holder2.get(...fields), { foo: 0, bar: 1, baz: 2 });
+  holder2.set({ foo: 2, bar: 2, baz: undefined });
+  t.deepEqual(holder2.get(...fields), { foo: 2, bar: 2, baz: undefined });
+});