feat(cosmic-swingset): Introduce inquisitor.mjs

eslint.config.mjs

@@ -117,7 +117,7 @@ export default [
         },
 
         tsconfigRootDir: __dirname,
-        extraFileExtensions: ['.cjs'],
+        extraFileExtensions: ['.cjs', '.mjs'],
       },
     },
 
@@ -182,6 +182,7 @@ export default [
     files: [
       'packages/*/src/**/*.js',
       'packages/*/tools/**/*.js',
+      'packages/*/tools/**/*.mjs',
       'packages/*/*.js',
       'packages/wallet/api/src/**/*.js',
     ],

packages/SwingSet/tools/run-utils.js

@@ -15,9 +15,10 @@ import { makeQueue } from '@endo/stream';
  */
 export const makeRunUtils = (controller, harness) => {
   const mutex = makeQueue();
+  mutex.put('dummy result'); // so the first `await mutex.get()` doesn't hang
+
   const logRunFailure = reason =>
     console.log('controller.run() failure', reason);
-  mutex.put(controller.run().catch(logRunFailure));
 
   /**
    * Wait for exclusive access to the controller, then before relinquishing that access,

packages/boot/test/upgrading/upgrade-vats.test.ts

@@ -49,6 +49,7 @@ const makeScenario = async (
   t.teardown(c.shutdown);
   c.pinVatRoot('bootstrap');
 
+  await c.run();
   const runUtils = makeRunUtils(c);
   return runUtils;
 };

packages/boot/tools/supports.ts

@@ -587,6 +587,7 @@ export const makeSwingsetTestKit = async (
 
   console.timeLog('makeBaseSwingsetTestKit', 'buildSwingset');
 
+  await controller.run();
   const runUtils = makeBootstrapRunUtils(controller, harness);
 
   const buildProposal = makeProposalExtractor({

packages/cosmic-swingset/package.json

@@ -52,8 +52,12 @@
     "tmp": "^0.2.1"
   },
   "devDependencies": {
+    "@agoric/kmarshal": "^0.1.0",
+    "@endo/eventual-send": "^1.2.8",
     "ava": "^5.3.0",
-    "c8": "^10.1.2"
+    "better-sqlite3": "^9.1.1",
+    "c8": "^10.1.2",
+    "ses": "^1.10.0"
   },
   "publishConfig": {
     "access": "public"

packages/cosmic-swingset/src/chain-main.js

@@ -47,7 +47,7 @@ import {
   makeReadCachingStorage,
 } from './helpers/bufferedStorage.js';
 import stringify from './helpers/json-stable-stringify.js';
-import { launch } from './launch-chain.js';
+import { launch, launchAndShareInternals } from './launch-chain.js';
 import { makeProcessValue } from './helpers/process-value.js';
 import {
   spawnSwingStoreExport,
@@ -228,6 +228,7 @@ export const makeQueueStorage = (call, queuePath) => {
  *   slogSender?: ERef<EReturn<typeof makeSlogSender>>,
  *   swingStore?: import('@agoric/swing-store').SwingStore,
  *   vatconfig?: Parameters<typeof launch>[0]['vatconfig'],
+ *   withInternals?: boolean,
  * }} [options.testingOverrides]
  */
 export const makeLaunchChain = (
@@ -523,7 +524,10 @@ export const makeLaunchChain = (
       ? makeArchiveTranscript(vatTranscriptArchiveDir, fsPowers)
       : undefined;
 
-    const s = await launch({
+    const launcher = testingOverrides.withInternals
+      ? launchAndShareInternals
+      : launch;
+    const s = await launcher({
       actionQueueStorage,
       highPriorityQueueStorage,
       swingStore: testingOverrides.swingStore,

packages/cosmic-swingset/src/helpers/bufferedStorage.js

@@ -76,10 +76,8 @@ export const makeKVStoreFromMap = map => {
   let priorKeyIndex;
 
   const ensureSorted = () => {
-    if (!sortedKeys) {
-      sortedKeys = [...map.keys()];
-      sortedKeys.sort(compareByCodePoints);
-    }
+    if (sortedKeys) return;
+    sortedKeys = [...map.keys()].sort(compareByCodePoints);
   };
 
   const clearGetNextKeyCache = () => {
@@ -101,9 +99,16 @@ export const makeKVStoreFromMap = map => {
       assert.typeof(priorKey, 'string');
       ensureSorted();
       const start =
-        compareByCodePoints(priorKeyReturned, priorKey) <= 0
-          ? priorKeyIndex + 1
-          : 0;
+        priorKeyReturned === undefined
+          ? 0
+          : // If priorKeyReturned <= priorKey, start just after it.
+            (compareByCodePoints(priorKeyReturned, priorKey) <= 0 &&
+              priorKeyIndex + 1) ||
+            // Else if priorKeyReturned immediately follows priorKey, start at
+            // its index (and expect to return it again).
+            (sortedKeys.at(priorKeyIndex - 1) === priorKey && priorKeyIndex) ||
+            // Otherwise, start at the beginning.
+            0;
       for (let i = start; i < sortedKeys.length; i += 1) {
         const key = sortedKeys[i];
         if (compareByCodePoints(key, priorKey) <= 0) continue;
@@ -226,7 +231,8 @@ export function makeBufferedStorage(kvStore, listeners = {}) {
 
   // To avoid confusion, additions and deletions are prevented from sharing
   // the same key at any given time.
-  const additions = new Map();
+  /** @type {Map<string, T> & KVStore<T>} */
+  const additions = provideEnhancedKVStore(makeKVStoreFromMap(new Map()));
   const deletions = new Set();
 
   /** @type {KVStore<T>} */
@@ -257,13 +263,18 @@ export function makeBufferedStorage(kvStore, listeners = {}) {
       deletions.add(key);
       if (onPendingDelete !== undefined) onPendingDelete(key);
     },
-
-    /**
-     * @param {string} previousKey
-     */
     getNextKey(previousKey) {
       assert.typeof(previousKey, 'string');
-      throw Error('not implemented');
+      const bufferedNextKey = additions.getNextKey(previousKey);
+      let nextKey = kvStore.getNextKey(previousKey);
+      while (nextKey !== undefined) {
+        if (bufferedNextKey !== undefined) {
+          if (compareByCodePoints(bufferedNextKey, nextKey) <= 0) break;
+        }
+        if (!deletions.has(nextKey)) return nextKey;
+        nextKey = kvStore.getNextKey(nextKey);
+      }
+      return bufferedNextKey;
     },
   };
   function commit() {

packages/cosmic-swingset/src/launch-chain.js

@@ -26,7 +26,7 @@ import {
 } from '@agoric/swingset-vat';
 import { waitUntilQuiescent } from '@agoric/internal/src/lib-nodejs/waitUntilQuiescent.js';
 import { openSwingStore } from '@agoric/swing-store';
-import { BridgeId as BRIDGE_ID } from '@agoric/internal';
+import { attenuate, BridgeId as BRIDGE_ID } from '@agoric/internal';
 import { makeWithQueue } from '@agoric/internal/src/queue.js';
 import * as ActionType from '@agoric/internal/src/action-types.js';
 
@@ -333,7 +333,7 @@ export async function buildSwingset(
 /**
  * @param {LaunchOptions} options
  */
-export async function launch({
+export async function launchAndShareInternals({
   actionQueueStorage,
   highPriorityQueueStorage,
   kernelStateDBDir,
@@ -1263,5 +1263,26 @@ export async function launch({
     writeSlogObject,
     savedHeight,
     savedChainSends: JSON.parse(kvStore.get(getHostKey('chainSends')) || '[]'),
+    // NOTE: to be used only for testing purposes!
+    internals: {
+      controller,
+      bridgeInbound,
+      timer,
+    },
   };
 }
+
+/**
+ * @param {LaunchOptions} options
+ * @returns {Promise<Omit<Awaited<ReturnType<typeof launchAndShareInternals>>, 'internals'>>}
+ */
+export async function launch(options) {
+  const launchResult = await launchAndShareInternals(options);
+  return attenuate(launchResult, {
+    blockingSend: 'pick',
+    shutdown: 'pick',
+    writeSlogObject: 'pick',
+    savedHeight: 'pick',
+    savedChainSends: 'pick',
+  });
+}