@formo/analytics 1.27.0 → 1.28.1

package/dist/cjs/src/FormoAnalytics.js

@@ -67,11 +67,13 @@ var consent_1 = require("./consent");
 var provider_1 = require("./provider");
 var session_1 = require("./session");
 var types_1 = require("./types");
-var utils_1 = require("./utils");
 var address_1 = require("./utils/address");
+var builderCode_1 = require("./utils/builderCode");
 var validators_1 = require("./validators");
 var chain_1 = require("./utils/chain");
 var wagmi_1 = require("./wagmi");
+var solana_1 = require("./solana");
+var SolanaManager_1 = require("./solana/SolanaManager");
 /**
  * Constants for provider switching reasons
  */
@@ -86,6 +88,11 @@ var FormoAnalytics = /** @class */ (function () {
         var _a, _b;
         this.writeKey = writeKey;
         this.options = options;
+        // Per-chain namespace state — isolates EVM and Solana connection state
+        this._chainState = {
+            evm: {},
+            solana: {},
+        };
         this._providerListenersMap = new Map();
         /**
          * EIP-6963 provider details discovered through the browser
@@ -165,9 +172,39 @@ var FormoAnalytics = /** @class */ (function () {
                 this.trackEIP1193Provider(provider);
             }
         }
+        // Initialize Solana manager if Solana options are provided
+        if (options.solana) {
+            this.solanaManager = new SolanaManager_1.SolanaManager(this, options.solana);
+        }
         this.trackPageHit();
         this.trackPageHits();
     }
+    Object.defineProperty(FormoAnalytics.prototype, "_provider", {
+        // EVM state accessors — EVM listener paths must use these instead of
+        // currentAddress/currentChainId to avoid cross-namespace reads.
+        get: function () {
+            return this._chainState.evm.provider;
+        },
+        set: function (value) {
+            this._chainState.evm.provider = value;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(FormoAnalytics.prototype, "_evmAddress", {
+        get: function () {
+            return this._chainState.evm.address;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(FormoAnalytics.prototype, "_evmChainId", {
+        get: function () {
+            return this._chainState.evm.chainId;
+        },
+        enumerable: false,
+        configurable: true
+    });
     /**
      * Helper method to check if a provider is different from the currently active one
      * @param provider The provider to check
@@ -247,12 +284,17 @@ var FormoAnalytics = /** @class */ (function () {
      * @returns {void}
      */
     FormoAnalytics.prototype.cleanup = function () {
-        logger_1.logger.info("FormoAnalytics: Cleaning up resources");
+        logger_1.logger.debug("FormoAnalytics: Cleaning up resources");
         // Clean up Wagmi handler if present
         if (this.wagmiHandler) {
             this.wagmiHandler.cleanup();
             this.wagmiHandler = undefined;
         }
+        // Clean up Solana manager if present
+        if (this.solanaManager) {
+            this.solanaManager.cleanup();
+            this.solanaManager = undefined;
+        }
         // Clean up EIP-1193 providers if not in Wagmi mode
         if (!this.isWagmiMode) {
             for (var _i = 0, _a = Array.from(this._trackedProviders); _i < _a.length; _i++) {
@@ -260,7 +302,7 @@ var FormoAnalytics = /** @class */ (function () {
                 this.untrackProvider(provider);
             }
         }
-        logger_1.logger.info("FormoAnalytics: Cleanup complete");
+        logger_1.logger.debug("FormoAnalytics: Cleanup complete");
     };
     /**
      * Emits a connect wallet event.
@@ -273,7 +315,7 @@ var FormoAnalytics = /** @class */ (function () {
      */
     FormoAnalytics.prototype.connect = function (_a, properties_1, context_1, callback_1) {
         return __awaiter(this, arguments, void 0, function (_b, properties, context, callback) {
-            var checksummedAddress;
+            var validAddress;
             var chainId = _b.chainId, address = _b.address;
             return __generator(this, function (_c) {
                 switch (_c.label) {
@@ -286,16 +328,15 @@ var FormoAnalytics = /** @class */ (function () {
                             logger_1.logger.warn("Connect: Address cannot be empty");
                             return [2 /*return*/];
                         }
-                        this.currentChainId = chainId;
-                        checksummedAddress = this.validateAndChecksumAddress(address);
-                        if (!checksummedAddress) {
-                            logger_1.logger.warn("Connect: Invalid address provided (\"".concat(address, "\"). Please provide a valid Ethereum address in checksum format."));
+                        validAddress = (0, address_1.validateAddress)(address, chainId);
+                        if (!validAddress) {
+                            logger_1.logger.warn("Connect: Invalid address provided (\"".concat(address, "\"). Please provide a valid EVM or Solana address."));
                             return [2 /*return*/];
                         }
-                        this.currentAddress = checksummedAddress;
+                        this.setChainState(chainId, { address: validAddress });
                         return [4 /*yield*/, this.trackEvent(constants_1.EventType.CONNECT, {
                                 chainId: chainId,
-                                address: this.currentAddress,
+                                address: validAddress,
                             }, properties, context, callback)];
                     case 1:
                         _c.sent();
@@ -315,13 +356,14 @@ var FormoAnalytics = /** @class */ (function () {
      */
     FormoAnalytics.prototype.disconnect = function (params, properties, context, callback) {
         return __awaiter(this, void 0, void 0, function () {
-            var chainId, address, providerInfo, disconnectProperties;
+            var chainId, address, isSolana, providerInfo, disconnectProperties;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         chainId = (params === null || params === void 0 ? void 0 : params.chainId) || this.currentChainId;
                         address = (params === null || params === void 0 ? void 0 : params.address) || this.currentAddress;
-                        providerInfo = this._provider
+                        isSolana = (0, solana_1.isSolanaChainId)(chainId);
+                        providerInfo = !isSolana && this._provider
                             ? this.getProviderInfo(this._provider)
                             : null;
                         logger_1.logger.info("Disconnect: Emitting disconnect event with:", {
@@ -337,9 +379,9 @@ var FormoAnalytics = /** @class */ (function () {
                         return [4 /*yield*/, this.trackEvent(constants_1.EventType.DISCONNECT, __assign(__assign({}, (chainId && { chainId: chainId })), (address && { address: address })), disconnectProperties, context, callback)];
                     case 1:
                         _a.sent();
-                        this.currentAddress = undefined;
-                        this.currentChainId = undefined;
-                        this.clearActiveProvider();
+                        // Clear the disconnecting chain's namespace state.
+                        // Per-chain isolation ensures a Solana disconnect never wipes EVM state (and vice versa).
+                        this.clearChainState(chainId);
                         logger_1.logger.info("Wallet disconnected: Cleared currentAddress, currentChainId, and provider");
                         return [2 /*return*/];
                 }
@@ -373,7 +415,7 @@ var FormoAnalytics = /** @class */ (function () {
                             logger_1.logger.warn("FormoAnalytics::chain: address was empty and no previous address has been recorded");
                             return [2 /*return*/];
                         }
-                        this.currentChainId = chainId;
+                        this.setChainState(chainId, {});
                         return [4 /*yield*/, this.trackEvent(constants_1.EventType.CHAIN, {
                                 chainId: chainId,
                                 address: address || this.currentAddress,
@@ -426,10 +468,10 @@ var FormoAnalytics = /** @class */ (function () {
      */
     FormoAnalytics.prototype.transaction = function (_a, properties_1, context_1, callback_1) {
         return __awaiter(this, arguments, void 0, function (_b, properties, context, callback) {
-            var status = _b.status, chainId = _b.chainId, address = _b.address, data = _b.data, to = _b.to, value = _b.value, transactionHash = _b.transactionHash, function_name = _b.function_name, function_args = _b.function_args;
+            var status = _b.status, chainId = _b.chainId, address = _b.address, data = _b.data, to = _b.to, value = _b.value, transactionHash = _b.transactionHash, function_name = _b.function_name, function_args = _b.function_args, builder_codes = _b.builder_codes;
             return __generator(this, function (_c) {
                 switch (_c.label) {
-                    case 0: return [4 /*yield*/, this.trackEvent(constants_1.EventType.TRANSACTION, __assign(__assign(__assign({ status: status, chainId: chainId, address: address, data: data, to: to, value: value }, (transactionHash && { transactionHash: transactionHash })), (function_name && { function_name: function_name })), (function_args && { function_args: function_args })), properties, context, callback)];
+                    case 0: return [4 /*yield*/, this.trackEvent(constants_1.EventType.TRANSACTION, __assign(__assign(__assign(__assign({ status: status, chainId: chainId, address: address, data: data, to: to, value: value }, (transactionHash && { transactionHash: transactionHash })), (function_name && { function_name: function_name })), (function_args && { function_args: function_args })), (builder_codes && { builder_codes: builder_codes })), properties, context, callback)];
                     case 1:
                         _c.sent();
                         return [2 /*return*/];
@@ -439,42 +481,59 @@ var FormoAnalytics = /** @class */ (function () {
     };
     /**
      * Emits an identify event with current wallet address and provider info.
-     * @param {string} params.address
-     * @param {string} params.userId
-     * @param {string} params.rdns
-     * @param {string} params.providerName
-     * @param {IFormoEventProperties} properties
+     *
+     * @param {string} params.address - Wallet address
+     * @param {string} params.userId - External user ID
+     * @param {string} params.rdns - Provider reverse domain name
+     * @param {string} params.providerName - Provider display name
+     * @param {IFormoEventProperties} properties - Additional properties to include with the identify event
      * @param {IFormoEventContext} context
      * @param {(...args: unknown[]) => void} callback
      * @returns {Promise<void>}
+     *
+     * @example
+     * ```ts
+     * // Basic identify
+     * formo.identify({ address: '0x...', userId: 'user123' });
+     *
+     * // With Privy user
+     * import { parsePrivyProperties } from '@formo/analytics';
+     * const { user } = usePrivy();
+     * if (user) {
+     *   const { properties, wallets } = parsePrivyProperties(user);
+     *   for (const wallet of wallets) {
+     *     formo.identify({ address: wallet.address, userId: user.id }, properties);
+     *   }
+     * }
+     * ```
      */
     FormoAnalytics.prototype.identify = function (params, properties, context, callback) {
         return __awaiter(this, void 0, void 0, function () {
-            var _i, _a, providerDetail, provider, address_2, validAddress_1, err_1, userId, address, providerName, rdns, validAddress, isAlreadyIdentified, e_1;
-            var _b;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            var _i, _a, providerDetail, provider, address_2, validAddress_1, err_1, address, providerName, userId, rdns, validAddress, isAlreadyIdentified, e_1;
+            var _b, _c;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
-                        _c.trys.push([0, 12, , 13]);
+                        _d.trys.push([0, 12, , 13]);
                         if (!!params) return [3 /*break*/, 10];
                         // If no params provided, auto-identify
                         logger_1.logger.info("Auto-identifying with providers:", this._providers.map(function (p) { return p.info.name; }));
                         _i = 0, _a = this._providers;
-                        _c.label = 1;
+                        _d.label = 1;
                     case 1:
                         if (!(_i < _a.length)) return [3 /*break*/, 9];
                         providerDetail = _a[_i];
                         provider = providerDetail.provider;
                         if (!provider)
                             return [3 /*break*/, 8];
-                        _c.label = 2;
+                        _d.label = 2;
                     case 2:
-                        _c.trys.push([2, 7, , 8]);
+                        _d.trys.push([2, 7, , 8]);
                         return [4 /*yield*/, this.getAddress(provider)];
                     case 3:
-                        address_2 = _c.sent();
+                        address_2 = _d.sent();
                         if (!address_2) return [3 /*break*/, 6];
-                        validAddress_1 = this.validateAndChecksumAddress(address_2);
+                        validAddress_1 = (0, address_1.validateAndChecksumAddress)(address_2);
                         logger_1.logger.info("Auto-identify: Checking deduplication", {
                             validAddress: validAddress_1,
                             rdns: providerDetail.info.rdns,
@@ -494,16 +553,16 @@ var FormoAnalytics = /** @class */ (function () {
                             }, properties, context, callback)];
                     case 4:
                         // NOTE: do not set this.currentAddress without explicit connect or identify
-                        _c.sent();
+                        _d.sent();
                         return [3 /*break*/, 6];
                     case 5:
                         if (validAddress_1) {
                             logger_1.logger.info("Auto-identify: Skipping already identified wallet", validAddress_1, providerDetail.info.name, providerDetail.info.rdns);
                         }
-                        _c.label = 6;
+                        _d.label = 6;
                     case 6: return [3 /*break*/, 8];
                     case 7:
-                        err_1 = _c.sent();
+                        err_1 = _d.sent();
                         logger_1.logger.error("Failed to identify provider ".concat(providerDetail.info.name, ":"), err_1);
                         return [3 /*break*/, 8];
                     case 8:
@@ -511,32 +570,32 @@ var FormoAnalytics = /** @class */ (function () {
                         return [3 /*break*/, 1];
                     case 9: return [2 /*return*/];
                     case 10:
-                        userId = params.userId, address = params.address, providerName = params.providerName, rdns = params.rdns;
+                        address = params.address, providerName = params.providerName, userId = params.userId, rdns = params.rdns;
+                        // Runtime validation: address is required
+                        if (!address) {
+                            (_b = logger_1.logger.warn) === null || _b === void 0 ? void 0 : _b.call(logger_1.logger, "identify() called without address - address is required");
+                            return [2 /*return*/];
+                        }
+                        // Explicit identify
                         logger_1.logger.info("Identify", address, userId, providerName, rdns);
-                        validAddress = undefined;
-                        if (address) {
-                            validAddress = this.validateAndChecksumAddress(address);
-                            this.currentAddress = validAddress || undefined;
-                            if (!validAddress) {
-                                (_b = logger_1.logger.warn) === null || _b === void 0 ? void 0 : _b.call(logger_1.logger, "Invalid address provided to identify:", address);
-                            }
+                        validAddress = (0, address_1.validateAddress)(address);
+                        if (validAddress) {
+                            this.currentAddress = validAddress;
                         }
                         else {
-                            this.currentAddress = undefined;
+                            (_c = logger_1.logger.warn) === null || _c === void 0 ? void 0 : _c.call(logger_1.logger, "Invalid address provided to identify:", address);
+                            return [2 /*return*/];
                         }
                         if (userId) {
                             this.currentUserId = userId;
                             (0, storage_1.cookie)().set(constants_1.SESSION_USER_ID_KEY, userId);
                         }
-                        isAlreadyIdentified = validAddress
-                            ? this.session.isWalletIdentified(validAddress, rdns || "")
-                            : false;
+                        isAlreadyIdentified = this.session.isWalletIdentified(validAddress, rdns || "");
                         logger_1.logger.debug("Identify: Checking deduplication", {
                             validAddress: validAddress,
                             rdns: rdns,
                             providerName: providerName,
-                            hasValidAddress: !!validAddress,
-                            hasRdns: !!rdns,
+                            userId: userId,
                             isAlreadyIdentified: isAlreadyIdentified,
                         });
                         if (isAlreadyIdentified) {
@@ -544,10 +603,7 @@ var FormoAnalytics = /** @class */ (function () {
                             return [2 /*return*/];
                         }
                         // Mark as identified before emitting the event
-                        // Mark even if rdns is empty to prevent duplicate empty identifies
-                        if (validAddress) {
-                            this.session.markWalletIdentified(validAddress, rdns || "");
-                        }
+                        this.session.markWalletIdentified(validAddress, rdns || "");
                         return [4 /*yield*/, this.trackEvent(constants_1.EventType.IDENTIFY, {
                                 address: validAddress,
                                 providerName: providerName,
@@ -555,10 +611,10 @@ var FormoAnalytics = /** @class */ (function () {
                                 rdns: rdns,
                             }, properties, context, callback)];
                     case 11:
-                        _c.sent();
+                        _d.sent();
                         return [3 /*break*/, 13];
                     case 12:
-                        e_1 = _c.sent();
+                        e_1 = _d.sent();
                         logger_1.logger.log("identify error", e_1);
                         return [3 /*break*/, 13];
                     case 13: return [2 /*return*/];
@@ -783,21 +839,21 @@ var FormoAnalytics = /** @class */ (function () {
                         if (!(accounts.length === 0)) return [3 /*break*/, 9];
                         if (!(this._provider === provider)) return [3 /*break*/, 7];
                         logger_1.logger.info("OnAccountsChanged: Detecting disconnect, current state:", {
-                            currentAddress: this.currentAddress,
-                            currentChainId: this.currentChainId,
+                            evmAddress: this._evmAddress,
+                            evmChainId: this._evmChainId,
                             providerMatch: this._provider === provider,
                         });
                         if (!this.isAutocaptureEnabled("disconnect")) return [3 /*break*/, 5];
                         _a.label = 1;
                     case 1:
                         _a.trys.push([1, 3, , 4]);
-                        // Pass current state explicitly to ensure we have the data for the disconnect event
+                        // Pass EVM state explicitly to ensure we have the data for the disconnect event
                         return [4 /*yield*/, this.disconnect({
-                                chainId: this.currentChainId,
-                                address: this.currentAddress,
+                                chainId: this._evmChainId,
+                                address: this._evmAddress,
                             })];
                     case 2:
-                        // Pass current state explicitly to ensure we have the data for the disconnect event
+                        // Pass EVM state explicitly to ensure we have the data for the disconnect event
                         _a.sent();
                         return [3 /*break*/, 4];
                     case 3:
@@ -808,9 +864,7 @@ var FormoAnalytics = /** @class */ (function () {
                     case 5:
                         logger_1.logger.debug("OnAccountsChanged: Disconnect event skipped (autocapture.disconnect: false)");
                         // Still clear state even if not tracking the event
-                        this.currentAddress = undefined;
-                        this.currentChainId = undefined;
-                        this.clearActiveProvider();
+                        this.clearChainState('evm');
                         _a.label = 6;
                     case 6: return [3 /*break*/, 8];
                     case 7:
@@ -818,14 +872,14 @@ var FormoAnalytics = /** @class */ (function () {
                         _a.label = 8;
                     case 8: return [2 /*return*/];
                     case 9:
-                        address = this.validateAndChecksumAddress(accounts[0]);
+                        address = (0, address_1.validateAndChecksumAddress)(accounts[0]);
                         if (!address) {
                             logger_1.logger.warn("onAccountsChanged: Invalid address received", accounts[0]);
                             return [2 /*return*/];
                         }
-                        if (!(this._provider && this._provider !== provider)) return [3 /*break*/, 26];
-                        currentStoredAddress = this.currentAddress;
-                        newProviderAddress = this.validateAndChecksumAddress(address);
+                        if (!(this._provider && this._provider !== provider)) return [3 /*break*/, 25];
+                        currentStoredAddress = this._evmAddress;
+                        newProviderAddress = (0, address_1.validateAndChecksumAddress)(address);
                         logger_1.logger.info("OnAccountsChanged: Different provider attempting to connect", {
                             activeProvider: this.getProviderInfo(this._provider).name,
                             eventProvider: this.getProviderInfo(provider).name,
@@ -834,7 +888,7 @@ var FormoAnalytics = /** @class */ (function () {
                         });
                         _a.label = 10;
                     case 10:
-                        _a.trys.push([10, 22, , 26]);
+                        _a.trys.push([10, 21, , 25]);
                         return [4 /*yield*/, this.getAccounts(this._provider)];
                     case 11:
                         activeProviderAccounts = _a.sent();
@@ -858,8 +912,8 @@ var FormoAnalytics = /** @class */ (function () {
                         });
                         if (!this.isAutocaptureEnabled("disconnect")) return [3 /*break*/, 13];
                         return [4 /*yield*/, this.disconnect({
-                                chainId: this.currentChainId,
-                                address: this.currentAddress,
+                                chainId: this._evmChainId,
+                                address: this._evmAddress,
                             })];
                     case 12:
                         _a.sent();
@@ -867,8 +921,7 @@ var FormoAnalytics = /** @class */ (function () {
                     case 13:
                         logger_1.logger.debug("OnAccountsChanged: Disconnect event skipped during provider switch (autocapture.disconnect: false)");
                         // Still clear state even if not tracking the event
-                        this.currentAddress = undefined;
-                        this.currentChainId = undefined;
+                        this.clearChainState('evm');
                         _a.label = 14;
                     case 14:
                         // Clear state and let the new provider become active
@@ -883,7 +936,7 @@ var FormoAnalytics = /** @class */ (function () {
                             newAddress: newProviderAddress,
                         });
                         return [2 /*return*/];
-                    case 16: return [3 /*break*/, 21];
+                    case 16: return [3 /*break*/, 20];
                     case 17:
                         logger_1.logger.info("OnAccountsChanged: Current provider has no accounts, switching to new provider", {
                             oldProvider: this.getProviderInfo(this._provider).name,
@@ -892,8 +945,8 @@ var FormoAnalytics = /** @class */ (function () {
                         });
                         if (!this.isAutocaptureEnabled("disconnect")) return [3 /*break*/, 19];
                         return [4 /*yield*/, this.disconnect({
-                                chainId: this.currentChainId,
-                                address: this.currentAddress,
+                                chainId: this._evmChainId,
+                                address: this._evmAddress,
                             })];
                     case 18:
                         _a.sent();
@@ -901,15 +954,10 @@ var FormoAnalytics = /** @class */ (function () {
                     case 19:
                         logger_1.logger.debug("OnAccountsChanged: Disconnect event skipped for old provider (autocapture.disconnect: false)");
                         // Still clear state even if not tracking the event
-                        this.currentAddress = undefined;
-                        this.currentChainId = undefined;
+                        this.clearChainState('evm');
                         _a.label = 20;
-                    case 20:
-                        // Clear state and let the new provider become active
-                        this.clearActiveProvider();
-                        _a.label = 21;
-                    case 21: return [3 /*break*/, 26];
-                    case 22:
+                    case 20: return [3 /*break*/, 25];
+                    case 21:
                         error_2 = _a.sent();
                         logger_1.logger.warn("OnAccountsChanged: Could not check current provider accounts, switching to new provider", {
                             error: error_2 instanceof Error ? error_2.message : String(error_2),
@@ -920,40 +968,36 @@ var FormoAnalytics = /** @class */ (function () {
                             newProvider: this.getProviderInfo(provider).name,
                             reason: PROVIDER_SWITCH_REASONS.CHECK_FAILED,
                         });
-                        if (!this.isAutocaptureEnabled("disconnect")) return [3 /*break*/, 24];
+                        if (!this.isAutocaptureEnabled("disconnect")) return [3 /*break*/, 23];
                         return [4 /*yield*/, this.disconnect({
-                                chainId: this.currentChainId,
-                                address: this.currentAddress,
+                                chainId: this._evmChainId,
+                                address: this._evmAddress,
                             })];
-                    case 23:
+                    case 22:
                         _a.sent();
-                        return [3 /*break*/, 25];
-                    case 24:
+                        return [3 /*break*/, 24];
+                    case 23:
                         logger_1.logger.debug("OnAccountsChanged: Disconnect event skipped for failed provider check (autocapture.disconnect: false)");
                         // Still clear state even if not tracking the event
-                        this.currentAddress = undefined;
-                        this.currentChainId = undefined;
-                        _a.label = 25;
+                        this.clearChainState('evm');
+                        _a.label = 24;
+                    case 24: return [3 /*break*/, 25];
                     case 25:
-                        this.clearActiveProvider();
-                        return [3 /*break*/, 26];
-                    case 26:
                         // Set provider if none exists (first connection)
                         if (!this._provider) {
                             this._provider = provider;
                         }
                         // If both the provider and address are the same, no-op
-                        if (this._provider === provider && address === this.currentAddress) {
+                        if (this._provider === provider && address === this._evmAddress) {
                             return [2 /*return*/];
                         }
                         return [4 /*yield*/, this.getCurrentChainId(provider)];
-                    case 27:
+                    case 26:
                         nextChainId = _a.sent();
-                        wasDisconnected = !this.currentAddress;
+                        wasDisconnected = !this._evmAddress;
                         // CRITICAL: Always update state regardless of whether connect tracking is enabled
                         // This ensures disconnect events will have valid address/chainId values
-                        this.currentAddress = address;
-                        this.currentChainId = nextChainId;
+                        this.setChainState('evm', { address: address, chainId: nextChainId });
                         providerInfo = this.getProviderInfo(provider);
                         effectiveChainId = nextChainId || 0;
                         if (this.isAutocaptureEnabled("connect")) {
@@ -1014,7 +1058,7 @@ var FormoAnalytics = /** @class */ (function () {
                     this.handleProviderMismatch(provider);
                 }
                 // Chain changes only matter for connected users
-                if (!this.currentAddress) {
+                if (!this._evmAddress) {
                     logger_1.logger.info("OnChainChanged: No current address, user appears disconnected");
                     return [2 /*return*/, Promise.resolve()];
                 }
@@ -1022,19 +1066,19 @@ var FormoAnalytics = /** @class */ (function () {
                 if (!this._provider) {
                     this._provider = provider;
                 }
-                this.currentChainId = nextChainId;
+                this.setChainState('evm', { chainId: nextChainId });
                 try {
-                    // This is just a chain change since we already confirmed currentAddress exists
+                    // This is just a chain change since we already confirmed _evmAddress exists
                     if (this.isAutocaptureEnabled("chain")) {
                         return [2 /*return*/, this.chain({
-                                chainId: this.currentChainId,
-                                address: this.currentAddress,
+                                chainId: nextChainId,
+                                address: this._evmAddress,
                             })];
                     }
                     else {
                         logger_1.logger.debug("OnChainChanged: Chain event skipped (autocapture.chain: false)", {
-                            chainId: this.currentChainId,
-                            address: this.currentAddress,
+                            chainId: this._evmChainId,
+                            address: this._evmAddress,
                         });
                     }
                 }
@@ -1070,8 +1114,8 @@ var FormoAnalytics = /** @class */ (function () {
                         if (this._provider !== provider)
                             return [2 /*return*/];
                         logger_1.logger.info("OnDisconnect: Wallet disconnect event received, current state:", {
-                            currentAddress: this.currentAddress,
-                            currentChainId: this.currentChainId,
+                            currentAddress: this._evmAddress,
+                            currentChainId: this._evmChainId,
                         });
                         if (!this.isAutocaptureEnabled("disconnect")) return [3 /*break*/, 5];
                         _a.label = 1;
@@ -1079,8 +1123,8 @@ var FormoAnalytics = /** @class */ (function () {
                         _a.trys.push([1, 3, , 4]);
                         // Pass current state explicitly to ensure we have the data for the disconnect event
                         return [4 /*yield*/, this.disconnect({
-                                chainId: this.currentChainId,
-                                address: this.currentAddress,
+                                chainId: this._evmChainId,
+                                address: this._evmAddress,
                             })];
                     case 2:
                         // Pass current state explicitly to ensure we have the data for the disconnect event
@@ -1094,9 +1138,7 @@ var FormoAnalytics = /** @class */ (function () {
                     case 5:
                         logger_1.logger.debug("OnDisconnect: Disconnect event skipped (autocapture.disconnect: false)");
                         // Still clear state even if not tracking the event
-                        this.currentAddress = undefined;
-                        this.currentChainId = undefined;
-                        this.clearActiveProvider();
+                        this.clearChainState('evm');
                         _a.label = 6;
                     case 6: return [2 /*return*/];
                 }
@@ -1122,7 +1164,7 @@ var FormoAnalytics = /** @class */ (function () {
                     case 2:
                         address = _a.sent();
                         if (chainId && address) {
-                            wasDisconnected = !this.currentAddress;
+                            wasDisconnected = !this._evmAddress;
                             // Set provider if none exists
                             if (!this._provider) {
                                 this._provider = provider;
@@ -1131,12 +1173,13 @@ var FormoAnalytics = /** @class */ (function () {
                             // CRITICAL: Always update state from active provider regardless of tracking config
                             // This ensures disconnect events will have valid address/chainId values
                             if (isActiveProvider) {
-                                this.currentChainId = chainId;
-                                this.currentAddress =
-                                    this.validateAndChecksumAddress(address) || undefined;
+                                this.setChainState('evm', {
+                                    chainId: chainId,
+                                    address: (0, address_1.validateAndChecksumAddress)(address) || undefined,
+                                });
                             }
                             // Conditionally emit connect event based on tracking configuration
-                            if (isActiveProvider && this.currentAddress) {
+                            if (isActiveProvider && this._evmAddress) {
                                 providerInfo = this.getProviderInfo(provider);
                                 effectiveChainId = chainId || 0;
                                 if (this.isAutocaptureEnabled("connect")) {
@@ -1219,7 +1262,7 @@ var FormoAnalytics = /** @class */ (function () {
                             logger_1.logger.debug("Signature event skipped (autocapture.signature: false)", { method: method });
                             return [2 /*return*/, request({ method: method, params: params })];
                         }
-                        _c = this.currentChainId;
+                        _c = this._evmChainId;
                         if (_c) return [3 /*break*/, 2];
                         return [4 /*yield*/, this.getCurrentChainId(provider)];
                     case 1:
@@ -1716,14 +1759,37 @@ var FormoAnalytics = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(FormoAnalytics.prototype, "solana", {
+        /**
+         * Access the Solana integration manager.
+         * Lazily creates one if not already initialized.
+         *
+         * @example
+         * ```tsx
+         * formo.solana.setWallet(wallet);
+         * formo.solana.setConnection(connection);
+         * formo.solana.setCluster("devnet");
+         * formo.solana.syncWalletState();
+         * ```
+         */
+        get: function () {
+            if (!this.solanaManager) {
+                this.solanaManager = new SolanaManager_1.SolanaManager(this);
+            }
+            return this.solanaManager;
+        },
+        enumerable: false,
+        configurable: true
+    });
     FormoAnalytics.prototype.getAddress = function (provider) {
         return __awaiter(this, void 0, void 0, function () {
             var p, accounts, err_3, code;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        if (this.currentAddress)
-                            return [2 /*return*/, this.currentAddress];
+                        // Use EVM-specific state to avoid returning a Solana address in an EVM context
+                        if (this._chainState.evm.address)
+                            return [2 /*return*/, this._chainState.evm.address];
                         p = provider || this.provider;
                         if (!p) {
                             logger_1.logger.info("The provider is not set");
@@ -1736,7 +1802,7 @@ var FormoAnalytics = /** @class */ (function () {
                     case 2:
                         accounts = _a.sent();
                         if (accounts && accounts.length > 0) {
-                            return [2 /*return*/, this.validateAndChecksumAddress(accounts[0]) || null];
+                            return [2 /*return*/, (0, address_1.validateAndChecksumAddress)(accounts[0]) || null];
                         }
                         return [3 /*break*/, 4];
                     case 3:
@@ -1754,7 +1820,6 @@ var FormoAnalytics = /** @class */ (function () {
     FormoAnalytics.prototype.getAccounts = function (provider) {
         return __awaiter(this, void 0, void 0, function () {
             var p, res, err_4, code;
-            var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -1770,7 +1835,7 @@ var FormoAnalytics = /** @class */ (function () {
                         if (!res || res.length === 0)
                             return [2 /*return*/, null];
                         return [2 /*return*/, res
-                                .map(function (e) { return _this.validateAndChecksumAddress(e); })
+                                .map(function (e) { return (0, address_1.validateAndChecksumAddress)(e); })
                                 .filter(function (e) { return e !== undefined; })];
                     case 3:
                         err_4 = _a.sent();
@@ -1822,12 +1887,12 @@ var FormoAnalytics = /** @class */ (function () {
         var rawAddress = method === "personal_sign"
             ? params[1]
             : params[0];
-        var validAddress = this.validateAndChecksumAddress(rawAddress);
+        var validAddress = (0, address_1.validateAndChecksumAddress)(rawAddress);
         if (!validAddress) {
             throw new Error("Invalid address in signature payload: ".concat(rawAddress));
         }
         var basePayload = {
-            chainId: (_a = chainId !== null && chainId !== void 0 ? chainId : this.currentChainId) !== null && _a !== void 0 ? _a : undefined,
+            chainId: (_a = chainId !== null && chainId !== void 0 ? chainId : this._evmChainId) !== null && _a !== void 0 ? _a : undefined,
             address: validAddress,
         };
         if (method === "personal_sign") {
@@ -1838,29 +1903,25 @@ var FormoAnalytics = /** @class */ (function () {
     };
     FormoAnalytics.prototype.buildTransactionEventPayload = function (params, provider) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, data, from, to, value, validAddress, _b;
+            var _a, data, from, to, value, validAddress, builder_codes, _b;
             var _c;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
                         _a = params[0], data = _a.data, from = _a.from, to = _a.to, value = _a.value;
-                        validAddress = this.validateAndChecksumAddress(from);
+                        validAddress = (0, address_1.validateAndChecksumAddress)(from);
                         if (!validAddress) {
                             throw new Error("Invalid address in transaction payload: ".concat(from));
                         }
+                        builder_codes = (0, builderCode_1.extractBuilderCodes)(data);
                         _c = {};
-                        _b = this.currentChainId;
+                        _b = this._evmChainId;
                         if (_b) return [3 /*break*/, 2];
                         return [4 /*yield*/, this.getCurrentChainId(provider)];
                     case 1:
                         _b = (_d.sent());
                         _d.label = 2;
-                    case 2: return [2 /*return*/, (_c.chainId = _b,
-                            _c.data = data,
-                            _c.address = validAddress,
-                            _c.to = to,
-                            _c.value = value,
-                            _c)];
+                    case 2: return [2 /*return*/, __assign.apply(void 0, [(_c.chainId = _b, _c.data = data, _c.address = validAddress, _c.to = to, _c.value = value, _c), (builder_codes && { builder_codes: builder_codes })])];
                 }
             });
         });
@@ -2000,19 +2061,84 @@ var FormoAnalytics = /** @class */ (function () {
         // If this is a different provider, allow the switch
         if (this._provider) {
             // Clear any provider-specific state when switching
-            this.currentChainId = undefined;
-            this.currentAddress = undefined;
+            this.setChainState('evm', { address: undefined, chainId: undefined, provider: provider });
         }
-        this._provider = provider;
+        else {
+            this._provider = provider;
+        }
+    };
+    /**
+     * Determine which namespace a chainId belongs to.
+     */
+    FormoAnalytics.prototype.getNamespace = function (chainId) {
+        return (0, solana_1.isSolanaChainId)(chainId) ? 'solana' : 'evm';
+    };
+    /**
+     * Update per-chain state and sync the derived currentAddress/currentChainId.
+     * Accepts either a namespace string ('evm'/'solana') or a chainId number
+     * to resolve the namespace automatically. When a chainId number is passed,
+     * it is also stored as the namespace's chainId (unless explicitly overridden
+     * in the update object).
+     */
+    FormoAnalytics.prototype.setChainState = function (namespaceOrChainId, update) {
+        var namespace = typeof namespaceOrChainId === 'string'
+            ? namespaceOrChainId
+            : this.getNamespace(namespaceOrChainId);
+        var ns = this._chainState[namespace];
+        if ('address' in update)
+            ns.address = update.address;
+        if ('chainId' in update) {
+            ns.chainId = update.chainId;
+        }
+        else if (typeof namespaceOrChainId === 'number') {
+            ns.chainId = namespaceOrChainId;
+        }
+        if (namespace === 'evm' && 'provider' in update) {
+            ns.provider = update.provider;
+        }
+        this._activeNamespace = namespace;
+        this.syncDerivedState();
     };
     /**
-     * Helper method to validate and checksum an address
-     * @param address The address to validate and checksum
-     * @returns The checksummed address or undefined if invalid
+     * Clear per-chain state for a given namespace (or chainId) and sync derived state.
      */
-    FormoAnalytics.prototype.validateAndChecksumAddress = function (address) {
-        var validAddress = (0, address_1.getValidAddress)(address);
-        return validAddress ? (0, utils_1.toChecksumAddress)(validAddress) : undefined;
+    FormoAnalytics.prototype.clearChainState = function (namespaceOrChainId) {
+        var namespace = typeof namespaceOrChainId === 'string'
+            ? namespaceOrChainId
+            : this.getNamespace(namespaceOrChainId);
+        if (namespace === 'evm') {
+            this._chainState.evm = {};
+        }
+        else {
+            this._chainState.solana = {};
+        }
+        this.syncDerivedState();
+    };
+    /**
+     * Synchronize currentAddress/currentChainId from the active namespace.
+     * Last-connected-chain-wins: _activeNamespace takes precedence.
+     */
+    FormoAnalytics.prototype.syncDerivedState = function () {
+        var active = this._activeNamespace;
+        if (active) {
+            var state = this._chainState[active];
+            if (state.address || state.chainId) {
+                this.currentAddress = state.address;
+                this.currentChainId = state.chainId;
+                return;
+            }
+        }
+        // Fall through to the other namespace
+        var other = active === 'evm' ? 'solana' : 'evm';
+        var otherState = this._chainState[other];
+        if (otherState.address || otherState.chainId) {
+            this.currentAddress = otherState.address;
+            this.currentChainId = otherState.chainId;
+            this._activeNamespace = other;
+            return;
+        }
+        this.currentAddress = undefined;
+        this.currentChainId = undefined;
     };
     /**
      * Helper method to clear the active provider state