Skip to content

perf(solana): Optimize rendering times when using default connectionConfig #1246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Nov 18, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/shaggy-jokes-fold.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@ant-design/web3-solana': minor
---

perf(solana): Optimize rendering times when using default connectionConfig
61 changes: 52 additions & 9 deletions packages/solana/src/solana-provider/__tests__/basic.test.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useState, type FC, type PropsWithChildren } from 'react';
import { useEffect, useState, type FC, type PropsWithChildren } from 'react';
import { Connector, useProvider, type ConnectorTriggerProps } from '@ant-design/web3';
import type { ConnectionContextState } from '@solana/wallet-adapter-react';
import { fireEvent, render } from '@testing-library/react';
Expand All @@ -9,9 +9,12 @@ import { SolanaWeb3ConfigProvider } from '../index';
import { xrender } from './utils';

type TestConnection = Partial<ConnectionContextState['connection']>;
const mockCreateConnectionInstance = vi.fn();

describe('SolanaWeb3ConfigProvider', () => {
beforeEach(() => {
mockCreateConnectionInstance.mockClear();

vi.resetAllMocks();
});

Expand Down Expand Up @@ -46,15 +49,27 @@ describe('SolanaWeb3ConfigProvider', () => {

const publicKey = new PublicKey(mockedData.address.value);

const ConnectionProvider: React.FC<React.PropsWithChildren<{ endpoint: string }>> = ({
const ConnectionProvider: React.FC<
React.PropsWithChildren<{ endpoint: string; config: any }>
> = ({
children,
endpoint,
}) => (
<div>
<div className="endpoint">{endpoint}</div>
{children}
</div>
);
// default value: copy from ConnectionProvider in @solana/wallet-adapter-react
config = { commitment: 'confirmed' },
}) => {
useEffect(() => {
mockCreateConnectionInstance(endpoint, config?.commitment);
}, [endpoint, config]);

return (
<div>
<div className="endpoint">{endpoint}</div>
<div className="commitment">{config?.commitment}</div>
{children}
</div>
);
};

const WalletProvider: React.FC<React.PropsWithChildren> = ({ children }) => <>{children}</>;

const connectedRef = remember(false);
Expand Down Expand Up @@ -183,7 +198,7 @@ describe('SolanaWeb3ConfigProvider', () => {
expect(mockRpcProvider).toBeCalled();
});

it('ConnectionProvider', () => {
it('available endpoint', () => {
const App = () => (
<SolanaWeb3ConfigProvider rpcProvider={() => `https://main-beta.fake-domain.com/`}>
<div className="content">test</div>
Expand All @@ -194,6 +209,34 @@ describe('SolanaWeb3ConfigProvider', () => {
expect(selector('.endpoint')?.textContent).toBe('https://main-beta.fake-domain.com/');
});

it('available connectionConfig and is optimized by default when creating connection', async () => {
const connectionConfig = { commitment: 'processed' };

const App = ({ config }: { config?: any }) => (
<SolanaWeb3ConfigProvider
rpcProvider={() => `https://api.zan.top/node/v1/solana/mainnet/${'YOUR_ZAN_API_KEY'}`}
connectionConfig={config}
>
<div className="content">test</div>
</SolanaWeb3ConfigProvider>
);

const { selector, rerender } = xrender(App);
expect(selector('.commitment')?.textContent).toBe('confirmed');

// simulate multiple renderings
rerender(<App />);
rerender(<App />);

expect(mockCreateConnectionInstance).toBeCalledTimes(1);

// simulate re-render with different connectionConfig
rerender(<App config={connectionConfig} />);

expect(selector('.commitment')?.textContent).toBe('processed');
expect(mockCreateConnectionInstance).toBeCalledTimes(2);
});

it('available show account address', async () => {
const { useWallet } = await import('@solana/wallet-adapter-react');
const connectRunned = vi.fn();
Expand Down
11 changes: 9 additions & 2 deletions packages/solana/src/solana-provider/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export interface SolanaWeb3ConfigProviderProps {
//#endregion

//#region Solana WalletProvider specific
autoConnect?: boolean;
autoConnect?: WalletProviderProps['autoConnect'];
walletProviderProps?: Omit<WalletProviderProps, 'wallets' | 'autoConnect' | 'children'>;
//#endregion

Expand Down Expand Up @@ -88,8 +88,15 @@ export const SolanaWeb3ConfigProvider: FC<PropsWithChildren<SolanaWeb3ConfigProv
[currentChain, endpoint, walletConnect, walletConnectProviderGetter, walletFactories],
);

const connectionProviderProps = useMemo(() => {
return {
endpoint,
config: connectionConfig ?? { commitment: 'confirmed' },
} as ConnectionProviderProps;
}, [endpoint, connectionConfig]);

return (
<ConnectionProvider endpoint={endpoint} config={connectionConfig}>
<ConnectionProvider {...connectionProviderProps}>
<WalletProvider
wallets={walletAdapters}
autoConnect={autoConnect}
Expand Down
Loading