agoric 0.21.2-u12.0 → 0.22.0-u13.0

package/CHANGELOG.md

@@ -3,6 +3,32 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.22.0-u13.0](https://github.com/Agoric/agoric-sdk/compare/agoric@0.21.2-u12.0...agoric@0.22.0-u13.0) (2023-12-07)
+
+
+### ⚠ BREAKING CHANGES
+
+* restrict exports from 'agoric' package
+
+### Features
+
+* **cosmos:** un-wire x/crisis ([#8582](https://github.com/Agoric/agoric-sdk/issues/8582)) ([19404a3](https://github.com/Agoric/agoric-sdk/commit/19404a3c5cd10d9c454f190b60cbf0aa715f605c))
+
+
+### Bug Fixes
+
+* **agops:** fix continuing id lookup in oracle setPrice ([0ac9697](https://github.com/Agoric/agoric-sdk/commit/0ac969746c7337d45287fd040b636d27d296a062))
+* **agoric:** print errors while following ([deab7e4](https://github.com/Agoric/agoric-sdk/commit/deab7e4065fe5dd6cc1a3c5bf8c0db861cb7856b))
+* **casting:** dont crash on bad capdata ([3f01369](https://github.com/Agoric/agoric-sdk/commit/3f0136994c0b4033c872f9593cabb19bab05f01c))
+* **cli:** handle not found error in vstorage requests ([8111c43](https://github.com/Agoric/agoric-sdk/commit/8111c4344bcaa6e06085020813e2431cba9d1632))
+
+
+### Miscellaneous Chores
+
+* restrict exports from 'agoric' package ([63c1abb](https://github.com/Agoric/agoric-sdk/commit/63c1abbfcb0710bdd0a22382eb4a683216a6c453))
+
+
+
 ### [0.21.2-u12.0](https://github.com/Agoric/agoric-sdk/compare/agoric@0.21.2-u11wf.0...agoric@0.21.2-u12.0) (2023-11-10)
 
 **Note:** Version bump only for package agoric

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agoric",
-  "version": "0.21.2-u12.0",
+  "version": "0.22.0-u13.0",
   "description": "Manage the Agoric Javascript smart contract platform",
   "type": "module",
   "main": "src/main.js",
@@ -8,6 +8,10 @@
     "agoric": "src/entrypoint.js",
     "agops": "src/bin-agops.js"
   },
+  "exports": {
+    "./src/entrypoint.js": "./src/entrypoint.js",
+    "./src/helpers.js": "./src/helpers.js"
+  },
   "files": [
     "src",
     "exported.js"
@@ -24,7 +28,7 @@
     "lint:eslint": "eslint ."
   },
   "devDependencies": {
-    "@agoric/deploy-script-support": "^0.10.4-u12.0",
+    "@agoric/deploy-script-support": "^0.10.4-u13.0",
     "ava": "^5.2.0",
     "c8": "^7.13.0",
     "dd-trace": "^3.3.0"
@@ -32,18 +36,18 @@
   "dependencies": {
     "@agoric/access-token": "^0.4.22-u11wf.0",
     "@agoric/assert": "^0.6.1-u11wf.0",
-    "@agoric/cache": "^0.3.3-u12.0",
-    "@agoric/casting": "^0.4.3-u12.0",
+    "@agoric/cache": "^0.3.3-u13.0",
+    "@agoric/casting": "^0.4.3-u13.0",
     "@agoric/cosmic-proto": "^0.3.0",
-    "@agoric/ertp": "^0.16.3-u12.0",
-    "@agoric/inter-protocol": "^0.16.2-u12.0",
-    "@agoric/internal": "^0.4.0-u12.0",
-    "@agoric/smart-wallet": "^0.5.4-u12.0",
-    "@agoric/store": "^0.9.3-u12.0",
-    "@agoric/swingset-vat": "^0.32.3-u12.0",
-    "@agoric/vats": "^0.15.2-u12.0",
-    "@agoric/zoe": "^0.26.3-u12.0",
-    "@agoric/zone": "^0.2.3-u12.0",
+    "@agoric/ertp": "^0.16.3-u13.0",
+    "@agoric/inter-protocol": "^0.16.2-u13.0",
+    "@agoric/internal": "^0.4.0-u13.0",
+    "@agoric/smart-wallet": "^0.5.4-u13.0",
+    "@agoric/store": "^0.9.3-u13.0",
+    "@agoric/swingset-vat": "^0.32.3-u13.0",
+    "@agoric/vats": "^0.15.2-u13.0",
+    "@agoric/zoe": "^0.26.3-u13.0",
+    "@agoric/zone": "^0.2.3-u13.0",
     "@confio/relayer": "^0.9.0",
     "@cosmjs/crypto": "^0.30.1",
     "@cosmjs/encoding": "^0.30.1",
@@ -87,5 +91,5 @@
     "timeout": "2m",
     "workerThreads": false
   },
-  "gitHead": "ee5a5fdad9187a6b1b7b26b772b6564c0db3062e"
+  "gitHead": "5a6cdeb0c18ae9700d706445acf402f8d1e873c3"
 }

package/src/chain-config.js

@@ -235,7 +235,6 @@ export function finishCosmosGenesis({ genesisJson, exportedGenesisJson }) {
 
   // Set the denomination for different modules.
   genesis.app_state.mint.params.mint_denom = MINT_DENOM;
-  genesis.app_state.crisis.constant_fee.denom = MINT_DENOM;
   genesis.app_state.gov.deposit_params.min_deposit = GOV_DEPOSIT_COINS;
   genesis.app_state.gov.voting_params.voting_period = GOV_VOTING_PERIOD;
 

package/src/commands/inter.js

@@ -25,7 +25,6 @@ import {
 import { getNetworkConfig } from '../lib/rpc.js';
 import {
   getCurrent,
-  makeParseAmount,
   makeWalletUtils,
   outputActionAndHint,
   sendAction,
@@ -416,14 +415,7 @@ inter auction status
       async ({ generateOnly, dryRun, ...opts }) => {
         const tools = await tryMakeUtils();
 
-        const parseAmount = makeParseAmount(
-          tools.agoricNames,
-          msg => new InvalidArgumentError(msg),
-        );
-        const offer = Offers.auction.Bid(tools.agoricNames.brand, {
-          ...opts,
-          parseAmount,
-        });
+        const offer = Offers.auction.Bid(tools.agoricNames, opts);
 
         if (generateOnly) {
           outputActionAndHint(
@@ -464,14 +456,7 @@ inter auction status
       async ({ generateOnly, ...opts }) => {
         const tools = await tryMakeUtils();
 
-        const parseAmount = makeParseAmount(
-          tools.agoricNames,
-          msg => new InvalidArgumentError(msg),
-        );
-        const offer = Offers.auction.Bid(tools.agoricNames.brand, {
-          ...opts,
-          parseAmount,
-        });
+        const offer = Offers.auction.Bid(tools.agoricNames, opts);
         if (generateOnly) {
           outputActionAndHint(
             { method: 'executeOffer', offer },

package/src/commands/oracle.js

@@ -71,6 +71,11 @@ export const makeOracleCommand = (logger, io = {}) => {
       env.AGORIC_KEYRING_BACKEND,
     );
 
+  const normalizeAddress = literalOrName =>
+    normalizeAddressWithOptions(literalOrName, oracle.opts(), {
+      execFileSync,
+    });
+
   const rpcTools = async () => {
     // XXX pass fetch to getNetworkConfig() explicitly
     const networkConfig = await getNetworkConfig(env);
@@ -162,7 +167,7 @@ export const makeOracleCommand = (logger, io = {}) => {
       console.warn('Now execute the prepared offer');
     });
 
-  const findOracleCap = async (from, readLatestHead) => {
+  const findOracleCap = async (instance, from, readLatestHead) => {
     const current = await getCurrent(from, { readLatestHead });
 
     const { offerToUsedInvitation: entries } = /** @type {any} */ (current);
@@ -170,8 +175,8 @@ export const makeOracleCommand = (logger, io = {}) => {
 
     for (const [offerId, { value }] of entries) {
       /** @type {{ description: string, instance: unknown }[]} */
-      const [{ description }] = value;
-      if (description === 'oracle invitation') {
+      const [{ description, instance: candidate }] = value;
+      if (description === 'oracle invitation' && candidate === instance) {
         return offerId;
       }
     }
@@ -180,11 +185,22 @@ export const makeOracleCommand = (logger, io = {}) => {
   oracle
     .command('find-continuing-id')
     .description('print id of specified oracle continuing invitation')
-    .requiredOption('--from <address>', 'from address', String)
+    .requiredOption(
+      '--from <address>',
+      'wallet address literal or name',
+      normalizeAddress,
+    )
+    .requiredOption(
+      '--pair [brandIn.brandOut]',
+      'token pair (brandIn.brandOut)',
+      s => s.split('.'),
+    )
     .action(async opts => {
-      const { readLatestHead } = await makeRpcUtils({ fetch });
+      const { readLatestHead, lookupPriceAggregatorInstance } =
+        await rpcTools();
+      const instance = lookupPriceAggregatorInstance(opts.pair);
 
-      const offerId = await findOracleCap(opts.from, readLatestHead);
+      const offerId = await findOracleCap(instance, opts.from, readLatestHead);
       if (!offerId) {
         console.error('No continuing ids found');
       }
@@ -212,11 +228,6 @@ export const makeOracleCommand = (logger, io = {}) => {
       console.log(inspect(capDatas[0], { depth: 10, colors: true }));
     });
 
-  /** @param {string} literalOrName */
-  const normalizeAddress = literalOrName =>
-    normalizeAddressWithOptions(literalOrName, oracle.opts(), {
-      execFileSync,
-    });
   const show = (info, indent = false) =>
     stdout.write(
       `${JSON.stringify(info, bigintReplacer, indent ? 2 : undefined)}\n`,
@@ -250,7 +261,8 @@ export const makeOracleCommand = (logger, io = {}) => {
          * }}
          */ { pair, keys, price },
       ) => {
-        const { readLatestHead, networkConfig } = await rpcTools();
+        const { readLatestHead, networkConfig, lookupPriceAggregatorInstance } =
+          await rpcTools();
         const wutil = await makeWalletUtils(
           { fetch, execFileSync, delay },
           networkConfig,
@@ -308,9 +320,12 @@ export const makeOracleCommand = (logger, io = {}) => {
           console.warn(err);
         });
 
+        const instance = lookupPriceAggregatorInstance(pair);
+
         console.error('pushPrice from each:', keyOrder);
         for await (const from of keyOrder) {
           const oracleAdminAcceptOfferId = await findOracleCap(
+            instance,
             from,
             readLatestHead,
           );

package/src/commands/psm.js

@@ -159,7 +159,7 @@ export const makePsmCommand = logger => {
       console.warn('running with options', opts);
       const { agoricNames, lookupPsmInstance } = await rpcTools();
       const instance = await lookupPsmInstance(opts.pair);
-      const offer = Offers.psm.swap(instance, agoricNames.brand, opts);
+      const offer = Offers.psm.swap(agoricNames, instance, opts);
       outputExecuteOfferAction(offer);
     });
 

package/src/commands/reserve.js

@@ -32,7 +32,7 @@ export const makeReserveCommand = (_logger, io = {}) => {
       async ({ collateralBrand, ...opts }) => {
         const { agoricNames } = await makeRpcUtils({ fetch });
 
-        const offer = Offers.reserve.AddCollateral(agoricNames.brand, {
+        const offer = Offers.reserve.AddCollateral(agoricNames, {
           collateralBrandKey: collateralBrand,
           ...opts,
         });

package/src/commands/vaults.js

@@ -65,7 +65,7 @@ export const makeVaultsCommand = logger => {
       logger.warn('running with options', opts);
       const { agoricNames } = await makeRpcUtils({ fetch });
 
-      const offer = Offers.vaults.OpenVault(agoricNames.brand, {
+      const offer = Offers.vaults.OpenVault(agoricNames, {
         giveCollateral: opts.giveCollateral,
         wantMinted: opts.wantMinted,
         offerId: opts.offerId,
@@ -106,7 +106,7 @@ export const makeVaultsCommand = logger => {
       );
 
       const offer = Offers.vaults.AdjustBalances(
-        agoricNames.brand,
+        agoricNames,
         {
           giveCollateral: opts.giveCollateral,
           wantCollateral: opts.wantCollateral,
@@ -147,7 +147,7 @@ export const makeVaultsCommand = logger => {
       );
 
       const offer = Offers.vaults.CloseVault(
-        agoricNames.brand,
+        agoricNames,
         {
           giveMinted: opts.giveMinted,
           offerId: opts.offerId,

package/src/follow.js

@@ -142,9 +142,12 @@ export default async function followerMain(progname, rawArgs, powers, opts) {
       verbose && console.warn('Following', spec);
       const castingSpec = makeCastingSpec(spec);
       const follower = makeFollower(castingSpec, leader, followerOptions);
-      for await (const { value, blockHeight, currentBlockHeight } of iterate(
-        follower,
-      )) {
+      for await (const obj of iterate(follower)) {
+        if ('error' in obj) {
+          console.error('Error following:', obj.error);
+          continue;
+        }
+        const { value, blockHeight, currentBlockHeight } = obj;
         const blockHeightPrefix = opts.blockHeight ? `${blockHeight}:` : '';
         const currentBlockHeightPrefix = opts.currentBlockHeight
           ? `${currentBlockHeight}:`

package/src/lib/rpc.js

@@ -79,9 +79,13 @@ export const makeVStorage = (powers, config = networkConfig) => {
           result: { response },
         } = data;
         if (response?.code !== 0) {
-          throw Error(
+          /** @type {any} */
+          const err = Error(
             `error code ${response?.code} reading ${kind} of ${path}: ${response.log}`,
           );
+          err.code = response?.code;
+          err.codespace = response?.codespace;
+          throw err;
         }
         return data;
       });
@@ -143,7 +147,14 @@ export const makeVStorage = (powers, config = networkConfig) => {
           ));
           // console.debug('readAt returned', { blockHeight });
         } catch (err) {
-          if (err.message.match(/unknown request/)) {
+          if (
+            // CosmosSDK ErrNotFound; there is no data at the path
+            (err.codespace === 'sdk' && err.code === 38) ||
+            // CosmosSDK ErrUnknownRequest; misrepresentation of the same until
+            // https://github.com/Agoric/agoric-sdk/commit/dafc7c1708977aaa55e245dc09a73859cf1df192
+            // TODO remove after upgrade-12
+            err.message.match(/unknown request/)
+          ) {
             // console.error(err);
             break;
           }

package/src/lib/wallet.js

@@ -9,7 +9,6 @@ import { boardSlottingMarshaller, makeRpcUtils } from './rpc.js';
 /** @typedef {import('@agoric/smart-wallet/src/smartWallet.js').CurrentWalletRecord} CurrentWalletRecord  */
 /** @typedef {import('@agoric/vats/tools/board-utils.js').AgoricNamesRemotes} AgoricNamesRemotes  */
 
-const { values } = Object;
 const { Fail } = assert;
 const marshaller = boardSlottingMarshaller();
 
@@ -113,6 +112,13 @@ export const coalesceWalletState = async (follower, invitationBrand) => {
   // values with oldest last
   const history = [];
   for await (const followerElement of iterateReverse(follower)) {
+    if ('error' in followerElement) {
+      console.error(
+        'Skipping wallet update due to error:',
+        followerElement.error,
+      );
+      continue;
+    }
     history.push(followerElement.value);
   }
 
@@ -272,44 +278,3 @@ export const makeWalletUtils = async (
     pollOffer,
   };
 };
-
-/**
- * @param {{
- *   brand: Record<string, Brand>,
- *   vbankAsset: Record<string, { brand: Brand, displayInfo: DisplayInfo }>,
- * }} agoricNames
- * @param {(msg: string) => Error} makeError error constructor
- * @returns {(a: string) => Amount<'nat'>}
- */
-export const makeParseAmount =
-  (agoricNames, makeError = msg => RangeError(msg)) =>
-  opt => {
-    assert.typeof(opt, 'string', 'parseAmount expected string');
-    const m = opt.match(/^(?<value>[\d_]+(\.[\d_]+)?)(?<brand>[A-Z]\w*?)$/);
-    if (!m || !m.groups) {
-      throw makeError(`invalid amount: ${opt}`);
-    }
-    const anyBrand = agoricNames.brand[m.groups.brand];
-    if (!anyBrand) {
-      throw makeError(`unknown brand: ${m.groups.brand}`);
-    }
-    const assetDesc = values(agoricNames.vbankAsset).find(
-      d => d.brand === anyBrand,
-    );
-    if (!assetDesc) {
-      throw makeError(`unknown brand: ${m.groups.brand}`);
-    }
-    const { displayInfo } = assetDesc;
-    if (!displayInfo.decimalPlaces || displayInfo.assetKind !== 'nat') {
-      throw makeError(`bad brand: ${displayInfo}`);
-    }
-    const value = BigInt(
-      Number(m.groups.value.replace(/_/g, '')) *
-        10 ** displayInfo.decimalPlaces,
-    );
-    /** @type {Brand<'nat'>} */
-    // @ts-expect-error dynamic cast
-    const natBrand = anyBrand;
-    const amt = { value, brand: natBrand };
-    return amt;
-  };