@web3auth/modal 8.12.7 → 9.0.0-alpha.1

package/dist/modal.cjs.js

@@ -9,6 +9,7 @@
 /* harmony export */   Gu: () => (/* binding */ defaultSolanaDappModalConfig),
 /* harmony export */   KT: () => (/* binding */ defaultSolanaWalletModalConfig),
 /* harmony export */   Lu: () => (/* binding */ defaultOtherModalConfig),
+/* harmony export */   e4: () => (/* binding */ walletRegistryUrl),
 /* harmony export */   eA: () => (/* binding */ defaultEvmWalletModalConfig),
 /* harmony export */   g2: () => (/* binding */ defaultEvmDappModalConfig)
 /* harmony export */ });
@@ -24,14 +25,8 @@ const defaultSolanaDappModalConfig = {
       showOnMobile: true,
       showOnDesktop: true
     },
-    [_web3auth_base__WEBPACK_IMPORTED_MODULE_0__.SOLANA_ADAPTERS.OPENLOGIN]: {
-      label: "OpenLogin",
-      showOnModal: true,
-      showOnMobile: true,
-      showOnDesktop: true
-    },
-    [_web3auth_base__WEBPACK_IMPORTED_MODULE_0__.SOLANA_ADAPTERS.PHANTOM]: {
-      label: "Phantom",
+    [_web3auth_base__WEBPACK_IMPORTED_MODULE_0__.SOLANA_ADAPTERS.AUTH]: {
+      label: "Auth",
       showOnModal: true,
       showOnMobile: true,
       showOnDesktop: true
@@ -47,14 +42,8 @@ const defaultEvmDappModalConfig = {
       showOnMobile: true,
       showOnDesktop: true
     },
-    [_web3auth_base__WEBPACK_IMPORTED_MODULE_0__.EVM_ADAPTERS.METAMASK]: {
-      label: "MetaMask",
-      showOnModal: true,
-      showOnMobile: true,
-      showOnDesktop: true
-    },
-    [_web3auth_base__WEBPACK_IMPORTED_MODULE_0__.EVM_ADAPTERS.OPENLOGIN]: {
-      label: "OpenLogin",
+    [_web3auth_base__WEBPACK_IMPORTED_MODULE_0__.EVM_ADAPTERS.AUTH]: {
+      label: "Auth",
       showOnModal: true,
       showOnMobile: true,
       showOnDesktop: true
@@ -70,8 +59,8 @@ const defaultEvmDappModalConfig = {
 const defaultSolanaWalletModalConfig = {
   chainNamespace: _web3auth_base__WEBPACK_IMPORTED_MODULE_0__.CHAIN_NAMESPACES.SOLANA,
   adapters: {
-    [_web3auth_base__WEBPACK_IMPORTED_MODULE_0__.SOLANA_ADAPTERS.OPENLOGIN]: {
-      label: "OpenLogin",
+    [_web3auth_base__WEBPACK_IMPORTED_MODULE_0__.SOLANA_ADAPTERS.AUTH]: {
+      label: "Auth",
       showOnModal: true,
       showOnMobile: true,
       showOnDesktop: true
@@ -81,8 +70,8 @@ const defaultSolanaWalletModalConfig = {
 const defaultEvmWalletModalConfig = {
   chainNamespace: _web3auth_base__WEBPACK_IMPORTED_MODULE_0__.CHAIN_NAMESPACES.EIP155,
   adapters: {
-    [_web3auth_base__WEBPACK_IMPORTED_MODULE_0__.EVM_ADAPTERS.OPENLOGIN]: {
-      label: "OpenLogin",
+    [_web3auth_base__WEBPACK_IMPORTED_MODULE_0__.EVM_ADAPTERS.AUTH]: {
+      label: "Auth",
       showOnModal: true,
       showOnMobile: true,
       showOnDesktop: true
@@ -92,14 +81,15 @@ const defaultEvmWalletModalConfig = {
 const defaultOtherModalConfig = {
   chainNamespace: _web3auth_base__WEBPACK_IMPORTED_MODULE_0__.CHAIN_NAMESPACES.OTHER,
   adapters: {
-    [_web3auth_base__WEBPACK_IMPORTED_MODULE_0__.EVM_ADAPTERS.OPENLOGIN]: {
-      label: "OpenLogin",
+    [_web3auth_base__WEBPACK_IMPORTED_MODULE_0__.EVM_ADAPTERS.AUTH]: {
+      label: "Auth",
       showOnModal: true,
       showOnMobile: true,
       showOnDesktop: true
     }
   }
 };
+const walletRegistryUrl = "https://assets.web3auth.io/v1/wallet-registry.json";
 
 /***/ }),
 
@@ -110,7 +100,7 @@ const defaultOtherModalConfig = {
 
 /***/ }),
 
-/***/ 73:
+/***/ 430:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
@@ -126,22 +116,19 @@ var objectSpread2_default = /*#__PURE__*/__webpack_require__.n(objectSpread2_nam
 ;// CONCATENATED MODULE: external "@babel/runtime/helpers/defineProperty"
 const defineProperty_namespaceObject = require("@babel/runtime/helpers/defineProperty");
 var defineProperty_default = /*#__PURE__*/__webpack_require__.n(defineProperty_namespaceObject);
+;// CONCATENATED MODULE: external "@web3auth/auth-adapter"
+const auth_adapter_namespaceObject = require("@web3auth/auth-adapter");
 // EXTERNAL MODULE: external "@web3auth/base"
 var base_ = __webpack_require__(377);
 ;// CONCATENATED MODULE: external "@web3auth/base-provider"
 const base_provider_namespaceObject = require("@web3auth/base-provider");
 ;// CONCATENATED MODULE: external "@web3auth/no-modal"
 const no_modal_namespaceObject = require("@web3auth/no-modal");
-;// CONCATENATED MODULE: external "@web3auth/openlogin-adapter"
-const openlogin_adapter_namespaceObject = require("@web3auth/openlogin-adapter");
 ;// CONCATENATED MODULE: external "@web3auth/ui"
 const ui_namespaceObject = require("@web3auth/ui");
-;// CONCATENATED MODULE: external "lodash.clonedeep"
-const external_lodash_clonedeep_namespaceObject = require("lodash.clonedeep");
-var external_lodash_clonedeep_default = /*#__PURE__*/__webpack_require__.n(external_lodash_clonedeep_namespaceObject);
-;// CONCATENATED MODULE: external "lodash.merge"
-const external_lodash_merge_namespaceObject = require("lodash.merge");
-var external_lodash_merge_default = /*#__PURE__*/__webpack_require__.n(external_lodash_merge_namespaceObject);
+;// CONCATENATED MODULE: external "deepmerge"
+const external_deepmerge_namespaceObject = require("deepmerge");
+var external_deepmerge_default = /*#__PURE__*/__webpack_require__.n(external_deepmerge_namespaceObject);
 // EXTERNAL MODULE: ./src/config.ts
 var config = __webpack_require__(149);
 ;// CONCATENATED MODULE: ./src/modalManager.ts
@@ -154,13 +141,12 @@ var config = __webpack_require__(149);
 
 
 
-
 class Web3Auth extends no_modal_namespaceObject.Web3AuthNoModal {
   constructor(options) {
     super(options);
     defineProperty_default()(this, "loginModal", void 0);
     defineProperty_default()(this, "options", void 0);
-    defineProperty_default()(this, "modalConfig", config/* defaultOtherModalConfig */.Lu);
+    defineProperty_default()(this, "modalConfig", (0,base_.cloneDeep)(config/* defaultOtherModalConfig */.Lu));
     this.options = objectSpread2_default()({}, options);
     if (!this.options.uiConfig) this.options.uiConfig = {};
     if (!this.coreOptions.privateKeyProvider) throw base_.WalletInitializationError.invalidParams("privateKeyProvider is required");
@@ -181,25 +167,34 @@ class Web3Auth extends no_modal_namespaceObject.Web3AuthNoModal {
     const {
       whitelabel
     } = projectConfig;
-    this.options.uiConfig = external_lodash_merge_default()(external_lodash_clonedeep_default()(whitelabel), this.options.uiConfig);
+    this.options.uiConfig = external_deepmerge_default()((0,base_.cloneDeep)(whitelabel), this.options.uiConfig);
     if (!this.options.uiConfig.defaultLanguage) this.options.uiConfig.defaultLanguage = (0,ui_namespaceObject.getUserLanguage)(this.options.uiConfig.defaultLanguage);
     if (!this.options.uiConfig.mode) this.options.uiConfig.mode = "light";
+    let walletRegistry = {};
+    try {
+      walletRegistry = await (0,base_.fetchWalletRegistry)(config/* walletRegistryUrl */.e4);
+    } catch (e) {
+      base_.log.error("Failed to fetch wallet registry", e);
+    }
     this.loginModal = new ui_namespaceObject.LoginModal(objectSpread2_default()(objectSpread2_default()({}, this.options.uiConfig), {}, {
-      adapterListener: this
+      adapterListener: this,
+      chainNamespace: this.options.chainConfig.chainNamespace,
+      walletRegistry
     }));
     this.subscribeToLoginModalEvents();
     const {
       sms_otp_enabled: smsOtpEnabled,
-      whitelist
+      whitelist,
+      key_export_enabled: keyExportEnabled
     } = projectConfig;
     if (smsOtpEnabled !== undefined) {
       var _params;
       const adapterConfig = {
-        [base_.WALLET_ADAPTERS.OPENLOGIN]: {
-          label: base_.WALLET_ADAPTERS.OPENLOGIN,
+        [base_.WALLET_ADAPTERS.AUTH]: {
+          label: base_.WALLET_ADAPTERS.AUTH,
           loginMethods: {
-            [openlogin_adapter_namespaceObject.LOGIN_PROVIDER.SMS_PASSWORDLESS]: {
-              name: openlogin_adapter_namespaceObject.LOGIN_PROVIDER.SMS_PASSWORDLESS,
+            [auth_adapter_namespaceObject.LOGIN_PROVIDER.SMS_PASSWORDLESS]: {
+              name: auth_adapter_namespaceObject.LOGIN_PROVIDER.SMS_PASSWORDLESS,
               showOnModal: smsOtpEnabled,
               showOnDesktop: smsOtpEnabled,
               showOnMobile: smsOtpEnabled
@@ -210,7 +205,7 @@ class Web3Auth extends no_modal_namespaceObject.Web3AuthNoModal {
       if (!((_params = params) !== null && _params !== void 0 && _params.modalConfig)) params = {
         modalConfig: {}
       };
-      params.modalConfig = external_lodash_merge_default()(external_lodash_clonedeep_default()(params.modalConfig), adapterConfig);
+      params.modalConfig = external_deepmerge_default()((0,base_.cloneDeep)(params.modalConfig), adapterConfig);
     }
     await this.loginModal.initModal();
     const providedChainConfig = this.options.chainConfig;
@@ -240,9 +235,9 @@ class Web3Auth extends no_modal_namespaceObject.Web3AuthNoModal {
       // and if adapter is not hidden by user
       if (!adapter && (_this$modalConfig$ada3 = this.modalConfig.adapters) !== null && _this$modalConfig$ada3 !== void 0 && _this$modalConfig$ada3[adapterName].showOnModal) {
         // Adapters to be shown on modal should be pre-configured.
-        if (adapterName === base_.WALLET_ADAPTERS.OPENLOGIN) {
+        if (adapterName === base_.WALLET_ADAPTERS.AUTH) {
           var _this$coreOptions$cha;
-          const defaultOptions = (0,openlogin_adapter_namespaceObject.getOpenloginDefaultOptions)();
+          const defaultOptions = (0,auth_adapter_namespaceObject.getAuthDefaultOptions)();
           const {
             clientId,
             useCoreKitKey,
@@ -255,14 +250,14 @@ class Web3Auth extends no_modal_namespaceObject.Web3AuthNoModal {
           if (!privateKeyProvider) {
             throw base_.WalletInitializationError.invalidParams("privateKeyProvider is required");
           }
-          const finalOpenloginAdapterSettings = objectSpread2_default()(objectSpread2_default()({}, defaultOptions.adapterSettings), {}, {
+          const finalAuthAdapterSettings = objectSpread2_default()(objectSpread2_default()({}, defaultOptions.adapterSettings), {}, {
             clientId,
             network: web3AuthNetwork,
             whiteLabel: this.options.uiConfig
           });
           if (smsOtpEnabled !== undefined) {
-            finalOpenloginAdapterSettings.loginConfig = {
-              [openlogin_adapter_namespaceObject.LOGIN_PROVIDER.SMS_PASSWORDLESS]: {
+            finalAuthAdapterSettings.loginConfig = {
+              [auth_adapter_namespaceObject.LOGIN_PROVIDER.SMS_PASSWORDLESS]: {
                 showOnModal: smsOtpEnabled,
                 showOnDesktop: smsOtpEnabled,
                 showOnMobile: smsOtpEnabled,
@@ -271,21 +266,21 @@ class Web3Auth extends no_modal_namespaceObject.Web3AuthNoModal {
             };
           }
           if (whitelist) {
-            finalOpenloginAdapterSettings.originData = whitelist.signed_urls;
+            finalAuthAdapterSettings.originData = whitelist.signed_urls;
           }
           if (this.options.uiConfig.uxMode) {
-            finalOpenloginAdapterSettings.uxMode = this.options.uiConfig.uxMode;
+            finalAuthAdapterSettings.uxMode = this.options.uiConfig.uxMode;
           }
-          const openloginAdapter = new openlogin_adapter_namespaceObject.OpenloginAdapter(objectSpread2_default()(objectSpread2_default()({}, defaultOptions), {}, {
+          const authAdapter = new auth_adapter_namespaceObject.AuthAdapter(objectSpread2_default()(objectSpread2_default()({}, defaultOptions), {}, {
             clientId,
             useCoreKitKey,
             chainConfig: objectSpread2_default()({}, finalChainConfig),
-            adapterSettings: finalOpenloginAdapterSettings,
+            adapterSettings: finalAuthAdapterSettings,
             sessionTime,
             web3AuthNetwork,
             privateKeyProvider
           }));
-          this.walletAdapters[adapterName] = openloginAdapter;
+          this.walletAdapters[adapterName] = authAdapter;
           return adapterName;
         }
         throw base_.WalletInitializationError.invalidParams(`Adapter ${adapterName} is not configured`);
@@ -310,21 +305,21 @@ class Web3Auth extends no_modal_namespaceObject.Web3AuthNoModal {
             chainConfig
           });
         }
-        if (adapterName === base_.WALLET_ADAPTERS.OPENLOGIN) {
+        if (adapterName === base_.WALLET_ADAPTERS.AUTH) {
           var _this$options$uiConfi;
-          const openloginAdapter = this.walletAdapters[adapterName];
+          const authAdapter = this.walletAdapters[adapterName];
           if (this.coreOptions.privateKeyProvider) {
-            if (openloginAdapter.currentChainNamespace !== this.coreOptions.privateKeyProvider.currentChainConfig.chainNamespace) {
-              throw base_.WalletInitializationError.incompatibleChainNameSpace("private key provider is not compatible with provided chainNamespace for openlogin adapter");
+            if (authAdapter.currentChainNamespace !== this.coreOptions.privateKeyProvider.currentChainConfig.chainNamespace) {
+              throw base_.WalletInitializationError.incompatibleChainNameSpace("private key provider is not compatible with provided chainNamespace for auth adapter");
             }
-            openloginAdapter.setAdapterSettings({
+            authAdapter.setAdapterSettings({
               privateKeyProvider: this.coreOptions.privateKeyProvider
             });
           }
           if (smsOtpEnabled !== undefined) {
-            openloginAdapter.setAdapterSettings({
+            authAdapter.setAdapterSettings({
               loginConfig: {
-                [openlogin_adapter_namespaceObject.LOGIN_PROVIDER.SMS_PASSWORDLESS]: {
+                [auth_adapter_namespaceObject.LOGIN_PROVIDER.SMS_PASSWORDLESS]: {
                   showOnModal: smsOtpEnabled,
                   showOnDesktop: smsOtpEnabled,
                   showOnMobile: smsOtpEnabled,
@@ -334,20 +329,20 @@ class Web3Auth extends no_modal_namespaceObject.Web3AuthNoModal {
             });
           }
           if (whitelist) {
-            openloginAdapter.setAdapterSettings({
+            authAdapter.setAdapterSettings({
               originData: whitelist.signed_urls
             });
           }
           if ((_this$options$uiConfi = this.options.uiConfig) !== null && _this$options$uiConfi !== void 0 && _this$options$uiConfi.uxMode) {
-            openloginAdapter.setAdapterSettings({
+            authAdapter.setAdapterSettings({
               uxMode: this.options.uiConfig.uxMode
             });
           }
-          openloginAdapter.setAdapterSettings({
+          authAdapter.setAdapterSettings({
             whiteLabel: this.options.uiConfig
           });
-          if (!openloginAdapter.privateKeyProvider) {
-            throw base_.WalletInitializationError.invalidParams("privateKeyProvider is required for openlogin adapter");
+          if (!authAdapter.privateKeyProvider) {
+            throw base_.WalletInitializationError.invalidParams("privateKeyProvider is required for auth adapter");
           }
         } else if (adapterName === base_.WALLET_ADAPTERS.WALLET_CONNECT_V2) {
           const walletConnectAdapter = this.walletAdapters[adapterName];
@@ -421,6 +416,11 @@ class Web3Auth extends no_modal_namespaceObject.Web3AuthNoModal {
     this.commonJRPCProvider = await base_provider_namespaceObject.CommonJRPCProvider.getProviderInstance({
       chainConfig: this.coreOptions.chainConfig
     });
+    if (typeof keyExportEnabled === "boolean") {
+      this.coreOptions.privateKeyProvider.setKeyExportFlag(keyExportEnabled);
+      // dont know if we need to do this.
+      this.commonJRPCProvider.setKeyExportFlag(keyExportEnabled);
+    }
     await Promise.all(initPromises);
     if (this.status === base_.ADAPTER_STATUS.NOT_READY) {
       this.status = base_.ADAPTER_STATUS.READY;
@@ -479,14 +479,20 @@ class Web3Auth extends no_modal_namespaceObject.Web3AuthNoModal {
           await adapter.init({
             autoConnect: this.cachedAdapter === adapterName
           }).then(() => {
-            adaptersConfig[adapterName] = this.modalConfig.adapters[adapterName];
+            const adapterModalConfig = this.modalConfig.adapters[adapterName];
+            adaptersConfig[adapterName] = objectSpread2_default()(objectSpread2_default()({}, adapterModalConfig), {}, {
+              isInjected: adapter.isInjected
+            });
             this.loginModal.addWalletLogins(adaptersConfig, {
               showExternalWalletsOnly: !!(options !== null && options !== void 0 && options.showExternalWalletsOnly)
             });
             return undefined;
           }).catch(error => base_.log.error(error, "error while initializing adapter", adapterName));
         } else if (adapter.status === base_.ADAPTER_STATUS.READY) {
-          adaptersConfig[adapterName] = this.modalConfig.adapters[adapterName];
+          const adapterModalConfig = this.modalConfig.adapters[adapterName];
+          adaptersConfig[adapterName] = objectSpread2_default()(objectSpread2_default()({}, adapterModalConfig), {}, {
+            isInjected: adapter.isInjected
+          });
           this.loginModal.addWalletLogins(adaptersConfig, {
             showExternalWalletsOnly: !!(options !== null && options !== void 0 && options.showExternalWalletsOnly)
           });
@@ -498,7 +504,7 @@ class Web3Auth extends no_modal_namespaceObject.Web3AuthNoModal {
     base_.log.info("adapterInitResults", adapterName);
     if (this.walletAdapters[adapterName].type === base_.ADAPTER_CATEGORY.IN_APP) {
       var _adapterName, _this$options$uiConfi2, _this$options$uiConfi3, _this$options$uiConfi4;
-      this.loginModal.addSocialLogins(adapterName, (0,ui_namespaceObject.getAdapterSocialLogins)(adapterName, (_adapterName = this.modalConfig.adapters[adapterName]) === null || _adapterName === void 0 ? void 0 : _adapterName.loginMethods), ((_this$options$uiConfi2 = this.options.uiConfig) === null || _this$options$uiConfi2 === void 0 ? void 0 : _this$options$uiConfi2.loginMethodsOrder) || ui_namespaceObject.OPENLOGIN_PROVIDERS, objectSpread2_default()(objectSpread2_default()({}, this.options.uiConfig), {}, {
+      this.loginModal.addSocialLogins(adapterName, (0,ui_namespaceObject.getAdapterSocialLogins)(adapterName, (_adapterName = this.modalConfig.adapters[adapterName]) === null || _adapterName === void 0 ? void 0 : _adapterName.loginMethods), ((_this$options$uiConfi2 = this.options.uiConfig) === null || _this$options$uiConfi2 === void 0 ? void 0 : _this$options$uiConfi2.loginMethodsOrder) || ui_namespaceObject.AUTH_PROVIDERS, objectSpread2_default()(objectSpread2_default()({}, this.options.uiConfig), {}, {
         loginGridCol: ((_this$options$uiConfi3 = this.options.uiConfig) === null || _this$options$uiConfi3 === void 0 ? void 0 : _this$options$uiConfi3.loginGridCol) || 3,
         primaryButton: ((_this$options$uiConfi4 = this.options.uiConfig) === null || _this$options$uiConfi4 === void 0 ? void 0 : _this$options$uiConfi4.primaryButton) || "socialLogin"
       }));
@@ -637,15 +643,16 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   defaultEvmWalletModalConfig: () => (/* reexport safe */ _config__WEBPACK_IMPORTED_MODULE_0__.eA),
 /* harmony export */   defaultOtherModalConfig: () => (/* reexport safe */ _config__WEBPACK_IMPORTED_MODULE_0__.Lu),
 /* harmony export */   defaultSolanaDappModalConfig: () => (/* reexport safe */ _config__WEBPACK_IMPORTED_MODULE_0__.Gu),
-/* harmony export */   defaultSolanaWalletModalConfig: () => (/* reexport safe */ _config__WEBPACK_IMPORTED_MODULE_0__.KT)
+/* harmony export */   defaultSolanaWalletModalConfig: () => (/* reexport safe */ _config__WEBPACK_IMPORTED_MODULE_0__.KT),
+/* harmony export */   walletRegistryUrl: () => (/* reexport safe */ _config__WEBPACK_IMPORTED_MODULE_0__.e4)
 /* harmony export */ });
 /* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(149);
 /* harmony import */ var _interface__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(624);
 /* harmony import */ var _interface__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_interface__WEBPACK_IMPORTED_MODULE_1__);
 /* harmony reexport (unknown) */ var __WEBPACK_REEXPORT_OBJECT__ = {};
-/* harmony reexport (unknown) */ for(const __WEBPACK_IMPORT_KEY__ in _interface__WEBPACK_IMPORTED_MODULE_1__) if(["default","defaultEvmDappModalConfig","defaultEvmWalletModalConfig","defaultOtherModalConfig","defaultSolanaDappModalConfig","defaultSolanaWalletModalConfig"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = () => _interface__WEBPACK_IMPORTED_MODULE_1__[__WEBPACK_IMPORT_KEY__]
+/* harmony reexport (unknown) */ for(const __WEBPACK_IMPORT_KEY__ in _interface__WEBPACK_IMPORTED_MODULE_1__) if(["default","defaultEvmDappModalConfig","defaultEvmWalletModalConfig","defaultOtherModalConfig","defaultSolanaDappModalConfig","defaultSolanaWalletModalConfig","walletRegistryUrl"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = () => _interface__WEBPACK_IMPORTED_MODULE_1__[__WEBPACK_IMPORT_KEY__]
 /* harmony reexport (unknown) */ __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
-/* harmony import */ var _modalManager__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(73);
+/* harmony import */ var _modalManager__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(430);
 
 
 

package/dist/modal.esm.js

@@ -1,12 +1,11 @@
-import { CHAIN_NAMESPACES, SOLANA_ADAPTERS, EVM_ADAPTERS, WalletInitializationError, fetchProjectConfig, log, WALLET_ADAPTERS, getChainConfig, ADAPTER_CATEGORY, ADAPTER_STATUS, ADAPTER_EVENTS } from '@web3auth/base';
+import { CHAIN_NAMESPACES, SOLANA_ADAPTERS, EVM_ADAPTERS, cloneDeep, WalletInitializationError, fetchProjectConfig, log, fetchWalletRegistry, WALLET_ADAPTERS, getChainConfig, ADAPTER_CATEGORY, ADAPTER_STATUS, ADAPTER_EVENTS } from '@web3auth/base';
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
+import { LOGIN_PROVIDER, getAuthDefaultOptions, AuthAdapter } from '@web3auth/auth-adapter';
 import { CommonJRPCProvider } from '@web3auth/base-provider';
 import { Web3AuthNoModal } from '@web3auth/no-modal';
-import { LOGIN_PROVIDER, getOpenloginDefaultOptions, OpenloginAdapter } from '@web3auth/openlogin-adapter';
-import { getUserLanguage, LoginModal, capitalizeFirstLetter, getAdapterSocialLogins, LOGIN_MODAL_EVENTS, OPENLOGIN_PROVIDERS } from '@web3auth/ui';
-import clonedeep from 'lodash.clonedeep';
-import merge from 'lodash.merge';
+import { getUserLanguage, LoginModal, capitalizeFirstLetter, getAdapterSocialLogins, LOGIN_MODAL_EVENTS, AUTH_PROVIDERS } from '@web3auth/ui';
+import deepmerge from 'deepmerge';
 
 const defaultSolanaDappModalConfig = {
   chainNamespace: CHAIN_NAMESPACES.SOLANA,
@@ -17,14 +16,8 @@ const defaultSolanaDappModalConfig = {
       showOnMobile: true,
       showOnDesktop: true
     },
-    [SOLANA_ADAPTERS.OPENLOGIN]: {
-      label: "OpenLogin",
-      showOnModal: true,
-      showOnMobile: true,
-      showOnDesktop: true
-    },
-    [SOLANA_ADAPTERS.PHANTOM]: {
-      label: "Phantom",
+    [SOLANA_ADAPTERS.AUTH]: {
+      label: "Auth",
       showOnModal: true,
       showOnMobile: true,
       showOnDesktop: true
@@ -40,14 +33,8 @@ const defaultEvmDappModalConfig = {
       showOnMobile: true,
       showOnDesktop: true
     },
-    [EVM_ADAPTERS.METAMASK]: {
-      label: "MetaMask",
-      showOnModal: true,
-      showOnMobile: true,
-      showOnDesktop: true
-    },
-    [EVM_ADAPTERS.OPENLOGIN]: {
-      label: "OpenLogin",
+    [EVM_ADAPTERS.AUTH]: {
+      label: "Auth",
       showOnModal: true,
       showOnMobile: true,
       showOnDesktop: true
@@ -63,8 +50,8 @@ const defaultEvmDappModalConfig = {
 const defaultSolanaWalletModalConfig = {
   chainNamespace: CHAIN_NAMESPACES.SOLANA,
   adapters: {
-    [SOLANA_ADAPTERS.OPENLOGIN]: {
-      label: "OpenLogin",
+    [SOLANA_ADAPTERS.AUTH]: {
+      label: "Auth",
       showOnModal: true,
       showOnMobile: true,
       showOnDesktop: true
@@ -74,8 +61,8 @@ const defaultSolanaWalletModalConfig = {
 const defaultEvmWalletModalConfig = {
   chainNamespace: CHAIN_NAMESPACES.EIP155,
   adapters: {
-    [EVM_ADAPTERS.OPENLOGIN]: {
-      label: "OpenLogin",
+    [EVM_ADAPTERS.AUTH]: {
+      label: "Auth",
       showOnModal: true,
       showOnMobile: true,
       showOnDesktop: true
@@ -85,21 +72,22 @@ const defaultEvmWalletModalConfig = {
 const defaultOtherModalConfig = {
   chainNamespace: CHAIN_NAMESPACES.OTHER,
   adapters: {
-    [EVM_ADAPTERS.OPENLOGIN]: {
-      label: "OpenLogin",
+    [EVM_ADAPTERS.AUTH]: {
+      label: "Auth",
       showOnModal: true,
       showOnMobile: true,
       showOnDesktop: true
     }
   }
 };
+const walletRegistryUrl = "https://assets.web3auth.io/v1/wallet-registry.json";
 
 class Web3Auth extends Web3AuthNoModal {
   constructor(options) {
     super(options);
     _defineProperty(this, "loginModal", void 0);
     _defineProperty(this, "options", void 0);
-    _defineProperty(this, "modalConfig", defaultOtherModalConfig);
+    _defineProperty(this, "modalConfig", cloneDeep(defaultOtherModalConfig));
     this.options = _objectSpread({}, options);
     if (!this.options.uiConfig) this.options.uiConfig = {};
     if (!this.coreOptions.privateKeyProvider) throw WalletInitializationError.invalidParams("privateKeyProvider is required");
@@ -120,22 +108,31 @@ class Web3Auth extends Web3AuthNoModal {
     const {
       whitelabel
     } = projectConfig;
-    this.options.uiConfig = merge(clonedeep(whitelabel), this.options.uiConfig);
+    this.options.uiConfig = deepmerge(cloneDeep(whitelabel), this.options.uiConfig);
     if (!this.options.uiConfig.defaultLanguage) this.options.uiConfig.defaultLanguage = getUserLanguage(this.options.uiConfig.defaultLanguage);
     if (!this.options.uiConfig.mode) this.options.uiConfig.mode = "light";
+    let walletRegistry = {};
+    try {
+      walletRegistry = await fetchWalletRegistry(walletRegistryUrl);
+    } catch (e) {
+      log.error("Failed to fetch wallet registry", e);
+    }
     this.loginModal = new LoginModal(_objectSpread(_objectSpread({}, this.options.uiConfig), {}, {
-      adapterListener: this
+      adapterListener: this,
+      chainNamespace: this.options.chainConfig.chainNamespace,
+      walletRegistry
     }));
     this.subscribeToLoginModalEvents();
     const {
       sms_otp_enabled: smsOtpEnabled,
-      whitelist
+      whitelist,
+      key_export_enabled: keyExportEnabled
     } = projectConfig;
     if (smsOtpEnabled !== undefined) {
       var _params;
       const adapterConfig = {
-        [WALLET_ADAPTERS.OPENLOGIN]: {
-          label: WALLET_ADAPTERS.OPENLOGIN,
+        [WALLET_ADAPTERS.AUTH]: {
+          label: WALLET_ADAPTERS.AUTH,
           loginMethods: {
             [LOGIN_PROVIDER.SMS_PASSWORDLESS]: {
               name: LOGIN_PROVIDER.SMS_PASSWORDLESS,
@@ -149,7 +146,7 @@ class Web3Auth extends Web3AuthNoModal {
       if (!((_params = params) !== null && _params !== void 0 && _params.modalConfig)) params = {
         modalConfig: {}
       };
-      params.modalConfig = merge(clonedeep(params.modalConfig), adapterConfig);
+      params.modalConfig = deepmerge(cloneDeep(params.modalConfig), adapterConfig);
     }
     await this.loginModal.initModal();
     const providedChainConfig = this.options.chainConfig;
@@ -179,9 +176,9 @@ class Web3Auth extends Web3AuthNoModal {
       // and if adapter is not hidden by user
       if (!adapter && (_this$modalConfig$ada3 = this.modalConfig.adapters) !== null && _this$modalConfig$ada3 !== void 0 && _this$modalConfig$ada3[adapterName].showOnModal) {
         // Adapters to be shown on modal should be pre-configured.
-        if (adapterName === WALLET_ADAPTERS.OPENLOGIN) {
+        if (adapterName === WALLET_ADAPTERS.AUTH) {
           var _this$coreOptions$cha;
-          const defaultOptions = getOpenloginDefaultOptions();
+          const defaultOptions = getAuthDefaultOptions();
           const {
             clientId,
             useCoreKitKey,
@@ -194,13 +191,13 @@ class Web3Auth extends Web3AuthNoModal {
           if (!privateKeyProvider) {
             throw WalletInitializationError.invalidParams("privateKeyProvider is required");
           }
-          const finalOpenloginAdapterSettings = _objectSpread(_objectSpread({}, defaultOptions.adapterSettings), {}, {
+          const finalAuthAdapterSettings = _objectSpread(_objectSpread({}, defaultOptions.adapterSettings), {}, {
             clientId,
             network: web3AuthNetwork,
             whiteLabel: this.options.uiConfig
           });
           if (smsOtpEnabled !== undefined) {
-            finalOpenloginAdapterSettings.loginConfig = {
+            finalAuthAdapterSettings.loginConfig = {
               [LOGIN_PROVIDER.SMS_PASSWORDLESS]: {
                 showOnModal: smsOtpEnabled,
                 showOnDesktop: smsOtpEnabled,
@@ -210,21 +207,21 @@ class Web3Auth extends Web3AuthNoModal {
             };
           }
           if (whitelist) {
-            finalOpenloginAdapterSettings.originData = whitelist.signed_urls;
+            finalAuthAdapterSettings.originData = whitelist.signed_urls;
           }
           if (this.options.uiConfig.uxMode) {
-            finalOpenloginAdapterSettings.uxMode = this.options.uiConfig.uxMode;
+            finalAuthAdapterSettings.uxMode = this.options.uiConfig.uxMode;
           }
-          const openloginAdapter = new OpenloginAdapter(_objectSpread(_objectSpread({}, defaultOptions), {}, {
+          const authAdapter = new AuthAdapter(_objectSpread(_objectSpread({}, defaultOptions), {}, {
             clientId,
             useCoreKitKey,
             chainConfig: _objectSpread({}, finalChainConfig),
-            adapterSettings: finalOpenloginAdapterSettings,
+            adapterSettings: finalAuthAdapterSettings,
             sessionTime,
             web3AuthNetwork,
             privateKeyProvider
           }));
-          this.walletAdapters[adapterName] = openloginAdapter;
+          this.walletAdapters[adapterName] = authAdapter;
           return adapterName;
         }
         throw WalletInitializationError.invalidParams(`Adapter ${adapterName} is not configured`);
@@ -249,19 +246,19 @@ class Web3Auth extends Web3AuthNoModal {
             chainConfig
           });
         }
-        if (adapterName === WALLET_ADAPTERS.OPENLOGIN) {
+        if (adapterName === WALLET_ADAPTERS.AUTH) {
           var _this$options$uiConfi;
-          const openloginAdapter = this.walletAdapters[adapterName];
+          const authAdapter = this.walletAdapters[adapterName];
           if (this.coreOptions.privateKeyProvider) {
-            if (openloginAdapter.currentChainNamespace !== this.coreOptions.privateKeyProvider.currentChainConfig.chainNamespace) {
-              throw WalletInitializationError.incompatibleChainNameSpace("private key provider is not compatible with provided chainNamespace for openlogin adapter");
+            if (authAdapter.currentChainNamespace !== this.coreOptions.privateKeyProvider.currentChainConfig.chainNamespace) {
+              throw WalletInitializationError.incompatibleChainNameSpace("private key provider is not compatible with provided chainNamespace for auth adapter");
             }
-            openloginAdapter.setAdapterSettings({
+            authAdapter.setAdapterSettings({
               privateKeyProvider: this.coreOptions.privateKeyProvider
             });
           }
           if (smsOtpEnabled !== undefined) {
-            openloginAdapter.setAdapterSettings({
+            authAdapter.setAdapterSettings({
               loginConfig: {
                 [LOGIN_PROVIDER.SMS_PASSWORDLESS]: {
                   showOnModal: smsOtpEnabled,
@@ -273,20 +270,20 @@ class Web3Auth extends Web3AuthNoModal {
             });
           }
           if (whitelist) {
-            openloginAdapter.setAdapterSettings({
+            authAdapter.setAdapterSettings({
               originData: whitelist.signed_urls
             });
           }
           if ((_this$options$uiConfi = this.options.uiConfig) !== null && _this$options$uiConfi !== void 0 && _this$options$uiConfi.uxMode) {
-            openloginAdapter.setAdapterSettings({
+            authAdapter.setAdapterSettings({
               uxMode: this.options.uiConfig.uxMode
             });
           }
-          openloginAdapter.setAdapterSettings({
+          authAdapter.setAdapterSettings({
             whiteLabel: this.options.uiConfig
           });
-          if (!openloginAdapter.privateKeyProvider) {
-            throw WalletInitializationError.invalidParams("privateKeyProvider is required for openlogin adapter");
+          if (!authAdapter.privateKeyProvider) {
+            throw WalletInitializationError.invalidParams("privateKeyProvider is required for auth adapter");
           }
         } else if (adapterName === WALLET_ADAPTERS.WALLET_CONNECT_V2) {
           const walletConnectAdapter = this.walletAdapters[adapterName];
@@ -360,6 +357,11 @@ class Web3Auth extends Web3AuthNoModal {
     this.commonJRPCProvider = await CommonJRPCProvider.getProviderInstance({
       chainConfig: this.coreOptions.chainConfig
     });
+    if (typeof keyExportEnabled === "boolean") {
+      this.coreOptions.privateKeyProvider.setKeyExportFlag(keyExportEnabled);
+      // dont know if we need to do this.
+      this.commonJRPCProvider.setKeyExportFlag(keyExportEnabled);
+    }
     await Promise.all(initPromises);
     if (this.status === ADAPTER_STATUS.NOT_READY) {
       this.status = ADAPTER_STATUS.READY;
@@ -418,14 +420,20 @@ class Web3Auth extends Web3AuthNoModal {
           await adapter.init({
             autoConnect: this.cachedAdapter === adapterName
           }).then(() => {
-            adaptersConfig[adapterName] = this.modalConfig.adapters[adapterName];
+            const adapterModalConfig = this.modalConfig.adapters[adapterName];
+            adaptersConfig[adapterName] = _objectSpread(_objectSpread({}, adapterModalConfig), {}, {
+              isInjected: adapter.isInjected
+            });
             this.loginModal.addWalletLogins(adaptersConfig, {
               showExternalWalletsOnly: !!(options !== null && options !== void 0 && options.showExternalWalletsOnly)
             });
             return undefined;
           }).catch(error => log.error(error, "error while initializing adapter", adapterName));
         } else if (adapter.status === ADAPTER_STATUS.READY) {
-          adaptersConfig[adapterName] = this.modalConfig.adapters[adapterName];
+          const adapterModalConfig = this.modalConfig.adapters[adapterName];
+          adaptersConfig[adapterName] = _objectSpread(_objectSpread({}, adapterModalConfig), {}, {
+            isInjected: adapter.isInjected
+          });
           this.loginModal.addWalletLogins(adaptersConfig, {
             showExternalWalletsOnly: !!(options !== null && options !== void 0 && options.showExternalWalletsOnly)
           });
@@ -437,7 +445,7 @@ class Web3Auth extends Web3AuthNoModal {
     log.info("adapterInitResults", adapterName);
     if (this.walletAdapters[adapterName].type === ADAPTER_CATEGORY.IN_APP) {
       var _adapterName, _this$options$uiConfi2, _this$options$uiConfi3, _this$options$uiConfi4;
-      this.loginModal.addSocialLogins(adapterName, getAdapterSocialLogins(adapterName, (_adapterName = this.modalConfig.adapters[adapterName]) === null || _adapterName === void 0 ? void 0 : _adapterName.loginMethods), ((_this$options$uiConfi2 = this.options.uiConfig) === null || _this$options$uiConfi2 === void 0 ? void 0 : _this$options$uiConfi2.loginMethodsOrder) || OPENLOGIN_PROVIDERS, _objectSpread(_objectSpread({}, this.options.uiConfig), {}, {
+      this.loginModal.addSocialLogins(adapterName, getAdapterSocialLogins(adapterName, (_adapterName = this.modalConfig.adapters[adapterName]) === null || _adapterName === void 0 ? void 0 : _adapterName.loginMethods), ((_this$options$uiConfi2 = this.options.uiConfig) === null || _this$options$uiConfi2 === void 0 ? void 0 : _this$options$uiConfi2.loginMethodsOrder) || AUTH_PROVIDERS, _objectSpread(_objectSpread({}, this.options.uiConfig), {}, {
         loginGridCol: ((_this$options$uiConfi3 = this.options.uiConfig) === null || _this$options$uiConfi3 === void 0 ? void 0 : _this$options$uiConfi3.loginGridCol) || 3,
         primaryButton: ((_this$options$uiConfi4 = this.options.uiConfig) === null || _this$options$uiConfi4 === void 0 ? void 0 : _this$options$uiConfi4.primaryButton) || "socialLogin"
       }));
@@ -487,4 +495,4 @@ class Web3Auth extends Web3AuthNoModal {
   }
 }
 
-export { Web3Auth, defaultEvmDappModalConfig, defaultEvmWalletModalConfig, defaultOtherModalConfig, defaultSolanaDappModalConfig, defaultSolanaWalletModalConfig };
+export { Web3Auth, defaultEvmDappModalConfig, defaultEvmWalletModalConfig, defaultOtherModalConfig, defaultSolanaDappModalConfig, defaultSolanaWalletModalConfig, walletRegistryUrl };