agoric 0.21.2-other-dev-3eb1a1d.0 → 0.21.2-other-dev-d15096d.0.d15096d

package/src/main.js

@@ -87,19 +87,6 @@ const main = async (progname, rawArgs, powers) => {
       return subMain(cosmosMain, ['cosmos', ...command], opts);
     });
 
-  const ibcSetup = path.join(
-    dirname,
-    '..',
-    'node_modules',
-    '.bin',
-    'ibc-setup',
-  );
-  program.command(
-    'ibc-setup <command...>',
-    'set up Inter Blockchain Communication',
-    { executableFile: ibcSetup },
-  );
-
   baseCmd('open')
     .description('launch the Agoric UI')
     .option(
@@ -184,21 +171,6 @@ const main = async (progname, rawArgs, powers) => {
       return subMain(setDefaultsMain, ['set-defaults', prog, configDir], opts);
     });
 
-  const ibcRelayer = path.join(
-    dirname,
-    '..',
-    'node_modules',
-    '.bin',
-    'ibc-relayer',
-  );
-  program.command(
-    'ibc-relayer',
-    'run an Inter Blockchain Communications relayer',
-    {
-      executableFile: ibcRelayer,
-    },
-  );
-
   baseCmd('install [force-sdk-version]')
     .description('install Dapp dependencies')
     .action(async (forceSdkVersion, _options, cmd) => {
@@ -210,17 +182,13 @@ const main = async (progname, rawArgs, powers) => {
   baseCmd('follow <path-spec...>')
     .description('follow an Agoric Casting leader')
     .option(
-      '--proof <strict | optimistic | none>',
-      'set proof mode',
+      '--proof <none>',
+      `set proof mode (currently only 'none' is supported)`,
       value => {
-        assert(
-          ['strict', 'optimistic', 'none'].includes(value),
-          X`--proof must be one of 'strict', 'optimistic', or 'none'`,
-          TypeError,
-        );
+        assert.equal(value, 'none', X`--proof can only be 'none'`, TypeError);
         return value;
       },
-      'optimistic',
+      'none',
     )
     .option(
       '--sleep <seconds>',

package/src/publish.js

@@ -15,7 +15,17 @@ 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';
+
+/**
+ * @import {resolve} from 'path';
+ * @import {promises} from 'fs';
+ * @import {SigningStargateClient} from '@cosmjs/stargate';
+ * @import {EncodeObject} from '@cosmjs/proto-signing';
+ */
+
+const MsgInstallBundle = CodecHelper(MsgInstallBundleType);
 
 // https://github.com/Agoric/agoric-sdk/blob/master/golang/cosmos/daemon/main.go
 const Agoric = {
@@ -226,9 +236,9 @@ const urlForRpcAddress = address => {
 
 /**
  * @param {object} args
- * @param {typeof import('path').resolve} args.pathResolve
- * @param {typeof import('fs').promises.readFile} args.readFile
- * @param {typeof import('@cosmjs/stargate').SigningStargateClient.connectWithSigner} args.connectWithSigner
+ * @param {typeof resolve} args.pathResolve
+ * @param {typeof promises.readFile} args.readFile
+ * @param {typeof SigningStargateClient.connectWithSigner} args.connectWithSigner
  * @param {() => number} args.random - a random number in the interval [0, 1)
  */
 export const makeCosmosBundlePublisher = ({
@@ -269,7 +279,7 @@ export const makeCosmosBundlePublisher = ({
       submitter: fromBech32(from.address).data,
     };
 
-    /** @type {Array<import('@cosmjs/proto-signing').EncodeObject>} */
+    /** @type {Array<EncodeObject>} */
     const encodeObjects = [
       {
         typeUrl: Agoric.proto.swingset.InstallBundle.typeUrl,

package/src/scripts.js

@@ -2,15 +2,17 @@
 /* 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';
+
+/**
+ * @import {ModuleFormat} from '@endo/bundle-source';
+ * @import {BundleOptions} from '@endo/bundle-source';
+ * @import {BundleSourceResult} from '@endo/bundle-source';
+ */
 
 const require = createRequire(import.meta.url);
-const esmRequire = createEsmRequire(/** @type {NodeModule} */ ({}));
 
 const PATH_SEP_RE = new RegExp(`${path.sep.replace(/\\/g, '\\\\')}`, 'g');
 
@@ -133,39 +135,16 @@ 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,
         /**
-         * @template {import('@endo/bundle-source').ModuleFormat} ModuleFormat
+         * @template {ModuleFormat} ModuleFormat
          * @param {string} file
-         * @param {import('@endo/bundle-source').BundleOptions<ModuleFormat>} options
-         * @returns {Promise<import('@endo/bundle-source').BundleSourceResult<ModuleFormat>>}
+         * @param {BundleOptions<ModuleFormat>} options
+         * @returns {Promise<BundleSourceResult<ModuleFormat>>}
          */
         bundleSource: (file, options = {}) =>
           bundleSource(pathResolve(file), {

package/src/sdk-package-names.js

@@ -1,11 +1,18 @@
 // DO NOT EDIT - automatically generated by get-sdk-package-names.js
 // prettier-ignore
 export default [
+  "@aglocal/benchmark",
+  "@aglocal/boot",
+  "@aglocal/deployment",
+  "@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",
-  "@agoric/benchmark",
-  "@agoric/boot",
   "@agoric/builders",
   "@agoric/cache",
   "@agoric/casting",
@@ -15,9 +22,9 @@ export default [
   "@agoric/cosmos",
   "@agoric/create-dapp",
   "@agoric/deploy-script-support",
-  "@agoric/deployment",
   "@agoric/ertp",
   "@agoric/eslint-config",
+  "@agoric/eslint-plugin",
   "@agoric/fast-usdc",
   "@agoric/governance",
   "@agoric/import-manager",
@@ -28,6 +35,8 @@ export default [
   "@agoric/notifier",
   "@agoric/orchestration",
   "@agoric/pegasus",
+  "@agoric/pola-io",
+  "@agoric/portfolio-api",
   "@agoric/smart-wallet",
   "@agoric/solo",
   "@agoric/sparse-ints",
@@ -36,7 +45,6 @@ export default [
   "@agoric/store",
   "@agoric/swing-store",
   "@agoric/swingset-liveslots",
-  "@agoric/swingset-runner",
   "@agoric/swingset-vat",
   "@agoric/swingset-xsnap-supervisor",
   "@agoric/telemetry",

package/src/start.js

@@ -276,7 +276,7 @@ export default async function startMain(progname, rawArgs, powers, opts) {
       await rmVerbose(serverDir);
     }
 
-    /** @type {(args: string[], spawnOpts?: Parameters<typeof pspawn>[2], dockerArgs?: string[]) => ReturnType<pspawn>} */
+    /** @type {(args: string[], spawnOpts?: Parameters<typeof pspawn>[2], dockerArgs?: string[]) => ReturnType<typeof pspawn>} */
     let chainSpawn;
     if (!popts.dockerTag) {
       chainSpawn = (args, spawnOpts) =>
@@ -482,7 +482,7 @@ export default async function startMain(progname, rawArgs, powers, opts) {
       await rmVerbose(serverDir);
     }
 
-    /** @type {(args: string[], spawnOpts?: Parameters<typeof pspawn>[2], dockerArgs?: string[]) => ReturnType<pspawn>} */
+    /** @type {(args: string[], spawnOpts?: Parameters<typeof pspawn>[2], dockerArgs?: string[]) => ReturnType<typeof pspawn>} */
     let soloSpawn;
     if (!popts.dockerTag) {
       soloSpawn = (args, spawnOpts) => pspawn(agSolo, args, spawnOpts);
@@ -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) {

package/tools/getting-started.js

@@ -11,6 +11,11 @@ import { spawn } from 'child_process';
 
 import { makePspawn } from '../src/helpers.js';
 
+/**
+ * @import {ExecutionContext} from 'ava';
+ * @import {ChildProcess} from 'child_process';
+ */
+
 const RETRY_BLOCKHEIGHT_SECONDS = 3;
 const SOCKET_TIMEOUT_SECONDS = 2;
 
@@ -66,7 +71,7 @@ const getLatestBlockHeight = url =>
  * Test the "getting started" workflow. Note that this function may be imported
  * by external repositories.
  *
- * @param {import('ava').ExecutionContext} t
+ * @param {ExecutionContext} t
  * @param {{ init?: string[], install?: string[] }} [options]
  */
 export const gettingStartedWorkflowTest = async (t, options = {}) => {
@@ -108,12 +113,30 @@ export const gettingStartedWorkflowTest = async (t, options = {}) => {
     });
   }
 
-  function yarn(args) {
-    return pspawnStdout('yarn', args, {
+  /**
+   * @param {string[]} args
+   * @returns {{childProcess?: ChildProcess} & Promise<void>}
+   */
+  function yarn(...args) {
+    const ps = pspawnStdout('yarn', args, {
       stdio: ['ignore', 'pipe', 'inherit'],
       env: { ...process.env },
       detached: true,
     });
+    /** @type {{childProcess?: 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 +193,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 +228,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;

package/src/commands/auction.js

@@ -1,169 +0,0 @@
-// @ts-check
-/* eslint-env node */
-import { InvalidArgumentError } from 'commander';
-import { Fail } from '@endo/errors';
-import { makeVstorageKit } from '@agoric/client-utils';
-import { outputActionAndHint } from '../lib/wallet.js';
-import { getNetworkConfig } from '../lib/network-config.js';
-
-/**
- * @import {ParamTypesMap, ParamTypesMapFromRecord} from '@agoric/governance/src/contractGovernance/typedParamManager.js'
- * @import {ParamValueForType} from '@agoric/governance/src/types.js'
- */
-
-const networkConfig = await getNetworkConfig({ env: process.env, fetch });
-
-/**
- * @template {ParamTypesMap} M
- * @typedef {{
- *   [K in keyof M]: ParamValueForType<M[K]>
- * }} ParamValues
- */
-
-/** @typedef {ReturnType<import('@agoric/inter-protocol/src/auction/params.js').makeAuctioneerParams>} AuctionParamRecord */
-/** @typedef {ParamValues<ParamTypesMapFromRecord<AuctionParamRecord>>} AuctionParams */
-
-/**
- * @param {import('anylogger').Logger} _logger
- * @param {{
- *   createCommand: typeof import('commander').createCommand,
- *   fetch: typeof window.fetch,
- *   stdout: Pick<import('stream').Writable, 'write'>,
- *   stderr: Pick<import('stream').Writable, 'write'>,
- *   now: () => number,
- * }} io
- */
-export const makeAuctionCommand = (
-  _logger,
-  { createCommand, stdout, stderr, fetch, now },
-) => {
-  const auctioneer = createCommand('auctioneer').description(
-    'Auctioneer commands',
-  );
-
-  auctioneer
-    .command('proposeParamChange')
-    .description('propose a change to start frequency')
-    .option(
-      '--start-frequency <seconds>',
-      'how often to start auctions',
-      BigInt,
-    )
-    .option('--price-lock-period <seconds>', 'price lock period', BigInt)
-    .option('--clock-step <seconds>', 'descending clock frequency', BigInt)
-    .option(
-      '--starting-rate <basis-points>',
-      'relative to oracle: 999 = 1bp discount',
-      BigInt,
-    )
-    .option('--lowest-rate <basis-points>', 'lower limit for discount', BigInt)
-    .option(
-      '--discount-step <basis-points>',
-      'descending clock step size',
-      BigInt,
-    )
-    .requiredOption(
-      '--charterAcceptOfferId <string>',
-      'offer that had continuing invitation result',
-    )
-    .option('--offer-id <string>', 'Offer id', String, `propose-${Date.now()}`)
-    .option(
-      '--deadline <minutes>',
-      'minutes from now to close the vote',
-      Number,
-      1,
-    )
-    .action(
-      /**
-       *
-       * @param {{
-       *   charterAcceptOfferId: string,
-       *   startFrequency?: bigint,
-       *   clockStep?: bigint,
-       *   startingRate?: bigint,
-       *   lowestRate?: bigint,
-       *   discountStep?: bigint,
-       *   priceLockPeriod?: bigint,
-       *   offerId: string,
-       *   deadline: number,
-       * }} opts
-       */
-      async opts => {
-        const { agoricNames, readPublished } = await makeVstorageKit(
-          { fetch },
-          networkConfig,
-        );
-
-        const { current } = await readPublished(`auction.governance`);
-
-        const {
-          AuctionStartDelay: {
-            value: { timerBrand },
-          },
-        } = current;
-        timerBrand || Fail`no timer brand?`;
-
-        /**
-         * typed param manager requires RelativeTimeRecord
-         * but TimeMath.toRel prodocues a RelativeTime (which may be a bare bigint).
-         *
-         * @param {bigint} relValue
-         * @returns {import('@agoric/time').RelativeTimeRecord}
-         */
-        const toRel = relValue => ({ timerBrand, relValue });
-
-        /** @type {Partial<AuctionParams>} */
-        const params = {
-          ...(opts.startFrequency && {
-            StartFrequency: toRel(opts.startFrequency),
-          }),
-          ...(opts.clockStep && { ClockStep: toRel(opts.clockStep) }),
-          ...(opts.startingRate && { StartingRate: opts.startingRate }),
-          ...(opts.lowestRate && { LowestRate: opts.lowestRate }),
-          ...(opts.discountStep && { DiscountStep: opts.discountStep }),
-          ...(opts.priceLockPeriod && {
-            PriceLockPeriod: toRel(opts.priceLockPeriod),
-          }),
-        };
-
-        if (Object.keys(params).length === 0) {
-          // InvalidArgumentError is a class constructor, and so
-          // must be invoked with `new`.
-          throw new InvalidArgumentError(`no parameters given`);
-        }
-
-        const instance = agoricNames.instance.auctioneer;
-        instance || Fail`missing auctioneer in names`;
-
-        const t0 = now();
-        const deadline = BigInt(Math.round(t0 / 1000) + 60 * opts.deadline);
-
-        /** @type {import('@agoric/inter-protocol/src/econCommitteeCharter.js').ParamChangesOfferArgs} */
-        const offerArgs = {
-          deadline,
-          params,
-          instance,
-          path: { paramPath: { key: 'governedParams' } },
-        };
-
-        /** @type {import('@agoric/smart-wallet/src/offers.js').OfferSpec} */
-        const offer = {
-          id: opts.offerId,
-          invitationSpec: {
-            source: 'continuing',
-            previousOffer: opts.charterAcceptOfferId,
-            invitationMakerName: 'VoteOnParamChange',
-          },
-          offerArgs,
-          proposal: {},
-        };
-
-        outputActionAndHint(
-          { method: 'executeOffer', offer },
-          { stdout, stderr },
-        );
-      },
-    );
-
-  return auctioneer;
-};

package/src/lib/network-config.js

@@ -1,41 +0,0 @@
-import { NonNullish } from '@agoric/internal';
-
-/**
- * @import {MinimalNetworkConfig} from '@agoric/client-utils';
- */
-
-export const networkConfigUrl = agoricNetSubdomain =>
-  `https://${agoricNetSubdomain}.agoric.net/network-config`;
-export const rpcUrl = agoricNetSubdomain =>
-  `https://${agoricNetSubdomain}.rpc.agoric.net:443`;
-
-/**
- * @param {string} str
- * @param {{ fetch: typeof fetch }} io
- * @returns {Promise<MinimalNetworkConfig>}
- */
-const fromAgoricNet = (str, { fetch }) => {
-  const [netName, chainName] = str.split(',');
-  if (chainName) {
-    return Promise.resolve({ chainName, rpcAddrs: [rpcUrl(netName)] });
-  }
-  return fetch(networkConfigUrl(netName)).then(res => res.json());
-};
-
-/**
- * @param {{ env: typeof process.env, fetch: typeof fetch }} io
- * @returns {Promise<MinimalNetworkConfig>}
- */
-export const getNetworkConfig = async ({ env, fetch }) => {
-  if (!('AGORIC_NET' in env) || env.AGORIC_NET === 'local') {
-    return { rpcAddrs: ['http://0.0.0.0:26657'], chainName: 'agoriclocal' };
-  }
-
-  return fromAgoricNet(NonNullish(env.AGORIC_NET), { fetch }).catch(err => {
-    throw Error(
-      `cannot get network config (${env.AGORIC_NET || 'local'}): ${
-        err.message
-      }`,
-    );
-  });
-};