agoric 0.21.2-dev-4c9a859.0 → 0.21.2-dev-e468caa.0

package/package.json

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

package/src/commands/wallet.js

@@ -50,11 +50,10 @@ export const makeWalletCommand = async command => {
     )
     .option('--spend', 'confirm you want to spend')
     .option('--nickname <string>', 'nickname to use', 'my-wallet')
-    .action(async function (opts) {
+    .action(function (opts) {
       const { account, nickname, spend } = opts;
       const { home, keyringBackend: backend } = wallet.opts();
       const tx = ['provision-one', nickname, account, 'SMART_WALLET'];
-      await null;
       if (spend) {
         execSwingsetTransaction(tx, {
           from: account,
@@ -62,12 +61,12 @@ export const makeWalletCommand = async command => {
           ...networkConfig,
         });
       } else {
-        const params = await fetchSwingsetParams(networkConfig);
+        const params = fetchSwingsetParams(networkConfig);
         assert(
-          params.powerFlagFees.length === 1,
-          'multiple powerFlagFees not supported',
+          params.power_flag_fees.length === 1,
+          'multiple power_flag_fees not supported',
         );
-        const { fee: fees } = params.powerFlagFees[0];
+        const { fee: fees } = params.power_flag_fees[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

@@ -1,6 +1,5 @@
 // @ts-check
 /* global process */
-import { agoric } from '@agoric/cosmic-proto';
 import { normalizeBech32 } from '@cosmjs/encoding';
 import { execFileSync as execFileSyncAmbient } from 'child_process';
 
@@ -96,16 +95,21 @@ harden(execSwingsetTransaction);
 /**
  *
  * @param {import('./rpc.js').MinimalNetworkConfig} net
- * @returns {Promise<import('@agoric/cosmic-proto/swingset/swingset.js').Params>}
  */
-export const fetchSwingsetParams = async net => {
-  const { rpcAddrs } = net;
-  const rpcEndpoint = rpcAddrs[0];
-  const client = await agoric.ClientFactory.createRPCQueryClient({
-    rpcEndpoint,
-  });
-  const { params } = await client.agoric.swingset.params();
-  return 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());
 };
 harden(fetchSwingsetParams);
 

package/src/publish.js

@@ -9,12 +9,14 @@ import {
   makeLeaderFromRpcAddresses,
   makeCastingSpec,
 } from '@agoric/casting';
-import { getSigningAgoricClientOptions } from '@agoric/cosmic-proto';
-import { DirectSecp256k1HdWallet } from '@cosmjs/proto-signing';
+import { DirectSecp256k1HdWallet, Registry } from '@cosmjs/proto-signing';
+import { defaultRegistryTypes } from '@cosmjs/stargate';
 import { stringToPath } from '@cosmjs/crypto';
 import { Decimal } from '@cosmjs/math';
 import { fromBech32 } from '@cosmjs/encoding';
 
+import { MsgInstallBundle } from '@agoric/cosmic-proto/swingset/msgs.js';
+
 // https://github.com/Agoric/agoric-sdk/blob/master/golang/cosmos/daemon/main.go
 const Agoric = {
   Bech32MainPrefix: 'agoric',
@@ -36,6 +38,12 @@ const Agoric = {
 const hdPath = (coinType = 118, account = 0) =>
   stringToPath(`m/44'/${coinType}'/${account}'/0/0`);
 
+// @ts-expect-error difference in private property _push
+const registry = new Registry([
+  ...defaultRegistryTypes,
+  [Agoric.proto.swingset.InstallBundle.typeUrl, MsgInstallBundle],
+]);
+
 /**
  * @typedef {object} JsonHttpRequest
  * @property {string} hostname
@@ -281,8 +289,8 @@ export const makeCosmosBundlePublisher = ({
 
       // AWAIT
       const stargateClient = await connectWithSigner(endpoint, wallet, {
-        ...getSigningAgoricClientOptions(),
         gasPrice: Agoric.gasPrice,
+        registry,
       });
 
       // AWAIT