@meshconnect/uwc-injected-connector 0.2.0 → 0.2.1

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

@@ -0,0 +1,136 @@
+import { Transaction, Connection } from '@solana/web3.js';
+import { parseError } from '../../utils/error-utils';
+import { SolanaTransactionBuilder } from './solana-transaction-builder';
+/**
+ * Service for handling Solana transaction operations
+ */
+export class SolanaTransactionService {
+    networkRpcMap;
+    builder;
+    constructor(networkRpcMap = {}) {
+        this.networkRpcMap = networkRpcMap;
+        this.builder = new SolanaTransactionBuilder();
+    }
+    /**
+     * Send a transaction for Solana
+     */
+    async sendTransaction(request, adapter) {
+        try {
+            // Handle different types of Solana transactions
+            if ('tokenMint' in request) {
+                return await this.sendSplTokenTransaction(adapter, request);
+            }
+            else if ('from' in request) {
+                return await this.sendNativeTransaction(adapter, request);
+            }
+            else if ('instructions' in request) {
+                return await this.sendGenericTransferWithInstructions(adapter, request);
+            }
+            else {
+                throw new Error('Invalid transaction request type');
+            }
+        }
+        catch (error) {
+            parseError(error);
+        }
+    }
+    /**
+     * 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');
+            }
+            // Blockhash is required
+            if (!request.blockhash) {
+                throw new Error('Blockhash is required for Solana transactions');
+            }
+            // Create transaction
+            const transaction = new Transaction();
+            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;
+        }
+        catch (error) {
+            parseError(error);
+        }
+    }
+    /**
+     * Send SPL token transfer
+     */
+    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');
+            }
+            // Blockhash is required
+            if (!request.blockhash) {
+                throw new Error('Blockhash is required for Solana transactions');
+            }
+            // Create transaction
+            const transaction = new Transaction();
+            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;
+        }
+        catch (error) {
+            parseError(error);
+        }
+    }
+    /**
+     * Send native SOL transfer
+     */
+    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');
+            }
+            // 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;
+        }
+        catch (error) {
+            parseError(error);
+        }
+    }
+}
+//# sourceMappingURL=solana-transaction-service.js.map

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

@@ -0,0 +1 @@
+{"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

@@ -0,0 +1,55 @@
+import type { AvailableAddress } from '@meshconnect/uwc-types';
+import type { WalletAdapter } from '@solana/wallet-adapter-base';
+import { type WalletStandardInfo } from '../../wallet-standard-discovery';
+import { StorageService } from '../storage-service';
+/**
+ * Service for managing Solana wallet connections
+ */
+export declare class SolanaWalletService {
+    private detectedWallets;
+    private connectedAdapter;
+    private account;
+    private storageService;
+    constructor(storageService: StorageService);
+    /**
+     * Initialize wallet discovery
+     */
+    initializeDiscovery(): void;
+    /**
+     * Get detected wallets
+     */
+    getDetectedWallets(): WalletStandardInfo[];
+    /**
+     * Find wallet by UUID
+     */
+    findWalletByUuid(uuid: string): WalletStandardInfo | undefined;
+    /**
+     * Check if a Solana wallet is already connected
+     */
+    checkExistingConnection(adapter: WalletAdapter, walletUuid: string): Promise<string | null>;
+    /**
+     * Connect to wallet
+     */
+    connect(adapter: WalletAdapter, walletUuid: string): Promise<string>;
+    /**
+     * Build available addresses for all supported networks
+     */
+    buildAvailableAddresses(supportedNetworkIds: string[], address: string): AvailableAddress[];
+    /**
+     * Set connection state
+     */
+    setConnectionState(adapter: WalletAdapter | null, account: string | null, walletUuid?: string): void;
+    /**
+     * Get current account
+     */
+    getAccount(): string | null;
+    /**
+     * Get connected adapter
+     */
+    getConnectedAdapter(): WalletAdapter | null;
+    /**
+     * Disconnect (clear state only, don't actually disconnect from wallet)
+     */
+    disconnect(): void;
+}
+//# sourceMappingURL=solana-wallet-service.d.ts.map

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

@@ -0,0 +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"}

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

@@ -0,0 +1,129 @@
+import { getSolanaWallets } from '../../wallet-standard-discovery';
+import { StorageService } from '../storage-service';
+/**
+ * Service for managing Solana wallet connections
+ */
+export class SolanaWalletService {
+    detectedWallets = [];
+    connectedAdapter = null;
+    account = null;
+    storageService;
+    constructor(storageService) {
+        this.storageService = storageService;
+    }
+    /**
+     * Initialize wallet discovery
+     */
+    initializeDiscovery() {
+        this.detectedWallets = getSolanaWallets();
+    }
+    /**
+     * Get detected wallets
+     */
+    getDetectedWallets() {
+        return this.detectedWallets;
+    }
+    /**
+     * Find wallet by UUID
+     */
+    findWalletByUuid(uuid) {
+        return this.detectedWallets.find(w => w.uuid === uuid);
+    }
+    /**
+     * Check if a Solana wallet is already connected
+     */
+    async checkExistingConnection(adapter, walletUuid) {
+        try {
+            // Check if adapter has a publicKey (means it's connected)
+            if (adapter.publicKey) {
+                return adapter.publicKey.toBase58();
+            }
+            // If this wallet was previously connected, try to reconnect
+            // This should work without prompting for wallets that support it
+            if (this.storageService.wasSolanaWalletPreviouslyConnected(walletUuid)) {
+                if ('connecting' in adapter &&
+                    !adapter.connecting &&
+                    'connect' in adapter) {
+                    try {
+                        // Type assertion needed because TypeScript can't narrow the type properly
+                        await adapter.connect();
+                        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                        const publicKey = adapter.publicKey;
+                        if (publicKey && 'toBase58' in publicKey) {
+                            return publicKey.toBase58();
+                        }
+                    }
+                    catch {
+                        // Silent fail - wallet requires user interaction or doesn't support silent reconnect
+                    }
+                }
+            }
+            return null;
+        }
+        catch {
+            return null;
+        }
+    }
+    /**
+     * Connect to wallet
+     */
+    async connect(adapter, walletUuid) {
+        // Connect to the Solana wallet
+        await adapter.connect();
+        if (!adapter.publicKey) {
+            throw new Error('No public key returned from wallet');
+        }
+        const address = adapter.publicKey.toBase58();
+        this.connectedAdapter = adapter;
+        this.account = address;
+        // Store this wallet as connected
+        this.storageService.storeSolanaWalletUUID(walletUuid);
+        return address;
+    }
+    /**
+     * Build available addresses for all supported networks
+     */
+    buildAvailableAddresses(supportedNetworkIds, address) {
+        const addresses = [];
+        supportedNetworkIds.forEach(networkId => {
+            if (networkId.startsWith('solana:')) {
+                addresses.push({
+                    address,
+                    networkId: networkId
+                });
+            }
+        });
+        return addresses;
+    }
+    /**
+     * Set connection state
+     */
+    setConnectionState(adapter, account, walletUuid) {
+        this.connectedAdapter = adapter;
+        this.account = account;
+        // Store wallet UUID if provided and connected
+        if (adapter && account && walletUuid) {
+            this.storageService.storeSolanaWalletUUID(walletUuid);
+        }
+    }
+    /**
+     * Get current account
+     */
+    getAccount() {
+        return this.account;
+    }
+    /**
+     * Get connected adapter
+     */
+    getConnectedAdapter() {
+        return this.connectedAdapter;
+    }
+    /**
+     * Disconnect (clear state only, don't actually disconnect from wallet)
+     */
+    disconnect() {
+        this.connectedAdapter = null;
+        this.account = null;
+    }
+}
+//# sourceMappingURL=solana-wallet-service.js.map

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

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

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

@@ -1,6 +1,6 @@
 import type { EthereumProvider } from '../eip6963-discovery';
 import type { WalletAdapter } from '@solana/wallet-adapter-base';
-import type { TransactionRequest, TransactionResult, SolanaNativeTransferRequest, NetworkRpcMap } from '@meshconnect/uwc-types';
+import type { TransactionRequest, TransactionResult, NetworkRpcMap } from '@meshconnect/uwc-types';
 /**
  * Service for handling transaction operations across different wallet types
  */
@@ -8,21 +8,9 @@ export declare class TransactionService {
     private ethereumService;
     private solanaService;
     constructor(networkRpcMap?: NetworkRpcMap);
-    /**
-     * Send a transaction for Ethereum
-     */
-    sendEthereumTransaction(request: TransactionRequest, provider: EthereumProvider): Promise<string>;
-    /**
-     * Send a transaction for Solana
-     */
-    sendSolanaTransaction(request: SolanaNativeTransferRequest, adapter: WalletAdapter): Promise<string>;
     /**
      * Send a transaction based on namespace
      */
     sendTransaction(request: TransactionRequest, namespace: 'eip155' | 'solana', provider: EthereumProvider | WalletAdapter): Promise<TransactionResult>;
-    /**
-     * Get EVM wallet capabilities
-     */
-    getEVMCapabilities(provider: EthereumProvider, from: string, chainId: string): Promise<import("@meshconnect/uwc-types").EVMCapabilities>;
 }
 //# sourceMappingURL=transaction-service.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"transaction-service.d.ts","sourceRoot":"","sources":["../../src/services/transaction-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAChE,OAAO,KAAK,EACV,kBAAkB,EAClB,iBAAiB,EAIjB,2BAA2B,EAC3B,aAAa,EACd,MAAM,wBAAwB,CAAA;AAK/B;;GAEG;AACH,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,eAAe,CAA4B;IACnD,OAAO,CAAC,aAAa,CAA0B;gBAEnC,aAAa,GAAE,aAAkB;IAK7C;;OAEG;IACG,uBAAuB,CAC3B,OAAO,EAAE,kBAAkB,EAC3B,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC,MAAM,CAAC;IA6BlB;;OAEG;IACG,qBAAqB,CACzB,OAAO,EAAE,2BAA2B,EACpC,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC;IAIlB;;OAEG;IACG,eAAe,CACnB,OAAO,EAAE,kBAAkB,EAC3B,SAAS,EAAE,QAAQ,GAAG,QAAQ,EAC9B,QAAQ,EAAE,gBAAgB,GAAG,aAAa,GACzC,OAAO,CAAC,iBAAiB,CAAC;IAgB7B;;OAEG;IACG,kBAAkB,CACtB,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM;CAIlB"}
+{"version":3,"file":"transaction-service.d.ts","sourceRoot":"","sources":["../../src/services/transaction-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAChE,OAAO,KAAK,EACV,kBAAkB,EAClB,iBAAiB,EACjB,aAAa,EAGd,MAAM,wBAAwB,CAAA;AAK/B;;GAEG;AACH,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,eAAe,CAA4B;IACnD,OAAO,CAAC,aAAa,CAA0B;gBAEnC,aAAa,GAAE,aAAkB;IAK7C;;OAEG;IACG,eAAe,CACnB,OAAO,EAAE,kBAAkB,EAC3B,SAAS,EAAE,QAAQ,GAAG,QAAQ,EAC9B,QAAQ,EAAE,gBAAgB,GAAG,aAAa,GACzC,OAAO,CAAC,iBAAiB,CAAC;CAe9B"}

package/dist/services/transaction-service.js

@@ -1,5 +1,5 @@
-import { EthereumTransactionService } from './ethereum-transaction-service';
-import { SolanaTransactionService } from './solana-transaction-service';
+import { EthereumTransactionService } from './ethereum/ethereum-transaction-service';
+import { SolanaTransactionService } from './solana/solana-transaction-service';
 import { parseError } from '../utils/error-utils';
 /**
  * Service for handling transaction operations across different wallet types
@@ -11,57 +11,19 @@ export class TransactionService {
         this.ethereumService = new EthereumTransactionService();
         this.solanaService = new SolanaTransactionService(networkRpcMap);
     }
-    /**
-     * Send a transaction for Ethereum
-     */
-    async sendEthereumTransaction(request, provider) {
-        try {
-            // Handle different types of EVM transactions
-            if ('contractAddress' in request && 'abi' in request) {
-                // Contract call
-                return await this.ethereumService.sendContractCall(provider, request);
-            }
-            else if ('calls' in request) {
-                // Batch transaction
-                return await this.ethereumService.sendBatch(provider, request);
-            }
-            else if ('amount' in request && typeof request.amount === 'bigint') {
-                // Native transfer
-                return await this.ethereumService.sendNativeTransfer(provider, request);
-            }
-            else {
-                throw new Error('Invalid transaction request type');
-            }
-        }
-        catch (error) {
-            parseError(error);
-        }
-    }
-    /**
-     * Send a transaction for Solana
-     */
-    async sendSolanaTransaction(request, adapter) {
-        return await this.solanaService.sendNativeTransfer(adapter, request);
-    }
     /**
      * Send a transaction based on namespace
      */
     async sendTransaction(request, namespace, provider) {
         if (namespace === 'eip155') {
-            return await this.sendEthereumTransaction(request, provider);
+            return await this.ethereumService.sendTransaction(request, provider);
         }
         else if (namespace === 'solana') {
-            return await this.sendSolanaTransaction(request, provider);
+            return await this.solanaService.sendTransaction(request, provider);
         }
         else {
             throw parseError(new Error(`Unsupported namespace: ${namespace}`));
         }
     }
-    /**
-     * Get EVM wallet capabilities
-     */
-    async getEVMCapabilities(provider, from, chainId) {
-        return await this.ethereumService.getCapabilities(provider, from, chainId);
-    }
 }
 //# sourceMappingURL=transaction-service.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"transaction-service.js","sourceRoot":"","sources":["../../src/services/transaction-service.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,0BAA0B,EAAE,MAAM,gCAAgC,CAAA;AAC3E,OAAO,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAA;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD;;GAEG;AACH,MAAM,OAAO,kBAAkB;IACrB,eAAe,CAA4B;IAC3C,aAAa,CAA0B;IAE/C,YAAY,gBAA+B,EAAE;QAC3C,IAAI,CAAC,eAAe,GAAG,IAAI,0BAA0B,EAAE,CAAA;QACvD,IAAI,CAAC,aAAa,GAAG,IAAI,wBAAwB,CAAC,aAAa,CAAC,CAAA;IAClE,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,uBAAuB,CAC3B,OAA2B,EAC3B,QAA0B;QAE1B,IAAI,CAAC;YACH,6CAA6C;YAC7C,IAAI,iBAAiB,IAAI,OAAO,IAAI,KAAK,IAAI,OAAO,EAAE,CAAC;gBACrD,gBAAgB;gBAChB,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,gBAAgB,CAChD,QAAQ,EACR,OAAiC,CAClC,CAAA;YACH,CAAC;iBAAM,IAAI,OAAO,IAAI,OAAO,EAAE,CAAC;gBAC9B,oBAAoB;gBACpB,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,SAAS,CACzC,QAAQ,EACR,OAAqC,CACtC,CAAA;YACH,CAAC;iBAAM,IAAI,QAAQ,IAAI,OAAO,IAAI,OAAO,OAAO,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;gBACrE,kBAAkB;gBAClB,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,kBAAkB,CAClD,QAAQ,EACR,OAAmC,CACpC,CAAA;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAA;YACrD,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,UAAU,CAAC,KAAK,CAAC,CAAA;QACnB,CAAC;IACH,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,qBAAqB,CACzB,OAAoC,EACpC,OAAsB;QAEtB,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;IACtE,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,eAAe,CACnB,OAA2B,EAC3B,SAA8B,EAC9B,QAA0C;QAE1C,IAAI,SAAS,KAAK,QAAQ,EAAE,CAAC;YAC3B,OAAO,MAAM,IAAI,CAAC,uBAAuB,CACvC,OAAO,EACP,QAA4B,CAC7B,CAAA;QACH,CAAC;aAAM,IAAI,SAAS,KAAK,QAAQ,EAAE,CAAC;YAClC,OAAO,MAAM,IAAI,CAAC,qBAAqB,CACrC,OAAsC,EACtC,QAAyB,CAC1B,CAAA;QACH,CAAC;aAAM,CAAC;YACN,MAAM,UAAU,CAAC,IAAI,KAAK,CAAC,0BAA0B,SAAS,EAAE,CAAC,CAAC,CAAA;QACpE,CAAC;IACH,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,kBAAkB,CACtB,QAA0B,EAC1B,IAAY,EACZ,OAAe;QAEf,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;IAC5E,CAAC;CACF"}
+{"version":3,"file":"transaction-service.js","sourceRoot":"","sources":["../../src/services/transaction-service.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,0BAA0B,EAAE,MAAM,yCAAyC,CAAA;AACpF,OAAO,EAAE,wBAAwB,EAAE,MAAM,qCAAqC,CAAA;AAC9E,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD;;GAEG;AACH,MAAM,OAAO,kBAAkB;IACrB,eAAe,CAA4B;IAC3C,aAAa,CAA0B;IAE/C,YAAY,gBAA+B,EAAE;QAC3C,IAAI,CAAC,eAAe,GAAG,IAAI,0BAA0B,EAAE,CAAA;QACvD,IAAI,CAAC,aAAa,GAAG,IAAI,wBAAwB,CAAC,aAAa,CAAC,CAAA;IAClE,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,eAAe,CACnB,OAA2B,EAC3B,SAA8B,EAC9B,QAA0C;QAE1C,IAAI,SAAS,KAAK,QAAQ,EAAE,CAAC;YAC3B,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,eAAe,CAC/C,OAAqC,EACrC,QAA4B,CAC7B,CAAA;QACH,CAAC;aAAM,IAAI,SAAS,KAAK,QAAQ,EAAE,CAAC;YAClC,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,eAAe,CAC7C,OAAmC,EACnC,QAAyB,CAC1B,CAAA;QACH,CAAC;aAAM,CAAC;YACN,MAAM,UAAU,CAAC,IAAI,KAAK,CAAC,0BAA0B,SAAS,EAAE,CAAC,CAAC,CAAA;QACpE,CAAC;IACH,CAAC;CACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meshconnect/uwc-injected-connector",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Injected connector for Universal Wallet Connector",
   "type": "module",
   "main": "dist/index.js",
@@ -16,6 +16,7 @@
     "src"
   ],
   "dependencies": {
+    "@solana/spl-token": "^0.4.13",
     "@solana/wallet-adapter-base": "^0.9.23",
     "@solana/wallet-adapter-wallets": "^0.19.37",
     "@solana/wallet-standard-wallet-adapter-base": "^1.1.2",
@@ -23,8 +24,9 @@
     "@wallet-standard/app": "^1.1.0",
     "@wallet-standard/base": "^1.1.0",
     "bs58": "^6.0.0",
+    "buffer": "^6.0.3",
     "ethers": "^6.15.0",
-    "@meshconnect/uwc-types": "0.2.0"
+    "@meshconnect/uwc-types": "0.2.1"
   },
   "devDependencies": {
     "typescript": "^5.9.2"

package/src/injected-connector.ts

@@ -10,11 +10,12 @@ import type {
   DetectedSolanaWalletInfo,
   TransactionRequest,
   TransactionResult,
-  NetworkRpcMap
+  NetworkRpcMap,
+  EVMCapabilities
 } from '@meshconnect/uwc-types'
 
-import { EthereumWalletService } from './services/ethereum-wallet-service'
-import { SolanaWalletService } from './services/solana-wallet-service'
+import { EthereumWalletService } from './services/ethereum/ethereum-wallet-service'
+import { SolanaWalletService } from './services/solana/solana-wallet-service'
 import { StorageService } from './services/storage-service'
 import { ConnectionManager } from './services/connection-manager'
 import { SignatureService } from './services/signature-service'
@@ -262,4 +263,13 @@ export class InjectedConnector implements Connector {
       throw new Error(`Transactions not supported for namespace: ${namespace}`)
     }
   }
+
+  /**
+   * Get EVM wallet capabilities
+   */
+  async getWalletCapabilities(
+    from: string
+  ): Promise<Record<string, EVMCapabilities>> {
+    return await this.ethereumService.getCapabilities(from)
+  }
 }

package/src/services/connection-manager.ts

@@ -6,8 +6,8 @@ import type {
   SwitchNetworkResult,
   AvailableAddress
 } from '@meshconnect/uwc-types'
-import { EthereumWalletService } from './ethereum-wallet-service'
-import { SolanaWalletService } from './solana-wallet-service'
+import { EthereumWalletService } from './ethereum/ethereum-wallet-service'
+import { SolanaWalletService } from './solana/solana-wallet-service'
 import { parseError } from '../utils/error-utils'
 
 /**

package/src/services/ethereum/ethereum-transaction-builder.ts

@@ -0,0 +1,82 @@
+import { ethers } from 'ethers'
+import type {
+  EVMGasConfig,
+  EVMNativeTransferRequest,
+  EVMContractCallRequest
+} from '@meshconnect/uwc-types'
+import { parseError } from '../../utils/error-utils'
+import type { TransactionRequest } from 'ethers'
+
+/**
+ * Service for handling Ethereum/EVM transaction operations
+ */
+export class EthereumTransactionBuilder {
+  async getContractTransaction(
+    request: EVMContractCallRequest
+  ): Promise<TransactionRequest> {
+    try {
+      // Build transaction options
+      const txOptions: ethers.Overrides = {
+        ...this.formatGasConfig(request.gasConfig)
+      }
+
+      // Add value for payable functions
+      if (request.value) {
+        txOptions.value = request.value
+      }
+
+      const iface = new ethers.Interface(request.abi)
+
+      const data = iface.encodeFunctionData(
+        request.functionName,
+        request.args || []
+      )
+
+      const txRequest: TransactionRequest = {
+        to: request.contractAddress,
+        data,
+        value: request.value ?? 0n,
+        ...txOptions
+      }
+
+      return txRequest
+    } catch (error) {
+      parseError(error)
+    }
+  }
+
+  async getNativeTransaction(
+    request: EVMNativeTransferRequest
+  ): Promise<TransactionRequest> {
+    try {
+      return {
+        to: request.to,
+        value: request.amount,
+        ...this.formatGasConfig(request.gasConfig)
+      }
+    } catch (error) {
+      parseError(error)
+    }
+  }
+
+  /**
+   * Helper to format gas configuration for ethers
+   */
+  private formatGasConfig(gasConfig?: EVMGasConfig): ethers.Overrides {
+    const txOptions: ethers.Overrides = {}
+
+    if (gasConfig?.gasLimit) {
+      txOptions.gasLimit = BigInt(Math.floor(gasConfig.gasLimit))
+    }
+    if (gasConfig?.maxFeePerGas) {
+      txOptions.maxFeePerGas = BigInt(Math.floor(gasConfig.maxFeePerGas))
+    }
+    if (gasConfig?.maxPriorityFeePerGas) {
+      txOptions.maxPriorityFeePerGas = BigInt(
+        Math.floor(gasConfig.maxPriorityFeePerGas)
+      )
+    }
+
+    return txOptions
+  }
+}