agoric 0.21.2-dev-fa6d3d3.0.fa6d3d3 → 0.21.2-dev-e3099cb.0.e3099cb

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agoric",
-  "version": "0.21.2-dev-fa6d3d3.0.fa6d3d3",
+  "version": "0.21.2-dev-e3099cb.0.e3099cb",
   "description": "Manage the Agoric Javascript smart contract platform",
   "type": "module",
   "main": "src/main.js",
@@ -29,28 +29,28 @@
     "lint:eslint": "yarn run -T eslint ."
   },
   "devDependencies": {
-    "@agoric/cosmic-swingset": "0.41.4-dev-fa6d3d3.0.fa6d3d3",
-    "@agoric/deploy-script-support": "0.10.4-dev-fa6d3d3.0.fa6d3d3",
+    "@agoric/cosmic-swingset": "0.41.4-dev-e3099cb.0.e3099cb",
+    "@agoric/deploy-script-support": "0.10.4-dev-e3099cb.0.e3099cb",
     "ava": "^6.4.1",
     "c8": "^10.1.2"
   },
   "dependencies": {
-    "@agoric/access-token": "0.4.22-dev-fa6d3d3.0.fa6d3d3",
-    "@agoric/cache": "0.3.3-dev-fa6d3d3.0.fa6d3d3",
-    "@agoric/casting": "0.4.3-dev-fa6d3d3.0.fa6d3d3",
-    "@agoric/client-utils": "0.1.1-dev-fa6d3d3.0.fa6d3d3",
-    "@agoric/cosmic-proto": "0.4.1-dev-fa6d3d3.0.fa6d3d3",
-    "@agoric/ertp": "0.16.3-dev-fa6d3d3.0.fa6d3d3",
-    "@agoric/governance": "0.10.4-dev-fa6d3d3.0.fa6d3d3",
-    "@agoric/inter-protocol": "0.16.2-dev-fa6d3d3.0.fa6d3d3",
-    "@agoric/internal": "0.3.3-dev-fa6d3d3.0.fa6d3d3",
-    "@agoric/network": "0.1.1-dev-fa6d3d3.0.fa6d3d3",
-    "@agoric/smart-wallet": "0.5.4-dev-fa6d3d3.0.fa6d3d3",
-    "@agoric/store": "0.9.3-dev-fa6d3d3.0.fa6d3d3",
-    "@agoric/swingset-vat": "0.32.3-dev-fa6d3d3.0.fa6d3d3",
-    "@agoric/vats": "0.15.2-dev-fa6d3d3.0.fa6d3d3",
-    "@agoric/zoe": "0.26.3-dev-fa6d3d3.0.fa6d3d3",
-    "@agoric/zone": "0.2.3-dev-fa6d3d3.0.fa6d3d3",
+    "@agoric/access-token": "0.4.22-dev-e3099cb.0.e3099cb",
+    "@agoric/cache": "0.3.3-dev-e3099cb.0.e3099cb",
+    "@agoric/casting": "0.4.3-dev-e3099cb.0.e3099cb",
+    "@agoric/client-utils": "0.1.1-dev-e3099cb.0.e3099cb",
+    "@agoric/cosmic-proto": "0.4.1-dev-e3099cb.0.e3099cb",
+    "@agoric/ertp": "0.16.3-dev-e3099cb.0.e3099cb",
+    "@agoric/governance": "0.10.4-dev-e3099cb.0.e3099cb",
+    "@agoric/inter-protocol": "0.16.2-dev-e3099cb.0.e3099cb",
+    "@agoric/internal": "0.3.3-dev-e3099cb.0.e3099cb",
+    "@agoric/network": "0.1.1-dev-e3099cb.0.e3099cb",
+    "@agoric/smart-wallet": "0.5.4-dev-e3099cb.0.e3099cb",
+    "@agoric/store": "0.9.3-dev-e3099cb.0.e3099cb",
+    "@agoric/swingset-vat": "0.32.3-dev-e3099cb.0.e3099cb",
+    "@agoric/vats": "0.15.2-dev-e3099cb.0.e3099cb",
+    "@agoric/zoe": "0.26.3-dev-e3099cb.0.e3099cb",
+    "@agoric/zone": "0.2.3-dev-e3099cb.0.e3099cb",
     "@cosmjs/crypto": "^0.36.0",
     "@cosmjs/encoding": "^0.36.0",
     "@cosmjs/math": "^0.36.0",
@@ -70,7 +70,6 @@
     "@endo/promise-kit": "^1.1.13",
     "@endo/zip": "^1.0.11",
     "@iarna/toml": "^2.2.3",
-    "anylogger": "^0.21.0",
     "chalk": "^5.2.0",
     "commander": "^12.1.0",
     "deterministic-json": "^1.0.5",
@@ -102,5 +101,5 @@
   "engines": {
     "node": "^20.9 || ^22.11"
   },
-  "gitHead": "fa6d3d3633f3a11ab3946e0d02901883b71847a9"
+  "gitHead": "e3099cb9b5af514813cf606753b3743fd361bcf8"
 }

package/src/anylogger-agoric.js

@@ -1,9 +1,27 @@
+/**
+ * @file agoric-cli anylogger adapter.
+ *
+ * Use this module as a side-effect import from CLI entrypoints when you want
+ * Agoric-prefixed loggers to respect `DEBUG` and emit styled output.
+ *
+ * How it works:
+ * - Reads `DEBUG` values like `agoric` or `agoric:<level>`.
+ * - Overrides `anylogger.ext` to enable/disable levels consistently.
+ * - Wraps enabled log methods with an `agoric`-style prefix.
+ *
+ * Why this file exists alongside `packages/cosmic-swingset/src/anylogger-agoric.js`:
+ * - This CLI adapter is optimized for interactive terminal UX (colored labels).
+ * - Cosmic-swingset logging targets chain/runtime service logs (timestamps,
+ *   vat-prefix suppression, and `agoric:none` semantics).
+ * - Keeping separate adapters avoids coupling CLI output behavior to
+ *   cosmic-swingset operational logging requirements.
+ */
 /* eslint-env node */
 import {
   getEnvironmentOption,
   getEnvironmentOptionsList,
 } from '@endo/env-options';
-import anylogger from 'anylogger';
+import anylogger from '@agoric/internal/vendor/anylogger.js';
 import chalk from 'chalk';
 
 const DEBUG_LIST = getEnvironmentOptionsList('DEBUG');
@@ -30,19 +48,25 @@ const globalCode = selectedCode === undefined ? -Infinity : selectedCode;
 const oldExt = anylogger.ext;
 /** @type {typeof anylogger.ext} */
 anylogger.ext = (l, ...rest) => {
-  l = oldExt(l, ...rest);
-  l.enabledFor = lvl => globalCode >= anylogger.levels[lvl];
+  const logger = oldExt(l, ...rest);
+  logger.enabledFor = lvl =>
+    lvl !== undefined && globalCode >= anylogger.levels[lvl];
 
-  const prefix = l.name.replace(/:/g, ': ');
+  const prefix = logger.name.replace(/:/g, ': ');
+  const fallbackSink = console.log.bind(console);
   for (const [level, code] of Object.entries(anylogger.levels)) {
     if (globalCode >= code) {
       // Enable the printing with a prefix.
-      const doLog = l[level] || (() => {});
-      l[level] = (...args) => doLog(chalk.bold.blue(`${prefix}:`), ...args);
+      const doLog =
+        (typeof console[level] === 'function' &&
+          console[level].bind(console)) ||
+        fallbackSink;
+      logger[level] = (...args) =>
+        doLog(chalk.bold.blue(`${prefix}:`), ...args);
     } else {
       // Disable printing.
-      l[level] = () => {};
+      logger[level] = () => {};
     }
   }
-  return l;
+  return logger;
 };

package/src/bin-agops.js

@@ -10,7 +10,7 @@ import { E } from '@endo/far';
 import { execFileSync } from 'child_process';
 import path from 'path';
 import process from 'process';
-import anylogger from 'anylogger';
+import anylogger from '@agoric/internal/vendor/anylogger.js';
 import { Command, CommanderError, createCommand } from 'commander';
 import { makeOracleCommand } from './commands/oracle.js';
 import { makeGovCommand } from './commands/gov.js';

package/src/commands/gov.js

@@ -22,7 +22,7 @@ import {
  * @import {AgoricNamesRemotes} from '@agoric/vats/tools/board-utils.js';
  * @import {CurrentWalletRecord} from '@agoric/smart-wallet/src/smartWallet.js';
  * @import {VstorageKit} from '@agoric/client-utils';
- * @import {Logger} from 'anylogger';
+ * @import {Logger} from '@agoric/internal/vendor/anylogger.js';
  * @import {Writable} from 'stream';
  */
 

package/src/commands/oracle.js

@@ -28,7 +28,7 @@ import {
  * @import {createCommand} from 'commander';
  * @import {execFileSync} from 'child_process';
  * @import {Writable} from 'stream';
- * @import {Logger} from 'anylogger';
+ * @import {Logger} from '@agoric/internal/vendor/anylogger.js';
  * @import {OfferSpec} from '@agoric/smart-wallet/src/offers.js';
  * @import {TimestampRecord} from '@agoric/time';
  */

package/src/commands/perf.js

@@ -20,7 +20,7 @@ import {
 } from '../lib/chain.js';
 
 /**
- * @import {Logger} from 'anylogger';
+ * @import {Logger} from '@agoric/internal/vendor/anylogger.js';
  */
 
 // tight for perf testing but less than this tends to hang.

package/src/commands/psm.js

@@ -13,7 +13,7 @@ import { asPercent } from '../lib/format.js';
 import { outputExecuteOfferAction } from '../lib/wallet.js';
 
 /**
- * @import {Logger} from 'anylogger';
+ * @import {Logger} from '@agoric/internal/vendor/anylogger.js';
  * @import {OfferSpec} from '@agoric/smart-wallet/src/offers.js';
  */
 

package/src/commands/reserve.js

@@ -11,7 +11,7 @@ import { Command } from 'commander';
 import { outputActionAndHint } from '../lib/wallet.js';
 
 /**
- * @import {Logger} from 'anylogger';
+ * @import {Logger} from '@agoric/internal/vendor/anylogger.js';
  * @import {OfferSpec} from '@agoric/smart-wallet/src/offers.js';
  */
 

package/src/commands/vaults.js

@@ -15,7 +15,7 @@ import { normalizeAddressWithOptions } from '../lib/chain.js';
 import { getCurrent, outputExecuteOfferAction } from '../lib/wallet.js';
 
 /**
- * @import {Logger} from 'anylogger';
+ * @import {Logger} from '@agoric/internal/vendor/anylogger.js';
  */
 
 const networkConfig = await fetchEnvNetworkConfig({ env: process.env, fetch });

package/src/entrypoint.js

@@ -12,7 +12,7 @@ import os from 'os';
 
 // Configure logs.
 import './anylogger-agoric.js';
-import anylogger from 'anylogger';
+import anylogger from '@agoric/internal/vendor/anylogger.js';
 
 import main from './main.js';