@reown/appkit 1.5.3 → 1.5.4-rc.2.0

package/dist/esm/exports/constants.js

@@ -1,2 +1,2 @@
-export const PACKAGE_VERSION = '1.5.3';
+export const PACKAGE_VERSION = '1.5.4-rc.2.0';
 //# sourceMappingURL=constants.js.map

package/dist/esm/exports/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../exports/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,eAAe,GAAG,OAAO,CAAA"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../exports/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,eAAe,GAAG,cAAc,CAAA"}

package/dist/esm/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@reown/appkit",
-    "version": "1.5.3",
+    "version": "1.5.4-rc.2.0",
     "type": "module",
     "main": "./dist/esm/exports/index.js",
     "types": "./dist/types/exports/index.d.ts",

package/dist/esm/src/adapters/ChainAdapterBlueprint.js.map

@@ -1 +1 @@
-{"version":3,"file":"ChainAdapterBlueprint.js","sourceRoot":"","sources":["../../../../src/adapters/ChainAdapterBlueprint.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ChainAdapterBlueprint.js","sourceRoot":"","sources":["../../../../src/adapters/ChainAdapterBlueprint.ts"],"names":[],"mappings":"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"}

package/dist/esm/src/client.js

@@ -2,7 +2,7 @@
 import { ConstantsUtil as CoreConstantsUtil, SIWXUtil } from '@reown/appkit-core';
 import { AccountController, BlockchainApiController, ConnectionController, ConnectorController, CoreHelperUtil, EventsController, ModalController, ChainController, PublicStateController, ThemeController, SnackController, RouterController, EnsController, OptionsController, AssetUtil, ApiController, AlertController, StorageUtil } from '@reown/appkit-core';
 import { setColorTheme, setThemeVariables } from '@reown/appkit-ui';
-import { ConstantsUtil, SafeLocalStorage, SafeLocalStorageKeys } from '@reown/appkit-common';
+import { ConstantsUtil, NetworkUtil } from '@reown/appkit-common';
 import { UniversalAdapter, UniversalAdapter as UniversalAdapterClient } from './universal-adapter/client.js';
 import { CaipNetworksUtil, ErrorUtil, ConstantsUtil as UtilConstantsUtil } from '@reown/appkit-utils';
 import { W3mFrameHelpers, W3mFrameRpcConstants } from '@reown/appkit-wallet';
@@ -192,13 +192,26 @@ export class AppKit {
         this.createAuthProvider();
         await this.createUniversalProvider();
         this.createClients();
-        ChainController.initialize(options.adapters ?? []);
+        ChainController.initialize(options.adapters ?? [], this.caipNetworks);
         this.chainAdapters = await this.createAdapters(options.adapters);
         await this.initChainAdapters();
         this.syncRequestedNetworks();
         await this.initOrContinue();
         await this.syncExistingConnection();
         this.version = options.sdkVersion;
+        const { ...optionsCopy } = options;
+        delete optionsCopy.adapters;
+        EventsController.sendEvent({
+            type: 'track',
+            event: 'INITIALIZE',
+            properties: {
+                ...optionsCopy,
+                networks: options.networks.map(n => n.id),
+                siweConfig: {
+                    options: options.siweConfig?.options || {}
+                }
+            }
+        });
     }
     // -- Public -------------------------------------------------------------------
     async open(options) {
@@ -237,8 +250,8 @@ export class AppKit {
             ? ProviderUtil.state.providerIds[ChainController.state.activeChain]
             : null;
     }
-    subscribeProvider() {
-        return null;
+    subscribeProviders(callback) {
+        return ProviderUtil.subscribeProviders(callback);
     }
     getThemeMode() {
         return ThemeController.state.themeMode;
@@ -250,6 +263,12 @@ export class AppKit {
         ThemeController.setThemeMode(themeMode);
         setColorTheme(ThemeController.state.themeMode);
     }
+    setTermsConditionsUrl(termsConditionsUrl) {
+        OptionsController.setTermsConditionsUrl(termsConditionsUrl);
+    }
+    setPrivacyPolicyUrl(privacyPolicyUrl) {
+        OptionsController.setPrivacyPolicyUrl(privacyPolicyUrl);
+    }
     setThemeVariables(themeVariables) {
         ThemeController.setThemeVariables(themeVariables);
         setThemeVariables(ThemeController.state.themeVariables);
@@ -326,6 +345,26 @@ export class AppKit {
     isTransactionShouldReplaceView() {
         return RouterController.state.transactionStack[RouterController.state.transactionStack.length - 1]?.replace;
     }
+    updateFeatures(newFeatures) {
+        OptionsController.setFeatures(newFeatures);
+    }
+    updateOptions(newOptions) {
+        const currentOptions = OptionsController.state || {};
+        const updatedOptions = { ...currentOptions, ...newOptions };
+        OptionsController.setOptions(updatedOptions);
+    }
+    setConnectMethodsOrder(connectMethodsOrder) {
+        OptionsController.setConnectMethodsOrder(connectMethodsOrder);
+    }
+    setWalletFeaturesOrder(walletFeaturesOrder) {
+        OptionsController.setWalletFeaturesOrder(walletFeaturesOrder);
+    }
+    setCollapseWallets(collapseWallets) {
+        OptionsController.setCollapseWallets(collapseWallets);
+    }
+    setSocialsOrder(socialsOrder) {
+        OptionsController.setSocialsOrder(socialsOrder);
+    }
     async disconnect() {
         await this.connectionControllerClient?.disconnect();
     }
@@ -334,6 +373,7 @@ export class AppKit {
         OptionsController.setDebug(options.debug);
         OptionsController.setProjectId(options.projectId);
         OptionsController.setSdkVersion(options.sdkVersion);
+        OptionsController.setEnableEmbedded(options.enableEmbedded);
         if (!options.projectId) {
             AlertController.open(ErrorUtil.ALERT_ERRORS.PROJECT_ID_NOT_CONFIGURED, 'error');
             return;
@@ -357,7 +397,9 @@ export class AppKit {
         OptionsController.setCustomWallets(options.customWallets);
         OptionsController.setFeatures(options.features);
         OptionsController.setEnableWalletConnect(options.enableWalletConnect !== false);
+        OptionsController.setEnableWalletGuide(options.enableWalletGuide !== false);
         OptionsController.setEnableWallets(options.enableWallets !== false);
+        OptionsController.setEIP6963Enabled(options.enableEIP6963 !== false);
         if (options.metadata) {
             OptionsController.setMetadata(options.metadata);
         }
@@ -463,16 +505,19 @@ export class AppKit {
                 await this.syncWalletConnectAccount();
             },
             connectExternal: async ({ id, info, type, provider, chain, caipNetwork }) => {
-                if (chain && chain !== ChainController.state.activeChain && !caipNetwork) {
+                const activeChain = ChainController.state.activeChain;
+                if (chain && chain !== activeChain && !caipNetwork) {
                     const toConnectNetwork = this.caipNetworks?.find(network => network.chainNamespace === chain);
                     if (toConnectNetwork) {
                         this.setCaipNetwork(toConnectNetwork);
                     }
                 }
-                const adapter = chain
-                    ? this.getAdapter(chain)
-                    : this.getAdapter(ChainController.state.activeChain);
-                const res = await adapter?.connect({
+                const chainToUse = chain || activeChain;
+                const adapter = this.getAdapter(chainToUse);
+                if (!adapter) {
+                    throw new Error('Adapter not found');
+                }
+                const res = await adapter.connect({
                     id,
                     info,
                     type,
@@ -484,12 +529,14 @@ export class AppKit {
                 if (res) {
                     this.syncProvider({
                         ...res,
-                        chainNamespace: chain || ChainController.state.activeChain
+                        chainNamespace: chainToUse
                     });
                     await this.syncAccount({
                         ...res,
-                        chainNamespace: chain || ChainController.state.activeChain
+                        chainNamespace: chainToUse
                     });
+                    const { accounts } = await adapter.getAccounts({ namespace: chainToUse, id });
+                    this.setAllAccounts(accounts, chainToUse);
                 }
                 if (!this.caipNetworks?.some(network => network.id === res?.chainId)) {
                     if (res?.chainId) {
@@ -509,8 +556,8 @@ export class AppKit {
                 const providerType = ProviderUtil.state.providerIds[ChainController.state.activeChain];
                 await adapter?.disconnect({ provider, providerType });
                 this.setStatus('disconnected', ChainController.state.activeChain);
-                SafeLocalStorage.removeItem(SafeLocalStorageKeys.CONNECTED_CONNECTOR);
-                SafeLocalStorage.removeItem(SafeLocalStorageKeys.ACTIVE_CAIP_NETWORK_ID);
+                StorageUtil.deleteConnectedConnector();
+                StorageUtil.deleteActiveCaipNetworkId();
                 ChainController.state.chains.forEach(chain => {
                     this.resetAccount(chain.namespace);
                 });
@@ -740,13 +787,19 @@ export class AppKit {
             }
             if (this.isTransactionStackEmpty()) {
                 this.close();
+                if (AccountController.state.address && ChainController.state.activeCaipNetwork?.id) {
+                    this.updateBalance();
+                }
             }
             else {
                 this.popTransactionStack();
+                if (AccountController.state.address && ChainController.state.activeCaipNetwork?.id) {
+                    this.updateBalance();
+                }
             }
         });
         provider.onNotConnected(() => {
-            const connectedConnector = SafeLocalStorage.getItem(SafeLocalStorageKeys.CONNECTED_CONNECTOR);
+            const connectedConnector = StorageUtil.getConnectedConnector();
             const isConnectedWithAuth = connectedConnector === UtilConstantsUtil.AUTH_CONNECTOR_ID;
             if (!isConnected && isConnectedWithAuth) {
                 this.setCaipAddress(undefined, ChainController.state.activeChain);
@@ -757,24 +810,25 @@ export class AppKit {
             provider.connect();
         });
         provider.onConnect(async (user) => {
+            const namespace = ChainController.state.activeChain;
             this.syncProvider({
                 type: UtilConstantsUtil.CONNECTOR_TYPE_AUTH,
                 provider,
                 id: UtilConstantsUtil.AUTH_CONNECTOR_ID,
-                chainNamespace: ChainController.state.activeChain
+                chainNamespace: namespace
             });
-            const caipAddress = ChainController.state.activeChain === 'eip155'
+            // To keep backwards compatibility, eip155 chainIds are numbers and not actual caipChainIds
+            const caipAddress = namespace === 'eip155'
                 ? `eip155:${user.chainId}:${user.address}`
                 : `${user.chainId}:${user.address}`;
-            this.setCaipAddress(caipAddress, ChainController.state.activeChain);
-            this.setSmartAccountDeployed(Boolean(user.smartAccountDeployed), ChainController.state.activeChain);
-            this.setPreferredAccountType(user.preferredAccountType, ChainController.state.activeChain);
-            this.setAllAccounts(user.accounts || [
-                {
-                    address: user.address,
-                    type: (user.preferredAccountType || 'eoa')
-                }
-            ], ChainController.state.activeChain);
+            this.setCaipAddress(caipAddress, namespace);
+            this.setSmartAccountDeployed(Boolean(user.smartAccountDeployed), namespace);
+            const preferredAccountType = (user.preferredAccountType || 'eoa');
+            this.setPreferredAccountType(preferredAccountType, namespace);
+            const userAccounts = user.accounts?.map(account => CoreHelperUtil.createAccount(namespace, account.address, namespace === 'eip155' ? preferredAccountType : 'eoa'));
+            this.setAllAccounts(userAccounts || [
+                CoreHelperUtil.createAccount(namespace, user.address, preferredAccountType)
+            ], namespace);
             await provider.getSmartAccountEnabledNetworks();
             this.setLoading(false);
         });
@@ -828,6 +882,9 @@ export class AppKit {
     }
     listenAdapter(chainNamespace) {
         const adapter = this.getAdapter(chainNamespace);
+        if (!adapter) {
+            return;
+        }
         const connectionStatus = StorageUtil.getConnectionStatus();
         if (connectionStatus === 'connected') {
             this.setStatus('connecting', chainNamespace);
@@ -835,7 +892,7 @@ export class AppKit {
         else {
             this.setStatus(connectionStatus, chainNamespace);
         }
-        adapter?.on('switchNetwork', ({ address, chainId }) => {
+        adapter.on('switchNetwork', ({ address, chainId }) => {
             if (chainId && this.caipNetworks?.find(n => n.id === chainId)) {
                 if (ChainController.state.activeChain === chainNamespace && address) {
                     this.syncAccount({ address, chainId, chainNamespace });
@@ -853,12 +910,20 @@ export class AppKit {
                 this.setUnsupportedNetwork(chainId);
             }
         });
-        adapter?.on('disconnect', () => {
+        adapter.on('disconnect', () => {
             if (ChainController.state.activeChain === chainNamespace) {
                 this.handleDisconnect();
             }
         });
-        adapter?.on('accountChanged', ({ address, chainId }) => {
+        adapter.on('pendingTransactions', () => {
+            const address = AccountController.state.address;
+            const activeCaipNetwork = ChainController.state.activeCaipNetwork;
+            if (!address || !activeCaipNetwork?.id) {
+                return;
+            }
+            this.updateBalance();
+        });
+        adapter.on('accountChanged', ({ address, chainId }) => {
             if (ChainController.state.activeChain === chainNamespace && chainId) {
                 this.syncAccount({
                     address,
@@ -876,6 +941,17 @@ export class AppKit {
             }
         });
     }
+    updateBalance() {
+        const adapter = this.getAdapter(ChainController.state.activeChain);
+        if (adapter) {
+            adapter.getBalance({
+                address: AccountController.state.address,
+                chainId: ChainController.state.activeCaipNetwork?.id,
+                caipNetwork: this.getCaipNetwork(),
+                tokens: this.options.tokens
+            });
+        }
+    }
     getChainsFromNamespaces(namespaces = {}) {
         return Object.values(namespaces).flatMap(namespace => {
             const chains = (namespace.chains || []);
@@ -888,7 +964,6 @@ export class AppKit {
     }
     async syncWalletConnectAccount() {
         const adapter = this.getAdapter(ChainController.state.activeChain);
-        StorageUtil.setConnectedNamespace(ChainController.state.activeChain);
         this.chainNamespaces.forEach(async (chainNamespace) => {
             const caipAddress = this.universalProvider?.session?.namespaces?.[chainNamespace]
                 ?.accounts[0];
@@ -956,45 +1031,49 @@ export class AppKit {
         })
             .filter((address, index, self) => self.indexOf(address) === index);
         if (addresses) {
-            this.setAllAccounts(addresses.map(address => ({ address, type: 'eoa' })), chainNamespace);
+            this.setAllAccounts(addresses.map(address => CoreHelperUtil.createAccount(chainNamespace, address, chainNamespace === 'bip122' ? 'payment' : 'eoa')), chainNamespace);
         }
     }
     syncProvider({ type, provider, id, chainNamespace }) {
         ProviderUtil.setProviderId(chainNamespace, type);
         ProviderUtil.setProvider(chainNamespace, provider);
         StorageUtil.setConnectedConnector(id);
-        StorageUtil.setConnectedNamespace(ChainController.state.activeChain);
     }
     async syncAccount({ address, chainId, chainNamespace }) {
-        this.setPreferredAccountType(AccountController.state.preferredAccountType
-            ? AccountController.state.preferredAccountType
-            : 'eoa', ChainController.state.activeChain);
-        this.setCaipAddress(`${chainNamespace}:${chainId}:${address}`, chainNamespace);
+        const { namespace: activeNamespace, chainId: activeChainId } = StorageUtil.getActiveNetworkProps();
+        const chainIdToUse = chainId || activeChainId;
+        // Only update state when needed
+        if (address.toLowerCase() !== AccountController.state.address?.toLowerCase()) {
+            this.setCaipAddress(`${chainNamespace}:${chainId}:${address}`, chainNamespace);
+            await this.syncIdentity({ address, chainId, chainNamespace });
+        }
         this.setStatus('connected', chainNamespace);
-        if (chainNamespace === ChainController.state.activeChain) {
-            const caipNetwork = this.caipNetworks?.find(n => n.id === chainId && n.chainNamespace === chainNamespace);
-            if (caipNetwork) {
-                this.setCaipNetwork(caipNetwork);
-            }
-            else {
-                this.setCaipNetwork(this.caipNetworks?.find(n => n.chainNamespace === chainNamespace));
-            }
+        if (chainIdToUse && chainNamespace === activeNamespace) {
+            const caipNetwork = this.caipNetworks?.find(n => n.id.toString() === chainIdToUse.toString());
+            const fallBackCaipNetwork = this.caipNetworks?.find(n => n.chainNamespace === chainNamespace);
+            this.setCaipNetwork(caipNetwork || fallBackCaipNetwork);
             this.syncConnectedWalletInfo(chainNamespace);
-            const adapter = this.getAdapter(chainNamespace);
-            const balance = await adapter?.getBalance({
-                address,
-                chainId,
-                caipNetwork: caipNetwork || this.getCaipNetwork(),
-                tokens: this.options.tokens
-            });
-            if (balance) {
-                this.setBalance(balance.balance, balance.symbol, chainNamespace);
-            }
-            await this.syncIdentity({ address, chainId: Number(chainId), chainNamespace });
+            await this.syncBalance({ address, chainId: chainIdToUse, chainNamespace });
+        }
+    }
+    async syncBalance(params) {
+        const adapter = this.getAdapter(params.chainNamespace);
+        const caipNetwork = NetworkUtil.getNetworksByNamespace(this.caipNetworks, params.chainNamespace).find(n => n.id.toString() === params.chainId.toString());
+        if (!caipNetwork) {
+            return;
+        }
+        const balance = await adapter?.getBalance({
+            address: params.address,
+            chainId: params.chainId,
+            caipNetwork,
+            tokens: this.options.tokens
+        });
+        if (balance) {
+            this.setBalance(balance.balance, balance.symbol, params.chainNamespace);
         }
     }
     syncConnectedWalletInfo(chainNamespace) {
-        const currentActiveWallet = SafeLocalStorage.getItem(SafeLocalStorageKeys.CONNECTED_CONNECTOR);
+        const currentActiveWallet = StorageUtil.getConnectedConnector();
         const providerType = ProviderUtil.state.providerIds[chainNamespace];
         if (providerType === UtilConstantsUtil.CONNECTOR_TYPE_ANNOUNCED ||
             providerType === UtilConstantsUtil.CONNECTOR_TYPE_INJECTED) {
@@ -1024,6 +1103,9 @@ export class AppKit {
         }
     }
     async syncIdentity({ address, chainId, chainNamespace }) {
+        if (chainNamespace !== 'eip155') {
+            return;
+        }
         try {
             const { name, avatar } = await this.fetchIdentity({
                 address
@@ -1083,30 +1165,34 @@ export class AppKit {
             [], chainNamespace));
     }
     async syncExistingConnection() {
-        const connectedConnector = SafeLocalStorage.getItem(SafeLocalStorageKeys.CONNECTED_CONNECTOR);
-        const connectedNamespace = SafeLocalStorage.getItem(SafeLocalStorageKeys.CONNECTED_NAMESPACE);
-        if (connectedConnector === UtilConstantsUtil.CONNECTOR_TYPE_WALLET_CONNECT &&
-            connectedNamespace) {
+        const connectedConnector = StorageUtil.getConnectedConnector();
+        const activeNamespace = StorageUtil.getActiveNamespace();
+        if (connectedConnector === UtilConstantsUtil.CONNECTOR_TYPE_WALLET_CONNECT && activeNamespace) {
             this.syncWalletConnectAccount();
         }
         else if (connectedConnector &&
             connectedConnector !== UtilConstantsUtil.CONNECTOR_TYPE_W3M_AUTH &&
-            connectedNamespace) {
-            this.setStatus('connecting', connectedNamespace);
-            const adapter = this.getAdapter(connectedNamespace);
+            activeNamespace) {
+            this.setStatus('connecting', activeNamespace);
+            const adapter = this.getAdapter(activeNamespace);
             const res = await adapter?.syncConnection({
                 id: connectedConnector,
                 chainId: this.getCaipNetwork()?.id,
-                namespace: connectedNamespace,
+                namespace: activeNamespace,
                 rpcUrl: this.getCaipNetwork()?.rpcUrls?.default?.http?.[0]
             });
             if (res) {
-                this.syncProvider({ ...res, chainNamespace: connectedNamespace });
-                await this.syncAccount({ ...res, chainNamespace: connectedNamespace });
-                this.setStatus('connected', connectedNamespace);
+                const accounts = await adapter?.getAccounts({
+                    namespace: activeNamespace,
+                    id: connectedConnector
+                });
+                this.syncProvider({ ...res, chainNamespace: activeNamespace });
+                await this.syncAccount({ ...res, chainNamespace: activeNamespace });
+                this.setAllAccounts(accounts?.accounts || [], activeNamespace);
+                this.setStatus('connected', activeNamespace);
             }
             else {
-                this.setStatus('disconnected', connectedNamespace);
+                this.setStatus('disconnected', activeNamespace);
             }
             if (!this.caipNetworks?.some(network => network.id === res?.chainId)) {
                 if (res?.chainId) {
@@ -1225,7 +1311,7 @@ export class AppKit {
         this.listenWalletConnect();
     }
     setDefaultNetwork() {
-        const previousNetwork = SafeLocalStorage.getItem(SafeLocalStorageKeys.ACTIVE_CAIP_NETWORK_ID);
+        const previousNetwork = StorageUtil.getActiveCaipNetworkId();
         const caipNetwork = previousNetwork && this.caipNetworks?.length
             ? this.caipNetworks.find(n => n.caipNetworkId === previousNetwork)
             : undefined;