agoric 0.21.2-dev-c65915e.0 → 0.21.2-dev-4440ce1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agoric",
-  "version": "0.21.2-dev-c65915e.0+c65915e",
+  "version": "0.21.2-dev-4440ce1.0+4440ce1",
   "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-c65915e.0+c65915e",
-    "@agoric/deploy-script-support": "0.10.4-dev-c65915e.0+c65915e",
+    "@agoric/cosmic-swingset": "0.41.4-dev-4440ce1.0+4440ce1",
+    "@agoric/deploy-script-support": "0.10.4-dev-4440ce1.0+4440ce1",
     "ava": "^5.3.0",
     "c8": "^9.1.0",
     "dd-trace": "^4.11.1"
   },
   "dependencies": {
-    "@agoric/access-token": "0.4.22-dev-c65915e.0+c65915e",
-    "@agoric/assert": "0.6.1-dev-c65915e.0+c65915e",
-    "@agoric/cache": "0.3.3-dev-c65915e.0+c65915e",
-    "@agoric/casting": "0.4.3-dev-c65915e.0+c65915e",
-    "@agoric/cosmic-proto": "0.4.1-dev-c65915e.0+c65915e",
-    "@agoric/ertp": "0.16.3-dev-c65915e.0+c65915e",
-    "@agoric/governance": "0.10.4-dev-c65915e.0+c65915e",
-    "@agoric/inter-protocol": "0.16.2-dev-c65915e.0+c65915e",
-    "@agoric/internal": "0.3.3-dev-c65915e.0+c65915e",
-    "@agoric/network": "0.1.1-dev-c65915e.0+c65915e",
-    "@agoric/smart-wallet": "0.5.4-dev-c65915e.0+c65915e",
-    "@agoric/store": "0.9.3-dev-c65915e.0+c65915e",
-    "@agoric/swingset-vat": "0.32.3-dev-c65915e.0+c65915e",
-    "@agoric/vats": "0.15.2-dev-c65915e.0+c65915e",
-    "@agoric/zoe": "0.26.3-dev-c65915e.0+c65915e",
-    "@agoric/zone": "0.2.3-dev-c65915e.0+c65915e",
+    "@agoric/access-token": "0.4.22-dev-4440ce1.0+4440ce1",
+    "@agoric/assert": "0.6.1-dev-4440ce1.0+4440ce1",
+    "@agoric/cache": "0.3.3-dev-4440ce1.0+4440ce1",
+    "@agoric/casting": "0.4.3-dev-4440ce1.0+4440ce1",
+    "@agoric/cosmic-proto": "0.4.1-dev-4440ce1.0+4440ce1",
+    "@agoric/ertp": "0.16.3-dev-4440ce1.0+4440ce1",
+    "@agoric/governance": "0.10.4-dev-4440ce1.0+4440ce1",
+    "@agoric/inter-protocol": "0.16.2-dev-4440ce1.0+4440ce1",
+    "@agoric/internal": "0.3.3-dev-4440ce1.0+4440ce1",
+    "@agoric/network": "0.1.1-dev-4440ce1.0+4440ce1",
+    "@agoric/smart-wallet": "0.5.4-dev-4440ce1.0+4440ce1",
+    "@agoric/store": "0.9.3-dev-4440ce1.0+4440ce1",
+    "@agoric/swingset-vat": "0.32.3-dev-4440ce1.0+4440ce1",
+    "@agoric/vats": "0.15.2-dev-4440ce1.0+4440ce1",
+    "@agoric/zoe": "0.26.3-dev-4440ce1.0+4440ce1",
+    "@agoric/zone": "0.2.3-dev-4440ce1.0+4440ce1",
     "@confio/relayer": "^0.11.3",
     "@cosmjs/crypto": "^0.32.3",
     "@cosmjs/encoding": "^0.32.3",
@@ -101,5 +101,5 @@
   "typeCoverage": {
     "atLeast": 76.99
   },
-  "gitHead": "c65915e607dd7ccfd50c9b5f8ba1692240fb605b"
+  "gitHead": "4440ce11c9cc3db685606ed86c0fe7bd68ddc2f0"
 }

package/src/commands/wallet.js

@@ -29,19 +29,26 @@ const SLEEP_SECONDS = 3;
  * @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(
-      '--keyring-backend <os|file|test>',
-      'keyring\'s backend (os|file|test) (default "os")',
-    );
+  /**
+   * @param {import('commander').Command} baseCmd
+   */
+  const withSharedTxOptions = baseCmd =>
+    baseCmd
+      .option('--home <dir>', 'agd application home directory')
+      .option(
+        '--keyring-backend <os|file|test>',
+        'keyring\'s backend (os|file|test) (default "os")',
+      );
+  /** @typedef {{home?: string, keyringBackend: 'os' | 'file' | 'test'}} SharedTxOptions */
+
+  const wallet = withSharedTxOptions(command('wallet')).description(
+    'wallet commands',
+  );
 
   const normalizeAddress = literalOrName =>
     normalizeAddressWithOptions(literalOrName, wallet.opts());
 
-  wallet
-    .command('provision')
+  withSharedTxOptions(wallet.command('provision'))
     .description('provision a Smart Wallet')
     .requiredOption(
       '--account [address]',
@@ -51,8 +58,14 @@ export const makeWalletCommand = async command => {
     .option('--spend', 'confirm you want to spend')
     .option('--nickname <string>', 'nickname to use', 'my-wallet')
     .action(function (opts) {
-      const { account, nickname, spend } = opts;
-      const { home, keyringBackend: backend } = wallet.opts();
+      /** @typedef {{account: string, spend?: boolean, nickname: 'my-wallet' | string }} Opts */
+      const {
+        account,
+        nickname,
+        spend,
+        home,
+        keyringBackend: backend,
+      } = /** @type {SharedTxOptions & Opts} */ ({ ...wallet.opts(), ...opts });
       const tx = ['provision-one', nickname, account, 'SMART_WALLET'];
       if (spend) {
         execSwingsetTransaction(tx, {
@@ -110,8 +123,7 @@ export const makeWalletCommand = async command => {
       console.log(offerObj.offer.id);
     });
 
-  wallet
-    .command('send')
+  withSharedTxOptions(wallet.command('send'))
     .description('send a prepared offer')
     .requiredOption(
       '--from [address]',
@@ -121,8 +133,14 @@ 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')
     .action(function (opts) {
-      const { dryRun, from, offer } = opts;
-      const { home, keyringBackend: backend } = wallet.opts();
+      /** @typedef {{ from: string, offer: string, dryRun: boolean }} Opts */
+      const {
+        dryRun,
+        from,
+        offer,
+        home,
+        keyringBackend: backend,
+      } = /** @type {SharedTxOptions & Opts} */ ({ ...wallet.opts(), ...opts });
 
       const offerBody = fs.readFileSync(offer).toString();
       execSwingsetTransaction(['wallet-action', '--allow-spend', offerBody], {