@meshconnect/uwc-injected-connector 0.2.7 → 0.2.8

package/dist/providers/evm-provider.js

@@ -0,0 +1,86 @@
+/**
+ * EVM provider management
+ */
+import { getAvailableWallets as getEIP6963Wallets } from '../eip6963-discovery';
+export class EVMProvider {
+    detectedEIP6963Wallets = [];
+    async initialize() {
+        this.detectedEIP6963Wallets = await getEIP6963Wallets();
+    }
+    getProvider(eip155Name, injectedId) {
+        // First, try to find the provider from EIP-6963 discovered wallets
+        const detectedWallet = this.detectedEIP6963Wallets.find(wallet => wallet.name.toLowerCase() === eip155Name.toLowerCase());
+        if (detectedWallet && detectedWallet.provider) {
+            return detectedWallet.provider;
+        }
+        // Fall back to window.ethereum if no EIP-6963 provider found
+        const ethereum = window.ethereum;
+        if (ethereum) {
+            // Check if the specific wallet is available via injectedId
+            if (injectedId && !ethereum[injectedId]) {
+                throw new Error(`Wallet ${eip155Name} is not available`);
+            }
+            return ethereum;
+        }
+        throw new Error(`No provider found for ${eip155Name}`);
+    }
+    async switchNetwork(provider, network) {
+        // Get the current chain ID
+        const currentChainId = await provider.request({
+            method: 'eth_chainId'
+        });
+        // Parse the expected chain ID from the network ID (format: "eip155:1")
+        const expectedChainId = network.id.split(':')[1];
+        if (!expectedChainId) {
+            throw new Error('Invalid network ID format');
+        }
+        const expectedChainIdHex = '0x' + parseInt(expectedChainId).toString(16);
+        // Switch to the correct network if needed
+        if (currentChainId !== expectedChainIdHex) {
+            try {
+                await provider.request({
+                    method: 'wallet_switchEthereumChain',
+                    params: [{ chainId: expectedChainIdHex }]
+                });
+            }
+            catch (switchError) {
+                // This error code indicates that the chain has not been added
+                if (switchError.code === 4902) {
+                    // Try to add the network
+                    const networkParams = {
+                        chainId: expectedChainIdHex,
+                        chainName: network.name,
+                        nativeCurrency: network.nativeCurrency,
+                        rpcUrls: network.rpcUrls?.default.http || [],
+                        blockExplorerUrls: network.blockExplorers
+                            ? [network.blockExplorers.default.url]
+                            : []
+                    };
+                    await provider.request({
+                        method: 'wallet_addEthereumChain',
+                        params: [networkParams]
+                    });
+                }
+                else {
+                    throw switchError;
+                }
+            }
+        }
+    }
+    async requestAccounts(provider) {
+        const accounts = await provider.request({
+            method: 'eth_requestAccounts'
+        });
+        return accounts || [];
+    }
+    async getAccounts(provider) {
+        const accounts = await provider.request({
+            method: 'eth_accounts'
+        });
+        return accounts || [];
+    }
+    getDetectedWallets() {
+        return this.detectedEIP6963Wallets;
+    }
+}
+//# sourceMappingURL=evm-provider.js.map

package/dist/providers/evm-provider.js.map

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

package/dist/providers/solana-provider.d.ts

@@ -0,0 +1,22 @@
+/**
+ * Solana provider management
+ */
+import type { SolanaMetadata } from '@meshconnect/uwc-types';
+export interface DetectedSolanaWallet {
+    name: string;
+    provider: any;
+    injectedId?: string;
+}
+export interface SolanaProviderManager {
+    getProvider(metadata?: SolanaMetadata): any;
+    detectWallets(): DetectedSolanaWallet[];
+}
+export declare class SolanaProvider implements SolanaProviderManager {
+    private detectedWallets;
+    initialize(): void;
+    getProvider(metadata?: SolanaMetadata): any;
+    detectWallets(): DetectedSolanaWallet[];
+    connect(provider: any): Promise<any>;
+    getDetectedWallets(): DetectedSolanaWallet[];
+}
+//# sourceMappingURL=solana-provider.d.ts.map

package/dist/providers/solana-provider.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"solana-provider.d.ts","sourceRoot":"","sources":["../../src/providers/solana-provider.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AAE5D,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,GAAG,CAAA;IACb,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB;AAED,MAAM,WAAW,qBAAqB;IACpC,WAAW,CAAC,QAAQ,CAAC,EAAE,cAAc,GAAG,GAAG,CAAA;IAC3C,aAAa,IAAI,oBAAoB,EAAE,CAAA;CACxC;AAED,qBAAa,cAAe,YAAW,qBAAqB;IAC1D,OAAO,CAAC,eAAe,CAA6B;IAEpD,UAAU,IAAI,IAAI;IAIlB,WAAW,CAAC,QAAQ,CAAC,EAAE,cAAc,GAAG,GAAG;IAsE3C,aAAa,IAAI,oBAAoB,EAAE;IAuEjC,OAAO,CAAC,QAAQ,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;IAW1C,kBAAkB,IAAI,oBAAoB,EAAE;CAG7C"}

package/dist/providers/solana-provider.js

@@ -0,0 +1,137 @@
+/**
+ * Solana provider management
+ */
+export class SolanaProvider {
+    detectedWallets = [];
+    initialize() {
+        this.detectedWallets = this.detectWallets();
+    }
+    getProvider(metadata) {
+        if (!metadata || !metadata.injectedId) {
+            // Fallback to checking common Solana provider locations
+            if (window.solana)
+                return window.solana;
+            if (window.phantom?.solana)
+                return window.phantom.solana;
+            if (window.solflare?.solana)
+                return window.solflare.solana;
+            return null;
+        }
+        const { injectedId, ignoredInjectedIds } = metadata;
+        // Helper function to validate provider
+        const isValidProvider = (provider) => {
+            if (!provider)
+                return false;
+            // Check if provider has ignored IDs (meaning it's the wrong wallet)
+            if (ignoredInjectedIds && ignoredInjectedIds.length > 0) {
+                for (const ignoredId of ignoredInjectedIds) {
+                    if (provider[ignoredId] === true) {
+                        return false;
+                    }
+                }
+            }
+            // Check if provider has the required injectedId property
+            // For example, if injectedId is 'isPhantom', check provider.isPhantom === true
+            if (injectedId.startsWith('is')) {
+                return provider[injectedId] === true;
+            }
+            // For non-boolean identifiers, just check existence
+            return !!provider[injectedId];
+        };
+        // Strategy 1: Check window[walletName].solana (e.g., window.phantom.solana)
+        const walletName = injectedId.replace(/^is/, '').toLowerCase();
+        const nestedProvider = window[walletName]?.solana;
+        if (nestedProvider && isValidProvider(nestedProvider)) {
+            return nestedProvider;
+        }
+        // Strategy 2: Check window[walletName] directly (e.g., window.solflare)
+        const directProvider = window[walletName];
+        if (directProvider && isValidProvider(directProvider)) {
+            return directProvider;
+        }
+        // Strategy 3: Check window.solana with validation
+        if (window.solana && isValidProvider(window.solana)) {
+            return window.solana;
+        }
+        // Strategy 4: For wallets that might inject differently (e.g., window.trustwallet.solana)
+        // Check various common patterns
+        const commonPatterns = [
+            window[`${walletName}wallet`]?.solana,
+            window[`${walletName}Wallet`]?.solana,
+            window[walletName.replace('wallet', '')]?.solana
+        ];
+        for (const provider of commonPatterns) {
+            if (provider && isValidProvider(provider)) {
+                return provider;
+            }
+        }
+        return null;
+    }
+    detectWallets() {
+        const wallets = [];
+        // Check common Solana wallet locations and identify them
+        const checkProvider = (provider, name, injectedId) => {
+            if (provider && typeof provider.connect === 'function') {
+                if (injectedId) {
+                    wallets.push({ name, provider, injectedId });
+                }
+                else {
+                    wallets.push({ name, provider });
+                }
+            }
+        };
+        // Check window.solana and identify the wallet type
+        if (window.solana) {
+            const provider = window.solana;
+            let name = 'Solana Wallet';
+            let injectedId;
+            if (provider.isPhantom) {
+                name = 'Phantom';
+                injectedId = 'isPhantom';
+            }
+            else if (provider.isSolflare) {
+                name = 'Solflare';
+                injectedId = 'isSolflare';
+            }
+            else if (provider.isTrust || provider.isTrustWallet) {
+                name = 'Trust Wallet';
+                injectedId = provider.isTrust ? 'isTrust' : 'isTrustWallet';
+            }
+            else if (provider.isExodus) {
+                name = 'Exodus';
+                injectedId = 'isExodus';
+            }
+            checkProvider(provider, name, injectedId);
+        }
+        // Check nested providers
+        if (window.phantom?.solana) {
+            checkProvider(window.phantom.solana, 'Phantom', 'isPhantom');
+        }
+        if (window.solflare) {
+            checkProvider(window.solflare, 'Solflare', 'isSolflare');
+        }
+        if (window.trustwallet?.solana) {
+            checkProvider(window.trustwallet.solana, 'Trust Wallet', 'isTrust');
+        }
+        if (window.exodus?.solana) {
+            checkProvider(window.exodus.solana, 'Exodus', 'isExodus');
+        }
+        // Remove duplicates based on provider reference
+        const uniqueWallets = wallets.filter((wallet, index, self) => index === self.findIndex(w => w.provider === wallet.provider));
+        return uniqueWallets;
+    }
+    async connect(provider) {
+        if (!provider.isConnected) {
+            const response = await provider.connect();
+            if (!response || !response.publicKey) {
+                throw new Error('Failed to connect to Solana wallet');
+            }
+            return response;
+        }
+        return { publicKey: provider.publicKey };
+    }
+    getDetectedWallets() {
+        return this.detectedWallets;
+    }
+}
+//# sourceMappingURL=solana-provider.js.map

package/dist/providers/solana-provider.js.map

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

package/dist/services/signature-service.d.ts

@@ -1,5 +1,5 @@
 import type { EthereumProvider } from '../eip6963-discovery';
-import type { WalletAdapter } from '@solana/wallet-adapter-base';
+import type { SolanaAdapter } from '../wallet-standard-discovery';
 /**
  * Service for handling message signing operations for injected wallets
  */
@@ -11,6 +11,6 @@ export declare class SignatureService {
     /**
      * Sign a message with a Solana wallet
      */
-    signSolanaMessage(message: string, adapter: WalletAdapter): Promise<string>;
+    signSolanaMessage(message: string, adapter: SolanaAdapter): Promise<string>;
 }
 //# sourceMappingURL=signature-service.d.ts.map

package/dist/services/signature-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signature-service.d.ts","sourceRoot":"","sources":["../../src/services/signature-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAIhE;;GAEG;AACH,qBAAa,gBAAgB;IAC3B;;OAEG;IACG,mBAAmB,CACvB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC,MAAM,CAAC;IA0BlB;;OAEG;IACG,iBAAiB,CACrB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC;CAmCnB"}
+{"version":3,"file":"signature-service.d.ts","sourceRoot":"","sources":["../../src/services/signature-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAG5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAEjE;;GAEG;AACH,qBAAa,gBAAgB;IAC3B;;OAEG;IACG,mBAAmB,CACvB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC,MAAM,CAAC;IA0BlB;;OAEG;IACG,iBAAiB,CACrB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC;CAuBnB"}

package/dist/services/signature-service.js

@@ -33,23 +33,16 @@ export class SignatureService {
      * Sign a message with a Solana wallet
      */
     async signSolanaMessage(message, adapter) {
-        if (!adapter) {
-            throw new Error('Adapter is required for Solana message signing');
-        }
         if (!message) {
             throw new Error('Message is required for signing');
         }
-        // Check if adapter supports signMessage
-        const signingAdapter = adapter;
-        if (!signingAdapter.signMessage) {
-            throw new Error('Solana adapter does not support message signing');
-        }
         try {
             // Convert message to Uint8Array for Solana
             const encoder = new TextEncoder();
             const messageBytes = encoder.encode(message);
-            // Sign the message
-            const signedMessage = await signingAdapter.signMessage(messageBytes);
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore
+            const signedMessage = await adapter.signMessage(messageBytes);
             // Encode signature using base58 for Solana (standard encoding for Solana)
             // The signature is returned as a Uint8Array, encode it to base58 string
             const signatureBase58 = bs58.encode(signedMessage);

package/dist/services/signature-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"signature-service.js","sourceRoot":"","sources":["../../src/services/signature-service.ts"],"names":[],"mappings":"AAEA,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD;;GAEG;AACH,MAAM,OAAO,gBAAgB;IAC3B;;OAEG;IACH,KAAK,CAAC,mBAAmB,CACvB,OAAe,EACf,OAAe,EACf,QAA0B;QAE1B,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAA;QACtE,CAAC;QAED,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAA;QACpD,CAAC;QAED,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAA;QACpD,CAAC;QAED,IAAI,CAAC;YACH,iCAAiC;YACjC,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC;gBACvC,MAAM,EAAE,eAAe;gBACvB,MAAM,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;aAC3B,CAAC,CAAA;YAEF,OAAO,SAAS,CAAA;QAClB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,UAAU,CAAC,KAAK,CAAC,CAAA;QACnB,CAAC;IACH,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,iBAAiB,CACrB,OAAe,EACf,OAAsB;QAEtB,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAA;QACnE,CAAC;QAED,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAA;QACpD,CAAC;QAED,wCAAwC;QACxC,MAAM,cAAc,GAAG,OAEtB,CAAA;QAED,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,CAAC;YAChC,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAA;QACpE,CAAC;QAED,IAAI,CAAC;YACH,2CAA2C;YAC3C,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAA;YACjC,MAAM,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;YAE5C,mBAAmB;YACnB,MAAM,aAAa,GAAG,MAAM,cAAc,CAAC,WAAW,CAAC,YAAY,CAAC,CAAA;YAEpE,0EAA0E;YAC1E,wEAAwE;YACxE,MAAM,eAAe,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;YAElD,OAAO,eAAe,CAAA;QACxB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,UAAU,CAAC,KAAK,CAAC,CAAA;QACnB,CAAC;IACH,CAAC;CACF"}
+{"version":3,"file":"signature-service.js","sourceRoot":"","sources":["../../src/services/signature-service.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAGjD;;GAEG;AACH,MAAM,OAAO,gBAAgB;IAC3B;;OAEG;IACH,KAAK,CAAC,mBAAmB,CACvB,OAAe,EACf,OAAe,EACf,QAA0B;QAE1B,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAA;QACtE,CAAC;QAED,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAA;QACpD,CAAC;QAED,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAA;QACpD,CAAC;QAED,IAAI,CAAC;YACH,iCAAiC;YACjC,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC;gBACvC,MAAM,EAAE,eAAe;gBACvB,MAAM,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;aAC3B,CAAC,CAAA;YAEF,OAAO,SAAS,CAAA;QAClB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,UAAU,CAAC,KAAK,CAAC,CAAA;QACnB,CAAC;IACH,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,iBAAiB,CACrB,OAAe,EACf,OAAsB;QAEtB,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAA;QACpD,CAAC;QAED,IAAI,CAAC;YACH,2CAA2C;YAC3C,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAA;YACjC,MAAM,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;YAE5C,6DAA6D;YAC7D,aAAa;YACb,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,YAAY,CAAC,CAAA;YAE7D,0EAA0E;YAC1E,wEAAwE;YACxE,MAAM,eAAe,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;YAElD,OAAO,eAAe,CAAA;QACxB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,UAAU,CAAC,KAAK,CAAC,CAAA;QACnB,CAAC;IACH,CAAC;CACF"}

package/dist/services/solana/solana-transaction-service.d.ts

@@ -1,5 +1,5 @@
-import type { WalletAdapter } from '@solana/wallet-adapter-base';
 import type { NetworkRpcMap, SolanaTransactionRequest } from '@meshconnect/uwc-types';
+import type { SolanaAdapter } from '../../wallet-standard-discovery';
 /**
  * Service for handling Solana transaction operations
  */
@@ -10,7 +10,19 @@ export declare class SolanaTransactionService {
     /**
      * Send a transaction for Solana
      */
-    sendTransaction(request: SolanaTransactionRequest, adapter: WalletAdapter): Promise<string>;
+    sendTransaction(request: SolanaTransactionRequest, adapter: SolanaAdapter): Promise<string>;
+    /**
+     * Helper: Validate wallet address matches
+     */
+    private validateWalletMatch;
+    /**
+     * Helper: Get RPC URL with fallback
+     */
+    private getRpcUrl;
+    /**
+     * Helper: Execute transaction with sendSerializedTransaction fallback
+     */
+    private executeTransaction;
     /**
      * Send native SOL transfer
      */

package/dist/services/solana/solana-transaction-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solana-transaction-service.d.ts","sourceRoot":"","sources":["../../../src/services/solana/solana-transaction-service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAChE,OAAO,KAAK,EAEV,aAAa,EAIb,wBAAwB,EACzB,MAAM,wBAAwB,CAAA;AAI/B;;GAEG;AACH,qBAAa,wBAAwB;IACnC,OAAO,CAAC,aAAa,CAAe;IACpC,OAAO,CAAC,OAAO,CAA0B;gBAE7B,aAAa,GAAE,aAAkB;IAK7C;;OAEG;IACG,eAAe,CACnB,OAAO,EAAE,wBAAwB,EACjC,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC;IA0BlB;;OAEG;YACW,qBAAqB;IA0CnC;;OAEG;YACW,uBAAuB;IA0CrC;;OAEG;YACW,mCAAmC;CAuClD"}
+{"version":3,"file":"solana-transaction-service.d.ts","sourceRoot":"","sources":["../../../src/services/solana/solana-transaction-service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAEV,aAAa,EAIb,wBAAwB,EACzB,MAAM,wBAAwB,CAAA;AAG/B,OAAO,KAAK,EAEV,aAAa,EACd,MAAM,iCAAiC,CAAA;AAExC;;GAEG;AACH,qBAAa,wBAAwB;IACnC,OAAO,CAAC,aAAa,CAAe;IACpC,OAAO,CAAC,OAAO,CAA0B;gBAE7B,aAAa,GAAE,aAAkB;IAK7C;;OAEG;IACG,eAAe,CACnB,OAAO,EAAE,wBAAwB,EACjC,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC;IA0BlB;;OAEG;YACW,mBAAmB;IAWjC;;OAEG;IACH,OAAO,CAAC,SAAS;IAMjB;;OAEG;YACW,kBAAkB;IAuChC;;OAEG;YACW,qBAAqB;IA8BnC;;OAEG;YACW,uBAAuB;IA8BrC;;OAEG;YACW,mCAAmC;CAwDlD"}

package/dist/services/solana/solana-transaction-service.js

@@ -1,4 +1,4 @@
-import { Transaction, Connection } from '@solana/web3.js';
+import { Transaction, Connection, PublicKey } from '@solana/web3.js';
 import { parseError } from '../../utils/error-utils';
 import { SolanaTransactionBuilder } from './solana-transaction-builder';
 /**
@@ -34,18 +34,60 @@ export class SolanaTransactionService {
             parseError(error);
         }
     }
+    /**
+     * Helper: Validate wallet address matches
+     */
+    async validateWalletMatch(adapter, expectedAddress) {
+        const base58PublicKey = await adapter.publicKey?.toBase58();
+        if (base58PublicKey !== expectedAddress) {
+            throw new Error('From address does not match connected wallet');
+        }
+        return base58PublicKey;
+    }
+    /**
+     * Helper: Get RPC URL with fallback
+     */
+    getRpcUrl(networkId) {
+        return networkId && this.networkRpcMap[networkId]
+            ? this.networkRpcMap[networkId]
+            : 'https://api.mainnet-beta.solana.com';
+    }
+    /**
+     * Helper: Execute transaction with sendSerializedTransaction fallback
+     */
+    async executeTransaction(adapter, transaction, rpcUrl) {
+        let transactionSignature;
+        // Try to use sendSerializedTransaction if available
+        try {
+            const extendedAdapter = adapter;
+            const serializedTx = transaction.serialize({
+                requireAllSignatures: false,
+                verifySignatures: false
+            });
+            if (extendedAdapter.sendSerializedTransaction) {
+                transactionSignature = await extendedAdapter.sendSerializedTransaction(serializedTx, rpcUrl);
+            }
+        }
+        catch {
+            // Fallback to regular sendTransaction
+        }
+        // If sendSerializedTransaction didn't work or wasn't available
+        if (!transactionSignature) {
+            const connection = new Connection(rpcUrl);
+            transactionSignature = await adapter.sendTransaction(transaction, connection);
+        }
+        if (transactionSignature === undefined) {
+            throw new Error(`Couldn't get the transaction signature`);
+        }
+        return transactionSignature;
+    }
     /**
      * Send native SOL transfer
      */
     async sendNativeTransaction(adapter, request, networkId) {
         try {
-            if (!adapter.publicKey) {
-                throw new Error('Wallet not connected');
-            }
-            // Verify the from address matches connected wallet
-            if (adapter.publicKey.toBase58() !== request.from) {
-                throw new Error('From address does not match connected wallet');
-            }
+            // Validate wallet
+            await this.validateWalletMatch(adapter, request.from);
             // Blockhash is required
             if (!request.blockhash) {
                 throw new Error('Blockhash is required for Solana transactions');
@@ -55,14 +97,10 @@ export class SolanaTransactionService {
             transaction.instructions =
                 await this.builder.buildTransferInstructions(request);
             transaction.recentBlockhash = request.blockhash;
-            transaction.feePayer = adapter.publicKey;
-            // Get RPC URL from the network RPC map or fall back to public endpoint
-            const rpcUrl = networkId && this.networkRpcMap[networkId]
-                ? this.networkRpcMap[networkId]
-                : 'https://api.mainnet-beta.solana.com';
-            const connection = new Connection(rpcUrl);
-            const signature = await adapter.sendTransaction(transaction, connection);
-            return signature;
+            transaction.feePayer = new PublicKey(request.from);
+            // Execute with helpers
+            const rpcUrl = this.getRpcUrl(networkId);
+            return await this.executeTransaction(adapter, transaction, rpcUrl);
         }
         catch (error) {
             parseError(error);
@@ -73,13 +111,8 @@ export class SolanaTransactionService {
      */
     async sendSplTokenTransaction(adapter, request, networkId) {
         try {
-            if (!adapter.publicKey) {
-                throw new Error('Wallet not connected');
-            }
-            // Verify the from address matches connected wallet
-            if (adapter.publicKey.toBase58() !== request.from) {
-                throw new Error('From address does not match connected wallet');
-            }
+            // Validate wallet
+            await this.validateWalletMatch(adapter, request.from);
             // Blockhash is required
             if (!request.blockhash) {
                 throw new Error('Blockhash is required for Solana transactions');
@@ -89,14 +122,10 @@ export class SolanaTransactionService {
             transaction.instructions =
                 await this.builder.buildTransferInstructions(request);
             transaction.recentBlockhash = request.blockhash;
-            transaction.feePayer = adapter.publicKey;
-            // Get RPC URL from the network RPC map or fall back to public endpoint
-            const rpcUrl = networkId && this.networkRpcMap[networkId]
-                ? this.networkRpcMap[networkId]
-                : 'https://api.mainnet-beta.solana.com';
-            const connection = new Connection(rpcUrl);
-            const signature = await adapter.sendTransaction(transaction, connection);
-            return signature;
+            transaction.feePayer = new PublicKey(request.from);
+            // Execute with helpers
+            const rpcUrl = this.getRpcUrl(networkId);
+            return await this.executeTransaction(adapter, transaction, rpcUrl);
         }
         catch (error) {
             parseError(error);
@@ -107,26 +136,37 @@ export class SolanaTransactionService {
      */
     async sendGenericTransferWithInstructions(adapter, request, networkId) {
         try {
-            if (!adapter.publicKey) {
-                throw new Error('Wallet not connected');
-            }
-            // Verify the from address matches connected wallet
-            if (adapter.publicKey.toBase58() !== request.feePayer) {
-                throw new Error('From address does not match connected wallet');
-            }
+            // Validate wallet
+            await this.validateWalletMatch(adapter, request.feePayer);
             // Blockhash is required
             if (!request.blockhash) {
                 throw new Error('Blockhash is required for Solana transactions');
             }
-            // Create transaction
-            const transaction = await this.builder.getVersionedTransaction(adapter.publicKey, request);
-            // Get RPC URL from the network RPC map or fall back to public endpoint
-            const rpcUrl = networkId && this.networkRpcMap[networkId]
-                ? this.networkRpcMap[networkId]
-                : 'https://api.mainnet-beta.solana.com';
-            const connection = new Connection(rpcUrl);
-            const signature = await adapter.sendTransaction(transaction, connection);
-            return signature;
+            // Create versioned transaction
+            const transaction = await this.builder.getVersionedTransaction(new PublicKey(request.feePayer), request);
+            // Get RPC URL
+            const rpcUrl = this.getRpcUrl(networkId);
+            // VersionedTransaction can't use our helper method, handle directly
+            let transactionSignature;
+            try {
+                const extendedAdapter = adapter;
+                const serializedTx = transaction.serialize();
+                if (extendedAdapter.sendSerializedTransaction) {
+                    transactionSignature =
+                        await extendedAdapter.sendSerializedTransaction(serializedTx, rpcUrl);
+                }
+            }
+            catch {
+                // Fallback to regular sendTransaction
+            }
+            if (!transactionSignature) {
+                const connection = new Connection(rpcUrl);
+                transactionSignature = await adapter.sendTransaction(transaction, connection);
+            }
+            if (transactionSignature === undefined) {
+                throw new Error(`Couldn't get the transaction signature`);
+            }
+            return transactionSignature;
         }
         catch (error) {
             parseError(error);

package/dist/services/solana/solana-transaction-service.js.map

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

package/dist/services/solana/solana-wallet-service.d.ts

@@ -1,6 +1,5 @@
 import type { AvailableAddress } from '@meshconnect/uwc-types';
-import type { WalletAdapter } from '@solana/wallet-adapter-base';
-import { type WalletStandardInfo } from '../../wallet-standard-discovery';
+import { type SolanaAdapter, type WalletStandardInfo } from '../../wallet-standard-discovery';
 import { StorageService } from '../storage-service';
 /**
  * Service for managing Solana wallet connections
@@ -14,7 +13,7 @@ export declare class SolanaWalletService {
     /**
      * Initialize wallet discovery
      */
-    initializeDiscovery(): void;
+    initializeDiscovery(): Promise<void>;
     /**
      * Get detected wallets
      */
@@ -26,11 +25,11 @@ export declare class SolanaWalletService {
     /**
      * Check if a Solana wallet is already connected
      */
-    checkExistingConnection(adapter: WalletAdapter, walletUuid: string): Promise<string | null>;
+    checkExistingConnection(adapter: SolanaAdapter, walletUuid: string): Promise<string | null>;
     /**
      * Connect to wallet
      */
-    connect(adapter: WalletAdapter, walletUuid: string): Promise<string>;
+    connect(adapter: SolanaAdapter, walletUuid: string): Promise<string>;
     /**
      * Build available addresses for all supported networks
      */
@@ -38,7 +37,7 @@ export declare class SolanaWalletService {
     /**
      * Set connection state
      */
-    setConnectionState(adapter: WalletAdapter | null, account: string | null, walletUuid?: string): void;
+    setConnectionState(adapter: SolanaAdapter | null, account: string | null, walletUuid?: string): void;
     /**
      * Get current account
      */
@@ -46,7 +45,7 @@ export declare class SolanaWalletService {
     /**
      * Get connected adapter
      */
-    getConnectedAdapter(): WalletAdapter | null;
+    getConnectedAdapter(): SolanaAdapter | null;
     /**
      * Disconnect (clear state only, don't actually disconnect from wallet)
      */

package/dist/services/solana/solana-wallet-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solana-wallet-service.d.ts","sourceRoot":"","sources":["../../../src/services/solana/solana-wallet-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAa,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAChE,OAAO,EAEL,KAAK,kBAAkB,EACxB,MAAM,iCAAiC,CAAA;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAEnD;;GAEG;AACH,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,eAAe,CAA2B;IAClD,OAAO,CAAC,gBAAgB,CAA6B;IACrD,OAAO,CAAC,OAAO,CAAsB;IACrC,OAAO,CAAC,cAAc,CAAgB;gBAE1B,cAAc,EAAE,cAAc;IAI1C;;OAEG;IACH,mBAAmB,IAAI,IAAI;IAI3B;;OAEG;IACH,kBAAkB,IAAI,kBAAkB,EAAE;IAI1C;;OAEG;IACH,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,kBAAkB,GAAG,SAAS;IAI9D;;OAEG;IACG,uBAAuB,CAC3B,OAAO,EAAE,aAAa,EACtB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAkCzB;;OAEG;IACG,OAAO,CAAC,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAkB1E;;OAEG;IACH,uBAAuB,CACrB,mBAAmB,EAAE,MAAM,EAAE,EAC7B,OAAO,EAAE,MAAM,GACd,gBAAgB,EAAE;IAarB;;OAEG;IACH,kBAAkB,CAChB,OAAO,EAAE,aAAa,GAAG,IAAI,EAC7B,OAAO,EAAE,MAAM,GAAG,IAAI,EACtB,UAAU,CAAC,EAAE,MAAM,GAClB,IAAI;IAUP;;OAEG;IACH,UAAU,IAAI,MAAM,GAAG,IAAI;IAI3B;;OAEG;IACH,mBAAmB,IAAI,aAAa,GAAG,IAAI;IAI3C;;OAEG;IACH,UAAU,IAAI,IAAI;CAInB"}
+{"version":3,"file":"solana-wallet-service.d.ts","sourceRoot":"","sources":["../../../src/services/solana/solana-wallet-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAa,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzE,OAAO,EAEL,KAAK,aAAa,EAClB,KAAK,kBAAkB,EACxB,MAAM,iCAAiC,CAAA;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAEnD;;GAEG;AACH,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,eAAe,CAA2B;IAClD,OAAO,CAAC,gBAAgB,CAA6B;IACrD,OAAO,CAAC,OAAO,CAAsB;IACrC,OAAO,CAAC,cAAc,CAAgB;gBAE1B,cAAc,EAAE,cAAc;IAI1C;;OAEG;IACG,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAI1C;;OAEG;IACH,kBAAkB,IAAI,kBAAkB,EAAE;IAI1C;;OAEG;IACH,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,kBAAkB,GAAG,SAAS;IAI9D;;OAEG;IACG,uBAAuB,CAC3B,OAAO,EAAE,aAAa,EACtB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IA+BzB;;OAEG;IACG,OAAO,CAAC,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAmB1E;;OAEG;IACH,uBAAuB,CACrB,mBAAmB,EAAE,MAAM,EAAE,EAC7B,OAAO,EAAE,MAAM,GACd,gBAAgB,EAAE;IAarB;;OAEG;IACH,kBAAkB,CAChB,OAAO,EAAE,aAAa,GAAG,IAAI,EAC7B,OAAO,EAAE,MAAM,GAAG,IAAI,EACtB,UAAU,CAAC,EAAE,MAAM,GAClB,IAAI;IAUP;;OAEG;IACH,UAAU,IAAI,MAAM,GAAG,IAAI;IAI3B;;OAEG;IACH,mBAAmB,IAAI,aAAa,GAAG,IAAI;IAI3C;;OAEG;IACH,UAAU,IAAI,IAAI;CAInB"}