agoric 0.21.2-dev-763bc10.0.763bc10 → 0.21.2-dev-bcbee89.0.bcbee89

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agoric",
-  "version": "0.21.2-dev-763bc10.0.763bc10",
+  "version": "0.21.2-dev-bcbee89.0.bcbee89",
   "description": "Manage the Agoric Javascript smart contract platform",
   "type": "module",
   "main": "src/main.js",
@@ -30,28 +30,28 @@
     "lint:eslint": "yarn run -T eslint ."
   },
   "devDependencies": {
-    "@agoric/cosmic-swingset": "0.41.4-dev-763bc10.0.763bc10",
-    "@agoric/deploy-script-support": "0.10.4-dev-763bc10.0.763bc10",
+    "@agoric/cosmic-swingset": "0.41.4-dev-bcbee89.0.bcbee89",
+    "@agoric/deploy-script-support": "0.10.4-dev-bcbee89.0.bcbee89",
     "ava": "^5.3.0",
     "c8": "^10.1.2"
   },
   "dependencies": {
-    "@agoric/access-token": "0.4.22-dev-763bc10.0.763bc10",
-    "@agoric/cache": "0.3.3-dev-763bc10.0.763bc10",
-    "@agoric/casting": "0.4.3-dev-763bc10.0.763bc10",
-    "@agoric/client-utils": "0.1.1-dev-763bc10.0.763bc10",
-    "@agoric/cosmic-proto": "0.4.1-dev-763bc10.0.763bc10",
-    "@agoric/ertp": "0.16.3-dev-763bc10.0.763bc10",
-    "@agoric/governance": "0.10.4-dev-763bc10.0.763bc10",
-    "@agoric/inter-protocol": "0.16.2-dev-763bc10.0.763bc10",
-    "@agoric/internal": "0.3.3-dev-763bc10.0.763bc10",
-    "@agoric/network": "0.1.1-dev-763bc10.0.763bc10",
-    "@agoric/smart-wallet": "0.5.4-dev-763bc10.0.763bc10",
-    "@agoric/store": "0.9.3-dev-763bc10.0.763bc10",
-    "@agoric/swingset-vat": "0.32.3-dev-763bc10.0.763bc10",
-    "@agoric/vats": "0.15.2-dev-763bc10.0.763bc10",
-    "@agoric/zoe": "0.26.3-dev-763bc10.0.763bc10",
-    "@agoric/zone": "0.2.3-dev-763bc10.0.763bc10",
+    "@agoric/access-token": "0.4.22-dev-bcbee89.0.bcbee89",
+    "@agoric/cache": "0.3.3-dev-bcbee89.0.bcbee89",
+    "@agoric/casting": "0.4.3-dev-bcbee89.0.bcbee89",
+    "@agoric/client-utils": "0.1.1-dev-bcbee89.0.bcbee89",
+    "@agoric/cosmic-proto": "0.4.1-dev-bcbee89.0.bcbee89",
+    "@agoric/ertp": "0.16.3-dev-bcbee89.0.bcbee89",
+    "@agoric/governance": "0.10.4-dev-bcbee89.0.bcbee89",
+    "@agoric/inter-protocol": "0.16.2-dev-bcbee89.0.bcbee89",
+    "@agoric/internal": "0.3.3-dev-bcbee89.0.bcbee89",
+    "@agoric/network": "0.1.1-dev-bcbee89.0.bcbee89",
+    "@agoric/smart-wallet": "0.5.4-dev-bcbee89.0.bcbee89",
+    "@agoric/store": "0.9.3-dev-bcbee89.0.bcbee89",
+    "@agoric/swingset-vat": "0.32.3-dev-bcbee89.0.bcbee89",
+    "@agoric/vats": "0.15.2-dev-bcbee89.0.bcbee89",
+    "@agoric/zoe": "0.26.3-dev-bcbee89.0.bcbee89",
+    "@agoric/zone": "0.2.3-dev-bcbee89.0.bcbee89",
     "@cosmjs/crypto": "^0.36.0",
     "@cosmjs/encoding": "^0.36.0",
     "@cosmjs/math": "^0.36.0",
@@ -101,5 +101,5 @@
   "typeCoverage": {
     "atLeast": 79.88
   },
-  "gitHead": "763bc10a6a843acfcee39f347957e56be7b58134"
+  "gitHead": "bcbee89fe2847f2d51784fb3e645fe8da8035a49"
 }

package/src/commands/wallet.js

@@ -68,7 +68,8 @@ export const makeWalletCommand = async command => {
     )
     .option('--spend', 'confirm you want to spend')
     .option('--nickname <string>', 'nickname to use', 'my-wallet')
-    .action(function (opts) {
+    .action(async function (opts) {
+      await null;
       /** @typedef {{account: string, spend?: boolean, nickname: 'my-wallet' | string }} Opts */
       const {
         account,
@@ -85,12 +86,12 @@ export const makeWalletCommand = async command => {
           ...networkConfig,
         });
       } else {
-        const params = fetchSwingsetParams(networkConfig);
+        const params = await fetchSwingsetParams(networkConfig);
         assert(
-          params.power_flag_fees.length === 1,
+          params.powerFlagFees.length === 1,
           'multiple power_flag_fees not supported',
         );
-        const { fee: fees } = params.power_flag_fees[0];
+        const { fee: fees } = params.powerFlagFees[0];
         const nf = new Intl.NumberFormat('en-US');
         const costs = fees
           .map(f => `${nf.format(Number(f.amount))} ${f.denom}`)

package/src/lib/chain.js

@@ -2,10 +2,11 @@
 /* eslint-env node */
 import { normalizeBech32 } from '@cosmjs/encoding';
 import { execFileSync as execFileSyncAmbient } from 'child_process';
+import { makeAgoricQueryClient } from '@agoric/client-utils';
 
 /**
  * @import {MinimalNetworkConfig} from '@agoric/client-utils';
- * @import {ParamsSDKType} from '@agoric/cosmic-proto/agoric/swingset/swingset.js';
+ * @import {Params, ParamsSDKType} from '@agoric/cosmic-proto/agoric/swingset/swingset.js';
  */
 
 const agdBinary = 'agd';
@@ -133,22 +134,12 @@ harden(execSwingsetTransaction);
 /**
  *
  * @param {MinimalNetworkConfig} net
- * @returns {ParamsSDKType}
+ * @returns {Promise<Params>}
  */
-// TODO fetch by HTTP instead of shelling out https://github.com/Agoric/agoric-sdk/issues/9200
-export const fetchSwingsetParams = net => {
-  const { chainName, rpcAddrs } = net;
-  const cmd = [
-    `--node=${rpcAddrs[0]}`,
-    `--chain-id=${chainName}`,
-    'query',
-    'swingset',
-    'params',
-    '--output',
-    'json',
-  ];
-  const buffer = execFileSyncAmbient(agdBinary, cmd);
-  return JSON.parse(buffer.toString());
+export const fetchSwingsetParams = async net => {
+  const client = await makeAgoricQueryClient(net);
+  const { params } = await client.agoric.swingset.params();
+  return params;
 };
 harden(fetchSwingsetParams);