agoric 0.21.2-dev-1b6f03b.0 → 0.21.2-dev-9380cfe.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agoric",
-  "version": "0.21.2-dev-1b6f03b.0+1b6f03b",
+  "version": "0.21.2-dev-9380cfe.0+9380cfe",
   "description": "Manage the Agoric Javascript smart contract platform",
   "type": "module",
   "main": "src/main.js",
@@ -28,29 +28,29 @@
     "lint:eslint": "eslint ."
   },
   "devDependencies": {
-    "@agoric/cosmic-swingset": "0.41.4-dev-1b6f03b.0+1b6f03b",
-    "@agoric/deploy-script-support": "0.10.4-dev-1b6f03b.0+1b6f03b",
+    "@agoric/cosmic-swingset": "0.41.4-dev-9380cfe.0+9380cfe",
+    "@agoric/deploy-script-support": "0.10.4-dev-9380cfe.0+9380cfe",
     "ava": "^5.3.0",
     "c8": "^7.13.0",
     "dd-trace": "^4.11.1"
   },
   "dependencies": {
-    "@agoric/access-token": "0.4.22-dev-1b6f03b.0+1b6f03b",
-    "@agoric/assert": "0.6.1-dev-1b6f03b.0+1b6f03b",
-    "@agoric/cache": "0.3.3-dev-1b6f03b.0+1b6f03b",
-    "@agoric/casting": "0.4.3-dev-1b6f03b.0+1b6f03b",
-    "@agoric/cosmic-proto": "0.3.1-dev-1b6f03b.0+1b6f03b",
-    "@agoric/ertp": "0.16.3-dev-1b6f03b.0+1b6f03b",
-    "@agoric/governance": "0.10.4-dev-1b6f03b.0+1b6f03b",
-    "@agoric/inter-protocol": "0.16.2-dev-1b6f03b.0+1b6f03b",
-    "@agoric/internal": "0.3.3-dev-1b6f03b.0+1b6f03b",
-    "@agoric/network": "0.1.1-dev-1b6f03b.0+1b6f03b",
-    "@agoric/smart-wallet": "0.5.4-dev-1b6f03b.0+1b6f03b",
-    "@agoric/store": "0.9.3-dev-1b6f03b.0+1b6f03b",
-    "@agoric/swingset-vat": "0.32.3-dev-1b6f03b.0+1b6f03b",
-    "@agoric/vats": "0.15.2-dev-1b6f03b.0+1b6f03b",
-    "@agoric/zoe": "0.26.3-dev-1b6f03b.0+1b6f03b",
-    "@agoric/zone": "0.2.3-dev-1b6f03b.0+1b6f03b",
+    "@agoric/access-token": "0.4.22-dev-9380cfe.0+9380cfe",
+    "@agoric/assert": "0.6.1-dev-9380cfe.0+9380cfe",
+    "@agoric/cache": "0.3.3-dev-9380cfe.0+9380cfe",
+    "@agoric/casting": "0.4.3-dev-9380cfe.0+9380cfe",
+    "@agoric/cosmic-proto": "0.3.1-dev-9380cfe.0+9380cfe",
+    "@agoric/ertp": "0.16.3-dev-9380cfe.0+9380cfe",
+    "@agoric/governance": "0.10.4-dev-9380cfe.0+9380cfe",
+    "@agoric/inter-protocol": "0.16.2-dev-9380cfe.0+9380cfe",
+    "@agoric/internal": "0.3.3-dev-9380cfe.0+9380cfe",
+    "@agoric/network": "0.1.1-dev-9380cfe.0+9380cfe",
+    "@agoric/smart-wallet": "0.5.4-dev-9380cfe.0+9380cfe",
+    "@agoric/store": "0.9.3-dev-9380cfe.0+9380cfe",
+    "@agoric/swingset-vat": "0.32.3-dev-9380cfe.0+9380cfe",
+    "@agoric/vats": "0.15.2-dev-9380cfe.0+9380cfe",
+    "@agoric/zoe": "0.26.3-dev-9380cfe.0+9380cfe",
+    "@agoric/zone": "0.2.3-dev-9380cfe.0+9380cfe",
     "@confio/relayer": "^0.9.0",
     "@cosmjs/crypto": "^0.30.1",
     "@cosmjs/encoding": "^0.30.1",
@@ -98,5 +98,5 @@
   "typeCoverage": {
     "atLeast": 77.53
   },
-  "gitHead": "1b6f03be8aa5cfe86039900ae8e1f15277a8333d"
+  "gitHead": "9380cfe04661eaed6de168e65a96730a8798bffb"
 }

package/src/commands/oracle.js

@@ -15,6 +15,7 @@ import {
   makeWalletUtils,
   outputAction,
   sendAction,
+  sendHint,
 } from '../lib/wallet.js';
 import { bigintReplacer } from '../lib/format.js';
 
@@ -128,7 +129,7 @@ export const makeOracleCommand = (logger, io = {}) => {
         offer,
       });
 
-      console.warn('Now execute the prepared offer');
+      console.warn(sendHint);
     });
 
   oracle
@@ -163,7 +164,7 @@ export const makeOracleCommand = (logger, io = {}) => {
         offer,
       });
 
-      console.warn('Now execute the prepared offer');
+      console.warn(sendHint);
     });
 
   const findOracleCap = async (instance, from, readLatestHead) => {

package/src/commands/psm.js

@@ -216,8 +216,6 @@ export const makePsmCommand = logger => {
       };
 
       outputExecuteOfferAction(offer);
-
-      console.warn('Now execute the prepared offer');
     });
 
   psm
@@ -272,8 +270,6 @@ export const makePsmCommand = logger => {
       };
 
       outputExecuteOfferAction(offer);
-
-      console.warn('Now execute the prepared offer');
     });
 
   return psm;

package/src/commands/vaults.js

@@ -54,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()}`)
@@ -76,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',
@@ -121,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',

package/src/lib/wallet.js

@@ -75,7 +75,7 @@ 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';
 
 /**
@@ -93,14 +93,20 @@ 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) => {
+export const outputExecuteOfferAction = (
+  offer,
+  stdout = process.stdout,
+  stderr = process.stderr,
+) => {
   /** @type {import('@agoric/smart-wallet/src/smartWallet').BridgeAction} */
   const spendAction = {
     method: 'executeOffer',
     offer,
   };
   outputAction(spendAction, stdout);
+  stderr.write(sendHint);
 };
 
 /**