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

package/README.md

@@ -2,79 +2,6 @@
 
 If you just want to use the Agoric CLI for your own smart contract, please see the [Getting Started website](https://agoric.com/documentation/getting-started/) for information.
 
-## Relaying via IBC
-
-The CLI integrates support for the [Confio
-ts-relayer](https://github.com/confio/ts-relayer#quick-start) via the
-`agoric ibc-setup` and `agoric ibc-relayer` commands.
-
-Run `agoric start --reset -v local-chain` in a project directory.  In the
-meantime, you can configure the relayer (note that `--registry-from .` means to use `./registry.yaml`):
-
-```console
-$ agoric ibc-setup init --registry-from . --src local --dest ollinet
-...
-$ agoric ibc-setup keys list
-ollinet: agoric1fwk40de0xu7gtlk8z858q2f5lfcqv33ml8qdg4
-local: agoric1rvyry6jqmcrrm4ay9tu23rer7que8kdj4206zk
-$
-```
-
-Once your chain has booted, send some `uist` tokens to your `local` relayer
-account printed above:
-
-```console
-$ agd --home=_agstate/keys tx --keyring-backend=test bank send provision agoric1rvyry6jqmcrrm4ay9tu23rer7que8kdj4206zk 20000000uist --from=provision --chain-id=agoriclocal --yes
-...
-$
-```
-
-Go to https://ollinet.faucet.agoric.net and fund your `ollinet` relayer account
-printed above with BLD/IBC toy tokens.
-
-Check your relayer balances.  Both `local` and `ollinet` relayer accounts should
-show `ubld` and `uist`:
-
-```console
-$ agoric ibc-setup balances
-CHAIN      AMOUNT
-ollinet    74972124ubld
-local      20000000uist
-$
-```
-
-Create an ICS-20 fungible token transfer channel:
-
-```console
-$ agoric ibc-setup ics20 -v
-...
-Created channel:
-  agoriclocal: transfer/channel-0 (connection-0)
-  agoricollinet-55: transfer/channel-33 (connection-12)
-$
-```
-
-Now that the channel exists, you can relay packets along it just by using:
-
-```console
-$ agoric ibc-relayer start -v --poll 15
-```
-
-Leave this running in the background, and use the above `transfer/channel-0` or
-`transfer/channel-33` to send tokens back and forth.  The following
-example uses the `tx ibc-transfer transfer` command, and then
-`transfer channel-0` to indicate the `transfer/channel-0` portID/channelID.  It really wants you to know this is about token *transfer*.
-
-```console
-$ agd --home=_agstate/keys tx ibc-transfer transfer --keyring-backend=test \
-  transfer channel-0 \
-  agoric1fwk40de0xu7gtlk8z858q2f5lfcqv33ml8qdg4 200uist \
-  --from=provision --chain-id=agoriclocal --yes
-...
-# Watch the ibc-relayer send a packet and its acknowledgement, then...
-$ agd query bank balances agoric1rvyry6jqmcrrm4ay9tu23rer7que8kdj4206zk
-```
-
 ## Developing Agoric CLI
 
 **NOTE: these steps are only for modifying the Agoric CLI.  See the above for using it to create your own smart contracts.**

package/package.json

@@ -1,16 +1,17 @@
 {
   "name": "agoric",
-  "version": "0.21.2-other-dev-3eb1a1d.0+3eb1a1d",
+  "version": "0.21.2-other-dev-d15096d.0.d15096d",
   "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",
-    "./src/helpers.js": "./src/helpers.js"
+    "./src/helpers.js": "./src/helpers.js",
+    "./src/lib/index.js": "./src/lib/index.js"
   },
   "files": [
     "src",
@@ -20,62 +21,60 @@
   "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",
-    "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.41.4-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/deploy-script-support": "0.10.4-other-dev-3eb1a1d.0+3eb1a1d",
+    "@agoric/cosmic-swingset": "0.41.4-other-dev-d15096d.0.d15096d",
+    "@agoric/deploy-script-support": "0.10.4-other-dev-d15096d.0.d15096d",
     "ava": "^5.3.0",
-    "c8": "^10.1.2",
-    "dd-trace": "^4.11.1"
+    "c8": "^10.1.2"
   },
   "dependencies": {
-    "@agoric/access-token": "0.4.22-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/cache": "0.3.3-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/casting": "0.4.3-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/client-utils": "0.1.1-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/cosmic-proto": "0.4.1-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/ertp": "0.16.3-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/governance": "0.10.4-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/inter-protocol": "0.16.2-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/internal": "0.3.3-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/network": "0.1.1-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/smart-wallet": "0.5.4-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/store": "0.9.3-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/swingset-vat": "0.32.3-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/vats": "0.15.2-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/zoe": "0.26.3-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/zone": "0.2.3-other-dev-3eb1a1d.0+3eb1a1d",
-    "@confio/relayer": "^0.11.3",
-    "@cosmjs/crypto": "^0.32.3",
-    "@cosmjs/encoding": "^0.32.3",
-    "@cosmjs/math": "^0.32.3",
-    "@cosmjs/proto-signing": "^0.32.3",
-    "@cosmjs/stargate": "^0.32.3",
-    "@endo/bundle-source": "^3.5.0",
-    "@endo/captp": "^4.4.3",
-    "@endo/compartment-mapper": "^1.4.0",
-    "@endo/env-options": "^1.1.8",
-    "@endo/errors": "^1.2.8",
-    "@endo/far": "^1.1.9",
-    "@endo/init": "^1.1.7",
-    "@endo/marshal": "^1.6.2",
-    "@endo/nat": "^5.0.13",
-    "@endo/patterns": "^1.4.7",
-    "@endo/promise-kit": "^1.1.8",
-    "@endo/zip": "^1.0.9",
+    "@agoric/access-token": "0.4.22-other-dev-d15096d.0.d15096d",
+    "@agoric/cache": "0.3.3-other-dev-d15096d.0.d15096d",
+    "@agoric/casting": "0.4.3-other-dev-d15096d.0.d15096d",
+    "@agoric/client-utils": "0.1.1-other-dev-d15096d.0.d15096d",
+    "@agoric/cosmic-proto": "0.4.1-other-dev-d15096d.0.d15096d",
+    "@agoric/ertp": "0.16.3-other-dev-d15096d.0.d15096d",
+    "@agoric/governance": "0.10.4-other-dev-d15096d.0.d15096d",
+    "@agoric/inter-protocol": "0.16.2-other-dev-d15096d.0.d15096d",
+    "@agoric/internal": "0.3.3-other-dev-d15096d.0.d15096d",
+    "@agoric/network": "0.1.1-other-dev-d15096d.0.d15096d",
+    "@agoric/smart-wallet": "0.5.4-other-dev-d15096d.0.d15096d",
+    "@agoric/store": "0.9.3-other-dev-d15096d.0.d15096d",
+    "@agoric/swingset-vat": "0.32.3-other-dev-d15096d.0.d15096d",
+    "@agoric/vats": "0.15.2-other-dev-d15096d.0.d15096d",
+    "@agoric/zoe": "0.26.3-other-dev-d15096d.0.d15096d",
+    "@agoric/zone": "0.2.3-other-dev-d15096d.0.d15096d",
+    "@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",
     "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,10 @@
     "workerThreads": false
   },
   "typeCoverage": {
-    "atLeast": 77.54
+    "atLeast": 79.84
   },
-  "gitHead": "3eb1a1d2d75b2b4a94807cd3bf759bc9fc531f05"
+  "engines": {
+    "node": "^20.9 || ^22.11"
+  },
+  "gitHead": "d15096dc4ff8b96e9b6cd11954c20d3a9efbb393"
 }

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';
@@ -21,7 +19,6 @@ import { makeReserveCommand } from './commands/reserve.js';
 import { makeVaultsCommand } from './commands/vaults.js';
 import { makePerfCommand } from './commands/perf.js';
 import { makeInterCommand } from './commands/inter.js';
-import { makeAuctionCommand } from './commands/auction.js';
 import { makeTestCommand } from './commands/test-upgrade.js';
 
 const logger = anylogger('agops');
@@ -30,7 +27,6 @@ const progname = path.basename(process.argv[1]);
 const program = new Command();
 program.name(progname).version('unversioned');
 
-program.addCommand(makeOracleCommand(logger));
 program.addCommand(makeGovCommand(logger));
 program.addCommand(makePerfCommand(logger));
 program.addCommand(makePsmCommand(logger));
@@ -69,8 +65,8 @@ const procIO = {
   setTimeout,
 };
 
+program.addCommand(makeOracleCommand(procIO, logger));
 program.addCommand(makeReserveCommand(logger, procIO));
-program.addCommand(makeAuctionCommand(logger, { ...procIO, fetch }));
 program.addCommand(makeInterCommand(procIO, { fetch }));
 program.addCommand(makeTestCommand(procIO, { fetch }));
 

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;
@@ -255,8 +256,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/gov.js

@@ -1,11 +1,14 @@
 // @ts-check
 /* eslint-disable func-names */
 /* eslint-env node */
-import { makeVstorageKit } from '@agoric/client-utils';
+import {
+  fetchEnvNetworkConfig,
+  makeAgoricNames,
+  makeVstorageKit,
+} from '@agoric/client-utils';
 import { execFileSync as execFileSyncAmbient } from 'child_process';
 import { Command, CommanderError } from 'commander';
 import { normalizeAddressWithOptions, pollBlocks } from '../lib/chain.js';
-import { getNetworkConfig } from '../lib/network-config.js';
 import {
   findContinuingIds,
   getCurrent,
@@ -15,8 +18,12 @@ import {
 } from '../lib/wallet.js';
 
 /**
- * @import {OfferSpec} from '@agoric/smart-wallet/src/offers.js'
- * @import {QuestionDetails} from '@agoric/governance/src/types.js'
+ * @import {OfferSpec} from '@agoric/smart-wallet/src/offers.js';
+ * @import {AgoricNamesRemotes} from '@agoric/vats/tools/board-utils.js';
+ * @import {CurrentWalletRecord} from '@agoric/smart-wallet/src/smartWallet.js';
+ * @import {VstorageKit} from '@agoric/client-utils';
+ * @import {Logger} from 'anylogger';
+ * @import {Writable} from 'stream';
  */
 
 const collectValues = (val, memo) => {
@@ -26,15 +33,15 @@ const collectValues = (val, memo) => {
 
 const defaultKeyring = process.env.AGORIC_KEYRING_BACKEND || 'test';
 
-const networkConfig = await getNetworkConfig({ env: process.env, fetch });
+const networkConfig = await fetchEnvNetworkConfig({ env: process.env, fetch });
 
 /**
- * @param {import('anylogger').Logger} _logger
+ * @param {Logger} _logger
  * @param {{
  *   env?: Record<string, string|undefined>,
  *   fetch?: typeof window.fetch,
- *   stdout?: Pick<import('stream').Writable, 'write'>,
- *   stderr?: Pick<import('stream').Writable, 'write'>,
+ *   stdout?: Pick<Writable, 'write'>,
+ *   stderr?: Pick<Writable, 'write'>,
  *   execFileSync?: typeof execFileSyncAmbient,
  *   delay?: (ms: number) => Promise<void>,
  * }} [io]
@@ -86,19 +93,21 @@ export const makeGovCommand = (_logger, io = {}) => {
    * given a sendFrom address; else print it.
    *
    * @param {{
-   *   toOffer: (agoricNames: *, current: import('@agoric/smart-wallet/src/smartWallet.js').CurrentWalletRecord | undefined) => OfferSpec,
+   *   toOffer: (agoricNames: AgoricNamesRemotes, current: CurrentWalletRecord | undefined) => OfferSpec,
    *   sendFrom?: string | undefined,
    *   keyringBackend: string,
    *   instanceName?: string,
    * }} detail
-   * @param {Awaited<ReturnType<makeVstorageKit>>} [optUtils]
+   * @param {VstorageKit} [vsk]
    */
   const processOffer = async function (
     { toOffer, sendFrom, keyringBackend },
-    optUtils,
+    vsk,
   ) {
-    const utils = await (optUtils || makeVstorageKit({ fetch }, networkConfig));
-    const { agoricNames, readPublished } = utils;
+    await null;
+    vsk ||= makeVstorageKit({ fetch }, networkConfig);
+    const { readPublished } = vsk;
+    const agoricNames = await makeAgoricNames(vsk.fromBoard, vsk.vstorage);
 
     assert(keyringBackend, 'missing keyring-backend option');
 
@@ -265,10 +274,11 @@ export const makeGovCommand = (_logger, io = {}) => {
     )
     .requiredOption('--for <string>', 'description of the invitation')
     .action(async opts => {
-      const { agoricNames, readPublished } = await makeVstorageKit(
+      const { readPublished, ...vsk } = makeVstorageKit(
         { fetch },
         networkConfig,
       );
+      const agoricNames = await makeAgoricNames(vsk.fromBoard, vsk.vstorage);
       const current = await getCurrent(opts.from, { readPublished });
 
       const known = findContinuingIds(current, agoricNames);
@@ -294,10 +304,11 @@ export const makeGovCommand = (_logger, io = {}) => {
       normalizeAddress,
     )
     .action(async opts => {
-      const { agoricNames, readPublished } = await makeVstorageKit(
+      const { readPublished, ...vsk } = makeVstorageKit(
         { fetch },
         networkConfig,
       );
+      const agoricNames = await makeAgoricNames(vsk.fromBoard, vsk.vstorage);
       const current = await getCurrent(opts.from, { readPublished });
 
       const found = findContinuingIds(current, agoricNames);
@@ -333,8 +344,8 @@ export const makeGovCommand = (_logger, io = {}) => {
       normalizeAddress,
     )
     .action(async function (opts, options) {
-      const utils = await makeVstorageKit({ fetch }, networkConfig);
-      const { readPublished } = utils;
+      const vsk = makeVstorageKit({ fetch }, networkConfig);
+      const { readPublished } = vsk;
 
       const questionDesc = await readPublished(
         `committees.${opts.pathname}.latestQuestion`,
@@ -384,7 +395,7 @@ export const makeGovCommand = (_logger, io = {}) => {
           sendFrom: opts.sendFrom,
           keyringBackend: options.optsWithGlobals().keyringBackend,
         },
-        utils,
+        vsk,
       );
     });