agoric 0.21.2-dev-e7af58f.0 → 0.21.2-dev-3b799b8.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agoric",
-  "version": "0.21.2-dev-e7af58f.0+e7af58f",
+  "version": "0.21.2-dev-3b799b8.0+3b799b8",
   "description": "Manage the Agoric Javascript smart contract platform",
   "type": "module",
   "main": "src/main.js",
@@ -29,29 +29,29 @@
     "lint:eslint": "eslint ."
   },
   "devDependencies": {
-    "@agoric/cosmic-swingset": "0.41.4-dev-e7af58f.0+e7af58f",
-    "@agoric/deploy-script-support": "0.10.4-dev-e7af58f.0+e7af58f",
+    "@agoric/cosmic-swingset": "0.41.4-dev-3b799b8.0+3b799b8",
+    "@agoric/deploy-script-support": "0.10.4-dev-3b799b8.0+3b799b8",
     "ava": "^5.3.0",
     "c8": "^9.1.0",
     "dd-trace": "^4.11.1"
   },
   "dependencies": {
-    "@agoric/access-token": "0.4.22-dev-e7af58f.0+e7af58f",
-    "@agoric/cache": "0.3.3-dev-e7af58f.0+e7af58f",
-    "@agoric/casting": "0.4.3-dev-e7af58f.0+e7af58f",
-    "@agoric/client-utils": "0.1.1-dev-e7af58f.0+e7af58f",
-    "@agoric/cosmic-proto": "0.4.1-dev-e7af58f.0+e7af58f",
-    "@agoric/ertp": "0.16.3-dev-e7af58f.0+e7af58f",
-    "@agoric/governance": "0.10.4-dev-e7af58f.0+e7af58f",
-    "@agoric/inter-protocol": "0.16.2-dev-e7af58f.0+e7af58f",
-    "@agoric/internal": "0.3.3-dev-e7af58f.0+e7af58f",
-    "@agoric/network": "0.1.1-dev-e7af58f.0+e7af58f",
-    "@agoric/smart-wallet": "0.5.4-dev-e7af58f.0+e7af58f",
-    "@agoric/store": "0.9.3-dev-e7af58f.0+e7af58f",
-    "@agoric/swingset-vat": "0.32.3-dev-e7af58f.0+e7af58f",
-    "@agoric/vats": "0.15.2-dev-e7af58f.0+e7af58f",
-    "@agoric/zoe": "0.26.3-dev-e7af58f.0+e7af58f",
-    "@agoric/zone": "0.2.3-dev-e7af58f.0+e7af58f",
+    "@agoric/access-token": "0.4.22-dev-3b799b8.0+3b799b8",
+    "@agoric/cache": "0.3.3-dev-3b799b8.0+3b799b8",
+    "@agoric/casting": "0.4.3-dev-3b799b8.0+3b799b8",
+    "@agoric/client-utils": "0.1.1-dev-3b799b8.0+3b799b8",
+    "@agoric/cosmic-proto": "0.4.1-dev-3b799b8.0+3b799b8",
+    "@agoric/ertp": "0.16.3-dev-3b799b8.0+3b799b8",
+    "@agoric/governance": "0.10.4-dev-3b799b8.0+3b799b8",
+    "@agoric/inter-protocol": "0.16.2-dev-3b799b8.0+3b799b8",
+    "@agoric/internal": "0.3.3-dev-3b799b8.0+3b799b8",
+    "@agoric/network": "0.1.1-dev-3b799b8.0+3b799b8",
+    "@agoric/smart-wallet": "0.5.4-dev-3b799b8.0+3b799b8",
+    "@agoric/store": "0.9.3-dev-3b799b8.0+3b799b8",
+    "@agoric/swingset-vat": "0.32.3-dev-3b799b8.0+3b799b8",
+    "@agoric/vats": "0.15.2-dev-3b799b8.0+3b799b8",
+    "@agoric/zoe": "0.26.3-dev-3b799b8.0+3b799b8",
+    "@agoric/zone": "0.2.3-dev-3b799b8.0+3b799b8",
     "@confio/relayer": "^0.11.3",
     "@cosmjs/crypto": "^0.32.3",
     "@cosmjs/encoding": "^0.32.3",
@@ -100,7 +100,7 @@
     "workerThreads": false
   },
   "typeCoverage": {
-    "atLeast": 77.45
+    "atLeast": 77.54
   },
-  "gitHead": "e7af58fe25a802d23283633416d0900aa06a2127"
+  "gitHead": "3b799b8302ba75327a825515c82d954a1f78103c"
 }

package/src/commands/auction.js

@@ -89,16 +89,12 @@ export const makeAuctionCommand = (
        * }} opts
        */
       async opts => {
-        const { agoricNames, readLatestHead } = await makeVstorageKit(
+        const { agoricNames, readPublished } = await makeVstorageKit(
           { fetch },
           networkConfig,
         );
 
-        /** @type {{ current: AuctionParamRecord }} */
-        // @ts-expect-error XXX should runtime check?
-        const { current } = await readLatestHead(
-          `published.auction.governance`,
-        );
+        const { current } = await readPublished(`auction.governance`);
 
         const {
           AuctionStartDelay: {

package/src/commands/gov.js

@@ -98,13 +98,13 @@ export const makeGovCommand = (_logger, io = {}) => {
     optUtils,
   ) {
     const utils = await (optUtils || makeVstorageKit({ fetch }, networkConfig));
-    const { agoricNames, readLatestHead } = utils;
+    const { agoricNames, readPublished } = utils;
 
     assert(keyringBackend, 'missing keyring-backend option');
 
     let current;
     if (sendFrom) {
-      current = await getCurrent(sendFrom, { readLatestHead });
+      current = await getCurrent(sendFrom, { readPublished });
     }
 
     const offer = toOffer(agoricNames, current);
@@ -134,9 +134,9 @@ export const makeGovCommand = (_logger, io = {}) => {
     show({ timestamp, height, offerId: offer.id, txhash });
     const checkInWallet = async blockInfo => {
       const [state, update] = await Promise.all([
-        getCurrent(sendFrom, { readLatestHead }),
-        getLastUpdate(sendFrom, { readLatestHead }),
-        readLatestHead(`published.wallet.${sendFrom}`),
+        getCurrent(sendFrom, { readPublished }),
+        getLastUpdate(sendFrom, { readPublished }),
+        readPublished(`wallet.${sendFrom}`),
       ]);
       if (update.updated === 'offerStatus' && update.status.id === offer.id) {
         return blockInfo;
@@ -265,11 +265,11 @@ export const makeGovCommand = (_logger, io = {}) => {
     )
     .requiredOption('--for <string>', 'description of the invitation')
     .action(async opts => {
-      const { agoricNames, readLatestHead } = await makeVstorageKit(
+      const { agoricNames, readPublished } = await makeVstorageKit(
         { fetch },
         networkConfig,
       );
-      const current = await getCurrent(opts.from, { readLatestHead });
+      const current = await getCurrent(opts.from, { readPublished });
 
       const known = findContinuingIds(current, agoricNames);
       if (!known) {
@@ -294,11 +294,11 @@ export const makeGovCommand = (_logger, io = {}) => {
       normalizeAddress,
     )
     .action(async opts => {
-      const { agoricNames, readLatestHead } = await makeVstorageKit(
+      const { agoricNames, readPublished } = await makeVstorageKit(
         { fetch },
         networkConfig,
       );
-      const current = await getCurrent(opts.from, { readLatestHead });
+      const current = await getCurrent(opts.from, { readPublished });
 
       const found = findContinuingIds(current, agoricNames);
       for (const it of found) {
@@ -334,19 +334,16 @@ export const makeGovCommand = (_logger, io = {}) => {
     )
     .action(async function (opts, options) {
       const utils = await makeVstorageKit({ fetch }, networkConfig);
-      const { readLatestHead } = utils;
+      const { readPublished } = utils;
 
-      const info = await readLatestHead(
-        `published.committees.${opts.pathname}.latestQuestion`,
+      const questionDesc = await readPublished(
+        `committees.${opts.pathname}.latestQuestion`,
       ).catch(err => {
         // CommanderError is a class constructor, and so
         // must be invoked with `new`.
         throw new CommanderError(1, 'VSTORAGE_FAILURE', err.message);
       });
 
-      // XXX runtime shape-check
-      const questionDesc = /** @type {QuestionDetails} */ (info);
-
       // TODO support multiple position arguments
       const chosenPositions = [questionDesc.positions[opts.forPosition]];
       assert(chosenPositions, `undefined position index ${opts.forPosition}`);

package/src/commands/inter.js

@@ -281,14 +281,12 @@ inter auction status
          * }}
          */ opts,
       ) => {
-        const { agoricNames, readLatestHead } = await tryMakeUtils();
+        const { agoricNames, readPublished } = await tryMakeUtils();
 
-        /** @type { [ScheduleNotification, BookDataNotification, *] } */
-        // @ts-expect-error dynamic cast
         const [schedule, book, { current: params }] = await Promise.all([
-          readLatestHead(`published.auction.schedule`),
-          readLatestHead(`published.auction.book${opts.book}`),
-          readLatestHead(`published.auction.governance`),
+          readPublished('auction.schedule'),
+          readPublished(`auction.book${opts.book}`),
+          readPublished('auction.governance'),
         ]);
 
         const fmt = makeFormatters(Object.values(agoricNames.vbankAsset));
@@ -493,9 +491,9 @@ inter auction status
           return;
         }
 
-        const { networkConfig, readLatestHead } = await tryMakeUtils();
+        const { networkConfig, readPublished } = await tryMakeUtils();
 
-        const current = await getCurrent(from, { readLatestHead });
+        const current = await getCurrent(from, { readPublished });
         const liveIds = current.liveOffers.map(([i, _s]) => i);
         if (!liveIds.includes(id)) {
           // InvalidArgumentError is a class constructor, and so
@@ -520,7 +518,7 @@ inter auction status
         show({ timestamp, height, offerId: id, txhash });
 
         const checkGone = async blockInfo => {
-          const pollResult = await getCurrent(from, { readLatestHead });
+          const pollResult = await getCurrent(from, { readPublished });
           const found = pollResult.liveOffers.find(([i, _]) => i === id);
           if (found) throw Error('retry');
           return blockInfo;
@@ -562,11 +560,11 @@ $ inter bid list --from my-acct
        * }} opts
        */
       async opts => {
-        const { agoricNames, readLatestHead, storedWalletState } =
+        const { agoricNames, readPublished, storedWalletState } =
           await tryMakeUtils();
 
         const [current, state] = await Promise.all([
-          getCurrent(opts.from, { readLatestHead }),
+          getCurrent(opts.from, { readPublished }),
           storedWalletState(opts.from),
         ]);
         const entries = opts.all

package/src/commands/oracle.js

@@ -175,8 +175,8 @@ export const makeOracleCommand = (logger, io = {}) => {
       console.warn(sendHint);
     });
 
-  const findOracleCap = async (instance, from, readLatestHead) => {
-    const current = await getCurrent(from, { readLatestHead });
+  const findOracleCap = async (instance, from, readPublished) => {
+    const current = await getCurrent(from, { readPublished });
 
     const { offerToUsedInvitation: entries } = /** @type {any} */ (current);
     Array.isArray(entries) || Fail`entries must be an array: ${entries}`;

package/src/commands/vaults.js

@@ -39,13 +39,10 @@ export const makeVaultsCommand = logger => {
       normalizeAddress,
     )
     .action(async function (opts) {
-      const { readLatestHead } = await makeVstorageKit(
-        { fetch },
-        networkConfig,
-      );
+      const { readPublished } = await makeVstorageKit({ fetch }, networkConfig);
 
       const current = await getCurrent(opts.from, {
-        readLatestHead,
+        readPublished,
       });
 
       const vaultStoragePaths = current.offerToPublicSubscriberPaths.map(
@@ -102,14 +99,14 @@ export const makeVaultsCommand = logger => {
     .requiredOption('--vaultId <string>', 'Key of vault (e.g. vault1)')
     .action(async function (opts) {
       logger.warn('running with options', opts);
-      const { agoricNames, readLatestHead } = await makeVstorageKit(
+      const { agoricNames, readPublished } = await makeVstorageKit(
         { fetch },
         networkConfig,
       );
 
       const previousOfferId = await lookupOfferIdForVault(
         opts.vaultId,
-        getCurrent(opts.from, { readLatestHead }),
+        getCurrent(opts.from, { readPublished }),
       );
 
       const offer = Offers.vaults.AdjustBalances(
@@ -146,14 +143,14 @@ export const makeVaultsCommand = logger => {
     )
     .action(async function (opts) {
       logger.warn('running with options', opts);
-      const { agoricNames, readLatestHead } = await makeVstorageKit(
+      const { agoricNames, readPublished } = await makeVstorageKit(
         { fetch },
         networkConfig,
       );
 
       const previousOfferId = await lookupOfferIdForVault(
         opts.vaultId,
-        getCurrent(opts.from, { readLatestHead }),
+        getCurrent(opts.from, { readPublished }),
       );
 
       const offer = Offers.vaults.CloseVault(

package/src/commands/wallet.js

@@ -172,7 +172,7 @@ export const makeWalletCommand = async command => {
       normalizeAddress,
     )
     .action(async function (opts) {
-      const { agoricNames, unserializer, readLatestHead } =
+      const { agoricNames, unserializer, readPublished } =
         await makeVstorageKit(
           {
             fetch,
@@ -191,7 +191,7 @@ export const makeWalletCommand = async command => {
 
       const coalesced = await coalesceWalletState(follower);
 
-      const current = await getCurrent(opts.from, { readLatestHead });
+      const current = await getCurrent(opts.from, { readPublished });
 
       console.warn(
         'got coalesced',

package/src/lib/wallet.js

@@ -10,7 +10,7 @@ import { execSwingsetTransaction, pollTx } from './chain.js';
 /**
  * @import {CurrentWalletRecord} from '@agoric/smart-wallet/src/smartWallet.js';
  * @import {AgoricNamesRemotes} from '@agoric/vats/tools/board-utils.js';
- * @import {MinimalNetworkConfig, WalletUtils} from '@agoric/client-utils';
+ * @import {MinimalNetworkConfig, VstorageKit} from '@agoric/client-utils';
  */
 
 const marshaller = boardSlottingMarshaller();
@@ -25,15 +25,15 @@ const emptyCurrentRecord = {
 
 /**
  * @param {string} addr
- * @param {Pick<WalletUtils, 'readLatestHead'>} io
+ * @param {Pick<VstorageKit, 'readPublished'>} io
  * @returns {Promise<import('@agoric/smart-wallet/src/smartWallet.js').CurrentWalletRecord>}
  */
-export const getCurrent = async (addr, { readLatestHead }) => {
+export const getCurrent = async (addr, { readPublished }) => {
   // Partial because older writes may not have had all properties
   // NB: assumes changes are only additions
   let current =
     /** @type {Partial<import('@agoric/smart-wallet/src/smartWallet.js').CurrentWalletRecord> | undefined} */ (
-      await readLatestHead(`published.wallet.${addr}.current`)
+      await readPublished(`wallet.${addr}.current`)
     );
   if (current === undefined) {
     throw Error(`undefined current node for ${addr}`);
@@ -60,12 +60,11 @@ export const getCurrent = async (addr, { readLatestHead }) => {
 
 /**
  * @param {string} addr
- * @param {Pick<WalletUtils, 'readLatestHead'>} io
+ * @param {Pick<VstorageKit, 'readPublished'>} io
  * @returns {Promise<import('@agoric/smart-wallet/src/smartWallet.js').UpdateRecord>}
  */
-export const getLastUpdate = (addr, { readLatestHead }) => {
-  // @ts-expect-error cast
-  return readLatestHead(`published.wallet.${addr}`);
+export const getLastUpdate = (addr, { readPublished }) => {
+  return readPublished(`wallet.${addr}`);
 };
 
 /**