Merge branch 'main' into rs-inter-dapp-test-cases

patches/vitest+0.32.2.patch → patches/vitest+0.32.0.patch

@@ -1,3 +1,4 @@
+# UNTIL https://github.com/vitest-dev/vitest/pull/3527
 diff --git a/node_modules/vitest/dist/vendor-rpc.4d3d7a54.js b/node_modules/vitest/dist/vendor-rpc.4d3d7a54.js
 index c98baeb..e365e91 100644
 --- a/node_modules/vitest/dist/vendor-rpc.4d3d7a54.js

src/components/ProvisionSmartWalletNoticeDialog.tsx

@@ -1,7 +1,7 @@
-import { agoric } from '@agoric/cosmic-proto';
 import { useAtomValue } from 'jotai';
 import { useEffect, useState } from 'react';
 import { rpcNodeAtom } from 'store/app';
+import { querySwingsetParams } from 'utils/swingsetParams';
 import ActionsDialog from './ActionsDialog';
 
 const useSmartWalletFeeQuery = (rpc: string | null) => {
@@ -12,19 +12,14 @@ const useSmartWalletFeeQuery = (rpc: string | null) => {
     const fetchParams = async () => {
       assert(rpc);
       try {
-        const client = await agoric.ClientFactory.createRPCQueryClient({
-          rpcEndpoint: rpc,
-        });
-        const params = await client.agoric.swingset.params();
+        const params = await querySwingsetParams(rpc);
         console.debug('swingset params', params);
         const beansPerSmartWallet = params.params.beansPerUnit.find(
           ({ key }: { key: string }) => key === 'smartWalletProvision',
         )?.beans;
-        assert(beansPerSmartWallet);
         const feeUnit = params.params.beansPerUnit.find(
           ({ key }: { key: string }) => key === 'feeUnit',
         )?.beans;
-        assert(feeUnit);
         setFee(BigInt(beansPerSmartWallet) / BigInt(feeUnit));
       } catch (e) {
         setError(e as Error);

src/store/app.ts

@@ -7,7 +7,7 @@ import {
 import { atom } from 'jotai';
 import { atomWithStorage } from 'jotai/utils';
 import { atomWithStore } from 'jotai-zustand';
-import { createStore } from 'zustand/vanilla';
+import createStore from 'zustand/vanilla';
 import { persist } from 'zustand/middleware';
 import { makeDisplayFunctions } from 'utils/displayFunctions';
 import { makeWalletService } from 'service/wallet';

src/store/vaults.ts

@@ -1,5 +1,5 @@
-import { createStore } from 'zustand/vanilla';
-import { create } from 'zustand';
+import createStore from 'zustand/vanilla';
+import create from 'zustand';
 import type { Brand, Amount } from '@agoric/ertp/src/types';
 import { atom } from 'jotai';
 import { getPriceDescription } from '@agoric/zoe/src/contractSupport';

src/utils/swingsetParams.ts

@@ -0,0 +1,21 @@
+import { QueryClient, createProtobufRpcClient } from '@cosmjs/stargate';
+import {
+  QueryClientImpl,
+  QueryParamsResponse,
+} from '@agoric/cosmic-proto/swingset/query.js';
+import { HttpClient, Tendermint34Client } from '@cosmjs/tendermint-rpc';
+
+/**
+ * Query swingset params.
+ */
+export const querySwingsetParams = async (
+  endpoint: string,
+): Promise<typeof QueryParamsResponse> => {
+  const http = new HttpClient(endpoint);
+  const trpc = await Tendermint34Client.create(http);
+  const base = QueryClient.withExtensions(trpc);
+  const rpc = createProtobufRpcClient(base);
+  const queryService = new QueryClientImpl(rpc);
+
+  return queryService.Params({});
+};

src/vite-env.d.ts

@@ -45,3 +45,8 @@ declare module '@agoric/inter-protocol/src/vaultFactory/math' {
 declare module 'react-view-slider' {
   export const ViewSlider;
 }
+
+declare module '@agoric/cosmic-proto/swingset/query.js' {
+  export const QueryClientImpl;
+  export const QueryParamsResponse;
+}

vitest.config.ts

@@ -1,12 +1,13 @@
 import { mergeConfig } from 'vite';
-import { defineConfig } from 'vitest/config';
+import { defineConfig, configDefaults } from 'vitest/config';
 import viteConfig from './vite.config';
 
 export default mergeConfig(
   viteConfig,
   defineConfig({
     test: {
       environment: 'happy-dom',
+      exclude: [...configDefaults.exclude, 'tests/e2e/**'],
     },
   }),
 );