Merge pull request #7147 from Agoric/ta/BoardRemote

board remote as remotable

packages/agoric-cli/src/commands/ec.js

@@ -32,7 +32,6 @@ export const makeEconomicCommiteeCommand = async _logger => {
         id: opts.offerId,
         invitationSpec: {
           source: 'purse',
-          // @ts-expect-error xxx RpcRemote
           instance: economicCommittee,
           description: 'Voter0', // XXX it may not always be
         },
@@ -56,7 +55,6 @@ export const makeEconomicCommiteeCommand = async _logger => {
         id: opts.offerId,
         invitationSpec: {
           source: 'purse',
-          // @ts-expect-error xxx RpcRemote
           instance: econCommitteeCharter,
           description: 'charter member invitation',
         },

packages/agoric-cli/src/commands/oracle.js

@@ -66,7 +66,6 @@ export const makeOracleCommand = async logger => {
         id: Number(opts.offerId),
         invitationSpec: {
           source: 'purse',
-          // @ts-expect-error xxx RpcRemote
           instance,
           description: 'oracle invitation',
         },

packages/agoric-cli/src/commands/psm.js

@@ -150,10 +150,11 @@ export const makePsmCommand = async logger => {
     .action(async function (opts) {
       console.warn('running with options', opts);
       const instance = await lookupPsmInstance(opts.pair);
-      // @ts-expect-error xxx RpcRemote
       const offer = Offers.psm.swap(instance, agoricNames.brand, {
         offerId: opts.offerId,
         feePct: opts.feePct,
+        giveMinted: opts.giveMinted,
+        wantMinted: opts.wantMinted,
       });
       outputExecuteOfferAction(offer);
     });

packages/agoric-cli/src/commands/wallet.js

@@ -155,9 +155,20 @@ export const makeWalletCommand = async () => {
       } catch (e) {
         console.error('CAUGHT HERE', e);
       }
-      execFileSync('agd', [`query`, 'bank', 'balances', opts.from], {
-        stdio: 'inherit',
-      });
+      execFileSync(
+        'agd',
+        [
+          'query',
+          '--node',
+          networkConfig.rpcAddrs[0],
+          'bank',
+          'balances',
+          opts.from,
+        ],
+        {
+          stdio: 'inherit',
+        },
+      );
     });
 
   wallet

packages/agoric-cli/src/lib/format.js

@@ -1,5 +1,5 @@
 // @ts-check
-/* eslint-disable @typescript-eslint/prefer-ts-expect-error -- https://github.com/Agoric/agoric-sdk/issues/4620 */
+import { makeBoardRemote } from '@agoric/vats/tools/board-utils.js';
 // eslint-disable-next-line no-unused-vars -- typeof below
 import { makeAgoricNames } from './rpc.js';
 
@@ -20,39 +20,40 @@ export const Natural = str => {
   return b;
 };
 
+/** @type {import('@agoric/vats/tools/board-utils.js').VBankAssetDetail} */
 // eslint-disable-next-line no-unused-vars
 const exampleAsset = {
-  brand: { boardId: 'board0425', iface: 'Alleged: BLD brand' },
+  // @ts-expect-error cast
+  brand: makeBoardRemote({ boardId: 'board0425', iface: 'Alleged: BLD brand' }),
   displayInfo: { assetKind: 'nat', decimalPlaces: 6 },
-  issuer: { boardId: null, iface: undefined },
+  // @ts-expect-error cast
+  issuer: makeBoardRemote({ boardId: null, iface: undefined }),
   petname: 'Agoric staking token',
 };
-/** @typedef {import('@agoric/smart-wallet/src/smartWallet').BrandDescriptor & {brand: import('./rpc').RpcRemote}} AssetDescriptor */
+/** @typedef {import('@agoric/vats/tools/board-utils.js').VBankAssetDetail & { brand: import('@agoric/vats/tools/board-utils.js').BoardRemote }} AssetDescriptor */
 
 /** @param {AssetDescriptor[]} assets */
 export const makeAmountFormatter = assets => amt => {
   const {
     brand: { boardId },
     value,
   } = amt;
-  const asset = assets.find(a => a.brand.boardId === boardId);
+  const asset = assets.find(a => a.brand.getBoardId() === boardId);
   if (!asset) return [NaN, boardId];
   const {
-    petname,
     displayInfo: { assetKind, decimalPlaces = 0 },
+    issuerName,
   } = asset;
-  const name = Array.isArray(petname) ? petname.join('.') : petname;
   switch (assetKind) {
     case 'nat':
-      /** @type {[petname: string, qty: number]} */
-      return [name, Number(value) / 10 ** decimalPlaces];
+      return [issuerName, Number(value) / 10 ** decimalPlaces];
     case 'set':
       if (value[0]?.handle?.iface?.includes('InvitationHandle')) {
-        return [name, value.map(v => v.description)];
+        return [issuerName, value.map(v => v.description)];
       }
-      return [name, value];
+      return [issuerName, value];
     default:
-      return [name, ['?']];
+      return [issuerName, ['?']];
   }
 };
 
@@ -97,11 +98,7 @@ export const fmtRecordOfLines = record => {
  */
 export const offerStatusTuples = (state, agoricNames) => {
   const { offerStatuses } = state;
-  const fmt = makeAmountFormatter(
-    // eslint-disable-next-line @typescript-eslint/prefer-ts-expect-error -- https://github.com/Agoric/agoric-sdk/issues/4620 */
-    // @ts-ignore xxx RpcRemote
-    Object.values(agoricNames.vbankAsset),
-  );
+  const fmt = makeAmountFormatter(Object.values(agoricNames.vbankAsset));
   const fmtRecord = r =>
     r
       ? Object.fromEntries(
@@ -132,7 +129,6 @@ export const offerStatusTuples = (state, agoricNames) => {
         } = o;
         // xxx could be O(1)
         const entry = Object.entries(agoricNames.instance).find(
-          // @ts-ignore minimarshal types are off by a bit
           ([_name, candidate]) => candidate === instance,
         );
         const instanceName = entry ? entry[0] : '???';
@@ -161,11 +157,7 @@ export const summarize = (current, coalesced, agoricNames) => {
   return {
     lastOfferId: [current.lastOfferId],
     purses: purseBalanceTuples(
-      // eslint-disable-next-line @typescript-eslint/prefer-ts-expect-error -- https://github.com/Agoric/agoric-sdk/issues/4620 */
-      // @ts-ignore xxx RpcRemote
       [...current.purses.values()],
-      // eslint-disable-next-line @typescript-eslint/prefer-ts-expect-error -- https://github.com/Agoric/agoric-sdk/issues/4620 */
-      // @ts-ignore xxx RpcRemote
       Object.values(agoricNames.vbankAsset),
     ),
     usedInvitations: Object.entries(current.offerToUsedInvitation).map(

packages/agoric-cli/src/lib/rpc.js

@@ -3,14 +3,13 @@
 /* global Buffer, fetch, process */
 
 import { NonNullish } from '@agoric/assert';
-import { boardSlottingMarshaller } from '@agoric/vats/tools/board-utils.js';
+import {
+  boardSlottingMarshaller,
+  makeBoardRemote,
+} from '@agoric/vats/tools/board-utils.js';
 
 export { boardSlottingMarshaller };
 
-/**
- * @typedef {{boardId: string, iface: string}} RpcRemote
- */
-
 export const networkConfigUrl = agoricNetSubdomain =>
   `https://${agoricNetSubdomain}.agoric.net/network-config`;
 export const rpcUrl = agoricNetSubdomain =>
@@ -125,14 +124,14 @@ export const makeVStorage = powers => {
 };
 /** @typedef {ReturnType<typeof makeVStorage>} VStorage */
 
-export const makeFromBoard = (slotKey = 'boardId') => {
+export const makeFromBoard = () => {
   const cache = new Map();
-  const convertSlotToVal = (slot, iface) => {
-    if (cache.has(slot)) {
-      return cache.get(slot);
+  const convertSlotToVal = (boardId, iface) => {
+    if (cache.has(boardId)) {
+      return cache.get(boardId);
     }
-    const val = harden({ [slotKey]: slot, iface });
-    cache.set(slot, val);
+    const val = makeBoardRemote({ boardId, iface });
+    cache.set(boardId, val);
     return val;
   };
   return harden({ convertSlotToVal });
@@ -189,9 +188,12 @@ export const makeAgoricNames = async (ctx, vstorage) => {
       const content = await vstorage.readLatest(
         `published.agoricNames.${kind}`,
       );
+      /** @type {Array<[string, import('@agoric/vats/tools/board-utils.js').BoardRemote]>} */
       const parts = storageHelper.unserializeTxt(content, ctx).at(-1);
       for (const [name, remote] of parts) {
-        reverse[remote.boardId] = name;
+        if ('getBoardId' in remote) {
+          reverse[remote.getBoardId()] = name;
+        }
       }
       return [kind, Object.fromEntries(parts)];
     }),

packages/inter-protocol/src/clientSupport.js

@@ -11,7 +11,7 @@ const COSMOS_UNIT = 1_000_000n;
 /**
  * Give/want
  *
- * @param {Record<string, import('@agoric/vats/tools/board-utils').BoardRemote>} brands
+ * @param {Record<string, Brand>} brands
  * @param {{ giveMinted?: number, wantMinted?: number } | { collateralBrandKey: string, giveCollateral?: number, wantCollateral?: number }} opts
  * @returns {Proposal}
  */
@@ -54,7 +54,7 @@ const makeVaultProposal = (brands, opts) => {
 // Then these can be used in tests as arguments to `executeOffer()` without a bridge.
 
 /**
- * @param {Record<string, import('@agoric/vats/tools/board-utils').BoardRemote>} brands
+ * @param {Record<string, Brand>} brands
  * @param {{ offerId: string, wantMinted: number, giveCollateral: number, collateralBrandKey: string }} opts
  * @returns {import('@agoric/smart-wallet/src/offers.js').OfferSpec}
  */
@@ -85,7 +85,7 @@ const makeOpenOffer = (brands, opts) => {
 };
 
 /**
- * @param {Record<string, import('@agoric/vats/tools/board-utils').BoardRemote>} brands
+ * @param {Record<string, Brand>} brands
  * @param {{ offerId: string, collateralBrandKey?: string, giveCollateral?: number, wantCollateral?: number, giveMinted?: number, wantMinted?: number }} opts
  * @param {string} previousOffer
  * @returns {import('@agoric/smart-wallet/src/offers.js').OfferSpec}
@@ -108,7 +108,7 @@ const makeAdjustOffer = (brands, opts, previousOffer) => {
 };
 
 /**
- * @param {Record<string, import('@agoric/vats/tools/board-utils').BoardRemote>} brands
+ * @param {Record<string, Brand>} brands
  * @param {{ offerId: string, collateralBrandKey?: string, giveMinted: number }} opts
  * @param {string} previousOffer
  * @returns {import('@agoric/smart-wallet/src/offers.js').OfferSpec}
@@ -147,7 +147,7 @@ export const lookupOfferIdForVault = async (vaultId, currentP) => {
 };
 
 /**
- * @param {Record<string, import('@agoric/vats/tools/board-utils').BoardRemote>} brands
+ * @param {Record<string, Brand>} brands
  * @param {({ wantMinted: number | undefined, giveMinted: number | undefined })} opts
  * @param {number} [fee=0]
  * @param {string} [anchor]
@@ -168,19 +168,17 @@ const makePsmProposal = (brands, opts, fee = 0, anchor = 'AUSD') => {
   };
   return {
     give: {
-      // @ts-expect-error XXX BoardRemote not real remote
       In: { brand: brand.in, value: adjusted.in },
     },
     want: {
-      // @ts-expect-error XXX BoardRemote not real remote
       Out: { brand: brand.out, value: adjusted.out },
     },
   };
 };
 
 /**
  * @param {Instance} instance
- * @param {Record<string, import('@agoric/vats/tools/board-utils').BoardRemote>} brands
+ * @param {Record<string, Brand>} brands
  * @param {{ offerId: number, feePct?: number } &
  *         ({ wantMinted: number | undefined, giveMinted: number | undefined })} opts
  * @returns {import('@agoric/smart-wallet/src/offers.js').OfferSpec}

packages/smart-wallet/src/utils.js

@@ -15,7 +15,7 @@ export const makeWalletStateCoalescer = (invitationBrand = undefined) => {
   /**
    * keyed by description; xxx assumes unique
    *
-   * @type {Map<import('./offers').OfferId, { acceptedIn: import('./offers').OfferId, description: string, instance: { boardId: string } }>}
+   * @type {Map<import('./offers').OfferId, { acceptedIn: import('./offers').OfferId, description: string, instance: Instance }>}
    */
   const invitationsReceived = new Map();
 

packages/vats/test/bootstrapTests/supports.js

@@ -150,7 +150,7 @@ export const makeWalletFactoryDriver = async (
       return EV(walletPresence).handleBridgeAction(offerCapData, true);
     },
     /**
-     * @template {(brands: Record<string, import('../../tools/board-utils.js').BoardRemote>, ...rest: any) => import('@agoric/smart-wallet/src/offers.js').OfferSpec} M offer maker function
+     * @template {(brands: Record<string, Brand>, ...rest: any) => import('@agoric/smart-wallet/src/offers.js').OfferSpec} M offer maker function
      * @param {M} makeOffer
      * @param {Parameters<M>[1]} firstArg
      * @param {Parameters<M>[2]} [secondArg]