@openzeppelin/ui-builder-adapter-evm 0.12.0 → 0.14.0

package/src/query/handler.ts

@@ -1,10 +1,10 @@
 import { createPublicClient, http, isAddress, type Chain, type PublicClient } from 'viem';
 
 import type { ContractSchema, FunctionParameter } from '@openzeppelin/ui-builder-types';
-import { logger, userRpcConfigService } from '@openzeppelin/ui-builder-utils';
+import { logger } from '@openzeppelin/ui-builder-utils';
 
 import { createAbiFunctionItem } from '../abi';
-import { resolveRpcUrl } from '../configuration';
+import { getUserRpcUrl, resolveRpcUrl } from '../configuration';
 import { parseEvmInput } from '../transform';
 import type { TypedEvmNetworkConfig } from '../types';
 import type { WagmiWalletImplementation } from '../wallet/implementation/wagmi-implementation';
@@ -19,10 +19,8 @@ async function getPublicClientForQuery(
   walletImplementation: WagmiWalletImplementation,
   networkConfig: TypedEvmNetworkConfig
 ): Promise<PublicClient> {
-  // First check if there's a custom RPC configuration
-  const customRpcConfig = userRpcConfigService.getUserRpcConfig(networkConfig.id);
-
-  if (customRpcConfig) {
+  // First check if there's a custom RPC configuration via generic service
+  if (getUserRpcUrl(networkConfig.id)) {
     // Always create a new client with custom RPC when configured
     const resolvedRpc = resolveRpcUrl(networkConfig);
     return createPublicClientWithRpc(networkConfig, resolvedRpc);

package/src/vite-config.ts

@@ -0,0 +1,68 @@
+/**
+ * EVM Adapter: Vite Configuration Export
+ *
+ * This module exports Vite configuration fragments for the EVM adapter.
+ * Currently minimal, but provides a consistent interface for adapter-specific
+ * build requirements.
+ *
+ * USAGE:
+ * 1. In the main builder app: Import and merge into packages/builder/vite.config.ts
+ * 2. In exported apps: The export system injects these configs when EVM is used
+ *
+ * See: docs/ADAPTER_ARCHITECTURE.md § "Build-Time Requirements"
+ */
+
+import type { UserConfig } from 'vite';
+
+/**
+ * Returns the Vite configuration required for EVM adapter compatibility
+ *
+ * @returns Vite configuration object to be merged with your main vite.config
+ *
+ * @example
+ * ```typescript
+ * // vite.config.ts
+ * import { getEvmViteConfig } from '@openzeppelin/ui-builder-adapter-evm/vite-config';
+ *
+ * export default defineConfig(({ mode }) => {
+ *   const evmConfig = getEvmViteConfig();
+ *
+ *   return {
+ *     plugins: [
+ *       react(),
+ *       ...evmConfig.plugins,
+ *     ],
+ *     resolve: {
+ *       dedupe: [
+ *         ...evmConfig.resolve.dedupe,
+ *       ],
+ *     },
+ *   };
+ * });
+ * ```
+ */
+export function getEvmViteConfig(): UserConfig {
+  return {
+    // Currently no EVM-specific plugins required
+    plugins: [],
+
+    resolve: {
+      // Module Deduplication
+      // Ensure singleton instances of shared dependencies
+      dedupe: [
+        // EVM-specific dependencies that may need deduplication
+        'viem',
+        'wagmi',
+        '@wagmi/core',
+      ],
+    },
+
+    optimizeDeps: {
+      // Force Pre-Bundling (CommonJS → ESM conversion)
+      // Include wagmi and @wagmi/core to ensure they're properly resolved
+      // when the EVM adapter is dynamically imported in production builds
+      include: ['wagmi', '@wagmi/core', 'viem', '@tanstack/react-query'],
+      exclude: [],
+    },
+  };
+}

package/src/wallet/implementation/wagmi-implementation.ts

@@ -23,6 +23,7 @@ import { http, PublicClient, WalletClient, type Chain } from 'viem';
 import type { Connector, UiKitConfiguration } from '@openzeppelin/ui-builder-types';
 import { appConfigService, logger } from '@openzeppelin/ui-builder-utils';
 
+import { getUserRpcUrl } from '../../configuration/rpc';
 import { evmNetworks } from '../../networks';
 import { getWagmiConfigForRainbowKit } from '../rainbowkit';
 import { type WagmiConfigChains } from '../types';
@@ -176,16 +177,20 @@ export class WagmiWalletImplementation {
         let rpcUrlToUse: string | undefined = chainDefinition.rpcUrls.default?.http?.[0];
         const appNetworkIdString = viemChainIdToAppNetworkId[chainDefinition.id];
         if (appNetworkIdString) {
-          const rpcOverrideSetting = appConfigService.getRpcEndpointOverride(appNetworkIdString);
-          let httpRpcOverride: string | undefined;
-          if (typeof rpcOverrideSetting === 'string') {
-            httpRpcOverride = rpcOverrideSetting;
-          } else if (typeof rpcOverrideSetting === 'object') {
-            // Handle both RpcEndpointConfig and UserRpcProviderConfig
-            if ('http' in rpcOverrideSetting && rpcOverrideSetting.http) {
-              httpRpcOverride = rpcOverrideSetting.http;
-            } else if ('url' in rpcOverrideSetting && rpcOverrideSetting.url) {
-              httpRpcOverride = rpcOverrideSetting.url;
+          // Prefer user-configured RPC from generic service
+          let httpRpcOverride: string | undefined = getUserRpcUrl(appNetworkIdString);
+          // Fallback to AppConfigService override if no user config
+          if (!httpRpcOverride) {
+            const rpcOverrideSetting = appConfigService.getRpcEndpointOverride(appNetworkIdString);
+            if (typeof rpcOverrideSetting === 'string') {
+              httpRpcOverride = rpcOverrideSetting;
+            } else if (typeof rpcOverrideSetting === 'object') {
+              // Handle both RpcEndpointConfig and UserRpcProviderConfig
+              if ('http' in rpcOverrideSetting && rpcOverrideSetting.http) {
+                httpRpcOverride = rpcOverrideSetting.http;
+              } else if ('url' in rpcOverrideSetting && rpcOverrideSetting.url) {
+                httpRpcOverride = rpcOverrideSetting.url;
+              }
             }
           }
           if (httpRpcOverride) {
@@ -227,6 +232,12 @@ export class WagmiWalletImplementation {
   private getRpcOverrideForRainbowKit(
     networkId: string
   ): string | { http?: string; ws?: string } | undefined {
+    // Prefer user-configured RPC from generic service first
+    const userRpcUrl = getUserRpcUrl(networkId);
+    if (userRpcUrl) {
+      return { http: userRpcUrl };
+    }
+
     const rpcOverrideSetting = appConfigService.getRpcEndpointOverride(networkId);
 
     if (typeof rpcOverrideSetting === 'string') {
@@ -322,9 +333,8 @@ export class WagmiWalletImplementation {
       );
     }
 
-    if (!this.defaultInstanceConfig) {
-      this.defaultInstanceConfig = this.createDefaultConfig();
-    }
+    // Always rebuild default config to reflect latest RPC overrides/user settings
+    this.defaultInstanceConfig = this.createDefaultConfig();
     return this.defaultInstanceConfig;
   }
 

package/src/wallet/rainbowkit/config-service.ts

@@ -6,39 +6,6 @@ import { logger } from '@openzeppelin/ui-builder-utils';
 
 import { type WagmiConfigChains } from '../types';
 
-// Cache to prevent duplicate config creation and WalletConnect double initialization
-const cacheInstanceId = Math.random().toString(36).substring(7);
-const configCache = new Map<string, Config>();
-logger.debug('rainbowkit/config-service', 'NEW configCache INSTANCE CREATED', cacheInstanceId);
-
-/**
- * Creates a cache key from the configuration to prevent duplicate config creation
- */
-function createConfigCacheKey(
-  userFullNativeConfig: Record<string, unknown> | undefined | null,
-  chains: readonly Chain[]
-): string {
-  const wagmiParamsContent = userFullNativeConfig?.wagmiParams;
-  const chainIds = chains.map((c) => c.id).sort();
-  const keyObject = {
-    wagmiParams: wagmiParamsContent,
-    chainIds: chainIds,
-  };
-  const configHash = JSON.stringify(keyObject);
-  logger.debug(
-    'rainbowkit/config-service:createConfigCacheKey',
-    'Key generation input - userFullNativeConfig.wagmiParams:',
-    wagmiParamsContent,
-    'Key generation input - chainIds:',
-    chainIds,
-    'Generated Key Object for stringify:',
-    keyObject,
-    'Generated Hash:',
-    configHash
-  );
-  return configHash;
-}
-
 /**
  * Creates a Wagmi configuration for RainbowKit using getDefaultConfig
  *
@@ -58,39 +25,6 @@ export async function createRainbowKitWagmiConfig(
   getRpcEndpointOverride: (networkId: string) => string | { http?: string; ws?: string } | undefined
 ): Promise<Config | null> {
   try {
-    const cacheKey = createConfigCacheKey(userFullNativeConfig, chains);
-    logger.info(
-      'rainbowkit/config-service:createRainbowKitWagmiConfig',
-      'Attempting to get/create config. Cache Key:',
-      cacheKey,
-      'Using cache instance ID:',
-      cacheInstanceId
-    );
-
-    const cachedConfig = configCache.get(cacheKey);
-
-    if (cachedConfig) {
-      logger.info(
-        'rainbowkit/config-service:createRainbowKitWagmiConfig',
-        'CACHE HIT. Returning cached RainbowKit Wagmi config.',
-        {
-          cacheKey,
-          cacheInstanceId,
-          cachedConfigObjectId:
-            typeof cachedConfig?.storage === 'object' && cachedConfig.storage !== null
-              ? 'WagmiStorageObject'
-              : String(cachedConfig?.storage),
-        }
-      );
-      return cachedConfig;
-    } else {
-      logger.warn(
-        'rainbowkit/config-service:createRainbowKitWagmiConfig',
-        'CACHE MISS. Proceeding to create new RainbowKit Wagmi config.',
-        { cacheKey, cacheSize: configCache.size, cacheInstanceId }
-      );
-    }
-
     const { getDefaultConfig } = await import('@rainbow-me/rainbowkit');
     if (!getDefaultConfig) {
       logger.error(
@@ -139,11 +73,12 @@ export async function createRainbowKitWagmiConfig(
           const rpcOverrideSetting = getRpcEndpointOverride(appNetworkIdString);
           let httpRpcOverride: string | undefined;
 
+          // Extract HTTP RPC URL from override setting
           if (typeof rpcOverrideSetting === 'string') {
             httpRpcOverride = rpcOverrideSetting;
-          } else if (typeof rpcOverrideSetting === 'object') {
+          } else if (typeof rpcOverrideSetting === 'object' && rpcOverrideSetting) {
             // Handle both RpcEndpointConfig and UserRpcProviderConfig
-            if (rpcOverrideSetting?.http) {
+            if ('http' in rpcOverrideSetting && rpcOverrideSetting.http) {
               httpRpcOverride = rpcOverrideSetting.http;
             } else if ('url' in rpcOverrideSetting && rpcOverrideSetting.url) {
               // Handle UserRpcProviderConfig
@@ -182,17 +117,6 @@ export async function createRainbowKitWagmiConfig(
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const config = getDefaultConfig(finalConfigOptions as any);
 
-    configCache.set(cacheKey, config);
-    logger.info(
-      'rainbowkit/config-service:createRainbowKitWagmiConfig',
-      'New config created and cached. Cache Size now:',
-      configCache.size,
-      {
-        cacheKey,
-        cacheInstanceId,
-      }
-    );
-
     logger.info(
       'rainbowkit/config-service',
       'Successfully created RainbowKit Wagmi config object.',