@openzeppelin/ui-builder-adapter-evm 1.0.0 → 1.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openzeppelin/ui-builder-adapter-evm",
-  "version": "1.0.0",
+  "version": "1.3.0",
   "private": false,
   "description": "EVM Adapter for UI Builder",
   "keywords": [
@@ -37,16 +37,16 @@
   },
   "dependencies": {
     "@openzeppelin/relayer-sdk": "1.4.0",
+    "@openzeppelin/ui-components": "^1.0.4",
+    "@openzeppelin/ui-react": "^1.1.0",
+    "@openzeppelin/ui-types": "^1.2.0",
+    "@openzeppelin/ui-utils": "^1.1.0",
     "@wagmi/connectors": "5.7.13",
     "@wagmi/core": "^2.20.3",
     "@web3icons/react": "^4.0.19",
     "lodash": "^4.17.21",
     "lucide-react": "^0.510.0",
-    "react-hook-form": "^7.62.0",
-    "@openzeppelin/ui-builder-react-core": "^1.0.0",
-    "@openzeppelin/ui-builder-types": "^1.0.0",
-    "@openzeppelin/ui-builder-ui": "^1.0.0",
-    "@openzeppelin/ui-builder-utils": "^1.0.0"
+    "react-hook-form": "^7.62.0"
   },
   "devDependencies": {
     "@rainbow-me/rainbowkit": "^2.2.8",

package/src/__tests__/adapter-parsing.test.ts

@@ -1,11 +1,12 @@
 import { beforeEach, describe, expect, it } from 'vitest';
 
 // Adjust path as needed
-import type { ContractFunction, FunctionParameter } from '@openzeppelin/ui-builder-types';
+import type { ContractFunction, FunctionParameter } from '@openzeppelin/ui-types';
 
 import { mockEvmNetworkConfig } from './mocks/mock-network-configs';
 
 import { EvmAdapter } from '../adapter';
+import { EVM_TYPE_TO_FIELD_TYPE } from '../mapping';
 import { parseEvmInput as parseEvmInputFunction } from '../transform';
 
 // Mock FunctionParameter type helper
@@ -464,3 +465,68 @@ describe('EvmAdapter Output Formatting', () => {
 
   // Potential TODO: Add test for error during stringifyWithBigInt if possible (e.g., circular refs, though unlikely here)
 });
+
+// --- getTypeMappingInfo Tests ---
+describe('EvmAdapter getTypeMappingInfo', () => {
+  let adapter: EvmAdapter;
+
+  beforeEach(() => {
+    adapter = new EvmAdapter(mockEvmNetworkConfig);
+  });
+
+  it('should return TypeMappingInfo with primitives and dynamicPatterns', () => {
+    const info = adapter.getTypeMappingInfo();
+    expect(info).toHaveProperty('primitives');
+    expect(info).toHaveProperty('dynamicPatterns');
+    expect(typeof info.primitives).toBe('object');
+    expect(Array.isArray(info.dynamicPatterns)).toBe(true);
+  });
+
+  it('should return primitives matching EVM_TYPE_TO_FIELD_TYPE constant', () => {
+    const info = adapter.getTypeMappingInfo();
+    const expectedTypes = Object.keys(EVM_TYPE_TO_FIELD_TYPE);
+    expect(Object.keys(info.primitives)).toEqual(expectedTypes);
+  });
+
+  it('should include expected EVM primitive types in primitives', () => {
+    const { primitives } = adapter.getTypeMappingInfo();
+    // Core EVM primitive types
+    expect(primitives).toHaveProperty('address');
+    expect(primitives).toHaveProperty('bool');
+    expect(primitives).toHaveProperty('string');
+    expect(primitives).toHaveProperty('bytes');
+    expect(primitives).toHaveProperty('bytes32');
+    // Integer types
+    expect(primitives).toHaveProperty('uint256');
+    expect(primitives).toHaveProperty('int256');
+  });
+
+  it('should NOT include dynamic types in primitives', () => {
+    const { primitives } = adapter.getTypeMappingInfo();
+    Object.keys(primitives).forEach((type) => {
+      expect(type).not.toMatch(/\[\]$/); // No array types
+      expect(type).not.toMatch(/^tuple/); // No tuple types
+    });
+  });
+
+  it('should include dynamic patterns for arrays and tuples', () => {
+    const { dynamicPatterns } = adapter.getTypeMappingInfo();
+    const patternNames = dynamicPatterns.map((p) => p.name);
+    expect(patternNames).toContain('array');
+    expect(patternNames).toContain('tuple');
+    expect(patternNames).toContain('tuple-array');
+  });
+
+  it('should have properly structured dynamic patterns', () => {
+    const { dynamicPatterns } = adapter.getTypeMappingInfo();
+    dynamicPatterns.forEach((pattern) => {
+      expect(pattern).toHaveProperty('name');
+      expect(pattern).toHaveProperty('syntax');
+      expect(pattern).toHaveProperty('mapsTo');
+      expect(pattern).toHaveProperty('description');
+      expect(typeof pattern.name).toBe('string');
+      expect(typeof pattern.syntax).toBe('string');
+      expect(typeof pattern.description).toBe('string');
+    });
+  });
+});

package/src/__tests__/mocks/mock-network-configs.ts

@@ -1,9 +1,9 @@
-import type { EvmNetworkConfig } from '@openzeppelin/ui-builder-types';
+import type { TypedEvmNetworkConfig } from '../../types';
 
 /**
  * Mock EVM Network Configuration for testing purposes.
  */
-export const mockEvmNetworkConfig: EvmNetworkConfig = {
+export const mockEvmNetworkConfig: TypedEvmNetworkConfig = {
   id: 'test-evm-mocknet',
   exportConstName: 'mockEvmNetworkConfig',
   name: 'Test EVM Mocknet',
@@ -15,6 +15,7 @@ export const mockEvmNetworkConfig: EvmNetworkConfig = {
   rpcUrl: 'http://localhost:8545', // Mock RPC URL
   nativeCurrency: { name: 'TestETH', symbol: 'TETH', decimals: 18 },
   apiUrl: 'https://api.etherscan.io/api', // Mock API URL
+  viemChain: undefined, // Optional viem Chain object
 };
 
 // Add mocks for other ecosystems here if needed later

package/src/__tests__/providerSelection.test.ts

@@ -1,6 +1,6 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
-import { appConfigService, userNetworkServiceConfigService } from '@openzeppelin/ui-builder-utils';
+import { appConfigService, userNetworkServiceConfigService } from '@openzeppelin/ui-utils';
 
 import { loadEvmContract } from '../abi/loader';
 import type { TypedEvmNetworkConfig } from '../types';

package/src/abi/__tests__/etherscan-v2.test.ts

@@ -8,7 +8,7 @@ vi.mock('../../configuration/explorer', () => ({
   resolveExplorerConfig: vi.fn(),
 }));
 
-vi.mock('@openzeppelin/ui-builder-utils', () => ({
+vi.mock('@openzeppelin/ui-utils', () => ({
   logger: {
     info: vi.fn(),
     error: vi.fn(),

package/src/abi/__tests__/transformer.test.ts

@@ -4,7 +4,7 @@
 import type { AbiFunction } from 'viem';
 import { describe, expect, it, vi } from 'vitest';
 
-import type { ContractFunction, ContractSchema } from '@openzeppelin/ui-builder-types';
+import type { ContractFunction, ContractSchema } from '@openzeppelin/ui-types';
 
 import type { AbiItem } from '../../types';
 // Adjust path as necessary

package/src/abi/comparison.ts

@@ -5,7 +5,7 @@
 
 import type { Abi } from 'viem';
 
-import { logger, simpleHash } from '@openzeppelin/ui-builder-utils';
+import { logger, simpleHash } from '@openzeppelin/ui-utils';
 
 import type { AbiComparisonResult, AbiDifference, AbiValidationResult } from './types';
 import { isValidAbiArray } from './types';

package/src/abi/etherscan-v2.ts

@@ -1,5 +1,5 @@
-import type { ContractSchema } from '@openzeppelin/ui-builder-types';
-import { logger } from '@openzeppelin/ui-builder-utils';
+import type { ContractSchema } from '@openzeppelin/ui-types';
+import { logger } from '@openzeppelin/ui-utils';
 
 import { resolveExplorerConfig } from '../configuration/explorer';
 import type { AbiItem, TypedEvmNetworkConfig } from '../types';

package/src/abi/etherscan.ts

@@ -1,5 +1,5 @@
-import type { ContractSchema } from '@openzeppelin/ui-builder-types';
-import { logger } from '@openzeppelin/ui-builder-utils';
+import type { ContractSchema } from '@openzeppelin/ui-types';
+import { logger } from '@openzeppelin/ui-utils';
 
 import { resolveExplorerConfig } from '../configuration/explorer';
 import type { AbiItem, TypedEvmNetworkConfig } from '../types';

package/src/abi/loader.ts

@@ -5,14 +5,14 @@ import type {
   ContractSchema,
   EvmNetworkConfig,
   ProxyInfo,
-} from '@openzeppelin/ui-builder-types';
+} from '@openzeppelin/ui-types';
 import {
   appConfigService,
   logger,
   simpleHash,
   userNetworkServiceConfigService,
   withTimeout,
-} from '@openzeppelin/ui-builder-utils';
+} from '@openzeppelin/ui-utils';
 
 import { getEvmExplorerAddressUrl } from '../configuration/explorer';
 import { detectProxyFromAbi, getAdminAddress, getImplementationAddress } from '../proxy/detection';

package/src/abi/sourcify.ts

@@ -1,5 +1,5 @@
-import type { ContractSchema } from '@openzeppelin/ui-builder-types';
-import { logger } from '@openzeppelin/ui-builder-utils';
+import type { ContractSchema } from '@openzeppelin/ui-types';
+import { logger } from '@openzeppelin/ui-utils';
 
 import type { AbiItem, TypedEvmNetworkConfig } from '../types';
 import { transformAbiToSchema } from './transformer';

package/src/abi/transformer.ts

@@ -1,11 +1,7 @@
 import type { AbiFunction, AbiParameter, AbiStateMutability } from 'viem';
 
-import type {
-  ContractFunction,
-  ContractSchema,
-  FunctionParameter,
-} from '@openzeppelin/ui-builder-types';
-import { logger } from '@openzeppelin/ui-builder-utils';
+import type { ContractFunction, ContractSchema, FunctionParameter } from '@openzeppelin/ui-types';
+import { logger } from '@openzeppelin/ui-utils';
 
 import type { AbiItem } from '../types';
 import { formatInputName, formatMethodName } from '../utils';

package/src/adapter.ts

@@ -23,12 +23,13 @@ import type {
   RelayerDetailsRich,
   TransactionStatusUpdate,
   TxStatus,
+  TypeMappingInfo,
   UiKitConfiguration,
   UserExplorerConfig,
   UserRpcProviderConfig,
   WalletConnectionStatus,
-} from '@openzeppelin/ui-builder-types';
-import { logger } from '@openzeppelin/ui-builder-utils';
+} from '@openzeppelin/ui-types';
+import { logger } from '@openzeppelin/ui-utils';
 
 import { abiComparisonService } from './abi/comparison';
 import {
@@ -60,6 +61,7 @@ import {
 import {
   generateEvmDefaultField,
   getEvmCompatibleFieldTypes,
+  getEvmTypeMappingInfo,
   mapEvmParamTypeToFieldType,
 } from './mapping';
 import { isEvmViewFunction, queryEvmViewFunction } from './query';
@@ -783,6 +785,13 @@ Get your WalletConnect projectId from <a href="https://cloud.walletconnect.com"
   public hashContractDefinition(definition: string): string {
     return abiComparisonService.hashAbi(definition);
   }
+
+  /**
+   * @inheritdoc
+   */
+  public getTypeMappingInfo(): TypeMappingInfo {
+    return getEvmTypeMappingInfo();
+  }
 }
 
 // Also export as default to ensure compatibility with various import styles

package/src/config.ts

@@ -5,7 +5,7 @@
  * when generating exported projects. It follows the AdapterConfig
  * interface to provide a structured approach to dependency management.
  */
-import type { AdapterConfig } from '@openzeppelin/ui-builder-types';
+import type { AdapterConfig } from '@openzeppelin/ui-types';
 
 export const evmAdapterConfig: AdapterConfig = {
   /**

package/src/configuration/__tests__/explorer.test.ts

@@ -1,6 +1,6 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
-import { EvmNetworkConfig, UserExplorerConfig } from '@openzeppelin/ui-builder-types';
+import { EvmNetworkConfig, UserExplorerConfig } from '@openzeppelin/ui-types';
 
 import { testEvmExplorerConnection, validateEvmExplorerConfig } from '../../configuration/explorer';
 

package/src/configuration/__tests__/rpc.test.ts

@@ -1,7 +1,7 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
-import type { EvmNetworkConfig } from '@openzeppelin/ui-builder-types';
-import { appConfigService } from '@openzeppelin/ui-builder-utils';
+import type { EvmNetworkConfig } from '@openzeppelin/ui-types';
+import { appConfigService } from '@openzeppelin/ui-utils';
 
 import { resolveRpcUrl } from '../rpc';
 
@@ -24,8 +24,8 @@ const createMockConfig = (id: string, rpcUrl?: string, name?: string): EvmNetwor
 });
 
 // Mock the appConfigService from the correct package
-vi.mock('@openzeppelin/ui-builder-utils', async (importOriginal) => {
-  const original = await importOriginal<typeof import('@openzeppelin/ui-builder-utils')>(); // Ensure correct type for original
+vi.mock('@openzeppelin/ui-utils', async (importOriginal) => {
+  const original = await importOriginal<typeof import('@openzeppelin/ui-utils')>(); // Ensure correct type for original
   return {
     ...original,
     logger: {

package/src/configuration/execution.ts

@@ -4,8 +4,8 @@ import type {
   ExecutionMethodDetail,
   MultisigExecutionConfig,
   RelayerExecutionConfig,
-} from '@openzeppelin/ui-builder-types';
-import { logger } from '@openzeppelin/ui-builder-utils';
+} from '@openzeppelin/ui-types';
+import { logger } from '@openzeppelin/ui-utils';
 
 import { validateEoaConfig, validateRelayerConfig } from '../validation';
 import { EvmWalletConnectionStatus } from '../wallet/types';

package/src/configuration/explorer.ts

@@ -1,9 +1,5 @@
-import { NetworkConfig, UserExplorerConfig } from '@openzeppelin/ui-builder-types';
-import {
-  appConfigService,
-  logger,
-  userNetworkServiceConfigService,
-} from '@openzeppelin/ui-builder-utils';
+import { NetworkConfig, UserExplorerConfig } from '@openzeppelin/ui-types';
+import { appConfigService, logger, userNetworkServiceConfigService } from '@openzeppelin/ui-utils';
 
 import { shouldUseV2Api, testEtherscanV2Connection } from '../abi/etherscan-v2';
 import { TypedEvmNetworkConfig } from '../types';

package/src/configuration/network-services.ts

@@ -1,6 +1,6 @@
-import type { NetworkServiceForm } from '@openzeppelin/ui-builder-types';
-import { UserExplorerConfig, UserRpcProviderConfig } from '@openzeppelin/ui-builder-types';
-import { appConfigService, userNetworkServiceConfigService } from '@openzeppelin/ui-builder-utils';
+import type { NetworkServiceForm } from '@openzeppelin/ui-types';
+import { UserExplorerConfig, UserRpcProviderConfig } from '@openzeppelin/ui-types';
+import { appConfigService, userNetworkServiceConfigService } from '@openzeppelin/ui-utils';
 
 import { TypedEvmNetworkConfig } from '../types';
 import { EvmProviderKeys, isEvmProviderKey } from '../types/providers';

package/src/configuration/rpc.ts

@@ -1,10 +1,10 @@
-import type { EvmNetworkConfig, UserRpcProviderConfig } from '@openzeppelin/ui-builder-types';
+import type { EvmNetworkConfig, UserRpcProviderConfig } from '@openzeppelin/ui-types';
 import {
   appConfigService,
   isValidUrl,
   logger,
   userNetworkServiceConfigService,
-} from '@openzeppelin/ui-builder-utils';
+} from '@openzeppelin/ui-utils';
 
 /**
  * Builds a complete RPC URL from a user RPC provider configuration.

package/src/mapping/__tests__/field-generator.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest';
 
-import type { FunctionParameter } from '@openzeppelin/ui-builder-types';
+import type { FunctionParameter } from '@openzeppelin/ui-types';
 
 import { generateEvmDefaultField } from '../field-generator';
 

package/src/mapping/constants.ts

@@ -1,4 +1,4 @@
-import type { FieldType } from '@openzeppelin/ui-builder-types';
+import type { FieldType, TypeMappingInfo } from '@openzeppelin/ui-types';
 
 /**
  * EVM-specific type mapping to default form field types.
@@ -30,3 +30,28 @@ export const EVM_TYPE_TO_FIELD_TYPE: Record<string, FieldType> = {
   bytes: 'textarea',
   bytes32: 'text',
 };
+
+/**
+ * EVM dynamic type patterns handled through pattern matching.
+ */
+const EVM_DYNAMIC_PATTERNS: TypeMappingInfo['dynamicPatterns'] = [
+  { name: 'array', syntax: 'T[]', mapsTo: 'array', description: 'Dynamic array of primitives' },
+  { name: 'fixed-array', syntax: 'T[N]', mapsTo: 'array', description: 'Fixed-size array' },
+  {
+    name: 'tuple-array',
+    syntax: 'tuple[]',
+    mapsTo: 'array-object',
+    description: 'Array of structs',
+  },
+  { name: 'tuple', syntax: 'tuple', mapsTo: 'object', description: 'Struct/tuple type' },
+];
+
+/**
+ * Returns complete type mapping information for EVM.
+ */
+export function getEvmTypeMappingInfo(): TypeMappingInfo {
+  return {
+    primitives: { ...EVM_TYPE_TO_FIELD_TYPE },
+    dynamicPatterns: EVM_DYNAMIC_PATTERNS,
+  };
+}

package/src/mapping/field-generator.ts

@@ -6,12 +6,12 @@ import type {
   FieldValue,
   FormFieldType,
   FunctionParameter,
-} from '@openzeppelin/ui-builder-types';
+} from '@openzeppelin/ui-types';
 import {
   enhanceNumericValidation,
   getDefaultValueForType,
   type NumericBoundsMap,
-} from '@openzeppelin/ui-builder-utils';
+} from '@openzeppelin/ui-utils';
 
 import { mapEvmParamTypeToFieldType } from './type-mapper';
 

package/src/mapping/type-mapper.ts

@@ -1,4 +1,4 @@
-import type { FieldType } from '@openzeppelin/ui-builder-types';
+import type { FieldType } from '@openzeppelin/ui-types';
 
 import { EVM_TYPE_TO_FIELD_TYPE } from './constants';
 

package/src/proxy/detection.ts

@@ -6,7 +6,7 @@
  */
 import { createPublicClient, http, keccak256, parseAbi, toHex } from 'viem';
 
-import { logger } from '@openzeppelin/ui-builder-utils';
+import { logger } from '@openzeppelin/ui-utils';
 
 import { resolveRpcUrl } from '../configuration';
 import { AbiItem, TypedEvmNetworkConfig } from '../types';

package/src/query/handler.ts

@@ -1,7 +1,7 @@
 import { createPublicClient, http, isAddress, type Chain, type PublicClient } from 'viem';
 
-import type { ContractSchema, FunctionParameter } from '@openzeppelin/ui-builder-types';
-import { logger } from '@openzeppelin/ui-builder-utils';
+import type { ContractSchema, FunctionParameter } from '@openzeppelin/ui-types';
+import { logger } from '@openzeppelin/ui-utils';
 
 import { createAbiFunctionItem } from '../abi';
 import { getUserRpcUrl, resolveRpcUrl } from '../configuration';

package/src/query/view-checker.ts

@@ -1,4 +1,4 @@
-import type { ContractFunction } from '@openzeppelin/ui-builder-types';
+import type { ContractFunction } from '@openzeppelin/ui-types';
 
 /**
  * Determines if a function is a view/pure function (read-only).

package/src/transaction/components/AdvancedInfo.tsx

@@ -1,7 +1,7 @@
 import { Info } from 'lucide-react';
 import React from 'react';
 
-import { Button } from '@openzeppelin/ui-builder-ui';
+import { Button } from '@openzeppelin/ui-components';
 
 interface AdvancedInfoProps {
   showAdvancedInfo: boolean;

package/src/transaction/components/CustomGasParameters.tsx

@@ -9,8 +9,8 @@ import {
   AccordionTrigger,
   BooleanField,
   NumberField,
-} from '@openzeppelin/ui-builder-ui';
-import { cn } from '@openzeppelin/ui-builder-utils';
+} from '@openzeppelin/ui-components';
+import { cn } from '@openzeppelin/ui-utils';
 
 import { EvmRelayerFormData } from './useEvmRelayerOptions';
 

package/src/transaction/components/EvmRelayerOptions.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { Tabs, TabsContent, TabsList, TabsTrigger } from '@openzeppelin/ui-builder-ui';
+import { Tabs, TabsContent, TabsList, TabsTrigger } from '@openzeppelin/ui-components';
 
 import { AdvancedInfo } from './AdvancedInfo';
 import { CustomGasParameters } from './CustomGasParameters';

package/src/transaction/components/SpeedSelection.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 
 import { Speed } from '@openzeppelin/relayer-sdk';
-import { RadioGroup, RadioGroupItem } from '@openzeppelin/ui-builder-ui';
+import { RadioGroup, RadioGroupItem } from '@openzeppelin/ui-components';
 
 interface SpeedSelectionProps {
   selectedSpeed: Speed | undefined;

package/src/transaction/eoa.ts

@@ -6,8 +6,8 @@ import {
   ExecutionConfig,
   TransactionStatusUpdate,
   TxStatus,
-} from '@openzeppelin/ui-builder-types';
-import { logger } from '@openzeppelin/ui-builder-utils';
+} from '@openzeppelin/ui-types';
+import { logger } from '@openzeppelin/ui-utils';
 
 import { WriteContractParameters } from '../types';
 import { validateEoaConfig } from '../validation';

package/src/transaction/execution-strategy.ts

@@ -1,4 +1,4 @@
-import { ExecutionConfig, TransactionStatusUpdate, TxStatus } from '@openzeppelin/ui-builder-types';
+import { ExecutionConfig, TransactionStatusUpdate, TxStatus } from '@openzeppelin/ui-types';
 
 import { WriteContractParameters } from '../types';
 import { WagmiWalletImplementation } from '../wallet/implementation/wagmi-implementation';

package/src/transaction/formatter.ts

@@ -1,7 +1,7 @@
 import { isAddress } from 'viem';
 
-import type { ContractSchema, FormFieldType } from '@openzeppelin/ui-builder-types';
-import { logger } from '@openzeppelin/ui-builder-utils';
+import type { ContractSchema, FormFieldType } from '@openzeppelin/ui-types';
+import { logger } from '@openzeppelin/ui-utils';
 
 import { createAbiFunctionItem } from '../abi';
 import { parseEvmInput } from '../transform';

package/src/transaction/relayer.ts

@@ -16,8 +16,8 @@ import {
   RelayerExecutionConfig,
   TransactionStatusUpdate,
   TxStatus,
-} from '@openzeppelin/ui-builder-types';
-import { logger } from '@openzeppelin/ui-builder-utils';
+} from '@openzeppelin/ui-types';
+import { logger } from '@openzeppelin/ui-utils';
 
 import { TypedEvmNetworkConfig, WriteContractParameters } from '../types';
 import { WagmiWalletImplementation } from '../wallet/implementation/wagmi-implementation';

package/src/transaction/sender.ts

@@ -1,8 +1,8 @@
 import type { GetAccountReturnType } from '@wagmi/core';
 import type { TransactionReceipt, WalletClient } from 'viem';
 
-import type { ExecutionConfig } from '@openzeppelin/ui-builder-types';
-import { logger } from '@openzeppelin/ui-builder-utils';
+import type { ExecutionConfig } from '@openzeppelin/ui-types';
+import { logger } from '@openzeppelin/ui-utils';
 
 import type { WriteContractParameters } from '../types';
 import type { WagmiWalletImplementation } from '../wallet/implementation/wagmi-implementation';

package/src/transform/input-parser.ts

@@ -1,7 +1,7 @@
 import { getAddress, isAddress } from 'viem';
 
-import type { FunctionParameter } from '@openzeppelin/ui-builder-types';
-import { logger } from '@openzeppelin/ui-builder-utils';
+import type { FunctionParameter } from '@openzeppelin/ui-types';
+import { logger } from '@openzeppelin/ui-utils';
 
 /**
  * Recursively parses a raw input value based on its expected ABI type definition.

package/src/transform/output-formatter.ts

@@ -1,5 +1,5 @@
-import type { ContractFunction } from '@openzeppelin/ui-builder-types';
-import { logger } from '@openzeppelin/ui-builder-utils';
+import type { ContractFunction } from '@openzeppelin/ui-types';
+import { logger } from '@openzeppelin/ui-utils';
 
 import { stringifyWithBigInt } from '../utils';
 

package/src/types.ts

@@ -1,6 +1,6 @@
 import type { Abi, Chain } from 'viem';
 
-import type { EvmNetworkConfig } from '@openzeppelin/ui-builder-types';
+import type { EvmNetworkConfig } from '@openzeppelin/ui-types';
 
 /**
  * EVM-specific type definitions

package/src/validation/eoa.ts

@@ -1,5 +1,5 @@
-import { EoaExecutionConfig } from '@openzeppelin/ui-builder-types';
-import { logger } from '@openzeppelin/ui-builder-utils';
+import { EoaExecutionConfig } from '@openzeppelin/ui-types';
+import { logger } from '@openzeppelin/ui-utils';
 
 import { isValidEvmAddress } from '../utils';
 import { EvmWalletConnectionStatus } from '../wallet/types';

package/src/validation/relayer.ts

@@ -1,4 +1,4 @@
-import { RelayerExecutionConfig } from '@openzeppelin/ui-builder-types';
+import { RelayerExecutionConfig } from '@openzeppelin/ui-types';
 
 export async function validateRelayerConfig(
   config: RelayerExecutionConfig

package/src/wallet/README.md

@@ -13,7 +13,7 @@ This architecture allows applications to switch between different wallet UIs (li
 ## Purpose
 
 - **UI Environment Provision**: Sets up a stable UI environment for EVM wallet interactions. The adapter exports `EvmWalletUiRoot`, a React component that internally uses a singleton `EvmUiKitManager` to manage the `WagmiConfig`, UI kit assets (like RainbowKit's provider and CSS), and overall state. This root component ensures `WagmiProvider` and `QueryClientProvider` are always rendered, aiming to prevent UI flicker during network or configuration changes.
-- **Facade Hooks**: Exposes a standardized set of React hooks (`evmFacadeHooks`) for wallet, account, and network management, wrapping `wagmi` core hooks. These are primarily consumed via `useWalletState()` from `@openzeppelin/ui-builder-react-core`.
+- **Facade Hooks**: Exposes a standardized set of React hooks (`evmFacadeHooks`) for wallet, account, and network management, wrapping `wagmi` core hooks. These are primarily consumed via `useWalletState()` from `@openzeppelin/ui-react`.
 - **UI Kit Integration**: Supports third-party UI kits like RainbowKit, as well as a default set of custom-styled wallet UI components (`CustomConnectButton`, `CustomAccountDisplay`, `CustomNetworkSwitcher`).
 - **Configuration**: Provides a flexible, layered configuration system allowing applications to define UI kit preferences and kit-specific parameters through global application configuration (`AppConfigService`), user-authored native TypeScript configuration files, and programmatic overrides.
 
@@ -172,7 +172,7 @@ The consuming application (via the `loadConfigModule` prop on `WalletStateProvid
 **Example from `packages/builder/src/App.tsx` or exported app's `main.tsx`:**
 
 ```typescript
-import { logger } from '@openzeppelin/ui-builder-utils';
+import { logger } from '@openzeppelin/ui-utils';
 
 const loadAppConfigModule = async (
   relativePath: string
@@ -209,7 +209,7 @@ When `kitName` is configured to `'rainbowkit'`, the `EvmAdapter` (via `EvmUiKitM
 
 ## Usage within Application
 
-The primary way to interact with wallet functionalities and UI components is through `@openzeppelin/ui-builder-react-core`:
+The primary way to interact with wallet functionalities and UI components is through `@openzeppelin/ui-react`:
 
 - **`WalletStateProvider`**: Wraps the application (or relevant parts) to provide wallet context.
 - **`useWalletState()`**: Hook to access `activeAdapter`, `activeNetworkConfig`, `walletFacadeHooks`, `isAdapterLoading`, etc.
@@ -221,7 +221,7 @@ The primary way to interact with wallet functionalities and UI components is thr
 import {
   useWalletState,
   useDerivedAccountStatus,
-} from '@openzeppelin/ui-builder-react-core';
+} from '@openzeppelin/ui-react';
 
 function WalletConnectionHeader() {
   const { activeAdapter, isAdapterLoading } = useWalletState();