agoric 0.21.2-dev-7244c71.0 → 0.21.2-getting-started-dev-26244e8.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agoric",
-  "version": "0.21.2-dev-7244c71.0+7244c71",
+  "version": "0.21.2-getting-started-dev-26244e8.0+26244e8",
   "description": "Manage the Agoric Javascript smart contract platform",
   "type": "module",
   "main": "src/main.js",
@@ -8,10 +8,6 @@
     "agoric": "src/entrypoint.js",
     "agops": "src/bin-agops.js"
   },
-  "exports": {
-    "./src/entrypoint.js": "./src/entrypoint.js",
-    "./src/helpers.js": "./src/helpers.js"
-  },
   "files": [
     "src",
     "exported.js"
@@ -24,48 +20,44 @@
     "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",
+    "lint:types": "tsc -p jsconfig.json",
     "lint:eslint": "eslint ."
   },
   "devDependencies": {
-    "@agoric/cosmic-swingset": "0.41.4-dev-7244c71.0+7244c71",
-    "@agoric/deploy-script-support": "0.10.4-dev-7244c71.0+7244c71",
-    "ava": "^5.3.0",
+    "@agoric/deploy-script-support": "0.10.4-getting-started-dev-26244e8.0+26244e8",
+    "ava": "^5.2.0",
     "c8": "^7.13.0",
-    "dd-trace": "^4.11.1"
+    "dd-trace": "^3.3.0"
   },
   "dependencies": {
-    "@agoric/access-token": "0.4.22-dev-7244c71.0+7244c71",
-    "@agoric/assert": "0.6.1-dev-7244c71.0+7244c71",
-    "@agoric/cache": "0.3.3-dev-7244c71.0+7244c71",
-    "@agoric/casting": "0.4.3-dev-7244c71.0+7244c71",
-    "@agoric/cosmic-proto": "0.3.1-dev-7244c71.0+7244c71",
-    "@agoric/ertp": "0.16.3-dev-7244c71.0+7244c71",
-    "@agoric/governance": "0.10.4-dev-7244c71.0+7244c71",
-    "@agoric/inter-protocol": "0.16.2-dev-7244c71.0+7244c71",
-    "@agoric/internal": "0.3.3-dev-7244c71.0+7244c71",
-    "@agoric/network": "0.1.1-dev-7244c71.0+7244c71",
-    "@agoric/smart-wallet": "0.5.4-dev-7244c71.0+7244c71",
-    "@agoric/store": "0.9.3-dev-7244c71.0+7244c71",
-    "@agoric/swingset-vat": "0.32.3-dev-7244c71.0+7244c71",
-    "@agoric/vats": "0.15.2-dev-7244c71.0+7244c71",
-    "@agoric/zoe": "0.26.3-dev-7244c71.0+7244c71",
-    "@agoric/zone": "0.2.3-dev-7244c71.0+7244c71",
+    "@agoric/access-token": "0.4.22-getting-started-dev-26244e8.0+26244e8",
+    "@agoric/assert": "0.6.1-getting-started-dev-26244e8.0+26244e8",
+    "@agoric/cache": "0.3.3-getting-started-dev-26244e8.0+26244e8",
+    "@agoric/casting": "0.4.3-getting-started-dev-26244e8.0+26244e8",
+    "@agoric/cosmic-proto": "0.3.1-getting-started-dev-26244e8.0+26244e8",
+    "@agoric/ertp": "0.16.3-getting-started-dev-26244e8.0+26244e8",
+    "@agoric/inter-protocol": "0.16.2-getting-started-dev-26244e8.0+26244e8",
+    "@agoric/internal": "0.4.0-getting-started-dev-26244e8.0+26244e8",
+    "@agoric/smart-wallet": "0.5.4-getting-started-dev-26244e8.0+26244e8",
+    "@agoric/store": "0.9.3-getting-started-dev-26244e8.0+26244e8",
+    "@agoric/swingset-vat": "0.32.3-getting-started-dev-26244e8.0+26244e8",
+    "@agoric/vats": "0.15.2-getting-started-dev-26244e8.0+26244e8",
+    "@agoric/zoe": "0.26.3-getting-started-dev-26244e8.0+26244e8",
+    "@agoric/zone": "0.2.3-getting-started-dev-26244e8.0+26244e8",
     "@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.7.0",
-    "@endo/captp": "^3.1.4",
-    "@endo/compartment-mapper": "^0.9.1",
-    "@endo/far": "^0.2.21",
-    "@endo/init": "^0.5.59",
-    "@endo/marshal": "^0.8.8",
-    "@endo/nat": "^4.1.30",
-    "@endo/patterns": "^0.2.6",
-    "@endo/promise-kit": "^0.2.59",
+    "@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",
     "@iarna/toml": "^2.2.3",
     "anylogger": "^0.21.0",
     "chalk": "^5.2.0",
@@ -95,8 +87,5 @@
     "timeout": "2m",
     "workerThreads": false
   },
-  "typeCoverage": {
-    "atLeast": 77.53
-  },
-  "gitHead": "7244c710962174a886903cf039c0fbe18874287f"
+  "gitHead": "26244e821f1a83cd5868f0c7d54aa480c8c17e5e"
 }

package/src/bin-agops.js

@@ -1,16 +1,13 @@
 #!/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 { E } from '@endo/far';
+import '@endo/init/pre.js';
 
 import { execFileSync } from 'child_process';
 import path from 'path';
@@ -18,7 +15,7 @@ import process from 'process';
 import anylogger from 'anylogger';
 import { Command, CommanderError, createCommand } from 'commander';
 import { makeOracleCommand } from './commands/oracle.js';
-import { makeGovCommand } from './commands/gov.js';
+import { makeEconomicCommiteeCommand } from './commands/ec.js';
 import { makePsmCommand } from './commands/psm.js';
 import { makeReserveCommand } from './commands/reserve.js';
 import { makeVaultsCommand } from './commands/vaults.js';
@@ -34,7 +31,7 @@ const program = new Command();
 program.name(progname).version('unversioned');
 
 program.addCommand(makeOracleCommand(logger));
-program.addCommand(makeGovCommand(logger));
+program.addCommand(makeEconomicCommiteeCommand(logger));
 program.addCommand(makePerfCommand(logger));
 program.addCommand(makePsmCommand(logger));
 program.addCommand(makeVaultsCommand(logger));
@@ -77,11 +74,13 @@ program.addCommand(makeAuctionCommand(logger, { ...procIO, fetch }));
 program.addCommand(makeInterCommand(procIO, { fetch }));
 program.addCommand(makeTestCommand(procIO, { fetch }));
 
-E.when(program.parseAsync(process.argv), undefined, err => {
+try {
+  await program.parseAsync(process.argv);
+} catch (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,6 +1,5 @@
 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.
@@ -14,38 +13,38 @@ export const ICA_HOST_ALLOW_MESSAGES = [
 ];
 
 const Stake = /** @type {const} */ ({
-  name: Tokens.Stake.proposedName,
+  name: 'Agoric Staking Token',
   description: 'The token used by delegates to stake on the Agoric chain',
   denom_units: [
     {
-      denom: Tokens.Stake.denom,
+      denom: 'ubld',
       exponent: 0,
     },
     {
       denom: 'bld',
-      exponent: Tokens.Stake.displayInfo.decimalPlaces,
+      exponent: 6,
     },
   ],
-  base: Tokens.Stake.denom,
+  base: 'ubld',
   display: 'bld',
-  symbol: Tokens.Stake.symbol,
+  symbol: 'BLD',
 });
 const Stable = /** @type {const} */ ({
-  name: Tokens.Stable.proposedName,
+  name: 'Agoric stable token',
   description: 'The stable token used by the Agoric chain',
   denom_units: [
     {
-      denom: Tokens.Stable.denom,
+      denom: 'uist',
       exponent: 0,
     },
     {
       denom: 'ist',
-      exponent: Tokens.Stable.displayInfo.decimalPlaces,
+      exponent: 6,
     },
   ],
-  base: Tokens.Stable.denom,
+  base: 'uist',
   display: 'ist',
-  symbol: Tokens.Stable.symbol,
+  symbol: 'IST',
 });
 export const DENOM_METADATA = /** @type {const} */ ([Stake, Stable]);
 

package/src/commands/auction.js

@@ -1,3 +1,4 @@
+/* eslint-disable @jessie.js/no-nested-await */
 // @ts-check
 /* eslint-disable func-names */
 import { InvalidArgumentError } from 'commander';
@@ -7,11 +8,7 @@ import { outputActionAndHint } from '../lib/wallet.js';
 const { Fail } = assert;
 
 /** @typedef {import('@agoric/governance/src/contractGovernance/typedParamManager.js').ParamTypesMap} ParamTypesMap */
-
-/**
- * @template {ParamStateRecord} M
- * @typedef {import('@agoric/governance/src/contractGovernance/typedParamManager.js').ParamTypesMapFromRecord<M>} ParamTypesMapFromRecord
- */
+/** @template M @typedef {import('@agoric/governance/src/contractGovernance/typedParamManager.js').ParamTypesMapFromRecord<M>} ParamTypesMapFromRecord */
 
 /**
  * @template {ParamTypesMap} M

package/src/commands/{gov.js → ec.js}

@@ -1,3 +1,4 @@
+/* eslint-disable @jessie.js/no-nested-await */
 // @ts-check
 /* eslint-disable func-names */
 /* global globalThis, process, setTimeout */
@@ -15,13 +16,6 @@ import {
 
 /** @typedef {import('@agoric/smart-wallet/src/offers.js').OfferSpec} OfferSpec */
 
-const collectValues = (val, memo) => {
-  memo.push(val);
-  return memo;
-};
-
-const defaultKeyring = process.env.AGORIC_KEYRING_BACKEND || 'test';
-
 /**
  * @param {import('anylogger').Logger} _logger
  * @param {{
@@ -33,7 +27,7 @@ const defaultKeyring = process.env.AGORIC_KEYRING_BACKEND || 'test';
  *   delay?: (ms: number) => Promise<void>,
  * }} [io]
  */
-export const makeGovCommand = (_logger, io = {}) => {
+export const makeEconomicCommiteeCommand = (_logger, io = {}) => {
   const {
     // Allow caller to provide access explicitly, but
     // default to conventional ambient IO facilities.
@@ -45,22 +39,11 @@ export const makeGovCommand = (_logger, io = {}) => {
     delay = ms => new Promise(resolve => setTimeout(resolve, ms)),
   } = io;
 
-  const cmd = new Command('gov').description('Electoral governance commands');
-  // backwards compatibility with less general "ec" command. To make this work
-  // the new CLI options default to the values used for Economic Committee
-  cmd.alias('ec');
-  cmd.option(
-    '--keyring-backend <os|file|test>',
-    `keyring's backend (os|file|test) (default "${defaultKeyring}")`,
-    defaultKeyring,
-  );
+  const ec = new Command('ec').description('Economic Committee commands');
 
   /** @param {string} literalOrName */
   const normalizeAddress = literalOrName =>
-    normalizeAddressWithOptions(literalOrName, {
-      // FIXME does not observe keyring-backend option, which isn't available during arg parsing
-      keyringBackend: defaultKeyring,
-    });
+    normalizeAddressWithOptions(literalOrName, { keyringBackend: 'test' });
 
   /** @type {(info: unknown, indent?: unknown) => boolean } */
   const show = (info, indent) =>
@@ -81,21 +64,15 @@ export const makeGovCommand = (_logger, io = {}) => {
    * @param {{
    *   toOffer: (agoricNames: *, current: import('@agoric/smart-wallet/src/smartWallet').CurrentWalletRecord | undefined) => OfferSpec,
    *   sendFrom?: string | undefined,
-   *   keyringBackend: string,
    *   instanceName?: string,
    * }} detail
    * @param {Awaited<ReturnType<makeRpcUtils>>} [optUtils]
    */
-  const processOffer = async function (
-    { toOffer, sendFrom, keyringBackend },
-    optUtils,
-  ) {
+  const processOffer = async function ({ toOffer, sendFrom }, optUtils) {
     const networkConfig = await getNetworkConfig(env);
     const utils = await (optUtils || makeRpcUtils({ fetch }));
     const { agoricNames, readLatestHead } = utils;
 
-    assert(keyringBackend, 'missing keyring-backend option');
-
     let current;
     if (sendFrom) {
       current = await getCurrent(sendFrom, { readLatestHead });
@@ -113,7 +90,7 @@ export const makeGovCommand = (_logger, io = {}) => {
     const result = await sendAction(
       { method: 'executeOffer', offer },
       {
-        keyring: { backend: keyringBackend },
+        keyring: { backend: 'test' }, // XXX
         from: sendFrom,
         verbose: false,
         ...networkConfig,
@@ -150,38 +127,29 @@ export const makeGovCommand = (_logger, io = {}) => {
     show(blockInfo);
   };
 
-  cmd
-    .command('committee')
-    .description('accept invitation to join a committee')
-    .requiredOption(
-      '--name <string>',
-      'Committee instance name',
-      String,
-      'economicCommittee',
-    )
+  ec.command('committee')
+    .description('accept invitation to join the economic committee')
     .option('--voter <number>', 'Voter number', Number, 0)
     .option(
       '--offerId <string>',
       'Offer id',
       String,
-      `gov-committee-${Date.now()}`,
+      `ecCommittee-${Date.now()}`,
     )
     .option(
       '--send-from <name-or-address>',
       'Send from address',
       normalizeAddress,
     )
-    .action(async function (opts, options) {
-      const { name: instanceName } = opts;
-
+    .action(async function (opts) {
       /** @type {Parameters<typeof processOffer>[0]['toOffer']} */
       const toOffer = (agoricNames, current) => {
-        const instance = agoricNames.instance[instanceName];
-        assert(instance, `missing ${instanceName}`);
+        const instance = agoricNames.instance.economicCommittee;
+        assert(instance, `missing economicCommittee`);
 
         if (current) {
           const found = findContinuingIds(current, agoricNames);
-          abortIfSeen(instanceName, found);
+          abortIfSeen('economicCommittee', found);
         }
 
         return {
@@ -197,37 +165,28 @@ export const makeGovCommand = (_logger, io = {}) => {
 
       await processOffer({
         toOffer,
-        instanceName,
-        sendFrom: opts.sendFrom,
-        keyringBackend: options.optsWithGlobals().keyringBackend,
+        instanceName: 'economicCommittee',
+        ...opts,
       });
     });
 
-  cmd
-    .command('charter')
+  ec.command('charter')
     .description('accept the charter invitation')
-    .requiredOption(
-      '--name <string>',
-      'Charter instance name',
-      'economicCommitteeCharter',
-    )
-    .option('--offerId <string>', 'Offer id', String, `charter-${Date.now()}`)
+    .option('--offerId <string>', 'Offer id', String, `ecCharter-${Date.now()}`)
     .option(
       '--send-from <name-or-address>',
       'Send from address',
       normalizeAddress,
     )
-    .action(async function (opts, options) {
-      const { name: instanceName } = opts;
-
+    .action(async function (opts) {
       /** @type {Parameters<typeof processOffer>[0]['toOffer']} */
       const toOffer = (agoricNames, current) => {
-        const instance = agoricNames.instance[instanceName];
-        assert(instance, `missing ${instanceName}`);
+        const instance = agoricNames.instance.econCommitteeCharter;
+        assert(instance, `missing econCommitteeCharter`);
 
         if (current) {
           const found = findContinuingIds(current, agoricNames);
-          abortIfSeen(instanceName, found);
+          abortIfSeen('econCommitteeCharter', found);
         }
 
         return {
@@ -243,14 +202,12 @@ export const makeGovCommand = (_logger, io = {}) => {
 
       await processOffer({
         toOffer,
-        instanceName,
-        sendFrom: opts.sendFrom,
-        keyringBackend: options.optsWithGlobals().keyringBackend,
+        instanceName: 'econCommitteeCharter',
+        ...opts,
       });
     });
 
-  cmd
-    .command('find-continuing-id')
+  ec.command('find-continuing-id')
     .description('print id of specified voting continuing invitation')
     .requiredOption(
       '--from <name-or-address>',
@@ -276,8 +233,7 @@ export const makeGovCommand = (_logger, io = {}) => {
       console.log(match.offerId);
     });
 
-  cmd
-    .command('find-continuing-ids')
+  ec.command('find-continuing-ids')
     .description('print records of voting continuing invitations')
     .requiredOption(
       '--from <name-or-address>',
@@ -289,27 +245,12 @@ export const makeGovCommand = (_logger, io = {}) => {
       const current = await getCurrent(opts.from, { readLatestHead });
 
       const found = findContinuingIds(current, agoricNames);
-      for (const it of found) {
-        show({ ...it, address: opts.from });
-      }
+      found.forEach(it => show({ ...it, address: opts.from }));
     });
 
-  cmd
-    .command('vote')
-    .description('vote on latest question')
-    .requiredOption(
-      '--instance <string>',
-      'Committee name under agoricNames.instances',
-      String,
-      'economicCommittee',
-    )
-    .requiredOption(
-      '--pathname <string>',
-      'Committee name under published.committees',
-      String,
-      'Economic_Committee',
-    )
-    .option('--offerId <number>', 'Offer id', String, `gov-vote-${Date.now()}`)
+  ec.command('vote')
+    .description('vote on a question (hard-coded for now))')
+    .option('--offerId <number>', 'Offer id', String, `ecVote-${Date.now()}`)
     .requiredOption(
       '--forPosition <number>',
       'index of one position to vote for (within the question description.positions); ',
@@ -320,18 +261,17 @@ export const makeGovCommand = (_logger, io = {}) => {
       'Send from address',
       normalizeAddress,
     )
-    .action(async function (opts, options) {
+    .action(async function (opts) {
       const utils = await makeRpcUtils({ fetch });
       const { readLatestHead } = utils;
 
       const info = await readLatestHead(
-        `published.committees.${opts.pathname}.latestQuestion`,
+        'published.committees.Economic_Committee.latestQuestion',
       ).catch(err => {
         throw new CommanderError(1, 'VSTORAGE_FAILURE', err.message);
       });
-
       // XXX runtime shape-check
-      const questionDesc = /** @type {QuestionDetails} */ (info);
+      const questionDesc = /** @type {any} */ (info);
 
       // TODO support multiple position arguments
       const chosenPositions = [questionDesc.positions[opts.forPosition]];
@@ -340,7 +280,9 @@ export const makeGovCommand = (_logger, io = {}) => {
       /** @type {Parameters<typeof processOffer>[0]['toOffer']} */
       const toOffer = (agoricNames, current) => {
         const cont = current ? findContinuingIds(current, agoricNames) : [];
-        const votingRight = cont.find(it => it.instanceName === opts.instance);
+        const votingRight = cont.find(
+          it => it.instance === agoricNames.instance.economicCommittee,
+        );
         if (!votingRight) {
           console.debug('continuing ids', cont, 'for', current);
           throw new CommanderError(
@@ -365,89 +307,8 @@ export const makeGovCommand = (_logger, io = {}) => {
         };
       };
 
-      await processOffer(
-        {
-          toOffer,
-          sendFrom: opts.sendFrom,
-          keyringBackend: options.optsWithGlobals().keyringBackend,
-        },
-        utils,
-      );
-    });
-
-  cmd
-    .command('proposePauseOffers')
-    .description('propose a vote to pause offers')
-    .option(
-      '--send-from <name-or-address>',
-      'Send from address',
-      normalizeAddress,
-    )
-    .option(
-      '--offerId <string>',
-      'Offer id',
-      String,
-      `proposePauseOffers-${Date.now()}`,
-    )
-    .requiredOption(
-      '--instance <string>',
-      'name of governed instance in agoricNames',
-    )
-    .requiredOption(
-      '--substring <string>',
-      'an offer string to pause (can be repeated)',
-      collectValues,
-      [],
-    )
-    .option(
-      '--deadline <minutes>',
-      'minutes from now to close the vote',
-      Number,
-      1,
-    )
-    .action(async function (opts, options) {
-      const { instance: instanceName } = opts;
-
-      /** @type {Parameters<typeof processOffer>[0]['toOffer']} */
-      const toOffer = (agoricNames, current) => {
-        const instance = agoricNames.instance[instanceName];
-        assert(instance, `missing ${instanceName}`);
-        assert(current, 'missing current wallet');
-
-        const known = findContinuingIds(current, agoricNames);
-
-        assert(known, 'could not find committee acceptance offer id');
-
-        // TODO magic string
-        const match = known.find(
-          r => r.description === 'charter member invitation',
-        );
-        assert(match, 'no offer found for charter member invitation');
-
-        return {
-          id: opts.offerId,
-          invitationSpec: {
-            source: 'continuing',
-            previousOffer: match.offerId,
-            invitationMakerName: 'VoteOnPauseOffers',
-            // ( instance, strings list, timer deadline seconds )
-            invitationArgs: harden([
-              instance,
-              opts.substring,
-              BigInt(opts.deadline * 60 + Math.round(Date.now() / 1000)),
-            ]),
-          },
-          proposal: {},
-        };
-      };
-
-      await processOffer({
-        toOffer,
-        instanceName,
-        sendFrom: opts.sendFrom,
-        keyringBackend: options.optsWithGlobals().keyringBackend,
-      });
+      await processOffer({ toOffer, sendFrom: opts.sendFrom }, utils);
     });
 
-  return cmd;
+  return ec;
 };