fix(swingset): initializeStoreKindInfo() earlier, unconditionally

The liveslots "collection manager" assigns a virtual-object Kind ID to
each of the collection types it supports. Currently there are 8: (weak
vs strong) times (map vs set) times (virtual vs durable). These Kind
IDs live in the same numberspace as the virtual/durable Kinds that
userspace creates by calling `defineKind` or `defineDurableKind`. This
numberspace is also used for Export IDs, the `o+NN` values assigned to
exported Remotables.

Previously, the Kind IDs for the collections were allocated on-demand,
the first time anybody created a collection. The IDs they got could
vary, depend upon whether userspace created a collection first, or
used `defineKind` first. This also changed when we introduced
"baggage" (which is a durable collection, created by liveslots
itself).

This commit moves the allocation step: it is now done unconditionally
during startVat(), before userspace gets control. This should make the
allocated IDs more consistent across all vats.

This should behave correctly when we add new kinds of Stores in the
future: when the vat is upgraded to a new liveslots, it will read the
existing IDs from the DB, add any new ones, then write the updated
table back to the DB.

As a side-effect of this change, *all* vats now have kvStore keys to
record the IDs, not just the once which use collections. And the first
Export ID allocated after startup (either an object export or a Kind
definition) will get a different ID: instead of `o+1`, it is likely to
be `o+9`. Several unit tests needed to be updated as a result, however
now they won't have to be updated further if e.g. `startVat` changes
to create collections before userspace runs.

packages/SwingSet/src/liveslots/collectionManager.js

@@ -31,7 +31,6 @@ export function makeCollectionManager(
 ) {
   const storeKindIDToName = new Map();
 
-  let storeKindInfoNeedsInitialization = true;
   const storeKindInfo = {
     scalarMapStore: {
       hasWeakKeys: false,
@@ -95,33 +94,32 @@ export function makeCollectionManager(
     return `vc.${collectionID}.${dbEntryKey}`;
   }
 
-  function obtainStoreKindID(kindName) {
-    if (storeKindInfoNeedsInitialization) {
-      storeKindInfoNeedsInitialization = false;
-
-      let storeKindIDs = {};
-      const rawTable = syscall.vatstoreGet('storeKindIDTable');
-      if (rawTable) {
-        storeKindIDs = JSON.parse(rawTable);
-      }
-      for (const kind of Object.getOwnPropertyNames(storeKindInfo)) {
-        let kindID = storeKindIDs[kind];
-        if (!kindID) {
-          kindID = allocateExportID();
-          storeKindIDs[kind] = kindID;
-        }
-        storeKindInfo[kind].kindID = kindID;
-        storeKindIDToName.set(`${kindID}`, kind);
-        vrm.registerKind(
-          kindID,
-          storeKindInfo[kind].reanimator,
-          // eslint-disable-next-line no-use-before-define
-          deleteCollection,
-          storeKindInfo[kind].durable,
-        );
+  function initializeStoreKindInfo() {
+    let storeKindIDs = {};
+    const rawTable = syscall.vatstoreGet('storeKindIDTable');
+    if (rawTable) {
+      storeKindIDs = JSON.parse(rawTable);
+    }
+    for (const kind of Object.getOwnPropertyNames(storeKindInfo)) {
+      let kindID = storeKindIDs[kind];
+      if (!kindID) {
+        kindID = allocateExportID();
+        storeKindIDs[kind] = kindID;
       }
-      syscall.vatstoreSet('storeKindIDTable', JSON.stringify(storeKindIDs));
+      storeKindInfo[kind].kindID = kindID;
+      storeKindIDToName.set(`${kindID}`, kind);
+      vrm.registerKind(
+        kindID,
+        storeKindInfo[kind].reanimator,
+        // eslint-disable-next-line no-use-before-define
+        deleteCollection,
+        storeKindInfo[kind].durable,
+      );
     }
+    syscall.vatstoreSet('storeKindIDTable', JSON.stringify(storeKindIDs));
+  }
+
+  function obtainStoreKindID(kindName) {
     return storeKindInfo[kindName].kindID;
   }
 
@@ -809,6 +807,7 @@ export function makeCollectionManager(
   const testHooks = { storeSizeInternal, makeCollection };
 
   return harden({
+    initializeStoreKindInfo,
     makeScalarBigMapStore,
     makeScalarBigWeakMapStore,
     makeScalarBigSetStore,

packages/SwingSet/src/liveslots/liveslots.js

@@ -1215,6 +1215,8 @@ function build(
     }
 
     initializeIDCounters();
+    collectionManager.initializeStoreKindInfo();
+
     const vatParameters = m.unserialize(vatParametersCapData);
     baggage = collectionManager.provideBaggage();
 

packages/SwingSet/test/stores/test-storeGC.js

@@ -466,7 +466,6 @@ function validateCreateHolder(v, idx) {
 
 function validateInit(v) {
   validate(v, matchVatstoreGet('idCounters', NONE));
-  validate(v, matchVatstoreGet('baggageID', NONE));
   validate(v, matchVatstoreGet('storeKindIDTable', NONE));
   validate(
     v,
@@ -475,6 +474,7 @@ function validateInit(v) {
       '{"scalarMapStore":1,"scalarWeakMapStore":2,"scalarSetStore":3,"scalarWeakSetStore":4,"scalarDurableMapStore":5,"scalarDurableWeakMapStore":6,"scalarDurableSetStore":7,"scalarDurableWeakSetStore":8}',
     ),
   );
+  validate(v, matchVatstoreGet('baggageID', NONE));
   validateCreateBaggage(v, 1);
   validateCreateHolder(v, 2);
 }

packages/SwingSet/test/test-baggage.js

@@ -47,7 +47,6 @@ function validateCreateBaggage(v, idx) {
 
 function validateSetup(v) {
   validate(v, matchVatstoreGet('idCounters', NONE));
-  validate(v, matchVatstoreGet('baggageID', NONE));
   validate(v, matchVatstoreGet('storeKindIDTable', NONE));
   validate(
     v,
@@ -56,6 +55,7 @@ function validateSetup(v) {
       '{"scalarMapStore":1,"scalarWeakMapStore":2,"scalarSetStore":3,"scalarWeakSetStore":4,"scalarDurableMapStore":5,"scalarDurableWeakMapStore":6,"scalarDurableSetStore":7,"scalarDurableWeakSetStore":8}',
     ),
   );
+  validate(v, matchVatstoreGet('baggageID', NONE));
   validateCreateBaggage(v, 1);
 }
 

packages/SwingSet/test/virtualObjects/test-virtualObjectGC.js

@@ -461,7 +461,6 @@ function validateCreateBaggage(v, idx) {
 
 function validateSetup(v) {
   validate(v, matchVatstoreGet('idCounters', NONE));
-  validate(v, matchVatstoreGet('baggageID', NONE));
   validate(v, matchVatstoreGet('storeKindIDTable', NONE));
   validate(
     v,
@@ -470,6 +469,7 @@ function validateSetup(v) {
       '{"scalarMapStore":1,"scalarWeakMapStore":2,"scalarSetStore":3,"scalarWeakSetStore":4,"scalarDurableMapStore":5,"scalarDurableWeakMapStore":6,"scalarDurableSetStore":7,"scalarDurableWeakSetStore":8}',
     ),
   );
+  validate(v, matchVatstoreGet('baggageID', NONE));
   validateCreateBaggage(v, 1);
   validate(v, matchVatstoreSet(stateKey(cacheDisplacerVref), cacheObjValue));
   validate(v, matchVatstoreSet(stateKey(fCacheDisplacerVref), cacheObjValue));