agoric 0.21.2-dev-f30b379.0 → 0.21.2-dev-d2ea4b4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agoric",
-  "version": "0.21.2-dev-f30b379.0+f30b379",
+  "version": "0.21.2-dev-d2ea4b4.0+d2ea4b4",
   "description": "Manage the Agoric Javascript smart contract platform",
   "type": "module",
   "main": "src/main.js",
@@ -29,29 +29,29 @@
     "lint:eslint": "eslint ."
   },
   "devDependencies": {
-    "@agoric/cosmic-swingset": "0.41.4-dev-f30b379.0+f30b379",
-    "@agoric/deploy-script-support": "0.10.4-dev-f30b379.0+f30b379",
+    "@agoric/cosmic-swingset": "0.41.4-dev-d2ea4b4.0+d2ea4b4",
+    "@agoric/deploy-script-support": "0.10.4-dev-d2ea4b4.0+d2ea4b4",
     "ava": "^5.3.0",
     "c8": "^7.13.0",
     "dd-trace": "^4.11.1"
   },
   "dependencies": {
-    "@agoric/access-token": "0.4.22-dev-f30b379.0+f30b379",
-    "@agoric/assert": "0.6.1-dev-f30b379.0+f30b379",
-    "@agoric/cache": "0.3.3-dev-f30b379.0+f30b379",
-    "@agoric/casting": "0.4.3-dev-f30b379.0+f30b379",
-    "@agoric/cosmic-proto": "0.3.1-dev-f30b379.0+f30b379",
-    "@agoric/ertp": "0.16.3-dev-f30b379.0+f30b379",
-    "@agoric/governance": "0.10.4-dev-f30b379.0+f30b379",
-    "@agoric/inter-protocol": "0.16.2-dev-f30b379.0+f30b379",
-    "@agoric/internal": "0.3.3-dev-f30b379.0+f30b379",
-    "@agoric/network": "0.1.1-dev-f30b379.0+f30b379",
-    "@agoric/smart-wallet": "0.5.4-dev-f30b379.0+f30b379",
-    "@agoric/store": "0.9.3-dev-f30b379.0+f30b379",
-    "@agoric/swingset-vat": "0.32.3-dev-f30b379.0+f30b379",
-    "@agoric/vats": "0.15.2-dev-f30b379.0+f30b379",
-    "@agoric/zoe": "0.26.3-dev-f30b379.0+f30b379",
-    "@agoric/zone": "0.2.3-dev-f30b379.0+f30b379",
+    "@agoric/access-token": "0.4.22-dev-d2ea4b4.0+d2ea4b4",
+    "@agoric/assert": "0.6.1-dev-d2ea4b4.0+d2ea4b4",
+    "@agoric/cache": "0.3.3-dev-d2ea4b4.0+d2ea4b4",
+    "@agoric/casting": "0.4.3-dev-d2ea4b4.0+d2ea4b4",
+    "@agoric/cosmic-proto": "0.3.1-dev-d2ea4b4.0+d2ea4b4",
+    "@agoric/ertp": "0.16.3-dev-d2ea4b4.0+d2ea4b4",
+    "@agoric/governance": "0.10.4-dev-d2ea4b4.0+d2ea4b4",
+    "@agoric/inter-protocol": "0.16.2-dev-d2ea4b4.0+d2ea4b4",
+    "@agoric/internal": "0.3.3-dev-d2ea4b4.0+d2ea4b4",
+    "@agoric/network": "0.1.1-dev-d2ea4b4.0+d2ea4b4",
+    "@agoric/smart-wallet": "0.5.4-dev-d2ea4b4.0+d2ea4b4",
+    "@agoric/store": "0.9.3-dev-d2ea4b4.0+d2ea4b4",
+    "@agoric/swingset-vat": "0.32.3-dev-d2ea4b4.0+d2ea4b4",
+    "@agoric/vats": "0.15.2-dev-d2ea4b4.0+d2ea4b4",
+    "@agoric/zoe": "0.26.3-dev-d2ea4b4.0+d2ea4b4",
+    "@agoric/zone": "0.2.3-dev-d2ea4b4.0+d2ea4b4",
     "@confio/relayer": "^0.9.0",
     "@cosmjs/crypto": "^0.30.1",
     "@cosmjs/encoding": "^0.30.1",
@@ -61,6 +61,7 @@
     "@endo/bundle-source": "^3.0.2",
     "@endo/captp": "^4.0.2",
     "@endo/compartment-mapper": "^1.1.0",
+    "@endo/env-options": "^1.1.0",
     "@endo/far": "^1.0.2",
     "@endo/init": "^1.0.2",
     "@endo/marshal": "^1.1.0",
@@ -99,5 +100,5 @@
   "typeCoverage": {
     "atLeast": 77.5
   },
-  "gitHead": "f30b3797212f3f64f734c3079df23105e293be54"
+  "gitHead": "d2ea4b46b9efa61e97eec8711830d9fdd741ca55"
 }

package/src/anylogger-agoric.js

@@ -1,31 +1,45 @@
-/* global process */
+import {
+  getEnvironmentOption,
+  getEnvironmentOptionsList,
+} from '@endo/env-options';
 import anylogger from 'anylogger';
 import chalk from 'chalk';
 
-// Turn on debugging output with DEBUG=agoric
-const { DEBUG } = process.env;
-let selectedLevel = 'info';
-if (DEBUG === undefined) {
-  selectedLevel = 'log';
-} else if (DEBUG.includes('agoric')) {
-  selectedLevel = 'debug';
+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'
+    ? 'log'
+    : 'info';
+for (const level of DEBUG_LIST) {
+  const parts = level.split(':');
+  if (parts[0] !== 'agoric') {
+    continue;
+  }
+  if (parts.length > 1) {
+    selectedLevel = parts[1];
+  } else {
+    selectedLevel = 'debug';
+  }
 }
-const defaultLevel = anylogger.levels[selectedLevel];
+const selectedCode = anylogger.levels[selectedLevel];
+const globalCode = selectedCode === undefined ? -Infinity : selectedCode;
 
 const oldExt = anylogger.ext;
 anylogger.ext = (l, o) => {
   l = oldExt(l, o);
-  l.enabledFor = lvl => defaultLevel >= anylogger.levels[lvl];
+  l.enabledFor = lvl => globalCode >= anylogger.levels[lvl];
 
   const prefix = l.name.replace(/:/g, ': ');
   for (const [level, code] of Object.entries(anylogger.levels)) {
-    if (code > defaultLevel) {
-      // Disable printing.
-      l[level] = () => {};
-    } else {
+    if (globalCode >= code) {
       // Enable the printing with a prefix.
       const doLog = l[level] || (() => {});
       l[level] = (...args) => doLog(chalk.bold.blue(`${prefix}:`), ...args);
+    } else {
+      // Disable printing.
+      l[level] = () => {};
     }
   }
   return l;

package/src/cosmos.js

@@ -14,10 +14,10 @@ export default async function cosmosMain(progname, rawArgs, powers, opts) {
   const pspawnEnv = { ...process.env };
   if (popts.verbose > 1) {
     // Enable verbose logs.
-    pspawnEnv.DEBUG = 'agoric';
+    pspawnEnv.DEBUG = 'agoric:info';
   } else if (!popts.verbose) {
     // Disable more logs.
-    pspawnEnv.DEBUG = '';
+    pspawnEnv.DEBUG = 'agoric:none';
   }
 
   const pspawn = makePspawn({ env: pspawnEnv, log, spawn, chalk });

package/src/start.js

@@ -71,10 +71,10 @@ export default async function startMain(progname, rawArgs, powers, opts) {
   const pspawnEnv = { ...process.env };
   if (opts.verbose > 1) {
     // Loudly verbose logs (nondeterministic).
-    pspawnEnv.DEBUG = 'agoric,SwingSet:vat,SwingSet:ls';
+    pspawnEnv.DEBUG = 'agoric:debug,SwingSet:vat,SwingSet:ls';
   } else if (opts.verbose) {
     // Verbose vat logs (nondeterministic).
-    pspawnEnv.DEBUG = 'SwingSet:vat,SwingSet:ls';
+    pspawnEnv.DEBUG = 'agoric:info,SwingSet:vat,SwingSet:ls';
   }
 
   const pspawn = makePspawn({ env: pspawnEnv, spawn, log, chalk });
@@ -184,7 +184,7 @@ export default async function startMain(progname, rawArgs, powers, opts) {
 
     await null;
     if (popts.reset) {
-      rmVerbose(serverDir);
+      await rmVerbose(serverDir);
     }
 
     if (!opts.dockerTag) {
@@ -274,7 +274,7 @@ export default async function startMain(progname, rawArgs, powers, opts) {
 
     const serverDir = `${SERVERS_ROOT_DIR}/${profileName}-${portNum}`;
     if (popts.reset) {
-      rmVerbose(serverDir);
+      await rmVerbose(serverDir);
     }
 
     let chainSpawn;
@@ -481,7 +481,7 @@ export default async function startMain(progname, rawArgs, powers, opts) {
     }
 
     if (popts.reset) {
-      rmVerbose(serverDir);
+      await rmVerbose(serverDir);
     }
 
     let soloSpawn;
@@ -704,7 +704,7 @@ export default async function startMain(progname, rawArgs, powers, opts) {
     const serverDir = `${SERVERS_ROOT_DIR}/${profileName}-${port}`;
 
     if (popts.reset) {
-      rmVerbose(serverDir);
+      await rmVerbose(serverDir);
     }
 
     const setupRun = (...bonusArgs) =>
@@ -731,7 +731,7 @@ export default async function startMain(progname, rawArgs, powers, opts) {
 
     await null;
     if (popts.reset) {
-      rmVerbose(serverDir);
+      await rmVerbose(serverDir);
     }
 
     const setupRun = (...bonusArgs) =>

package/tools/getting-started.js

@@ -64,7 +64,7 @@ export const gettingStartedWorkflowTest = async (t, options = {}) => {
     // console.error('running agoric-cli', ...extraArgs, ...args);
     return pspawnStdout(agoricCmd[0], [...agoricCmd.slice(1), ...args], {
       stdio: ['ignore', 'pipe', 'inherit'],
-      env: { ...process.env, DEBUG: 'agoric' },
+      env: { ...process.env, DEBUG: 'agoric:debug' },
       detached: true,
       ...opts,
     });