agoric 0.22.0-u20.0 → 0.22.0-u21.0

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "agoric",
-  "version": "0.22.0-u20.0",
+  "version": "0.22.0-u21.0",
   "description": "Manage the Agoric Javascript smart contract platform",
   "type": "module",
   "main": "src/main.js",
   "bin": {
-    "agoric": "src/entrypoint.js",
-    "agops": "src/bin-agops.js"
+    "agops": "src/bin-agops.js",
+    "agoric": "src/entrypoint.js"
   },
   "exports": {
     "./src/entrypoint.js": "./src/entrypoint.js",
@@ -25,33 +25,33 @@
     "test:xs": "exit 0",
     "integration-test": "ava --config .ava-integration-test.config.js",
     "lint-fix": "yarn lint:eslint --fix",
-    "lint": "run-s --continue-on-error lint:*",
-    "lint:types": "tsc",
-    "lint:eslint": "eslint ."
+    "lint": "yarn run -T run-s --continue-on-error 'lint:*'",
+    "lint:types": "yarn run -T tsc",
+    "lint:eslint": "yarn run -T eslint ."
   },
   "devDependencies": {
-    "@agoric/cosmic-swingset": "^0.42.0-u20.0",
-    "@agoric/deploy-script-support": "^0.10.4-u20.0",
+    "@agoric/cosmic-swingset": "workspace:*",
+    "@agoric/deploy-script-support": "workspace:*",
     "ava": "^5.3.0",
     "c8": "^10.1.2"
   },
   "dependencies": {
-    "@agoric/access-token": "^0.4.22-u20.0",
-    "@agoric/cache": "^0.3.3-u20.0",
-    "@agoric/casting": "^0.5.0-u20.0",
-    "@agoric/client-utils": "^0.2.0-u20.0",
-    "@agoric/cosmic-proto": "^0.5.0-u20.0",
-    "@agoric/ertp": "^0.16.3-u20.0",
-    "@agoric/governance": "^0.10.4-u20.0",
-    "@agoric/inter-protocol": "^0.17.0-u20.0",
-    "@agoric/internal": "^0.4.0-u20.0",
-    "@agoric/network": "^0.2.0-u20.0",
-    "@agoric/smart-wallet": "^0.5.4-u20.0",
-    "@agoric/store": "^0.9.3-u20.0",
-    "@agoric/swingset-vat": "^0.33.0-u20.0",
-    "@agoric/vats": "^0.16.0-u20.0",
-    "@agoric/zoe": "^0.27.0-u20.0",
-    "@agoric/zone": "^0.3.0-u20.0",
+    "@agoric/access-token": "workspace:*",
+    "@agoric/cache": "workspace:*",
+    "@agoric/casting": "workspace:*",
+    "@agoric/client-utils": "workspace:*",
+    "@agoric/cosmic-proto": "workspace:*",
+    "@agoric/ertp": "workspace:*",
+    "@agoric/governance": "workspace:*",
+    "@agoric/inter-protocol": "workspace:*",
+    "@agoric/internal": "workspace:*",
+    "@agoric/network": "workspace:*",
+    "@agoric/smart-wallet": "workspace:*",
+    "@agoric/store": "workspace:*",
+    "@agoric/swingset-vat": "workspace:*",
+    "@agoric/vats": "workspace:*",
+    "@agoric/zoe": "workspace:*",
+    "@agoric/zone": "workspace:*",
     "@cosmjs/crypto": "^0.33.0",
     "@cosmjs/encoding": "^0.33.0",
     "@cosmjs/math": "^0.33.0",
@@ -75,7 +75,6 @@
     "chalk": "^5.2.0",
     "commander": "^12.1.0",
     "deterministic-json": "^1.0.5",
-    "esm": "agoric-labs/esm#Agoric-built",
     "inquirer": "^8.2.2",
     "opener": "^1.5.2",
     "tmp": "^0.2.1",
@@ -100,7 +99,7 @@
     "workerThreads": false
   },
   "typeCoverage": {
-    "atLeast": 78.96
+    "atLeast": 79.15
   },
-  "gitHead": "8e4207fa19dabf76c1f91f8779b5b5b93570ecea"
+  "gitHead": "e4dd46857133403d584bcf822a81817b355532f9"
 }

package/src/bin-agops.js

@@ -3,8 +3,6 @@
 // @ts-check
 // @jessie-check
 
-import '@endo/init/pre.js';
-
 import '@endo/init';
 
 import { E } from '@endo/far';

package/src/chain-config.js

@@ -255,8 +255,14 @@ export function finishCosmosGenesis({ genesisJson, exportedGenesisJson }) {
 
   // Set the denomination for different modules.
   genesis.app_state.mint.params.mint_denom = MINT_DENOM;
-  genesis.app_state.gov.deposit_params.min_deposit = GOV_DEPOSIT_COINS;
-  genesis.app_state.gov.voting_params.voting_period = GOV_VOTING_PERIOD;
+
+  {
+    const gov = genesis.app_state.gov;
+    const depositParams = gov.params ?? gov.deposit_params;
+    const votingParams = gov.params ?? gov.voting_params;
+    depositParams.min_deposit = GOV_DEPOSIT_COINS;
+    votingParams.voting_period = GOV_VOTING_PERIOD;
+  }
 
   // Reduce the cost of a transaction.
   genesis.app_state.auth.params.tx_size_cost_per_byte = '1';

package/src/commands/auction.js

@@ -11,6 +11,7 @@ import { outputActionAndHint } from '../lib/wallet.js';
 
 /**
  * @import {ParamTypesMap, ParamTypesMapFromRecord} from '@agoric/governance/src/contractGovernance/typedParamManager.js'
+ * @import {AuctionParamRecord} from '@agoric/inter-protocol/src/auction/params.js';
  * @import {ParamValueForType} from '@agoric/governance/src/types.js'
  */
 
@@ -23,7 +24,6 @@ const networkConfig = await fetchEnvNetworkConfig({ env: process.env, fetch });
  * }} ParamValues
  */
 
-/** @typedef {ReturnType<import('@agoric/inter-protocol/src/auction/params.js').makeAuctioneerParams>} AuctionParamRecord */
 /** @typedef {ParamValues<ParamTypesMapFromRecord<AuctionParamRecord>>} AuctionParams */
 
 /**

package/src/commands/perf.js

@@ -51,6 +51,7 @@ export const makePerfCommand = logger => {
       'address literal or name',
       normalizeAddress,
     )
+    .option('--verbose')
     .action(async function (opts) {
       const sharedOpts = perf.opts();
       logger.warn({ sharedOpts, opts });
@@ -63,15 +64,13 @@ export const makePerfCommand = logger => {
 
       const spec = `:published.wallet.${opts.from}`;
 
-      const leaderOptions = makeLeaderOptions({
-        sleep: SLEEP_SECONDS,
-        jitter: 0,
-        log: () => undefined,
-      });
-
       const leader = makeLeaderFromRpcAddresses(
         networkConfig.rpcAddrs,
-        leaderOptions,
+        makeLeaderOptions({
+          sleep: SLEEP_SECONDS,
+          jitter: 0,
+          log: console.warn,
+        }),
       );
 
       logger.warn('Following', spec);
@@ -86,9 +85,10 @@ export const makePerfCommand = logger => {
             if (status.error) {
               console.error(status.error);
               exit(1);
-            } else if (status.numWantsSatisfied)
+            } else if (status.numWantsSatisfied) {
               process.stdout.write(`satisfied: ${status.numWantsSatisfied}\n`);
-            exit(0);
+              exit(0);
+            }
           }
         }
       };
@@ -102,7 +102,11 @@ export const makePerfCommand = logger => {
       if (sharedOpts.home) {
         cmd.push(`--home=${sharedOpts.home}`);
       }
-      execSwingsetTransaction(cmd, { from: opts.from, ...networkConfig });
+      execSwingsetTransaction(cmd, {
+        from: opts.from,
+        verbose: opts.verbose,
+        ...networkConfig,
+      });
     });
 
   return perf;

package/src/commands/wallet.js

@@ -278,15 +278,13 @@ export const makeWalletCommand = async command => {
     .action(async function ({ from }) {
       const spec = `:published.wallet.${from}`;
 
-      const leaderOptions = makeLeaderOptions({
-        sleep: SLEEP_SECONDS,
-        jitter: 0,
-        log: () => undefined,
-      });
-
       const leader = makeLeaderFromRpcAddresses(
         networkConfig.rpcAddrs,
-        leaderOptions,
+        makeLeaderOptions({
+          sleep: SLEEP_SECONDS,
+          jitter: 0,
+          log: console.warn,
+        }),
       );
 
       console.warn('Following', spec);

package/src/entrypoint.js

@@ -2,8 +2,6 @@
 /* eslint-env node */
 // @jessie-check
 
-import '@endo/init/pre.js';
-import 'esm';
 import '@endo/init/legacy.js';
 
 import path from 'path';

package/src/follow.js

@@ -126,16 +126,17 @@ export default async function followerMain(progname, rawArgs, powers, opts) {
     });
   }
 
-  const leaderOptions = makeLeaderOptions({
-    sleep,
-    jitter,
-    log: verbose ? console.warn : () => undefined,
-  });
-
   const [_cmd, ...specs] = rawArgs;
 
   verbose && console.warn('Creating leader for', bootstrap);
-  const leader = makeLeader(bootstrap, leaderOptions);
+  const leader = makeLeader(
+    bootstrap,
+    makeLeaderOptions({
+      sleep,
+      jitter,
+      log: verbose ? console.warn : () => undefined,
+    }),
+  );
   const iterate = opts.lossy ? iterateLatest : iterateEach;
   await Promise.all(
     specs.map(async spec => {

package/src/scripts.js

@@ -2,15 +2,11 @@
 /* eslint-env node */
 import bundleSource from '@endo/bundle-source';
 import { E } from '@endo/captp';
-import { search as readContainingPackageDescriptor } from '@endo/compartment-mapper';
 
-import createEsmRequire from 'esm';
 import { createRequire } from 'module';
 import path from 'path';
-import url from 'url';
 
 const require = createRequire(import.meta.url);
-const esmRequire = createEsmRequire(/** @type {NodeModule} */ ({}));
 
 const PATH_SEP_RE = new RegExp(`${path.sep.replace(/\\/g, '\\\\')}`, 'g');
 
@@ -133,31 +129,8 @@ export { bootPlugin } from ${JSON.stringify(absPath)};
       // Use a dynamic import to load the deploy script.
       // It is unconfined.
 
-      // Use Node.js ESM support if package.json of template says "type":
-      // "module".
-      const read = async location => fs.readFile(url.fileURLToPath(location));
-      const { packageDescriptorText } = await readContainingPackageDescriptor(
-        read,
-        url.pathToFileURL(moduleFile).href,
-      ).catch(cause => {
-        throw Error(
-          `Expected a package.json beside deploy script ${moduleFile}, ${cause}`,
-          { cause },
-        );
-      });
-      const packageDescriptor = JSON.parse(packageDescriptorText);
-      const nativeEsm = packageDescriptor.type === 'module';
-      console.log(
-        `Deploy script will run with ${
-          nativeEsm ? 'Node.js ESM' : 'standardthings/esm emulation'
-        }`,
-      );
-
       const modulePath = pathResolve(moduleFile);
-      let mainNS = await (nativeEsm && import(modulePath));
-      if (!mainNS) {
-        mainNS = esmRequire(modulePath);
-      }
+      const mainNS = await import(modulePath);
 
       const allEndowments = harden({
         home: bootP,

package/src/sdk-package-names.js

@@ -6,6 +6,7 @@ export default [
   "@aglocal/deployment",
   "@aglocal/fast-usdc-contract",
   "@aglocal/fast-usdc-deploy",
+  "@aglocal/portfolio-contract",
   "@aglocal/swingset-runner",
   "@agoric/access-token",
   "@agoric/async-flow",

package/tools/getting-started.js

@@ -108,12 +108,30 @@ export const gettingStartedWorkflowTest = async (t, options = {}) => {
     });
   }
 
-  function yarn(args) {
-    return pspawnStdout('yarn', args, {
+  /**
+   * @param {string[]} args
+   * @returns {{childProcess?: import('child_process').ChildProcess} & Promise<void>}
+   */
+  function yarn(...args) {
+    const ps = pspawnStdout('yarn', args, {
       stdio: ['ignore', 'pipe', 'inherit'],
       env: { ...process.env },
       detached: true,
     });
+    /** @type {{childProcess?: import('child_process').ChildProcess} & Promise<void>} */
+    const p = new Promise((resolve, reject) => {
+      ps.then(code => {
+        if (code !== 0) {
+          reject(
+            new Error(`yarn ${args.join(' ')} failed with exit code ${code}`),
+          );
+        } else {
+          resolve();
+        }
+      }).catch(reject);
+    });
+    p.childProcess = ps.childProcess;
+    return p;
   }
 
   const olddir = process.cwd();
@@ -170,12 +188,12 @@ export const gettingStartedWorkflowTest = async (t, options = {}) => {
     } else {
       // ==============
       // yarn install
-      t.is(await yarn(['install', ...installOptions]), 0, 'yarn install works');
+      await yarn('install', ...installOptions);
     }
 
     // ==============
     // yarn start:docker
-    t.is(await yarn(['start:docker']), 0, 'yarn start:docker works');
+    await yarn('start:docker');
 
     // ==============
     // wait for the chain to start
@@ -205,11 +223,11 @@ export const gettingStartedWorkflowTest = async (t, options = {}) => {
 
     // ==============
     // yarn start:contract
-    t.is(await yarn(['start:contract']), 0, 'yarn start:contract works');
+    await yarn('start:contract');
 
     // ==============
     // yarn start:ui
-    const startUiP = yarn(['start:ui']);
+    const startUiP = yarn('start:ui');
     finalizers.push(() => pkill(startUiP.childProcess, 'SIGINT'));
     const uiListening = makePromiseKit();
     let retries = 0;