@agoric/fast-usdc 0.1.1-dev-cf1d435.0 → 0.1.1-dev-d6a7ffb.0

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@agoric/fast-usdc",
-  "version": "0.1.1-dev-cf1d435.0+cf1d435",
+  "version": "0.1.1-dev-d6a7ffb.0+d6a7ffb",
   "description": "CLI and library for Fast USDC product",
   "type": "module",
   "files": [
     "contract",
-    "src"
+    "src",
+    "tools"
   ],
   "bin": {
     "fast-usdc": "./src/cli/bin.js"
@@ -21,9 +22,9 @@
     "lint:eslint": "eslint ."
   },
   "devDependencies": {
-    "@agoric/swingset-liveslots": "0.10.3-dev-cf1d435.0+cf1d435",
-    "@agoric/vats": "0.15.2-dev-cf1d435.0+cf1d435",
-    "@agoric/zone": "0.2.3-dev-cf1d435.0+cf1d435",
+    "@agoric/swingset-liveslots": "0.10.3-dev-d6a7ffb.0+d6a7ffb",
+    "@agoric/vats": "0.15.2-dev-d6a7ffb.0+d6a7ffb",
+    "@agoric/zone": "0.2.3-dev-d6a7ffb.0+d6a7ffb",
     "@fast-check/ava": "^2.0.1",
     "ava": "^5.3.0",
     "c8": "^10.1.2",
@@ -31,15 +32,15 @@
     "ts-blank-space": "^0.4.1"
   },
   "dependencies": {
-    "@agoric/client-utils": "0.1.1-dev-cf1d435.0+cf1d435",
-    "@agoric/ertp": "0.16.3-dev-cf1d435.0+cf1d435",
-    "@agoric/internal": "0.3.3-dev-cf1d435.0+cf1d435",
-    "@agoric/notifier": "0.6.3-dev-cf1d435.0+cf1d435",
-    "@agoric/orchestration": "0.1.1-dev-cf1d435.0+cf1d435",
-    "@agoric/store": "0.9.3-dev-cf1d435.0+cf1d435",
-    "@agoric/vat-data": "0.5.3-dev-cf1d435.0+cf1d435",
-    "@agoric/vow": "0.1.1-dev-cf1d435.0+cf1d435",
-    "@agoric/zoe": "0.26.3-dev-cf1d435.0+cf1d435",
+    "@agoric/client-utils": "0.1.1-dev-d6a7ffb.0+d6a7ffb",
+    "@agoric/ertp": "0.16.3-dev-d6a7ffb.0+d6a7ffb",
+    "@agoric/internal": "0.3.3-dev-d6a7ffb.0+d6a7ffb",
+    "@agoric/notifier": "0.6.3-dev-d6a7ffb.0+d6a7ffb",
+    "@agoric/orchestration": "0.1.1-dev-d6a7ffb.0+d6a7ffb",
+    "@agoric/store": "0.9.3-dev-d6a7ffb.0+d6a7ffb",
+    "@agoric/vat-data": "0.5.3-dev-d6a7ffb.0+d6a7ffb",
+    "@agoric/vow": "0.1.1-dev-d6a7ffb.0+d6a7ffb",
+    "@agoric/zoe": "0.26.3-dev-d6a7ffb.0+d6a7ffb",
     "@cosmjs/proto-signing": "^0.32.4",
     "@cosmjs/stargate": "^0.32.4",
     "@endo/base64": "^1.0.9",
@@ -49,6 +50,7 @@
     "@endo/far": "^1.1.9",
     "@endo/init": "^1.1.7",
     "@endo/marshal": "^1.6.2",
+    "@endo/nat": "^5.0.13",
     "@endo/pass-style": "^1.4.7",
     "@endo/patterns": "^1.4.7",
     "@endo/promise-kit": "^1.1.8",
@@ -78,5 +80,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "cf1d43515a2a014b0b53cf18935eea5136ae73e2"
+  "gitHead": "d6a7ffb6290c63287c4e1fda66d188440105c2a7"
 }

package/src/cli/cli.js

@@ -1,3 +1,5 @@
+/* eslint-env node */
+/* global globalThis */
 import { assertParsableNumber } from '@agoric/zoe/src/contractSupport/ratio.js';
 import {
   Command,
@@ -34,6 +36,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();
 
@@ -55,8 +62,27 @@ export const initProgram = (
     return makeFile(getConfigPath(), readFile, writeFile, mkdir, exists);
   };
 
+  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);
+  addOperatorCommands(program, {
+    fetch,
+    stdout,
+    stderr,
+    env,
+    now,
+  });
 
   /** @param {string} value */
   const parseDecimal = value => {

package/src/cli/config.js

@@ -6,7 +6,6 @@ import { stdin as input, stdout as output } from 'node:process';
     nobleSeed: string,
     ethSeed: string,
     nobleToAgoricChannel: string,
-    agoricRpc: string,
     nobleApi: string,
     nobleRpc: string,
     ethRpc: string,

package/src/cli/operator-commands.js

@@ -1,18 +1,44 @@
-/* eslint-env node */
 /**
  * @import {Command} from 'commander';
  * @import {OfferSpec} from '@agoric/smart-wallet/src/offers.js';
  * @import {ExecuteOfferAction} from '@agoric/smart-wallet/src/smartWallet.js';
+ * @import {OperatorKit} from '../exos/operator-kit.js';
  */
 
 import { fetchEnvNetworkConfig, makeVstorageKit } from '@agoric/client-utils';
+import { mustMatch } from '@agoric/internal';
+import { Nat } from '@endo/nat';
+import { InvalidArgumentError } from 'commander';
 import { INVITATION_MAKERS_DESC } from '../exos/transaction-feed.js';
+import { CctpTxEvidenceShape } from '../type-guards.js';
 import { outputActionAndHint } from './bridge-action.js';
 
+/** @param {string} arg */
+const parseNat = arg => {
+  const n = Nat(BigInt(arg));
+  return n;
+};
+
+/** @param {string} arg */
+const parseHex = arg => {
+  if (!arg.startsWith('0x')) throw new InvalidArgumentError('not a hex string');
+  return arg;
+};
+
 /**
  * @param {Command} program
+ * @param {{
+ *   fetch: Window['fetch'];
+ *   stdout: typeof process.stdout;
+ *   stderr: typeof process.stderr;
+ *   env: typeof process.env;
+ *   now: typeof Date.now;
+ * }} io
  */
-export const addOperatorCommands = program => {
+export const addOperatorCommands = (
+  program,
+  { fetch, stderr, stdout, env, now },
+) => {
   const operator = program
     .command('operator')
     .description('Oracle operator commands');
@@ -24,17 +50,9 @@ export const addOperatorCommands = program => {
       'after',
       '\nPipe the STDOUT to a file such as accept.json, then use the Agoric CLI to broadcast it:\n  agoric wallet send --offer accept.json --from gov1 --keyring-backend="test"',
     )
-    .option(
-      '--offerId <string>',
-      'Offer id',
-      String,
-      `operatorAccept-${Date.now()}`,
-    )
+    .option('--offerId <string>', 'Offer id', String, `operatorAccept-${now()}`)
     .action(async opts => {
-      const networkConfig = await fetchEnvNetworkConfig({
-        env: process.env,
-        fetch,
-      });
+      const networkConfig = await fetchEnvNetworkConfig({ env, fetch });
       const vsk = await makeVstorageKit({ fetch }, networkConfig);
       const instance = vsk.agoricNames.instance.fastUsdc;
       assert(instance, 'fastUsdc instance not in agoricNames');
@@ -56,21 +74,58 @@ export const addOperatorCommands = program => {
         offer,
       };
 
-      outputActionAndHint(bridgeAction, {
-        stderr: process.stderr,
-        stdout: process.stdout,
-      });
+      outputActionAndHint(bridgeAction, { stderr, stdout });
     });
 
   operator
     .command('attest')
     .description('Attest to an observed Fast USDC transfer')
     .requiredOption('--previousOfferId <string>', 'Offer id', String)
-    .action(async options => {
-      const { previousOfferId } = options;
-      console.error(
-        'TODO: Implement attest logic for request:',
+    .requiredOption('--forwardingChannel <string>', 'Channel id', String)
+    .requiredOption('--recipientAddress <string>', 'bech32 address', String)
+    .requiredOption('--blockHash <0xhex>', 'hex hash', parseHex)
+    .requiredOption('--blockNumber <number>', 'number', parseNat)
+    .requiredOption('--blockTimestamp <number>', 'number', parseNat)
+    .requiredOption('--chainId <string>', 'chain id', Number)
+    .requiredOption('--amount <number>', 'number', parseNat)
+    .requiredOption('--forwardingAddress <string>', 'bech32 address', String)
+    .requiredOption('--txHash <0xhexo>', 'hex hash', parseHex)
+    .option('--offerId <string>', 'Offer id', String, `operatorAttest-${now()}`)
+    .action(async opts => {
+      const {
+        offerId,
         previousOfferId,
+        forwardingChannel,
+        recipientAddress,
+        amount,
+        forwardingAddress,
+        ...flat
+      } = opts;
+
+      const evidence = harden({
+        aux: { forwardingChannel, recipientAddress },
+        tx: { amount, forwardingAddress },
+        ...flat,
+      });
+      mustMatch(evidence, CctpTxEvidenceShape);
+
+      /** @type {OfferSpec} */
+      const offer = {
+        id: offerId,
+        invitationSpec: {
+          source: 'continuing',
+          previousOffer: previousOfferId,
+          /** @type {string & keyof OperatorKit['invitationMakers'] } */
+          invitationMakerName: 'SubmitEvidence',
+          /** @type {Parameters<OperatorKit['invitationMakers']['SubmitEvidence']> } */
+          invitationArgs: [evidence],
+        },
+        proposal: {},
+      };
+
+      outputActionAndHint(
+        { method: 'executeOffer', offer },
+        { stderr, stdout },
       );
     });
 

package/src/cli/transfer.js

@@ -1,13 +1,18 @@
+/* eslint-env node */
 /* global globalThis */
 
-import { makeVStorage } from '@agoric/client-utils';
+import {
+  fetchEnvNetworkConfig,
+  makeVStorage,
+  pickEndpoint,
+} from '@agoric/client-utils';
+import { queryFastUSDCLocalChainAccount } from '../util/agoric.js';
 import { depositForBurn, makeProvider } from '../util/cctp.js';
 import {
   makeSigner,
   queryForwardingAccount,
   registerFwdAccount,
 } from '../util/noble.js';
-import { queryFastUSDCLocalChainAccount } from '../util/agoric.js';
 
 /** @import { File } from '../util/file' */
 /** @import { VStorage } from '@agoric/client-utils' */
@@ -23,13 +28,15 @@ const transfer = async (
   /** @type {VStorage | undefined} */ vstorage,
   /** @type {{signer: SigningStargateClient, address: string} | undefined} */ nobleSigner,
   /** @type {ethProvider | undefined} */ ethProvider,
+  env = process.env,
 ) => {
   const execute = async (
     /** @type {import('./config').ConfigOpts} */ config,
   ) => {
+    const netConfig = await fetchEnvNetworkConfig({ env, fetch });
     vstorage ||= makeVStorage(
       { fetch },
-      { chainName: 'agoric', rpcAddrs: [config.agoricRpc] },
+      { chainName: 'agoric', rpcAddrs: [pickEndpoint(netConfig)] },
     );
     const agoricAddr = await queryFastUSDCLocalChainAccount(vstorage, out);
     const appendedAddr = `${agoricAddr}?EUD=${destination}`;

package/tools/cli-tools.ts

@@ -0,0 +1,9 @@
+export const flags = (
+  record: Record<string, string | number | bigint | undefined>,
+): string[] => {
+  // @ts-expect-error undefined is filtered out
+  const skipUndef: [string, string][] = Object.entries(record).filter(
+    ([_k, v]) => v !== undefined,
+  );
+  return skipUndef.map(([k, v]) => [`--${k}`, `${v}`]).flat();
+};

package/tools/mock-io.ts

@@ -0,0 +1,14 @@
+import type { Writable } from 'node:stream';
+
+/**
+ * mock stdout / stderr, for example
+ *
+ * @param buf - caller-provided buffer for written data
+ */
+export const mockStream = <T extends Writable>(buf: string[]): T =>
+  ({
+    write: txt => {
+      buf.push(txt);
+      return true;
+    },
+  }) as T;