[dapp-kit] Add ability to configure networks to SuiClientProvider

sdk/dapp-kit/package.json

@@ -59,9 +59,14 @@
 		"@mysten/build-scripts": "workspace:*",
 		"@size-limit/preset-small-lib": "^8.2.6",
 		"@tanstack/react-query": "^4.29.25",
+		"@testing-library/dom": "^9.3.1",
+		"@testing-library/jest-dom": "^5.17.0",
 		"@testing-library/react": "^14.0.0",
+		"@testing-library/user-event": "^14.4.3",
 		"@types/react": "^18.2.15",
+		"@types/testing-library__jest-dom": "^5.14.9",
 		"happy-dom": "^10.5.1",
+		"jsdom": "^22.1.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"size-limit": "^8.2.6",

sdk/dapp-kit/src/components/SuiClientProvider.tsx

@@ -1,30 +1,70 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-import { SuiClient, getFullnodeUrl } from '@mysten/sui.js/client';
-import { SuiClientContext } from '../hooks/useSuiClient.js';
-import { useMemo } from 'react';
+import { SuiClient, getFullnodeUrl, isSuiClient } from '@mysten/sui.js/client';
+import type { SuiClientOptions } from '@mysten/sui.js/client';
+import { createContext, useMemo, useState } from 'react';
 
-export interface SuiClientProviderProps {
+type NetworkConfig = SuiClient | SuiClientOptions;
+type NetworkConfigs<T extends NetworkConfig = NetworkConfig> = Record<string, T>;
+
+export interface SuiClientProviderContext {
+	client: SuiClient;
+	networks: NetworkConfigs;
+	selectedNetwork: string;
+	selectNetwork: (network: string) => void;
+}
+
+export const SuiClientContext = createContext<SuiClientProviderContext | null>(null);
+
+export interface SuiClientProviderProps<T extends NetworkConfigs> {
+	networks?: T;
+	createClient?: (name: keyof T, config: T[keyof T]) => SuiClient;
+	defaultNetwork?: keyof T & string;
 	children: React.ReactNode;
-	client?: SuiClient;
-	url?: string;
-	queryKeyPrefix: string;
 }
 
-export const SuiClientProvider = (props: SuiClientProviderProps) => {
-	const ctx = useMemo(() => {
-		const client =
-			props.client ??
-			new SuiClient({
-				url: props.url ?? getFullnodeUrl('devnet'),
-			});
+const DEFAULT_NETWORKS = {
+	devnet: { url: getFullnodeUrl('devnet') },
+};
+
+const DEFAULT_CREATE_CLIENT = function createClient(
+	_name: string,
+	config: NetworkConfig | SuiClient,
+) {
+	if (isSuiClient(config)) {
+		return config;
+	}
 
+	return new SuiClient(config);
+};
+
+export function SuiClientProvider<T extends NetworkConfigs>(props: SuiClientProviderProps<T>) {
+	const networks = props.networks ?? (DEFAULT_NETWORKS as never);
+	const createClient =
+		(props.createClient as typeof DEFAULT_CREATE_CLIENT) ?? DEFAULT_CREATE_CLIENT;
+
+	const [selectedNetwork, setSelectedNetwork] = useState<keyof T & string>(
+		props.defaultNetwork ?? (Object.keys(networks)[0] as keyof T & string),
+	);
+
+	const [client, setClient] = useState<SuiClient>(() => {
+		return createClient(selectedNetwork, networks[selectedNetwork]);
+	});
+
+	const ctx = useMemo((): SuiClientProviderContext => {
 		return {
 			client,
-			queryKey: (key: unknown[]) => [props.queryKeyPrefix, ...key],
+			networks,
+			selectedNetwork,
+			selectNetwork: (network) => {
+				if (network !== selectedNetwork) {
+					setSelectedNetwork(network);
+					setClient(createClient(network, networks[network]));
+				}
+			},
 		};
-	}, [props.client, props.url, props.queryKeyPrefix]);
+	}, [client, setClient, createClient, selectedNetwork, networks]);
 
 	return <SuiClientContext.Provider value={ctx}>{props.children}</SuiClientContext.Provider>;
-};
+}

sdk/dapp-kit/src/hooks/useSuiClient.ts

@@ -1,16 +1,8 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-import type { SuiClient } from '@mysten/sui.js/client';
-import { createContext, useContext } from 'react';
-
-export const SuiClientContext = createContext<
-	| {
-			client: SuiClient;
-			queryKey: (key: unknown[]) => unknown[];
-	  }
-	| undefined
->(undefined);
+import { useContext } from 'react';
+import { SuiClientContext } from '../components/SuiClientProvider.js';
 
 export function useSuiClientContext() {
 	const suiClient = useContext(SuiClientContext);

sdk/dapp-kit/src/hooks/useSuiClientQuery.ts

@@ -52,8 +52,7 @@ export function useSuiClientQuery<T extends keyof Methods>(
 
 	return useQuery({
 		...options,
-		// eslint-disable-next-line @tanstack/query/exhaustive-deps
-		queryKey: suiContext.queryKey(queryKey ?? [method, params]),
+		queryKey: [suiContext.selectedNetwork, method, params],
 		enabled,
 		queryFn: async () => {
 			return await suiContext.client[method](params as never);

sdk/dapp-kit/test/components/SuiClientProvider.test.tsx

@@ -0,0 +1,104 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+import { render } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { screen } from '@testing-library/dom';
+import { SuiClientProvider } from '../../src/components/SuiClientProvider.js';
+import { useSuiClient, useSuiClientContext } from 'dapp-kit/src/index.js';
+import { SuiClient } from '@mysten/sui.js/client';
+import { useState } from 'react';
+
+describe('SuiClientProvider', () => {
+	it('renders without crashing', () => {
+		render(
+			<SuiClientProvider>
+				<div>Test</div>
+			</SuiClientProvider>,
+		);
+		expect(screen.getByText('Test')).toBeInTheDocument();
+	});
+
+	it('provides a SuiClient instance to its children', () => {
+		const ChildComponent = () => {
+			const client = useSuiClient();
+			expect(client).toBeInstanceOf(SuiClient);
+			return <div>Test</div>;
+		};
+
+		render(
+			<SuiClientProvider>
+				<ChildComponent />
+			</SuiClientProvider>,
+		);
+	});
+
+	it('can accept pre-configured SuiClients', () => {
+		const suiClient = new SuiClient({ url: 'http://localhost:8080' });
+		const ChildComponent = () => {
+			const client = useSuiClient();
+			expect(client).toBeInstanceOf(SuiClient);
+			expect(client).toBe(suiClient);
+			return <div>Test</div>;
+		};
+
+		render(
+			<SuiClientProvider networks={{ localnet: suiClient }}>
+				<ChildComponent />
+			</SuiClientProvider>,
+		);
+
+		expect(screen.getByText('Test')).toBeInTheDocument();
+	});
+
+	test('can create sui clients with custom options', async () => {
+		function NetworkSelector() {
+			const ctx = useSuiClientContext();
+
+			return (
+				<div>
+					{Object.keys(ctx.networks).map((network) => (
+						<button key={network} onClick={() => ctx.selectNetwork(network)}>
+							{`select ${network}`}
+						</button>
+					))}
+				</div>
+			);
+		}
+		function CustomConfigProvider() {
+			const [selectedNetwork, setSelectedNetwork] = useState<string>();
+
+			return (
+				<SuiClientProvider
+					networks={{
+						a: {
+							url: 'http://localhost:8080',
+							custom: setSelectedNetwork,
+						},
+						b: {
+							url: 'http://localhost:8080',
+							custom: setSelectedNetwork,
+						},
+					}}
+					createClient={(name, { custom, ...config }) => {
+						custom(name);
+						return new SuiClient(config);
+					}}
+				>
+					<div>{`selected network: ${selectedNetwork}`}</div>
+					<NetworkSelector />
+				</SuiClientProvider>
+			);
+		}
+
+		const user = userEvent.setup();
+
+		render(<CustomConfigProvider />);
+
+		expect(screen.getByText('selected network: a')).toBeInTheDocument();
+
+		await user.click(screen.getByText('select b'));
+
+		expect(screen.getByText('selected network: b')).toBeInTheDocument();
+	});
+});

sdk/dapp-kit/test/setup.ts

@@ -0,0 +1,3 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+import '@testing-library/jest-dom';

sdk/dapp-kit/test/test-utils.tsx

@@ -6,10 +6,6 @@ import { SuiClientProvider } from 'dapp-kit/src';
 
 export function createSuiClientContextWrapper(client: SuiClient) {
 	return function SuiClientContextWrapper({ children }: { children: React.ReactNode }) {
-		return (
-			<SuiClientProvider queryKeyPrefix="devnet" client={client}>
-				{children}
-			</SuiClientProvider>
-		);
+		return <SuiClientProvider networks={{ test: client }}>{children}</SuiClientProvider>;
 	};
 }

sdk/dapp-kit/vitest.config.ts

@@ -8,9 +8,10 @@ export default defineConfig({
 	plugins: [tsconfigPaths()],
 	test: {
 		exclude: [...configDefaults.exclude, 'tests/**'],
-		environment: 'happy-dom',
+		environment: 'jsdom',
 		restoreMocks: true,
 		globals: true,
+		setupFiles: ['./test/setup.ts'],
 	},
 	resolve: {
 		conditions: ['source'],

sdk/typescript/src/client/client.ts

@@ -115,8 +115,23 @@ export type NetworkOrTransport =
 			url?: never;
 	  };
 
+export const SUI_CLIENT_BRAND = Symbol.for('@mysten/SuiClient');
+
+export function isSuiClient(client: unknown): client is SuiClient {
+	return (
+		typeof client === 'object' &&
+		client !== null &&
+		(client as { [SUI_CLIENT_BRAND]: unknown })[SUI_CLIENT_BRAND] === true
+	);
+}
+
 export class SuiClient {
 	protected transport: SuiTransport;
+
+	get [SUI_CLIENT_BRAND]() {
+		return true;
+	}
+
 	/**
 	 * Establish a connection to a Sui RPC endpoint
 	 *