agoric 0.21.2-mainnet1B-dev-26244e8.0 → 0.21.2-orchestration-dev-096c4e8.0

package/src/commands/reserve.js

@@ -1,4 +1,3 @@
-/* eslint-disable @jessie.js/no-nested-await */
 // @ts-check
 /* eslint-disable func-names */
 /* global fetch, process */
@@ -32,7 +31,7 @@ export const makeReserveCommand = (_logger, io = {}) => {
       async ({ collateralBrand, ...opts }) => {
         const { agoricNames } = await makeRpcUtils({ fetch });
 
-        const offer = Offers.reserve.AddCollateral(agoricNames.brand, {
+        const offer = Offers.reserve.AddCollateral(agoricNames, {
           collateralBrandKey: collateralBrand,
           ...opts,
         });

package/src/commands/test-upgrade.js

@@ -38,7 +38,6 @@ export const makeTestCommand = (
     try {
       // XXX pass fetch to getNetworkConfig() explicitly
       // await null above makes this await safe
-      // eslint-disable-next-line @jessie.js/no-nested-await
       const networkConfig = await getNetworkConfig(env);
       return makeWalletUtils({ fetch, execFileSync, delay }, networkConfig);
     } catch (err) {
@@ -83,7 +82,13 @@ export const makeTestCommand = (
           publicInvitationMaker: 'makeInvitation',
         },
         proposal: {
-          want: { Tokens: { brand: agoricNames.brand.GoodStuff, value: 32n } },
+          want: {
+            Tokens: {
+              // @ts-expect-error BoardRemote not a Brand object
+              brand: agoricNames.brand.GoodStuff,
+              value: 32n,
+            },
+          },
         },
       };
       const result = await sendAction(

package/src/commands/vaults.js

@@ -1,5 +1,3 @@
-/* eslint-disable no-await-in-loop */
-/* eslint-disable @jessie.js/no-nested-await */
 // @ts-check
 /* eslint-disable func-names */
 /* global fetch, process */
@@ -56,7 +54,7 @@ export const makeVaultsCommand = logger => {
 
   vaults
     .command('open')
-    .description('open a new vault')
+    .description('Prepare an offer to open a new vault')
     .requiredOption('--giveCollateral <number>', 'Collateral to give', Number)
     .requiredOption('--wantMinted <number>', 'Minted wants', Number)
     .option('--offerId <string>', 'Offer id', String, `openVault-${Date.now()}`)
@@ -65,7 +63,7 @@ export const makeVaultsCommand = logger => {
       logger.warn('running with options', opts);
       const { agoricNames } = await makeRpcUtils({ fetch });
 
-      const offer = Offers.vaults.OpenVault(agoricNames.brand, {
+      const offer = Offers.vaults.OpenVault(agoricNames, {
         giveCollateral: opts.giveCollateral,
         wantMinted: opts.wantMinted,
         offerId: opts.offerId,
@@ -78,7 +76,7 @@ export const makeVaultsCommand = logger => {
 
   vaults
     .command('adjust')
-    .description('adjust an existing vault')
+    .description('Prepare an offer to adjust an existing vault')
     .requiredOption(
       '--from <address>',
       'wallet address literal or name',
@@ -106,7 +104,7 @@ export const makeVaultsCommand = logger => {
       );
 
       const offer = Offers.vaults.AdjustBalances(
-        agoricNames.brand,
+        agoricNames,
         {
           giveCollateral: opts.giveCollateral,
           wantCollateral: opts.wantCollateral,
@@ -123,7 +121,7 @@ export const makeVaultsCommand = logger => {
 
   vaults
     .command('close')
-    .description('close an existing vault')
+    .description('Prepare an offer to close an existing vault')
     .requiredOption(
       '--from <address>',
       'wallet address literal or name',
@@ -147,7 +145,7 @@ export const makeVaultsCommand = logger => {
       );
 
       const offer = Offers.vaults.CloseVault(
-        agoricNames.brand,
+        agoricNames,
         {
           giveMinted: opts.giveMinted,
           offerId: opts.offerId,

package/src/commands/wallet.js

@@ -8,7 +8,6 @@ import {
   makeLeader,
   makeLeaderFromRpcAddresses,
 } from '@agoric/casting';
-import { Command } from 'commander';
 import fs from 'fs';
 import util from 'util';
 import { execFileSync } from 'child_process';
@@ -25,8 +24,12 @@ import { coalesceWalletState, getCurrent } from '../lib/wallet.js';
 
 const SLEEP_SECONDS = 3;
 
-export const makeWalletCommand = async () => {
-  const wallet = new Command('wallet')
+/**
+ * @param {import('commander').Command['command']} command
+ * @returns {Promise<import('commander').Command>}
+ */
+export const makeWalletCommand = async command => {
+  const wallet = command('wallet')
     .description('wallet commands')
     .option('--home <dir>', 'agd application home directory')
     .option(
@@ -47,10 +50,11 @@ export const makeWalletCommand = async () => {
     )
     .option('--spend', 'confirm you want to spend')
     .option('--nickname <string>', 'nickname to use', 'my-wallet')
-    .action(function (opts) {
+    .action(async function (opts) {
       const { account, nickname, spend } = opts;
       const { home, keyringBackend: backend } = wallet.opts();
       const tx = ['provision-one', nickname, account, 'SMART_WALLET'];
+      await null;
       if (spend) {
         execSwingsetTransaction(tx, {
           from: account,
@@ -58,12 +62,12 @@ export const makeWalletCommand = async () => {
           ...networkConfig,
         });
       } else {
-        const params = fetchSwingsetParams(networkConfig);
+        const params = await fetchSwingsetParams(networkConfig);
         assert(
-          params.power_flag_fees.length === 1,
-          'multiple power_flag_fees not supported',
+          params.powerFlagFees.length === 1,
+          'multiple powerFlagFees not supported',
         );
-        const { fee: fees } = params.power_flag_fees[0];
+        const { fee: fees } = params.powerFlagFees[0];
         const nf = new Intl.NumberFormat('en-US');
         const costs = fees
           .map(f => `${nf.format(Number(f.amount))} ${f.denom}`)

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/follow.js

@@ -142,9 +142,12 @@ export default async function followerMain(progname, rawArgs, powers, opts) {
       verbose && console.warn('Following', spec);
       const castingSpec = makeCastingSpec(spec);
       const follower = makeFollower(castingSpec, leader, followerOptions);
-      for await (const { value, blockHeight, currentBlockHeight } of iterate(
-        follower,
-      )) {
+      for await (const obj of iterate(follower)) {
+        if ('error' in obj) {
+          console.error('Error following:', obj.error);
+          continue;
+        }
+        const { value, blockHeight, currentBlockHeight } = obj;
         const blockHeightPrefix = opts.blockHeight ? `${blockHeight}:` : '';
         const currentBlockHeightPrefix = opts.currentBlockHeight
           ? `${currentBlockHeight}:`

package/src/helpers.js

@@ -41,6 +41,7 @@ export const makePspawn = ({
    * @param {string} cmd command name to run
    * @param {Array<string>} cargs arguments to the command
    * @param {object} param2
+   * @param {string} [param2.cwd]
    * @param {string | [string, string, string]} [param2.stdio] standard IO
    * specification
    * @param {Record<string, string | undefined>} [param2.env] environment

package/src/init.js

@@ -1,11 +1,9 @@
 import chalk from 'chalk';
 import { makePspawn } from './helpers.js';
 
-// Ambient types. Needed only for dev but this does a runtime import.
-// https://github.com/Agoric/agoric-sdk/issues/6512
-import '@endo/captp/src/types.js';
-import '@agoric/swingset-vat/exported.js';
-import '@agoric/swingset-vat/src/vats/network/types.js';
+/// <reference types="@endo/captp/src/types.js" />
+/// <reference types="@agoric/swingset-vat/exported.js" />
+/// <reference types="@agoric/network/exported.js" />
 
 // Use either an absolute template URL, or find it relative to DAPP_URL_BASE.
 const gitURL = (relativeOrAbsoluteURL, base) => {
@@ -40,9 +38,10 @@ export default async function initMain(_progname, rawArgs, priv, opts) {
     dappBranch = ['-b', opts.dappBranch];
   }
 
+  const shallow = ['--depth', '1', '--shallow-submodules'];
   const exitStatus = await pspawn(
     'git',
-    ['clone', '--origin=upstream', dappURL, DIR, ...dappBranch],
+    ['clone', '--origin=upstream', ...shallow, dappURL, DIR, ...dappBranch],
     {
       stdio: 'inherit',
     },
@@ -60,7 +59,6 @@ export default async function initMain(_progname, rawArgs, priv, opts) {
     const path = `${DIR}/${dir}package.json`;
     log('rewriting ', path);
 
-    // eslint-disable-next-line no-await-in-loop
     const contents = await fs.readFile(path, 'utf-8');
     const pkg = JSON.parse(contents.replace(/@DIR@/g, DIR));
     if (dir === '') {
@@ -74,7 +72,6 @@ export default async function initMain(_progname, rawArgs, priv, opts) {
     pkg.name = `${DIR}${pkg.name.substr(topLevelName.length)}`;
     const json = JSON.stringify(pkg, undefined, 2);
 
-    // eslint-disable-next-line no-await-in-loop
     await fs.writeFile(path, json);
   }
 

package/src/install.js

@@ -1,4 +1,4 @@
-/* global process AggregateError Buffer */
+/* global process Buffer */
 import path from 'path';
 import chalk from 'chalk';
 import { makePspawn } from './helpers.js';
@@ -41,9 +41,9 @@ export default async function installMain(progname, rawArgs, powers, opts) {
     p.childProcess.stdout.on('data', out => stdout.push(out));
     await p;
     const d = JSON.parse(Buffer.concat(stdout).toString('utf-8'));
-    Object.entries(d).forEach(([name, { location }]) =>
-      map.set(name, path.resolve(cwd, location)),
-    );
+    for (const [name, { location }] of Object.entries(d)) {
+      map.set(name, path.resolve(cwd, location));
+    }
     return map;
   }
 
@@ -61,7 +61,6 @@ export default async function installMain(progname, rawArgs, powers, opts) {
   const yarnInstallEachWorktree = async (phase, ...flags) => {
     for await (const workTree of workTrees) {
       log.info(`yarn install ${phase} in ${workTree}`);
-      // eslint-disable-next-line no-await-in-loop
       const yarnInstall = await pspawn(
         'yarn',
         [...linkFlags, 'install', ...flags],
@@ -269,7 +268,9 @@ export default async function installMain(progname, rawArgs, powers, opts) {
     };
     await Promise.all(subdirs.map(removeNodeModulesSymlinks));
   } else {
-    DEFAULT_SDK_PACKAGE_NAMES.forEach(name => sdkPackageToPath.set(name, null));
+    for (const name of DEFAULT_SDK_PACKAGE_NAMES) {
+      sdkPackageToPath.set(name, null);
+    }
   }
 
   if (forceSdkVersion !== undefined) {
@@ -288,6 +289,7 @@ export default async function installMain(progname, rawArgs, powers, opts) {
   await Promise.all(
     [...sdkPackageToPath.entries()].map(async ([pjName, dir]) => {
       const SUBOPTIMAL = false;
+      await null;
       if (SUBOPTIMAL) {
         // This use of yarn is noisy and slow.
         await pspawn('yarn', [...linkFlags, 'unlink', pjName]);

package/src/lib/chain.js

@@ -1,5 +1,6 @@
 // @ts-check
 /* global process */
+import { agoric } from '@agoric/cosmic-proto';
 import { normalizeBech32 } from '@cosmjs/encoding';
 import { execFileSync as execFileSyncAmbient } from 'child_process';
 
@@ -36,8 +37,9 @@ harden(normalizeAddressWithOptions);
 
 /**
  * @param {ReadonlyArray<string>} swingsetArgs
- * @param {import('./rpc').MinimalNetworkConfig & {
+ * @param {import('./rpc.js').MinimalNetworkConfig & {
  *   from: string,
+ *   fees?: string,
  *   dryRun?: boolean,
  *   verbose?: boolean,
  *   keyring?: {home?: string, backend: string}
@@ -48,6 +50,7 @@ harden(normalizeAddressWithOptions);
 export const execSwingsetTransaction = (swingsetArgs, opts) => {
   const {
     from,
+    fees,
     dryRun = false,
     verbose = true,
     keyring = undefined,
@@ -60,9 +63,11 @@ export const execSwingsetTransaction = (swingsetArgs, opts) => {
   const backendOpt = keyring?.backend
     ? [`--keyring-backend=${keyring.backend}`]
     : [];
+  const feeOpt = fees ? ['--fees', fees] : [];
   const cmd = [`--node=${rpcAddrs[0]}`, `--chain-id=${chainName}`].concat(
     homeOpt,
     backendOpt,
+    feeOpt,
     [`--from=${from}`, 'tx', 'swingset'],
     swingsetArgs,
   );
@@ -75,30 +80,37 @@ export const execSwingsetTransaction = (swingsetArgs, opts) => {
   } else {
     const yesCmd = cmd.concat(['--yes']);
     if (verbose) console.log('Executing ', yesCmd);
-    return execFileSync(agdBinary, yesCmd, { encoding: 'utf-8' });
+    const out = execFileSync(agdBinary, yesCmd, { encoding: 'utf-8' });
+
+    // agd puts this diagnostic on stdout rather than stderr :-/
+    // "Default sign-mode 'direct' not supported by Ledger, using sign-mode 'amino-json'.
+    if (out.startsWith('Default sign-mode')) {
+      const stripDiagnostic = out.replace(/^Default[^\n]+\n/, '');
+      return stripDiagnostic;
+    }
+    return out;
   }
 };
 harden(execSwingsetTransaction);
 
-// xxx rpc should be able to query this by HTTP without shelling out
-export const fetchSwingsetParams = net => {
-  const { chainName, rpcAddrs, execFileSync = execFileSyncAmbient } = net;
-  const cmd = [
-    `--node=${rpcAddrs[0]}`,
-    `--chain-id=${chainName}`,
-    'query',
-    'swingset',
-    'params',
-    '--output',
-    '--json',
-  ];
-  const buffer = execFileSync(agdBinary, cmd);
-  return JSON.parse(buffer.toString());
+/**
+ *
+ * @param {import('./rpc.js').MinimalNetworkConfig} net
+ * @returns {Promise<import('@agoric/cosmic-proto/dist/codegen/agoric/swingset/swingset').Params>}
+ */
+export const fetchSwingsetParams = async net => {
+  const { rpcAddrs } = net;
+  const rpcEndpoint = rpcAddrs[0];
+  const client = await agoric.ClientFactory.createRPCQueryClient({
+    rpcEndpoint,
+  });
+  const { params } = await client.agoric.swingset.params();
+  return params;
 };
 harden(fetchSwingsetParams);
 
 /**
- * @param {import('./rpc').MinimalNetworkConfig & {
+ * @param {import('./rpc.js').MinimalNetworkConfig & {
  *   execFileSync: typeof import('child_process').execFileSync,
  *   delay: (ms: number) => Promise<void>,
  *   period?: number,
@@ -122,7 +134,6 @@ export const pollBlocks = opts => async lookup => {
     } = status;
     try {
       // see await null above
-      // eslint-disable-next-line @jessie.js/no-nested-await, no-await-in-loop
       const result = await lookup({ time, height });
       return result;
     } catch (_err) {
@@ -132,7 +143,6 @@ export const pollBlocks = opts => async lookup => {
         height,
         'retrying...',
       );
-      // eslint-disable-next-line @jessie.js/no-nested-await, no-await-in-loop
       await delay(period);
     }
   }
@@ -140,7 +150,7 @@ export const pollBlocks = opts => async lookup => {
 
 /**
  * @param {string} txhash
- * @param {import('./rpc').MinimalNetworkConfig & {
+ * @param {import('./rpc.js').MinimalNetworkConfig & {
  *   execFileSync: typeof import('child_process').execFileSync,
  *   delay: (ms: number) => Promise<void>,
  *   period?: number,

package/src/lib/format.js

@@ -1,10 +1,6 @@
 // @ts-check
-import { makeBoardRemote } from '@agoric/vats/tools/board-utils.js';
-// eslint-disable-next-line no-unused-vars -- typeof below
-import { makeAgoricNames } from './rpc.js';
 
-// ambient types
-import '@agoric/ertp/src/types-ambient.js';
+import { makeBoardRemote } from '@agoric/vats/tools/board-utils.js';
 
 /** @typedef {import('@agoric/vats/tools/board-utils.js').BoardRemote} BoardRemote */
 
@@ -30,21 +26,20 @@ export const Natural = str => {
  */
 export const bigintReplacer = (k, v) => (typeof v === 'bigint' ? `${v}` : v);
 
-/** @type {import('@agoric/vats/tools/board-utils.js').VBankAssetDetail} */
+/** @type {Partial<import('@agoric/vats/tools/board-utils.js').VBankAssetDetail>} */
 // eslint-disable-next-line no-unused-vars
 const exampleAsset = {
-  // @ts-expect-error cast
   brand: makeBoardRemote({ boardId: 'board0425', iface: 'Alleged: BLD brand' }),
   displayInfo: { assetKind: 'nat', decimalPlaces: 6 },
-  // @ts-expect-error cast
   issuer: makeBoardRemote({ boardId: null, iface: undefined }),
-  petname: 'Agoric staking token',
+  proposedName: 'Agoric staking token',
 };
+
 /** @typedef {import('@agoric/vats/tools/board-utils.js').VBankAssetDetail } AssetDescriptor */
 
 /**
  * @param {AssetDescriptor[]} assets
- * @returns {(a: Amount & { brand: BoardRemote }) => [string, number | any[]]}
+ * @returns {(a: Amount & { brand: BoardRemote }) => [string | null, number | any[]]}
  */
 export const makeAmountFormatter = assets => amt => {
   const { brand, value } = amt;
@@ -94,7 +89,7 @@ export const asBoardRemote = x => {
 /**
  * Summarize the balances array as user-facing informative tuples
  *
- * @param {import('@agoric/smart-wallet/src/smartWallet').CurrentWalletRecord['purses']} purses
+ * @param {import('@agoric/smart-wallet/src/smartWallet.js').CurrentWalletRecord['purses']} purses
  * @param {AssetDescriptor[]} assets
  */
 export const purseBalanceTuples = (purses, assets) => {
@@ -122,7 +117,7 @@ export const fmtRecordOfLines = record => {
  * Summarize the offerStatuses of the state as user-facing informative tuples
  *
  * @param {import('@agoric/smart-wallet/src/utils.js').CoalescedWalletState} state
- * @param {Awaited<ReturnType<typeof makeAgoricNames>>} agoricNames
+ * @param {import('./wallet.js').AgoricNamesRemotes} agoricNames
  */
 export const offerStatusTuples = (state, agoricNames) => {
   const { offerStatuses } = state;
@@ -177,9 +172,9 @@ export const offerStatusTuples = (state, agoricNames) => {
 };
 
 /**
- * @param {import('@agoric/smart-wallet/src/smartWallet').CurrentWalletRecord} current
+ * @param {import('@agoric/smart-wallet/src/smartWallet.js').CurrentWalletRecord} current
  * @param {ReturnType<import('@agoric/smart-wallet/src/utils.js').makeWalletStateCoalescer>['state']} coalesced
- * @param {Awaited<ReturnType<typeof makeAgoricNames>>} agoricNames
+ * @param {import('./wallet.js').AgoricNamesRemotes} agoricNames
  */
 export const summarize = (current, coalesced, agoricNames) => {
   return {

package/src/lib/rpc.js

@@ -1,5 +1,4 @@
 // @ts-check
-/* eslint-disable @jessie.js/no-nested-await */
 /* global Buffer, fetch, process */
 
 import { NonNullish } from '@agoric/assert';
@@ -50,7 +49,8 @@ export const getNetworkConfig = async env => {
 };
 
 /** @type {MinimalNetworkConfig} */
-export const networkConfig = await getNetworkConfig(process.env);
+const networkConfig = await getNetworkConfig(process.env);
+export { networkConfig };
 // console.warn('networkConfig', networkConfig);
 
 /**
@@ -79,9 +79,13 @@ export const makeVStorage = (powers, config = networkConfig) => {
           result: { response },
         } = data;
         if (response?.code !== 0) {
-          throw Error(
+          /** @type {any} */
+          const err = Error(
             `error code ${response?.code} reading ${kind} of ${path}: ${response.log}`,
           );
+          err.code = response?.code;
+          err.codespace = response?.codespace;
+          throw err;
         }
         return data;
       });
@@ -132,18 +136,25 @@ export const makeVStorage = (powers, config = networkConfig) => {
       const parts = [];
       // undefined the first iteration, to query at the highest
       let blockHeight;
+      await null;
       do {
         // console.debug('READING', { blockHeight });
         let values;
         try {
-          // eslint-disable-next-line no-await-in-loop
           ({ blockHeight, values } = await this.readAt(
             path,
             blockHeight && Number(blockHeight) - 1,
           ));
           // console.debug('readAt returned', { blockHeight });
         } catch (err) {
-          if (err.message.match(/unknown request/)) {
+          if (
+            // CosmosSDK ErrNotFound; there is no data at the path
+            (err.codespace === 'sdk' && err.code === 38) ||
+            // CosmosSDK ErrUnknownRequest; misrepresentation of the same until
+            // https://github.com/Agoric/agoric-sdk/commit/dafc7c1708977aaa55e245dc09a73859cf1df192
+            // TODO remove after upgrade-12
+            err.message.match(/unknown request/)
+          ) {
             // console.error(err);
             break;
           }
@@ -242,6 +253,7 @@ export const makeAgoricNames = async (ctx, vstorage) => {
  * @param {MinimalNetworkConfig} config
  */
 export const makeRpcUtils = async ({ fetch }, config = networkConfig) => {
+  await null;
   try {
     const vstorage = makeVStorage({ fetch }, config);
     const fromBoard = makeFromBoard();