@agoric/swingset-vat 0.32.3-dev-c962ba0.0 → 0.32.3-dev-533d84a.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/swingset-vat",
-  "version": "0.32.3-dev-c962ba0.0+c962ba0",
+  "version": "0.32.3-dev-533d84a.0+533d84a",
   "description": "Vat/Container Launcher",
   "type": "module",
   "main": "src/index.js",
@@ -27,15 +27,15 @@
     "@types/yargs-parser": "^21.0.0"
   },
   "dependencies": {
-    "@agoric/internal": "0.3.3-dev-c962ba0.0+c962ba0",
-    "@agoric/kmarshal": "0.1.1-dev-c962ba0.0+c962ba0",
-    "@agoric/store": "0.9.3-dev-c962ba0.0+c962ba0",
-    "@agoric/swing-store": "0.9.2-dev-c962ba0.0+c962ba0",
-    "@agoric/swingset-liveslots": "0.10.3-dev-c962ba0.0+c962ba0",
-    "@agoric/swingset-xsnap-supervisor": "0.10.3-dev-c962ba0.0+c962ba0",
-    "@agoric/time": "0.3.3-dev-c962ba0.0+c962ba0",
-    "@agoric/vat-data": "0.5.3-dev-c962ba0.0+c962ba0",
-    "@agoric/xsnap-lockdown": "0.14.1-dev-c962ba0.0+c962ba0",
+    "@agoric/internal": "0.3.3-dev-533d84a.0+533d84a",
+    "@agoric/kmarshal": "0.1.1-dev-533d84a.0+533d84a",
+    "@agoric/store": "0.9.3-dev-533d84a.0+533d84a",
+    "@agoric/swing-store": "0.9.2-dev-533d84a.0+533d84a",
+    "@agoric/swingset-liveslots": "0.10.3-dev-533d84a.0+533d84a",
+    "@agoric/swingset-xsnap-supervisor": "0.10.3-dev-533d84a.0+533d84a",
+    "@agoric/time": "0.3.3-dev-533d84a.0+533d84a",
+    "@agoric/vat-data": "0.5.3-dev-533d84a.0+533d84a",
+    "@agoric/xsnap-lockdown": "0.14.1-dev-533d84a.0+533d84a",
     "@endo/base64": "^1.0.9",
     "@endo/bundle-source": "^4.0.0",
     "@endo/captp": "^4.4.5",
@@ -102,5 +102,5 @@
   "typeCoverage": {
     "atLeast": 76.47
   },
-  "gitHead": "c962ba0771022947027b9bd76339a3ab21406b20"
+  "gitHead": "533d84a756c981bd973def6437b9f05aa732caa3"
 }

package/src/controller/upgradeSwingset.js

@@ -285,11 +285,9 @@ export const upgradeSwingset = kernelStorage => {
 
     const buggyKPIDs = []; // [kpid, vatID]
     for (const vatID of allVatIDs) {
-      const prefix = `${vatID}.c.`;
-      const len = prefix.length;
       const ckpPrefix = `${vatID}.c.kp`;
-      for (const key of enumeratePrefixedKeys(kvStore, ckpPrefix)) {
-        const kpid = key.slice(len);
+      for (const { suffix } of enumeratePrefixedKeys(kvStore, ckpPrefix)) {
+        const kpid = `kp${suffix}`;
         if (isSettled(kpid)) {
           const n = notifies.get(kpid);
           if (!n || !n.includes(vatID)) {

package/src/kernel/state/deviceKeeper.js

@@ -189,11 +189,12 @@ export function makeDeviceKeeper(kvStore, deviceID, tools) {
     /** @type {Array<[string, string, string]>} */
     const res = [];
     const prefix = `${deviceID}.c.`;
-    for (const k of enumeratePrefixedKeys(kvStore, prefix)) {
-      const slot = k.slice(prefix.length);
+    const prefixedKeys = enumeratePrefixedKeys(kvStore, prefix);
+
+    for (const { key, suffix: slot } of prefixedKeys) {
       if (!slot.startsWith('k')) {
         const devSlot = slot;
-        const kernelSlot = kvStore.get(k);
+        const kernelSlot = kvStore.get(key);
         res.push([kernelSlot, deviceID, devSlot]);
       }
     }

package/src/kernel/state/kernelKeeper.js

@@ -212,9 +212,8 @@ function insistMeterID(m) {
 export const getAllStaticVats = kvStore => {
   const result = [];
   const prefix = 'vat.name.';
-  for (const k of enumeratePrefixedKeys(kvStore, prefix)) {
-    const vatID = kvStore.get(k) || Fail`getNextKey ensures get`;
-    const name = k.slice(prefix.length);
+  for (const { key, suffix: name } of enumeratePrefixedKeys(kvStore, prefix)) {
+    const vatID = kvStore.get(key) || Fail`getNextKey ensures get`;
     result.push([name, vatID]);
   }
   return result;
@@ -718,17 +717,22 @@ export default function makeKernelKeeper(
     // We iterate through all ephemeral and virtual entries so the kernel
     // can ensure that they are abandoned by a vat being upgraded.
     const prefix = `${vatID}.c.`;
-    const ephStart = `${prefix}o+`;
-    const durStart = `${prefix}o+d`;
-    const virStart = `${prefix}o+v`;
+    const ephStart = `o+`;
+    const durStart = `o+d`;
+    const virStart = `o+v`;
     /** @type {[string, string?][]} */
     const ranges = [[ephStart, durStart], [virStart]];
     for (const range of ranges) {
-      for (const k of enumeratePrefixedKeys(kvStore, ...range)) {
-        const vref = k.slice(prefix.length);
+      const rangeSuffix = range[0];
+      const args = /** @type {typeof ranges[0]} */ (
+        /** @type {unknown} */ (range.map(s => `${prefix}${s}`))
+      );
+      const prefixedKeys = enumeratePrefixedKeys(kvStore, ...args);
+      for (const { key, suffix } of prefixedKeys) {
+        const vref = `${rangeSuffix}${suffix}`;
         // exclude the root object, which is replaced by upgrade
         if (vref !== 'o+0') {
-          const kref = kvStore.get(k);
+          const kref = kvStore.get(key);
           assert.typeof(kref, 'string');
           yield { kref, vref };
         }
@@ -1072,7 +1076,7 @@ export default function makeKernelKeeper(
 
     // first, scan for exported objects, which must be orphaned
     remaining = budget.exports ?? budget.default;
-    for (const k of enumeratePrefixedKeys(kvStore, exportPrefix)) {
+    for (const { key } of enumeratePrefixedKeys(kvStore, exportPrefix)) {
       // The void for an object exported by a vat will always be of the form
       // `o+NN`.  The '+' means that the vat exported the object (rather than
       // importing it) and therefore the object is owned by (i.e., within) the
@@ -1080,9 +1084,7 @@ export default function makeKernelKeeper(
       // begin with `vMM.c.o+`.  In addition to deleting the c-list entry, we
       // must also delete the corresponding kernel owner entry for the object,
       // since the object will no longer be accessible.
-      const vref = stripPrefix(clistPrefix, k);
-      assert(vref.startsWith('o+'), vref);
-      const kref = kvStore.get(k);
+      const kref = kvStore.get(key);
       // note: adds to maybeFreeKrefs, deletes c-list and .owner
       orphanKernelObject(kref, vatID);
       work.exports += 1;
@@ -1094,11 +1096,14 @@ export default function makeKernelKeeper(
 
     // then scan for imported objects, which must be decrefed
     remaining = budget.imports ?? budget.default;
-    for (const k of enumeratePrefixedKeys(kvStore, importPrefix)) {
+    for (const { key, suffix } of enumeratePrefixedKeys(
+      kvStore,
+      importPrefix,
+    )) {
       // abandoned imports: delete the clist entry as if the vat did a
       // drop+retire
-      const kref = kvStore.get(k) || Fail`getNextKey ensures get`;
-      const vref = stripPrefix(clistPrefix, k);
+      const kref = kvStore.get(key) || Fail`getNextKey ensures get`;
+      const vref = `o-${suffix}`;
       undertaker.deleteCListEntry(kref, vref);
       // that will also delete both db keys
       work.imports += 1;
@@ -1113,9 +1118,12 @@ export default function makeKernelKeeper(
     // kpids are still present in the dead vat's c-list. Clean those
     // up now.
     remaining = budget.promises ?? budget.default;
-    for (const k of enumeratePrefixedKeys(kvStore, promisePrefix)) {
-      const kref = kvStore.get(k) || Fail`getNextKey ensures get`;
-      const vref = stripPrefix(clistPrefix, k);
+    for (const { key, suffix } of enumeratePrefixedKeys(
+      kvStore,
+      promisePrefix,
+    )) {
+      const kref = kvStore.get(key) || Fail`getNextKey ensures get`;
+      const vref = `p${suffix}`;
       undertaker.deleteCListEntry(kref, vref);
       // that will also delete both db keys
       work.promises += 1;
@@ -1127,8 +1135,8 @@ export default function makeKernelKeeper(
 
     // now loop back through everything and delete it all
     remaining = budget.kv ?? budget.default;
-    for (const k of enumeratePrefixedKeys(kvStore, `${vatID}.`)) {
-      kvStore.delete(k);
+    for (const { key } of enumeratePrefixedKeys(kvStore, `${vatID}.`)) {
+      kvStore.delete(key);
       work.kv += 1;
       remaining -= 1;
       if (remaining <= 0) {
@@ -1167,11 +1175,11 @@ export default function makeKernelKeeper(
       kvStore.set(DYNAMIC_IDS_KEY, JSON.stringify(newDynamicVatIDs));
     } else {
       kdebug(`removing static vat ${vatID}`);
-      for (const k of enumeratePrefixedKeys(kvStore, 'vat.name.')) {
-        if (kvStore.get(k) === vatID) {
-          kvStore.delete(k);
+      const prefixedKeys = enumeratePrefixedKeys(kvStore, 'vat.name.');
+      for (const { key, suffix: name } of prefixedKeys) {
+        if (kvStore.get(key) === vatID) {
+          kvStore.delete(key);
           const VAT_NAMES_KEY = 'vat.names';
-          const name = k.slice('vat.name.'.length);
           const oldStaticVatNames = JSON.parse(getRequired(VAT_NAMES_KEY));
           const newStaticVatNames = oldStaticVatNames.filter(v => v !== name);
           kvStore.set(VAT_NAMES_KEY, JSON.stringify(newStaticVatNames));
@@ -1240,7 +1248,7 @@ export default function makeKernelKeeper(
   function* enumeratePromisesByDecider(vatID) {
     insistVatID(vatID);
     const promisePrefix = `${vatID}.c.p`;
-    for (const k of enumeratePrefixedKeys(kvStore, promisePrefix)) {
+    for (const { key } of enumeratePrefixedKeys(kvStore, promisePrefix)) {
       // The vpid for a promise imported or exported by a vat (and thus
       // potentially a promise for which the vat *might* be the decider) will
       // always be of the form `p+NN` or `p-NN`.  The corresponding vpid->kpid
@@ -1250,7 +1258,7 @@ export default function makeKernelKeeper(
       // whether the vat is the decider or not.  If it is, we add the promise
       // to the list of promises that must be rejected because the dead vat
       // will never be able to act upon them.
-      const kpid = getRequired(k);
+      const kpid = getRequired(key);
       const p = getKernelPromise(kpid);
       if (p.state === 'unresolved' && p.decider === vatID) {
         yield [kpid, p];
@@ -1449,9 +1457,9 @@ export default function makeKernelKeeper(
 
   function getDevices() {
     const result = [];
-    for (const k of enumeratePrefixedKeys(kvStore, 'device.name.')) {
-      const name = k.slice(12);
-      const deviceID = kvStore.get(k) || Fail`getNextKey ensures get`;
+    const prefixedKeys = enumeratePrefixedKeys(kvStore, 'device.name.');
+    for (const { key, suffix: name } of prefixedKeys) {
+      const deviceID = kvStore.get(key) || Fail`getNextKey ensures get`;
       result.push([name, deviceID]);
     }
     return result;

package/src/kernel/state/storageHelper.js

@@ -13,7 +13,8 @@ import { Fail } from '@endo/errors';
  * @param {KVStore} kvStore
  * @param {string} prefix
  * @param {string} [exclusiveEnd]
- * @yields {string} the next key with the prefix that is not >= exclusiveEnd
+ * @yields {{key: string; suffix: string}} the next `key` with the prefix that is not >= exclusiveEnd
+ * and the `suffix` which is obtained by stripping the supplied prefix from the key
  */
 export function* enumeratePrefixedKeys(kvStore, prefix, exclusiveEnd) {
   /** @type {string | undefined} */
@@ -26,7 +27,7 @@ export function* enumeratePrefixedKeys(kvStore, prefix, exclusiveEnd) {
     if (exclusiveEnd && key >= exclusiveEnd) {
       break;
     }
-    yield key;
+    yield { key, suffix: key.slice(prefix.length) };
   }
 }
 harden(enumeratePrefixedKeys);

package/src/kernel/state/vatKeeper.js

@@ -761,11 +761,13 @@ export function makeVatKeeper(
   function dumpState() {
     const res = [];
     const prefix = `${vatID}.c.`;
-    for (const k of enumeratePrefixedKeys(kvStore, prefix)) {
-      const slot = k.slice(prefix.length);
+    for (const { key, suffix: slot } of enumeratePrefixedKeys(
+      kvStore,
+      prefix,
+    )) {
       if (!slot.startsWith('k')) {
         const vatSlot = slot;
-        const kernelSlot = kvStore.get(k) || Fail`getNextKey ensures get`;
+        const kernelSlot = kvStore.get(key) || Fail`getNextKey ensures get`;
         /** @type { [string, string, string] } */
         const item = [kernelSlot, vatID, vatSlot];
         res.push(item);