agoric 0.18.4 → 0.18.5-dev-800c2bb.0

package/README.md

@@ -2,6 +2,79 @@
 
 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,6 +1,6 @@
 {
   "name": "agoric",
-  "version": "0.18.4",
+  "version": "0.18.5-dev-800c2bb.0+800c2bb",
   "description": "Manage the Agoric Javascript smart contract platform",
   "type": "module",
   "main": "src/main.js",
@@ -13,7 +13,7 @@
     "exported.js"
   ],
   "scripts": {
-    "build": "./scripts/get-sdk-package-names.js > src/sdk-package-names.js",
+    "build": "node ./scripts/get-sdk-package-names.js > src/sdk-package-names.js",
     "test": "ava",
     "test:c8": "c8 $C8_OPTIONS ava --config=ava-nesm.config.js",
     "test:xs": "exit 0",
@@ -24,37 +24,44 @@
     "lint:eslint": "eslint ."
   },
   "devDependencies": {
-    "ava": "^4.3.1",
-    "c8": "^7.11.0"
+    "@agoric/deploy-script-support": "0.9.7-dev-800c2bb.0+800c2bb",
+    "ava": "^5.2.0",
+    "c8": "^7.13.0"
   },
   "dependencies": {
-    "@agoric/access-token": "^0.4.20",
-    "@agoric/assert": "^0.5.1",
-    "@agoric/cache": "^0.2.4",
-    "@agoric/casting": "^0.3.4",
-    "@agoric/cosmic-proto": "^0.2.1",
-    "@agoric/ertp": "^0.15.5",
-    "@agoric/nat": "^4.1.0",
-    "@agoric/smart-wallet": "^0.4.4",
-    "@agoric/swingset-vat": "^0.31.0",
-    "@agoric/zoe": "^0.25.5",
-    "@cosmjs/crypto": "0.29.0",
-    "@cosmjs/encoding": "0.29.0",
-    "@cosmjs/math": "0.29.0",
-    "@cosmjs/proto-signing": "0.29.0",
-    "@cosmjs/stargate": "0.29.0",
-    "@cosmjs/tendermint-rpc": "0.29.0",
-    "@endo/bundle-source": "^2.3.1",
-    "@endo/captp": "^2.0.15",
-    "@endo/compartment-mapper": "^0.7.13",
-    "@endo/far": "^0.2.11",
-    "@endo/init": "^0.5.49",
-    "@endo/marshal": "^0.7.5",
-    "@endo/promise-kit": "^0.2.49",
+    "@agoric/access-token": "0.4.21-dev-800c2bb.0+800c2bb",
+    "@agoric/assert": "0.5.2-dev-800c2bb.0+800c2bb",
+    "@agoric/cache": "0.2.5-dev-800c2bb.0+800c2bb",
+    "@agoric/casting": "0.3.5-dev-800c2bb.0+800c2bb",
+    "@agoric/cosmic-proto": "0.2.2-dev-800c2bb.0+800c2bb",
+    "@agoric/ertp": "0.15.6-dev-800c2bb.0+800c2bb",
+    "@agoric/inter-protocol": "0.13.4-dev-800c2bb.0+800c2bb",
+    "@agoric/internal": "0.2.2-dev-800c2bb.0+800c2bb",
+    "@agoric/smart-wallet": "0.4.5-dev-800c2bb.0+800c2bb",
+    "@agoric/store": "0.8.6-dev-800c2bb.0+800c2bb",
+    "@agoric/swingset-vat": "0.31.1-dev-800c2bb.0+800c2bb",
+    "@agoric/vats": "0.13.3-dev-800c2bb.0+800c2bb",
+    "@agoric/zoe": "0.25.6-dev-800c2bb.0+800c2bb",
+    "@agoric/zone": "0.1.1-dev-800c2bb.0+800c2bb",
+    "@confio/relayer": "^0.9.0",
+    "@cosmjs/crypto": "^0.30.1",
+    "@cosmjs/encoding": "^0.30.1",
+    "@cosmjs/math": "^0.30.1",
+    "@cosmjs/proto-signing": "^0.30.1",
+    "@cosmjs/stargate": "^0.30.1",
+    "@cosmjs/tendermint-rpc": "^0.30.1",
+    "@endo/bundle-source": "^2.5.1",
+    "@endo/captp": "^3.1.1",
+    "@endo/compartment-mapper": "^0.8.4",
+    "@endo/far": "^0.2.18",
+    "@endo/init": "^0.5.56",
+    "@endo/marshal": "^0.8.5",
+    "@endo/nat": "^4.1.27",
+    "@endo/promise-kit": "^0.2.56",
     "@iarna/toml": "^2.2.3",
     "anylogger": "^0.21.0",
-    "chalk": "^2.4.2",
-    "commander": "^5.0.0",
+    "chalk": "^5.2.0",
+    "commander": "^10.0.0",
     "dd-trace": "^3.3.0",
     "deterministic-json": "^1.0.5",
     "esm": "agoric-labs/esm#Agoric-built",
@@ -81,5 +88,5 @@
     "timeout": "2m",
     "workerThreads": false
   },
-  "gitHead": "636c850161d29c0368b4dec03c90e2674e8d6479"
+  "gitHead": "800c2bbed8ccb1e0fc24481c9f95027f95efc1fb"
 }

package/src/bin-agops.js

@@ -1,16 +1,28 @@
 #!/usr/bin/env node
+// @ts-check
+// @jessie-check
+
 /* eslint-disable @jessie.js/no-nested-await */
-/* global process */
+/* global fetch, setTimeout */
 
 import '@agoric/casting/node-fetch-shim.js';
 import '@endo/init';
 import '@endo/init/pre.js';
 
-import anylogger from 'anylogger';
-import { Command } from 'commander';
+import { execFileSync } from 'child_process';
 import path from 'path';
+import process from 'process';
+import anylogger from 'anylogger';
+import { Command, CommanderError, createCommand } from 'commander';
+import { makeOracleCommand } from './commands/oracle.js';
+import { makeEconomicCommiteeCommand } from './commands/ec.js';
 import { makePsmCommand } from './commands/psm.js';
+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');
 const progname = path.basename(process.argv[1]);
@@ -18,7 +30,57 @@ const progname = path.basename(process.argv[1]);
 const program = new Command();
 program.name(progname).version('unversioned');
 
-program.addCommand(await makePsmCommand(logger));
-program.addCommand(await makePerfCommand(logger));
+program.addCommand(makeOracleCommand(logger));
+program.addCommand(makeEconomicCommiteeCommand(logger));
+program.addCommand(makePerfCommand(logger));
+program.addCommand(makePsmCommand(logger));
+program.addCommand(makeVaultsCommand(logger));
+
+/**
+ * XXX Threading I/O powers has gotten a bit jumbled.
+ *
+ * Perhaps a more straightforward approach would be:
+ *
+ *  - makeTUI({ stdout, stderr, logger })
+ *    where tui.show(data) prints data as JSON to stdout
+ *    and tui.warn() and tui.error() log ad-hoc to stderr
+ *  - makeQueryClient({ fetch })
+ *    with q.withConfig(networkConfig)
+ *    and q.vstorage.get('published...') (no un-marshaling)
+ *    and q.pollBlocks(), q.pollTx()
+ *    also, printing the progress message should be done
+ *    in the lookup callback
+ *  - makeBoardClient(queryClient)
+ *    with b.readLatestHead('published...')
+ *  - makeKeyringNames({ execFileSync })
+ *    with names.lookup('gov1') -> 'agoric1...'
+ *    and names.withBackend('test')
+ *    and names.withHome('~/.agoric')
+ *  - makeSigner({ execFileSync })
+ *    signer.sendSwingsetTx()
+ */
+const procIO = {
+  env: { ...process.env },
+  stdout: process.stdout,
+  stderr: process.stderr,
+  createCommand,
+  execFileSync,
+  now: () => Date.now(),
+  setTimeout,
+};
+
+program.addCommand(makeReserveCommand(logger, procIO));
+program.addCommand(makeAuctionCommand(logger, { ...procIO, fetch }));
+program.addCommand(makeInterCommand(procIO, { fetch }));
+program.addCommand(makeTestCommand(procIO, { fetch }));
 
-await program.parseAsync(process.argv);
+try {
+  await program.parseAsync(process.argv);
+} catch (err) {
+  if (err instanceof CommanderError) {
+    console.error(err.message);
+  } else {
+    console.error(err); // CRASH! show stack trace
+  }
+  process.exit(1);
+}

package/src/chain-config.js

@@ -30,8 +30,8 @@ const Stake = /** @type {const} */ ({
   symbol: 'BLD',
 });
 const Stable = /** @type {const} */ ({
-  name: 'Agoric Stable Local Currency',
-  description: 'The stable local currency used by the Agoric chain',
+  name: 'Agoric stable token',
+  description: 'The stable token used by the Agoric chain',
   denom_units: [
     {
       denom: 'uist',
@@ -73,6 +73,8 @@ export const ORIG_BLOCK_CADENCE_S = 5;
 export const ORIG_SIGNED_BLOCKS_WINDOW = 100;
 export const SIGNED_BLOCKS_WINDOW_BASE_MULTIPLIER = 100;
 
+export const DEFAULT_CHAIN_ID = 'agoriclocal';
+export const DEFAULT_ROSETTA_PORT = 8080;
 export const DEFAULT_GRPC_PORT = 9090;
 export const DEFAULT_RPC_PORT = 26657;
 export const DEFAULT_PROM_PORT = 26660;
@@ -84,6 +86,9 @@ export function finishCosmosApp({
   enableCors,
   exportMetrics,
   portNum = `${DEFAULT_RPC_PORT}`,
+  chainId = DEFAULT_CHAIN_ID,
+  enableRosetta = true,
+  rosettaPort = `${DEFAULT_ROSETTA_PORT}`,
 }) {
   const rpcPort = Number(portNum);
   const app = TOML.parse(appToml);
@@ -117,6 +122,18 @@ export function finishCosmosApp({
     app.telemetry['prometheus-retention-time'] = 60;
   }
 
+  // Optionally enable the rosetta service
+  if (enableRosetta) {
+    app.rosetta.enable = enableRosetta;
+    app.rosetta.network = chainId;
+    app.rosetta.retries = 30;
+  }
+
+  if (rosettaPort !== `${DEFAULT_ROSETTA_PORT}`) {
+    // Rosetta doesn't want a scheme
+    app.rosetta.address = `0.0.0.0:${rosettaPort}`;
+  }
+
   return TOML.stringify(app);
 }
 

package/src/commands/auction.js

@@ -0,0 +1,170 @@
+/* eslint-disable @jessie.js/no-nested-await */
+// @ts-check
+/* eslint-disable func-names */
+import { InvalidArgumentError } from 'commander';
+import { makeRpcUtils } from '../lib/rpc.js';
+import { outputActionAndHint } from '../lib/wallet.js';
+
+const { Fail } = assert;
+
+/** @typedef {import('@agoric/governance/src/contractGovernance/typedParamManager.js').ParamTypesMap} ParamTypesMap */
+/** @template M @typedef {import('@agoric/governance/src/contractGovernance/typedParamManager.js').ParamTypesMapFromRecord<M>} ParamTypesMapFromRecord */
+
+/**
+ * @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,
+    )
+    .option(
+      '--discount-step <integer>',
+      'proposed value (basis points)',
+      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, readLatestHead } = await makeRpcUtils({ fetch });
+
+        /** @type {{ current: AuctionParamRecord }} */
+        // @ts-expect-error XXX should runtime check?
+        const { current } = await readLatestHead(
+          `published.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/src/types').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) {
+          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;
+};