Query bank balances

src/components/SmartWalletConnection.tsx

@@ -172,6 +172,7 @@ const SmartWalletConnection = ({
  makeFollower(`:published.${path}`, leader, {
  unserializer: context.fromMyWallet,
  });
+
  const bridge = makeWalletBridgeFromFollowers(
  {
  chainId: keplrConnection.chainId,
@@ -184,6 +185,8 @@ const SmartWalletConnection = ({
  makeFollower(`:beansOwing.${publicAddress}`, leader, {
  unserializer: { unserialize: data => data },
  }),
+ followPublished('agoricNames.vbankAsset'),
+ followPublished('agoricNames.brand'),
  keplrConnection,
  // @ts-expect-error xxx
  backendError,

src/service/Offers.ts

@@ -5,7 +5,6 @@ import {
  makeAsyncIterableFromNotifier,
 } from '@agoric/notifier';
 import { E } from '@endo/eventual-send';
-
 import {
  loadOffers as load,
  removeOffer as remove,
@@ -17,11 +16,10 @@ import {
 
 import type { SmartWalletKey } from '../store/Dapps';
 import type { OfferSpec, OfferStatus } from '@agoric/smart-wallet/src/offers';
-import { Marshal } from '@endo/marshal';
-
+import type { Marshal } from '@endo/marshal';
 import type { Notifier } from '@agoric/notifier/src/types';
-import { Petname } from '@agoric/smart-wallet/src/types';
-import { Brand } from '@agoric/ertp/src/types';
+import type { Petname } from '@agoric/smart-wallet/src/types';
+import type { Brand } from '@agoric/ertp/src/types';
 
 export const getOfferService = (
  smartWalletKey: SmartWalletKey,
@@ -41,33 +39,43 @@ export const getOfferService = (
  id,
  instanceHandle,
  publicInvitationMaker,
- proposalTemplate: { give, want },
+ proposalTemplate: { give: giveTemplate, want: wantTemplate },
  } = offer;
 
- const mapPursePetnamesToBrands = paymentProposals =>
- Object.fromEntries(
+ const convertProposals = async paymentProposals => {
+ const entries = await Promise.all(
  Object.entries(paymentProposals).map(
  // @ts-expect-error
- ([kw, { pursePetname, value }]) => {
- const brand = pursePetnameToBrand.get(pursePetname);
- if (!brand) {
+ async ([kw, { pursePetname, value, amount: serializedAmount }]) => {
+ /// XXX test e2e with dapp inter once feasible.
+ const amount = serializedAmount
+ ? await E(boardIdMarshaller).unserialize(serializedAmount)
+ : { brand: pursePetnameToBrand.get(pursePetname), value };
+
+ if (!(amount.brand && amount.value)) {
  return [];
  }
- return [
- kw,
- {
- brand,
- value: BigInt(value),
- },
- ];
+ return [kw, amount];
  },
  ),
  );
+ return Object.fromEntries(entries);
+ };
 
- const instance = await E(boardIdMarshaller).unserialize(instanceHandle);
- const {
- slots: [instanceBoardId],
- } = await E(boardIdMarshaller).serialize(instance);
+ const deconstructInstance = async () => {
+ const instance = await E(boardIdMarshaller).unserialize(instanceHandle);
+ const {
+ slots: [instanceBoardId],
+ } = await E(boardIdMarshaller).serialize(instance);
+
+ return { instance, instanceBoardId };
+ };
+
+ const [{ instance, instanceBoardId }, give, want] = await Promise.all([
+ deconstructInstance(),
+ convertProposals(giveTemplate),
+ convertProposals(wantTemplate),
+ ]);
 
  const offerForAction: OfferSpec = {
  id,
@@ -77,8 +85,8 @@ export const getOfferService = (
  publicInvitationMaker,
  },
  proposal: {
- give: mapPursePetnamesToBrands(give),
- want: mapPursePetnamesToBrands(want),
+ give,
+ want,
  },
  };
 

src/util/WalletBackendAdapter.ts

@@ -5,6 +5,7 @@ import { objectMap } from '@agoric/internal';
 import {
  makeAsyncIterableFromNotifier,
  makeNotifierKit,
+ observeNotifier,
 } from '@agoric/notifier';
 import {
  assertHasData,
@@ -29,8 +30,11 @@ import { KeplrUtils } from '../contexts/Provider.jsx';
 import type { PurseInfo } from '@agoric/web-components/src/keplr-connection/fetchCurrent';
 import { HttpEndpoint } from '@cosmjs/tendermint-rpc';
 import type { ValueFollowerElement } from '@agoric/casting/src/types';
+import { queryBankBalances } from './queryBankBalances';
+import type { Coin } from '@cosmjs/stargate';
 
 const newId = kind => `${kind}${Math.random()}`;
+const POLL_INTERVAL_MS = 6000;
 
 export type BackendSchema = {
  actions: object;
@@ -108,6 +112,7 @@ export const makeBackendFromWalletBridge = (
 
  const cancel = e => {
  backendUpdater.fail(e);
+ walletBridge.cleanup();
  };
 
  return { backendIt, cancel };
@@ -120,13 +125,20 @@ export const makeWalletBridgeFromFollowers = (
  currentFollower: ValueFollower<CurrentWalletRecord>,
  updateFollower: ValueFollower<UpdateRecord>,
  beansOwingFollower: ValueFollower<string>,
+ vbankAssetsFollower: ValueFollower<unknown>,
+ agoricBrandsFollower: ValueFollower<unknown>,
  keplrConnection: KeplrUtils,
  errorHandler = e => {
  // Make an unhandled rejection.
  throw e;
  },
  firstCallback: () => void | undefined = () => {},
 ) => {
+ let isHalted = false;
+ let isBankLoaded = false;
+ let isSmartWalletLoaded = false;
+ let isOfferServiceStarted = false;
+
  const notifiers = {
  getPursesNotifier: 'purses',
  getContactsNotifier: 'contacts',
@@ -142,14 +154,12 @@ export const makeWalletBridgeFromFollowers = (
  ]),
  );
 
- const { notifier: beansOwingNotifier, updater: beansOwingUpdater } =
- makeNotifierKit<Number | null>(null);
-
  // We assume just one cosmos purse per brand.
  const brandToPurse = new Map<Brand, PurseInfo>();
  const pursePetnameToBrand = new Map<Petname, Brand>();
 
  const updatePurses = () => {
+ console.debug('brandToPurse map', brandToPurse);
  const purses = [] as PurseInfo[];
  for (const [brand, purse] of brandToPurse.entries()) {
  if (purse.currentAmount && purse.brandPetname) {
@@ -159,6 +169,13 @@ export const makeWalletBridgeFromFollowers = (
  }
  }
  notifierKits.purses.updater.updateState(harden(purses));
+
+ // Make sure the offer service has all purses from both bank and smart
+ // wallet chainstorage.
+ if (!isOfferServiceStarted && isBankLoaded && isSmartWalletLoaded) {
+ isOfferServiceStarted = true;
+ offerService.start(pursePetnameToBrand);
+ }
  };
 
  const signSpendAction = async (data: string) => {
@@ -188,15 +205,79 @@ export const makeWalletBridgeFromFollowers = (
  marshaller,
  );
 
+ const { notifier: beansOwingNotifier, updater: beansOwingUpdater } =
+ makeNotifierKit<Number | null>(null);
+
  const watchBeansOwing = async () => {
  for await (const { value } of iterateLatest(beansOwingFollower)) {
+ if (isHalted) return;
  beansOwingUpdater.updateState(Number(value));
  }
  };
 
+ // Reads purses from the cosmos bank module. These are not necessarily real
+ // "purses" in the smart wallet contract, because those are lazily
+ // instantiated, but we still need to show the balances.
+ const watchChainBalances = () => {
+ let vbankAssets;
+ let bank;
+
+ const possiblyUpdateBankPurses = () => {
+ if (!vbankAssets || !bank) return;
+
+ const bankMap = new Map<string, string>(
+ bank.map(({ denom, amount }) => [denom, amount]),
+ );
+
+ vbankAssets.forEach(([denom, info]) => {
+ const amount = bankMap.get(denom) ?? 0n;
+ const purseInfo: PurseInfo = {
+ brand: info.brand,
+ currentAmount: AmountMath.make(info.brand, BigInt(amount)),
+ brandPetname: info.issuerName,
+ pursePetname: info.issuerName,
+ displayInfo: info.displayInfo,
+ };
+ brandToPurse.set(info.brand, purseInfo);
+ });
+
+ isBankLoaded = true;
+ updatePurses();
+ };
+
+ const watchBank = async () => {
+ if (isHalted) return;
+ const balances = await queryBankBalances(keplrConnection.address, rpc);
+ bank = balances;
+ possiblyUpdateBankPurses();
+ setTimeout(watchBank, POLL_INTERVAL_MS);
+ };
+
+ const watchVbankAssets = async () => {
+ for await (const { value } of iterateLatest(vbankAssetsFollower)) {
+ if (isHalted) return;
+ vbankAssets = value;
+ possiblyUpdateBankPurses();
+ }
+ };
+
+ void watchVbankAssets();
+ void watchBank();
+ };
+
+ const fetchAgoricBrands = async () => {
+ for await (const { value } of iterateLatest(agoricBrandsFollower)) {
+ if (value) {
+ return new Map(value.map(([k, v]) => [v, k]));
+ }
+ }
+ };
+
  const fetchCurrent = async () => {
  await assertHasData(currentFollower);
  void watchBeansOwing();
+ watchChainBalances();
+
  const latestIterable = await E(currentFollower).getLatestIterable();
  const iterator = latestIterable[Symbol.asyncIterator]();
  const latest = await iterator.next();
@@ -210,13 +291,29 @@ export const makeWalletBridgeFromFollowers = (
  }
  const currentEl: ValueFollowerElement<CurrentWalletRecord> = latest.value;
  const wallet = currentEl.value;
- console.log('wallet current', wallet);
+ console.debug('wallet current', wallet);
+
+ const agoricBrands = await fetchAgoricBrands();
+ assert(agoricBrands, 'Failed to fetch agoric brands');
+
  for (const purse of wallet.purses) {
- console.debug('registering purse', purse);
- const brandDescriptor = wallet.brands.find(
- bd => purse.brand === bd.brand,
- );
- assert(brandDescriptor, `missing descriptor for brand ${purse.brand}`);
+ // We only care about the zoe invite purse, which has asset kind 'set'.
+ // Non 'set' amounts need to be fetched from vbank to know their
+ // decimalPlaces.
+ //
+ // If we have add non 'set' amount purses that aren't in the vbank, it's
+ // not currently possible to read their decimalPlaces, so this code
+ // will need updating.
+ if (
+ !Array.isArray(purse.balance.value) ||
+ !agoricBrands.has(purse.brand)
+ ) {
+ continue;
+ }
+ const brandDescriptor = {
+ petname: agoricBrands.get(purse.brand),
+ displayInfo: { assetKind: 'set' },
+ };
  const purseInfo: PurseInfo = {
  brand: purse.brand,
  currentAmount: purse.balance,
@@ -226,9 +323,8 @@ export const makeWalletBridgeFromFollowers = (
  };
  brandToPurse.set(purse.brand, purseInfo);
  }
- console.debug('brandToPurse map', brandToPurse);
+ isSmartWalletLoaded = true;
  updatePurses();
- offerService.start(pursePetnameToBrand);
  return currentEl.blockHeight;
  };
 
@@ -340,6 +436,7 @@ export const makeWalletBridgeFromFollowers = (
  makeEmptyPurse,
  addContact,
  addIssuer,
+ cleanup: () => (isHalted = true),
  });
 
  return walletBridge;

src/util/queryBankBalances.ts

@@ -0,0 +1,21 @@
+import { QueryClient, createProtobufRpcClient } from '@cosmjs/stargate';
+import { Tendermint34Client } from '@cosmjs/tendermint-rpc';
+import { QueryClientImpl } from 'cosmjs-types/cosmos/bank/v1beta1/query';
+import type { Coin } from '@cosmjs/stargate';
+import type { HttpEndpoint } from '@cosmjs/tendermint-rpc';
+
+export const queryBankBalances = async (
+ address: string,
+ rpc: HttpEndpoint,
+): Promise<Coin[]> => {
+ const tendermint = await Tendermint34Client.connect(rpc);
+ const queryClient = new QueryClient(tendermint);
+ const rpcClient = createProtobufRpcClient(queryClient);
+ const bankQueryService = new QueryClientImpl(rpcClient);
+
+ const { balances } = await bankQueryService.AllBalances({
+ address,
+ });
+
+ return balances;
+};

yarn.lock

@@ -12164,7 +12164,7 @@ rollup@^2.43.1:
  optionalDependencies:
  fsevents "~2.3.2"
 
-rollup@endojs/endo#rollup-2.7.1-patch-1, "rollup@github:endojs/endo#rollup-2.7.1-patch-1":
+rollup@endojs/endo#rollup-2.7.1-patch-1:
  version "2.70.1-endo.1"
  resolved "https://codeload.github.com/endojs/endo/tar.gz/54060e784a4dbe77b6692f17344f4d84a198530d"
  optionalDependencies: