agoric 0.21.2-dev-5dc325b.0 → 0.21.2-getting-started-dev-26244e8.0

package/src/commands/inter.js

@@ -11,6 +11,11 @@ import { Offers } from '@agoric/inter-protocol/src/clientSupport.js';
 import { objectMap } from '@agoric/internal';
 import { M, matches } from '@agoric/store';
 
+// XXX scare away ambient type zombies to fix ScheduleNotification.activeStartTime etc.
+// https://github.com/Agoric/agoric-sdk/issues/6512
+// https://github.com/Agoric/agoric-sdk/issues/6343
+import '@agoric/inter-protocol/src/vaultFactory/types.js';
+
 import { normalizeAddressWithOptions, pollBlocks } from '../lib/chain.js';
 import {
   asBoardRemote,
@@ -20,6 +25,7 @@ import {
 import { getNetworkConfig } from '../lib/rpc.js';
 import {
   getCurrent,
+  makeParseAmount,
   makeWalletUtils,
   outputActionAndHint,
   sendAction,
@@ -82,7 +88,7 @@ const makeFormatters = assets => {
    * @param {(_: T) => string} f
    * @returns { (x: T | null | undefined ) => string | undefined }
    */
-  const maybe = f => x => (x ? f(x) : undefined);
+  const maybe = f => x => x ? f(x) : undefined;
 
   return {
     amount,
@@ -102,7 +108,7 @@ const makeFormatters = assets => {
  * Dynamic check that an OfferStatus is also a BidSpec.
  *
  * @param {import('@agoric/smart-wallet/src/offers.js').OfferStatus} offerStatus
- * @param {import('../lib/wallet.js').AgoricNamesRemotes} agoricNames
+ * @param {Awaited<ReturnType<import('../lib/rpc').makeAgoricNames>>} agoricNames
  * @param {typeof console.warn} warn
  * returns null if offerStatus is not a BidSpec
  */
@@ -200,10 +206,6 @@ export const makeInterCommand = (
   const interCmd = createCommand('inter')
     .description('Inter Protocol commands for liquidation bidding etc.')
     .option('--home <dir>', 'agd CosmosSDK application home directory')
-    .option(
-      '--fees <amount>',
-      'set fees for transaction broadcast (e.g. 5000ubld)',
-    )
     .option(
       '--keyring-backend <os|file|test>',
       `keyring's backend (os|file|test) (default "${
@@ -236,6 +238,7 @@ export const makeInterCommand = (
     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) {
@@ -336,10 +339,10 @@ inter auction status
     const { networkConfig, agoricNames, pollOffer } = tools;
     const io = { ...networkConfig, execFileSync, delay, stdout };
 
-    const { home, keyringBackend: backend, fees } = interCmd.opts();
+    const { home, keyringBackend: backend } = interCmd.opts();
     const result = await sendAction(
       { method: 'executeOffer', offer },
-      { keyring: { home, backend }, from, fees, verbose: false, dryRun, ...io },
+      { keyring: { home, backend }, from, verbose: false, dryRun, ...io },
     );
     if (dryRun) {
       return;
@@ -413,7 +416,14 @@ inter auction status
       async ({ generateOnly, dryRun, ...opts }) => {
         const tools = await tryMakeUtils();
 
-        const offer = Offers.auction.Bid(tools.agoricNames, opts);
+        const parseAmount = makeParseAmount(
+          tools.agoricNames,
+          msg => new InvalidArgumentError(msg),
+        );
+        const offer = Offers.auction.Bid(tools.agoricNames.brand, {
+          ...opts,
+          parseAmount,
+        });
 
         if (generateOnly) {
           outputActionAndHint(
@@ -454,7 +464,14 @@ inter auction status
       async ({ generateOnly, ...opts }) => {
         const tools = await tryMakeUtils();
 
-        const offer = Offers.auction.Bid(tools.agoricNames, opts);
+        const parseAmount = makeParseAmount(
+          tools.agoricNames,
+          msg => new InvalidArgumentError(msg),
+        );
+        const offer = Offers.auction.Bid(tools.agoricNames.brand, {
+          ...opts,
+          parseAmount,
+        });
         if (generateOnly) {
           outputActionAndHint(
             { method: 'executeOffer', offer },

package/src/commands/oracle.js

@@ -1,3 +1,5 @@
+/* eslint-disable no-await-in-loop */
+/* eslint-disable @jessie.js/no-nested-await */
 // @ts-check
 /* eslint-disable func-names */
 /* global fetch, setTimeout, process */
@@ -7,7 +9,6 @@ import { Nat } from '@endo/nat';
 import { Command } from 'commander';
 import * as cp from 'child_process';
 import { inspect } from 'util';
-import { oracleBrandFeedName } from '@agoric/inter-protocol/src/proposals/utils.js';
 import { normalizeAddressWithOptions } from '../lib/chain.js';
 import { getNetworkConfig, makeRpcUtils, storageHelper } from '../lib/rpc.js';
 import {
@@ -76,7 +77,7 @@ export const makeOracleCommand = (logger, io = {}) => {
     const utils = await makeRpcUtils({ fetch });
 
     const lookupPriceAggregatorInstance = ([brandIn, brandOut]) => {
-      const name = oracleBrandFeedName(brandIn, brandOut);
+      const name = `${brandIn}-${brandOut} price feed`;
       const instance = utils.agoricNames.instance[name];
       if (!instance) {
         logger.debug('known instances:', utils.agoricNames.instance);

package/src/commands/perf.js

@@ -1,3 +1,5 @@
+/* eslint-disable no-await-in-loop */
+/* eslint-disable @jessie.js/no-nested-await */
 // @ts-check
 /* eslint-disable func-names */
 /* global process */

package/src/commands/psm.js

@@ -1,3 +1,5 @@
+/* eslint-disable no-await-in-loop */
+/* eslint-disable @jessie.js/no-nested-await */
 // @ts-check
 /* eslint-disable func-names */
 /* global fetch, process */
@@ -151,17 +153,15 @@ export const makePsmCommand = logger => {
     .option('--giveMinted <DOLLARS>', 'amount of minted tokens to give', Number)
     .option('--feePct [%]', 'Gas fee percentage', Number)
     .option('--offerId <string>', 'Offer id', String, `swap-${Date.now()}`)
-    .action(
-      async function (
-        /** @type {Parameters<typeof Offers.psm.swap>[2]} */ opts,
-      ) {
-        console.warn('running with options', opts);
-        const { agoricNames, lookupPsmInstance } = await rpcTools();
-        const instance = await lookupPsmInstance(opts.pair);
-        const offer = Offers.psm.swap(agoricNames, instance, opts);
-        outputExecuteOfferAction(offer);
-      },
-    );
+    .action(async function (
+      /** @type {Parameters<typeof Offers.psm.swap>[2]} */ opts,
+    ) {
+      console.warn('running with options', opts);
+      const { agoricNames, lookupPsmInstance } = await rpcTools();
+      const instance = await lookupPsmInstance(opts.pair);
+      const offer = Offers.psm.swap(instance, agoricNames.brand, opts);
+      outputExecuteOfferAction(offer);
+    });
 
   psm
     .command('proposePauseOffers')

package/src/commands/reserve.js

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

package/src/commands/test-upgrade.js

@@ -38,6 +38,7 @@ 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) {
@@ -82,13 +83,7 @@ export const makeTestCommand = (
           publicInvitationMaker: 'makeInvitation',
         },
         proposal: {
-          want: {
-            Tokens: {
-              // @ts-expect-error BoardRemote not a Brand object
-              brand: agoricNames.brand.GoodStuff,
-              value: 32n,
-            },
-          },
+          want: { Tokens: { brand: agoricNames.brand.GoodStuff, value: 32n } },
         },
       };
       const result = await sendAction(

package/src/commands/vaults.js

@@ -1,3 +1,5 @@
+/* eslint-disable no-await-in-loop */
+/* eslint-disable @jessie.js/no-nested-await */
 // @ts-check
 /* eslint-disable func-names */
 /* global fetch, process */
@@ -63,7 +65,7 @@ export const makeVaultsCommand = logger => {
       logger.warn('running with options', opts);
       const { agoricNames } = await makeRpcUtils({ fetch });
 
-      const offer = Offers.vaults.OpenVault(agoricNames, {
+      const offer = Offers.vaults.OpenVault(agoricNames.brand, {
         giveCollateral: opts.giveCollateral,
         wantMinted: opts.wantMinted,
         offerId: opts.offerId,
@@ -104,7 +106,7 @@ export const makeVaultsCommand = logger => {
       );
 
       const offer = Offers.vaults.AdjustBalances(
-        agoricNames,
+        agoricNames.brand,
         {
           giveCollateral: opts.giveCollateral,
           wantCollateral: opts.wantCollateral,
@@ -145,7 +147,7 @@ export const makeVaultsCommand = logger => {
       );
 
       const offer = Offers.vaults.CloseVault(
-        agoricNames,
+        agoricNames.brand,
         {
           giveMinted: opts.giveMinted,
           offerId: opts.offerId,

package/src/helpers.js

@@ -41,7 +41,6 @@ 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,9 +1,11 @@
 import chalk from 'chalk';
 import { makePspawn } from './helpers.js';
 
-/// <reference types="@endo/captp/src/types.js" />
-/// <reference types="@agoric/swingset-vat/exported.js" />
-/// <reference types="@agoric/network/exported.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';
 
 // Use either an absolute template URL, or find it relative to DAPP_URL_BASE.
 const gitURL = (relativeOrAbsoluteURL, base) => {
@@ -38,10 +40,9 @@ 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', ...shallow, dappURL, DIR, ...dappBranch],
+    ['clone', '--origin=upstream', dappURL, DIR, ...dappBranch],
     {
       stdio: 'inherit',
     },
@@ -59,6 +60,7 @@ 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 === '') {
@@ -72,6 +74,7 @@ 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

@@ -61,6 +61,7 @@ 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],
@@ -287,7 +288,6 @@ 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

@@ -38,7 +38,6 @@ harden(normalizeAddressWithOptions);
  * @param {ReadonlyArray<string>} swingsetArgs
  * @param {import('./rpc').MinimalNetworkConfig & {
  *   from: string,
- *   fees?: string,
  *   dryRun?: boolean,
  *   verbose?: boolean,
  *   keyring?: {home?: string, backend: string}
@@ -49,7 +48,6 @@ harden(normalizeAddressWithOptions);
 export const execSwingsetTransaction = (swingsetArgs, opts) => {
   const {
     from,
-    fees,
     dryRun = false,
     verbose = true,
     keyring = undefined,
@@ -62,11 +60,9 @@ 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,
   );
@@ -79,15 +75,7 @@ export const execSwingsetTransaction = (swingsetArgs, opts) => {
   } else {
     const yesCmd = cmd.concat(['--yes']);
     if (verbose) console.log('Executing ', yesCmd);
-    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;
+    return execFileSync(agdBinary, yesCmd, { encoding: 'utf-8' });
   }
 };
 harden(execSwingsetTransaction);
@@ -134,6 +122,7 @@ 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) {
@@ -143,6 +132,7 @@ export const pollBlocks = opts => async lookup => {
         height,
         'retrying...',
       );
+      // eslint-disable-next-line @jessie.js/no-nested-await, no-await-in-loop
       await delay(period);
     }
   }

package/src/lib/format.js

@@ -1,6 +1,10 @@
 // @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';
 
 /** @typedef {import('@agoric/vats/tools/board-utils.js').BoardRemote} BoardRemote */
 
@@ -26,15 +30,16 @@ export const Natural = str => {
  */
 export const bigintReplacer = (k, v) => (typeof v === 'bigint' ? `${v}` : v);
 
-/** @type {Partial<import('@agoric/vats/tools/board-utils.js').VBankAssetDetail>} */
+/** @type {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 }),
-  proposedName: 'Agoric staking token',
+  petname: 'Agoric staking token',
 };
-
 /** @typedef {import('@agoric/vats/tools/board-utils.js').VBankAssetDetail } AssetDescriptor */
 
 /**
@@ -117,7 +122,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 {import('./wallet.js').AgoricNamesRemotes} agoricNames
+ * @param {Awaited<ReturnType<typeof makeAgoricNames>>} agoricNames
  */
 export const offerStatusTuples = (state, agoricNames) => {
   const { offerStatuses } = state;
@@ -174,7 +179,7 @@ export const offerStatusTuples = (state, agoricNames) => {
 /**
  * @param {import('@agoric/smart-wallet/src/smartWallet').CurrentWalletRecord} current
  * @param {ReturnType<import('@agoric/smart-wallet/src/utils.js').makeWalletStateCoalescer>['state']} coalesced
- * @param {import('./wallet.js').AgoricNamesRemotes} agoricNames
+ * @param {Awaited<ReturnType<typeof makeAgoricNames>>} agoricNames
  */
 export const summarize = (current, coalesced, agoricNames) => {
   return {

package/src/lib/rpc.js

@@ -1,4 +1,5 @@
 // @ts-check
+/* eslint-disable @jessie.js/no-nested-await */
 /* global Buffer, fetch, process */
 
 import { NonNullish } from '@agoric/assert';
@@ -49,8 +50,7 @@ export const getNetworkConfig = async env => {
 };
 
 /** @type {MinimalNetworkConfig} */
-const networkConfig = await getNetworkConfig(process.env);
-export { networkConfig };
+export const networkConfig = await getNetworkConfig(process.env);
 // console.warn('networkConfig', networkConfig);
 
 /**
@@ -132,11 +132,11 @@ 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,
@@ -242,7 +242,6 @@ 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();

package/src/lib/wallet.js

@@ -9,6 +9,7 @@ import { boardSlottingMarshaller, makeRpcUtils } from './rpc.js';
 /** @typedef {import('@agoric/smart-wallet/src/smartWallet.js').CurrentWalletRecord} CurrentWalletRecord  */
 /** @typedef {import('@agoric/vats/tools/board-utils.js').AgoricNamesRemotes} AgoricNamesRemotes  */
 
+const { values } = Object;
 const { Fail } = assert;
 const marshaller = boardSlottingMarshaller();
 
@@ -131,7 +132,6 @@ export const coalesceWalletState = async (follower, invitationBrand) => {
  * @param {import('@agoric/smart-wallet/src/smartWallet').BridgeAction} bridgeAction
  * @param {import('./rpc').MinimalNetworkConfig & {
  *   from: string,
- *   fees?: string,
  *   verbose?: boolean,
  *   keyring?: {home?: string, backend: string},
  *   stdout: Pick<import('stream').Writable, 'write'>,
@@ -159,7 +159,7 @@ export const sendAction = async (bridgeAction, opts) => {
   assert(out); // not dry run
   const tx = JSON.parse(out);
   if (tx.code !== 0) {
-    const err = Error(`failed to send tx: ${tx.raw_log} code: ${tx.code}`);
+    const err = Error(`failed to send action. code: ${tx.code}`);
     // @ts-expect-error XXX how to add properties to an error?
     err.code = tx.code;
     throw err;
@@ -247,6 +247,7 @@ export const makeWalletUtils = async (
     untilNumWantsSatisfied = false,
   ) => {
     const lookup = async () => {
+      // eslint-disable-next-line @jessie.js/no-nested-await, no-await-in-loop
       const { offerStatuses } = await storedWalletState(from, minHeight);
       const offerStatus = [...offerStatuses.values()].find(s => s.id === id);
       if (!offerStatus) throw Error('retry');
@@ -271,3 +272,44 @@ export const makeWalletUtils = async (
     pollOffer,
   };
 };
+
+/**
+ * @param {{
+ *   brand: Record<string, Brand>,
+ *   vbankAsset: Record<string, { brand: Brand, displayInfo: DisplayInfo }>,
+ * }} agoricNames
+ * @param {(msg: string) => Error} makeError error constructor
+ * @returns {(a: string) => Amount<'nat'>}
+ */
+export const makeParseAmount =
+  (agoricNames, makeError = msg => RangeError(msg)) =>
+  opt => {
+    assert.typeof(opt, 'string', 'parseAmount expected string');
+    const m = opt.match(/^(?<value>[\d_]+(\.[\d_]+)?)(?<brand>[A-Z]\w*?)$/);
+    if (!m || !m.groups) {
+      throw makeError(`invalid amount: ${opt}`);
+    }
+    const anyBrand = agoricNames.brand[m.groups.brand];
+    if (!anyBrand) {
+      throw makeError(`unknown brand: ${m.groups.brand}`);
+    }
+    const assetDesc = values(agoricNames.vbankAsset).find(
+      d => d.brand === anyBrand,
+    );
+    if (!assetDesc) {
+      throw makeError(`unknown brand: ${m.groups.brand}`);
+    }
+    const { displayInfo } = assetDesc;
+    if (!displayInfo.decimalPlaces || displayInfo.assetKind !== 'nat') {
+      throw makeError(`bad brand: ${displayInfo}`);
+    }
+    const value = BigInt(
+      Number(m.groups.value.replace(/_/g, '')) *
+        10 ** displayInfo.decimalPlaces,
+    );
+    /** @type {Brand<'nat'>} */
+    // @ts-expect-error dynamic cast
+    const natBrand = anyBrand;
+    const amt = { value, brand: natBrand };
+    return amt;
+  };

package/src/main-publish.js

@@ -31,9 +31,9 @@ const publishMain = async (progname, rawArgs, powers, opts) => {
     chainID,
   };
 
-  await null;
   for (const bundlePath of rawArgs.slice(1)) {
     // AWAIT
+    // eslint-disable-next-line no-await-in-loop,@jessie.js/no-nested-await
     const bundleText = await fs.readFile(bundlePath, 'utf-8');
     const bundle = parseLocatedJson(bundleText, bundlePath);
 
@@ -53,6 +53,7 @@ const publishMain = async (progname, rawArgs, powers, opts) => {
     });
 
     // AWAIT
+    // eslint-disable-next-line no-await-in-loop,@jessie.js/no-nested-await
     const hashedBundle = await publishBundle(bundle, connectionSpec);
     process.stdout.write(`${JSON.stringify(hashedBundle)}\n`);
   }

package/src/main.js

@@ -1,3 +1,4 @@
+/* eslint-disable @jessie.js/no-nested-await */
 /* global process */
 import { Command } from 'commander';
 import path from 'path';
@@ -35,7 +36,6 @@ const main = async (progname, rawArgs, powers) => {
   const program = new Command();
 
   async function isNotBasedir() {
-    await null;
     try {
       await fs.stat(STAMP);
       return false;

package/src/open.js

@@ -5,8 +5,8 @@ import { getAccessToken } from '@agoric/access-token';
 
 import { assert, details as X } from '@agoric/assert';
 
-export default async function walletMain(_progname, _rawArgs, powers, opts) {
-  const { anylogger } = powers;
+export default async function walletMain(progname, rawArgs, powers, opts) {
+  const { anylogger, fs } = powers;
   const console = anylogger('agoric:wallet');
 
   let suffix;
@@ -39,10 +39,10 @@ export default async function walletMain(_progname, _rawArgs, powers, opts) {
     1000,
   );
 
-  const walletAccessToken = await getAccessToken(opts.hostport).catch(e => {
-    console.error(`Trying to fetch access token:`, e);
-    throw e;
-  });
+  const walletAccessToken = await getAccessToken(opts.hostport, {
+    console,
+    fs,
+  }).catch(e => console.error(`Trying to fetch access token:`, e));
 
   clearInterval(progressTimer);
   process.stderr.write('\n');

package/src/publish.js

@@ -289,12 +289,14 @@ export const makeCosmosBundlePublisher = ({
       const endpoint = urlForRpcAddress(rpcAddress);
 
       // AWAIT
+      // eslint-disable-next-line no-await-in-loop,@jessie.js/no-nested-await
       const stargateClient = await connectWithSigner(endpoint, wallet, {
         gasPrice: Agoric.gasPrice,
         registry,
       });
 
       // AWAIT
+      // eslint-disable-next-line no-await-in-loop,@jessie.js/no-nested-await
       const result = await stargateClient
         .signAndBroadcast(from.address, encodeObjects, Agoric.fee)
         .catch(error => {
@@ -310,6 +312,7 @@ export const makeCosmosBundlePublisher = ({
       }
 
       // AWAIT
+      // eslint-disable-next-line no-await-in-loop,@jessie.js/no-nested-await
       await E(leader).jitter('agoric CLI deploy');
     }
 
@@ -423,7 +426,6 @@ const publishBundle = async (
     )}, publishBundle supports only "endoZipBase64" with "endoZipBase64Sha512"`;
   }
 
-  await null;
   if (connectionSpec === undefined && getDefaultConnection !== undefined) {
     connectionSpec = await getDefaultConnection();
   }

package/src/sdk-package-names.js

@@ -4,9 +4,6 @@
 export default [
   "@agoric/access-token",
   "@agoric/assert",
-  "@agoric/base-zone",
-  "@agoric/boot",
-  "@agoric/builders",
   "@agoric/cache",
   "@agoric/casting",
   "@agoric/cosmic-proto",
@@ -20,11 +17,10 @@ export default [
   "@agoric/import-manager",
   "@agoric/inter-protocol",
   "@agoric/internal",
-  "@agoric/kmarshal",
-  "@agoric/network",
   "@agoric/notifier",
   "@agoric/pegasus",
   "@agoric/same-structure",
+  "@agoric/sharing-service",
   "@agoric/smart-wallet",
   "@agoric/solo",
   "@agoric/sparse-ints",
@@ -38,11 +34,13 @@ export default [
   "@agoric/swingset-xsnap-supervisor",
   "@agoric/telemetry",
   "@agoric/time",
+  "@agoric/ui-components",
   "@agoric/vat-data",
   "@agoric/vats",
-  "@agoric/vm-config",
   "@agoric/wallet",
   "@agoric/wallet-backend",
+  "@agoric/wallet-connection",
+  "@agoric/web-components",
   "@agoric/xsnap",
   "@agoric/xsnap-lockdown",
   "@agoric/zoe",

package/src/set-defaults.js

@@ -42,7 +42,6 @@ export default async function setDefaultsMain(progname, rawArgs, powers, opts) {
     return fs.writeFile(fileName, contents);
   };
 
-  await null;
   if (appFile) {
     log(`read ${appFile}`);
     const appToml = await fs.readFile(appFile, 'utf-8');