agoric 0.21.2-dev-c236c55.0 → 0.21.2-dev-d19b293.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agoric",
-  "version": "0.21.2-dev-c236c55.0+c236c55",
+  "version": "0.21.2-dev-d19b293.0+d19b293",
   "description": "Manage the Agoric Javascript smart contract platform",
   "type": "module",
   "main": "src/main.js",
@@ -29,29 +29,29 @@
     "lint:eslint": "eslint ."
   },
   "devDependencies": {
-    "@agoric/cosmic-swingset": "0.41.4-dev-c236c55.0+c236c55",
-    "@agoric/deploy-script-support": "0.10.4-dev-c236c55.0+c236c55",
+    "@agoric/cosmic-swingset": "0.41.4-dev-d19b293.0+d19b293",
+    "@agoric/deploy-script-support": "0.10.4-dev-d19b293.0+d19b293",
     "ava": "^5.3.0",
     "c8": "^9.1.0",
     "dd-trace": "^4.11.1"
   },
   "dependencies": {
-    "@agoric/access-token": "0.4.22-dev-c236c55.0+c236c55",
-    "@agoric/cache": "0.3.3-dev-c236c55.0+c236c55",
-    "@agoric/casting": "0.4.3-dev-c236c55.0+c236c55",
-    "@agoric/client-utils": "0.1.1-dev-c236c55.0+c236c55",
-    "@agoric/cosmic-proto": "0.4.1-dev-c236c55.0+c236c55",
-    "@agoric/ertp": "0.16.3-dev-c236c55.0+c236c55",
-    "@agoric/governance": "0.10.4-dev-c236c55.0+c236c55",
-    "@agoric/inter-protocol": "0.16.2-dev-c236c55.0+c236c55",
-    "@agoric/internal": "0.3.3-dev-c236c55.0+c236c55",
-    "@agoric/network": "0.1.1-dev-c236c55.0+c236c55",
-    "@agoric/smart-wallet": "0.5.4-dev-c236c55.0+c236c55",
-    "@agoric/store": "0.9.3-dev-c236c55.0+c236c55",
-    "@agoric/swingset-vat": "0.32.3-dev-c236c55.0+c236c55",
-    "@agoric/vats": "0.15.2-dev-c236c55.0+c236c55",
-    "@agoric/zoe": "0.26.3-dev-c236c55.0+c236c55",
-    "@agoric/zone": "0.2.3-dev-c236c55.0+c236c55",
+    "@agoric/access-token": "0.4.22-dev-d19b293.0+d19b293",
+    "@agoric/cache": "0.3.3-dev-d19b293.0+d19b293",
+    "@agoric/casting": "0.4.3-dev-d19b293.0+d19b293",
+    "@agoric/client-utils": "0.1.1-dev-d19b293.0+d19b293",
+    "@agoric/cosmic-proto": "0.4.1-dev-d19b293.0+d19b293",
+    "@agoric/ertp": "0.16.3-dev-d19b293.0+d19b293",
+    "@agoric/governance": "0.10.4-dev-d19b293.0+d19b293",
+    "@agoric/inter-protocol": "0.16.2-dev-d19b293.0+d19b293",
+    "@agoric/internal": "0.3.3-dev-d19b293.0+d19b293",
+    "@agoric/network": "0.1.1-dev-d19b293.0+d19b293",
+    "@agoric/smart-wallet": "0.5.4-dev-d19b293.0+d19b293",
+    "@agoric/store": "0.9.3-dev-d19b293.0+d19b293",
+    "@agoric/swingset-vat": "0.32.3-dev-d19b293.0+d19b293",
+    "@agoric/vats": "0.15.2-dev-d19b293.0+d19b293",
+    "@agoric/zoe": "0.26.3-dev-d19b293.0+d19b293",
+    "@agoric/zone": "0.2.3-dev-d19b293.0+d19b293",
     "@confio/relayer": "^0.11.3",
     "@cosmjs/crypto": "^0.32.3",
     "@cosmjs/encoding": "^0.32.3",
@@ -102,5 +102,5 @@
   "typeCoverage": {
     "atLeast": 77.54
   },
-  "gitHead": "c236c55c008a83a28d324026dcc4a8411a0c4f05"
+  "gitHead": "d19b293d5b28a2d78754eb7912771bdb66d5fb37"
 }

package/src/commands/wallet.js

@@ -21,7 +21,11 @@ import {
 } from '../lib/chain.js';
 import { getNetworkConfig } from '../lib/network-config.js';
 import { coalesceWalletState, getCurrent } from '../lib/wallet.js';
-import { summarize, fmtRecordOfLines } from '../lib/format.js';
+import {
+  summarize,
+  fmtRecordOfLines,
+  parseFiniteNumber,
+} from '../lib/format.js';
 
 const networkConfig = await getNetworkConfig({ env: process.env, fetch });
 
@@ -135,23 +139,60 @@ export const makeWalletCommand = async command => {
     )
     .requiredOption('--offer [filename]', 'path to file with prepared offer')
     .option('--dry-run', 'spit out the command instead of running it')
+    .option('--gas', 'gas limit; "auto" [default] to calculate automatically')
+    .option(
+      '--gas-adjustment',
+      'factor by which to multiply the --gas=auto calculation result [default 1.2]',
+    )
+    .option('--verbose', 'print command output')
     .action(function (opts) {
-      /** @typedef {{ from: string, offer: string, dryRun: boolean }} Opts */
+      /**
+       * @typedef {{
+       *   from: string,
+       *   offer: string,
+       *   dryRun: boolean,
+       *   gas: string,
+       *   gasAdjustment: string,
+       *   verbose: boolean,
+       * }} Opts
+       */
       const {
         dryRun,
         from,
+        gas = 'auto',
+        gasAdjustment = '1.2',
         offer,
         home,
+        verbose,
         keyringBackend: backend,
       } = /** @type {SharedTxOptions & Opts} */ ({ ...wallet.opts(), ...opts });
 
       const offerBody = fs.readFileSync(offer).toString();
-      execSwingsetTransaction(['wallet-action', '--allow-spend', offerBody], {
-        from,
-        dryRun,
-        keyring: { home, backend },
-        ...networkConfig,
-      });
+      const out = execSwingsetTransaction(
+        ['wallet-action', '--allow-spend', offerBody, '-ojson', '-bblock'],
+        {
+          ...networkConfig,
+          keyring: { home, backend },
+          from,
+          gas:
+            gas === 'auto' ? ['auto', parseFiniteNumber(gasAdjustment)] : gas,
+          dryRun,
+          verbose,
+        },
+      );
+
+      // see sendAction in {@link ../lib/wallet.js}
+      if (dryRun || !verbose) return;
+      try {
+        const tx = JSON.parse(/** @type {string} */ (out));
+        if (tx.code !== 0) {
+          console.error('failed to send tx', tx);
+        }
+        console.log(tx);
+      } catch (err) {
+        console.error('unexpected output', JSON.stringify(out));
+        throw err;
+      }
     });
 
   wallet

package/src/helpers.js

@@ -3,6 +3,8 @@
 
 /** @import { ChildProcess } from 'child_process' */
 
+export { getNetworkConfig } from './lib/network-config.js';
+
 export const getSDKBinaries = ({
   jsPfx = '../..',
   goPfx = `${jsPfx}/../golang`,

package/src/lib/chain.js

@@ -38,11 +38,42 @@ export const normalizeAddressWithOptions = (
 };
 harden(normalizeAddressWithOptions);
 
+/** @typedef {number | 'auto' | ['auto', adjustment?: number | undefined]} GasLimit */
+
+/**
+ * @param {GasLimit} limit
+ * @returns {string[]}
+ */
+const makeGasOpts = limit => {
+  if (Number.isFinite(limit) || limit === 'auto') {
+    return [`--gas=${limit}`];
+  }
+  if (Array.isArray(limit) && limit.length >= 1 && limit[0] === 'auto') {
+    const gasOpts = ['--gas=auto'];
+    if (limit.length > 1) {
+      const [adjustment, ...rest] = limit.slice(1);
+      const adjustmentIsValid =
+        adjustment === undefined ||
+        (Number.isFinite(adjustment) && Number(adjustment) > 0);
+      if (rest.length !== 0 || !adjustmentIsValid) {
+        throw Error('invalid gas input');
+      }
+      if (adjustment !== undefined) {
+        gasOpts.push(`--gas-adjustment=${adjustment}`);
+      }
+    }
+    return gasOpts;
+  }
+
+  throw Error('invalid gas input');
+};
+
 /**
  * @param {ReadonlyArray<string>} swingsetArgs
  * @param {MinimalNetworkConfig & {
  *   from: string,
  *   fees?: string,
+ *   gas?: GasLimit,
  *   dryRun?: boolean,
  *   verbose?: boolean,
  *   keyring?: {home?: string, backend: string}
@@ -54,6 +85,7 @@ export const execSwingsetTransaction = (swingsetArgs, opts) => {
   const {
     from,
     fees,
+    gas = ['auto', 1.2],
     dryRun = false,
     verbose = true,
     keyring = undefined,
@@ -71,6 +103,7 @@ export const execSwingsetTransaction = (swingsetArgs, opts) => {
     homeOpt,
     backendOpt,
     feeOpt,
+    makeGasOpts(gas),
     [`--from=${from}`, 'tx', 'swingset'],
     swingsetArgs,
   );
@@ -82,7 +115,7 @@ export const execSwingsetTransaction = (swingsetArgs, opts) => {
     stdout.write('\n');
   } else {
     const yesCmd = cmd.concat(['--yes']);
-    if (verbose) console.log('Executing ', yesCmd);
+    if (verbose) console.log('Executing ', agdBinary, yesCmd);
     const out = execFileSync(agdBinary, yesCmd, { encoding: 'utf-8' });
 
     // agd puts this diagnostic on stdout rather than stderr :-/

package/src/lib/format.js

@@ -6,6 +6,18 @@ import { makeBoardRemote } from '@agoric/vats/tools/board-utils.js';
  * @import {AgoricNamesRemotes, BoardRemote, VBankAssetDetail} from '@agoric/vats/tools/board-utils.js';
  */
 
+// TODO Move to packages/internal.
+/**
+ * Parses the input and returns either a finite number or NaN.
+ *
+ * @param {string} input
+ * @returns {number}
+ */
+export const parseFiniteNumber = input => {
+  const result = /[0-9]/.test(input || '') ? Number(input) : NaN;
+  return Number.isFinite(result) ? result : NaN;
+};
+
 /**
  * JSON.stringify replacer to handle bigint
  *