@tronweb3/tronwallet-adapter-trust 1.0.3 → 1.1.0

package/lib/umd/index.js

@@ -363,82 +363,7 @@
 		return eventemitter3.exports;
 	}
 
-	var hasRequiredAdapter$2;
-
-	function requireAdapter$2 () {
-		if (hasRequiredAdapter$2) return adapter$1;
-		hasRequiredAdapter$2 = 1;
-		var __importDefault = (adapter$1 && adapter$1.__importDefault) || function (mod) {
-		    return (mod && mod.__esModule) ? mod : { "default": mod };
-		};
-		Object.defineProperty(adapter$1, "__esModule", { value: true });
-		adapter$1.Adapter = adapter$1.AdapterState = adapter$1.WalletReadyState = adapter$1.EventEmitter = void 0;
-		const eventemitter3_1 = __importDefault(requireEventemitter3());
-		adapter$1.EventEmitter = eventemitter3_1.default;
-		/**
-		 * Wallet ready state.
-		 */
-		var WalletReadyState;
-		(function (WalletReadyState) {
-		    /**
-		     * Adapter will start to check if wallet exists after adapter instance is created.
-		     */
-		    WalletReadyState["Loading"] = "Loading";
-		    /**
-		     * When checking ends and wallet is not found, readyState will be NotFound.
-		     */
-		    WalletReadyState["NotFound"] = "NotFound";
-		    /**
-		     * When checking ends and wallet is found, readyState will be Found.
-		     */
-		    WalletReadyState["Found"] = "Found";
-		})(WalletReadyState || (adapter$1.WalletReadyState = WalletReadyState = {}));
-		/**
-		 * Adapter state
-		 */
-		var AdapterState;
-		(function (AdapterState) {
-		    /**
-		     * If adapter is checking the wallet, the state is Loading.
-		     */
-		    AdapterState["Loading"] = "Loading";
-		    /**
-		     * If wallet is not installed, the state is NotFound.
-		     */
-		    AdapterState["NotFound"] = "NotFound";
-		    /**
-		     * If wallet is installed but is not connected to current Dapp, the state is Disconnected.
-		     */
-		    AdapterState["Disconnect"] = "Disconnected";
-		    /**
-		     * Wallet is connected to current Dapp.
-		     */
-		    AdapterState["Connected"] = "Connected";
-		})(AdapterState || (adapter$1.AdapterState = AdapterState = {}));
-		class Adapter extends eventemitter3_1.default {
-		    get connected() {
-		        return this.state === AdapterState.Connected;
-		    }
-		    /**
-		     * Some wallets such as TronLink don't support disconnect() method.
-		     */
-		    disconnect() {
-		        console.info("The current adapter doesn't support disconnect by DApp.");
-		        return Promise.resolve();
-		    }
-		    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-		    multiSign(transaction, options = {}) {
-		        return Promise.reject("The current wallet doesn't support multiSign.");
-		    }
-		    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-		    switchChain(_chainId) {
-		        return Promise.reject("The current wallet doesn't support switch chain.");
-		    }
-		}
-		adapter$1.Adapter = Adapter;
-		
-		return adapter$1;
-	}
+	var typedData = {};
 
 	var errors = {};
 
@@ -448,7 +373,7 @@
 		if (hasRequiredErrors) return errors;
 		hasRequiredErrors = 1;
 		Object.defineProperty(errors, "__esModule", { value: true });
-		errors.WalletGetNetworkError = errors.WalletSwitchChainError = errors.WalletWindowClosedError = errors.WalletWalletLoadError = errors.WalletSignTransactionError = errors.WalletSignMessageError = errors.WalletDisconnectionError = errors.WalletConnectionError = errors.WalletDisconnectedError = errors.WalletNotSelectedError = errors.WalletNotFoundError = errors.WalletError = void 0;
+		errors.WalletSignTypedDataError = errors.WalletGetNetworkError = errors.WalletSwitchChainError = errors.WalletWindowClosedError = errors.WalletWalletLoadError = errors.WalletSignTransactionError = errors.WalletSignMessageError = errors.WalletDisconnectionError = errors.WalletConnectionError = errors.WalletDisconnectedError = errors.WalletNotSelectedError = errors.WalletNotFoundError = errors.WalletError = void 0;
 		class WalletError extends Error {
 		    constructor(message, error) {
 		        super(message);
@@ -569,10 +494,66 @@
 		    }
 		}
 		errors.WalletGetNetworkError = WalletGetNetworkError;
+		/**
+		 * Occurs when call `signTypedData()`.
+		 */
+		class WalletSignTypedDataError extends WalletError {
+		    constructor() {
+		        super(...arguments);
+		        this.name = 'WalletSignTypedDataError';
+		    }
+		}
+		errors.WalletSignTypedDataError = WalletSignTypedDataError;
 		
 		return errors;
 	}
 
+	var hasRequiredTypedData;
+
+	function requireTypedData () {
+		if (hasRequiredTypedData) return typedData;
+		hasRequiredTypedData = 1;
+		Object.defineProperty(typedData, "__esModule", { value: true });
+		typedData.normalizeAndValidateTypedData = normalizeAndValidateTypedData;
+		const errors_js_1 = requireErrors();
+		function isPlainObject(value) {
+		    return typeof value === 'object' && value !== null && !Array.isArray(value);
+		}
+		/**
+		 * Validate a TypedData payload and return a normalized copy safe to pass to wallets.
+		 *
+		 * Current normalization: convert `domain.chainId` from string to number (some wallets,
+		 * e.g. TronLink, require a numeric chainId).
+		 *
+		 * Throws {@link WalletSignTypedDataError} if the payload is not a valid TypedData object.
+		 */
+		function normalizeAndValidateTypedData(typedData) {
+		    if (!isPlainObject(typedData)) {
+		        throw new errors_js_1.WalletSignTypedDataError('typedData must be an object.');
+		    }
+		    if (!isPlainObject(typedData.domain)) {
+		        throw new errors_js_1.WalletSignTypedDataError('typedData.domain must be an object.');
+		    }
+		    if (!isPlainObject(typedData.types)) {
+		        throw new errors_js_1.WalletSignTypedDataError('typedData.types must be an object.');
+		    }
+		    if (!isPlainObject(typedData.message)) {
+		        throw new errors_js_1.WalletSignTypedDataError('typedData.message must be an object.');
+		    }
+		    const { chainId } = typedData.domain;
+		    if (typeof chainId === 'string') {
+		        const parsed = Number(chainId);
+		        if (!Number.isFinite(parsed)) {
+		            throw new errors_js_1.WalletSignTypedDataError(`Invalid domain.chainId: ${chainId}.`);
+		        }
+		        return Object.assign(Object.assign({}, typedData), { domain: Object.assign(Object.assign({}, typedData.domain), { chainId: parsed }) });
+		    }
+		    return typedData;
+		}
+		
+		return typedData;
+	}
+
 	var types$1 = {};
 
 	var hasRequiredTypes$1;
@@ -581,7 +562,47 @@
 		if (hasRequiredTypes$1) return types$1;
 		hasRequiredTypes$1 = 1;
 		Object.defineProperty(types$1, "__esModule", { value: true });
-		types$1.TIP6963RequestProviderEventName = types$1.TIP6963AnnounceProviderEventName = types$1.ChainNetwork = types$1.NetworkType = void 0;
+		types$1.TIP6963RequestProviderEventName = types$1.TIP6963AnnounceProviderEventName = types$1.ChainNetwork = types$1.NetworkType = types$1.AdapterState = types$1.WalletReadyState = void 0;
+		/**
+		 * Wallet ready state.
+		 */
+		var WalletReadyState;
+		(function (WalletReadyState) {
+		    /**
+		     * Adapter will start to check if wallet exists after adapter instance is created.
+		     */
+		    WalletReadyState["Loading"] = "Loading";
+		    /**
+		     * When checking ends and wallet is not found, readyState will be NotFound.
+		     */
+		    WalletReadyState["NotFound"] = "NotFound";
+		    /**
+		     * When checking ends and wallet is found, readyState will be Found.
+		     */
+		    WalletReadyState["Found"] = "Found";
+		})(WalletReadyState || (types$1.WalletReadyState = WalletReadyState = {}));
+		/**
+		 * Adapter state
+		 */
+		var AdapterState;
+		(function (AdapterState) {
+		    /**
+		     * If adapter is checking the wallet, the state is Loading.
+		     */
+		    AdapterState["Loading"] = "Loading";
+		    /**
+		     * If wallet is not installed, the state is NotFound.
+		     */
+		    AdapterState["NotFound"] = "NotFound";
+		    /**
+		     * If wallet is installed but is not connected to current Dapp, the state is Disconnected.
+		     */
+		    AdapterState["Disconnect"] = "Disconnected";
+		    /**
+		     * Wallet is connected to current Dapp.
+		     */
+		    AdapterState["Connected"] = "Connected";
+		})(AdapterState || (types$1.AdapterState = AdapterState = {}));
 		var NetworkType;
 		(function (NetworkType) {
 		    NetworkType["Mainnet"] = "Mainnet";
@@ -604,6 +625,59 @@
 		return types$1;
 	}
 
+	var hasRequiredAdapter$2;
+
+	function requireAdapter$2 () {
+		if (hasRequiredAdapter$2) return adapter$1;
+		hasRequiredAdapter$2 = 1;
+		var __importDefault = (adapter$1 && adapter$1.__importDefault) || function (mod) {
+		    return (mod && mod.__esModule) ? mod : { "default": mod };
+		};
+		Object.defineProperty(adapter$1, "__esModule", { value: true });
+		adapter$1.Adapter = adapter$1.EventEmitter = void 0;
+		const eventemitter3_1 = __importDefault(requireEventemitter3());
+		adapter$1.EventEmitter = eventemitter3_1.default;
+		const typedData_js_1 = requireTypedData();
+		const types_js_1 = requireTypes$1();
+		class Adapter extends eventemitter3_1.default {
+		    get connected() {
+		        return this.state === types_js_1.AdapterState.Connected;
+		    }
+		    /**
+		     * Some wallets such as TronLink don't support disconnect() method.
+		     */
+		    disconnect() {
+		        console.info("The current adapter doesn't support disconnect by DApp.");
+		        return Promise.resolve();
+		    }
+		    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+		    multiSign(transaction, options = {}) {
+		        return Promise.reject("The current wallet doesn't support multiSign.");
+		    }
+		    signTypedData(typedData) {
+		        let normalized;
+		        try {
+		            normalized = (0, typedData_js_1.normalizeAndValidateTypedData)(typedData);
+		        }
+		        catch (error) {
+		            return Promise.reject(error);
+		        }
+		        return this._signTypedData(normalized);
+		    }
+		    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+		    _signTypedData(_typedData) {
+		        return Promise.reject("The current wallet doesn't support signTypedData.");
+		    }
+		    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+		    switchChain(_chainId) {
+		        return Promise.reject("The current wallet doesn't support switch chain.");
+		    }
+		}
+		adapter$1.Adapter = Adapter;
+		
+		return adapter$1;
+	}
+
 	var utils$2 = {};
 
 	var hasRequiredUtils$2;
@@ -666,6 +740,306 @@
 		return utils$2;
 	}
 
+	var addonAdapter = {};
+
+	var security = {};
+
+	var hasRequiredSecurity;
+
+	function requireSecurity () {
+		if (hasRequiredSecurity) return security;
+		hasRequiredSecurity = 1;
+		(function (exports$1) {
+			var __awaiter = (security && security.__awaiter) || function (thisArg, _arguments, P, generator) {
+			    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+			    return new (P || (P = Promise))(function (resolve, reject) {
+			        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+			        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+			        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+			        step((generator = generator.apply(thisArg, _arguments || [])).next());
+			    });
+			};
+			Object.defineProperty(exports$1, "__esModule", { value: true });
+			exports$1.defaultSecurityOptions = void 0;
+			exports$1.clearCache = clearCache;
+			exports$1.fetchJsonWithCache = fetchJsonWithCache;
+			exports$1.defaultSecurityOptions = {
+			    onRiskDetected: (result) => __awaiter(void 0, void 0, void 0, function* () {
+			        console.log(`[WalletAdapter] Risk detected:`, result);
+			    }),
+			    configUrls: [],
+			    enabled: false,
+			    timeout: 2000,
+			    retries: 0,
+			    cacheTTL: 10 * 60 * 1000,
+			};
+			function isValidRisk(risk) {
+			    return (!!risk &&
+			        typeof risk === 'object' &&
+			        typeof risk.title === 'string' &&
+			        risk.title.length > 0 &&
+			        (risk.noticeType === 1 || risk.noticeType === 2 || risk.noticeType === 3));
+			}
+			function sanitizeRisk(risk) {
+			    const clean = { title: risk.title, noticeType: risk.noticeType };
+			    if (typeof risk.ext === 'string')
+			        clean.ext = risk.ext;
+			    if (typeof risk.ios === 'string')
+			        clean.ios = risk.ios;
+			    if (typeof risk.and === 'string')
+			        clean.and = risk.and;
+			    return clean;
+			}
+			/**
+			 * Defensively coerce an arbitrary remote payload into a well-formed RiskConfig.
+			 *
+			 * The config comes from a remote URL, so a bad release (or a tampered response)
+			 * must never break the connect flow. Anything malformed is dropped with a
+			 * warning rather than thrown: `wallets` must be a record whose values are
+			 * arrays, and each risk must have a non-empty string `title` and a `noticeType`
+			 * of 1/2/3. Invalid entries are discarded so downstream merging/consumption
+			 * only ever sees clean `Risk[]`.
+			 */
+			function normalizeRiskConfig(data) {
+			    const source = data && typeof data === 'object' ? data : {};
+			    const wallets = {};
+			    if (source.wallets && typeof source.wallets === 'object') {
+			        for (const [walletName, rawRisks] of Object.entries(source.wallets)) {
+			            if (!Array.isArray(rawRisks)) {
+			                console.warn(`[WalletAdapter] Ignoring malformed risks for "${walletName}": expected an array, got ${typeof rawRisks}.`);
+			                continue;
+			            }
+			            const validRisks = [];
+			            for (const risk of rawRisks) {
+			                if (isValidRisk(risk)) {
+			                    validRisks.push(sanitizeRisk(risk));
+			                }
+			                else {
+			                    console.warn(`[WalletAdapter] Dropping malformed risk entry for "${walletName}":`, risk);
+			                }
+			            }
+			            if (validRisks.length > 0) {
+			                wallets[walletName] = validRisks;
+			            }
+			        }
+			    }
+			    return {
+			        v: typeof source.v === 'string' ? source.v : '',
+			        ts: typeof source.ts === 'number' ? source.ts : 0,
+			        wallets,
+			    };
+			}
+			const _jsonCache = {};
+			function clearCache() {
+			    Object.keys(_jsonCache).forEach((key) => {
+			        Reflect.deleteProperty(_jsonCache, key);
+			    });
+			}
+			function fetchJsonWithCache(options) {
+			    return __awaiter(this, void 0, void 0, function* () {
+			        const { configUrls = exports$1.defaultSecurityOptions.configUrls, timeout = exports$1.defaultSecurityOptions.timeout, retries = exports$1.defaultSecurityOptions.retries, onConfigFallback, cacheTTL = exports$1.defaultSecurityOptions.cacheTTL, } = options;
+			        const now = Date.now();
+			        function fetchOneUrl(url) {
+			            return __awaiter(this, void 0, void 0, function* () {
+			                const cache = _jsonCache[url];
+			                if (cache && now - cache.timestamp < cacheTTL) {
+			                    return cache.data;
+			                }
+			                function fetchWithTimeout() {
+			                    return __awaiter(this, void 0, void 0, function* () {
+			                        return new Promise((resolve, reject) => {
+			                            const controller = new AbortController();
+			                            const timer = setTimeout(() => controller.abort(), timeout);
+			                            fetch(url, { signal: controller.signal })
+			                                .then((resp) => {
+			                                clearTimeout(timer);
+			                                if (!resp.ok)
+			                                    reject(new Error('Fetch failed with code: ' + resp.status));
+			                                else
+			                                    resp.json().then((data) => resolve(normalizeRiskConfig(data)), reject);
+			                            })
+			                                .catch((err) => {
+			                                clearTimeout(timer);
+			                                reject(err);
+			                            });
+			                        });
+			                    });
+			                }
+			                for (let i = 0; i <= retries; i++) {
+			                    try {
+			                        const data = yield fetchWithTimeout();
+			                        _jsonCache[url] = { data, timestamp: Date.now() };
+			                        return data;
+			                    }
+			                    catch (e) {
+			                        console.warn(`[WalletAdapter] Fetch attempt ${i + 1} for ${url} failed:`, e);
+			                        // continue to next retry
+			                    }
+			                }
+			                // All retries failed — let the outer caller decide (onConfigFallback or safe empty config)
+			                return null;
+			            });
+			        }
+			        const results = yield Promise.all(configUrls.map(fetchOneUrl));
+			        const configs = results.filter((r) => r !== null);
+			        if (configs.length > 0) {
+			            return configs.reduce((merged, config) => {
+			                var _a;
+			                if (config.ts > merged.ts) {
+			                    merged.v = config.v;
+			                    merged.ts = config.ts;
+			                }
+			                // Pass every risk from every source through to the DApp without
+			                // deduplication. Conflict resolution (highest severity wins, source
+			                // weighting, etc.) is the DApp's responsibility — the adapter just
+			                // delivers the union.
+			                for (const [wallet, risks] of Object.entries(config.wallets)) {
+			                    merged.wallets[wallet] = [...((_a = merged.wallets[wallet]) !== null && _a !== void 0 ? _a : []), ...risks];
+			                }
+			                return merged;
+			            }, { v: '', ts: 0, wallets: {} });
+			        }
+			        // All URLs failed with no cache — call custom fallback or default to safe (allow connection)
+			        if (onConfigFallback) {
+			            return normalizeRiskConfig(yield onConfigFallback());
+			        }
+			        return { v: '', ts: 0, wallets: {} };
+			    });
+			}
+			
+		} (security));
+		return security;
+	}
+
+	var hasRequiredAddonAdapter;
+
+	function requireAddonAdapter () {
+		if (hasRequiredAddonAdapter) return addonAdapter;
+		hasRequiredAddonAdapter = 1;
+		var __awaiter = (addonAdapter && addonAdapter.__awaiter) || function (thisArg, _arguments, P, generator) {
+		    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+		    return new (P || (P = Promise))(function (resolve, reject) {
+		        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+		        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+		        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+		        step((generator = generator.apply(thisArg, _arguments || [])).next());
+		    });
+		};
+		Object.defineProperty(addonAdapter, "__esModule", { value: true });
+		addonAdapter.AddonAdapter = void 0;
+		const adapter_js_1 = requireAdapter$2();
+		const errors_js_1 = requireErrors();
+		const security_js_1 = requireSecurity();
+		const types_js_1 = requireTypes$1();
+		const utils_js_1 = requireUtils$2();
+		/**
+		 * Class to provide security check for wallets.
+		 */
+		class AddonAdapter extends adapter_js_1.Adapter {
+		    constructor(params) {
+		        super();
+		        this.commonConfig = {
+		            checkTimeout: 2 * 1000,
+		            openAppWithDeeplink: true,
+		            openUrlWhenWalletNotFound: true,
+		            securityOptions: security_js_1.defaultSecurityOptions,
+		        };
+		        this._securityCheckCache = null;
+		        this.commonConfig = Object.assign(Object.assign({}, this.commonConfig), params);
+		        if (typeof this.commonConfig.checkTimeout !== 'number') {
+		            throw new Error(`[WalletAdapter] config.checkTimeout should be a number`);
+		        }
+		        AddonAdapter._validateSecurityOptions(this.commonConfig.securityOptions);
+		    }
+		    static _validateSecurityOptions(securityOptions) {
+		        const { enabled, configUrls } = securityOptions;
+		        if (enabled && (!configUrls || configUrls.length === 0)) {
+		            throw new Error(`[WalletAdapter] config.securityOptions.configUrls is required when securityOptions.enabled is true`);
+		        }
+		    }
+		    /**
+		     * Update the security options at runtime. The given options are merged into
+		     * the existing config, validated, and the cached security check result is
+		     * cleared so the next connect runs a fresh check with the new configuration.
+		     */
+		    updateSecurityOptions(securityOptions) {
+		        const merged = Object.assign(Object.assign({}, this.commonConfig.securityOptions), securityOptions);
+		        AddonAdapter._validateSecurityOptions(merged);
+		        this.commonConfig.securityOptions = merged;
+		        this._securityCheckCache = null;
+		    }
+		    /**
+		     * Run the pre-connect pipeline (wallet discovery, deeplink/url fallback,
+		     * security check).
+		     *
+		     * @returns `true` when the caller should continue with the actual connect
+		     * flow, `false` when the adapter is already connected/connecting and the
+		     * caller should bail out. Throws `WalletNotFoundError` when the wallet
+		     * cannot be found.
+		     */
+		    _beforeConnect() {
+		        return __awaiter(this, void 0, void 0, function* () {
+		            if (this.connected || this.connecting)
+		                return false;
+		            yield this._checkWallet();
+		            if (this.readyState === types_js_1.WalletReadyState.NotFound) {
+		                if ((0, utils_js_1.isInBrowser)() &&
+		                    !this._openAppByDeepLinkIfNeed() &&
+		                    this.commonConfig.openUrlWhenWalletNotFound !== false) {
+		                    window.open(this.url, '_blank');
+		                }
+		                throw new errors_js_1.WalletNotFoundError();
+		            }
+		            yield this.checkSecurity();
+		            return true;
+		        });
+		    }
+		    /**
+		     * Fetch remote config and do risk check.
+		     * In-flight calls share the same promise (so `onRiskDetected` fires at most
+		     * once even on a slow network). After the promise settles, the result is
+		     * cached for SECURITY_CHECK_CACHE_TTL; the next call after that window
+		     * runs a fresh check.
+		     */
+		    checkSecurity() {
+		        return __awaiter(this, void 0, void 0, function* () {
+		            if (!this.commonConfig.securityOptions.enabled)
+		                return;
+		            const cache = this._securityCheckCache;
+		            if (cache &&
+		                (cache.settledAt === null || Date.now() - cache.settledAt < AddonAdapter.SECURITY_CHECK_CACHE_TTL)) {
+		                return cache.promise;
+		            }
+		            const promise = (() => __awaiter(this, void 0, void 0, function* () {
+		                const result = yield (0, security_js_1.fetchJsonWithCache)(this.commonConfig.securityOptions);
+		                const risks = result.wallets[this.name];
+		                if (risks && risks.length > 0) {
+		                    const callback = this.commonConfig.securityOptions.onRiskDetected || security_js_1.defaultSecurityOptions.onRiskDetected;
+		                    yield callback({ risks });
+		                }
+		            }))();
+		            const entry = { promise, settledAt: null };
+		            this._securityCheckCache = entry;
+		            // The `.finally` chain returns a new promise that mirrors `promise`'s rejection.
+		            // Attach a noop `.catch` to avoid an unhandled rejection on that chain — the
+		            // original `promise` is still surfaced to callers via the return below.
+		            promise
+		                .finally(() => {
+		                if (this._securityCheckCache === entry) {
+		                    entry.settledAt = Date.now();
+		                }
+		            })
+		                .catch(() => { });
+		            return promise;
+		        });
+		    }
+		}
+		addonAdapter.AddonAdapter = AddonAdapter;
+		AddonAdapter.SECURITY_CHECK_CACHE_TTL = 5 * 1000;
+		
+		return addonAdapter;
+	}
+
 	var hasRequiredCjs$2;
 
 	function requireCjs$2 () {
@@ -690,7 +1064,10 @@
 			__exportStar(requireAdapter$2(), exports$1);
 			__exportStar(requireErrors(), exports$1);
 			__exportStar(requireTypes$1(), exports$1);
+			__exportStar(requireTypedData(), exports$1);
 			__exportStar(requireUtils$2(), exports$1);
+			__exportStar(requireAddonAdapter(), exports$1);
+			__exportStar(requireSecurity(), exports$1);
 			
 		} (cjs$1));
 		return cjs$1;
@@ -829,10 +1206,10 @@
 			    });
 			}
 			exports$1.TronLinkAdapterName = 'TronLink';
-			class TronLinkAdapter extends tronwallet_abstract_adapter_1.Adapter {
+			class TronLinkAdapter extends tronwallet_abstract_adapter_1.AddonAdapter {
 			    // record if first connect event has emitted or not
 			    constructor(config = {}) {
-			        super();
+			        super(config);
 			        this.name = exports$1.TronLinkAdapterName;
 			        this.url = 'https://www.tronlink.org/';
 			        this.icon = 'data:image/png;base64,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';
@@ -858,8 +1235,8 @@
 			            }
 			        };
 			        this._checkPromise = null;
-			        this._updateWallet = () => {
-			            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+			        this._updateWallet = () => __awaiter(this, void 0, void 0, function* () {
+			            var _a, _b, _c, _d, _e, _f, _g, _h;
 			            this._supportNewTronProtocol = false;
 			            let state = this.state;
 			            let address = this.address;
@@ -875,9 +1252,23 @@
 			                    };
 			                }
 			                address = ((_c = (_b = this._wallet.tronWeb) === null || _b === void 0 ? void 0 : _b.defaultAddress) === null || _c === void 0 ? void 0 : _c.base58) || null;
-			                state = address ? tronwallet_abstract_adapter_1.AdapterState.Connected : tronwallet_abstract_adapter_1.AdapterState.Disconnect;
+			                if (address) {
+			                    // Only run the security check once the wallet is actually connected.
+			                    try {
+			                        yield this.checkSecurity();
+			                    }
+			                    catch (_j) {
+			                        this.setAddress(null);
+			                        this.setState(tronwallet_abstract_adapter_1.AdapterState.Disconnect);
+			                        return;
+			                    }
+			                    state = tronwallet_abstract_adapter_1.AdapterState.Connected;
+			                }
+			                else {
+			                    state = tronwallet_abstract_adapter_1.AdapterState.Disconnect;
+			                }
 			            }
-			            else if (window.tron && window.tron.isTronLink) {
+			            else if (this.isLegacyTronLinkProvider(window.tron)) {
 			                this._supportNewTronProtocol = true;
 			                this._wallet = window.tron;
 			                this._listenTronEvent();
@@ -899,16 +1290,6 @@
 			                address = ((_h = (_g = this._wallet.tronWeb) === null || _g === void 0 ? void 0 : _g.defaultAddress) === null || _h === void 0 ? void 0 : _h.base58) || null;
 			                state = this._wallet.ready ? tronwallet_abstract_adapter_1.AdapterState.Connected : tronwallet_abstract_adapter_1.AdapterState.Disconnect;
 			            }
-			            else if (window.tronWeb) {
-			                // fake tronLink
-			                this._wallet = {
-			                    ready: window.tronWeb.ready,
-			                    tronWeb: window.tronWeb,
-			                    request: () => Promise.resolve(true),
-			                };
-			                address = ((_j = this._wallet.tronWeb.defaultAddress) === null || _j === void 0 ? void 0 : _j.base58) || null;
-			                state = this._wallet.ready ? tronwallet_abstract_adapter_1.AdapterState.Connected : tronwallet_abstract_adapter_1.AdapterState.Disconnect;
-			            }
 			            else {
 			                // no tronlink support
 			                this._wallet = null;
@@ -921,26 +1302,40 @@
 			            }
 			            this.setAddress(address);
 			            this.setState(state);
-			        };
+			        });
 			        this.checkReadyInterval = null;
-			        const { checkTimeout = 30 * 1000, dappIcon = '', dappName = '', openUrlWhenWalletNotFound = true, openTronLinkAppOnMobile = true, openAppWithDeeplink = true, } = config;
+			        const { checkTimeout = 5 * 1000, dappIcon = '', dappName = '', openUrlWhenWalletNotFound = true, openTronLinkAppOnMobile = true, openAppWithDeeplink = true, } = config;
 			        if (typeof checkTimeout !== 'number') {
 			            throw new Error('[TronLinkAdapter] config.checkTimeout should be a number');
 			        }
-			        this.config = {
-			            checkTimeout,
+			        this.config = Object.assign(Object.assign({}, this.commonConfig), { checkTimeout,
 			            openTronLinkAppOnMobile,
 			            openAppWithDeeplink,
 			            openUrlWhenWalletNotFound,
 			            dappIcon,
-			            dappName,
-			        };
+			            dappName });
 			        this._connecting = false;
 			        this._wallet = null;
 			        this._address = null;
-			        if ((0, utils_js_1.supportTron)() || ((0, tronwallet_abstract_adapter_1.isInMobileBrowser)() && (window.tronLink || window.tronWeb))) {
+			        if (!(0, tronwallet_abstract_adapter_1.isInBrowser)()) {
+			            this._readyState = tronwallet_abstract_adapter_1.WalletReadyState.NotFound;
+			            this.setState(tronwallet_abstract_adapter_1.AdapterState.NotFound);
+			            return;
+			        }
+			        if (!(0, tronwallet_abstract_adapter_1.isInMobileBrowser)()) {
+			            this._checkWallet().then(() => {
+			                if (this.connected) {
+			                    this.emit('connect', this.address || '');
+			                }
+			            });
+			        }
+			        else if ((0, utils_js_1.supportTron)() || ((0, tronwallet_abstract_adapter_1.isInMobileBrowser)() && (window.tronLink || window.tronWeb))) {
 			            this._readyState = tronwallet_abstract_adapter_1.WalletReadyState.Found;
-			            this._updateWallet();
+			            this._updateWallet().then(() => {
+			                if (this.connected) {
+			                    this.emit('connect', this.address || '');
+			                }
+			            });
 			        }
 			        else {
 			            this._checkWallet().then(() => {
@@ -993,16 +1388,8 @@
 			        return __awaiter(this, void 0, void 0, function* () {
 			            var _a, _b;
 			            try {
-			                this.checkIfOpenTronLink();
-			                if (this.connected || this.connecting)
+			                if (!(yield this._beforeConnect()))
 			                    return;
-			                yield this._checkWallet();
-			                if (this.state === tronwallet_abstract_adapter_1.AdapterState.NotFound) {
-			                    if (this.config.openUrlWhenWalletNotFound !== false && (0, tronwallet_abstract_adapter_1.isInBrowser)()) {
-			                        window.open(this.url, '_blank');
-			                    }
-			                    throw new tronwallet_abstract_adapter_1.WalletNotFoundError();
-			                }
 			                // lower version only support window.tronWeb, no window.tronLink
 			                if (!this._wallet)
 			                    return;
@@ -1033,22 +1420,17 @@
 			                }
 			                else if (window.tronLink) {
 			                    const wallet = this._wallet;
-			                    try {
-			                        const res = yield wallet.request({ method: 'tron_requestAccounts' });
-			                        if (!res) {
-			                            // 1. wallet is locked
-			                            // 2. tronlink is first installed and there is no wallet account
-			                            throw new tronwallet_abstract_adapter_1.WalletConnectionError('TronLink wallet is locked or no wallet account is avaliable.');
-			                        }
-			                        if (res.code === 4000) {
-			                            throw new tronwallet_abstract_adapter_1.WalletConnectionError('The same DApp has already initiated a request to connect to TronLink wallet, and the pop-up window has not been closed.');
-			                        }
-			                        if (res.code === 4001) {
-			                            throw new tronwallet_abstract_adapter_1.WalletConnectionError('The user rejected connection.');
-			                        }
+			                    const res = yield wallet.request({ method: 'tron_requestAccounts' });
+			                    if (!res) {
+			                        // 1. wallet is locked
+			                        // 2. tronlink is first installed and there is no wallet account
+			                        throw new tronwallet_abstract_adapter_1.WalletConnectionError('TronLink wallet is locked or no wallet account is avaliable.');
 			                    }
-			                    catch (error) {
-			                        throw new tronwallet_abstract_adapter_1.WalletConnectionError(error === null || error === void 0 ? void 0 : error.message, error);
+			                    if (res.code === 4000) {
+			                        throw new tronwallet_abstract_adapter_1.WalletConnectionError('The same DApp has already initiated a request to connect to TronLink wallet, and the pop-up window has not been closed.');
+			                    }
+			                    if (res.code === 4001) {
+			                        throw new tronwallet_abstract_adapter_1.WalletConnectionError('The user rejected connection.');
 			                    }
 			                    const address = ((_a = wallet.tronWeb.defaultAddress) === null || _a === void 0 ? void 0 : _a.base58) || '';
 			                    this.setAddress(address);
@@ -1066,8 +1448,9 @@
 			                this.connected && this.emit('connect', this.address || '');
 			            }
 			            catch (error) {
-			                this.emit('error', error);
-			                throw error;
+			                const err = error instanceof tronwallet_abstract_adapter_1.WalletError ? error : new tronwallet_abstract_adapter_1.WalletConnectionError(error === null || error === void 0 ? void 0 : error.message, error);
+			                this.emit('error', err);
+			                throw err;
 			            }
 			            finally {
 			                this._connecting = false;
@@ -1135,6 +1518,11 @@
 			            return this._checkAndSign((wallet) => __awaiter(this, void 0, void 0, function* () { return wallet.tronWeb.trx.signMessageV2(message); }), tronwallet_abstract_adapter_1.WalletSignMessageError);
 			        });
 			    }
+			    _signTypedData(typedData) {
+			        return __awaiter(this, void 0, void 0, function* () {
+			            return this._checkAndSign((wallet) => __awaiter(this, void 0, void 0, function* () { return wallet.tronWeb.trx._signTypedData(typedData.domain, typedData.types, typedData.message); }), tronwallet_abstract_adapter_1.WalletSignTypedDataError);
+			        });
+			    }
 			    /**
 			     * Switch to target chain. If current chain is the same as target chain, the call will success immediately.
 			     * Available chainIds:
@@ -1175,7 +1563,9 @@
 			    }
 			    checkAndGetWallet() {
 			        return __awaiter(this, void 0, void 0, function* () {
-			            this.checkIfOpenTronLink();
+			            if (this._openAppByDeepLinkIfNeed()) {
+			                throw new tronwallet_abstract_adapter_1.WalletNotFoundError();
+			            }
 			            yield this._checkWallet();
 			            if (this.state !== tronwallet_abstract_adapter_1.AdapterState.Connected)
 			                throw new tronwallet_abstract_adapter_1.WalletDisconnectedError();
@@ -1185,14 +1575,12 @@
 			            return wallet;
 			        });
 			    }
-			    checkIfOpenTronLink() {
-			        const { dappName = '', dappIcon = '' } = this.config;
-			        if (this.config.openTronLinkAppOnMobile === false || this.config.openAppWithDeeplink === false) {
-			            return;
-			        }
-			        if ((0, utils_js_1.openTronLink)({ dappIcon, dappName })) {
-			            throw new tronwallet_abstract_adapter_1.WalletNotFoundError();
+			    _openAppByDeepLinkIfNeed() {
+			        if (this.config.openAppWithDeeplink === false || this.config.openTronLinkAppOnMobile === false) {
+			            return false;
 			        }
+			        const { dappName = '', dappIcon = '' } = this.config;
+			        return (0, utils_js_1.openTronLink)({ dappIcon, dappName });
 			    }
 			    // following code is for TIP-1193
 			    _listenTronEvent() {
@@ -1208,6 +1596,12 @@
 			        (_a = wallet.removeListener) === null || _a === void 0 ? void 0 : _a.call(wallet, 'chainChanged', this._onChainChanged);
 			        (_b = wallet.removeListener) === null || _b === void 0 ? void 0 : _b.call(wallet, 'accountsChanged', this._onAccountsChanged);
 			    }
+			    isLegacyTronLinkProvider(provider) {
+			        return !!(provider === null || provider === void 0 ? void 0 : provider.isTronLink);
+			    }
+			    hasDesktopLegacyTronLinkProvider() {
+			        return this.isLegacyTronLinkProvider(window.tron) || !!window.tronLink;
+			    }
 			    /**
 			     * check if wallet exists by interval, the promise only resolve when wallet detected or timeout
 			     * @returns if wallet exists
@@ -1219,18 +1613,89 @@
 			        if (this._checkPromise) {
 			            return this._checkPromise;
 			        }
+			        if ((0, tronwallet_abstract_adapter_1.isInBrowser)() && !(0, tronwallet_abstract_adapter_1.isInMobileBrowser)()) {
+			            // Desktop: use TIP-6963 event-based discovery with fallback
+			            this._checkPromise = new Promise((resolve) => {
+			                let handled = false;
+			                let timer = null;
+			                let handler = null;
+			                const cleanupDesktopDetection = () => {
+			                    if (timer) {
+			                        clearTimeout(timer);
+			                        timer = null;
+			                    }
+			                    if (typeof window !== 'undefined' && handler) {
+			                        window.removeEventListener(tronwallet_abstract_adapter_1.TIP6963AnnounceProviderEventName, handler);
+			                    }
+			                };
+			                const finishWithLegacyDetection = () => {
+			                    if (handled) {
+			                        return;
+			                    }
+			                    handled = true;
+			                    cleanupDesktopDetection();
+			                    if (typeof window === 'undefined') {
+			                        resolve(false);
+			                        return;
+			                    }
+			                    // Fallback to legacy detection
+			                    this._updateWallet();
+			                    const isSupport = this.state !== tronwallet_abstract_adapter_1.AdapterState.NotFound;
+			                    this._readyState = isSupport ? tronwallet_abstract_adapter_1.WalletReadyState.Found : tronwallet_abstract_adapter_1.WalletReadyState.NotFound;
+			                    this.emit('readyStateChanged', this._readyState);
+			                    resolve(isSupport);
+			                };
+			                timer = setTimeout(finishWithLegacyDetection, this.config.checkTimeout);
+			                handler = (event) => __awaiter(this, void 0, void 0, function* () {
+			                    var _a, _b;
+			                    if (handled) {
+			                        return;
+			                    }
+			                    const { info, provider } = event.detail;
+			                    const isTronLinkProvider = info.name === 'TronLink';
+			                    if (isTronLinkProvider) {
+			                        handled = true;
+			                        this._supportNewTronProtocol = true;
+			                        this._wallet = provider;
+			                        try {
+			                            yield this.checkSecurity();
+			                        }
+			                        catch (_c) {
+			                            this.setAddress(null);
+			                            this.setState(tronwallet_abstract_adapter_1.AdapterState.Disconnect);
+			                            this._readyState = tronwallet_abstract_adapter_1.WalletReadyState.Found;
+			                            this.emit('readyStateChanged', this.readyState);
+			                            resolve(true);
+			                            return;
+			                        }
+			                        this._listenTronEvent();
+			                        this._readyState = tronwallet_abstract_adapter_1.WalletReadyState.Found;
+			                        const address = (((_a = this._wallet) === null || _a === void 0 ? void 0 : _a.tronWeb) && ((_b = this._wallet.tronWeb.defaultAddress) === null || _b === void 0 ? void 0 : _b.base58)) || null;
+			                        const state = address ? tronwallet_abstract_adapter_1.AdapterState.Connected : tronwallet_abstract_adapter_1.AdapterState.Disconnect;
+			                        this.setAddress(address);
+			                        this.setState(state);
+			                        this.emit('readyStateChanged', this.readyState);
+			                        cleanupDesktopDetection();
+			                        resolve(true);
+			                    }
+			                });
+			                window.addEventListener(tronwallet_abstract_adapter_1.TIP6963AnnounceProviderEventName, handler);
+			                window.dispatchEvent(new Event(tronwallet_abstract_adapter_1.TIP6963RequestProviderEventName));
+			            });
+			            return this._checkPromise;
+			        }
+			        // Mobile: use legacy polling detection
 			        const interval = 100;
-			        const checkTronTimes = Math.floor(2000 / interval);
 			        const maxTimes = Math.floor(this.config.checkTimeout / interval);
 			        let times = 0, timer;
 			        this._checkPromise = new Promise((resolve) => {
 			            const check = () => {
 			                times++;
-			                const isSupport = times < checkTronTimes && !(0, tronwallet_abstract_adapter_1.isInMobileBrowser)() ? (0, utils_js_1.supportTron)() : (0, utils_js_1.supportTronLink)();
+			                this._updateWallet();
+			                const isSupport = !!((0, tronwallet_abstract_adapter_1.isInMobileBrowser)() && (window.tronLink || window.tronWeb));
 			                if (isSupport || times > maxTimes) {
 			                    timer && clearInterval(timer);
 			                    this._readyState = isSupport ? tronwallet_abstract_adapter_1.WalletReadyState.Found : tronwallet_abstract_adapter_1.WalletReadyState.NotFound;
-			                    this._updateWallet();
 			                    this.emit('readyStateChanged', this.readyState);
 			                    resolve(isSupport);
 			                }
@@ -1378,25 +1843,34 @@
 			const tronwallet_adapter_tronlink_1 = /*@__PURE__*/ requireCjs$1();
 			const utils_js_1 = requireUtils();
 			exports$1.TrustAdapterName = 'Trust';
-			class TrustAdapter extends tronwallet_abstract_adapter_1.Adapter {
+			class TrustAdapter extends tronwallet_abstract_adapter_1.AddonAdapter {
 			    constructor(config = {}) {
-			        super();
+			        super(config);
 			        this.name = exports$1.TrustAdapterName;
 			        this.url = 'https://trustwallet.com';
 			        this.icon = 'data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTgiIGhlaWdodD0iNjUiIHZpZXdCb3g9IjAgMCA1OCA2NSIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTAgOS4zODk0OUwyOC44OTA3IDBWNjUuMDA0MkM4LjI1NDUgNTYuMzM2OSAwIDM5LjcyNDggMCAzMC4zMzUzVjkuMzg5NDlaIiBmaWxsPSIjMDUwMEZGIi8+CjxwYXRoIGQ9Ik01Ny43ODIyIDkuMzg5NDlMMjguODkxNSAwVjY1LjAwNDJDNDkuNTI3NyA1Ni4zMzY5IDU3Ljc4MjIgMzkuNzI0OCA1Ny43ODIyIDMwLjMzNTNWOS4zODk0OVoiIGZpbGw9InVybCgjcGFpbnQwX2xpbmVhcl8yMjAxXzY5NDIpIi8+CjxkZWZzPgo8bGluZWFyR3JhZGllbnQgaWQ9InBhaW50MF9saW5lYXJfMjIwMV82OTQyIiB4MT0iNTEuMzYxNSIgeTE9Ii00LjE1MjkzIiB4Mj0iMjkuNTM4NCIgeTI9IjY0LjUxNDciIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIj4KPHN0b3Agb2Zmc2V0PSIwLjAyMTEyIiBzdG9wLWNvbG9yPSIjMDAwMEZGIi8+CjxzdG9wIG9mZnNldD0iMC4wNzYyNDIzIiBzdG9wLWNvbG9yPSIjMDA5NEZGIi8+CjxzdG9wIG9mZnNldD0iMC4xNjMwODkiIHN0b3AtY29sb3I9IiM0OEZGOTEiLz4KPHN0b3Agb2Zmc2V0PSIwLjQyMDA0OSIgc3RvcC1jb2xvcj0iIzAwOTRGRiIvPgo8c3RvcCBvZmZzZXQ9IjAuNjgyODg2IiBzdG9wLWNvbG9yPSIjMDAzOEZGIi8+CjxzdG9wIG9mZnNldD0iMC45MDI0NjUiIHN0b3AtY29sb3I9IiMwNTAwRkYiLz4KPC9saW5lYXJHcmFkaWVudD4KPC9kZWZzPgo8L3N2Zz4K';
 			        this._readyState = (0, tronwallet_abstract_adapter_1.isInBrowser)() ? tronwallet_abstract_adapter_1.WalletReadyState.Loading : tronwallet_abstract_adapter_1.WalletReadyState.NotFound;
 			        this._state = tronwallet_abstract_adapter_1.AdapterState.Loading;
-			        this.messageHandler = (e) => {
+			        this.messageHandler = (e) => __awaiter(this, void 0, void 0, function* () {
 			            var _a, _b, _c;
 			            const message = (_a = e.data) === null || _a === void 0 ? void 0 : _a.message;
 			            if (!message) {
 			                return;
 			            }
 			            if (message.action === 'accountsChanged') {
-			                setTimeout(() => {
+			                setTimeout(() => __awaiter(this, void 0, void 0, function* () {
 			                    var _a;
 			                    const preAddr = this.address || '';
 			                    if ((_a = this._wallet) === null || _a === void 0 ? void 0 : _a.ready) {
+			                        // Gate the connect transition with the security check.
+			                        try {
+			                            yield this.checkSecurity();
+			                        }
+			                        catch (_b) {
+			                            this.setAddress(null);
+			                            this.setState(tronwallet_abstract_adapter_1.AdapterState.Disconnect);
+			                            return;
+			                        }
 			                        const address = message.data.address;
 			                        this.setAddress(address);
 			                        this.setState(tronwallet_abstract_adapter_1.AdapterState.Connected);
@@ -1415,12 +1889,25 @@
 			                    else if (preAddr && !this.address) {
 			                        this.emit('disconnect');
 			                    }
-			                }, 200);
+			                }), 200);
 			            }
 			            else if (message.action === 'connect') {
 			                const isCurConnected = this.connected;
 			                const preAddress = this.address || '';
 			                const address = ((_c = (_b = this._wallet.tronWeb) === null || _b === void 0 ? void 0 : _b.defaultAddress) === null || _c === void 0 ? void 0 : _c.base58) || '';
+			                // Trust may post a `connect` message before the address is available;
+			                // ignore it so we don't report a connection (and emit connect) with no address.
+			                if (!address) {
+			                    return;
+			                }
+			                try {
+			                    yield this.checkSecurity();
+			                }
+			                catch (_d) {
+			                    this.setAddress(null);
+			                    this.setState(tronwallet_abstract_adapter_1.AdapterState.Disconnect);
+			                    return;
+			                }
 			                this.setAddress(address);
 			                this.setState(tronwallet_abstract_adapter_1.AdapterState.Connected);
 			                if (!isCurConnected) {
@@ -1435,9 +1922,9 @@
 			                this.setState(tronwallet_abstract_adapter_1.AdapterState.Disconnect);
 			                this.emit('disconnect');
 			            }
-			        };
+			        });
 			        this._checkPromise = null;
-			        this._updateWallet = () => {
+			        this._updateWallet = () => __awaiter(this, void 0, void 0, function* () {
 			            var _a, _b;
 			            let state = this.state;
 			            let address = this.address;
@@ -1445,7 +1932,21 @@
 			                this._wallet = window.trustwallet.tronLink;
 			                this._listenEvent();
 			                address = ((_b = (_a = this._wallet.tronWeb) === null || _a === void 0 ? void 0 : _a.defaultAddress) === null || _b === void 0 ? void 0 : _b.base58) || null;
-			                state = this._wallet.ready ? tronwallet_abstract_adapter_1.AdapterState.Connected : tronwallet_abstract_adapter_1.AdapterState.Disconnect;
+			                if (address) {
+			                    // Only run the security check once the wallet is actually connected.
+			                    try {
+			                        yield this.checkSecurity();
+			                    }
+			                    catch (_c) {
+			                        this.setAddress(null);
+			                        this.setState(tronwallet_abstract_adapter_1.AdapterState.Disconnect);
+			                        return;
+			                    }
+			                    state = tronwallet_abstract_adapter_1.AdapterState.Connected;
+			                }
+			                else {
+			                    state = tronwallet_abstract_adapter_1.AdapterState.Disconnect;
+			                }
 			            }
 			            else {
 			                this._wallet = null;
@@ -1454,16 +1955,8 @@
 			            }
 			            this.setAddress(address);
 			            this.setState(state);
-			        };
-			        const { checkTimeout = 2 * 1000, openUrlWhenWalletNotFound = true, openAppWithDeeplink = true } = config;
-			        if (typeof checkTimeout !== 'number') {
-			            throw new Error('[TrustAdapter] config.checkTimeout should be a number');
-			        }
-			        this.config = {
-			            checkTimeout,
-			            openAppWithDeeplink,
-			            openUrlWhenWalletNotFound,
-			        };
+			        });
+			        this.config = Object.assign({}, this.commonConfig);
 			        this._connecting = false;
 			        this._wallet = null;
 			        this._address = null;
@@ -1474,7 +1967,11 @@
 			        }
 			        if ((0, utils_js_1.supportTrust)()) {
 			            this._readyState = tronwallet_abstract_adapter_1.WalletReadyState.Found;
-			            this._updateWallet();
+			            this._updateWallet().then(() => {
+			                if (this.connected) {
+			                    this.emit('connect', this.address || '');
+			                }
+			            });
 			        }
 			        else {
 			            this._checkWallet().then(() => {
@@ -1526,34 +2023,21 @@
 			        return __awaiter(this, void 0, void 0, function* () {
 			            var _a;
 			            try {
-			                this.checkIfopenTrustWallet();
-			                if (this.connected || this.connecting)
+			                if (!(yield this._beforeConnect()))
 			                    return;
-			                yield this._checkWallet();
-			                if (this.state === tronwallet_abstract_adapter_1.AdapterState.NotFound) {
-			                    if (this.config.openUrlWhenWalletNotFound !== false && (0, tronwallet_abstract_adapter_1.isInBrowser)()) {
-			                        window.open(this.url, '_blank');
-			                    }
-			                    throw new tronwallet_abstract_adapter_1.WalletNotFoundError();
-			                }
 			                if (!this._wallet)
 			                    return;
 			                this._connecting = true;
 			                const wallet = this._wallet;
-			                try {
-			                    const res = yield wallet.request({ method: 'tron_requestAccounts' });
-			                    if (!res) {
-			                        throw new tronwallet_abstract_adapter_1.WalletConnectionError('Request connect error.');
-			                    }
-			                    if (res.code === 4000) {
-			                        throw new tronwallet_abstract_adapter_1.WalletConnectionError('The same DApp has already initiated a request to connect to trustwallet, and the pop-up window has not been closed.');
-			                    }
-			                    if (res.code === 4001) {
-			                        throw new tronwallet_abstract_adapter_1.WalletConnectionError('The user rejected connection.');
-			                    }
+			                const res = yield wallet.request({ method: 'tron_requestAccounts' });
+			                if (!res) {
+			                    throw new tronwallet_abstract_adapter_1.WalletConnectionError('Request connect error.');
 			                }
-			                catch (error) {
-			                    throw new tronwallet_abstract_adapter_1.WalletConnectionError(error === null || error === void 0 ? void 0 : error.message, error);
+			                if (res.code === 4000) {
+			                    throw new tronwallet_abstract_adapter_1.WalletConnectionError('The same DApp has already initiated a request to connect to trustwallet, and the pop-up window has not been closed.');
+			                }
+			                if (res.code === 4001) {
+			                    throw new tronwallet_abstract_adapter_1.WalletConnectionError('The user rejected connection.');
 			                }
 			                const address = ((_a = wallet.tronWeb.defaultAddress) === null || _a === void 0 ? void 0 : _a.base58) || '';
 			                this.setAddress(address);
@@ -1562,8 +2046,9 @@
 			                this.connected && this.emit('connect', this.address || '');
 			            }
 			            catch (error) {
-			                this.emit('error', error);
-			                throw error;
+			                const err = error instanceof tronwallet_abstract_adapter_1.WalletError ? error : new tronwallet_abstract_adapter_1.WalletConnectionError(error === null || error === void 0 ? void 0 : error.message, error);
+			                this.emit('error', err);
+			                throw err;
 			            }
 			            finally {
 			                this._connecting = false;
@@ -1683,6 +2168,12 @@
 			            throw new tronwallet_abstract_adapter_1.WalletNotFoundError();
 			        }
 			    }
+			    _openAppByDeepLinkIfNeed() {
+			        if (this.config.openAppWithDeeplink === false) {
+			            return false;
+			        }
+			        return (0, utils_js_1.openTrustWallet)();
+			    }
 			    /**
 			     * check if wallet exists by interval, the promise only resolve when wallet detected or timeout
 			     * @returns if trustwallet exists