agoric 0.21.2-dev-c50ca19.0 → 0.21.2-dev-f5f34f4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agoric",
-  "version": "0.21.2-dev-c50ca19.0+c50ca19",
+  "version": "0.21.2-dev-f5f34f4.0+f5f34f4",
   "description": "Manage the Agoric Javascript smart contract platform",
   "type": "module",
   "main": "src/main.js",
@@ -28,25 +28,25 @@
     "lint:eslint": "eslint ."
   },
   "devDependencies": {
-    "@agoric/deploy-script-support": "0.10.4-dev-c50ca19.0+c50ca19",
+    "@agoric/deploy-script-support": "0.10.4-dev-f5f34f4.0+f5f34f4",
     "ava": "^5.3.0",
     "c8": "^7.13.0"
   },
   "dependencies": {
-    "@agoric/access-token": "0.4.22-dev-c50ca19.0+c50ca19",
-    "@agoric/assert": "0.6.1-dev-c50ca19.0+c50ca19",
-    "@agoric/cache": "0.3.3-dev-c50ca19.0+c50ca19",
-    "@agoric/casting": "0.4.3-dev-c50ca19.0+c50ca19",
-    "@agoric/cosmic-proto": "0.3.1-dev-c50ca19.0+c50ca19",
-    "@agoric/ertp": "0.16.3-dev-c50ca19.0+c50ca19",
-    "@agoric/inter-protocol": "0.16.2-dev-c50ca19.0+c50ca19",
-    "@agoric/internal": "0.3.3-dev-c50ca19.0+c50ca19",
-    "@agoric/smart-wallet": "0.5.4-dev-c50ca19.0+c50ca19",
-    "@agoric/store": "0.9.3-dev-c50ca19.0+c50ca19",
-    "@agoric/swingset-vat": "0.32.3-dev-c50ca19.0+c50ca19",
-    "@agoric/vats": "0.15.2-dev-c50ca19.0+c50ca19",
-    "@agoric/zoe": "0.26.3-dev-c50ca19.0+c50ca19",
-    "@agoric/zone": "0.2.3-dev-c50ca19.0+c50ca19",
+    "@agoric/access-token": "0.4.22-dev-f5f34f4.0+f5f34f4",
+    "@agoric/assert": "0.6.1-dev-f5f34f4.0+f5f34f4",
+    "@agoric/cache": "0.3.3-dev-f5f34f4.0+f5f34f4",
+    "@agoric/casting": "0.4.3-dev-f5f34f4.0+f5f34f4",
+    "@agoric/cosmic-proto": "0.3.1-dev-f5f34f4.0+f5f34f4",
+    "@agoric/ertp": "0.16.3-dev-f5f34f4.0+f5f34f4",
+    "@agoric/inter-protocol": "0.16.2-dev-f5f34f4.0+f5f34f4",
+    "@agoric/internal": "0.3.3-dev-f5f34f4.0+f5f34f4",
+    "@agoric/smart-wallet": "0.5.4-dev-f5f34f4.0+f5f34f4",
+    "@agoric/store": "0.9.3-dev-f5f34f4.0+f5f34f4",
+    "@agoric/swingset-vat": "0.32.3-dev-f5f34f4.0+f5f34f4",
+    "@agoric/vats": "0.15.2-dev-f5f34f4.0+f5f34f4",
+    "@agoric/zoe": "0.26.3-dev-f5f34f4.0+f5f34f4",
+    "@agoric/zone": "0.2.3-dev-f5f34f4.0+f5f34f4",
     "@confio/relayer": "^0.9.0",
     "@cosmjs/crypto": "^0.30.1",
     "@cosmjs/encoding": "^0.30.1",
@@ -92,5 +92,5 @@
     "timeout": "2m",
     "workerThreads": false
   },
-  "gitHead": "c50ca190ec2254d16e6d15d8f1235fcb4aa63560"
+  "gitHead": "f5f34f4ad80a92d66f74e588e0fa119dfc99ca31"
 }

package/src/commands/inter.js

@@ -205,6 +205,10 @@ 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 "${
@@ -337,10 +341,10 @@ inter auction status
     const { networkConfig, agoricNames, pollOffer } = tools;
     const io = { ...networkConfig, execFileSync, delay, stdout };
 
-    const { home, keyringBackend: backend } = interCmd.opts();
+    const { home, keyringBackend: backend, fees } = interCmd.opts();
     const result = await sendAction(
       { method: 'executeOffer', offer },
-      { keyring: { home, backend }, from, verbose: false, dryRun, ...io },
+      { keyring: { home, backend }, from, fees, verbose: false, dryRun, ...io },
     );
     if (dryRun) {
       return;

package/src/lib/chain.js

@@ -38,6 +38,7 @@ harden(normalizeAddressWithOptions);
  * @param {ReadonlyArray<string>} swingsetArgs
  * @param {import('./rpc').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,7 +79,15 @@ 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);

package/src/lib/wallet.js

@@ -131,6 +131,7 @@ 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'>,
@@ -158,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 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;