agoric 0.22.0-u21.0.1 → 0.22.0-u22.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agoric",
-  "version": "0.22.0-u21.0.1",
+  "version": "0.22.0-u22.1",
   "description": "Manage the Agoric Javascript smart contract platform",
   "type": "module",
   "main": "src/main.js",
@@ -21,7 +21,7 @@
   "scripts": {
     "build": "node ./scripts/get-sdk-package-names.js > src/sdk-package-names.js",
     "test": "ava",
-    "test:c8": "c8 --all $C8_OPTIONS ava",
+    "test:c8": "c8 --all ${C8_OPTIONS:-} ava",
     "test:xs": "exit 0",
     "integration-test": "ava --config .ava-integration-test.config.js",
     "lint-fix": "yarn lint:eslint --fix",
@@ -30,46 +30,46 @@
     "lint:eslint": "yarn run -T eslint ."
   },
   "devDependencies": {
-    "@agoric/cosmic-swingset": "0.42.0-u21.0.1",
-    "@agoric/deploy-script-support": "0.10.4-u21.0.1",
+    "@agoric/cosmic-swingset": "0.42.0-u22.1",
+    "@agoric/deploy-script-support": "0.11.0-u22.1",
     "ava": "^5.3.0",
     "c8": "^10.1.2"
   },
   "dependencies": {
-    "@agoric/access-token": "0.4.22-u21.0.1",
-    "@agoric/cache": "0.3.3-u21.0.1",
-    "@agoric/casting": "0.5.0-u21.0.1",
-    "@agoric/client-utils": "0.2.0-u21.0.1",
-    "@agoric/cosmic-proto": "0.5.0-u21.0.1",
-    "@agoric/ertp": "0.16.3-u21.0.1",
-    "@agoric/governance": "0.10.4-u21.0.1",
-    "@agoric/inter-protocol": "0.17.0-u21.0.1",
-    "@agoric/internal": "0.4.0-u21.0.1",
-    "@agoric/network": "0.2.0-u21.0.1",
-    "@agoric/smart-wallet": "0.5.4-u21.0.1",
-    "@agoric/store": "0.9.3-u21.0.1",
-    "@agoric/swingset-vat": "0.33.0-u21.0.1",
-    "@agoric/vats": "0.16.0-u21.0.1",
-    "@agoric/zoe": "0.27.0-u21.0.1",
-    "@agoric/zone": "0.3.0-u21.0.1",
-    "@cosmjs/crypto": "^0.33.0",
-    "@cosmjs/encoding": "^0.33.0",
-    "@cosmjs/math": "^0.33.0",
-    "@cosmjs/proto-signing": "^0.33.0",
-    "@cosmjs/stargate": "^0.33.0",
-    "@endo/base64": "^1.0.9",
-    "@endo/bundle-source": "^4.0.0",
-    "@endo/captp": "^4.4.5",
-    "@endo/compartment-mapper": "^1.6.0",
-    "@endo/env-options": "^1.1.8",
-    "@endo/errors": "^1.2.10",
-    "@endo/far": "^1.1.11",
-    "@endo/init": "^1.1.9",
-    "@endo/marshal": "^1.6.4",
-    "@endo/nat": "^5.1.0",
-    "@endo/patterns": "^1.5.0",
-    "@endo/promise-kit": "^1.1.10",
-    "@endo/zip": "^1.0.9",
+    "@agoric/access-token": "0.4.22-u22.1",
+    "@agoric/cache": "0.4.0-u22.1",
+    "@agoric/casting": "0.5.0-u22.1",
+    "@agoric/client-utils": "0.2.0-u22.1",
+    "@agoric/cosmic-proto": "0.5.0-u22.1",
+    "@agoric/ertp": "0.17.0-u22.1",
+    "@agoric/governance": "0.11.0-u22.1",
+    "@agoric/inter-protocol": "0.17.0-u22.1",
+    "@agoric/internal": "0.4.0-u22.1",
+    "@agoric/network": "0.2.0-u22.1",
+    "@agoric/smart-wallet": "0.6.0-u22.1",
+    "@agoric/store": "0.10.0-u22.1",
+    "@agoric/swingset-vat": "0.33.0-u22.1",
+    "@agoric/vats": "0.16.0-u22.1",
+    "@agoric/zoe": "0.27.0-u22.1",
+    "@agoric/zone": "0.3.0-u22.1",
+    "@cosmjs/crypto": "^0.36.0",
+    "@cosmjs/encoding": "^0.36.0",
+    "@cosmjs/math": "^0.36.0",
+    "@cosmjs/proto-signing": "^0.36.0",
+    "@cosmjs/stargate": "^0.36.0",
+    "@endo/base64": "^1.0.12",
+    "@endo/bundle-source": "^4.1.2",
+    "@endo/captp": "^4.4.8",
+    "@endo/compartment-mapper": "^1.6.3",
+    "@endo/env-options": "^1.1.11",
+    "@endo/errors": "^1.2.13",
+    "@endo/far": "^1.1.14",
+    "@endo/init": "^1.1.12",
+    "@endo/marshal": "^1.8.0",
+    "@endo/nat": "^5.1.3",
+    "@endo/patterns": "^1.7.0",
+    "@endo/promise-kit": "^1.1.13",
+    "@endo/zip": "^1.0.11",
     "@iarna/toml": "^2.2.3",
     "anylogger": "^0.21.0",
     "chalk": "^5.2.0",
@@ -99,7 +99,10 @@
     "workerThreads": false
   },
   "typeCoverage": {
-    "atLeast": 79.15
+    "atLeast": 79.88
   },
-  "gitHead": "f5318add2db0f254e5647374088bb7ae350ad3fa"
+  "engines": {
+    "node": "^20.9 || ^22.11"
+  },
+  "gitHead": "83a42d0f343b01448a918631dce159b5bdb69b7e"
 }

package/src/chain-config.js

@@ -132,6 +132,7 @@ export function finishCosmosApp({
 
   // Optionally enable the rosetta service
   if (enableRosetta) {
+    app.rosetta ||= {};
     app.rosetta.enable = enableRosetta;
     app.rosetta.network = chainId;
     app.rosetta.retries = 30;

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/deploy.js

@@ -190,6 +190,12 @@ const connectAndRun = async (
   return retryWebsocket().then(() => exit.promise);
 };
 
+/**
+ * @param {string} progname
+ * @param {string[]} rawArgs
+ * @param {{ makeWebSocket?: (...args: ConstructorParameters<typeof WebSocket>) => WebSocket; anylogger: (name: string) => Console; now?: () => number; fs?: any; }} powers
+ * @param {{ allowUnsafePlugins: any; provide: string; sdk: any; need: string; hostport: string; target: string | number | undefined; scriptArgs: any; }} opts
+ */
 export default async function deployMain(progname, rawArgs, powers, opts) {
   const { anylogger, now, fs } = powers;
   const console = anylogger('agoric:deploy');
@@ -238,7 +244,7 @@ export default async function deployMain(progname, rawArgs, powers, opts) {
 
   const match = opts.hostport.match(/^(.*):(\d+)$/);
   const host = match ? match[1] : 'localhost';
-  const port = match ? match[2] : '8000';
+  const port = match ? +match[2] : 8000;
 
   const wsurl = opts.hostport.includes('//')
     ? new URL(opts.hostport, 'ws://localhost:8000')

package/src/entrypoint.js

@@ -21,6 +21,7 @@ const log = anylogger('agoric');
 const progname = path.basename(process.argv[1]);
 
 const stdout = str => process.stdout.write(str);
+/** @type {(...args: ConstructorParameters<typeof WebSocket>) => WebSocket} */
 const makeWebSocket = (...args) => new WebSocket(...args);
 
 const rawArgs = process.argv.slice(2);

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);
 
@@ -172,9 +163,8 @@ export const pollBlocks = opts => async lookup => {
   for (;;) {
     const sTxt = execFileSync(agdBinary, ['status', ...nodeArgs]);
     const status = JSON.parse(sTxt.toString());
-    const {
-      SyncInfo: { latest_block_time: time, latest_block_height: height },
-    } = status;
+    const { latest_block_time: time, latest_block_height: height } =
+      status.sync_info || status.SyncInfo;
     try {
       // see await null above
       const result = await lookup({ time, height });
@@ -200,7 +190,7 @@ export const pollBlocks = opts => async lookup => {
  * }} opts
  */
 export const pollTx = async (txhash, opts) => {
-  const { execFileSync, rpcAddrs, chainName } = opts;
+  const { execFileSync, rpcAddrs } = opts;
 
   const nodeArgs = [`--node=${rpcAddrs[0]}`];
   const outJson = ['--output', 'json'];
@@ -208,14 +198,7 @@ export const pollTx = async (txhash, opts) => {
   const lookup = async () => {
     const out = execFileSync(
       agdBinary,
-      [
-        'query',
-        'tx',
-        txhash,
-        `--chain-id=${chainName}`,
-        ...nodeArgs,
-        ...outJson,
-      ],
+      ['query', 'tx', txhash, ...nodeArgs, ...outJson],
       { stdio: ['ignore', 'pipe', 'pipe'] },
     );
     // XXX this type is defined in a .proto file somewhere

package/src/publish.js

@@ -15,7 +15,10 @@ 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';
+import { CodecHelper } from '@agoric/cosmic-proto';
+import { MsgInstallBundle as MsgInstallBundleType } from '@agoric/cosmic-proto/swingset/msgs.js';
+
+const MsgInstallBundle = CodecHelper(MsgInstallBundleType);
 
 // https://github.com/Agoric/agoric-sdk/blob/master/golang/cosmos/daemon/main.go
 const Agoric = {

package/src/sdk-package-names.js

@@ -7,7 +7,9 @@ export default [
   "@aglocal/fast-usdc-contract",
   "@aglocal/fast-usdc-deploy",
   "@aglocal/portfolio-contract",
+  "@aglocal/portfolio-deploy",
   "@aglocal/swingset-runner",
+  "@aglocal/ymax-planner",
   "@agoric/access-token",
   "@agoric/async-flow",
   "@agoric/base-zone",
@@ -32,6 +34,8 @@ export default [
   "@agoric/notifier",
   "@agoric/orchestration",
   "@agoric/pegasus",
+  "@agoric/pola-io",
+  "@agoric/portfolio-api",
   "@agoric/smart-wallet",
   "@agoric/solo",
   "@agoric/sparse-ints",

package/src/start.js

@@ -597,7 +597,6 @@ export default async function startMain(progname, rawArgs, powers, opts) {
           'swingset',
           'egress',
           soloAddr,
-          `--chain-id=${CHAIN_ID}`,
           `--node=tcp://${rpcAddr}`,
         ]);
         if (exitStatus) {