@openzeppelin/ui-builder-adapter-evm 0.16.0 → 1.2.0

package/dist/index.cjs

@@ -39,25 +39,25 @@ __export(rainbowkitAssetManager_exports, {
 });
 async function ensureRainbowKitAssetsLoaded() {
   if (loadedAssets) {
-    import_ui_builder_utils17.logger.debug("RainbowKitAssetManager", "Assets already loaded, returning cached.");
+    import_ui_utils17.logger.debug("RainbowKitAssetManager", "Assets already loaded, returning cached.");
     return loadedAssets;
   }
   if (!providerPromise) {
     providerPromise = import("@rainbow-me/rainbowkit").then((module2) => {
       const component = module2.RainbowKitProvider;
-      import_ui_builder_utils17.logger.info("RainbowKitAssetManager", "RainbowKitProvider module loaded.");
+      import_ui_utils17.logger.info("RainbowKitAssetManager", "RainbowKitProvider module loaded.");
       return component;
     }).catch((err) => {
-      import_ui_builder_utils17.logger.error("RainbowKitAssetManager", "Failed to load RainbowKitProvider module:", err);
+      import_ui_utils17.logger.error("RainbowKitAssetManager", "Failed to load RainbowKitProvider module:", err);
       return null;
     });
   }
   if (!cssPromise) {
     cssPromise = import("@rainbow-me/rainbowkit/styles.css").then(() => {
-      import_ui_builder_utils17.logger.info("RainbowKitAssetManager", "RainbowKit CSS loaded successfully.");
+      import_ui_utils17.logger.info("RainbowKitAssetManager", "RainbowKit CSS loaded successfully.");
       return true;
     }).catch((err) => {
-      import_ui_builder_utils17.logger.error("RainbowKitAssetManager", "Failed to load RainbowKit CSS:", err);
+      import_ui_utils17.logger.error("RainbowKitAssetManager", "Failed to load RainbowKit CSS:", err);
       return false;
     });
   }
@@ -65,7 +65,7 @@ async function ensureRainbowKitAssetsLoaded() {
     const [ProviderComponent, cssLoadedSuccess] = await Promise.all([providerPromise, cssPromise]);
     loadedAssets = { ProviderComponent, cssLoaded: cssLoadedSuccess };
     if (!ProviderComponent || !cssLoadedSuccess) {
-      import_ui_builder_utils17.logger.warn(
+      import_ui_utils17.logger.warn(
         "RainbowKitAssetManager",
         "One or more RainbowKit assets failed to load.",
         loadedAssets
@@ -73,16 +73,16 @@ async function ensureRainbowKitAssetsLoaded() {
     }
     return loadedAssets;
   } catch (error) {
-    import_ui_builder_utils17.logger.error("RainbowKitAssetManager", "Error in Promise.all for asset loading:", error);
+    import_ui_utils17.logger.error("RainbowKitAssetManager", "Error in Promise.all for asset loading:", error);
     loadedAssets = { ProviderComponent: null, cssLoaded: false };
     return loadedAssets;
   }
 }
-var import_ui_builder_utils17, loadedAssets, providerPromise, cssPromise;
+var import_ui_utils17, loadedAssets, providerPromise, cssPromise;
 var init_rainbowkitAssetManager = __esm({
   "src/wallet/rainbowkit/rainbowkitAssetManager.ts"() {
     "use strict";
-    import_ui_builder_utils17 = require("@openzeppelin/ui-builder-utils");
+    import_ui_utils17 = require("@openzeppelin/ui-utils");
     loadedAssets = null;
     providerPromise = null;
     cssPromise = null;
@@ -127,10 +127,10 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // src/adapter.ts
-var import_ui_builder_utils40 = require("@openzeppelin/ui-builder-utils");
+var import_ui_utils40 = require("@openzeppelin/ui-utils");
 
 // src/abi/comparison.ts
-var import_ui_builder_utils = require("@openzeppelin/ui-builder-utils");
+var import_ui_utils = require("@openzeppelin/ui-utils");
 
 // src/abi/types.ts
 function isValidAbiArray(value) {
@@ -176,8 +176,8 @@ var AbiComparisonService = class {
       }
       const normalized1 = this.normalizeAbi(validation1.normalizedAbi);
       const normalized2 = this.normalizeAbi(validation2.normalizedAbi);
-      const hash1 = (0, import_ui_builder_utils.simpleHash)(JSON.stringify(normalized1));
-      const hash2 = (0, import_ui_builder_utils.simpleHash)(JSON.stringify(normalized2));
+      const hash1 = (0, import_ui_utils.simpleHash)(JSON.stringify(normalized1));
+      const hash2 = (0, import_ui_utils.simpleHash)(JSON.stringify(normalized2));
       if (hash1 === hash2) {
         return {
           identical: true,
@@ -195,7 +195,7 @@ var AbiComparisonService = class {
         summary: this.generateSummary(differences)
       };
     } catch (error) {
-      import_ui_builder_utils.logger.error("ABI comparison failed:", error.message);
+      import_ui_utils.logger.error("ABI comparison failed:", error.message);
       return {
         identical: false,
         differences: [],
@@ -266,9 +266,9 @@ var AbiComparisonService = class {
       }
       const normalized = this.normalizeAbi(validation.normalizedAbi);
       const normalizedString = JSON.stringify(normalized);
-      return (0, import_ui_builder_utils.simpleHash)(normalizedString);
+      return (0, import_ui_utils.simpleHash)(normalizedString);
     } catch (error) {
-      import_ui_builder_utils.logger.error("ABI hashing failed:", error.message);
+      import_ui_utils.logger.error("ABI hashing failed:", error.message);
       throw new Error(`Failed to hash ABI: ${error.message}`);
     }
   }
@@ -453,7 +453,7 @@ var AbiComparisonService = class {
 var abiComparisonService = new AbiComparisonService();
 
 // src/configuration/network-services.ts
-var import_ui_builder_utils6 = require("@openzeppelin/ui-builder-utils");
+var import_ui_utils6 = require("@openzeppelin/ui-utils");
 
 // src/types/providers.ts
 var EvmProviderKeys = {
@@ -469,13 +469,13 @@ function isEvmProviderKey(value) {
 }
 
 // src/configuration/explorer.ts
-var import_ui_builder_utils4 = require("@openzeppelin/ui-builder-utils");
+var import_ui_utils4 = require("@openzeppelin/ui-utils");
 
 // src/abi/etherscan-v2.ts
-var import_ui_builder_utils3 = require("@openzeppelin/ui-builder-utils");
+var import_ui_utils3 = require("@openzeppelin/ui-utils");
 
 // src/abi/transformer.ts
-var import_ui_builder_utils2 = require("@openzeppelin/ui-builder-utils");
+var import_ui_utils2 = require("@openzeppelin/ui-utils");
 
 // src/types/artifacts.ts
 function isEvmContractArtifacts(obj) {
@@ -537,7 +537,7 @@ var gweiToWei = (gwei) => {
 
 // src/abi/transformer.ts
 function transformAbiToSchema(abi, contractName, address) {
-  import_ui_builder_utils2.logger.info("transformAbiToSchema", `Transforming ABI to ContractSchema for: ${contractName}`);
+  import_ui_utils2.logger.info("transformAbiToSchema", `Transforming ABI to ContractSchema for: ${contractName}`);
   const functions = [];
   for (const item of abi) {
     if (item.type === "function") {
@@ -572,7 +572,7 @@ function transformAbiToSchema(abi, contractName, address) {
     address,
     functions
   };
-  import_ui_builder_utils2.logger.info(
+  import_ui_utils2.logger.info(
     "transformAbiToSchema",
     `Transformation complete. Found ${contractSchema.functions.length} functions.`
   );
@@ -663,20 +663,20 @@ async function loadAbiFromEtherscanV2(address, networkConfig) {
   );
   let response;
   try {
-    import_ui_builder_utils3.logger.info(
+    import_ui_utils3.logger.info(
       "loadAbiFromEtherscanV2",
       `Fetching ABI from Etherscan V2 API for address: ${address} on chain ${networkConfig.chainId}`
     );
     response = await fetch(url);
   } catch (networkError) {
-    import_ui_builder_utils3.logger.error(
+    import_ui_utils3.logger.error(
       "loadAbiFromEtherscanV2",
       `Network error fetching ABI from Explorer V2 API: ${networkError}`
     );
     throw new Error(`Network error fetching ABI: ${networkError.message}`);
   }
   if (!response.ok) {
-    import_ui_builder_utils3.logger.error(
+    import_ui_utils3.logger.error(
       "loadAbiFromEtherscanV2",
       `Explorer V2 API request failed with status: ${response.status}`
     );
@@ -686,14 +686,14 @@ async function loadAbiFromEtherscanV2(address, networkConfig) {
   try {
     apiResult = await response.json();
   } catch (jsonError) {
-    import_ui_builder_utils3.logger.error(
+    import_ui_utils3.logger.error(
       "loadAbiFromEtherscanV2",
       `Failed to parse Explorer V2 API response as JSON: ${jsonError}`
     );
     throw new Error("Invalid JSON response received from Explorer V2 API.");
   }
   if (apiResult.status !== "1") {
-    import_ui_builder_utils3.logger.warn(
+    import_ui_utils3.logger.warn(
       "loadAbiFromEtherscanV2",
       `Explorer V2 API error: Status ${apiResult.status}, Message: ${apiResult.message}, Result: ${apiResult.result}`
     );
@@ -724,13 +724,13 @@ async function loadAbiFromEtherscanV2(address, networkConfig) {
       throw new Error("Parsed ABI from Explorer V2 API is not an array.");
     }
   } catch (error) {
-    import_ui_builder_utils3.logger.error(
+    import_ui_utils3.logger.error(
       "loadAbiFromEtherscanV2",
       `Failed to parse ABI JSON string from Explorer V2 API result: ${error}`
     );
     throw new Error(`Invalid ABI JSON received from Explorer V2 API: ${error.message}`);
   }
-  import_ui_builder_utils3.logger.info(
+  import_ui_utils3.logger.info(
     "loadAbiFromEtherscanV2",
     `Successfully parsed ABI for ${networkConfig.name} with ${abi.length} items using V2 API.`
   );
@@ -799,12 +799,12 @@ async function testEtherscanV2Connection(networkConfig, apiKey) {
 // src/configuration/explorer.ts
 function resolveExplorerConfig(networkConfig) {
   const isV2 = networkConfig.supportsEtherscanV2 && networkConfig.primaryExplorerApiIdentifier === "etherscan-v2";
-  const globalV2ApiKey = isV2 ? import_ui_builder_utils4.appConfigService.getGlobalServiceConfig("etherscanv2")?.apiKey : void 0;
-  const appApiKey = networkConfig.primaryExplorerApiIdentifier ? import_ui_builder_utils4.appConfigService.getExplorerApiKey(networkConfig.primaryExplorerApiIdentifier) : void 0;
-  const rawCfg = import_ui_builder_utils4.userNetworkServiceConfigService.get(networkConfig.id, "explorer");
+  const globalV2ApiKey = isV2 ? import_ui_utils4.appConfigService.getGlobalServiceConfig("etherscanv2")?.apiKey : void 0;
+  const appApiKey = networkConfig.primaryExplorerApiIdentifier ? import_ui_utils4.appConfigService.getExplorerApiKey(networkConfig.primaryExplorerApiIdentifier) : void 0;
+  const rawCfg = import_ui_utils4.userNetworkServiceConfigService.get(networkConfig.id, "explorer");
   if (rawCfg && typeof rawCfg === "object") {
     const userCfg = rawCfg;
-    import_ui_builder_utils4.logger.info("ExplorerConfig", `Using user-configured explorer for ${networkConfig.name}`);
+    import_ui_utils4.logger.info("ExplorerConfig", `Using user-configured explorer for ${networkConfig.name}`);
     return {
       explorerUrl: userCfg.explorerUrl ?? networkConfig.explorerUrl,
       apiUrl: userCfg.apiUrl ?? networkConfig.apiUrl,
@@ -814,7 +814,7 @@ function resolveExplorerConfig(networkConfig) {
     };
   }
   if (isV2 && globalV2ApiKey) {
-    import_ui_builder_utils4.logger.info("ExplorerConfig", `Using global Etherscan V2 API key for ${networkConfig.name}`);
+    import_ui_utils4.logger.info("ExplorerConfig", `Using global Etherscan V2 API key for ${networkConfig.name}`);
     return {
       explorerUrl: networkConfig.explorerUrl,
       apiUrl: networkConfig.apiUrl,
@@ -824,7 +824,7 @@ function resolveExplorerConfig(networkConfig) {
     };
   }
   if (appApiKey) {
-    import_ui_builder_utils4.logger.info("ExplorerConfig", `Using app-configured API key for ${networkConfig.name}`);
+    import_ui_utils4.logger.info("ExplorerConfig", `Using app-configured API key for ${networkConfig.name}`);
     return {
       explorerUrl: networkConfig.explorerUrl,
       apiUrl: networkConfig.apiUrl,
@@ -833,7 +833,7 @@ function resolveExplorerConfig(networkConfig) {
       isCustom: false
     };
   }
-  import_ui_builder_utils4.logger.info(
+  import_ui_utils4.logger.info(
     "ExplorerConfig",
     `Using default explorer for ${networkConfig.name} (no API key configured)`
   );
@@ -946,12 +946,12 @@ async function testEvmExplorerConnection(explorerConfig, networkConfig) {
 }
 
 // src/configuration/rpc.ts
-var import_ui_builder_utils5 = require("@openzeppelin/ui-builder-utils");
+var import_ui_utils5 = require("@openzeppelin/ui-utils");
 function buildRpcUrl(config) {
   return config.url;
 }
 function getUserRpcUrl(networkId) {
-  const svcCfg = import_ui_builder_utils5.userNetworkServiceConfigService.get(networkId, "rpc");
+  const svcCfg = import_ui_utils5.userNetworkServiceConfigService.get(networkId, "rpc");
   if (svcCfg && typeof svcCfg === "object" && "rpcUrl" in svcCfg) {
     return svcCfg.rpcUrl;
   }
@@ -963,17 +963,17 @@ function resolveRpcUrl(networkConfig) {
   const userRpcUrl = getUserRpcUrl(networkId);
   if (userRpcUrl) {
     const userRpcUrlString = String(userRpcUrl);
-    if ((0, import_ui_builder_utils5.isValidUrl)(userRpcUrlString)) {
-      import_ui_builder_utils5.logger.info(logSystem, `Using user-configured RPC URL for network ${networkId}`);
+    if ((0, import_ui_utils5.isValidUrl)(userRpcUrlString)) {
+      import_ui_utils5.logger.info(logSystem, `Using user-configured RPC URL for network ${networkId}`);
       return userRpcUrlString;
     } else {
-      import_ui_builder_utils5.logger.warn(
+      import_ui_utils5.logger.warn(
         logSystem,
         `User-configured RPC URL for ${networkId} is invalid: ${userRpcUrlString}. Falling back.`
       );
     }
   }
-  const rpcOverrideSetting = import_ui_builder_utils5.appConfigService.getRpcEndpointOverride(networkId);
+  const rpcOverrideSetting = import_ui_utils5.appConfigService.getRpcEndpointOverride(networkId);
   let rpcUrlFromOverride;
   if (typeof rpcOverrideSetting === "string") {
     rpcUrlFromOverride = rpcOverrideSetting;
@@ -986,27 +986,27 @@ function resolveRpcUrl(networkConfig) {
     }
   }
   if (rpcUrlFromOverride) {
-    import_ui_builder_utils5.logger.info(
+    import_ui_utils5.logger.info(
       logSystem,
       `Using overridden RPC URL for network ${networkId}: ${rpcUrlFromOverride}`
     );
-    if ((0, import_ui_builder_utils5.isValidUrl)(rpcUrlFromOverride)) {
+    if ((0, import_ui_utils5.isValidUrl)(rpcUrlFromOverride)) {
       return rpcUrlFromOverride;
     } else {
-      import_ui_builder_utils5.logger.warn(
+      import_ui_utils5.logger.warn(
         logSystem,
         `Overridden RPC URL for ${networkId} is invalid: ${rpcUrlFromOverride}. Falling back.`
       );
     }
   }
-  if (networkConfig.rpcUrl && (0, import_ui_builder_utils5.isValidUrl)(networkConfig.rpcUrl)) {
-    import_ui_builder_utils5.logger.debug(
+  if (networkConfig.rpcUrl && (0, import_ui_utils5.isValidUrl)(networkConfig.rpcUrl)) {
+    import_ui_utils5.logger.debug(
       logSystem,
       `Using default RPC URL for network ${networkId}: ${networkConfig.rpcUrl}`
     );
     return networkConfig.rpcUrl;
   }
-  import_ui_builder_utils5.logger.error(
+  import_ui_utils5.logger.error(
     logSystem,
     `No valid RPC URL could be resolved for network ${networkId}. Checked user config, override, and networkConfig.rpcUrl.`
   );
@@ -1016,13 +1016,13 @@ function resolveRpcUrl(networkConfig) {
 }
 function validateEvmRpcEndpoint(rpcConfig) {
   try {
-    if (!(0, import_ui_builder_utils5.isValidUrl)(rpcConfig.url)) {
-      import_ui_builder_utils5.logger.error("validateEvmRpcEndpoint", `Invalid RPC URL format: ${rpcConfig.url}`);
+    if (!(0, import_ui_utils5.isValidUrl)(rpcConfig.url)) {
+      import_ui_utils5.logger.error("validateEvmRpcEndpoint", `Invalid RPC URL format: ${rpcConfig.url}`);
       return false;
     }
     return true;
   } catch (error) {
-    import_ui_builder_utils5.logger.error("validateEvmRpcEndpoint", "Error validating RPC endpoint:", error);
+    import_ui_utils5.logger.error("validateEvmRpcEndpoint", "Error validating RPC endpoint:", error);
     return false;
   }
 }
@@ -1057,7 +1057,7 @@ async function testEvmRpcConnection(rpcConfig, timeoutMs = 5e3) {
     }
     return { success: true, latency };
   } catch (error) {
-    import_ui_builder_utils5.logger.error("testEvmRpcConnection", "Connection test failed:", error);
+    import_ui_utils5.logger.error("testEvmRpcConnection", "Connection test failed:", error);
     if (error instanceof Error && error.name === "AbortError") {
       return {
         success: false,
@@ -1072,12 +1072,47 @@ async function testEvmRpcConnection(rpcConfig, timeoutMs = 5e3) {
     clearTimeout(timeoutId);
   }
 }
+async function getEvmCurrentBlock(networkConfig) {
+  const rpcUrl = resolveRpcUrl(networkConfig);
+  try {
+    const response = await fetch(rpcUrl, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({
+        jsonrpc: "2.0",
+        method: "eth_blockNumber",
+        params: [],
+        id: 1
+      })
+    });
+    if (!response.ok) {
+      throw new Error(`RPC request failed with status ${response.status}`);
+    }
+    const data = await response.json();
+    if (data.error) {
+      throw new Error(data.error.message || "RPC error");
+    }
+    if (data.result === void 0 || data.result === null) {
+      throw new Error("RPC response missing result field");
+    }
+    const blockNumber = parseInt(data.result, 16);
+    if (isNaN(blockNumber)) {
+      throw new Error(`Invalid block number returned: ${data.result}`);
+    }
+    return blockNumber;
+  } catch (error) {
+    import_ui_utils5.logger.error("getEvmCurrentBlock", "Failed to get current block:", error);
+    throw new Error(
+      `Failed to get current block: ${error instanceof Error ? error.message : String(error)}`
+    );
+  }
+}
 
 // src/configuration/network-services.ts
 function getEvmNetworkServiceForms(networkConfig) {
-  const globalV2ApiKey = import_ui_builder_utils6.appConfigService.getGlobalServiceConfig("etherscanv2")?.apiKey;
+  const globalV2ApiKey = import_ui_utils6.appConfigService.getGlobalServiceConfig("etherscanv2")?.apiKey;
   const v2DefaultEnabled = Boolean(globalV2ApiKey);
-  const savedContractDefCfg = import_ui_builder_utils6.userNetworkServiceConfigService.get(
+  const savedContractDefCfg = import_ui_utils6.userNetworkServiceConfigService.get(
     networkConfig.id,
     "contract-definitions"
   );
@@ -1231,7 +1266,7 @@ function getEvmNetworkServiceForms(networkConfig) {
             { label: "Sourcify", value: EvmProviderKeys.Sourcify }
           ],
           // Seed from saved user config or app-config default if present; otherwise empty
-          defaultValue: savedDefaultProvider || import_ui_builder_utils6.appConfigService.getGlobalServiceParam("contractdefinition", "defaultProvider") || "",
+          defaultValue: savedDefaultProvider || import_ui_utils6.appConfigService.getGlobalServiceParam("contractdefinition", "defaultProvider") || "",
           width: "full"
         },
         // Apply to all networks
@@ -1298,23 +1333,23 @@ var import_core3 = require("@wagmi/core");
 var import_chains3 = require("viem/chains");
 var import_wagmi = require("wagmi");
 var import_react9 = require("react");
-var import_ui_builder_utils19 = require("@openzeppelin/ui-builder-utils");
+var import_ui_utils19 = require("@openzeppelin/ui-utils");
 
 // src/wallet/context/wagmi-context.tsx
 var import_react = require("react");
 var WagmiProviderInitializedContext = (0, import_react.createContext)(false);
 
 // src/wallet/evmUiKitManager.ts
-var import_ui_builder_utils18 = require("@openzeppelin/ui-builder-utils");
+var import_ui_utils18 = require("@openzeppelin/ui-utils");
 
 // src/wallet/utils/walletImplementationManager.ts
-var import_ui_builder_utils16 = require("@openzeppelin/ui-builder-utils");
+var import_ui_utils16 = require("@openzeppelin/ui-utils");
 
 // src/wallet/implementation/wagmi-implementation.ts
 var import_connectors = require("@wagmi/connectors");
 var import_core2 = require("@wagmi/core");
 var import_viem3 = require("viem");
-var import_ui_builder_utils15 = require("@openzeppelin/ui-builder-utils");
+var import_ui_utils15 = require("@openzeppelin/ui-utils");
 
 // src/networks/mainnet.ts
 var import_react2 = require("@web3icons/react");
@@ -1868,19 +1903,19 @@ var evmNetworks = [...evmMainnetNetworks, ...evmTestnetNetworks];
 // src/wallet/rainbowkit/components.tsx
 var import_lucide_react4 = require("lucide-react");
 var import_react8 = require("react");
-var import_ui_builder_ui5 = require("@openzeppelin/ui-builder-ui");
-var import_ui_builder_utils12 = require("@openzeppelin/ui-builder-utils");
+var import_ui_components5 = require("@openzeppelin/ui-components");
+var import_ui_utils12 = require("@openzeppelin/ui-utils");
 
 // src/wallet/components/connect/ConnectButton.tsx
 var import_lucide_react = require("lucide-react");
 var import_react7 = require("react");
-var import_ui_builder_react_core2 = require("@openzeppelin/ui-builder-react-core");
-var import_ui_builder_ui2 = require("@openzeppelin/ui-builder-ui");
-var import_ui_builder_utils9 = require("@openzeppelin/ui-builder-utils");
+var import_ui_components2 = require("@openzeppelin/ui-components");
+var import_ui_react2 = require("@openzeppelin/ui-react");
+var import_ui_utils9 = require("@openzeppelin/ui-utils");
 
 // src/wallet/utils/SafeWagmiComponent.tsx
 var import_react5 = require("react");
-var import_ui_builder_utils7 = require("@openzeppelin/ui-builder-utils");
+var import_ui_utils7 = require("@openzeppelin/ui-utils");
 
 // src/wallet/hooks/useIsWagmiProviderInitialized.ts
 var import_react4 = require("react");
@@ -1904,7 +1939,7 @@ var SafeWagmiComponent = ({
   (0, import_react5.useEffect)(() => {
     const handleError = (event) => {
       if (event.error?.message?.includes("useConfig") || event.error?.message?.includes("WagmiProvider")) {
-        import_ui_builder_utils7.logger.debug(
+        import_ui_utils7.logger.debug(
           "SafeWagmiComponent",
           "Caught wagmi error via window error event:",
           event.error
@@ -1925,7 +1960,7 @@ var SafeWagmiComponent = ({
     return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, { children });
   } catch (error) {
     if (error instanceof Error && (error.message.includes("useConfig") || error.message.includes("WagmiProvider"))) {
-      import_ui_builder_utils7.logger.debug("SafeWagmiComponent", "Caught wagmi error:", error);
+      import_ui_utils7.logger.debug("SafeWagmiComponent", "Caught wagmi error:", error);
       setHasError(true);
       return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, { children: fallback });
     }
@@ -1935,11 +1970,11 @@ var SafeWagmiComponent = ({
 
 // src/wallet/components/connect/ConnectorDialog.tsx
 var import_react6 = require("react");
-var import_ui_builder_react_core = require("@openzeppelin/ui-builder-react-core");
-var import_ui_builder_ui = require("@openzeppelin/ui-builder-ui");
+var import_ui_components = require("@openzeppelin/ui-components");
+var import_ui_react = require("@openzeppelin/ui-react");
 
 // src/wallet/hooks/useUiKitConfig.ts
-var import_ui_builder_utils8 = require("@openzeppelin/ui-builder-utils");
+var import_ui_utils8 = require("@openzeppelin/ui-utils");
 var defaultConfig = {
   kitName: "custom",
   // Default to using our custom implementation for EVM
@@ -1950,10 +1985,10 @@ var defaultConfig = {
 };
 var uiKitConfig = { ...defaultConfig };
 function loadInitialConfigFromAppService() {
-  import_ui_builder_utils8.logger.debug("useUiKitConfig", "Attempting to load initial config from AppConfigService...");
-  const configObj = import_ui_builder_utils8.appConfigService.getWalletUIConfig("evm");
+  import_ui_utils8.logger.debug("useUiKitConfig", "Attempting to load initial config from AppConfigService...");
+  const configObj = import_ui_utils8.appConfigService.getWalletUIConfig("evm");
   if (configObj && configObj.kitName) {
-    import_ui_builder_utils8.logger.info(
+    import_ui_utils8.logger.info(
       "useUiKitConfig",
       `Loaded initial config from AppConfigService: kitName=${configObj.kitName}`,
       configObj.kitConfig
@@ -1963,7 +1998,7 @@ function loadInitialConfigFromAppService() {
       kitConfig: { ...defaultConfig.kitConfig, ...configObj.kitConfig || {} }
     };
   }
-  import_ui_builder_utils8.logger.debug(
+  import_ui_utils8.logger.debug(
     "useUiKitConfig",
     "No initial config found in AppConfigService, using module default."
   );
@@ -1979,9 +2014,9 @@ function useUiKitConfig() {
 // src/wallet/components/connect/ConnectorDialog.tsx
 var import_jsx_runtime2 = require("react/jsx-runtime");
 var ConnectorDialog = ({ open, onOpenChange }) => {
-  const unavailableContent = /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_ui_builder_ui.Dialog, { open, onOpenChange, children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_ui_builder_ui.DialogContent, { className: "sm:max-w-[425px]", children: /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(import_ui_builder_ui.DialogHeader, { children: [
-    /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_ui_builder_ui.DialogTitle, { children: "Wallet Connection Unavailable" }),
-    /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_ui_builder_ui.DialogDescription, { children: "The wallet connection system is not properly initialized." })
+  const unavailableContent = /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_ui_components.Dialog, { open, onOpenChange, children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_ui_components.DialogContent, { className: "sm:max-w-[425px]", children: /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(import_ui_components.DialogHeader, { children: [
+    /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_ui_components.DialogTitle, { children: "Wallet Connection Unavailable" }),
+    /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_ui_components.DialogDescription, { children: "The wallet connection system is not properly initialized." })
   ] }) }) });
   return /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(SafeWagmiComponent, { fallback: unavailableContent, children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(ConnectorDialogContent, { open, onOpenChange }) });
 };
@@ -1992,8 +2027,8 @@ var ConnectorDialogContent = ({ open, onOpenChange }) => {
     error: connectError,
     isConnecting,
     pendingConnector
-  } = (0, import_ui_builder_react_core.useDerivedConnectStatus)();
-  const { isConnected } = (0, import_ui_builder_react_core.useDerivedAccountStatus)();
+  } = (0, import_ui_react.useDerivedConnectStatus)();
+  const { isConnected } = (0, import_ui_react.useDerivedAccountStatus)();
   const [connectingId, setConnectingId] = (0, import_react6.useState)(null);
   const fullConfig = useUiKitConfig();
   const showInjectedConnector = isConfigEnabled("showInjectedConnector");
@@ -2006,8 +2041,8 @@ var ConnectorDialogContent = ({ open, onOpenChange }) => {
     }
   }, [isConnected, connectingId, onOpenChange]);
   if (!connect2) {
-    return /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_ui_builder_ui.Dialog, { open, onOpenChange, children: /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(import_ui_builder_ui.DialogContent, { className: "sm:max-w-[425px]", children: [
-      /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_ui_builder_ui.DialogHeader, { children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_ui_builder_ui.DialogTitle, { children: "Error" }) }),
+    return /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_ui_components.Dialog, { open, onOpenChange, children: /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(import_ui_components.DialogContent, { className: "sm:max-w-[425px]", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_ui_components.DialogHeader, { children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_ui_components.DialogTitle, { children: "Error" }) }),
       /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("p", { children: "Wallet connection function is not available." })
     ] }) });
   }
@@ -2019,13 +2054,13 @@ var ConnectorDialogContent = ({ open, onOpenChange }) => {
     const isInjected = connector.id === "injected";
     return !(isInjected && !showInjectedConnector);
   });
-  return /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_ui_builder_ui.Dialog, { open, onOpenChange, children: /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(import_ui_builder_ui.DialogContent, { className: "sm:max-w-[425px]", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(import_ui_builder_ui.DialogHeader, { children: [
-      /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_ui_builder_ui.DialogTitle, { children: "Connect Wallet" }),
-      /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_ui_builder_ui.DialogDescription, { children: "Select a wallet provider to connect with this application." })
+  return /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_ui_components.Dialog, { open, onOpenChange, children: /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(import_ui_components.DialogContent, { className: "sm:max-w-[425px]", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(import_ui_components.DialogHeader, { children: [
+      /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_ui_components.DialogTitle, { children: "Connect Wallet" }),
+      /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_ui_components.DialogDescription, { children: "Select a wallet provider to connect with this application." })
     ] }),
     /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("div", { className: "grid gap-4 py-4", children: filteredConnectors.length === 0 ? /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("p", { className: "text-center text-muted-foreground", children: "No wallet connectors available." }) : filteredConnectors.map((connector) => /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(
-      import_ui_builder_ui.Button,
+      import_ui_components.Button,
       {
         onClick: () => handleConnectorSelect(connector),
         disabled: isConnecting && connectingId === connector.id,
@@ -2049,7 +2084,7 @@ var CustomConnectButton = ({
   hideWhenConnected = true
 }) => {
   const [dialogOpen, setDialogOpen] = (0, import_react7.useState)(false);
-  const unavailableButton = /* @__PURE__ */ (0, import_jsx_runtime3.jsx)("div", { className: (0, import_ui_builder_utils9.cn)("flex items-center", className), children: /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(import_ui_builder_ui2.Button, { disabled: true, variant: "outline", size: "sm", className: "h-8 px-2 text-xs", children: [
+  const unavailableButton = /* @__PURE__ */ (0, import_jsx_runtime3.jsx)("div", { className: (0, import_ui_utils9.cn)("flex items-center", className), children: /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(import_ui_components2.Button, { disabled: true, variant: "outline", size: "sm", className: "h-8 px-2 text-xs", children: [
     /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_lucide_react.Wallet, { className: "size-3.5 mr-1" }),
     "Wallet Unavailable"
   ] }) });
@@ -2064,8 +2099,8 @@ var CustomConnectButton = ({
   ) });
 };
 var ConnectButtonContent = ({ className, dialogOpen, setDialogOpen, hideWhenConnected }) => {
-  const { isConnected } = (0, import_ui_builder_react_core2.useDerivedAccountStatus)();
-  const { isConnecting: isHookConnecting, error: connectError } = (0, import_ui_builder_react_core2.useDerivedConnectStatus)();
+  const { isConnected } = (0, import_ui_react2.useDerivedAccountStatus)();
+  const { isConnecting: isHookConnecting, error: connectError } = (0, import_ui_react2.useDerivedConnectStatus)();
   const [isManuallyInitiated, setIsManuallyInitiated] = (0, import_react7.useState)(false);
   (0, import_react7.useEffect)(() => {
     if (isConnected && hideWhenConnected) {
@@ -2093,9 +2128,9 @@ var ConnectButtonContent = ({ className, dialogOpen, setDialogOpen, hideWhenConn
     return null;
   }
   const showButtonLoading = isHookConnecting || isManuallyInitiated;
-  return /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)("div", { className: (0, import_ui_builder_utils9.cn)("flex items-center", className), children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)("div", { className: (0, import_ui_utils9.cn)("flex items-center", className), children: [
     /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(
-      import_ui_builder_ui2.Button,
+      import_ui_components2.Button,
       {
         onClick: handleConnectClick,
         disabled: showButtonLoading || isConnected,
@@ -2126,26 +2161,26 @@ var ConnectButtonContent = ({ className, dialogOpen, setDialogOpen, hideWhenConn
 
 // src/wallet/components/account/AccountDisplay.tsx
 var import_lucide_react2 = require("lucide-react");
-var import_ui_builder_react_core3 = require("@openzeppelin/ui-builder-react-core");
-var import_ui_builder_ui3 = require("@openzeppelin/ui-builder-ui");
-var import_ui_builder_utils10 = require("@openzeppelin/ui-builder-utils");
+var import_ui_components3 = require("@openzeppelin/ui-components");
+var import_ui_react3 = require("@openzeppelin/ui-react");
+var import_ui_utils10 = require("@openzeppelin/ui-utils");
 var import_jsx_runtime4 = require("react/jsx-runtime");
 var CustomAccountDisplay = ({ className }) => {
   return /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(SafeWagmiComponent, { fallback: null, children: /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(AccountDisplayContent, { className }) });
 };
 var AccountDisplayContent = ({ className }) => {
-  const { isConnected, address, chainId } = (0, import_ui_builder_react_core3.useDerivedAccountStatus)();
-  const { disconnect: disconnect2 } = (0, import_ui_builder_react_core3.useDerivedDisconnect)();
+  const { isConnected, address, chainId } = (0, import_ui_react3.useDerivedAccountStatus)();
+  const { disconnect: disconnect2 } = (0, import_ui_react3.useDerivedDisconnect)();
   if (!isConnected || !address || !disconnect2) {
     return null;
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("div", { className: (0, import_ui_builder_utils10.cn)("flex items-center gap-2", className), children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("div", { className: (0, import_ui_utils10.cn)("flex items-center gap-2", className), children: [
     /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("div", { className: "flex flex-col", children: [
-      /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("span", { className: "text-xs font-medium", children: (0, import_ui_builder_utils10.truncateMiddle)(address, 4, 4) }),
+      /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("span", { className: "text-xs font-medium", children: (0, import_ui_utils10.truncateMiddle)(address, 4, 4) }),
       /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("span", { className: "text-[9px] text-muted-foreground -mt-0.5", children: chainId ? `Chain ID: ${chainId}` : "Chain ID: N/A" })
     ] }),
     /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
-      import_ui_builder_ui3.Button,
+      import_ui_components3.Button,
       {
         onClick: () => disconnect2(),
         variant: "ghost",
@@ -2160,17 +2195,17 @@ var AccountDisplayContent = ({ className }) => {
 
 // src/wallet/components/network/NetworkSwitcher.tsx
 var import_lucide_react3 = require("lucide-react");
-var import_ui_builder_react_core4 = require("@openzeppelin/ui-builder-react-core");
-var import_ui_builder_ui4 = require("@openzeppelin/ui-builder-ui");
-var import_ui_builder_utils11 = require("@openzeppelin/ui-builder-utils");
+var import_ui_components4 = require("@openzeppelin/ui-components");
+var import_ui_react4 = require("@openzeppelin/ui-react");
+var import_ui_utils11 = require("@openzeppelin/ui-utils");
 var import_jsx_runtime5 = require("react/jsx-runtime");
 var CustomNetworkSwitcher = ({ className }) => {
   return /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(SafeWagmiComponent, { fallback: null, children: /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(NetworkSwitcherContent, { className }) });
 };
 var NetworkSwitcherContent = ({ className }) => {
-  const { isConnected } = (0, import_ui_builder_react_core4.useDerivedAccountStatus)();
-  const { currentChainId, availableChains: unknownChains } = (0, import_ui_builder_react_core4.useDerivedChainInfo)();
-  const { switchChain: switchChain2, isSwitching: isPending, error } = (0, import_ui_builder_react_core4.useDerivedSwitchChainStatus)();
+  const { isConnected } = (0, import_ui_react4.useDerivedAccountStatus)();
+  const { currentChainId, availableChains: unknownChains } = (0, import_ui_react4.useDerivedChainInfo)();
+  const { switchChain: switchChain2, isSwitching: isPending, error } = (0, import_ui_react4.useDerivedSwitchChainStatus)();
   const typedAvailableChains = unknownChains;
   if (!isConnected || !switchChain2 || typedAvailableChains.length === 0) {
     return null;
@@ -2182,23 +2217,23 @@ var NetworkSwitcherContent = ({ className }) => {
   };
   const currentChain = typedAvailableChains.find((chain) => chain.id === currentChainId);
   const currentChainName = currentChain?.name || "Network";
-  return /* @__PURE__ */ (0, import_jsx_runtime5.jsxs)("div", { className: (0, import_ui_builder_utils11.cn)("flex items-center", className), children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime5.jsxs)("div", { className: (0, import_ui_utils11.cn)("flex items-center", className), children: [
     /* @__PURE__ */ (0, import_jsx_runtime5.jsxs)(
-      import_ui_builder_ui4.Select,
+      import_ui_components4.Select,
       {
         value: currentChainId?.toString() ?? "",
         onValueChange: (value) => handleNetworkChange(Number(value)),
         disabled: isPending || typedAvailableChains.length === 0,
         children: [
-          /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(import_ui_builder_ui4.SelectTrigger, { className: "h-8 text-xs px-2 min-w-[90px] max-w-[120px]", children: /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(import_ui_builder_ui4.SelectValue, { placeholder: "Network", children: currentChainName }) }),
+          /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(import_ui_components4.SelectTrigger, { className: "h-8 text-xs px-2 min-w-[90px] max-w-[120px]", children: /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(import_ui_components4.SelectValue, { placeholder: "Network", children: currentChainName }) }),
           /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(
-            import_ui_builder_ui4.SelectContent,
+            import_ui_components4.SelectContent,
             {
               position: "popper",
               sideOffset: 5,
               align: "start",
               className: "w-auto min-w-[160px] max-h-[300px]",
-              children: typedAvailableChains.map((chain) => /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(import_ui_builder_ui4.SelectItem, { value: chain.id.toString(), className: "text-xs py-1.5", children: chain.name }, chain.id))
+              children: typedAvailableChains.map((chain) => /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(import_ui_components4.SelectItem, { value: chain.id.toString(), className: "text-xs py-1.5", children: chain.name }, chain.id))
             }
           )
         ]
@@ -2262,7 +2297,7 @@ var RainbowKitConnectButton = (props) => {
         if (isMounted) {
           setError(err instanceof Error ? err : new Error(String(err)));
           setIsLoadingComponent(false);
-          import_ui_builder_utils12.logger.error("RainbowKitConnectButton", "Failed to load RainbowKit ConnectButton:", err);
+          import_ui_utils12.logger.error("RainbowKitConnectButton", "Failed to load RainbowKit ConnectButton:", err);
         }
       }
     };
@@ -2275,12 +2310,12 @@ var RainbowKitConnectButton = (props) => {
     };
   }, []);
   const renderLoadingPlaceholder = (message) => /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)(
-    import_ui_builder_ui5.Button,
+    import_ui_components5.Button,
     {
       disabled: true,
       variant: "outline",
       size: "sm",
-      className: (0, import_ui_builder_utils12.cn)("h-8 px-2 text-xs", props.className),
+      className: (0, import_ui_utils12.cn)("h-8 px-2 text-xs", props.className),
       children: [
         /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_lucide_react4.Loader2, { className: "h-3.5 w-3.5 animate-spin mr-1.5" }),
         message
@@ -2288,7 +2323,7 @@ var RainbowKitConnectButton = (props) => {
     }
   );
   if (error) {
-    import_ui_builder_utils12.logger.warn(
+    import_ui_utils12.logger.warn(
       "RainbowKitConnectButton",
       "Error loading RainbowKit ConnectButton. Displaying fallback CustomConnectButton."
     );
@@ -2301,7 +2336,7 @@ var RainbowKitConnectButton = (props) => {
     return renderLoadingPlaceholder("Initializing Provider...");
   }
   if (!Component) {
-    import_ui_builder_utils12.logger.warn("RainbowKitConnectButton", "Component is null after loading phase, falling back.");
+    import_ui_utils12.logger.warn("RainbowKitConnectButton", "Component is null after loading phase, falling back.");
     return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(CustomConnectButton, { ...props });
   }
   const kitConfig = managerState.currentFullUiKitConfig?.kitConfig;
@@ -2313,7 +2348,7 @@ var RainbowKitConnectButton = (props) => {
     ...props
     // Allow props to override configuration
   };
-  import_ui_builder_utils12.logger.debug("RainbowKitConnectButton", "Rendering with configuration:", {
+  import_ui_utils12.logger.debug("RainbowKitConnectButton", "Rendering with configuration:", {
     configFromFile: connectButtonConfig,
     finalProps
   });
@@ -2321,20 +2356,20 @@ var RainbowKitConnectButton = (props) => {
 };
 
 // src/wallet/rainbowkit/utils.ts
-var import_ui_builder_utils13 = require("@openzeppelin/ui-builder-utils");
+var import_ui_utils13 = require("@openzeppelin/ui-utils");
 function validateRainbowKitConfig(kitConfig) {
-  import_ui_builder_utils13.logger.debug(
+  import_ui_utils13.logger.debug(
     "validateRainbowKitConfig",
     "Received kitConfig for validation:",
     JSON.stringify(kitConfig)
   );
   if (!kitConfig) {
-    import_ui_builder_utils13.logger.warn("validateRainbowKitConfig", "Validation failed: No kitConfig provided.");
+    import_ui_utils13.logger.warn("validateRainbowKitConfig", "Validation failed: No kitConfig provided.");
     return { isValid: false, error: "No kitConfig provided for RainbowKit" };
   }
   const wagmiParamsFromKitConfig = kitConfig.wagmiParams;
   if (!wagmiParamsFromKitConfig || typeof wagmiParamsFromKitConfig !== "object" || wagmiParamsFromKitConfig === null) {
-    import_ui_builder_utils13.logger.warn(
+    import_ui_utils13.logger.warn(
       "validateRainbowKitConfig",
       "Validation failed: kitConfig.wagmiParams is missing or invalid.",
       { wagmiParamsFromKitConfig }
@@ -2350,14 +2385,14 @@ function validateRainbowKitConfig(kitConfig) {
   }
   if (missingFields.length > 0) {
     const errorMsg = `Missing or invalid required fields in wagmiParams: ${missingFields.join(", ")}`;
-    import_ui_builder_utils13.logger.warn("validateRainbowKitConfig", "Validation failed:", errorMsg, { missingFields });
+    import_ui_utils13.logger.warn("validateRainbowKitConfig", "Validation failed:", errorMsg, { missingFields });
     return {
       isValid: false,
       missingFields,
       error: errorMsg
     };
   }
-  import_ui_builder_utils13.logger.debug("validateRainbowKitConfig", "Validation successful.");
+  import_ui_utils13.logger.debug("validateRainbowKitConfig", "Validation successful.");
   return { isValid: true };
 }
 
@@ -2372,12 +2407,12 @@ function createRainbowKitComponents() {
 
 // src/wallet/rainbowkit/config-service.ts
 var import_core = require("@wagmi/core");
-var import_ui_builder_utils14 = require("@openzeppelin/ui-builder-utils");
+var import_ui_utils14 = require("@openzeppelin/ui-utils");
 async function createRainbowKitWagmiConfig(userFullNativeConfig, chains, chainIdToNetworkIdMap, getRpcEndpointOverride) {
   try {
     const { getDefaultConfig } = await import("@rainbow-me/rainbowkit");
     if (!getDefaultConfig) {
-      import_ui_builder_utils14.logger.error(
+      import_ui_utils14.logger.error(
         "rainbowkit/config-service",
         "Failed to import getDefaultConfig from RainbowKit"
       );
@@ -2385,21 +2420,21 @@ async function createRainbowKitWagmiConfig(userFullNativeConfig, chains, chainId
     }
     const wagmiParams = userFullNativeConfig?.wagmiParams;
     if (!wagmiParams) {
-      import_ui_builder_utils14.logger.warn(
+      import_ui_utils14.logger.warn(
         "rainbowkit/config-service",
         "Resolved kitConfig does not contain a `wagmiParams` object. Cannot create RainbowKit Wagmi config."
       );
       return null;
     }
     if (typeof wagmiParams.appName !== "string" || !wagmiParams.appName) {
-      import_ui_builder_utils14.logger.warn(
+      import_ui_utils14.logger.warn(
         "rainbowkit/config-service",
         "kitConfig.wagmiParams is missing or has invalid `appName`."
       );
       return null;
     }
     if (typeof wagmiParams.projectId !== "string" || !wagmiParams.projectId) {
-      import_ui_builder_utils14.logger.warn(
+      import_ui_utils14.logger.warn(
         "rainbowkit/config-service",
         "kitConfig.wagmiParams is missing or has invalid `projectId`."
       );
@@ -2422,7 +2457,7 @@ async function createRainbowKitWagmiConfig(userFullNativeConfig, chains, chainId
             }
           }
           if (httpRpcOverride) {
-            import_ui_builder_utils14.logger.info(
+            import_ui_utils14.logger.info(
               "rainbowkit/config-service",
               `Using overridden RPC for chain ${chainDefinition.name}: ${httpRpcOverride}`
             );
@@ -2443,20 +2478,20 @@ async function createRainbowKitWagmiConfig(userFullNativeConfig, chains, chainId
       // Adapter controls this
     };
     const config = getDefaultConfig(finalConfigOptions);
-    import_ui_builder_utils14.logger.info(
+    import_ui_utils14.logger.info(
       "rainbowkit/config-service",
       "Successfully created RainbowKit Wagmi config object.",
       config
     );
     return config;
   } catch (error) {
-    import_ui_builder_utils14.logger.error("rainbowkit/config-service", "Error creating RainbowKit Wagmi config:", error);
+    import_ui_utils14.logger.error("rainbowkit/config-service", "Error creating RainbowKit Wagmi config:", error);
     return null;
   }
 }
 async function getWagmiConfigForRainbowKit(uiKitConfiguration, chains, chainIdToNetworkIdMap, getRpcEndpointOverride) {
   if (!uiKitConfiguration || uiKitConfiguration.kitName !== "rainbowkit" || !uiKitConfiguration.kitConfig) {
-    import_ui_builder_utils14.logger.debug(
+    import_ui_utils14.logger.debug(
       "rainbowkit/config-service",
       "Not configured for RainbowKit or kitConfig (resolved native + programmatic) is missing."
     );
@@ -2476,7 +2511,7 @@ async function getWagmiConfigForRainbowKit(uiKitConfiguration, chains, chainIdTo
 var LOG_SYSTEM = "WagmiWalletImplementation";
 var getSupportedChainsFromNetworks = () => {
   const chains = evmNetworks.filter((network) => network.viemChain).map((network) => network.viemChain).filter((chain, index, self) => self.findIndex((c) => c.id === chain.id) === index);
-  import_ui_builder_utils15.logger.info(
+  import_ui_utils15.logger.info(
     LOG_SYSTEM,
     `Generated supported chains from network configurations: ${chains.length} chains`,
     chains.map((c) => ({ id: c.id, name: c.name }))
@@ -2491,7 +2526,7 @@ var getChainIdToNetworkIdMapping = () => {
     },
     {}
   );
-  import_ui_builder_utils15.logger.info(
+  import_ui_utils15.logger.info(
     LOG_SYSTEM,
     "Generated chain ID to network ID mapping from network configurations:",
     mapping
@@ -2516,13 +2551,13 @@ var WagmiWalletImplementation = class {
     __publicField(this, "walletConnectProjectId");
     __publicField(this, "rpcConfigUnsubscribe");
     this.walletConnectProjectId = walletConnectProjectIdFromAppConfig;
-    import_ui_builder_utils15.logger.info(
+    import_ui_utils15.logger.info(
       LOG_SYSTEM,
       "Constructor called. Initial anticipated kitName:",
       initialUiKitConfig?.kitName
     );
     this.initialized = true;
-    import_ui_builder_utils15.logger.info(
+    import_ui_utils15.logger.info(
       LOG_SYSTEM,
       "WagmiWalletImplementation instance initialized (Wagmi config creation deferred)."
     );
@@ -2533,10 +2568,10 @@ var WagmiWalletImplementation = class {
    * when user changes RPC settings.
    */
   setupRpcConfigListener() {
-    import("@openzeppelin/ui-builder-utils").then(({ userRpcConfigService }) => {
+    import("@openzeppelin/ui-utils").then(({ userRpcConfigService }) => {
       this.rpcConfigUnsubscribe = userRpcConfigService.subscribe("*", (event) => {
         if (event.type === "rpc-config-changed" || event.type === "rpc-config-cleared") {
-          import_ui_builder_utils15.logger.info(
+          import_ui_utils15.logger.info(
             LOG_SYSTEM,
             `RPC config changed for network ${event.networkId}. Invalidating cached Wagmi config.`
           );
@@ -2544,7 +2579,7 @@ var WagmiWalletImplementation = class {
         }
       });
     }).catch((error) => {
-      import_ui_builder_utils15.logger.error(LOG_SYSTEM, "Failed to setup RPC config listener:", error);
+      import_ui_utils15.logger.error(LOG_SYSTEM, "Failed to setup RPC config listener:", error);
     });
   }
   /**
@@ -2567,14 +2602,14 @@ var WagmiWalletImplementation = class {
    * @param config - The Wagmi Config object to set as active, or null to clear it.
    */
   setActiveWagmiConfig(config) {
-    import_ui_builder_utils15.logger.info(
+    import_ui_utils15.logger.info(
       LOG_SYSTEM,
       "setActiveWagmiConfig called with config:",
       config ? "Valid Config" : "Null"
     );
     this.activeWagmiConfig = config;
     if (this.unsubscribe) {
-      import_ui_builder_utils15.logger.warn(
+      import_ui_utils15.logger.warn(
         LOG_SYSTEM,
         "setActiveWagmiConfig: Active WagmiConfig instance has changed. Existing direct watchAccount subscription (via onWalletConnectionChange) may be stale and operating on an old config instance."
       );
@@ -2591,9 +2626,9 @@ var WagmiWalletImplementation = class {
     const baseConnectors = [(0, import_connectors.injected)(), (0, import_connectors.metaMask)(), (0, import_connectors.safe)()];
     if (this.walletConnectProjectId?.trim()) {
       baseConnectors.push((0, import_connectors.walletConnect)({ projectId: this.walletConnectProjectId }));
-      import_ui_builder_utils15.logger.info(LOG_SYSTEM, "WalletConnect connector added to DEFAULT config.");
+      import_ui_utils15.logger.info(LOG_SYSTEM, "WalletConnect connector added to DEFAULT config.");
     } else {
-      import_ui_builder_utils15.logger.warn(
+      import_ui_utils15.logger.warn(
         LOG_SYSTEM,
         "WalletConnect Project ID not provided; WC connector unavailable for DEFAULT config."
       );
@@ -2605,7 +2640,7 @@ var WagmiWalletImplementation = class {
         if (appNetworkIdString) {
           let httpRpcOverride = getUserRpcUrl(appNetworkIdString);
           if (!httpRpcOverride) {
-            const rpcOverrideSetting = import_ui_builder_utils15.appConfigService.getRpcEndpointOverride(appNetworkIdString);
+            const rpcOverrideSetting = import_ui_utils15.appConfigService.getRpcEndpointOverride(appNetworkIdString);
             if (typeof rpcOverrideSetting === "string") {
               httpRpcOverride = rpcOverrideSetting;
             } else if (typeof rpcOverrideSetting === "object") {
@@ -2617,7 +2652,7 @@ var WagmiWalletImplementation = class {
             }
           }
           if (httpRpcOverride) {
-            import_ui_builder_utils15.logger.info(
+            import_ui_utils15.logger.info(
               LOG_SYSTEM,
               `Using overridden RPC for chain ${chainDefinition.name} (default config): ${httpRpcOverride}`
             );
@@ -2635,10 +2670,10 @@ var WagmiWalletImplementation = class {
         connectors: baseConnectors,
         transports: transportsConfig
       });
-      import_ui_builder_utils15.logger.info(LOG_SYSTEM, "Default Wagmi config created successfully on demand.");
+      import_ui_utils15.logger.info(LOG_SYSTEM, "Default Wagmi config created successfully on demand.");
       return defaultConfig2;
     } catch (error) {
-      import_ui_builder_utils15.logger.error(LOG_SYSTEM, "Error creating default Wagmi config on demand:", error);
+      import_ui_utils15.logger.error(LOG_SYSTEM, "Error creating default Wagmi config on demand:", error);
       return (0, import_core2.createConfig)({
         chains: [defaultSupportedChains[0]],
         connectors: [(0, import_connectors.injected)()],
@@ -2656,7 +2691,7 @@ var WagmiWalletImplementation = class {
     if (userRpcUrl) {
       return { http: userRpcUrl };
     }
-    const rpcOverrideSetting = import_ui_builder_utils15.appConfigService.getRpcEndpointOverride(networkId);
+    const rpcOverrideSetting = import_ui_utils15.appConfigService.getRpcEndpointOverride(networkId);
     if (typeof rpcOverrideSetting === "string") {
       return rpcOverrideSetting;
     } else if (typeof rpcOverrideSetting === "object" && rpcOverrideSetting !== null) {
@@ -2683,20 +2718,20 @@ var WagmiWalletImplementation = class {
    */
   async getConfigForRainbowKit(currentAdapterUiKitConfig) {
     if (!this.initialized) {
-      import_ui_builder_utils15.logger.error(
+      import_ui_utils15.logger.error(
         LOG_SYSTEM,
         "getConfigForRainbowKit called before implementation initialization."
       );
       return null;
     }
     if (currentAdapterUiKitConfig?.kitName !== "rainbowkit") {
-      import_ui_builder_utils15.logger.warn(
+      import_ui_utils15.logger.warn(
         LOG_SYSTEM,
         "getConfigForRainbowKit called, but kitName is not rainbowkit. Returning null."
       );
       return null;
     }
-    import_ui_builder_utils15.logger.info(
+    import_ui_utils15.logger.info(
       LOG_SYSTEM,
       "getConfigForRainbowKit: Kit is RainbowKit. Proceeding to create/get config. CurrentAdapterUiKitConfig:",
       currentAdapterUiKitConfig
@@ -2708,10 +2743,10 @@ var WagmiWalletImplementation = class {
       this.getRpcOverrideForRainbowKit.bind(this)
     );
     if (rainbowKitWagmiConfig) {
-      import_ui_builder_utils15.logger.info(LOG_SYSTEM, "Returning RainbowKit-specific Wagmi config for provider.");
+      import_ui_utils15.logger.info(LOG_SYSTEM, "Returning RainbowKit-specific Wagmi config for provider.");
       return rainbowKitWagmiConfig;
     }
-    import_ui_builder_utils15.logger.warn(LOG_SYSTEM, "RainbowKit specific Wagmi config creation failed.");
+    import_ui_utils15.logger.warn(LOG_SYSTEM, "RainbowKit specific Wagmi config creation failed.");
     return null;
   }
   /**
@@ -2723,7 +2758,7 @@ var WagmiWalletImplementation = class {
    */
   async getActiveConfigForManager(uiKitConfig2) {
     if (!this.initialized) {
-      import_ui_builder_utils15.logger.error(
+      import_ui_utils15.logger.error(
         LOG_SYSTEM,
         "getActiveConfigForManager called before initialization! Creating fallback."
       );
@@ -2735,7 +2770,7 @@ var WagmiWalletImplementation = class {
     if (uiKitConfig2?.kitName === "rainbowkit") {
       const rkConfig = await this.getConfigForRainbowKit(uiKitConfig2);
       if (rkConfig) return rkConfig;
-      import_ui_builder_utils15.logger.warn(
+      import_ui_utils15.logger.warn(
         LOG_SYSTEM,
         "getActiveConfigForManager: RainbowKit config failed, falling back to default."
       );
@@ -2753,7 +2788,7 @@ var WagmiWalletImplementation = class {
    * @returns The current default or active Wagmi Config object.
    */
   getConfig() {
-    import_ui_builder_utils15.logger.warn(
+    import_ui_utils15.logger.warn(
       LOG_SYSTEM,
       "getConfig() is deprecated. Internal calls should use activeWagmiConfig if set, or ensure default is created."
     );
@@ -2771,10 +2806,10 @@ var WagmiWalletImplementation = class {
    * @returns The current account status from Wagmi.
    */
   getWalletConnectionStatus() {
-    import_ui_builder_utils15.logger.debug(LOG_SYSTEM, "getWalletConnectionStatus called.");
+    import_ui_utils15.logger.debug(LOG_SYSTEM, "getWalletConnectionStatus called.");
     const configToUse = this.activeWagmiConfig || this.defaultInstanceConfig || (this.defaultInstanceConfig = this.createDefaultConfig());
     if (!configToUse) {
-      import_ui_builder_utils15.logger.error(LOG_SYSTEM, "No config available for getWalletConnectionStatus!");
+      import_ui_utils15.logger.error(LOG_SYSTEM, "No config available for getWalletConnectionStatus!");
       return {
         isConnected: false,
         isConnecting: false,
@@ -2800,17 +2835,17 @@ var WagmiWalletImplementation = class {
    */
   onWalletConnectionChange(callback) {
     if (!this.initialized) {
-      import_ui_builder_utils15.logger.warn(LOG_SYSTEM, "onWalletConnectionChange called before initialization. No-op.");
+      import_ui_utils15.logger.warn(LOG_SYSTEM, "onWalletConnectionChange called before initialization. No-op.");
       return () => {
       };
     }
     if (this.unsubscribe) {
       this.unsubscribe();
-      import_ui_builder_utils15.logger.debug(LOG_SYSTEM, "Previous watchAccount unsubscribed.");
+      import_ui_utils15.logger.debug(LOG_SYSTEM, "Previous watchAccount unsubscribed.");
     }
     const configToUse = this.activeWagmiConfig || this.defaultInstanceConfig || (this.defaultInstanceConfig = this.createDefaultConfig());
     if (!configToUse) {
-      import_ui_builder_utils15.logger.error(
+      import_ui_utils15.logger.error(
         LOG_SYSTEM,
         "No config available for onWalletConnectionChange! Subscription not set."
       );
@@ -2818,7 +2853,7 @@ var WagmiWalletImplementation = class {
       };
     }
     this.unsubscribe = (0, import_core2.watchAccount)(configToUse, { onChange: callback });
-    import_ui_builder_utils15.logger.info(
+    import_ui_utils15.logger.info(
       LOG_SYSTEM,
       "watchAccount subscription established/re-established using config:",
       configToUse === this.activeWagmiConfig ? "activeExternal" : "defaultInstance"
@@ -2832,7 +2867,7 @@ var WagmiWalletImplementation = class {
    */
   async getWalletClient() {
     if (!this.initialized || !this.activeWagmiConfig) {
-      import_ui_builder_utils15.logger.warn(
+      import_ui_utils15.logger.warn(
         LOG_SYSTEM,
         "getWalletClient: Not initialized or no activeWagmiConfig. Returning null."
       );
@@ -2853,7 +2888,7 @@ var WagmiWalletImplementation = class {
    */
   async getPublicClient() {
     if (!this.initialized || !this.activeWagmiConfig) {
-      import_ui_builder_utils15.logger.warn(
+      import_ui_utils15.logger.warn(
         LOG_SYSTEM,
         "getPublicClient: Not initialized or no activeWagmiConfig. Returning null."
       );
@@ -2862,7 +2897,7 @@ var WagmiWalletImplementation = class {
     const accountStatus = (0, import_core2.getAccount)(this.activeWagmiConfig);
     const currentChainId = accountStatus.chainId;
     if (!currentChainId) {
-      import_ui_builder_utils15.logger.warn(
+      import_ui_utils15.logger.warn(
         LOG_SYSTEM,
         "getPublicClient: No connected chainId available from accountStatus. Returning null."
       );
@@ -2873,19 +2908,19 @@ var WagmiWalletImplementation = class {
         chainId: currentChainId
       });
       if (publicClient) {
-        import_ui_builder_utils15.logger.info(
+        import_ui_utils15.logger.info(
           LOG_SYSTEM,
           `getPublicClient: Successfully retrieved public client for chainId ${currentChainId}.`
         );
         return publicClient;
       }
-      import_ui_builder_utils15.logger.warn(
+      import_ui_utils15.logger.warn(
         LOG_SYSTEM,
         `getPublicClient: getWagmiCorePublicClient returned undefined/null for chainId ${currentChainId}.`
       );
       return null;
     } catch (error) {
-      import_ui_builder_utils15.logger.error(LOG_SYSTEM, "Error getting public client from wagmi/core:", error);
+      import_ui_utils15.logger.error(LOG_SYSTEM, "Error getting public client from wagmi/core:", error);
       return null;
     }
   }
@@ -2948,18 +2983,18 @@ async function getEvmWalletImplementation() {
   }
   walletImplementationPromise = (async () => {
     try {
-      import_ui_builder_utils16.logger.info(LOG_SYSTEM2, "Initializing WagmiWalletImplementation singleton (async)... ");
-      const initialUiKitConfig = import_ui_builder_utils16.appConfigService.getTypedNestedConfig(
+      import_ui_utils16.logger.info(LOG_SYSTEM2, "Initializing WagmiWalletImplementation singleton (async)... ");
+      const initialUiKitConfig = import_ui_utils16.appConfigService.getTypedNestedConfig(
         "walletui",
         "config"
       );
-      const wcProjectId = import_ui_builder_utils16.appConfigService.getGlobalServiceParam("walletconnect", "projectId");
+      const wcProjectId = import_ui_utils16.appConfigService.getGlobalServiceParam("walletconnect", "projectId");
       const instance = new WagmiWalletImplementation(wcProjectId, initialUiKitConfig);
-      import_ui_builder_utils16.logger.info(LOG_SYSTEM2, "WagmiWalletImplementation singleton created (async).");
+      import_ui_utils16.logger.info(LOG_SYSTEM2, "WagmiWalletImplementation singleton created (async).");
       walletImplementationInstance = instance;
       return instance;
     } catch (error) {
-      import_ui_builder_utils16.logger.error(LOG_SYSTEM2, "Failed to initialize WagmiWalletImplementation (async):", error);
+      import_ui_utils16.logger.error(LOG_SYSTEM2, "Failed to initialize WagmiWalletImplementation (async):", error);
       const fallbackInstance = new WagmiWalletImplementation();
       walletImplementationInstance = fallbackInstance;
       return fallbackInstance;
@@ -2969,7 +3004,7 @@ async function getEvmWalletImplementation() {
 }
 function getInitializedEvmWalletImplementation() {
   if (!walletImplementationInstance) {
-    import_ui_builder_utils16.logger.warn(
+    import_ui_utils16.logger.warn(
       LOG_SYSTEM2,
       "getInitializedEvmWalletImplementation called before instance was ready."
     );
@@ -2993,7 +3028,7 @@ function notifyListeners() {
     try {
       listener();
     } catch (error) {
-      import_ui_builder_utils18.logger.error("EvmUiKitManager", "Error in listener:", error);
+      import_ui_utils18.logger.error("EvmUiKitManager", "Error in listener:", error);
     }
   });
 }
@@ -3007,7 +3042,7 @@ function getState() {
   return { ...state };
 }
 async function configure(newFullUiKitConfig) {
-  import_ui_builder_utils18.logger.info("EvmUiKitManager:configure", "Configuring UI kit. New config:", newFullUiKitConfig);
+  import_ui_utils18.logger.info("EvmUiKitManager:configure", "Configuring UI kit. New config:", newFullUiKitConfig);
   const oldKitName = state.currentFullUiKitConfig?.kitName;
   const newKitName = newFullUiKitConfig.kitName;
   const kitChanged = oldKitName !== newKitName;
@@ -3025,7 +3060,7 @@ async function configure(newFullUiKitConfig) {
   try {
     if (newKitName === "rainbowkit") {
       if (kitChanged || !state.kitProviderComponent || !state.isKitAssetsLoaded) {
-        import_ui_builder_utils18.logger.info("EvmUiKitManager:configure", "Ensuring RainbowKit assets are loaded...");
+        import_ui_utils18.logger.info("EvmUiKitManager:configure", "Ensuring RainbowKit assets are loaded...");
         const { ensureRainbowKitAssetsLoaded: ensureRainbowKitAssetsLoaded2 } = await Promise.resolve().then(() => (init_rainbowkitAssetManager(), rainbowkitAssetManager_exports));
         const rkAssets = await ensureRainbowKitAssetsLoaded2();
         state.kitProviderComponent = rkAssets.ProviderComponent;
@@ -3035,16 +3070,16 @@ async function configure(newFullUiKitConfig) {
         }
       }
       newWagmiConfigAttempt = await evmImpl.getConfigForRainbowKit(newFullUiKitConfig);
-      import_ui_builder_utils18.logger.info("EvmUiKitManager:configure", "WagmiConfig for RainbowKit obtained.");
+      import_ui_utils18.logger.info("EvmUiKitManager:configure", "WagmiConfig for RainbowKit obtained.");
     } else if (newKitName === "custom" || !newKitName) {
       newWagmiConfigAttempt = await evmImpl.getActiveConfigForManager(newFullUiKitConfig);
-      import_ui_builder_utils18.logger.info("EvmUiKitManager:configure", "ActiveConfig for custom/default obtained.");
+      import_ui_utils18.logger.info("EvmUiKitManager:configure", "ActiveConfig for custom/default obtained.");
       if (kitChanged) {
         state.kitProviderComponent = null;
         state.isKitAssetsLoaded = false;
       }
     } else {
-      import_ui_builder_utils18.logger.warn("EvmUiKitManager:configure", `Unsupported kitName: ${newKitName}.`);
+      import_ui_utils18.logger.warn("EvmUiKitManager:configure", `Unsupported kitName: ${newKitName}.`);
       state.kitProviderComponent = null;
       state.isKitAssetsLoaded = false;
     }
@@ -3053,16 +3088,16 @@ async function configure(newFullUiKitConfig) {
     state.error = null;
     if (!newWagmiConfigAttempt && newKitName && newKitName !== "none" && newKitName !== "custom") {
       state.error = new Error(`Failed to obtain WagmiConfig for ${newKitName}`);
-      import_ui_builder_utils18.logger.error("EvmUiKitManager:configure", state.error.message);
+      import_ui_utils18.logger.error("EvmUiKitManager:configure", state.error.message);
     }
   } catch (err) {
-    import_ui_builder_utils18.logger.error("EvmUiKitManager:configure", "Error during UI kit configuration process:", err);
+    import_ui_utils18.logger.error("EvmUiKitManager:configure", "Error during UI kit configuration process:", err);
     state.error = err instanceof Error ? err : new Error(String(err));
     state.wagmiConfig = null;
     evmImpl.setActiveWagmiConfig(null);
   } finally {
     state.isInitializing = false;
-    import_ui_builder_utils18.logger.info(
+    import_ui_utils18.logger.info(
       "EvmUiKitManager:configure",
       "Configuration attempt finished. Final wagmiConfig:",
       state.wagmiConfig ? "Set" : "Null",
@@ -3123,13 +3158,13 @@ var EvmWalletUiRoot = ({ children }) => {
     const DynKitProvider = kitProviderComponent;
     const kitConfig = currentFullUiKitConfig.kitConfig || {};
     const providerProps = kitConfig.providerProps || {};
-    import_ui_builder_utils19.logger.info(
+    import_ui_utils19.logger.info(
       "EvmWalletUiRoot",
       "Wrapping children with dynamically loaded KitProvider (RainbowKit)."
     );
     finalChildren = /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(DynKitProvider, { ...providerProps, children });
   } else if (currentFullUiKitConfig?.kitName === "rainbowkit" && !isWagmiContextEffectivelyReady) {
-    import_ui_builder_utils19.logger.info(
+    import_ui_utils19.logger.info(
       "EvmWalletUiRoot",
       "RainbowKit configured, but context or assets not ready. Button may show its loading/error state."
     );
@@ -3238,28 +3273,28 @@ function generateRainbowKitExportables(uiKitConfig2) {
 }
 
 // src/wallet/services/configResolutionService.ts
-var import_ui_builder_utils23 = require("@openzeppelin/ui-builder-utils");
+var import_ui_utils23 = require("@openzeppelin/ui-utils");
 
 // src/wallet/utils.ts
-var import_ui_builder_utils22 = require("@openzeppelin/ui-builder-utils");
+var import_ui_utils22 = require("@openzeppelin/ui-utils");
 
 // src/wallet/utils/uiKitService.ts
-var import_ui_builder_utils21 = require("@openzeppelin/ui-builder-utils");
+var import_ui_utils21 = require("@openzeppelin/ui-utils");
 
 // src/wallet/utils/filterWalletComponents.ts
-var import_ui_builder_types = require("@openzeppelin/ui-builder-types");
-var import_ui_builder_utils20 = require("@openzeppelin/ui-builder-utils");
+var import_ui_types = require("@openzeppelin/ui-types");
+var import_ui_utils20 = require("@openzeppelin/ui-utils");
 function filterWalletComponents(allPossibleComponents, exclusions, kitName = "custom") {
-  import_ui_builder_utils20.logger.debug(
+  import_ui_utils20.logger.debug(
     "filterWalletComponents",
     `Filtering components for kit: ${kitName}. Exclusions: ${exclusions.join(", ")}.`
   );
   if (!allPossibleComponents || Object.keys(allPossibleComponents).length === 0) {
-    import_ui_builder_utils20.logger.debug("filterWalletComponents", `No components provided to filter for kit: ${kitName}.`);
+    import_ui_utils20.logger.debug("filterWalletComponents", `No components provided to filter for kit: ${kitName}.`);
     return void 0;
   }
   if (exclusions.length === 0) {
-    import_ui_builder_utils20.logger.debug(
+    import_ui_utils20.logger.debug(
       "filterWalletComponents",
       `Providing all components for kit: ${kitName}.`,
       allPossibleComponents
@@ -3278,14 +3313,14 @@ function filterWalletComponents(allPossibleComponents, exclusions, kitName = "cu
     }
   }
   if (componentCount > 0) {
-    import_ui_builder_utils20.logger.debug(
+    import_ui_utils20.logger.debug(
       "filterWalletComponents",
       `Providing filtered components for kit: ${kitName} after exclusions (${exclusions.join(", ")}).`,
       filteredComponents
     );
     return filteredComponents;
   }
-  import_ui_builder_utils20.logger.debug("filterWalletComponents", `All components were excluded for kit: ${kitName}.`);
+  import_ui_utils20.logger.debug("filterWalletComponents", `All components were excluded for kit: ${kitName}.`);
   return void 0;
 }
 function getComponentExclusionsFromConfig(kitConfig) {
@@ -3293,7 +3328,7 @@ function getComponentExclusionsFromConfig(kitConfig) {
     const componentsCfg = kitConfig.components;
     if (componentsCfg && typeof componentsCfg === "object" && "exclude" in componentsCfg && Array.isArray(componentsCfg.exclude)) {
       return componentsCfg.exclude.filter(
-        (key) => typeof key === "string" && import_ui_builder_types.ECOSYSTEM_WALLET_COMPONENT_KEYS.includes(key)
+        (key) => typeof key === "string" && import_ui_types.ECOSYSTEM_WALLET_COMPONENT_KEYS.includes(key)
       );
     }
   }
@@ -3302,21 +3337,21 @@ function getComponentExclusionsFromConfig(kitConfig) {
 
 // src/wallet/utils/uiKitService.ts
 function getResolvedWalletComponents(uiKitConfiguration) {
-  import_ui_builder_utils21.logger.debug(
+  import_ui_utils21.logger.debug(
     "uiKitService:getResolvedWalletComponents",
     "Received uiKitConfiguration:",
     JSON.stringify(uiKitConfiguration)
   );
   const currentKitName = uiKitConfiguration.kitName || "custom";
   if (currentKitName === "none") {
-    import_ui_builder_utils21.logger.info(
+    import_ui_utils21.logger.info(
       "uiKitService",
       'UI Kit set to "none" for getResolvedWalletComponents, not providing wallet components.'
     );
     return void 0;
   }
   const exclusions = getComponentExclusionsFromConfig(uiKitConfiguration.kitConfig);
-  import_ui_builder_utils21.logger.debug(
+  import_ui_utils21.logger.debug(
     "uiKitService",
     `Extracted component exclusions for ${currentKitName}: ${exclusions.join(", ") || "none"}.`
   );
@@ -3331,17 +3366,17 @@ function getResolvedWalletComponents(uiKitConfiguration) {
   if (currentKitName === "rainbowkit") {
     const validation = validateRainbowKitConfig(uiKitConfiguration.kitConfig);
     if (!validation.isValid) {
-      import_ui_builder_utils21.logger.warn(
+      import_ui_utils21.logger.warn(
         "uiKitService",
         `Invalid RainbowKit configuration for components: ${validation.error}. No components provided.`
       );
       return void 0;
     }
     const rainbowKitComponents = createRainbowKitComponents();
-    import_ui_builder_utils21.logger.info("uiKitService", "Providing RainbowKit components.");
+    import_ui_utils21.logger.info("uiKitService", "Providing RainbowKit components.");
     return filterWalletComponents(rainbowKitComponents, exclusions, currentKitName);
   }
-  import_ui_builder_utils21.logger.warn(
+  import_ui_utils21.logger.warn(
     "uiKitService",
     `UI Kit "${currentKitName}" for getResolvedWalletComponents not explicitly supported. No components provided.`
   );
@@ -3353,7 +3388,7 @@ function getResolvedWalletComponents2(uiKitConfig2) {
   return getResolvedWalletComponents(uiKitConfig2);
 }
 async function resolveAndInitializeKitConfig(kitName, programmaticKitConfig, loadConfigModule) {
-  import_ui_builder_utils22.logger.debug(
+  import_ui_utils22.logger.debug(
     "resolveAndInitializeKitConfig",
     `Resolving native config for kit: ${kitName || "none"}`,
     {
@@ -3367,7 +3402,7 @@ async function resolveAndInitializeKitConfig(kitName, programmaticKitConfig, loa
     try {
       userNativeConfig = await loadConfigModule(conventionalConfigPath);
     } catch (error) {
-      import_ui_builder_utils22.logger.warn(
+      import_ui_utils22.logger.warn(
         "resolveAndInitializeKitConfig",
         `Call to load native config for ${kitName} from ${conventionalConfigPath} failed. Error:`,
         error
@@ -3382,7 +3417,7 @@ async function resolveAndInitializeKitConfig(kitName, programmaticKitConfig, loa
   } else if (programmaticKitConfig) {
     return programmaticKitConfig;
   }
-  import_ui_builder_utils22.logger.debug(
+  import_ui_utils22.logger.debug(
     "resolveAndInitializeKitConfig",
     `No native or programmatic kitConfig provided for ${kitName || "none"}. Returning null.`
   );
@@ -3391,7 +3426,7 @@ async function resolveAndInitializeKitConfig(kitName, programmaticKitConfig, loa
 
 // src/wallet/services/configResolutionService.ts
 async function resolveFullUiKitConfiguration(programmaticOverrides, initialAppServiceKitName, currentAppServiceConfig, options) {
-  import_ui_builder_utils23.logger.debug(
+  import_ui_utils23.logger.debug(
     "configResolutionService:resolveFullUiKitConfiguration",
     "Starting resolution with:",
     {
@@ -3418,7 +3453,7 @@ async function resolveFullUiKitConfiguration(programmaticOverrides, initialAppSe
     // Pass through customCode for export purposes only
     customCode: programmaticOverrides.customCode
   };
-  import_ui_builder_utils23.logger.debug(
+  import_ui_utils23.logger.debug(
     "configResolutionService:resolveFullUiKitConfiguration",
     "Resolved finalFullConfig:",
     finalFullConfig
@@ -3427,19 +3462,19 @@ async function resolveFullUiKitConfiguration(programmaticOverrides, initialAppSe
 }
 
 // src/abi/etherscan.ts
-var import_ui_builder_utils24 = require("@openzeppelin/ui-builder-utils");
+var import_ui_utils24 = require("@openzeppelin/ui-utils");
 async function loadAbiFromEtherscan(address, networkConfig) {
   if (shouldUseV2Api(networkConfig)) {
-    import_ui_builder_utils24.logger.info("loadAbiFromEtherscan", "Using V2 API for fetching ABI");
+    import_ui_utils24.logger.info("loadAbiFromEtherscan", "Using V2 API for fetching ABI");
     return loadAbiFromEtherscanV2(address, networkConfig);
   }
-  import_ui_builder_utils24.logger.info("loadAbiFromEtherscan", "Using V1 API for fetching ABI");
+  import_ui_utils24.logger.info("loadAbiFromEtherscan", "Using V1 API for fetching ABI");
   return loadAbiFromEtherscanV1(address, networkConfig);
 }
 async function loadAbiFromEtherscanV1(address, networkConfig) {
   const explorerConfig = resolveExplorerConfig(networkConfig);
   if (!explorerConfig.apiUrl) {
-    import_ui_builder_utils24.logger.error(
+    import_ui_utils24.logger.error(
       "loadAbiFromEtherscanV1",
       `API URL is missing for ${networkConfig.name} explorer.`
     );
@@ -3454,20 +3489,20 @@ async function loadAbiFromEtherscanV1(address, networkConfig) {
   }
   let response;
   try {
-    import_ui_builder_utils24.logger.info(
+    import_ui_utils24.logger.info(
       "loadAbiFromEtherscanV1",
       `Fetching ABI from ${explorerConfig.apiUrl} for address: ${address}`
     );
     response = await fetch(url);
   } catch (networkError) {
-    import_ui_builder_utils24.logger.error(
+    import_ui_utils24.logger.error(
       "loadAbiFromEtherscanV1",
       `Network error fetching ABI from Explorer API: ${networkError}`
     );
     throw new Error(`Network error fetching ABI: ${networkError.message}`);
   }
   if (!response.ok) {
-    import_ui_builder_utils24.logger.error(
+    import_ui_utils24.logger.error(
       "loadAbiFromEtherscanV1",
       `Explorer API request failed with status: ${response.status}`
     );
@@ -3477,14 +3512,14 @@ async function loadAbiFromEtherscanV1(address, networkConfig) {
   try {
     apiResult = await response.json();
   } catch (jsonError) {
-    import_ui_builder_utils24.logger.error(
+    import_ui_utils24.logger.error(
       "loadAbiFromEtherscanV1",
       `Failed to parse Explorer API response as JSON: ${jsonError}`
     );
     throw new Error("Invalid JSON response received from Explorer API.");
   }
   if (apiResult.status !== "1") {
-    import_ui_builder_utils24.logger.warn(
+    import_ui_utils24.logger.warn(
       "loadAbiFromEtherscanV1",
       `Explorer API error: Status ${apiResult.status}, Message: ${apiResult.message}, Result: ${apiResult.result}`
     );
@@ -3503,13 +3538,13 @@ async function loadAbiFromEtherscanV1(address, networkConfig) {
       throw new Error("Parsed ABI from Explorer API is not an array.");
     }
   } catch (error) {
-    import_ui_builder_utils24.logger.error(
+    import_ui_utils24.logger.error(
       "loadAbiFromEtherscanV1",
       `Failed to parse ABI JSON string from Explorer API result: ${error}`
     );
     throw new Error(`Invalid ABI JSON received from Explorer API: ${error.message}`);
   }
-  import_ui_builder_utils24.logger.info(
+  import_ui_utils24.logger.info(
     "loadAbiFromEtherscanV1",
     `Successfully parsed ABI for ${networkConfig.name} with ${abi.length} items.`
   );
@@ -3523,17 +3558,17 @@ async function loadAbiFromEtherscanV1(address, networkConfig) {
 
 // src/abi/loader.ts
 var import_viem5 = require("viem");
-var import_ui_builder_utils29 = require("@openzeppelin/ui-builder-utils");
+var import_ui_utils29 = require("@openzeppelin/ui-utils");
 
 // src/proxy/detection.ts
 var import_viem4 = require("viem");
-var import_ui_builder_utils27 = require("@openzeppelin/ui-builder-utils");
+var import_ui_utils27 = require("@openzeppelin/ui-utils");
 
 // src/configuration/execution.ts
-var import_ui_builder_utils26 = require("@openzeppelin/ui-builder-utils");
+var import_ui_utils26 = require("@openzeppelin/ui-utils");
 
 // src/validation/eoa.ts
-var import_ui_builder_utils25 = require("@openzeppelin/ui-builder-utils");
+var import_ui_utils25 = require("@openzeppelin/ui-utils");
 var SYSTEM_LOG_TAG = "EoaValidator";
 async function validateEoaConfig(config, walletStatus) {
   if (!config.allowAny) {
@@ -3548,7 +3583,7 @@ async function validateEoaConfig(config, walletStatus) {
         return `Connected wallet address (${walletStatus.address}) does not match the required specific EOA address (${config.specificAddress}). Please connect the correct wallet.`;
       }
     } else if (walletStatus.isConnected && !walletStatus.address) {
-      import_ui_builder_utils25.logger.warn(
+      import_ui_utils25.logger.warn(
         SYSTEM_LOG_TAG,
         "Wallet is connected but address is unavailable for EOA validation."
       );
@@ -3572,7 +3607,7 @@ async function validateRelayerConfig(config) {
 // src/configuration/execution.ts
 var SYSTEM_LOG_TAG2 = "adapter-evm-execution-config";
 async function getEvmSupportedExecutionMethods() {
-  import_ui_builder_utils26.logger.warn(
+  import_ui_utils26.logger.warn(
     "adapter-evm-execution-config",
     "getEvmSupportedExecutionMethods is using placeholder implementation."
   );
@@ -3598,11 +3633,11 @@ async function getEvmSupportedExecutionMethods() {
   ]);
 }
 async function _validateMultisigConfig(_config, _walletStatus) {
-  import_ui_builder_utils26.logger.info(SYSTEM_LOG_TAG2, "Multisig execution config validation: Not yet fully implemented.");
+  import_ui_utils26.logger.info(SYSTEM_LOG_TAG2, "Multisig execution config validation: Not yet fully implemented.");
   return true;
 }
 async function validateEvmExecutionConfig(config, walletStatus) {
-  import_ui_builder_utils26.logger.info(SYSTEM_LOG_TAG2, "Validating EVM execution config:", { config, walletStatus });
+  import_ui_utils26.logger.info(SYSTEM_LOG_TAG2, "Validating EVM execution config:", { config, walletStatus });
   switch (config.method) {
     case "eoa":
       return validateEoaConfig(config, walletStatus);
@@ -3612,7 +3647,7 @@ async function validateEvmExecutionConfig(config, walletStatus) {
       return _validateMultisigConfig(config, walletStatus);
     default: {
       const unknownMethod = config.method;
-      import_ui_builder_utils26.logger.warn(
+      import_ui_utils26.logger.warn(
         SYSTEM_LOG_TAG2,
         `Unsupported execution method type encountered: ${unknownMethod}`
       );
@@ -3711,7 +3746,7 @@ function detectProxyFromAbi(abi) {
   };
 }
 async function getImplementationAddress(proxyAddress, networkConfig, proxyType) {
-  import_ui_builder_utils27.logger.info(
+  import_ui_utils27.logger.info(
     "getImplementationAddress",
     `Resolving implementation for ${proxyType} proxy: ${proxyAddress}`
   );
@@ -3728,7 +3763,7 @@ async function getImplementationAddress(proxyAddress, networkConfig, proxyType)
       case "beacon":
         return await getBeaconImplementation(proxyAddress, networkConfig);
       case "diamond":
-        import_ui_builder_utils27.logger.info("getImplementationAddress", "Diamond proxies not fully supported yet");
+        import_ui_utils27.logger.info("getImplementationAddress", "Diamond proxies not fully supported yet");
         return null;
       case "minimal":
         return await getMinimalProxyImplementation(proxyAddress, networkConfig);
@@ -3736,7 +3771,7 @@ async function getImplementationAddress(proxyAddress, networkConfig, proxyType)
         return await tryCommonImplementationMethods(proxyAddress, networkConfig);
     }
   } catch (error) {
-    import_ui_builder_utils27.logger.warn("getImplementationAddress", `Failed to resolve implementation: ${error}`);
+    import_ui_utils27.logger.warn("getImplementationAddress", `Failed to resolve implementation: ${error}`);
     return null;
   }
 }
@@ -3748,7 +3783,7 @@ async function getAdminAddress(proxyAddress, networkConfig) {
     if (legacyAdmin) return legacyAdmin;
     return null;
   } catch (error) {
-    import_ui_builder_utils27.logger.warn("getAdminAddress", `Failed to resolve admin: ${error}`);
+    import_ui_utils27.logger.warn("getAdminAddress", `Failed to resolve admin: ${error}`);
     return null;
   }
 }
@@ -3763,20 +3798,20 @@ async function getEIP1967Admin(proxyAddress, networkConfig) {
 async function getLegacyOZAdmin(proxyAddress, networkConfig) {
   try {
     const slot = (0, import_viem4.keccak256)((0, import_viem4.toHex)("org.zeppelinos.proxy.admin"));
-    import_ui_builder_utils27.logger.info("getLegacyOZAdmin", `Trying legacy OZ admin slot: ${slot}`);
+    import_ui_utils27.logger.info("getLegacyOZAdmin", `Trying legacy OZ admin slot: ${slot}`);
     return await readStorageSlot(proxyAddress, slot, networkConfig);
   } catch (error) {
-    import_ui_builder_utils27.logger.warn("getLegacyOZAdmin", `Failed computing or reading legacy admin slot: ${error}`);
+    import_ui_utils27.logger.warn("getLegacyOZAdmin", `Failed computing or reading legacy admin slot: ${error}`);
     return null;
   }
 }
 async function getLegacyOZImplementation(proxyAddress, networkConfig) {
   try {
     const slot = (0, import_viem4.keccak256)((0, import_viem4.toHex)("org.zeppelinos.proxy.implementation"));
-    import_ui_builder_utils27.logger.info("getLegacyOZImplementation", `Trying legacy OZ slot: ${slot}`);
+    import_ui_utils27.logger.info("getLegacyOZImplementation", `Trying legacy OZ slot: ${slot}`);
     return await readStorageSlot(proxyAddress, slot, networkConfig);
   } catch (error) {
-    import_ui_builder_utils27.logger.warn("getLegacyOZImplementation", `Failed computing or reading legacy slot: ${error}`);
+    import_ui_utils27.logger.warn("getLegacyOZImplementation", `Failed computing or reading legacy slot: ${error}`);
     return null;
   }
 }
@@ -3800,7 +3835,7 @@ async function getMinimalProxyImplementation(proxyAddress, networkConfig) {
     }
     return null;
   } catch (error) {
-    import_ui_builder_utils27.logger.warn("getMinimalProxyImplementation", `Error reading bytecode: ${error}`);
+    import_ui_utils27.logger.warn("getMinimalProxyImplementation", `Error reading bytecode: ${error}`);
     return null;
   }
 }
@@ -3815,7 +3850,7 @@ async function tryCommonImplementationMethods(proxyAddress, networkConfig) {
     try {
       const result = await callContractFunction(proxyAddress, method, [], networkConfig);
       if (result && result !== "0x0000000000000000000000000000000000000000") {
-        import_ui_builder_utils27.logger.info(
+        import_ui_utils27.logger.info(
           "tryCommonImplementationMethods",
           `Found implementation via ${method}: ${result}`
         );
@@ -3841,13 +3876,13 @@ async function readStorageSlot(address, slot, networkConfig) {
       slot
     });
     if (storageValue && storageValue !== "0x0000000000000000000000000000000000000000000000000000000000000000") {
-      import_ui_builder_utils27.logger.info("readStorageSlot", `Found non-zero value at slot ${slot}: ${storageValue}`);
+      import_ui_utils27.logger.info("readStorageSlot", `Found non-zero value at slot ${slot}: ${storageValue}`);
       const implAddress = "0x" + storageValue.slice(-40);
       return implAddress;
     }
     return null;
   } catch (error) {
-    import_ui_builder_utils27.logger.warn("readStorageSlot", `Failed to read storage slot ${slot}: ${error}`);
+    import_ui_utils27.logger.warn("readStorageSlot", `Failed to read storage slot ${slot}: ${error}`);
     return null;
   }
 }
@@ -3868,7 +3903,7 @@ async function callContractFunction(address, signature, params, networkConfig) {
     }
     return null;
   } catch (error) {
-    import_ui_builder_utils27.logger.warn("callContractFunction", `Failed to call ${signature}: ${error}`);
+    import_ui_utils27.logger.warn("callContractFunction", `Failed to call ${signature}: ${error}`);
     return null;
   }
 }
@@ -3880,13 +3915,13 @@ async function getContractBytecode(address, networkConfig) {
     });
     return bytecode || null;
   } catch (error) {
-    import_ui_builder_utils27.logger.warn("getContractBytecode", `Failed to get bytecode: ${error}`);
+    import_ui_utils27.logger.warn("getContractBytecode", `Failed to get bytecode: ${error}`);
     return null;
   }
 }
 
 // src/abi/sourcify.ts
-var import_ui_builder_utils28 = require("@openzeppelin/ui-builder-utils");
+var import_ui_utils28 = require("@openzeppelin/ui-utils");
 var SOURCIFY_APP_BASE = "https://repo.sourcify.dev";
 function getSourcifyContractAppUrl(chainId, address) {
   return `${SOURCIFY_APP_BASE}/${chainId}/${address}`;
@@ -3904,7 +3939,7 @@ async function loadAbiFromSourcify(address, networkConfig, timeoutMs = 4e3) {
   const timeout = setTimeout(() => controller.abort(), timeoutMs);
   try {
     const url = buildSourcifyApiUrl(networkConfig.chainId, address);
-    import_ui_builder_utils28.logger.info("loadAbiFromSourcify", `Fetching contract from ${url}`);
+    import_ui_utils28.logger.info("loadAbiFromSourcify", `Fetching contract from ${url}`);
     const response = await fetch(url, { signal: controller.signal });
     if (!response.ok) {
       throw new Error(`Sourcify request failed: ${response.status} ${response.statusText}`);
@@ -3919,7 +3954,7 @@ async function loadAbiFromSourcify(address, networkConfig, timeoutMs = 4e3) {
     const schema = transformAbiToSchema(abi, contractName, address);
     return { schema, originalAbi: JSON.stringify(abi) };
   } catch (error) {
-    import_ui_builder_utils28.logger.warn("loadAbiFromSourcify", `Failed to fetch ABI from Sourcify: ${String(error)}`);
+    import_ui_utils28.logger.warn("loadAbiFromSourcify", `Failed to fetch ABI from Sourcify: ${String(error)}`);
     throw error;
   } finally {
     clearTimeout(timeout);
@@ -3935,10 +3970,10 @@ async function loadAbiFromJson(abiJsonString) {
       throw new Error("Parsed JSON is not an array.");
     }
   } catch (error) {
-    import_ui_builder_utils29.logger.error("loadAbiFromJson", "Failed to parse source string as JSON ABI:", error);
+    import_ui_utils29.logger.error("loadAbiFromJson", "Failed to parse source string as JSON ABI:", error);
     throw new Error(`Invalid JSON ABI provided: ${error.message}`);
   }
-  import_ui_builder_utils29.logger.info("loadAbiFromJson", `Successfully parsed JSON ABI with ${abi.length} items.`);
+  import_ui_utils29.logger.info("loadAbiFromJson", `Successfully parsed JSON ABI with ${abi.length} items.`);
   const contractName = "ContractFromABI";
   return transformAbiToSchema(abi, contractName, void 0);
 }
@@ -3957,7 +3992,7 @@ async function loadEvmContract(artifacts, networkConfig, options = {}) {
     const trimmed = contractDefinition.trim();
     const hasJsonContent = trimmed.includes("[") && trimmed.includes("]") && trimmed.includes("{");
     if (hasJsonContent) {
-      import_ui_builder_utils29.logger.info("loadEvmContract", "Manual contract definition provided. Attempting to parse...");
+      import_ui_utils29.logger.info("loadEvmContract", "Manual contract definition provided. Attempting to parse...");
       try {
         const schema = await loadAbiFromJson(contractDefinition);
         return {
@@ -3973,14 +4008,14 @@ async function loadEvmContract(artifacts, networkConfig, options = {}) {
           // Note: No proxy detection for manual ABIs - user provides what they want
         };
       } catch (error) {
-        import_ui_builder_utils29.logger.error("loadEvmContract", "Failed to parse manually provided ABI:", error);
+        import_ui_utils29.logger.error("loadEvmContract", "Failed to parse manually provided ABI:", error);
         throw new Error(`The provided ABI JSON is invalid: ${error.message}`);
       }
     }
   }
   const forcedRaw = artifacts.__forcedProvider || artifacts.service;
   const forcedProvider = isEvmProviderKey(forcedRaw) ? forcedRaw : null;
-  import_ui_builder_utils29.logger.info(
+  import_ui_utils29.logger.info(
     "loadEvmContract",
     `No manual ABI detected. Attempting Etherscan fetch for address: ${contractAddress}...`
   );
@@ -4009,7 +4044,7 @@ function buildContractResult(contractAddress, abiResult, networkConfig, sourcePr
       contractName: abiResult.schema.name,
       verificationStatus: "verified",
       fetchTimestamp: /* @__PURE__ */ new Date(),
-      definitionHash: (0, import_ui_builder_utils29.simpleHash)(abiResult.originalAbi)
+      definitionHash: (0, import_ui_utils29.simpleHash)(abiResult.originalAbi)
     },
     proxyInfo
   };
@@ -4017,13 +4052,13 @@ function buildContractResult(contractAddress, abiResult, networkConfig, sourcePr
 async function loadImplementationAbi(_contractAddress, implementationAddress, networkConfig, _proxyType) {
   try {
     const implementationResult = await loadAbiFromEtherscan(implementationAddress, networkConfig);
-    import_ui_builder_utils29.logger.info(
+    import_ui_utils29.logger.info(
       "loadImplementationAbi",
       `Successfully fetched implementation ABI with ${implementationResult.schema.functions.length} functions`
     );
     return implementationResult;
   } catch (implementationError) {
-    import_ui_builder_utils29.logger.warn(
+    import_ui_utils29.logger.warn(
       "loadImplementationAbi",
       `Failed to load implementation ABI: ${implementationError}`
     );
@@ -4036,7 +4071,7 @@ async function handleProxyDetection(contractAddress, initialResult, networkConfi
   if (!proxyDetection.isProxy) {
     return null;
   }
-  import_ui_builder_utils29.logger.info(
+  import_ui_utils29.logger.info(
     "handleProxyDetection",
     `Proxy detected: ${proxyDetection.proxyType} (confidence: ${proxyDetection.confidence})`
   );
@@ -4048,7 +4083,7 @@ async function handleProxyDetection(contractAddress, initialResult, networkConfi
   );
   const adminAddress = await getAdminAddress(contractAddress, networkConfig);
   if (!implementationAddress) {
-    import_ui_builder_utils29.logger.info("handleProxyDetection", "Proxy detected but implementation address not found");
+    import_ui_utils29.logger.info("handleProxyDetection", "Proxy detected but implementation address not found");
     return buildContractResult(contractAddress, initialResult, networkConfig, initialProvider, {
       isProxy: true,
       proxyType,
@@ -4056,7 +4091,7 @@ async function handleProxyDetection(contractAddress, initialResult, networkConfi
       detectionMethod: "automatic"
     });
   }
-  import_ui_builder_utils29.logger.info("handleProxyDetection", `Found implementation at: ${implementationAddress}`);
+  import_ui_utils29.logger.info("handleProxyDetection", `Found implementation at: ${implementationAddress}`);
   const implementationResult = await loadImplementationAbi(
     contractAddress,
     implementationAddress,
@@ -4092,12 +4127,12 @@ async function handleProxyDetection(contractAddress, initialResult, networkConfi
 async function loadContractWithProxyDetection(contractAddress, networkConfig, options = {}, forcedProvider = null) {
   try {
     let uiDefault = null;
-    const svcCfg = import_ui_builder_utils29.userNetworkServiceConfigService.get(networkConfig.id, "contract-definitions");
+    const svcCfg = import_ui_utils29.userNetworkServiceConfigService.get(networkConfig.id, "contract-definitions");
     if (svcCfg && typeof svcCfg === "object" && "defaultProvider" in svcCfg) {
       const raw = svcCfg.defaultProvider;
       if (isEvmProviderKey(raw)) uiDefault = raw;
     }
-    const appDefaultRaw = import_ui_builder_utils29.appConfigService.getGlobalServiceParam(
+    const appDefaultRaw = import_ui_utils29.appConfigService.getGlobalServiceParam(
       "contractdefinition",
       "defaultProvider"
     );
@@ -4116,13 +4151,13 @@ async function loadContractWithProxyDetection(contractAddress, networkConfig, op
         const remainingOverall = Math.max(100, overallDeadline - Date.now());
         const attemptTimeout = Math.min(PER_PROVIDER_TIMEOUT_MS, remainingOverall);
         if (provider === EvmProviderKeys.Etherscan) {
-          initialResult = await (0, import_ui_builder_utils29.withTimeout)(
+          initialResult = await (0, import_ui_utils29.withTimeout)(
             loadAbiFromEtherscan(contractAddress, networkConfig),
             attemptTimeout,
             "etherscan"
           );
         } else if (provider === EvmProviderKeys.Sourcify) {
-          initialResult = await (0, import_ui_builder_utils29.withTimeout)(
+          initialResult = await (0, import_ui_utils29.withTimeout)(
             loadAbiFromSourcify(contractAddress, networkConfig, attemptTimeout),
             attemptTimeout,
             "sourcify"
@@ -4138,7 +4173,7 @@ async function loadContractWithProxyDetection(contractAddress, networkConfig, op
       }
     }
     if (!initialResult) throw lastError ?? new Error("No provider succeeded");
-    import_ui_builder_utils29.logger.info(
+    import_ui_utils29.logger.info(
       "loadContractWithProxyDetection",
       `Successfully fetched initial ABI for ${contractAddress} with ${initialResult.schema.functions.length} functions`
     );
@@ -4155,7 +4190,7 @@ async function loadContractWithProxyDetection(contractAddress, networkConfig, op
     }
     return buildContractResult(contractAddress, initialResult, networkConfig, usedProvider);
   } catch (error) {
-    import_ui_builder_utils29.logger.warn("loadContractWithProxyDetection", `Contract loading failed: ${error}`);
+    import_ui_utils29.logger.warn("loadContractWithProxyDetection", `Contract loading failed: ${error}`);
     if (forcedProvider) {
       throw error;
     }
@@ -4191,6 +4226,23 @@ var EVM_TYPE_TO_FIELD_TYPE = {
   bytes: "textarea",
   bytes32: "text"
 };
+var EVM_DYNAMIC_PATTERNS = [
+  { 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" }
+];
+function getEvmTypeMappingInfo() {
+  return {
+    primitives: { ...EVM_TYPE_TO_FIELD_TYPE },
+    dynamicPatterns: EVM_DYNAMIC_PATTERNS
+  };
+}
 
 // src/mapping/type-mapper.ts
 function mapEvmParamTypeToFieldType(parameterType) {
@@ -4243,7 +4295,7 @@ function getEvmCompatibleFieldTypes(parameterType) {
 
 // src/mapping/field-generator.ts
 var import_lodash = require("lodash");
-var import_ui_builder_utils30 = require("@openzeppelin/ui-builder-utils");
+var import_ui_utils30 = require("@openzeppelin/ui-utils");
 function extractArrayElementType(parameterType) {
   const arrayMatch = parameterType.match(/^(.+)\[\d*\]$/);
   if (arrayMatch) {
@@ -4274,8 +4326,8 @@ function generateEvmDefaultField(parameter) {
     type: fieldType,
     placeholder: `Enter ${parameter.displayName || parameter.name || parameter.type}`,
     helperText: parameter.description || "",
-    defaultValue: (0, import_ui_builder_utils30.getDefaultValueForType)(fieldType),
-    validation: (0, import_ui_builder_utils30.enhanceNumericValidation)(
+    defaultValue: (0, import_ui_utils30.getDefaultValueForType)(fieldType),
+    validation: (0, import_ui_utils30.enhanceNumericValidation)(
       getDefaultValidation(),
       parameter.type,
       EVM_NUMERIC_BOUNDS
@@ -4291,7 +4343,7 @@ function generateEvmDefaultField(parameter) {
         elementType: elementFieldType,
         elementFieldConfig: {
           type: elementFieldType,
-          validation: (0, import_ui_builder_utils30.enhanceNumericValidation)(
+          validation: (0, import_ui_utils30.enhanceNumericValidation)(
             getDefaultValidation(),
             elementType,
             EVM_NUMERIC_BOUNDS
@@ -4319,11 +4371,11 @@ function isEvmViewFunction(functionDetails) {
 
 // src/query/handler.ts
 var import_viem7 = require("viem");
-var import_ui_builder_utils33 = require("@openzeppelin/ui-builder-utils");
+var import_ui_utils33 = require("@openzeppelin/ui-utils");
 
 // src/transform/input-parser.ts
 var import_viem6 = require("viem");
-var import_ui_builder_utils31 = require("@openzeppelin/ui-builder-utils");
+var import_ui_utils31 = require("@openzeppelin/ui-utils");
 function parseEvmInput(param, rawValue, isRecursive = false) {
   const { type, name } = param;
   const baseType = type.replace(/\[\d*\]$/, "");
@@ -4441,7 +4493,7 @@ function parseEvmInput(param, rawValue, isRecursive = false) {
     } else if (baseType === "string") {
       return String(rawValue);
     }
-    import_ui_builder_utils31.logger.warn(
+    import_ui_utils31.logger.warn(
       "parseEvmInput",
       `Unknown EVM parameter type encountered: '${type}'. Using raw value.`
     );
@@ -4454,10 +4506,10 @@ function parseEvmInput(param, rawValue, isRecursive = false) {
 }
 
 // src/transform/output-formatter.ts
-var import_ui_builder_utils32 = require("@openzeppelin/ui-builder-utils");
+var import_ui_utils32 = require("@openzeppelin/ui-utils");
 function formatEvmFunctionResult(decodedValue, functionDetails) {
   if (!functionDetails.outputs || !Array.isArray(functionDetails.outputs)) {
-    import_ui_builder_utils32.logger.warn(
+    import_ui_utils32.logger.warn(
       "formatEvmFunctionResult",
       `Output ABI definition missing or invalid for function ${functionDetails.name}.`
     );
@@ -4485,7 +4537,7 @@ function formatEvmFunctionResult(decodedValue, functionDetails) {
     }
   } catch (error) {
     const errorMessage = `Error formatting result for ${functionDetails.name}: ${error.message}`;
-    import_ui_builder_utils32.logger.error("formatEvmFunctionResult", errorMessage, {
+    import_ui_utils32.logger.error("formatEvmFunctionResult", errorMessage, {
       functionName: functionDetails.name,
       decodedValue,
       error
@@ -4508,14 +4560,14 @@ async function getPublicClientForQuery(walletImplementation, networkConfig) {
     if (clientFromWallet) {
       return clientFromWallet;
     } else {
-      import_ui_builder_utils33.logger.warn(
+      import_ui_utils33.logger.warn(
         "getPublicClientForQuery",
         `Could not get public client from connected wallet for chain ${walletChainId}. Falling back.`
       );
     }
   }
   const resolvedRpc = resolveRpcUrl(networkConfig);
-  import_ui_builder_utils33.logger.info(
+  import_ui_utils33.logger.info(
     "getPublicClientForQuery",
     `Wallet not connected/on wrong chain OR failed to get wallet client. Creating dedicated public client for query on ${networkConfig.name} using RPC: ${resolvedRpc}`
   );
@@ -4526,7 +4578,7 @@ function createPublicClientWithRpc(networkConfig, rpcUrl) {
   if (networkConfig.viemChain) {
     chainForViem = networkConfig.viemChain;
   } else {
-    import_ui_builder_utils33.logger.warn(
+    import_ui_utils33.logger.warn(
       "createPublicClientWithRpc",
       `Viem chain object (viemChain) not provided in EvmNetworkConfig for ${networkConfig.name} (query). Creating a minimal one.`
     );
@@ -4553,7 +4605,7 @@ function createPublicClientWithRpc(networkConfig, rpcUrl) {
     });
     return publicClient;
   } catch (error) {
-    import_ui_builder_utils33.logger.error(
+    import_ui_utils33.logger.error(
       "createPublicClientWithRpc",
       "Failed to create network-specific public client for query:",
       error
@@ -4564,7 +4616,7 @@ function createPublicClientWithRpc(networkConfig, rpcUrl) {
   }
 }
 async function queryEvmViewFunction(contractAddress, functionId, networkConfig, params, contractSchema, walletImplementation, loadContractFn) {
-  import_ui_builder_utils33.logger.info(
+  import_ui_utils33.logger.info(
     "queryEvmViewFunction",
     `Querying view function: ${functionId} on ${contractAddress} (${networkConfig.name})`,
     { params }
@@ -4595,9 +4647,9 @@ async function queryEvmViewFunction(contractAddress, functionId, networkConfig,
       }
       return parseEvmInput(inputParam, rawValue, false);
     });
-    import_ui_builder_utils33.logger.debug("queryEvmViewFunction", "Parsed Args for readContract:", args);
+    import_ui_utils33.logger.debug("queryEvmViewFunction", "Parsed Args for readContract:", args);
     const functionAbiItem = createAbiFunctionItem(functionDetails);
-    import_ui_builder_utils33.logger.debug(
+    import_ui_utils33.logger.debug(
       "queryEvmViewFunction",
       `[Query ${functionDetails.name}] Calling readContract with ABI:`,
       functionAbiItem,
@@ -4613,7 +4665,7 @@ async function queryEvmViewFunction(contractAddress, functionId, networkConfig,
         args
       });
     } catch (readError) {
-      import_ui_builder_utils33.logger.error(
+      import_ui_utils33.logger.error(
         "queryEvmViewFunction",
         `[Query ${functionDetails.name}] publicClient.readContract specific error:`,
         readError
@@ -4622,7 +4674,7 @@ async function queryEvmViewFunction(contractAddress, functionId, networkConfig,
         `Viem readContract failed for ${functionDetails.name}: ${readError.message}`
       );
     }
-    import_ui_builder_utils33.logger.debug(
+    import_ui_utils33.logger.debug(
       "queryEvmViewFunction",
       `[Query ${functionDetails.name}] Raw decoded result:`,
       decodedResult
@@ -4630,7 +4682,7 @@ async function queryEvmViewFunction(contractAddress, functionId, networkConfig,
     return decodedResult;
   } catch (error) {
     const errorMessage = `Failed to query view function ${functionId} on network ${networkConfig.name}: ${error.message}`;
-    import_ui_builder_utils33.logger.error("queryEvmViewFunction", errorMessage, {
+    import_ui_utils33.logger.error("queryEvmViewFunction", errorMessage, {
       contractAddress,
       functionId,
       params,
@@ -4644,7 +4696,7 @@ async function queryEvmViewFunction(contractAddress, functionId, networkConfig,
 // src/transaction/relayer.ts
 var import_viem8 = require("viem");
 var import_relayer_sdk = require("@openzeppelin/relayer-sdk");
-var import_ui_builder_utils34 = require("@openzeppelin/ui-builder-utils");
+var import_ui_utils34 = require("@openzeppelin/ui-utils");
 var RelayerExecutionStrategy = class {
   async execute(transactionData, executionConfig, _walletImplementation, onStatusChange, runtimeApiKey) {
     const relayerConfig = executionConfig;
@@ -4679,7 +4731,7 @@ var RelayerExecutionStrategy = class {
    * @throws If the API call fails or returns an unsuccessful response.
    */
   async getEvmRelayers(serviceUrl, accessToken, networkConfig) {
-    import_ui_builder_utils34.logger.info(
+    import_ui_utils34.logger.info(
       "[Relayer] Getting relayers with access token",
       accessToken.slice(0, 5).padEnd(accessToken.length, "*")
     );
@@ -4727,7 +4779,7 @@ var RelayerExecutionStrategy = class {
    * @throws If any API call fails or returns an unsuccessful response.
    */
   async getEvmRelayer(serviceUrl, accessToken, relayerId, networkConfig) {
-    import_ui_builder_utils34.logger.info("[Relayer] Getting detailed relayer info", relayerId);
+    import_ui_utils34.logger.info("[Relayer] Getting detailed relayer info", relayerId);
     const sdkConfig = new import_relayer_sdk.Configuration({
       basePath: serviceUrl,
       accessToken
@@ -4737,11 +4789,11 @@ var RelayerExecutionStrategy = class {
       const [relayerResponse, balanceResponse, statusResponse] = await Promise.all([
         relayersApi.getRelayer(relayerId),
         relayersApi.getRelayerBalance(relayerId).catch((err) => {
-          import_ui_builder_utils34.logger.warn("[Relayer] Failed to fetch balance", err);
+          import_ui_utils34.logger.warn("[Relayer] Failed to fetch balance", err);
           return null;
         }),
         relayersApi.getRelayerStatus(relayerId).catch((err) => {
-          import_ui_builder_utils34.logger.warn("[Relayer] Failed to fetch status", err);
+          import_ui_utils34.logger.warn("[Relayer] Failed to fetch status", err);
           return null;
         })
       ]);
@@ -4764,7 +4816,7 @@ var RelayerExecutionStrategy = class {
           const currencySymbol = networkConfig.nativeCurrency.symbol;
           enhancedDetails.balance = `${balanceInEth} ${currencySymbol}`;
         } catch (error) {
-          import_ui_builder_utils34.logger.warn("[Relayer] Failed to format balance, using raw value", String(error));
+          import_ui_utils34.logger.warn("[Relayer] Failed to format balance, using raw value", String(error));
           enhancedDetails.balance = String(balanceResponse.data.data.balance);
         }
       }
@@ -4782,10 +4834,10 @@ var RelayerExecutionStrategy = class {
           }
         }
       }
-      import_ui_builder_utils34.logger.info("[Relayer] Retrieved enhanced relayer details", JSON.stringify(enhancedDetails));
+      import_ui_utils34.logger.info("[Relayer] Retrieved enhanced relayer details", JSON.stringify(enhancedDetails));
       return enhancedDetails;
     } catch (error) {
-      import_ui_builder_utils34.logger.error(
+      import_ui_utils34.logger.error(
         "[Relayer] Failed to get relayer details",
         error instanceof Error ? error.message : String(error)
       );
@@ -4810,7 +4862,7 @@ var RelayerExecutionStrategy = class {
     let valueNumber = 0;
     const MAX_SAFE = BigInt(Number.MAX_SAFE_INTEGER);
     if (valueBigint > MAX_SAFE) {
-      import_ui_builder_utils34.logger.warn(
+      import_ui_utils34.logger.warn(
         "[Relayer] Value exceeds JS safe integer. Truncating for request.",
         valueBigint.toString()
       );
@@ -4825,7 +4877,7 @@ var RelayerExecutionStrategy = class {
       // If no explicit gas limit is provided, keep a conservative default but warn.
       gas_limit: (() => {
         if (typeof evmOptions?.gasLimit === "number") return evmOptions.gasLimit;
-        import_ui_builder_utils34.logger.warn(
+        import_ui_utils34.logger.warn(
           "[Relayer]",
           "No gasLimit provided; using default 210000. Consider setting explicitly."
         );
@@ -4897,10 +4949,10 @@ var RelayerExecutionStrategy = class {
 };
 
 // src/transaction/sender.ts
-var import_ui_builder_utils35 = require("@openzeppelin/ui-builder-utils");
+var import_ui_utils35 = require("@openzeppelin/ui-utils");
 var SYSTEM_LOG_TAG3 = "adapter-evm-sender";
 async function waitForEvmTransactionConfirmation(txHash, walletImplementation) {
-  import_ui_builder_utils35.logger.info(SYSTEM_LOG_TAG3, `Waiting for tx: ${txHash}`);
+  import_ui_utils35.logger.info(SYSTEM_LOG_TAG3, `Waiting for tx: ${txHash}`);
   try {
     const resolvedPublicClient = await walletImplementation.getPublicClient();
     if (!resolvedPublicClient) {
@@ -4909,15 +4961,15 @@ async function waitForEvmTransactionConfirmation(txHash, walletImplementation) {
     const receipt = await resolvedPublicClient.waitForTransactionReceipt({
       hash: txHash
     });
-    import_ui_builder_utils35.logger.info(SYSTEM_LOG_TAG3, "Received receipt:", receipt);
+    import_ui_utils35.logger.info(SYSTEM_LOG_TAG3, "Received receipt:", receipt);
     if (receipt.status === "success") {
       return { status: "success", receipt };
     } else {
-      import_ui_builder_utils35.logger.error(SYSTEM_LOG_TAG3, "Transaction reverted:", receipt);
+      import_ui_utils35.logger.error(SYSTEM_LOG_TAG3, "Transaction reverted:", receipt);
       return { status: "error", receipt, error: new Error("Transaction reverted.") };
     }
   } catch (error) {
-    import_ui_builder_utils35.logger.error(SYSTEM_LOG_TAG3, "Error waiting for transaction confirmation:", error);
+    import_ui_utils35.logger.error(SYSTEM_LOG_TAG3, "Error waiting for transaction confirmation:", error);
     return {
       status: "error",
       error: error instanceof Error ? error : new Error(String(error))
@@ -4927,9 +4979,9 @@ async function waitForEvmTransactionConfirmation(txHash, walletImplementation) {
 
 // src/transaction/formatter.ts
 var import_viem9 = require("viem");
-var import_ui_builder_utils36 = require("@openzeppelin/ui-builder-utils");
+var import_ui_utils36 = require("@openzeppelin/ui-utils");
 function formatEvmTransactionData(contractSchema, functionId, submittedInputs, fields) {
-  import_ui_builder_utils36.logger.info(
+  import_ui_utils36.logger.info(
     "formatEvmTransactionData",
     `Formatting EVM transaction data for function: ${functionId}`
   );
@@ -4967,7 +5019,7 @@ function formatEvmTransactionData(contractSchema, functionId, submittedInputs, f
   const isPayable = functionDetails.stateMutability === "payable";
   let transactionValue = 0n;
   if (isPayable) {
-    import_ui_builder_utils36.logger.warn(
+    import_ui_utils36.logger.warn(
       "formatEvmTransactionData",
       "Payable function detected, but sending 0 ETH. Implement value input."
     );
@@ -4988,7 +5040,7 @@ function formatEvmTransactionData(contractSchema, functionId, submittedInputs, f
 }
 
 // src/transaction/eoa.ts
-var import_ui_builder_utils37 = require("@openzeppelin/ui-builder-utils");
+var import_ui_utils37 = require("@openzeppelin/ui-utils");
 var SYSTEM_LOG_TAG4 = "EoaExecutionStrategy";
 var EoaExecutionStrategy = class {
   async execute(transactionData, executionConfig, walletImplementation, onStatusChange, _runtimeApiKey) {
@@ -5001,9 +5053,9 @@ var EoaExecutionStrategy = class {
     if (validationResult !== true) {
       throw new Error(validationResult);
     }
-    import_ui_builder_utils37.logger.info(SYSTEM_LOG_TAG4, "Using EOA execution strategy.");
+    import_ui_utils37.logger.info(SYSTEM_LOG_TAG4, "Using EOA execution strategy.");
     try {
-      import_ui_builder_utils37.logger.debug(SYSTEM_LOG_TAG4, "Calling walletClient.writeContract with:", {
+      import_ui_utils37.logger.debug(SYSTEM_LOG_TAG4, "Calling walletClient.writeContract with:", {
         account: accountStatus.address,
         address: transactionData.address,
         abi: transactionData.abi,
@@ -5022,10 +5074,10 @@ var EoaExecutionStrategy = class {
         value: transactionData.value,
         chain: walletClient.chain
       });
-      import_ui_builder_utils37.logger.info(SYSTEM_LOG_TAG4, "EOA Transaction initiated. Hash:", hash);
+      import_ui_utils37.logger.info(SYSTEM_LOG_TAG4, "EOA Transaction initiated. Hash:", hash);
       return { txHash: hash };
     } catch (error) {
-      import_ui_builder_utils37.logger.error(SYSTEM_LOG_TAG4, "Error during EOA writeContract call:", error);
+      import_ui_utils37.logger.error(SYSTEM_LOG_TAG4, "Error during EOA writeContract call:", error);
       const errorMessage = error instanceof Error ? error.message : "Unknown EOA transaction error";
       throw new Error(`Transaction failed (EOA): ${errorMessage}`);
     }
@@ -5033,12 +5085,12 @@ var EoaExecutionStrategy = class {
   async getAuthenticatedWalletClient(walletImplementation) {
     const walletClient = await walletImplementation.getWalletClient();
     if (!walletClient) {
-      import_ui_builder_utils37.logger.error(SYSTEM_LOG_TAG4, "Wallet client not available. Is wallet connected?");
+      import_ui_utils37.logger.error(SYSTEM_LOG_TAG4, "Wallet client not available. Is wallet connected?");
       throw new Error("Wallet is not connected or client is unavailable.");
     }
     const accountStatus = walletImplementation.getWalletConnectionStatus();
     if (!accountStatus.isConnected || !accountStatus.address) {
-      import_ui_builder_utils37.logger.error(SYSTEM_LOG_TAG4, "Account not available. Is wallet connected?");
+      import_ui_utils37.logger.error(SYSTEM_LOG_TAG4, "Account not available. Is wallet connected?");
       throw new Error("Wallet is not connected or account address is unavailable.");
     }
     return { walletClient, accountStatus };
@@ -5047,17 +5099,17 @@ var EoaExecutionStrategy = class {
 
 // src/transaction/components/EvmRelayerOptions.tsx
 var import_react11 = __toESM(require("react"), 1);
-var import_ui_builder_ui9 = require("@openzeppelin/ui-builder-ui");
+var import_ui_components9 = require("@openzeppelin/ui-components");
 
 // src/transaction/components/AdvancedInfo.tsx
 var import_lucide_react5 = require("lucide-react");
-var import_ui_builder_ui6 = require("@openzeppelin/ui-builder-ui");
+var import_ui_components6 = require("@openzeppelin/ui-components");
 var import_jsx_runtime8 = require("react/jsx-runtime");
 var AdvancedInfo = ({ showAdvancedInfo, onToggle }) => {
   return /* @__PURE__ */ (0, import_jsx_runtime8.jsxs)("div", { className: "space-y-2", children: [
     /* @__PURE__ */ (0, import_jsx_runtime8.jsxs)("div", { className: "flex items-center justify-between", children: [
       /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("label", { className: "text-base font-medium", children: "Gas Pricing Strategy" }),
-      /* @__PURE__ */ (0, import_jsx_runtime8.jsxs)(import_ui_builder_ui6.Button, { variant: "ghost", size: "sm", onClick: onToggle, className: "text-xs", type: "button", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime8.jsxs)(import_ui_components6.Button, { variant: "ghost", size: "sm", onClick: onToggle, className: "text-xs", type: "button", children: [
         /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(import_lucide_react5.Info, { className: "h-3 w-3 mr-1" }),
         "API Requirements"
       ] })
@@ -5076,8 +5128,8 @@ var AdvancedInfo = ({ showAdvancedInfo, onToggle }) => {
 
 // src/transaction/components/CustomGasParameters.tsx
 var import_lucide_react6 = require("lucide-react");
-var import_ui_builder_ui7 = require("@openzeppelin/ui-builder-ui");
-var import_ui_builder_utils38 = require("@openzeppelin/ui-builder-utils");
+var import_ui_components7 = require("@openzeppelin/ui-components");
+var import_ui_utils38 = require("@openzeppelin/ui-utils");
 var import_jsx_runtime9 = require("react/jsx-runtime");
 var CustomGasParameters = ({
   control,
@@ -5098,7 +5150,7 @@ var CustomGasParameters = ({
     /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)("div", { className: "space-y-3", children: [
       /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("p", { className: "text-xs text-muted-foreground font-medium uppercase tracking-wider", children: "Select Gas Pricing Method" }),
       /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)(
-        import_ui_builder_ui7.Accordion,
+        import_ui_components7.Accordion,
         {
           type: "single",
           collapsible: true,
@@ -5107,15 +5159,15 @@ var CustomGasParameters = ({
           className: "w-full space-y-3",
           children: [
             /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)(
-              import_ui_builder_ui7.AccordionItem,
+              import_ui_components7.AccordionItem,
               {
                 value: "eip1559",
-                className: (0, import_ui_builder_utils38.cn)(
+                className: (0, import_ui_utils38.cn)(
                   "rounded-lg border shadow-sm overflow-hidden transition-all",
                   gasType === "eip1559" ? "border-primary bg-primary/5" : "border-border bg-card hover:border-muted-foreground/50"
                 ),
                 children: [
-                  /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(import_ui_builder_ui7.AccordionTrigger, { className: "px-4 py-3 text-sm font-medium hover:no-underline", children: /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)("div", { className: "flex items-center justify-between w-full", children: [
+                  /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(import_ui_components7.AccordionTrigger, { className: "px-4 py-3 text-sm font-medium hover:no-underline", children: /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)("div", { className: "flex items-center justify-between w-full", children: [
                     /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)("div", { className: "flex items-center gap-3", children: [
                       /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)("div", { className: "relative", children: [
                         /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
@@ -5130,9 +5182,9 @@ var CustomGasParameters = ({
                     ] }),
                     gasType === "eip1559" && /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("span", { className: "text-xs text-primary font-medium mr-2", children: "Selected" })
                   ] }) }),
-                  /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(import_ui_builder_ui7.AccordionContent, { children: /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)("div", { className: "px-4 pb-4 pt-4 grid gap-4 border-t bg-background/50", children: [
+                  /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(import_ui_components7.AccordionContent, { children: /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)("div", { className: "px-4 pb-4 pt-4 grid gap-4 border-t bg-background/50", children: [
                     /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
-                      import_ui_builder_ui7.NumberField,
+                      import_ui_components7.NumberField,
                       {
                         id: "maxFeePerGas",
                         label: "Max Fee Per Gas",
@@ -5146,7 +5198,7 @@ var CustomGasParameters = ({
                       }
                     ),
                     /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
-                      import_ui_builder_ui7.NumberField,
+                      import_ui_components7.NumberField,
                       {
                         id: "maxPriorityFeePerGas",
                         label: "Max Priority Fee Per Gas",
@@ -5164,15 +5216,15 @@ var CustomGasParameters = ({
               }
             ),
             /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)(
-              import_ui_builder_ui7.AccordionItem,
+              import_ui_components7.AccordionItem,
               {
                 value: "legacy",
-                className: (0, import_ui_builder_utils38.cn)(
+                className: (0, import_ui_utils38.cn)(
                   "rounded-lg border shadow-sm overflow-hidden transition-all",
                   gasType === "legacy" ? "border-primary bg-primary/5" : "border-border bg-card hover:border-muted-foreground/50"
                 ),
                 children: [
-                  /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(import_ui_builder_ui7.AccordionTrigger, { className: "px-4 py-3 text-sm font-medium hover:no-underline", children: /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)("div", { className: "flex items-center justify-between w-full", children: [
+                  /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(import_ui_components7.AccordionTrigger, { className: "px-4 py-3 text-sm font-medium hover:no-underline", children: /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)("div", { className: "flex items-center justify-between w-full", children: [
                     /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)("div", { className: "flex items-center gap-3", children: [
                       /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)("div", { className: "relative", children: [
                         /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
@@ -5187,8 +5239,8 @@ var CustomGasParameters = ({
                     ] }),
                     gasType === "legacy" && /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("span", { className: "text-xs text-primary font-medium mr-2", children: "Selected" })
                   ] }) }),
-                  /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(import_ui_builder_ui7.AccordionContent, { children: /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("div", { className: "px-4 pb-4 pt-4 border-t bg-background/50", children: /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
-                    import_ui_builder_ui7.NumberField,
+                  /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(import_ui_components7.AccordionContent, { children: /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("div", { className: "px-4 pb-4 pt-4 border-t bg-background/50", children: /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
+                    import_ui_components7.NumberField,
                     {
                       id: "gasPrice",
                       label: "Gas Price",
@@ -5210,7 +5262,7 @@ var CustomGasParameters = ({
     ] }),
     /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)("div", { className: "space-y-2", children: [
       /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
-        import_ui_builder_ui7.BooleanField,
+        import_ui_components7.BooleanField,
         {
           id: "showGasLimit",
           label: "Override gas limit",
@@ -5220,7 +5272,7 @@ var CustomGasParameters = ({
         }
       ),
       showGasLimit && /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("div", { className: "pl-6", children: /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
-        import_ui_builder_ui7.NumberField,
+        import_ui_components7.NumberField,
         {
           id: "gasLimit",
           label: "Gas Limit",
@@ -5238,7 +5290,7 @@ var CustomGasParameters = ({
 
 // src/transaction/components/SpeedSelection.tsx
 var import_relayer_sdk2 = require("@openzeppelin/relayer-sdk");
-var import_ui_builder_ui8 = require("@openzeppelin/ui-builder-ui");
+var import_ui_components8 = require("@openzeppelin/ui-components");
 var import_jsx_runtime10 = require("react/jsx-runtime");
 var speedOptions = [
   {
@@ -5265,7 +5317,7 @@ var speedOptions = [
 ];
 var SpeedSelection = ({ selectedSpeed, onSpeedChange }) => {
   return /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(
-    import_ui_builder_ui8.RadioGroup,
+    import_ui_components8.RadioGroup,
     {
       value: selectedSpeed || import_relayer_sdk2.Speed.FAST,
       onValueChange: (value) => onSpeedChange(value),
@@ -5278,7 +5330,7 @@ var SpeedSelection = ({ selectedSpeed, onSpeedChange }) => {
             option.recommended && /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("span", { className: "absolute -top-2 right-4 bg-primary text-primary-foreground text-xs px-2 py-0.5 rounded", children: "Recommended" }),
             /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)("div", { className: "flex items-start space-x-3", children: [
               /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(
-                import_ui_builder_ui8.RadioGroupItem,
+                import_ui_components8.RadioGroupItem,
                 {
                   value: option.value,
                   id: `speed-${option.value}`,
@@ -5442,13 +5494,13 @@ var EvmRelayerOptions = ({ options, onChange }) => {
         onToggle: () => setShowAdvancedInfo(!showAdvancedInfo)
       }
     ),
-    /* @__PURE__ */ (0, import_jsx_runtime11.jsxs)(import_ui_builder_ui9.Tabs, { value: configMode, onValueChange: handleModeChange, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime11.jsxs)(import_ui_builder_ui9.TabsList, { className: "grid w-full grid-cols-2", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(import_ui_builder_ui9.TabsTrigger, { value: "speed", children: "Speed" }),
-        /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(import_ui_builder_ui9.TabsTrigger, { value: "custom", children: "Custom" })
+    /* @__PURE__ */ (0, import_jsx_runtime11.jsxs)(import_ui_components9.Tabs, { value: configMode, onValueChange: handleModeChange, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime11.jsxs)(import_ui_components9.TabsList, { className: "grid w-full grid-cols-2", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(import_ui_components9.TabsTrigger, { value: "speed", children: "Speed" }),
+        /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(import_ui_components9.TabsTrigger, { value: "custom", children: "Custom" })
       ] }),
-      /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(import_ui_builder_ui9.TabsContent, { value: "speed", className: "space-y-4", children: /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(SpeedSelection, { selectedSpeed: formValues.speed, onSpeedChange: handleSpeedChange }) }),
-      /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(import_ui_builder_ui9.TabsContent, { value: "custom", className: "space-y-4", children: /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(
+      /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(import_ui_components9.TabsContent, { value: "speed", className: "space-y-4", children: /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(SpeedSelection, { selectedSpeed: formValues.speed, onSpeedChange: handleSpeedChange }) }),
+      /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(import_ui_components9.TabsContent, { value: "custom", className: "space-y-4", children: /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(
         CustomGasParameters,
         {
           control,
@@ -5463,7 +5515,7 @@ var EvmRelayerOptions = ({ options, onChange }) => {
 };
 
 // src/wallet/utils/connection.ts
-var import_ui_builder_utils39 = require("@openzeppelin/ui-builder-utils");
+var import_ui_utils39 = require("@openzeppelin/ui-utils");
 var LOG_SYSTEM3 = "adapter-evm-connection";
 function evmSupportsWalletConnection() {
   return true;
@@ -5471,7 +5523,7 @@ function evmSupportsWalletConnection() {
 async function getEvmAvailableConnectors() {
   const impl = await getEvmWalletImplementation();
   if (!impl) {
-    import_ui_builder_utils39.logger.warn(LOG_SYSTEM3, "getEvmAvailableConnectors: Wallet implementation not ready.");
+    import_ui_utils39.logger.warn(LOG_SYSTEM3, "getEvmAvailableConnectors: Wallet implementation not ready.");
     return [];
   }
   return impl.getAvailableConnectors();
@@ -5479,7 +5531,7 @@ async function getEvmAvailableConnectors() {
 async function connectAndEnsureCorrectNetwork(connectorId, targetChainId) {
   const impl = await getEvmWalletImplementation();
   if (!impl) {
-    import_ui_builder_utils39.logger.error(LOG_SYSTEM3, "connectAndEnsureCorrectNetwork: Wallet implementation not ready.");
+    import_ui_utils39.logger.error(LOG_SYSTEM3, "connectAndEnsureCorrectNetwork: Wallet implementation not ready.");
     return { connected: false, error: "Wallet system not initialized." };
   }
   const connectionResult = await impl.connect(connectorId);
@@ -5487,7 +5539,7 @@ async function connectAndEnsureCorrectNetwork(connectorId, targetChainId) {
     return { connected: false, error: connectionResult.error || "Connection failed" };
   }
   if (connectionResult.chainId !== targetChainId) {
-    import_ui_builder_utils39.logger.info(
+    import_ui_utils39.logger.info(
       LOG_SYSTEM3,
       `Connected to chain ${connectionResult.chainId}, but target is ${targetChainId}. Attempting switch.`
     );
@@ -5496,23 +5548,23 @@ async function connectAndEnsureCorrectNetwork(connectorId, targetChainId) {
       const postSwitchStatus = impl.getWalletConnectionStatus();
       if (postSwitchStatus.chainId !== targetChainId) {
         const switchError = `Failed to switch to target network ${targetChainId}. Current: ${postSwitchStatus.chainId}`;
-        import_ui_builder_utils39.logger.error(LOG_SYSTEM3, switchError);
+        import_ui_utils39.logger.error(LOG_SYSTEM3, switchError);
         try {
           await impl.disconnect();
         } catch (e) {
-          import_ui_builder_utils39.logger.warn(LOG_SYSTEM3, "Failed to disconnect after network switch failure.", e);
+          import_ui_utils39.logger.warn(LOG_SYSTEM3, "Failed to disconnect after network switch failure.", e);
         }
         return { connected: false, error: switchError };
       }
-      import_ui_builder_utils39.logger.info(LOG_SYSTEM3, `Successfully switched to target chain ${targetChainId}.`);
+      import_ui_utils39.logger.info(LOG_SYSTEM3, `Successfully switched to target chain ${targetChainId}.`);
       return { ...connectionResult, chainId: postSwitchStatus.chainId };
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : String(error);
-      import_ui_builder_utils39.logger.error(LOG_SYSTEM3, "Network switch failed:", errorMessage);
+      import_ui_utils39.logger.error(LOG_SYSTEM3, "Network switch failed:", errorMessage);
       try {
         await impl.disconnect();
       } catch (e) {
-        import_ui_builder_utils39.logger.warn(LOG_SYSTEM3, "Failed to disconnect after network switch failure.", e);
+        import_ui_utils39.logger.warn(LOG_SYSTEM3, "Failed to disconnect after network switch failure.", e);
       }
       return { connected: false, error: `Network switch failed: ${errorMessage}` };
     }
@@ -5522,7 +5574,7 @@ async function connectAndEnsureCorrectNetwork(connectorId, targetChainId) {
 async function disconnectEvmWallet() {
   const impl = await getEvmWalletImplementation();
   if (!impl) {
-    import_ui_builder_utils39.logger.warn(LOG_SYSTEM3, "disconnectEvmWallet: Wallet implementation not ready.");
+    import_ui_utils39.logger.warn(LOG_SYSTEM3, "disconnectEvmWallet: Wallet implementation not ready.");
     return { disconnected: false, error: "Wallet system not initialized." };
   }
   return impl.disconnect();
@@ -5530,7 +5582,7 @@ async function disconnectEvmWallet() {
 function getEvmWalletConnectionStatus() {
   const impl = getInitializedEvmWalletImplementation();
   if (!impl) {
-    import_ui_builder_utils39.logger.warn(
+    import_ui_utils39.logger.warn(
       LOG_SYSTEM3,
       "getEvmWalletConnectionStatus: Wallet implementation not ready. Returning default disconnected state."
     );
@@ -5580,13 +5632,13 @@ var EvmAdapter = class {
       throw new Error("EvmAdapter requires a valid EVM network configuration.");
     }
     this.networkConfig = networkConfig;
-    import_ui_builder_utils40.logger.info(
+    import_ui_utils40.logger.info(
       "EvmAdapter",
       `Adapter initialized for network: ${networkConfig.name} (ID: ${networkConfig.id})`
     );
     const initialGlobalConfig = loadInitialConfigFromAppService();
     this.initialAppServiceKitName = initialGlobalConfig.kitName || "custom";
-    import_ui_builder_utils40.logger.info(
+    import_ui_utils40.logger.info(
       "EvmAdapter:constructor",
       "Initial kitName from AppConfigService noted:",
       this.initialAppServiceKitName
@@ -5821,7 +5873,7 @@ var EvmAdapter = class {
   onWalletConnectionChange(callback) {
     const walletImplementation = getInitializedEvmWalletImplementation();
     if (!walletImplementation) {
-      import_ui_builder_utils40.logger.warn(
+      import_ui_utils40.logger.warn(
         "EvmAdapter:onWalletConnectionChange",
         "Wallet implementation not ready. Subscription may not work."
       );
@@ -5851,6 +5903,12 @@ var EvmAdapter = class {
     }
     return null;
   }
+  /**
+   * @inheritdoc
+   */
+  async getCurrentBlock() {
+    return getEvmCurrentBlock(this.networkConfig);
+  }
   /**
    * @inheritdoc
    */
@@ -5870,7 +5928,7 @@ var EvmAdapter = class {
       options
     );
     await evmUiKitManager.configure(finalFullConfig);
-    import_ui_builder_utils40.logger.info(
+    import_ui_utils40.logger.info(
       "EvmAdapter:configureUiKit",
       "EvmUiKitManager configuration requested with final config:",
       finalFullConfig
@@ -5880,7 +5938,7 @@ var EvmAdapter = class {
    * @inheritdoc
    */
   getEcosystemReactUiContextProvider() {
-    import_ui_builder_utils40.logger.info("EvmAdapter:getEcosystemReactUiContextProvider", "Returning EvmWalletUiRoot.");
+    import_ui_utils40.logger.info("EvmAdapter:getEcosystemReactUiContextProvider", "Returning EvmWalletUiRoot.");
     return EvmWalletUiRoot;
   }
   /**
@@ -5904,7 +5962,7 @@ var EvmAdapter = class {
   getEcosystemWalletComponents() {
     const currentManagerState = evmUiKitManager.getState();
     if (!currentManagerState.currentFullUiKitConfig) {
-      import_ui_builder_utils40.logger.debug(
+      import_ui_utils40.logger.debug(
         // Changed from warn to debug, as this can be normal during init sequence
         "EvmAdapter:getEcosystemWalletComponents",
         "No UI kit configuration available in manager yet. Returning undefined components."
@@ -6043,7 +6101,7 @@ Get your WalletConnect projectId from <a href="https://cloud.walletconnect.com"
         summary: result.summary
       };
     } catch (error) {
-      import_ui_builder_utils40.logger.error("EVM contract definition comparison failed:", error.message);
+      import_ui_utils40.logger.error("EVM contract definition comparison failed:", error.message);
       throw new Error(`Contract definition comparison failed: ${error.message}`);
     }
   }
@@ -6064,6 +6122,12 @@ Get your WalletConnect projectId from <a href="https://cloud.walletconnect.com"
   hashContractDefinition(definition) {
     return abiComparisonService.hashAbi(definition);
   }
+  /**
+   * @inheritdoc
+   */
+  getTypeMappingInfo() {
+    return getEvmTypeMappingInfo();
+  }
 };
 
 // src/config.ts