agoric 0.21.2-mainnet1B-dev-cfa7cb2.0 → 0.21.2-orchestration-dev-096c4e8.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agoric",
-  "version": "0.21.2-mainnet1B-dev-cfa7cb2.0+cfa7cb2",
+  "version": "0.21.2-orchestration-dev-096c4e8.0+096c4e8",
   "description": "Manage the Agoric Javascript smart contract platform",
   "type": "module",
   "main": "src/main.js",
@@ -8,8 +8,13 @@
     "agoric": "src/entrypoint.js",
     "agops": "src/bin-agops.js"
   },
+  "exports": {
+    "./src/entrypoint.js": "./src/entrypoint.js",
+    "./src/helpers.js": "./src/helpers.js"
+  },
   "files": [
     "src",
+    "tools",
     "exported.js"
   ],
   "scripts": {
@@ -20,48 +25,53 @@
     "integration-test": "ava --config .ava-integration-test.config.js",
     "lint-fix": "yarn lint:eslint --fix",
     "lint": "run-s --continue-on-error lint:*",
-    "lint:types": "tsc -p jsconfig.json",
+    "lint:types": "tsc",
     "lint:eslint": "eslint ."
   },
   "devDependencies": {
-    "@agoric/deploy-script-support": "0.10.4-mainnet1B-dev-cfa7cb2.0+cfa7cb2",
-    "ava": "^5.2.0",
+    "@agoric/cosmic-swingset": "0.41.4-orchestration-dev-096c4e8.0+096c4e8",
+    "@agoric/deploy-script-support": "0.10.4-orchestration-dev-096c4e8.0+096c4e8",
+    "ava": "^5.3.0",
     "c8": "^7.13.0",
-    "dd-trace": "^3.3.0"
+    "dd-trace": "^4.11.1"
   },
   "dependencies": {
-    "@agoric/access-token": "0.4.22-mainnet1B-dev-cfa7cb2.0+cfa7cb2",
-    "@agoric/assert": "0.6.1-mainnet1B-dev-cfa7cb2.0+cfa7cb2",
-    "@agoric/cache": "0.3.3-mainnet1B-dev-cfa7cb2.0+cfa7cb2",
-    "@agoric/casting": "0.4.3-mainnet1B-dev-cfa7cb2.0+cfa7cb2",
-    "@agoric/cosmic-proto": "0.3.1-mainnet1B-dev-cfa7cb2.0+cfa7cb2",
-    "@agoric/ertp": "0.16.3-mainnet1B-dev-cfa7cb2.0+cfa7cb2",
-    "@agoric/inter-protocol": "0.16.2-mainnet1B-dev-cfa7cb2.0+cfa7cb2",
-    "@agoric/internal": "0.3.3-mainnet1B-dev-cfa7cb2.0+cfa7cb2",
-    "@agoric/smart-wallet": "0.5.4-mainnet1B-dev-cfa7cb2.0+cfa7cb2",
-    "@agoric/store": "0.9.3-mainnet1B-dev-cfa7cb2.0+cfa7cb2",
-    "@agoric/swingset-vat": "0.32.3-mainnet1B-dev-cfa7cb2.0+cfa7cb2",
-    "@agoric/vats": "0.15.2-mainnet1B-dev-cfa7cb2.0+cfa7cb2",
-    "@agoric/zoe": "0.26.3-mainnet1B-dev-cfa7cb2.0+cfa7cb2",
-    "@agoric/zone": "0.2.3-mainnet1B-dev-cfa7cb2.0+cfa7cb2",
-    "@confio/relayer": "^0.9.0",
-    "@cosmjs/crypto": "^0.30.1",
-    "@cosmjs/encoding": "^0.30.1",
-    "@cosmjs/math": "^0.30.1",
-    "@cosmjs/proto-signing": "^0.30.1",
-    "@cosmjs/stargate": "^0.30.1",
-    "@endo/bundle-source": "2.5.2-upstream-rollup",
-    "@endo/captp": "3.1.1",
-    "@endo/compartment-mapper": "0.8.4",
-    "@endo/far": "0.2.18",
-    "@endo/init": "0.5.56",
-    "@endo/marshal": "0.8.5",
-    "@endo/nat": "4.1.27",
-    "@endo/promise-kit": "0.2.56",
+    "@agoric/access-token": "0.4.22-orchestration-dev-096c4e8.0+096c4e8",
+    "@agoric/assert": "0.6.1-orchestration-dev-096c4e8.0+096c4e8",
+    "@agoric/cache": "0.3.3-orchestration-dev-096c4e8.0+096c4e8",
+    "@agoric/casting": "0.4.3-orchestration-dev-096c4e8.0+096c4e8",
+    "@agoric/cosmic-proto": "0.4.1-orchestration-dev-096c4e8.0+096c4e8",
+    "@agoric/ertp": "0.16.3-orchestration-dev-096c4e8.0+096c4e8",
+    "@agoric/governance": "0.10.4-orchestration-dev-096c4e8.0+096c4e8",
+    "@agoric/inter-protocol": "0.16.2-orchestration-dev-096c4e8.0+096c4e8",
+    "@agoric/internal": "0.3.3-orchestration-dev-096c4e8.0+096c4e8",
+    "@agoric/network": "0.1.1-orchestration-dev-096c4e8.0+096c4e8",
+    "@agoric/smart-wallet": "0.5.4-orchestration-dev-096c4e8.0+096c4e8",
+    "@agoric/store": "0.9.3-orchestration-dev-096c4e8.0+096c4e8",
+    "@agoric/swingset-vat": "0.32.3-orchestration-dev-096c4e8.0+096c4e8",
+    "@agoric/vats": "0.15.2-orchestration-dev-096c4e8.0+096c4e8",
+    "@agoric/zoe": "0.26.3-orchestration-dev-096c4e8.0+096c4e8",
+    "@agoric/zone": "0.2.3-orchestration-dev-096c4e8.0+096c4e8",
+    "@confio/relayer": "^0.11.3",
+    "@cosmjs/crypto": "^0.32.2",
+    "@cosmjs/encoding": "^0.32.2",
+    "@cosmjs/math": "^0.32.2",
+    "@cosmjs/proto-signing": "^0.32.2",
+    "@cosmjs/stargate": "^0.32.2",
+    "@endo/bundle-source": "^3.1.0",
+    "@endo/captp": "^4.0.4",
+    "@endo/compartment-mapper": "^1.1.2",
+    "@endo/env-options": "^1.1.1",
+    "@endo/far": "^1.0.4",
+    "@endo/init": "^1.0.4",
+    "@endo/marshal": "^1.3.0",
+    "@endo/nat": "^5.0.4",
+    "@endo/patterns": "^1.2.0",
+    "@endo/promise-kit": "^1.0.4",
     "@iarna/toml": "^2.2.3",
     "anylogger": "^0.21.0",
     "chalk": "^5.2.0",
-    "commander": "^10.0.0",
+    "commander": "^11.1.0",
     "deterministic-json": "^1.0.5",
     "esm": "agoric-labs/esm#Agoric-built",
     "inquirer": "^8.2.2",
@@ -87,5 +97,8 @@
     "timeout": "2m",
     "workerThreads": false
   },
-  "gitHead": "cfa7cb2bf1aa80bc60741a0eb5ba884995e8ee4c"
+  "typeCoverage": {
+    "atLeast": 76.93
+  },
+  "gitHead": "096c4e8fce80e9a509b0e1a30fda11736c4570e1"
 }

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/bin-agops.js

@@ -1,13 +1,16 @@
 #!/usr/bin/env node
 // @ts-check
 // @jessie-check
+/* eslint @typescript-eslint/no-floating-promises: "warn" */
 
-/* eslint-disable @jessie.js/no-nested-await */
 /* global fetch, setTimeout */
 
+import '@endo/init/pre.js';
+
 import '@agoric/casting/node-fetch-shim.js';
 import '@endo/init';
-import '@endo/init/pre.js';
+
+import { E } from '@endo/far';
 
 import { execFileSync } from 'child_process';
 import path from 'path';
@@ -15,7 +18,7 @@ import process from 'process';
 import anylogger from 'anylogger';
 import { Command, CommanderError, createCommand } from 'commander';
 import { makeOracleCommand } from './commands/oracle.js';
-import { makeEconomicCommiteeCommand } from './commands/ec.js';
+import { makeGovCommand } from './commands/gov.js';
 import { makePsmCommand } from './commands/psm.js';
 import { makeReserveCommand } from './commands/reserve.js';
 import { makeVaultsCommand } from './commands/vaults.js';
@@ -31,7 +34,7 @@ const program = new Command();
 program.name(progname).version('unversioned');
 
 program.addCommand(makeOracleCommand(logger));
-program.addCommand(makeEconomicCommiteeCommand(logger));
+program.addCommand(makeGovCommand(logger));
 program.addCommand(makePerfCommand(logger));
 program.addCommand(makePsmCommand(logger));
 program.addCommand(makeVaultsCommand(logger));
@@ -74,13 +77,11 @@ program.addCommand(makeAuctionCommand(logger, { ...procIO, fetch }));
 program.addCommand(makeInterCommand(procIO, { fetch }));
 program.addCommand(makeTestCommand(procIO, { fetch }));
 
-try {
-  await program.parseAsync(process.argv);
-} catch (err) {
+void E.when(program.parseAsync(process.argv), undefined, err => {
   if (err instanceof CommanderError) {
     console.error(err.message);
   } else {
     console.error(err); // CRASH! show stack trace
   }
   process.exit(1);
-}
+});

package/src/chain-config.js

@@ -1,5 +1,6 @@
 import djson from 'deterministic-json';
 import TOML from '@iarna/toml';
+import * as Tokens from '@agoric/internal/src/tokens.js';
 
 export const STAKING_MAX_VALIDATORS = 150;
 // Required for IBC connections not to time out.
@@ -13,38 +14,38 @@ export const ICA_HOST_ALLOW_MESSAGES = [
 ];
 
 const Stake = /** @type {const} */ ({
-  name: 'Agoric Staking Token',
+  name: Tokens.Stake.proposedName,
   description: 'The token used by delegates to stake on the Agoric chain',
   denom_units: [
     {
-      denom: 'ubld',
+      denom: Tokens.Stake.denom,
       exponent: 0,
     },
     {
       denom: 'bld',
-      exponent: 6,
+      exponent: Tokens.Stake.displayInfo.decimalPlaces,
     },
   ],
-  base: 'ubld',
+  base: Tokens.Stake.denom,
   display: 'bld',
-  symbol: 'BLD',
+  symbol: Tokens.Stake.symbol,
 });
 const Stable = /** @type {const} */ ({
-  name: 'Agoric stable token',
+  name: Tokens.Stable.proposedName,
   description: 'The stable token used by the Agoric chain',
   denom_units: [
     {
-      denom: 'uist',
+      denom: Tokens.Stable.denom,
       exponent: 0,
     },
     {
       denom: 'ist',
-      exponent: 6,
+      exponent: Tokens.Stable.displayInfo.decimalPlaces,
     },
   ],
-  base: 'uist',
+  base: Tokens.Stable.denom,
   display: 'ist',
-  symbol: 'IST',
+  symbol: Tokens.Stable.symbol,
 });
 export const DENOM_METADATA = /** @type {const} */ ([Stake, Stable]);
 
@@ -235,7 +236,6 @@ export function finishCosmosGenesis({ genesisJson, exportedGenesisJson }) {
 
   // Set the denomination for different modules.
   genesis.app_state.mint.params.mint_denom = MINT_DENOM;
-  genesis.app_state.crisis.constant_fee.denom = MINT_DENOM;
   genesis.app_state.gov.deposit_params.min_deposit = GOV_DEPOSIT_COINS;
   genesis.app_state.gov.voting_params.voting_period = GOV_VOTING_PERIOD;
 

package/src/commands/auction.js

@@ -1,4 +1,3 @@
-/* eslint-disable @jessie.js/no-nested-await */
 // @ts-check
 /* eslint-disable func-names */
 import { InvalidArgumentError } from 'commander';
@@ -8,7 +7,11 @@ import { outputActionAndHint } from '../lib/wallet.js';
 const { Fail } = assert;
 
 /** @typedef {import('@agoric/governance/src/contractGovernance/typedParamManager.js').ParamTypesMap} ParamTypesMap */
-/** @template M @typedef {import('@agoric/governance/src/contractGovernance/typedParamManager.js').ParamTypesMapFromRecord<M>} ParamTypesMapFromRecord */
+
+/**
+ * @template {ParamStateRecord} M
+ * @typedef {import('@agoric/governance/src/contractGovernance/typedParamManager.js').ParamTypesMapFromRecord<M>} ParamTypesMapFromRecord
+ */
 
 /**
  * @template {ParamTypesMap} M
@@ -111,7 +114,7 @@ export const makeAuctionCommand = (
          * but TimeMath.toRel prodocues a RelativeTime (which may be a bare bigint).
          *
          * @param {bigint} relValue
-         * @returns {import('@agoric/time/src/types').RelativeTimeRecord}
+         * @returns {import('@agoric/time').RelativeTimeRecord}
          */
         const toRel = relValue => ({ timerBrand, relValue });