agoric 0.21.2-dev-7cc5def.0 → 0.21.2-u11.0

package/src/lib/wallet.js

@@ -9,6 +9,7 @@ import { boardSlottingMarshaller, makeRpcUtils } from './rpc.js';
 /** @typedef {import('@agoric/smart-wallet/src/smartWallet.js').CurrentWalletRecord} CurrentWalletRecord  */
 /** @typedef {import('@agoric/vats/tools/board-utils.js').AgoricNamesRemotes} AgoricNamesRemotes  */
 
+const { values } = Object;
 const { Fail } = assert;
 const marshaller = boardSlottingMarshaller();
 
@@ -131,7 +132,6 @@ export const coalesceWalletState = async (follower, invitationBrand) => {
  * @param {import('@agoric/smart-wallet/src/smartWallet').BridgeAction} bridgeAction
  * @param {import('./rpc').MinimalNetworkConfig & {
  *   from: string,
- *   fees?: string,
  *   verbose?: boolean,
  *   keyring?: {home?: string, backend: string},
  *   stdout: Pick<import('stream').Writable, 'write'>,
@@ -159,7 +159,7 @@ export const sendAction = async (bridgeAction, opts) => {
   assert(out); // not dry run
   const tx = JSON.parse(out);
   if (tx.code !== 0) {
-    const err = Error(`failed to send tx: ${tx.raw_log} code: ${tx.code}`);
+    const err = Error(`failed to send action. code: ${tx.code}`);
     // @ts-expect-error XXX how to add properties to an error?
     err.code = tx.code;
     throw err;
@@ -247,6 +247,7 @@ export const makeWalletUtils = async (
     untilNumWantsSatisfied = false,
   ) => {
     const lookup = async () => {
+      // eslint-disable-next-line @jessie.js/no-nested-await, no-await-in-loop
       const { offerStatuses } = await storedWalletState(from, minHeight);
       const offerStatus = [...offerStatuses.values()].find(s => s.id === id);
       if (!offerStatus) throw Error('retry');
@@ -271,3 +272,44 @@ export const makeWalletUtils = async (
     pollOffer,
   };
 };
+
+/**
+ * @param {{
+ *   brand: Record<string, Brand>,
+ *   vbankAsset: Record<string, { brand: Brand, displayInfo: DisplayInfo }>,
+ * }} agoricNames
+ * @param {(msg: string) => Error} makeError error constructor
+ * @returns {(a: string) => Amount<'nat'>}
+ */
+export const makeParseAmount =
+  (agoricNames, makeError = msg => RangeError(msg)) =>
+  opt => {
+    assert.typeof(opt, 'string', 'parseAmount expected string');
+    const m = opt.match(/^(?<value>[\d_]+(\.[\d_]+)?)(?<brand>[A-Z]\w*?)$/);
+    if (!m || !m.groups) {
+      throw makeError(`invalid amount: ${opt}`);
+    }
+    const anyBrand = agoricNames.brand[m.groups.brand];
+    if (!anyBrand) {
+      throw makeError(`unknown brand: ${m.groups.brand}`);
+    }
+    const assetDesc = values(agoricNames.vbankAsset).find(
+      d => d.brand === anyBrand,
+    );
+    if (!assetDesc) {
+      throw makeError(`unknown brand: ${m.groups.brand}`);
+    }
+    const { displayInfo } = assetDesc;
+    if (!displayInfo.decimalPlaces || displayInfo.assetKind !== 'nat') {
+      throw makeError(`bad brand: ${displayInfo}`);
+    }
+    const value = BigInt(
+      Number(m.groups.value.replace(/_/g, '')) *
+        10 ** displayInfo.decimalPlaces,
+    );
+    /** @type {Brand<'nat'>} */
+    // @ts-expect-error dynamic cast
+    const natBrand = anyBrand;
+    const amt = { value, brand: natBrand };
+    return amt;
+  };

package/src/main-publish.js

@@ -31,9 +31,9 @@ const publishMain = async (progname, rawArgs, powers, opts) => {
     chainID,
   };
 
-  await null;
   for (const bundlePath of rawArgs.slice(1)) {
     // AWAIT
+    // eslint-disable-next-line no-await-in-loop,@jessie.js/no-nested-await
     const bundleText = await fs.readFile(bundlePath, 'utf-8');
     const bundle = parseLocatedJson(bundleText, bundlePath);
 
@@ -53,6 +53,7 @@ const publishMain = async (progname, rawArgs, powers, opts) => {
     });
 
     // AWAIT
+    // eslint-disable-next-line no-await-in-loop,@jessie.js/no-nested-await
     const hashedBundle = await publishBundle(bundle, connectionSpec);
     process.stdout.write(`${JSON.stringify(hashedBundle)}\n`);
   }

package/src/main.js

@@ -1,3 +1,4 @@
+/* eslint-disable @jessie.js/no-nested-await */
 /* global process */
 import { Command } from 'commander';
 import path from 'path';
@@ -35,7 +36,6 @@ const main = async (progname, rawArgs, powers) => {
   const program = new Command();
 
   async function isNotBasedir() {
-    await null;
     try {
       await fs.stat(STAMP);
       return false;

package/src/publish.js

@@ -289,12 +289,14 @@ export const makeCosmosBundlePublisher = ({
       const endpoint = urlForRpcAddress(rpcAddress);
 
       // AWAIT
+      // eslint-disable-next-line no-await-in-loop,@jessie.js/no-nested-await
       const stargateClient = await connectWithSigner(endpoint, wallet, {
         gasPrice: Agoric.gasPrice,
         registry,
       });
 
       // AWAIT
+      // eslint-disable-next-line no-await-in-loop,@jessie.js/no-nested-await
       const result = await stargateClient
         .signAndBroadcast(from.address, encodeObjects, Agoric.fee)
         .catch(error => {
@@ -310,6 +312,7 @@ export const makeCosmosBundlePublisher = ({
       }
 
       // AWAIT
+      // eslint-disable-next-line no-await-in-loop,@jessie.js/no-nested-await
       await E(leader).jitter('agoric CLI deploy');
     }
 
@@ -423,7 +426,6 @@ const publishBundle = async (
     )}, publishBundle supports only "endoZipBase64" with "endoZipBase64Sha512"`;
   }
 
-  await null;
   if (connectionSpec === undefined && getDefaultConnection !== undefined) {
     connectionSpec = await getDefaultConnection();
   }

package/src/sdk-package-names.js

@@ -4,9 +4,6 @@
 export default [
   "@agoric/access-token",
   "@agoric/assert",
-  "@agoric/base-zone",
-  "@agoric/boot",
-  "@agoric/builders",
   "@agoric/cache",
   "@agoric/casting",
   "@agoric/cosmic-proto",
@@ -19,10 +16,10 @@ export default [
   "@agoric/import-manager",
   "@agoric/inter-protocol",
   "@agoric/internal",
-  "@agoric/network",
   "@agoric/notifier",
   "@agoric/pegasus",
   "@agoric/same-structure",
+  "@agoric/sharing-service",
   "@agoric/smart-wallet",
   "@agoric/solo",
   "@agoric/sparse-ints",
@@ -37,11 +34,13 @@ export default [
   "@agoric/swingset-xsnap-supervisor",
   "@agoric/telemetry",
   "@agoric/time",
+  "@agoric/ui-components",
   "@agoric/vat-data",
   "@agoric/vats",
-  "@agoric/vm-config",
   "@agoric/wallet",
   "@agoric/wallet-backend",
+  "@agoric/wallet-connection",
+  "@agoric/web-components",
   "@agoric/xsnap",
   "@agoric/xsnap-lockdown",
   "@agoric/zoe",

package/src/set-defaults.js

@@ -42,7 +42,6 @@ export default async function setDefaultsMain(progname, rawArgs, powers, opts) {
     return fs.writeFile(fileName, contents);
   };
 
-  await null;
   if (appFile) {
     log(`read ${appFile}`);
     const appToml = await fs.readFile(appFile, 'utf-8');

package/src/start.js

@@ -40,7 +40,6 @@ const DELEGATE0_COINS = `50000000${STAKING_DENOM}`;
 const SOLO_COINS = `13000000${STAKING_DENOM},500000000${CENTRAL_DENOM}`;
 const CHAIN_ID = 'agoriclocal';
 
-const SERVERS_ROOT_DIR = '_agstate/agoric-servers';
 const FAKE_CHAIN_DELAY =
   process.env.FAKE_CHAIN_DELAY === undefined
     ? 0
@@ -152,7 +151,6 @@ export default async function startMain(progname, rawArgs, powers, opts) {
     ]);
 
   const exists = async file => {
-    await null;
     try {
       await fs.stat(file);
       return true;
@@ -161,12 +159,6 @@ export default async function startMain(progname, rawArgs, powers, opts) {
     }
   };
 
-  const rmVerbose = async filePath => {
-    log(chalk.green(`removing ${filePath}`));
-    // rm is available on all the unix-likes, so use it for speed.
-    await pspawn('rm', ['-rf', filePath]);
-  };
-
   let agSolo;
   let agSoloBuild;
   if (opts.dockerTag) {
@@ -179,11 +171,12 @@ export default async function startMain(progname, rawArgs, powers, opts) {
     const fakeDelay =
       popts.delay === undefined ? FAKE_CHAIN_DELAY : Number(popts.delay);
 
-    const serverDir = `${SERVERS_ROOT_DIR}/${profileName}`;
+    const agServer = `_agstate/agoric-servers/${profileName}`;
 
-    await null;
     if (popts.reset) {
-      rmVerbose(serverDir);
+      log(chalk.green(`removing ${agServer}`));
+      // rm is available on all the unix-likes, so use it for speed.
+      await pspawn('rm', ['-rf', agServer]);
     }
 
     if (!opts.dockerTag) {
@@ -204,14 +197,14 @@ export default async function startMain(progname, rawArgs, powers, opts) {
     }
 
     const fakeGCI = 'sim-chain';
-    const serverExists = await exists(serverDir);
+    const serverExists = await exists(agServer);
     if (!serverExists) {
       log(chalk.yellow(`initializing ${profileName}`));
       await pspawn(
         agSolo,
         ['init', profileName, '--egresses=fake', `--webport=${HOST_PORT}`],
         {
-          cwd: SERVERS_ROOT_DIR,
+          cwd: '_agstate/agoric-servers',
         },
       );
     }
@@ -222,7 +215,7 @@ export default async function startMain(progname, rawArgs, powers, opts) {
         agSolo,
         ['set-fake-chain', `--delay=${fakeDelay}`, fakeGCI],
         {
-          cwd: serverDir,
+          cwd: agServer,
         },
       );
     }
@@ -233,7 +226,7 @@ export default async function startMain(progname, rawArgs, powers, opts) {
     }
 
     const ps = pspawn(agSolo, [...debugOpts, 'start'], {
-      cwd: serverDir,
+      cwd: agServer,
       env: nodeDebugEnv,
     });
     process.on('SIGINT', () => ps.childProcess.kill('SIGINT'));
@@ -253,7 +246,6 @@ export default async function startMain(progname, rawArgs, powers, opts) {
     }
 
     const { cosmosChain, cosmosChainBuild } = getSDKBinaries(sdkPrefixes);
-    await null;
     if (popts.pull || popts.rebuild) {
       if (popts.dockerTag) {
         const exitStatus = await pspawn('docker', ['pull', SDK_IMAGE]);
@@ -271,15 +263,17 @@ export default async function startMain(progname, rawArgs, powers, opts) {
       }
     }
 
-    const serverDir = `${SERVERS_ROOT_DIR}/${profileName}-${portNum}`;
+    const agServer = `_agstate/agoric-servers/${profileName}-${portNum}`;
     if (popts.reset) {
-      rmVerbose(serverDir);
+      log(chalk.green(`removing ${agServer}`));
+      // rm is available on all the unix-likes, so use it for speed.
+      await pspawn('rm', ['-rf', agServer]);
     }
 
     let chainSpawn;
     if (!popts.dockerTag) {
       chainSpawn = (args, spawnOpts = undefined) => {
-        return pspawn(cosmosChain, [...args, `--home=${serverDir}`], spawnOpts);
+        return pspawn(cosmosChain, [...args, `--home=${agServer}`], spawnOpts);
       };
     } else {
       chainSpawn = (args, spawnOpts = undefined, dockerArgs = []) =>
@@ -293,13 +287,13 @@ export default async function startMain(progname, rawArgs, powers, opts) {
             ...terminalOnlyFlags(`-it`),
             SDK_IMAGE,
             ...args,
-            `--home=/usr/src/dapp/${serverDir}`,
+            `--home=/usr/src/dapp/${agServer}`,
           ],
           spawnOpts,
         );
     }
 
-    const serverExists = await exists(serverDir);
+    const serverExists = await exists(agServer);
     if (!serverExists) {
       const exitStatus = await chainSpawn([
         'init',
@@ -314,6 +308,7 @@ export default async function startMain(progname, rawArgs, powers, opts) {
     // Get or create the essential addresses.
     const addrs = {};
     for (const keyName of ['provision', 'delegate0']) {
+      /* eslint-disable no-await-in-loop */
       let statusOut = showKey(keyName);
       const exitStatusOut = await statusOut[0];
       if (exitStatusOut) {
@@ -336,7 +331,7 @@ export default async function startMain(progname, rawArgs, powers, opts) {
       /* eslint-enable no-await-in-loop */
     }
 
-    const genesisFile = `${serverDir}/config/genesis.json`;
+    const genesisFile = `${agServer}/config/genesis.json`;
     const stampExists = await exists(`${genesisFile}.stamp`);
     if (!stampExists) {
       let exitStatus;
@@ -366,7 +361,7 @@ export default async function startMain(progname, rawArgs, powers, opts) {
         `--keyring-dir=${keysHome}`,
         '--keyring-backend=test',
         `--chain-id=${CHAIN_ID}`,
-        DELEGATE0_COINS,
+        `${DELEGATE0_COINS}`,
       ]);
       if (exitStatus) {
         return exitStatus;
@@ -387,8 +382,8 @@ export default async function startMain(progname, rawArgs, powers, opts) {
 
     // Complete the genesis file and launch the chain.
     log('read ag-chain-cosmos config');
-    const configFile = `${serverDir}/config/config.toml`;
-    const appFile = `${serverDir}/config/app.toml`;
+    const configFile = `${agServer}/config/config.toml`;
+    const appFile = `${agServer}/config/app.toml`;
     const [genesisJson, configToml, appToml] = await Promise.all([
       fs.readFile(genesisFile, 'utf-8'),
       fs.readFile(configFile, 'utf-8'),
@@ -451,10 +446,9 @@ export default async function startMain(progname, rawArgs, powers, opts) {
       return 1;
     }
 
-    const serverDir = `${SERVERS_ROOT_DIR}/${profileName}-${portNum}`;
+    const agServer = `_agstate/agoric-servers/${profileName}-${portNum}`;
 
     const { cosmosClientBuild } = getSDKBinaries(sdkPrefixes);
-    await null;
     if (popts.pull || popts.rebuild) {
       if (popts.dockerTag) {
         const exitStatus = await pspawn('docker', ['pull', SDK_IMAGE]);
@@ -480,7 +474,9 @@ export default async function startMain(progname, rawArgs, powers, opts) {
     }
 
     if (popts.reset) {
-      rmVerbose(serverDir);
+      log(chalk.green(`removing ${agServer}`));
+      // rm is available on all the unix-likes, so use it for speed.
+      await pspawn('rm', ['-rf', agServer]);
     }
 
     let soloSpawn;
@@ -495,7 +491,7 @@ export default async function startMain(progname, rawArgs, powers, opts) {
             'run',
             `--volume=${process.cwd()}:/usr/src/dapp`,
             `--volume=${process.env.HOME}/.agoric:/root/.agoric`,
-            `-eAG_SOLO_BASEDIR=/usr/src/dapp/${serverDir}`,
+            `-eAG_SOLO_BASEDIR=/usr/src/dapp/${agServer}`,
             `--rm`,
             ...terminalOnlyFlags(`-it`),
             `--entrypoint=ag-solo`,
@@ -507,7 +503,7 @@ export default async function startMain(progname, rawArgs, powers, opts) {
         );
     }
 
-    const serverExists = await exists(serverDir);
+    const serverExists = await exists(agServer);
     // Initialise the solo directory and key.
     if (!serverExists) {
       const initArgs = [`--webport=${portNum}`];
@@ -515,7 +511,7 @@ export default async function startMain(progname, rawArgs, powers, opts) {
         initArgs.push(`--webhost=0.0.0.0`);
       }
       const exitStatus = await soloSpawn(
-        ['init', serverDir, ...initArgs],
+        ['init', agServer, ...initArgs],
         undefined,
         [`--workdir=/usr/src/dapp`],
       );
@@ -526,15 +522,15 @@ export default async function startMain(progname, rawArgs, powers, opts) {
 
     // Create the full economy chain config.
     const agServerResolve = spec =>
-      require.resolve(spec, { paths: [serverDir] });
+      require.resolve(spec, { paths: [agServer] });
     const coreConfigPath = agServerResolve(
-      '@agoric/vm-config/decentral-core-config.json',
+      '@agoric/vats/decentral-core-config.json',
     );
     const economyTemplPath = agServerResolve(
       '@agoric/cosmic-swingset/economy-template.json',
     );
     const [rawSoloAddr, coreConfigJson, economyTemplJson] = await Promise.all([
-      fs.readFile(`${serverDir}/ag-cosmos-helper-address`, 'utf-8'),
+      fs.readFile(`${agServer}/ag-cosmos-helper-address`, 'utf-8'),
       fs.readFile(coreConfigPath, 'utf-8'),
       fs.readFile(economyTemplPath, 'utf-8'),
     ]);
@@ -545,7 +541,7 @@ export default async function startMain(progname, rawArgs, powers, opts) {
     const economyConfig = JSON.parse(coreConfigJson);
     economyConfig.coreProposals = economyProposals;
     await fs.writeFile(
-      `${serverDir}/decentral-economy-config.json`,
+      `${agServer}/decentral-economy-config.json`,
       JSON.stringify(economyConfig, null, 2),
     );
 
@@ -553,12 +549,13 @@ export default async function startMain(progname, rawArgs, powers, opts) {
       return 0;
     }
 
-    const gciFile = `${SERVERS_ROOT_DIR}/local-chain-${CHAIN_PORT}/config/genesis.json.sha256`;
+    const gciFile = `_agstate/agoric-servers/local-chain-${CHAIN_PORT}/config/genesis.json.sha256`;
     process.stdout.write(`Waiting for local-chain-${CHAIN_PORT} to start...`);
     let hasGci = false;
     for await (const _ of untilTrue(() => hasGci)) {
       process.stdout.write('.');
 
+      // eslint-disable-next-line no-await-in-loop
       await new Promise((resolve, reject) => {
         fs.stat(gciFile).then(
           _2 => {
@@ -579,7 +576,7 @@ export default async function startMain(progname, rawArgs, powers, opts) {
 
     const spawnOpts = {};
     if (!popts.dockerTag) {
-      spawnOpts.cwd = serverDir;
+      spawnOpts.cwd = agServer;
     }
 
     const rpcAddrs = [`localhost:${CHAIN_PORT}`];
@@ -593,6 +590,7 @@ export default async function startMain(progname, rawArgs, powers, opts) {
     let bestRpcAddr;
     for await (const _ of untilTrue(() => bestRpcAddr)) {
       for await (const rpcAddr of rpcAddrs) {
+        // eslint-disable-next-line no-await-in-loop
         exitStatus = await keysSpawn([
           'query',
           'swingset',
@@ -641,6 +639,7 @@ export default async function startMain(progname, rawArgs, powers, opts) {
           ];
           for (/* await */ const cmd of provCmds) {
             const statusOut = capture(keysSpawn, cmd, true);
+            // eslint-disable-next-line no-await-in-loop
             exitStatus = await statusOut[0];
             if (!exitStatus) {
               const json = statusOut[1].replace(/^gas estimate: \d+$/m, '');
@@ -665,6 +664,7 @@ export default async function startMain(progname, rawArgs, powers, opts) {
         }
       }
       if (!bestRpcAddr) {
+        // eslint-disable-next-line no-await-in-loop
         await delay(2000);
       }
     }
@@ -690,7 +690,6 @@ export default async function startMain(progname, rawArgs, powers, opts) {
   }
 
   async function startTestnetDocker(profileName, startArgs, popts) {
-    await null;
     if (popts.dockerTag && popts.pull) {
       const exitStatus = await pspawn('docker', ['pull', SOLO_IMAGE]);
       if (exitStatus) {
@@ -700,10 +699,12 @@ export default async function startMain(progname, rawArgs, powers, opts) {
 
     const port = startArgs[0] || PORT;
     const netconfig = startArgs[1] || DEFAULT_NETCONFIG;
-    const serverDir = `${SERVERS_ROOT_DIR}/${profileName}-${port}`;
+    const agServer = `_agstate/agoric-servers/${profileName}-${port}`;
 
     if (popts.reset) {
-      rmVerbose(serverDir);
+      log(chalk.green(`removing ${agServer}`));
+      // rm is available on all the unix-likes, so use it for speed.
+      await pspawn('rm', ['-rf', agServer]);
     }
 
     const setupRun = (...bonusArgs) =>
@@ -711,7 +712,7 @@ export default async function startMain(progname, rawArgs, powers, opts) {
         'run',
         `-p127.0.0.1:${HOST_PORT}:${port}`,
         `--volume=${process.cwd()}:/usr/src/dapp`,
-        `-eAG_SOLO_BASEDIR=/usr/src/dapp/${serverDir}`,
+        `-eAG_SOLO_BASEDIR=/usr/src/dapp/${agServer}`,
         `--rm`,
         ...terminalOnlyFlags(`-it`),
         SOLO_IMAGE,
@@ -726,38 +727,44 @@ export default async function startMain(progname, rawArgs, powers, opts) {
   async function startTestnetSdk(profileName, startArgs, popts) {
     const port = startArgs[0] || PORT;
     const netconfig = startArgs[1] || DEFAULT_NETCONFIG;
-    const serverDir = `${SERVERS_ROOT_DIR}/${profileName}-${port}`;
+    const agServer = `_agstate/agoric-servers/${profileName}-${port}`;
 
-    await null;
     if (popts.reset) {
-      rmVerbose(serverDir);
+      log(chalk.green(`removing ${agServer}`));
+      // rm is available on all the unix-likes, so use it for speed.
+      await pspawn('rm', ['-rf', agServer]);
     }
 
     const setupRun = (...bonusArgs) =>
       pspawn(agSolo, [`--webport=${port}`, ...bonusArgs], {
-        env: { ...pspawnEnv, AG_SOLO_BASEDIR: serverDir },
+        env: { ...pspawnEnv, AG_SOLO_BASEDIR: agServer },
       });
 
     return setupRun('setup', `--netconfig=${netconfig}`);
   }
 
   const profiles = {
-    __proto__: null,
     dev: startFakeChain,
     'local-chain': startLocalChain,
     'local-solo': startLocalSolo,
     testnet: opts.dockerTag ? startTestnetDocker : startTestnetSdk,
   };
 
-  const [_command = 'start', profileName = 'dev', ...args] = rawArgs;
+  const popts = opts;
+
+  const args = rawArgs.slice(1);
+  const profileName = args[0] || 'dev';
   const startFn = profiles[profileName];
   if (!startFn) {
-    const profileNames = Object.keys(profiles).join(', ');
     log.error(
-      `unrecognized profile name ${profileName}; use one of: ${profileNames}`,
+      `unrecognized profile name ${profileName}; use one of: ${Object.keys(
+        profiles,
+      )
+        .sort()
+        .join(', ')}`,
     );
     return 1;
   }
 
-  return startFn(profileName, args, opts);
+  return startFn(profileName, args[0] ? args.slice(1) : args, popts);
 }