agoric 0.21.2-other-dev-8f8782b.0 → 0.21.2-other-dev-fbe72e7.0.fbe72e7

package/README.md

@@ -2,79 +2,6 @@
 
 If you just want to use the Agoric CLI for your own smart contract, please see the [Getting Started website](https://agoric.com/documentation/getting-started/) for information.
 
-## Relaying via IBC
-
-The CLI integrates support for the [Confio
-ts-relayer](https://github.com/confio/ts-relayer#quick-start) via the
-`agoric ibc-setup` and `agoric ibc-relayer` commands.
-
-Run `agoric start --reset -v local-chain` in a project directory.  In the
-meantime, you can configure the relayer (note that `--registry-from .` means to use `./registry.yaml`):
-
-```console
-$ agoric ibc-setup init --registry-from . --src local --dest ollinet
-...
-$ agoric ibc-setup keys list
-ollinet: agoric1fwk40de0xu7gtlk8z858q2f5lfcqv33ml8qdg4
-local: agoric1rvyry6jqmcrrm4ay9tu23rer7que8kdj4206zk
-$
-```
-
-Once your chain has booted, send some `uist` tokens to your `local` relayer
-account printed above:
-
-```console
-$ agd --home=_agstate/keys tx --keyring-backend=test bank send provision agoric1rvyry6jqmcrrm4ay9tu23rer7que8kdj4206zk 20000000uist --from=provision --chain-id=agoriclocal --yes
-...
-$
-```
-
-Go to https://ollinet.faucet.agoric.net and fund your `ollinet` relayer account
-printed above with BLD/IBC toy tokens.
-
-Check your relayer balances.  Both `local` and `ollinet` relayer accounts should
-show `ubld` and `uist`:
-
-```console
-$ agoric ibc-setup balances
-CHAIN      AMOUNT
-ollinet    74972124ubld
-local      20000000uist
-$
-```
-
-Create an ICS-20 fungible token transfer channel:
-
-```console
-$ agoric ibc-setup ics20 -v
-...
-Created channel:
-  agoriclocal: transfer/channel-0 (connection-0)
-  agoricollinet-55: transfer/channel-33 (connection-12)
-$
-```
-
-Now that the channel exists, you can relay packets along it just by using:
-
-```console
-$ agoric ibc-relayer start -v --poll 15
-```
-
-Leave this running in the background, and use the above `transfer/channel-0` or
-`transfer/channel-33` to send tokens back and forth.  The following
-example uses the `tx ibc-transfer transfer` command, and then
-`transfer channel-0` to indicate the `transfer/channel-0` portID/channelID.  It really wants you to know this is about token *transfer*.
-
-```console
-$ agd --home=_agstate/keys tx ibc-transfer transfer --keyring-backend=test \
-  transfer channel-0 \
-  agoric1fwk40de0xu7gtlk8z858q2f5lfcqv33ml8qdg4 200uist \
-  --from=provision --chain-id=agoriclocal --yes
-...
-# Watch the ibc-relayer send a packet and its acknowledgement, then...
-$ agd query bank balances agoric1rvyry6jqmcrrm4ay9tu23rer7que8kdj4206zk
-```
-
 ## Developing Agoric CLI
 
 **NOTE: these steps are only for modifying the Agoric CLI.  See the above for using it to create your own smart contracts.**

package/package.json

@@ -1,69 +1,80 @@
 {
   "name": "agoric",
-  "version": "0.21.2-other-dev-8f8782b.0+8f8782b",
+  "version": "0.21.2-other-dev-fbe72e7.0.fbe72e7",
   "description": "Manage the Agoric Javascript smart contract platform",
   "type": "module",
   "main": "src/main.js",
   "bin": {
-    "agoric": "src/entrypoint.js",
-    "agops": "src/bin-agops.js"
+    "agops": "src/bin-agops.js",
+    "agoric": "src/entrypoint.js"
+  },
+  "exports": {
+    "./src/entrypoint.js": "./src/entrypoint.js",
+    "./src/helpers.js": "./src/helpers.js",
+    "./src/lib/index.js": "./src/lib/index.js"
   },
   "files": [
     "src",
+    "tools",
     "exported.js"
   ],
   "scripts": {
     "build": "node ./scripts/get-sdk-package-names.js > src/sdk-package-names.js",
     "test": "ava",
-    "test:c8": "c8 $C8_OPTIONS ava --config=ava-nesm.config.js",
+    "test:c8": "c8 --all ${C8_OPTIONS:-} ava",
     "test:xs": "exit 0",
     "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:eslint": "eslint ."
+    "lint": "yarn run -T run-s --continue-on-error 'lint:*'",
+    "lint:types": "yarn run -T tsc",
+    "lint:eslint": "yarn run -T eslint ."
   },
   "devDependencies": {
-    "@agoric/deploy-script-support": "0.10.4-other-dev-8f8782b.0+8f8782b",
-    "ava": "^5.2.0",
-    "c8": "^7.13.0",
-    "dd-trace": "^3.3.0"
+    "@agoric/cosmic-swingset": "0.41.4-other-dev-fbe72e7.0.fbe72e7",
+    "@agoric/deploy-script-support": "0.10.4-other-dev-fbe72e7.0.fbe72e7",
+    "ava": "^5.3.0",
+    "c8": "^10.1.2"
   },
   "dependencies": {
-    "@agoric/access-token": "0.4.22-other-dev-8f8782b.0+8f8782b",
-    "@agoric/assert": "0.6.1-other-dev-8f8782b.0+8f8782b",
-    "@agoric/cache": "0.3.3-other-dev-8f8782b.0+8f8782b",
-    "@agoric/casting": "0.4.3-other-dev-8f8782b.0+8f8782b",
-    "@agoric/cosmic-proto": "0.3.1-other-dev-8f8782b.0+8f8782b",
-    "@agoric/ertp": "0.16.3-other-dev-8f8782b.0+8f8782b",
-    "@agoric/inter-protocol": "0.16.2-other-dev-8f8782b.0+8f8782b",
-    "@agoric/internal": "0.3.3-other-dev-8f8782b.0+8f8782b",
-    "@agoric/smart-wallet": "0.5.4-other-dev-8f8782b.0+8f8782b",
-    "@agoric/store": "0.9.3-other-dev-8f8782b.0+8f8782b",
-    "@agoric/swingset-vat": "0.32.3-other-dev-8f8782b.0+8f8782b",
-    "@agoric/vats": "0.15.2-other-dev-8f8782b.0+8f8782b",
-    "@agoric/zoe": "0.26.3-other-dev-8f8782b.0+8f8782b",
-    "@agoric/zone": "0.2.3-other-dev-8f8782b.0+8f8782b",
-    "@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-other-dev-fbe72e7.0.fbe72e7",
+    "@agoric/cache": "0.3.3-other-dev-fbe72e7.0.fbe72e7",
+    "@agoric/casting": "0.4.3-other-dev-fbe72e7.0.fbe72e7",
+    "@agoric/client-utils": "0.1.1-other-dev-fbe72e7.0.fbe72e7",
+    "@agoric/cosmic-proto": "0.4.1-other-dev-fbe72e7.0.fbe72e7",
+    "@agoric/ertp": "0.16.3-other-dev-fbe72e7.0.fbe72e7",
+    "@agoric/governance": "0.10.4-other-dev-fbe72e7.0.fbe72e7",
+    "@agoric/inter-protocol": "0.16.2-other-dev-fbe72e7.0.fbe72e7",
+    "@agoric/internal": "0.3.3-other-dev-fbe72e7.0.fbe72e7",
+    "@agoric/network": "0.1.1-other-dev-fbe72e7.0.fbe72e7",
+    "@agoric/smart-wallet": "0.5.4-other-dev-fbe72e7.0.fbe72e7",
+    "@agoric/store": "0.9.3-other-dev-fbe72e7.0.fbe72e7",
+    "@agoric/swingset-vat": "0.32.3-other-dev-fbe72e7.0.fbe72e7",
+    "@agoric/vats": "0.15.2-other-dev-fbe72e7.0.fbe72e7",
+    "@agoric/zoe": "0.26.3-other-dev-fbe72e7.0.fbe72e7",
+    "@agoric/zone": "0.2.3-other-dev-fbe72e7.0.fbe72e7",
+    "@cosmjs/crypto": "^0.36.0",
+    "@cosmjs/encoding": "^0.36.0",
+    "@cosmjs/math": "^0.36.0",
+    "@cosmjs/proto-signing": "^0.36.0",
+    "@cosmjs/stargate": "^0.36.0",
+    "@endo/base64": "^1.0.12",
+    "@endo/bundle-source": "^4.1.2",
+    "@endo/captp": "^4.4.8",
+    "@endo/compartment-mapper": "^1.6.3",
+    "@endo/env-options": "^1.1.11",
+    "@endo/errors": "^1.2.13",
+    "@endo/far": "^1.1.14",
+    "@endo/init": "^1.1.12",
+    "@endo/marshal": "^1.8.0",
+    "@endo/nat": "^5.1.3",
+    "@endo/patterns": "^1.7.0",
+    "@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": "^10.0.0",
+    "commander": "^12.1.0",
     "deterministic-json": "^1.0.5",
-    "esm": "agoric-labs/esm#Agoric-built",
     "inquirer": "^8.2.2",
     "opener": "^1.5.2",
     "tmp": "^0.2.1",
@@ -82,10 +93,16 @@
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "ava": {
     "files": [
-      "test/**/test-*.js"
+      "test/**/*.test.*"
     ],
     "timeout": "2m",
     "workerThreads": false
   },
-  "gitHead": "8f8782bc52393e9d4fc82523ecf31cab429b11b3"
+  "typeCoverage": {
+    "atLeast": 79.88
+  },
+  "engines": {
+    "node": "^20.9 || ^22.11"
+  },
+  "gitHead": "fbe72e72107f9997f788674e668c660d92ec4492"
 }

package/src/anylogger-agoric.js

@@ -1,31 +1,46 @@
-/* global process */
+/* eslint-env node */
+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];
+anylogger.ext = (l, ...rest) => {
+  l = oldExt(l, ...rest);
+  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,11 @@
 #!/usr/bin/env node
+/* eslint-env node */
 // @ts-check
 // @jessie-check
 
-/* eslint-disable @jessie.js/no-nested-await */
-/* global fetch, setTimeout */
-
-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 +13,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';
@@ -30,8 +28,7 @@ const progname = path.basename(process.argv[1]);
 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));
@@ -69,18 +66,17 @@ const procIO = {
   setTimeout,
 };
 
+program.addCommand(makeOracleCommand(procIO, logger));
 program.addCommand(makeReserveCommand(logger, procIO));
 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]);
 
@@ -80,7 +81,12 @@ export const DEFAULT_RPC_PORT = 26657;
 export const DEFAULT_PROM_PORT = 26660;
 export const DEFAULT_API_PORT = 1317;
 
-// Rewrite the app.toml.
+/**
+ * Rewrite the app.toml.
+ *
+ * @param {{ appToml: string, enableCors?: boolean, exportMetrics?: boolean, portNum?: string, chainId?: string, enableRosetta?: boolean, rosettaPort?: string }} input
+ * @returns {string} toml
+ */
 export function finishCosmosApp({
   appToml,
   enableCors,
@@ -91,6 +97,8 @@ export function finishCosmosApp({
   rosettaPort = `${DEFAULT_ROSETTA_PORT}`,
 }) {
   const rpcPort = Number(portNum);
+  // TODO: Use an accurate narrow type.
+  /** @type {Record<string, any>} */
   const app = TOML.parse(appToml);
 
   if (enableCors) {
@@ -124,6 +132,7 @@ export function finishCosmosApp({
 
   // Optionally enable the rosetta service
   if (enableRosetta) {
+    app.rosetta ||= {};
     app.rosetta.enable = enableRosetta;
     app.rosetta.network = chainId;
     app.rosetta.retries = 30;
@@ -137,7 +146,12 @@ export function finishCosmosApp({
   return TOML.stringify(app);
 }
 
-// Rewrite the config.toml.
+/**
+ * Rewrite the config.toml.
+ *
+ * @param {{ configToml: string, enableCors?: boolean, exportMetrics?: boolean, portNum?: string, persistentPeers?: string, seeds?: string, unconditionalPeerIds?: string }} input
+ * @returns {string} toml
+ */
 export function finishTendermintConfig({
   configToml,
   enableCors,
@@ -150,6 +164,8 @@ export function finishTendermintConfig({
   const rpcPort = Number(portNum);
 
   // Adjust the config.toml.
+  // TODO: Use an accurate narrow type.
+  /** @type {Record<string, any>} */
   const config = TOML.parse(configToml);
 
   config.proxy_app = 'kvstore';
@@ -188,7 +204,12 @@ export function finishTendermintConfig({
   return TOML.stringify(config);
 }
 
-// Rewrite/import the genesis.json.
+/**
+ * Rewrite/import the genesis.json.
+ *
+ * @param {{ genesisJson: string, exportedGenesisJson?: string }} input
+ * @returns {string} json
+ */
 export function finishCosmosGenesis({ genesisJson, exportedGenesisJson }) {
   const genesis = JSON.parse(genesisJson);
   const exported = exportedGenesisJson ? JSON.parse(exportedGenesisJson) : {};
@@ -235,9 +256,14 @@ 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;
+
+  {
+    const gov = genesis.app_state.gov;
+    const depositParams = gov.params ?? gov.deposit_params;
+    const votingParams = gov.params ?? gov.voting_params;
+    depositParams.min_deposit = GOV_DEPOSIT_COINS;
+    votingParams.voting_period = GOV_VOTING_PERIOD;
+  }
 
   // Reduce the cost of a transaction.
   genesis.app_state.auth.params.tx_size_cost_per_byte = '1';

package/src/commands/auction.js

@@ -1,14 +1,21 @@
-/* eslint-disable @jessie.js/no-nested-await */
 // @ts-check
-/* eslint-disable func-names */
+/* eslint-env node */
+import {
+  fetchEnvNetworkConfig,
+  makeAgoricNames,
+  makeVstorageKit,
+} from '@agoric/client-utils';
+import { Fail } from '@endo/errors';
 import { InvalidArgumentError } from 'commander';
-import { makeRpcUtils } from '../lib/rpc.js';
 import { outputActionAndHint } from '../lib/wallet.js';
 
-const { Fail } = assert;
+/**
+ * @import {ParamTypesMap, ParamTypesMapFromRecord} from '@agoric/governance/src/contractGovernance/typedParamManager.js'
+ * @import {AuctionParamRecord} from '@agoric/inter-protocol/src/auction/params.js';
+ * @import {ParamValueForType} from '@agoric/governance/src/types.js'
+ */
 
-/** @typedef {import('@agoric/governance/src/contractGovernance/typedParamManager.js').ParamTypesMap} ParamTypesMap */
-/** @template M @typedef {import('@agoric/governance/src/contractGovernance/typedParamManager.js').ParamTypesMapFromRecord<M>} ParamTypesMapFromRecord */
+const networkConfig = await fetchEnvNetworkConfig({ env: process.env, fetch });
 
 /**
  * @template {ParamTypesMap} M
@@ -17,7 +24,6 @@ const { Fail } = assert;
  * }} ParamValues
  */
 
-/** @typedef {ReturnType<import('@agoric/inter-protocol/src/auction/params.js').makeAuctioneerParams>} AuctionParamRecord */
 /** @typedef {ParamValues<ParamTypesMapFromRecord<AuctionParamRecord>>} AuctionParams */
 
 /**
@@ -59,11 +65,6 @@ export const makeAuctionCommand = (
       'descending clock step size',
       BigInt,
     )
-    .option(
-      '--discount-step <integer>',
-      'proposed value (basis points)',
-      BigInt,
-    )
     .requiredOption(
       '--charterAcceptOfferId <string>',
       'offer that had continuing invitation result',
@@ -91,13 +92,13 @@ export const makeAuctionCommand = (
        * }} opts
        */
       async opts => {
-        const { agoricNames, readLatestHead } = await makeRpcUtils({ fetch });
-
-        /** @type {{ current: AuctionParamRecord }} */
-        // @ts-expect-error XXX should runtime check?
-        const { current } = await readLatestHead(
-          `published.auction.governance`,
+        const { readPublished, ...vsk } = makeVstorageKit(
+          { fetch },
+          networkConfig,
         );
+        const agoricNames = await makeAgoricNames(vsk.fromBoard, vsk.vstorage);
+
+        const { current } = await readPublished(`auction.governance`);
 
         const {
           AuctionStartDelay: {
@@ -111,7 +112,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 });
 
@@ -130,6 +131,8 @@ export const makeAuctionCommand = (
         };
 
         if (Object.keys(params).length === 0) {
+          // InvalidArgumentError is a class constructor, and so
+          // must be invoked with `new`.
           throw new InvalidArgumentError(`no parameters given`);
         }