@agoric/fast-usdc 0.1.1-other-dev-3eb1a1d.0 → 0.1.1-other-dev-d15096d.0.d15096d

package/README.md

@@ -1,58 +1,184 @@
 # Fast USDC
 
-Development package for the Fast USDC product.
-Here in agoric-sdk as a convenience for integration testing and iterating on the SDK affordances required for the product.
+Development package for the Fast USDC product. Here in agoric-sdk as a
+convenience for integration testing and iterating on the SDK affordances
+required for the product.
 
 # Factoring
 
-This package is meant to contain all the code for the Fast USDC product. However there are some constraints:
+This package is meant to contain all the code for the Fast USDC product.
+However, there are some constraints:
 
-- a3p integration tests are in the `a3p-integration` top-level package, separate from this workspace
-- the proposal builders are in `@agoric/builders` to work with the a3p-integration `build:submissions` script
-- the RunUtils tests are in `@agoric/boot` to test running them atop a fresh bootstrapped environment
+- a3p integration tests are in the `a3p-integration` top-level package, separate
+    from this workspace
+- the proposal builders are in `@agoric/builders` to work with the
+    a3p-integration `build:submissions` script
+- the RunUtils tests are in `@aglocal/boot` to test running them atop a fresh
+    bootstrapped environment
 
 Over time we can update our tooling to decouple this more from the `packages` directory.
 
-1. Make a3p-integration `build:submissions` script work with arbitrary builder paths, allowing this to be above `@agoric/builders` in the package graph
-2. Export bootstrap testing utilities from `@agoric/boot`, allowing this to be above `@agoric/boot` in the package graph
-3. Update CI to support packages that aren't under `packages/`, eg. a top-level `dapps` directory
+1. Make a3p-integration `build:submissions` script work with arbitrary builder
+    paths, allowing this to be above `@agoric/builders` in the package graph
+2. Export bootstrap testing utilities from `@aglocal/boot`, allowing this to be
+    above `@aglocal/boot` in the package graph
+3. Update CI to support packages that aren't under `packages/`, eg. a top-level
+   `dapps` directory. `multichain-testing` does this now but not organized per contract.
 4. Move this package out of agoric-sdk
 
-# Transaction feed
+# Funds flow
 
-## Oracles interface
-
-Oracles run off-chain and interact with the contract via an Agoric smart wallet bridge.
 ```mermaid
 sequenceDiagram
-    title Becoming an oracle operator
-    participant OW as Operator N<br/>Smart Wallet
-    participant FUC as Fast USDC<br/>Contract Exo
-    participant CE as Core Eval
+  actor User as User
+  participant NEA as User Wallet<br>[Browser]
+  participant ETH as CCTP Contract<br>[Ethereum]
+  participant NFA as Noble Forwarding Account<br/>[Noble]
+  participant NC as Noble Chain<br/>[Noble]
+  participant NAR as Noble-Agoric<br/>[IBC Relayer]
+  participant SA as Settlement Account<br/>[Agoric]
+  participant CFA as Contract Fee Account<br/>[Agoric]
+  participant DAR as Destination-Agoric<br/>[IBC Relayer]
+  participant EUD as End User Destination<br/>[Dest Chain]
+
+  autonumber
+  rect rgb(240, 248, 255)
+    User ->> NEA: Sign transaction<br/>(MintAmount, to NFA)
+    NEA ->> ETH: Submit USDC Burn Txn via CCTP
+  end
+  rect rgb(200, 255, 230)
+    FUC ->> P: Initiate PFM transfer(AdvanceAmount, EUD) from pool<br/>of Noble-Agoric tokens to EUD Chain
+    P ->> NC: PFM transfer(AdvanceAmount of Agoric USDC denom) to EUD
+    NC ->> EUD: deliver AdvanceAmount as final USDC denom
+  end
+  Note over User, EUD: User got their AdvanceAmountof IBC USDC<br/>UX COMPLETE
+  rect rgb(255, 200, 200)
+    Note over ETH, SA: Minting Process
+    Note over ETH: ~12 minutes for Ethereum finality
+    Note over NC: 1-6 minutes for CCTP<br/>to Mint on Noble
+    NC ->> NFA: Noble CCTP contract mints USDC<br/> into Noble Forwarding Address
+    NFA ->> NAR: Broadcast Forward MintAmount (as Agoric USDC Denom) to FU Account
+    NAR ->> SA: Relay    
+  end
+  rect rgb(255, 245, 230)
+    Note over FUC, CFA: Settlement Process
+    alt Advance was started:
+      FUC ->> SA: Initiate transfers out of settlement
+      SA ->> P: Deposit the AdvanceAmount + PoolFee (= MintAmount - ContractFee)
+      SA ->> CFA: Deposit ContractFee
+    else Advance for matched transaction that has not yet started:
+      P ->> NC: PFM transfer(MintAmount of Agoric USDC denom) to EUD
+      NC ->> EUD: deliver MintAmount as final USDC denom
+    else Settlement for unknown transaction:
+      Note over SA: Leave funds in SettlementAccount.
+      Note over SA: Wait for observation from watcher
+    end
+  end
+```
 
-    CE->>FUC: makeOperatorInvitation()
-    FUC-->>CE: operatorInvitation
-    CE->>+OW: deposit(operatorInvitation)
+Not pictured:
+- Circle Attestation Service
+- CCTP Relayer
 
-    Note left of FUC: Off-chain wallet accepts the operator invitation
+"Noble Forwarding Account" is also owned by the CCTP Relayer as they actually register it
+CCTP Relayer can be many parties, but only one when caller is specified
 
-    OW->>+FUC: offer(operatorInvitation)
-    FUC-->>OW: operator invitationMakers: {SubmitEvidence}
 
-    Note left of FUC: Off-chain watcher detects evidence
-    OW->>+FUC: offer(SubmitEvidence, evidence)
-```
+# Transaction flow
 
 ```mermaid
+%%{init: {
+  'theme': 'base',
+  'themeVariables': {
+    'primaryColor': '#f0f8ff',
+    'primaryTextColor': '#2c3e50',
+    'primaryBorderColor': '#7fb2e6',
+    'lineColor': '#7fb2e6',
+    'secondaryColor': '#f6f8fa',
+    'tertiaryColor': '#fff5e6'
+  }
+}}%%
 sequenceDiagram
-    title Receiving evidence
-    participant W as Operator N<br/>Smart Wallet
-    participant A as Operator N<br/>Admin Oexo
-    participant TF as Transaction<br/>Feed
-
-    W->>A: offer(SubmitEvidence, evidence)
-
-    Note left of A: Once 3 operators push the same…
-
-    A->>TF: notify(evidence)
+    title Fast USDC Transaction Process
+    autonumber
+    actor User
+    %% [Where it runs]
+    participant NEA as Noble Express app<br/>[Browser]
+    participant ETH as CCTP Contract<br/>[Ethereum]
+    participant NFA as Noble Forwarding Account<br/>[Noble]
+    participant NC as Noble Chain<br/>[Noble]
+    participant NAR as Noble-Agoric<br/>[Relayer]
+    participant OCW as Eth Watcher<br/>[Off-chain]
+    participant FUC as Fast USDC Contract<br/>[Agoric]
+    participant P as Pool<br/>[Agoric]
+    participant SA as Settlement Account<br/>[Agoric]
+    participant CFA as Contract Fee Account<br/>[Agoric]
+    participant DAR as Destination-Agoric<br/>[Relayer]
+    participant EUD as End User Destination<br/>[User]
+
+    %% Notation: --> for async, ->> for sync
+    rect rgb(240, 248, 255)
+        Note over User,OCW: User request
+        Note over NEA: App looks up fees and SettlementAccount address
+        User->>NEA: Input desired MintAmount and EUD
+        NEA->>User: Display fees and AdvanceAmount
+        Note over NEA: Calculate VirtualRecipient from (SettlementAccount, EUD)
+        Note over NEA: Calculate NFA address from (VirtualRecipient) using Signerless forwarding
+        %% Getting from here to the burn is mostly up to Noble
+        User->>NEA: Initiate transfer
+        NEA-->>NC: Register NFA
+        NEA->>User: Request signature
+        User->>NEA: Sign transaction<br/>(MintAmount, to NFA) 
+        NEA->>ETH: Submit USDC Burn Txn via CCTP
+        Note over ETH: Burn succeeds,<br/>implying mint to NFA will happen
+        OCW->>ETH: Query CCTP transactions to Noble
+        ETH-->>OCW: 1 block confirmed
+        OCW->>NC: Look up recipient of NFA<br/>by account query
+        NC->>OCW: RPC replies with account including `recipient` (LCA+EUD)
+    end
+
+    Note over OCW: Continue if recipient is over the Noble-Agoric channel
+    rect rgb(200, 255, 230)
+        Note over NC,EUD: Advancement Process
+        Note over OCW: Log proof of each confirmation
+        Note over OCW,FUC: Provide info needed by policy to make a decision
+        OCW->>FUC: Notify of each confirmation<br/>(dest=agoric1 recipient, amount,<br/>metadata=transaction-nonce,chain,block,timestamp)
+        Note over FUC: MM's policy decides whether to advance (e.g. 2 confirmations from Ethereum, 5 from Polygon)
+        Note over FUC: Syslog with sufficient detail to debug
+        Note over FUC: calculate AdvanceAmount = (MintAmount – PoolFee - ContractFee)<br/>based on fee rates at this moment, and record for future lookup
+        FUC->>P: Initiate PFM transfer(AdvanceAmount, EUD) from pool<br/>of Noble-Agoric tokens to EUD Chain
+        P->>NC: PFM transfer(AdvanceAmount of Agoric USDC denom) to EUD
+        NC->>EUD: deliver AdvanceAmount as final USDC denom
+        %% TODO do need epsilon tolerance on MintAmount for if Noble takes a small cut of the minted amount
+        %% TODO map out the event handling for these states: START: only-observed,advance-started,received-minted-unobserved, END: done
+        Note over SA: Wake up the settlement process to handle observed (key=EUD,MintAmount)
+
+    end
+    Note over User,EUD: User got their AdvanceAmountof IBC USDC<br/>UX COMPLETE
+
+    rect rgb(255, 200, 200)
+        Note over ETH,SA: Minting Process
+        Note over ETH: ~12 minutes for Ethereum finality
+        Note over NC: 1-6 minutes for CCTP<br/>to Mint on Noble
+        NC->>NFA: Noble CCTP contract mints USDC<br/> into Noble Forwarding Address
+        NFA->>SA: Forward MintAmount (as Agoric USDC Denom) to FU Account
+    end
+
+    rect rgb(255, 245, 230)
+        Note over FUC,CFA: Settlement Process
+        Note over FUC,SA: Tap on account reads MintAmount,<br/>parses EUD from virtual address recipient<br/>and looks up AdvanceAmount,PoolFee,ContractFee.<br/>Matches against an unsettled transaction (by EUD and approx amount).
+        %% Treat starting the advance as an atomic action. Assume it will complete once started.
+        alt Advance was started:
+            FUC->>SA: Initiate transfers out of settlement
+            SA->>P: Deposit the AdvanceAmount + PoolFee (= MintAmount - ContractFee)
+            SA->>CFA: Deposit ContractFee
+        else Advance for matched transaction that has not yet started:
+            P->>NC: PFM transfer(MintAmount of Agoric USDC denom) to EUD
+            NC->>EUD: deliver MintAmount as final USDC denom
+        else Settlement for unknown transaction:
+            %% Have not received notification of this Amount,EUD from the watcher
+            Note over SA: Leave funds in SettlementAccount.
+            Note over SA: Wait for observation from watcher
+        end
+    end
 ```

package/package.json

@@ -1,57 +1,52 @@
 {
   "name": "@agoric/fast-usdc",
-  "version": "0.1.1-other-dev-3eb1a1d.0+3eb1a1d",
+  "version": "0.1.1-other-dev-d15096d.0.d15096d",
   "description": "CLI and library for Fast USDC product",
   "type": "module",
   "files": [
-    "contract",
-    "src"
+    "src",
+    "tools"
   ],
-  "bin": {
-    "fast-usdc": "./src/cli/bin.js"
-  },
+  "main": "src/main.js",
+  "bin": "./src/cli/bin.js",
   "scripts": {
     "build": "exit 0",
     "test": "ava",
-    "test:c8": "c8 --all $C8_OPTIONS ava",
+    "test:c8": "c8 --all ${C8_OPTIONS:-} ava",
     "test:xs": "exit 0",
     "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:eslint": "yarn run -T eslint .",
+    "lint:types": "yarn run -T tsc"
   },
   "devDependencies": {
-    "@agoric/swingset-liveslots": "0.10.3-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/vats": "0.15.2-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/zone": "0.2.3-other-dev-3eb1a1d.0+3eb1a1d",
     "@fast-check/ava": "^2.0.1",
     "ava": "^5.3.0",
-    "c8": "^10.1.2",
-    "execa": "9.1.0",
-    "ts-blank-space": "^0.4.1"
+    "c8": "^10.1.3",
+    "nano-spawn": "^1.0.2",
+    "ts-blank-space": "^0.6.2"
   },
   "dependencies": {
-    "@agoric/client-utils": "0.1.1-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/ertp": "0.16.3-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/internal": "0.3.3-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/notifier": "0.6.3-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/orchestration": "0.1.1-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/store": "0.9.3-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/vat-data": "0.5.3-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/vow": "0.1.1-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/zoe": "0.26.3-other-dev-3eb1a1d.0+3eb1a1d",
-    "@cosmjs/proto-signing": "^0.32.4",
-    "@cosmjs/stargate": "^0.32.4",
-    "@endo/base64": "^1.0.9",
-    "@endo/common": "^1.2.8",
-    "@endo/errors": "^1.2.8",
-    "@endo/eventual-send": "^1.2.8",
-    "@endo/far": "^1.1.9",
-    "@endo/init": "^1.1.7",
-    "@endo/marshal": "^1.6.2",
-    "@endo/pass-style": "^1.4.7",
-    "@endo/patterns": "^1.4.7",
-    "@endo/promise-kit": "^1.1.8",
+    "@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/internal": "0.3.3-other-dev-d15096d.0.d15096d",
+    "@agoric/notifier": "0.6.3-other-dev-d15096d.0.d15096d",
+    "@agoric/orchestration": "0.1.1-other-dev-d15096d.0.d15096d",
+    "@agoric/zoe": "0.26.3-other-dev-d15096d.0.d15096d",
+    "@cosmjs/proto-signing": "^0.36.0",
+    "@cosmjs/stargate": "^0.36.0",
+    "@endo/base64": "^1.0.12",
+    "@endo/common": "^1.2.13",
+    "@endo/errors": "^1.2.13",
+    "@endo/eventual-send": "^1.3.4",
+    "@endo/far": "^1.1.14",
+    "@endo/init": "^1.1.12",
+    "@endo/marshal": "^1.8.0",
+    "@endo/nat": "^5.1.3",
+    "@endo/pass-style": "^1.6.3",
+    "@endo/patterns": "^1.7.0",
+    "@endo/promise-kit": "^1.1.13",
     "@nick134-bit/noblejs": "0.0.2",
     "bech32": "^2.0.0",
     "commander": "^12.1.0",
@@ -78,5 +73,11 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3eb1a1d2d75b2b4a94807cd3bf759bc9fc531f05"
+  "typeCoverage": {
+    "atLeast": 97.08
+  },
+  "engines": {
+    "node": "^20.9 || ^22.11"
+  },
+  "gitHead": "d15096dc4ff8b96e9b6cd11954c20d3a9efbb393"
 }

package/src/cli/bridge-action.js

@@ -0,0 +1,41 @@
+import { boardSlottingMarshaller } from '@agoric/client-utils';
+
+/**
+ * @import {BridgeAction} from '@agoric/smart-wallet/src/smartWallet.js';
+ * @import {Writable} from 'stream';
+ */
+
+const defaultMarshaller = boardSlottingMarshaller();
+
+/** @typedef {ReturnType<typeof boardSlottingMarshaller>} BoardSlottingMarshaller */
+
+/**
+ * @param {BridgeAction} bridgeAction
+ * @param {Pick<Writable,'write'>} stdout
+ * @param {BoardSlottingMarshaller} marshaller
+ */
+const outputAction = (bridgeAction, stdout, marshaller) => {
+  const capData = marshaller.toCapData(harden(bridgeAction));
+  stdout.write(JSON.stringify(capData));
+  stdout.write('\n');
+};
+
+export const sendHint =
+  'Now use `agoric wallet send ...` to sign and broadcast the offer.\n';
+
+/**
+ * @param {BridgeAction} bridgeAction
+ * @param {{
+ *   stdout: Pick<Writable,'write'>,
+ *   stderr: Pick<Writable,'write'>,
+ * }} io
+ * @param {BoardSlottingMarshaller | undefined} marshaller
+ */
+export const outputActionAndHint = (
+  bridgeAction,
+  { stdout, stderr },
+  marshaller = defaultMarshaller,
+) => {
+  outputAction(bridgeAction, stdout, marshaller);
+  stderr.write(sendHint);
+};

package/src/cli/cli.js

@@ -1,9 +1,6 @@
-import { assertParsableNumber } from '@agoric/zoe/src/contractSupport/ratio.js';
-import {
-  Command,
-  InvalidArgumentError,
-  InvalidOptionArgumentError,
-} from 'commander';
+/* eslint-env node */
+/* global globalThis */
+import { Command } from 'commander';
 import { existsSync, mkdirSync, readFileSync } from 'fs';
 import { fileURLToPath } from 'url';
 import { dirname, resolve } from 'path';
@@ -12,9 +9,12 @@ import {
   readFile as readAsync,
   writeFile as writeAsync,
 } from 'node:fs/promises';
-import configLib from './config.js';
-import transferLib from './transfer.js';
-import { makeFile } from '../util/file.js';
+import { addConfigCommands } from './config-commands.js';
+import { addOperatorCommands } from './operator-commands.js';
+import * as configLib from './config.js';
+import * as transferLib from './transfer.js';
+import { makeFile } from './util/file.js';
+import { addLPCommands } from './lp-commands.js';
 
 const packageJson = JSON.parse(
   readFileSync(
@@ -32,6 +32,11 @@ export const initProgram = (
   writeFile = writeAsync,
   mkdir = mkdirSync,
   exists = existsSync,
+  fetch = globalThis.fetch,
+  stdout = process.stdout,
+  stderr = process.stderr,
+  env = process.env,
+  now = () => Date.now(),
 ) => {
   const program = new Command();
 
@@ -45,153 +50,36 @@ export const initProgram = (
       `${defaultHome}/.fast-usdc/`,
     );
 
-  const config = program.command('config').description('Manage config');
-
-  const configFilename = 'config.json';
-  const getConfigPath = () => {
-    const { home: configDir } = program.opts();
-    return configDir + configFilename;
-  };
-
-  const makeConfigFile = () =>
-    makeFile(getConfigPath(), readFile, writeFile, mkdir, exists);
-
-  config
-    .command('show')
-    .description('Show current config')
-    .action(async () => {
-      await configHelpers.show(makeConfigFile());
-    });
-
-  config
-    .command('init')
-    .description('Set initial config values')
-    .requiredOption(
-      '--noble-seed <seed>',
-      'Seed phrase for Noble account. CAUTION: Stored unencrypted in file system',
-    )
-    .requiredOption(
-      '--eth-seed <seed>',
-      'Seed phrase for Ethereum account. CAUTION: Stored unencrypted in file system',
-    )
-    .requiredOption(
-      '--agoric-seed <seed>',
-      'Seed phrase for Agoric LP account. CAUTION: Stored unencrypted in file system',
-    )
-    .option(
-      '--agoric-rpc [url]',
-      'Agoric RPC endpoint',
-      'http://127.0.0.1:26656',
-    )
-    .option(
-      '--agoric-api [url]',
-      'Agoric RPC endpoint',
-      'http://127.0.0.1:1317',
-    )
-    .option('--noble-rpc [url]', 'Noble RPC endpoint', 'http://127.0.0.1:26657')
-    .option('--noble-api [url]', 'Noble API endpoint', 'http://127.0.0.1:1318')
-    .option('--eth-rpc [url]', 'Ethereum RPC Endpoint', 'http://127.0.0.1:8545')
-    .option(
-      '--noble-to-agoric-channel [channel]',
-      'Channel ID on Noble for Agoric',
-      'channel-21',
-    )
-    .option(
-      '--token-messenger-address [address]',
-      'Address of TokenMessenger contract',
-      // Default to ETH mainnet contract address. For ETH sepolia, use 0x9f3B8679c73C2Fef8b59B4f3444d4e156fb70AA5
-      '0xbd3fa81b58ba92a82136038b25adec7066af3155',
-    )
-    .option(
-      '--token-contract-address [address]',
-      'Address of USDC token contract',
-      // Detault to ETH mainnet token address. For ETH sepolia, use 0x1c7D4B196Cb0C7B01d743Fbc6116a902379C7238
-      '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-    )
-    .action(async options => {
-      await configHelpers.init(makeConfigFile(), options);
-    });
-
-  config
-    .command('update')
-    .description('Update config values')
-    .option(
-      '--noble-seed [string]',
-      'Seed phrase for Noble account. CAUTION: Stored unencrypted in file system',
-    )
-    .option(
-      '--eth-seed [string]',
-      'Seed phrase for Ethereum account. CAUTION: Stored unencrypted in file system',
-    )
-    .option(
-      '--agoric-seed <seed>',
-      'Seed phrase for Agoric LP account. CAUTION: Stored unencrypted in file system',
-    )
-    .option('--agoric-rpc [url]', 'Agoric RPC endpoint')
-    .option('--agoric-api [url]', 'Agoric API endpoint')
-    .option('--noble-rpc [url]', 'Noble RPC endpoint')
-    .option('--noble-api [url]', 'Noble API endpoint')
-    .option('--eth-rpc [url]', 'Ethereum RPC Endpoint')
-    .option(
-      '--noble-to-agoric-channel [channel]',
-      'Channel ID on Noble for Agoric',
-    )
-    .option(
-      '--token-messenger-address [address]',
-      'Address of TokenMessenger contract',
-    )
-    .option(
-      '--token-contract-address [address]',
-      'Address of USDC token contract',
-    )
-    .action(async options => {
-      await configHelpers.update(makeConfigFile(), options);
-    });
-
-  /** @param {string} value */
-  const parseDecimal = value => {
-    try {
-      assertParsableNumber(value);
-    } catch {
-      throw new InvalidArgumentError('Not a decimal number.');
-    }
-    return value;
-  };
-
-  /**
-   * @param {string} str
-   * @returns {'auto' | number}
-   */
-  const parseFee = str => {
-    if (str === 'auto') return 'auto';
-    const num = parseFloat(str);
-    if (Number.isNaN(num)) {
-      throw new InvalidOptionArgumentError('Fee must be a number.');
-    }
-    return num;
+  const makeConfigFile = () => {
+    const getConfigPath = () => {
+      const { home: configDir } = program.opts();
+      return `${configDir}config.json`;
+    };
+    return makeFile(getConfigPath(), readFile, writeFile, mkdir, exists);
   };
 
-  program
-    .command('deposit')
-    .description('Offer assets to the liquidity pool')
-    .argument('<give>', 'USDC to give', parseDecimal)
-    .option('--id [offer-id]', 'Offer ID')
-    .option('--fee [fee]', 'Cosmos fee', parseFee)
-    .action(() => {
-      console.error('TODO actually send deposit');
-      // TODO: Implement deposit logic
-    });
-
-  program
-    .command('withdraw')
-    .description('Withdraw assets from the liquidity pool')
-    .argument('<want>', 'USDC to withdraw', parseDecimal)
-    .option('--id [offer-id]', 'Offer ID')
-    .option('--fee [fee]', 'Cosmos fee', parseFee)
-    .action(() => {
-      console.error('TODO actually send withdrawal');
-      // TODO: Implement withdraw logic
-    });
+  program.addHelpText(
+    'afterAll',
+    `
+  Agoric test networks provide configuration info at, for example,
+
+  https://devnet.agoric.net/network-config
+
+  To use RPC endpoints from such a configuration, use:
+  export AGORIC_NET=devnet
+
+  Use AGORIC_NET=local or leave it unset to use localhost and chain id agoriclocal.
+  `,
+  );
+  addConfigCommands(program, configHelpers, makeConfigFile);
+  addOperatorCommands(program, {
+    fetch,
+    stdout,
+    stderr,
+    env,
+    now,
+  });
+  addLPCommands(program, { fetch, stdout, stderr, env, now });
 
   program
     .command('transfer')
@@ -203,7 +91,12 @@ export const initProgram = (
         /** @type {string} */ amount,
         /** @type {string} */ destination,
       ) => {
+        const start = now();
         await transferHelpers.transfer(makeConfigFile(), amount, destination);
+        const duration = now() - start;
+        stdout.write(
+          `Transfer finished in ${(duration / 1000).toFixed(1)} seconds`,
+        );
       },
     );