agoric 0.22.0-upgrade-14-dev-0169c7e.0 → 0.22.0-upgrade-16-dev-07b0130.0

package/src/lib/chain.js

@@ -36,8 +36,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 +49,7 @@ harden(normalizeAddressWithOptions);
 export const execSwingsetTransaction = (swingsetArgs, opts) => {
   const {
     from,
+    fees,
     dryRun = false,
     verbose = true,
     keyring = undefined,
@@ -60,9 +62,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,14 +79,26 @@ 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
+/**
+ *
+ * @param {import('./rpc.js').MinimalNetworkConfig} net
+ */
+// TODO fetch by HTTP instead of shelling out https://github.com/Agoric/agoric-sdk/issues/9200
 export const fetchSwingsetParams = net => {
-  const { chainName, rpcAddrs, execFileSync = execFileSyncAmbient } = net;
+  const { chainName, rpcAddrs } = net;
   const cmd = [
     `--node=${rpcAddrs[0]}`,
     `--chain-id=${chainName}`,
@@ -90,15 +106,15 @@ export const fetchSwingsetParams = net => {
     'swingset',
     'params',
     '--output',
-    '--json',
+    'json',
   ];
-  const buffer = execFileSync(agdBinary, cmd);
+  const buffer = execFileSyncAmbient(agdBinary, cmd);
   return JSON.parse(buffer.toString());
 };
 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 +138,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 +147,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 +154,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,12 +1,9 @@
 // @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 */
+/** @import {BoardRemote} from '@agoric/vats/tools/board-utils.js' */
+/** @import {VBankAssetDetail} from '@agoric/vats/tools/board-utils.js'; */
 
 /**
  * Like @endo/nat but coerces
@@ -30,21 +27,18 @@ 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<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[]]}
+ * @param {VBankAssetDetail[]} assets
+ * @returns {(a: Amount & { brand: BoardRemote }) => [string | null, number | any[]]}
  */
 export const makeAmountFormatter = assets => amt => {
   const { brand, value } = amt;
@@ -60,7 +54,9 @@ export const makeAmountFormatter = assets => amt => {
       return [issuerName, Number(value) / 10 ** decimalPlaces];
     case 'set':
       assert(Array.isArray(value));
+      // @ts-expect-error narrowed
       if (value[0]?.handle?.iface?.includes('InvitationHandle')) {
+        // @ts-expect-error narrowed
         return [issuerName, value.map(v => v.description)];
       }
       return [issuerName, value];
@@ -94,8 +90,8 @@ export const asBoardRemote = x => {
 /**
  * Summarize the balances array as user-facing informative tuples
  *
- * @param {import('@agoric/smart-wallet/src/smartWallet').CurrentWalletRecord['purses']} purses
- * @param {AssetDescriptor[]} assets
+ * @param {import('@agoric/smart-wallet/src/smartWallet.js').CurrentWalletRecord['purses']} purses
+ * @param {VBankAssetDetail[]} assets
  */
 export const purseBalanceTuples = (purses, assets) => {
   const fmt = makeAmountFormatter(assets);
@@ -122,7 +118,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('@agoric/vats/tools/board-utils.js').AgoricNamesRemotes} agoricNames
  */
 export const offerStatusTuples = (state, agoricNames) => {
   const { offerStatuses } = state;
@@ -177,9 +173,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('@agoric/vats/tools/board-utils.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);
 
 /**
@@ -136,11 +136,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,
@@ -148,12 +148,13 @@ export const makeVStorage = (powers, config = networkConfig) => {
           // console.debug('readAt returned', { blockHeight });
         } catch (err) {
           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/)
+            // CosmosSDK ErrInvalidRequest with particular message text;
+            // misrepresentation of pruned data
+            // TODO replace after incorporating a fix to
+            // https://github.com/cosmos/cosmos-sdk/issues/19992
+            err.codespace === 'sdk' &&
+            err.code === 18 &&
+            err.message.match(/pruned/)
           ) {
             // console.error(err);
             break;
@@ -253,6 +254,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();

package/src/lib/wallet.js

@@ -6,8 +6,8 @@ import { makeWalletStateCoalescer } from '@agoric/smart-wallet/src/utils.js';
 import { execSwingsetTransaction, pollBlocks, pollTx } from './chain.js';
 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  */
+/** @import {CurrentWalletRecord} from '@agoric/smart-wallet/src/smartWallet.js' */
+/** @import {AgoricNamesRemotes} from '@agoric/vats/tools/board-utils.js' */
 
 const { Fail } = assert;
 const marshaller = boardSlottingMarshaller();
@@ -23,13 +23,13 @@ const emptyCurrentRecord = {
 /**
  * @param {string} addr
  * @param {Pick<import('./rpc.js').RpcUtils, 'readLatestHead'>} io
- * @returns {Promise<import('@agoric/smart-wallet/src/smartWallet').CurrentWalletRecord>}
+ * @returns {Promise<import('@agoric/smart-wallet/src/smartWallet.js').CurrentWalletRecord>}
  */
 export const getCurrent = async (addr, { readLatestHead }) => {
   // Partial because older writes may not have had all properties
   // NB: assumes changes are only additions
   let current =
-    /** @type {Partial<import('@agoric/smart-wallet/src/smartWallet').CurrentWalletRecord> | undefined} */ (
+    /** @type {Partial<import('@agoric/smart-wallet/src/smartWallet.js').CurrentWalletRecord> | undefined} */ (
       await readLatestHead(`published.wallet.${addr}.current`)
     );
   if (current === undefined) {
@@ -58,7 +58,7 @@ export const getCurrent = async (addr, { readLatestHead }) => {
 /**
  * @param {string} addr
  * @param {Pick<import('./rpc.js').RpcUtils, 'readLatestHead'>} io
- * @returns {Promise<import('@agoric/smart-wallet/src/smartWallet').UpdateRecord>}
+ * @returns {Promise<import('@agoric/smart-wallet/src/smartWallet.js').UpdateRecord>}
  */
 export const getLastUpdate = (addr, { readLatestHead }) => {
   // @ts-expect-error cast
@@ -66,7 +66,7 @@ export const getLastUpdate = (addr, { readLatestHead }) => {
 };
 
 /**
- * @param {import('@agoric/smart-wallet/src/smartWallet').BridgeAction} bridgeAction
+ * @param {import('@agoric/smart-wallet/src/smartWallet.js').BridgeAction} bridgeAction
  * @param {Pick<import('stream').Writable,'write'>} [stdout]
  */
 export const outputAction = (bridgeAction, stdout = process.stdout) => {
@@ -75,11 +75,11 @@ export const outputAction = (bridgeAction, stdout = process.stdout) => {
   stdout.write('\n');
 };
 
-const sendHint =
+export const sendHint =
   'Now use `agoric wallet send ...` to sign and broadcast the offer.\n';
 
 /**
- * @param {import('@agoric/smart-wallet/src/smartWallet').BridgeAction} bridgeAction
+ * @param {import('@agoric/smart-wallet/src/smartWallet.js').BridgeAction} bridgeAction
  * @param {{
  *   stdout: Pick<import('stream').Writable,'write'>,
  *   stderr: Pick<import('stream').Writable,'write'>,
@@ -93,19 +93,25 @@ export const outputActionAndHint = (bridgeAction, { stdout, stderr }) => {
 /**
  * @param {import('@agoric/smart-wallet/src/offers.js').OfferSpec} offer
  * @param {Pick<import('stream').Writable,'write'>} [stdout]
+ * @param {Pick<import('stream').Writable,'write'>} [stderr]
  */
-export const outputExecuteOfferAction = (offer, stdout = process.stdout) => {
-  /** @type {import('@agoric/smart-wallet/src/smartWallet').BridgeAction} */
+export const outputExecuteOfferAction = (
+  offer,
+  stdout = process.stdout,
+  stderr = process.stderr,
+) => {
+  /** @type {import('@agoric/smart-wallet/src/smartWallet.js').BridgeAction} */
   const spendAction = {
     method: 'executeOffer',
     offer,
   };
   outputAction(spendAction, stdout);
+  stderr.write(sendHint);
 };
 
 /**
  * @deprecated use `.current` node for current state
- * @param {import('@agoric/casting').Follower<import('@agoric/casting').ValueFollowerElement<import('@agoric/smart-wallet/src/smartWallet').UpdateRecord>>} follower
+ * @param {import('@agoric/casting').Follower<import('@agoric/casting').ValueFollowerElement<import('@agoric/smart-wallet/src/smartWallet.js').UpdateRecord>>} follower
  * @param {Brand<'set'>} [invitationBrand]
  */
 export const coalesceWalletState = async (follower, invitationBrand) => {
@@ -135,9 +141,10 @@ export const coalesceWalletState = async (follower, invitationBrand) => {
  * Sign and broadcast a wallet-action.
  *
  * @throws { Error & { code: number } } if transaction fails
- * @param {import('@agoric/smart-wallet/src/smartWallet').BridgeAction} bridgeAction
- * @param {import('./rpc').MinimalNetworkConfig & {
+ * @param {import('@agoric/smart-wallet/src/smartWallet.js').BridgeAction} bridgeAction
+ * @param {import('./rpc.js').MinimalNetworkConfig & {
  *   from: string,
+ *   fees?: string,
  *   verbose?: boolean,
  *   keyring?: {home?: string, backend: string},
  *   stdout: Pick<import('stream').Writable, 'write'>,
@@ -165,7 +172,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 action. code: ${tx.code}`);
+    const err = Error(`failed to send tx: ${tx.raw_log} code: ${tx.code}`);
     // @ts-expect-error XXX how to add properties to an error?
     err.code = tx.code;
     throw err;
@@ -180,7 +187,7 @@ export const sendAction = async (bridgeAction, opts) => {
  */
 export const findContinuingIds = (current, agoricNames) => {
   // XXX should runtime type-check
-  /** @type {{ offerToUsedInvitation: [string, Amount<'set'>][]}} */
+  /** @type {{ offerToUsedInvitation: [string, InvitationAmount][]}} */
   const { offerToUsedInvitation: entries } = /** @type {any} */ (current);
 
   Array.isArray(entries) || Fail`entries must be an array: ${entries}`;
@@ -253,7 +260,6 @@ 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');

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,7 +53,6 @@ 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`);
   }