agoric 0.18.4 → 0.18.5-dev-800c2bb.0

package/src/commands/oracle.js

@@ -0,0 +1,212 @@
+/* eslint-disable no-await-in-loop */
+/* eslint-disable @jessie.js/no-nested-await */
+// @ts-check
+/* eslint-disable func-names */
+/* global fetch */
+import { Fail } from '@agoric/assert';
+import { Nat } from '@endo/nat';
+import { Command } from 'commander';
+import { inspect } from 'util';
+import { makeRpcUtils, storageHelper } from '../lib/rpc.js';
+import { getCurrent, outputAction } from '../lib/wallet.js';
+
+// XXX support other decimal places
+const COSMOS_UNIT = 1_000_000n;
+const scaleDecimals = num => BigInt(num * Number(COSMOS_UNIT));
+
+/**
+ * @param {import('anylogger').Logger} logger
+ */
+export const makeOracleCommand = logger => {
+  const oracle = new Command('oracle').description('Oracle commands').usage(
+    `
+  WALLET=my-wallet
+  export AGORIC_NET=ollinet
+
+  # provision wallet if necessary
+  agd keys add $WALLET
+  # provision with faucet, e.g.
+  open https://ollinet.faucet.agoric.net/ # and paste the key and choose client: smart-wallet
+
+  # confirm funds
+  agoric wallet list
+  agoric wallet show —from $WALLET
+
+  # prepare an offer to send
+  # (offerId is optional but best to specify as each must be higher than the last and the default value is a huge number)
+  agops oracle accept --offerId 12 > offer-12.json
+
+  # sign and send
+  agoric wallet send --from $WALLET --offer offer-12.json
+  `,
+  );
+
+  const rpcTools = async () => {
+    const utils = await makeRpcUtils({ fetch });
+
+    const lookupPriceAggregatorInstance = ([brandIn, brandOut]) => {
+      const name = `${brandIn}-${brandOut} price feed`;
+      const instance = utils.agoricNames.instance[name];
+      if (!instance) {
+        logger.debug('known instances:', utils.agoricNames.instance);
+        throw Error(`Unknown instance ${name}`);
+      }
+      return instance;
+    };
+
+    return { ...utils, lookupPriceAggregatorInstance };
+  };
+
+  oracle
+    .command('accept')
+    .description('accept invitation to operate an oracle')
+    .requiredOption(
+      '--pair [brandIn.brandOut]',
+      'token pair (brandIn.brandOut)',
+      s => s.split('.'),
+      ['ATOM', 'USD'],
+    )
+    .option(
+      '--offerId <string>',
+      'Offer id',
+      String,
+      `oracleAccept-${Date.now()}`,
+    )
+    .action(async function (opts) {
+      const { lookupPriceAggregatorInstance } = await rpcTools();
+      const instance = lookupPriceAggregatorInstance(opts.pair);
+
+      /** @type {import('@agoric/smart-wallet/src/offers.js').OfferSpec} */
+      const offer = {
+        id: opts.offerId,
+        invitationSpec: {
+          source: 'purse',
+          instance,
+          description: 'oracle invitation',
+        },
+        proposal: {},
+      };
+
+      outputAction({
+        method: 'executeOffer',
+        offer,
+      });
+
+      console.warn('Now execute the prepared offer');
+    });
+
+  oracle
+    .command('pushPrice')
+    .description('add a current price sample to a priceAggregator')
+    .option('--offerId <string>', 'Offer id', String, `pushPrice-${Date.now()}`)
+    .requiredOption(
+      '--oracleAdminAcceptOfferId <number>',
+      'offer that had continuing invitation result',
+      Number,
+    )
+    .requiredOption('--price <number>', 'price (format TODO)', String)
+    .action(async function (opts) {
+      /** @type {import('@agoric/smart-wallet/src/offers.js').OfferSpec} */
+      const offer = {
+        id: opts.offerId,
+        invitationSpec: {
+          source: 'continuing',
+          previousOffer: opts.oracleAdminAcceptOfferId,
+          invitationMakerName: 'PushPrice',
+          invitationArgs: harden([opts.price]),
+        },
+        proposal: {},
+      };
+
+      outputAction({
+        method: 'executeOffer',
+        offer,
+      });
+
+      console.warn('Now execute the prepared offer');
+    });
+
+  oracle
+    .command('pushPriceRound')
+    .description('add a price for a round to a fluxAggregator')
+    .option(
+      '--offerId <string>',
+      'Offer id',
+      String,
+      `pushPriceRound-${Date.now()}`,
+    )
+    .requiredOption(
+      '--oracleAdminAcceptOfferId <string>',
+      'offer that had continuing invitation result',
+      String,
+    )
+    .requiredOption('--price <number>', 'price', Number)
+    .option('--roundId <number>', 'round', Number)
+    .action(async function (opts) {
+      const unitPrice = scaleDecimals(opts.price);
+      const roundId = 'roundId' in opts ? Nat(opts.roundId) : undefined;
+      /** @type {import('@agoric/smart-wallet/src/offers.js').OfferSpec} */
+      const offer = {
+        id: opts.offerId,
+        invitationSpec: {
+          source: 'continuing',
+          previousOffer: opts.oracleAdminAcceptOfferId,
+          invitationMakerName: 'PushPrice',
+          invitationArgs: harden([{ unitPrice, roundId }]),
+        },
+        proposal: {},
+      };
+
+      outputAction({
+        method: 'executeOffer',
+        offer,
+      });
+
+      console.warn('Now execute the prepared offer');
+    });
+
+  oracle
+    .command('find-continuing-id')
+    .description('print id of specified oracle continuing invitation')
+    .requiredOption('--from <address>', 'from address', String)
+    .action(async opts => {
+      const { readLatestHead } = await makeRpcUtils({ fetch });
+      const current = await getCurrent(opts.from, { readLatestHead });
+
+      const { offerToUsedInvitation: entries } = /** @type {any} */ (current);
+      Array.isArray(entries) || Fail`entries must be an array: ${entries}`;
+
+      for (const [offerId, { value }] of entries) {
+        /** @type {{ description: string, instance: unknown }[]} */
+        const [{ description }] = value;
+        if (description === 'oracle invitation') {
+          console.log(offerId);
+          return;
+        }
+      }
+
+      console.error('No continuing ids found');
+    });
+
+  oracle
+    .command('query')
+    .description('return current aggregated (median) price')
+    .requiredOption(
+      '--pair [brandIn.brandOut]',
+      'token pair (brandIn.brandOut)',
+      s => s.split('.'),
+      ['ATOM', 'USD'],
+    )
+    .action(async function (opts) {
+      const { pair } = opts;
+      const { vstorage, fromBoard } = await rpcTools();
+
+      const capDataStr = await vstorage.readLatest(
+        `published.priceFeed.${pair[0]}-${pair[1]}_price_feed`,
+      );
+      const capDatas = storageHelper.unserializeTxt(capDataStr, fromBoard);
+
+      console.log(inspect(capDatas[0], { depth: 10, colors: true }));
+    });
+  return oracle;
+};

package/src/commands/perf.js

@@ -12,19 +12,32 @@ import {
 import { Command } from 'commander';
 import fs from 'fs';
 import { exit } from 'process';
+import { slotToRemotable } from '@agoric/internal/src/storage-test-utils.js';
+import { boardSlottingMarshaller } from '@agoric/vats/tools/board-utils.js';
 import { makeLeaderOptions } from '../lib/casting.js';
-import { execSwingsetTransaction, normalizeAddress } from '../lib/chain.js';
+import {
+  execSwingsetTransaction,
+  normalizeAddressWithOptions,
+} from '../lib/chain.js';
 import { networkConfig } from '../lib/rpc.js';
 
 // tight for perf testing but less than this tends to hang.
 const SLEEP_SECONDS = 0.1;
 
 /**
- *
  * @param {import('anylogger').Logger} logger
  */
-export const makePerfCommand = async logger => {
-  const perf = new Command('perf').description('Performance testing commands');
+export const makePerfCommand = logger => {
+  const perf = new Command('perf')
+    .description('Performance testing commands')
+    .option(
+      '--keyring-backend <string>',
+      'Select keyring’s backend (os|file|kwallet|pass|test|memory) (default "os")',
+      'os',
+    )
+    .option('--home <string>', 'directory for config and data');
+  const normalizeAddress = literalOrName =>
+    normalizeAddressWithOptions(literalOrName, perf.opts());
 
   perf
     .command('satisfaction')
@@ -34,21 +47,18 @@ export const makePerfCommand = async logger => {
     )
     .description('filename of prepared offer')
     .requiredOption(
-      '--from [address]',
+      '--from <address>',
       'address literal or name',
       normalizeAddress,
     )
-    .option(
-      '--keyring-backend [string]',
-      'Select keyring’s backend (os|file|kwallet|pass|test|memory) (default "os")',
-      'os',
-    )
-    .option('--home [string]', 'directory for config and data')
-    .action(async function () {
-      const opts = this.opts();
-      logger.warn({ opts });
-      const payloadStr = await fs.readFileSync(opts.executeOffer).toString();
-      const { offer } = JSON.parse(JSON.parse(payloadStr).body);
+    .action(async function (opts) {
+      const sharedOpts = perf.opts();
+      logger.warn({ sharedOpts, opts });
+      const payloadStr = fs.readFileSync(opts.executeOffer).toString();
+      const payloadCapData = JSON.parse(payloadStr);
+      const unserializer = boardSlottingMarshaller(slotToRemotable);
+      const obj = unserializer.fromCapData(payloadCapData);
+      const { offer } = obj;
       const { id: offerId } = offer;
 
       const spec = `:published.wallet.${opts.from}`;
@@ -85,14 +95,14 @@ export const makePerfCommand = async logger => {
       void watchForSatisfied();
 
       // now execute
-      let cmd = `wallet-action --allow-spend "$(cat ${opts.executeOffer})"`;
-      if (opts.keyringBackend) {
-        cmd = cmd.concat(' --keyring-backend ', opts.keyringBackend);
+      const cmd = ['wallet-action', '--allow-spend', payloadStr];
+      if (sharedOpts.keyringBackend) {
+        cmd.push(`--keyring-backend=${sharedOpts.keyringBackend}`);
       }
-      if (opts.home) {
-        cmd = cmd.concat(' --home ', opts.home);
+      if (sharedOpts.home) {
+        cmd.push(`--home=${sharedOpts.home}`);
       }
-      execSwingsetTransaction(cmd, networkConfig, opts.from);
+      execSwingsetTransaction(cmd, { from: opts.from, ...networkConfig });
     });
 
   return perf;