@agoric/cosmic-swingset 0.41.4-dev-47470c7.0 → 0.41.4-dev-de9b2e7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/cosmic-swingset",
-  "version": "0.41.4-dev-47470c7.0+47470c7",
+  "version": "0.41.4-dev-de9b2e7.0+de9b2e7",
   "description": "Agoric's Cosmos blockchain integration",
   "type": "module",
   "bin": {
@@ -22,15 +22,15 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/builders": "0.1.1-dev-47470c7.0+47470c7",
-    "@agoric/cosmos": "0.34.2-dev-47470c7.0+47470c7",
-    "@agoric/deploy-script-support": "0.10.4-dev-47470c7.0+47470c7",
-    "@agoric/internal": "0.3.3-dev-47470c7.0+47470c7",
-    "@agoric/store": "0.9.3-dev-47470c7.0+47470c7",
-    "@agoric/swing-store": "0.9.2-dev-47470c7.0+47470c7",
-    "@agoric/swingset-vat": "0.32.3-dev-47470c7.0+47470c7",
-    "@agoric/telemetry": "0.6.3-dev-47470c7.0+47470c7",
-    "@agoric/vm-config": "0.1.1-dev-47470c7.0+47470c7",
+    "@agoric/builders": "0.1.1-dev-de9b2e7.0+de9b2e7",
+    "@agoric/cosmos": "0.34.2-dev-de9b2e7.0+de9b2e7",
+    "@agoric/deploy-script-support": "0.10.4-dev-de9b2e7.0+de9b2e7",
+    "@agoric/internal": "0.3.3-dev-de9b2e7.0+de9b2e7",
+    "@agoric/store": "0.9.3-dev-de9b2e7.0+de9b2e7",
+    "@agoric/swing-store": "0.9.2-dev-de9b2e7.0+de9b2e7",
+    "@agoric/swingset-vat": "0.32.3-dev-de9b2e7.0+de9b2e7",
+    "@agoric/telemetry": "0.6.3-dev-de9b2e7.0+de9b2e7",
+    "@agoric/vm-config": "0.1.1-dev-de9b2e7.0+de9b2e7",
     "@endo/bundle-source": "^3.5.1",
     "@endo/env-options": "^1.1.8",
     "@endo/errors": "^1.2.9",
@@ -52,7 +52,7 @@
     "tmp": "^0.2.1"
   },
   "devDependencies": {
-    "@agoric/kmarshal": "0.1.1-dev-47470c7.0+47470c7",
+    "@agoric/kmarshal": "0.1.1-dev-de9b2e7.0+de9b2e7",
     "ava": "^5.3.0",
     "better-sqlite3": "^9.1.1",
     "c8": "^10.1.2"
@@ -64,9 +64,17 @@
     "node": "^18.12 || ^20.9"
   },
   "ava": {
+    "extensions": {
+      "js": true,
+      "ts": "module"
+    },
     "files": [
       "test/**/*.test.*"
     ],
+    "nodeArguments": [
+      "--import=ts-blank-space/register",
+      "--no-warnings"
+    ],
     "require": [
       "@endo/init/debug.js"
     ],
@@ -75,5 +83,5 @@
   "typeCoverage": {
     "atLeast": 84.59
   },
-  "gitHead": "47470c7d3999c1222677244ed29ce6fc60c7766f"
+  "gitHead": "de9b2e7ca244a6d131f2e4206aeee76f814382e4"
 }

package/src/anylogger-agoric.js

@@ -4,68 +4,69 @@ import {
   getEnvironmentOption,
 } from '@endo/env-options';
 import anylogger from 'anylogger';
+import { defineName } from '@agoric/internal/src/js-utils.js';
 
-// Turn on debugging output with DEBUG=agoric
+/** @import {BaseLevels} from 'anylogger'; */
+/** @typedef {keyof BaseLevels} LogLevel; */
 
-const DEBUG_LIST = getEnvironmentOptionsList('DEBUG');
+const VAT_LOGGER_PREFIXES = Object.freeze([
+  'SwingSet:vat',
+  'SwingSet:ls', // "ls" for "liveslots"
+]);
 
-const isVatLogNameColon = nameColon =>
-  ['SwingSet:ls:', 'SwingSet:vat:'].some(sel => nameColon.startsWith(sel));
+const DEBUG_LIST = getEnvironmentOptionsList('DEBUG');
 
-// Turn on debugging output with DEBUG=agoric or DEBUG=agoric:${level}
-let selectedLevel =
-  DEBUG_LIST.length || getEnvironmentOption('DEBUG', 'unset') === 'unset'
+/**
+ * As documented in ../../../docs/env.md, the log level defaults to "log" when
+ * environment variable DEBUG is non-empty or unset, and to the quieter "info"
+ * when it is set to an empty string, but in either case is overridden if DEBUG
+ * is a comma-separated list that contains "agoric:none" or "agoric:${level}" or
+ * "agoric" (the last an alias for "agoric:debug").
+ *
+ * @type {string | undefined}
+ */
+let maxActiveLevel =
+  DEBUG_LIST.length > 0 || getEnvironmentOption('DEBUG', 'unset') === 'unset'
     ? 'log'
     : 'info';
 for (const selector of DEBUG_LIST) {
-  const parts = selector.split(':');
-  if (parts[0] !== 'agoric') {
-    continue;
-  }
-  if (parts.length > 1) {
-    selectedLevel = parts[1];
-  } else {
-    selectedLevel = 'debug';
+  const fullSelector = selector === 'agoric' ? 'agoric:debug' : selector;
+  const [_, detail] = fullSelector.match(/^agoric:(.*)/gs) || [];
+  if (detail) {
+    maxActiveLevel = detail === 'none' ? undefined : detail;
   }
 }
-const selectedCode = anylogger.levels[selectedLevel];
-const globalCode = selectedCode === undefined ? -Infinity : selectedCode;
+const maxActiveLevelCode = /** @type {number} */ (
+  (maxActiveLevel && anylogger.levels[maxActiveLevel]) ?? -Infinity
+);
 
 const oldExt = anylogger.ext;
 anylogger.ext = logger => {
-  const l = oldExt(logger);
-  l.enabledFor = lvl => globalCode >= anylogger.levels[lvl];
+  logger = oldExt(logger);
 
-  const prefix = l.name.replace(/:/g, ': ');
+  /** @type {(level: LogLevel) => boolean} */
+  const enabledFor = level => anylogger.levels[level] <= maxActiveLevelCode;
+  logger.enabledFor = enabledFor;
 
-  const nameColon = `${l.name}:`;
-  const logBelongsToVat = isVatLogNameColon(nameColon);
+  const nameColon = `${logger.name}:`;
+  const label = logger.name.replaceAll(':', ': ');
 
-  // If this is a vat log, then it is enabled by a selector in DEBUG_LIST.
-  const logMatchesSelector =
-    !logBelongsToVat ||
-    DEBUG_LIST.some(selector => {
-      const selectorColon = `${selector}:`;
-      return nameColon.startsWith(selectorColon);
-    });
+  // Vat logs are suppressed unless matched by a prefix in DEBUG_LIST.
+  const suppressed =
+    VAT_LOGGER_PREFIXES.some(prefix => nameColon.startsWith(`${prefix}:`)) &&
+    !DEBUG_LIST.some(prefix => nameColon.startsWith(`${prefix}:`));
 
-  for (const [level, code] of Object.entries(anylogger.levels)) {
-    if (logMatchesSelector && globalCode >= code) {
-      // Enable the printing with a prefix.
-      const doLog = l[level];
-      if (doLog) {
-        l[level] = (...args) => {
-          // Add a timestamp.
-          const now = new Date().toISOString();
-          doLog(`${now} ${prefix}:`, ...args);
-        };
-      } else {
-        l[level] = () => {};
-      }
-    } else {
-      // Disable printing.
-      l[level] = () => {};
-    }
+  const levels = /** @type {LogLevel[]} */ (Object.keys(anylogger.levels));
+  for (const level of levels) {
+    const impl = logger[level];
+    const disabled = !impl || suppressed || !enabledFor(level);
+    logger[level] = disabled
+      ? defineName(`dummy ${level}`, () => {})
+      : defineName(level, (...args) => {
+          // Prepend a timestamp and label.
+          const timestamp = new Date().toISOString();
+          impl(`${timestamp} ${label}:`, ...args);
+        });
   }
-  return l;
+  return logger;
 };

package/tools/inquisitor.mjs

@@ -318,6 +318,7 @@ export const makeHelpers = ({ db, EV }) => {
     stable: { db, getRefs, kvGet, kvGetJSON, kvGlob, vatsByID, vatsByName },
   });
 };
+/** @typedef {ReturnType<typeof makeHelpers>} Helpers */
 
 /**
  * Wrap a swing-store sub-store (kvStore/transcriptStore/etc.) with a

package/tsconfig.json

@@ -5,10 +5,10 @@
     "skipLibCheck": false
   },
   "include": [
-    "calc-*.js",
-    "src/**/*.js",
-    "test/**/*.js",
     "*.cjs",
+    "*.js",
+    "src",
+    "test",
     "tools",
   ],
 }