agoric 0.18.4 → 0.18.5-dev-800c2bb.0

package/src/commands/vaults.js

@@ -0,0 +1,161 @@
+/* eslint-disable no-await-in-loop */
+/* eslint-disable @jessie.js/no-nested-await */
+// @ts-check
+/* eslint-disable func-names */
+/* global fetch, process */
+import { Command } from 'commander';
+import {
+  lookupOfferIdForVault,
+  Offers,
+} from '@agoric/inter-protocol/src/clientSupport.js';
+import { normalizeAddressWithOptions } from '../lib/chain.js';
+import { makeRpcUtils } from '../lib/rpc.js';
+import { getCurrent, outputExecuteOfferAction } from '../lib/wallet.js';
+
+/**
+ * @param {import('anylogger').Logger} logger
+ */
+export const makeVaultsCommand = logger => {
+  const vaults = new Command('vaults')
+    .description('Vault Factory commands')
+    .option('--home [dir]', 'agd application home directory')
+    .option(
+      '--keyring-backend <os|file|test>',
+      'keyring\'s backend (os|file|test) (default "os")',
+    );
+
+  const normalizeAddress = literalOrName =>
+    normalizeAddressWithOptions(literalOrName, vaults.opts());
+
+  vaults
+    .command('list')
+    .description(
+      'list vaults ever owned by the address (as path that can be followed)',
+    )
+    .requiredOption(
+      '--from <address>',
+      'wallet address literal or name',
+      normalizeAddress,
+    )
+    .action(async function (opts) {
+      const { readLatestHead } = await makeRpcUtils({ fetch });
+
+      const current = await getCurrent(opts.from, {
+        readLatestHead,
+      });
+
+      const vaultStoragePaths = current.offerToPublicSubscriberPaths.map(
+        ([_offerId, pathmap]) => pathmap.vault,
+      );
+
+      for (const path of vaultStoragePaths) {
+        process.stdout.write(path);
+        process.stdout.write('\n');
+      }
+    });
+
+  vaults
+    .command('open')
+    .description('open a new vault')
+    .requiredOption('--giveCollateral <number>', 'Collateral to give', Number)
+    .requiredOption('--wantMinted <number>', 'Minted wants', Number)
+    .option('--offerId <string>', 'Offer id', String, `openVault-${Date.now()}`)
+    .option('--collateralBrand <string>', 'Collateral brand key', 'ATOM')
+    .action(async function (opts) {
+      logger.warn('running with options', opts);
+      const { agoricNames } = await makeRpcUtils({ fetch });
+
+      const offer = Offers.vaults.OpenVault(agoricNames.brand, {
+        giveCollateral: opts.giveCollateral,
+        wantMinted: opts.wantMinted,
+        offerId: opts.offerId,
+        // rename to allow CLI to be more concise
+        collateralBrandKey: opts.collateralBrand,
+      });
+
+      outputExecuteOfferAction(offer);
+    });
+
+  vaults
+    .command('adjust')
+    .description('adjust an existing vault')
+    .requiredOption(
+      '--from <address>',
+      'wallet address literal or name',
+      normalizeAddress,
+    )
+    .option('--giveCollateral <number>', 'More collateral to lend', Number)
+    .option('--wantCollateral <number>', 'Collateral to get back', Number)
+    .option('--giveMinted <number>', 'Minted to give back', Number)
+    .option('--wantMinted <number>', 'More minted to borrow', Number)
+    .option(
+      '--offerId <string>',
+      'Offer id',
+      String,
+      `adjustVault-${Date.now()}`,
+    )
+    .option('--collateralBrand <string>', 'Collateral brand key', 'ATOM')
+    .requiredOption('--vaultId <string>', 'Key of vault (e.g. vault1)')
+    .action(async function (opts) {
+      logger.warn('running with options', opts);
+      const { agoricNames, readLatestHead } = await makeRpcUtils({ fetch });
+
+      const previousOfferId = await lookupOfferIdForVault(
+        opts.vaultId,
+        getCurrent(opts.from, { readLatestHead }),
+      );
+
+      const offer = Offers.vaults.AdjustBalances(
+        agoricNames.brand,
+        {
+          giveCollateral: opts.giveCollateral,
+          wantCollateral: opts.wantCollateral,
+          giveMinted: opts.giveMinted,
+          wantMinted: opts.wantMinted,
+          offerId: opts.offerId,
+          // rename to allow CLI to be more concise
+          collateralBrandKey: opts.collateralBrand,
+        },
+        previousOfferId,
+      );
+      outputExecuteOfferAction(offer);
+    });
+
+  vaults
+    .command('close')
+    .description('close an existing vault')
+    .requiredOption(
+      '--from <address>',
+      'wallet address literal or name',
+      normalizeAddress,
+    )
+    .requiredOption('--giveMinted <number>', 'Minted to give back', Number)
+    .requiredOption('--vaultId <string>', 'Key of vault (e.g. vault1)')
+    .option(
+      '--offerId <string>',
+      'Offer id',
+      String,
+      `closeVault-${Date.now()}`,
+    )
+    .action(async function (opts) {
+      logger.warn('running with options', opts);
+      const { agoricNames, readLatestHead } = await makeRpcUtils({ fetch });
+
+      const previousOfferId = await lookupOfferIdForVault(
+        opts.vaultId,
+        getCurrent(opts.from, { readLatestHead }),
+      );
+
+      const offer = Offers.vaults.CloseVault(
+        agoricNames.brand,
+        {
+          giveMinted: opts.giveMinted,
+          offerId: opts.offerId,
+        },
+        previousOfferId,
+      );
+      outputExecuteOfferAction(offer);
+    });
+
+  return vaults;
+};

package/src/commands/wallet.js

@@ -8,28 +8,34 @@ import {
   makeLeader,
   makeLeaderFromRpcAddresses,
 } from '@agoric/casting';
-import { coalesceWalletState } from '@agoric/smart-wallet/src/utils.js';
 import { Command } from 'commander';
+import fs from 'fs';
 import util from 'util';
+import { execFileSync } from 'child_process';
 import { fmtRecordOfLines, summarize } from '../lib/format.js';
-import {
-  boardSlottingMarshaller,
-  makeRpcUtils,
-  networkConfig,
-} from '../lib/rpc.js';
+import { makeRpcUtils, networkConfig } from '../lib/rpc.js';
 
 import { makeLeaderOptions } from '../lib/casting.js';
 import {
   execSwingsetTransaction,
   fetchSwingsetParams,
-  normalizeAddress,
+  normalizeAddressWithOptions,
 } from '../lib/chain.js';
-import { getCurrent } from '../lib/wallet.js';
+import { coalesceWalletState, getCurrent } from '../lib/wallet.js';
 
 const SLEEP_SECONDS = 3;
 
 export const makeWalletCommand = async () => {
-  const wallet = new Command('wallet').description('wallet commands');
+  const wallet = new Command('wallet')
+    .description('wallet commands')
+    .option('--home <dir>', 'agd application home directory')
+    .option(
+      '--keyring-backend <os|file|test>',
+      'keyring\'s backend (os|file|test) (default "os")',
+    );
+
+  const normalizeAddress = literalOrName =>
+    normalizeAddressWithOptions(literalOrName, wallet.opts());
 
   wallet
     .command('provision')
@@ -40,25 +46,16 @@ export const makeWalletCommand = async () => {
       normalizeAddress,
     )
     .option('--spend', 'confirm you want to spend')
-    .option('--home [dir]', 'agd application home directory')
-    .option(
-      '--keyring-backend [os|file|test]',
-      'keyring\'s backend (os|file|test) (default "os")',
-    )
-    .option('--nickname [string]', 'nickname to use', 'my-wallet')
-    .action(function () {
-      const {
-        account,
-        nickname,
-        spend,
-        home,
-        keyringBackend: backend,
-      } = this.opts();
-      const tx = `provision-one ${nickname} ${account} SMART_WALLET`;
+    .option('--nickname <string>', 'nickname to use', 'my-wallet')
+    .action(function (opts) {
+      const { account, nickname, spend } = opts;
+      const { home, keyringBackend: backend } = wallet.opts();
+      const tx = ['provision-one', nickname, account, 'SMART_WALLET'];
       if (spend) {
-        execSwingsetTransaction(tx, networkConfig, account, false, {
-          home,
-          backend,
+        execSwingsetTransaction(tx, {
+          from: account,
+          keyring: { home, backend },
+          ...networkConfig,
         });
       } else {
         const params = fetchSwingsetParams(networkConfig);
@@ -73,13 +70,43 @@ export const makeWalletCommand = async () => {
           .join(' + ');
         process.stdout.write(`Provisioning a wallet costs ${costs}\n`);
         process.stdout.write(`To really provision, rerun with --spend or...\n`);
-        execSwingsetTransaction(tx, networkConfig, account, true, {
-          home,
-          backend,
+        execSwingsetTransaction(tx, {
+          from: account,
+          dryRun: true,
+          keyring: { home, backend },
+          ...networkConfig,
         });
       }
     });
 
+  wallet
+    .command('print')
+    .description('print out a marshalled message on disk')
+    .requiredOption('--file [filename]', 'path to file with prepared message')
+    .action(async function (opts) {
+      const offerStr = fs.readFileSync(opts.file).toString();
+
+      const { unserializer } = await makeRpcUtils({ fetch });
+
+      const offerObj = unserializer.fromCapData(JSON.parse(offerStr));
+      console.log(offerObj);
+    });
+
+  wallet
+    .command('extract-id')
+    .description(
+      'print out the offer id of a marshalled offer messsage on disk',
+    )
+    .requiredOption('--offer [filename]', 'path to file with prepared offer')
+    .action(async function (opts) {
+      const offerStr = fs.readFileSync(opts.offer).toString();
+
+      const { unserializer } = await makeRpcUtils({ fetch });
+
+      const offerObj = unserializer.fromCapData(JSON.parse(offerStr));
+      console.log(offerObj.offer.id);
+    });
+
   wallet
     .command('send')
     .description('send a prepared offer')
@@ -89,28 +116,18 @@ export const makeWalletCommand = async () => {
       normalizeAddress,
     )
     .requiredOption('--offer [filename]', 'path to file with prepared offer')
-    .option('--home [dir]', 'agd application home directory')
-    .option(
-      '--keyring-backend [os|file|test]',
-      'keyring\'s backend (os|file|test) (default "os")',
-    )
     .option('--dry-run', 'spit out the command instead of running it')
-    .action(function () {
-      const {
-        dryRun,
-        from,
-        offer,
-        home,
-        keyringBackend: backend,
-      } = this.opts();
-
-      execSwingsetTransaction(
-        `wallet-action --allow-spend "$(cat ${offer})"`,
-        networkConfig,
+    .action(function (opts) {
+      const { dryRun, from, offer } = opts;
+      const { home, keyringBackend: backend } = wallet.opts();
+
+      const offerBody = fs.readFileSync(offer).toString();
+      execSwingsetTransaction(['wallet-action', '--allow-spend', offerBody], {
         from,
         dryRun,
-        { home, backend },
-      );
+        keyring: { home, backend },
+        ...networkConfig,
+      });
     });
 
   wallet
@@ -130,15 +147,11 @@ export const makeWalletCommand = async () => {
       'wallet address literal or name',
       normalizeAddress,
     )
-    .action(async function () {
-      const opts = this.opts();
-
-      const { agoricNames, fromBoard, vstorage } = await makeRpcUtils({
+    .action(async function (opts) {
+      const { agoricNames, unserializer, readLatestHead } = await makeRpcUtils({
         fetch,
       });
 
-      const unserializer = boardSlottingMarshaller(fromBoard.convertSlotToVal);
-
       const leader = makeLeader(networkConfig.rpcAddrs[0]);
       const follower = await makeFollower(
         `:published.wallet.${opts.from}`,
@@ -151,9 +164,7 @@ export const makeWalletCommand = async () => {
 
       const coalesced = await coalesceWalletState(follower);
 
-      const current = await getCurrent(opts.from, fromBoard, {
-        vstorage,
-      });
+      const current = await getCurrent(opts.from, { readLatestHead });
 
       console.warn(
         'got coalesced',
@@ -162,9 +173,24 @@ export const makeWalletCommand = async () => {
       try {
         const summary = summarize(current, coalesced, agoricNames);
         process.stdout.write(fmtRecordOfLines(summary));
+        process.stdout.write('\n');
       } catch (e) {
         console.error('CAUGHT HERE', e);
       }
+      execFileSync(
+        'agd',
+        [
+          'query',
+          '--node',
+          networkConfig.rpcAddrs[0],
+          'bank',
+          'balances',
+          opts.from,
+        ],
+        {
+          stdio: 'inherit',
+        },
+      );
     });
 
   wallet
@@ -175,8 +201,7 @@ export const makeWalletCommand = async () => {
       'address literal or name',
       normalizeAddress,
     )
-    .action(async function () {
-      const { from } = this.opts();
+    .action(async function ({ from }) {
       const spec = `:published.wallet.${from}`;
 
       const leaderOptions = makeLeaderOptions({

package/src/cosmos.js

@@ -5,7 +5,7 @@ import { makePspawn, getSDKBinaries } from './helpers.js';
 const filename = new URL(import.meta.url).pathname;
 
 export default async function cosmosMain(progname, rawArgs, powers, opts) {
-  const IMAGE = `agoric/agoric-sdk`;
+  const IMAGE = `ghcr.io/agoric/agoric-sdk`;
   const { anylogger, fs, spawn, process } = powers;
   const log = anylogger('agoric:cosmos');
 
@@ -58,9 +58,7 @@ export default async function cosmosMain(progname, rawArgs, powers, opts) {
         )
         .then(code => {
           if (code !== 0) {
-            throw new Error(
-              `Cosmos client helper build failed with code ${code}`,
-            );
+            throw Error(`Cosmos client helper build failed with code ${code}`);
           }
           return pspawn(cosmosHelper, args, hopts);
         });
@@ -84,11 +82,9 @@ export default async function cosmosMain(progname, rawArgs, powers, opts) {
     );
   }
 
-  if (popts.pull) {
-    const exitStatus = await pspawn('docker', ['pull', IMAGE]);
-    if (exitStatus) {
-      return exitStatus;
-    }
+  const exitStatus = await (popts.pull && pspawn('docker', ['pull', IMAGE]));
+  if (exitStatus) {
+    return exitStatus;
   }
 
   return helper(rawArgs.slice(1));