@meshconnect/uwc-wallet-connect-connector 0.2.1 → 0.2.2

package/dist/services/transaction-service.js

@@ -1,24 +1,20 @@
-import { ethers } from 'ethers';
-import { Buffer } from 'buffer';
-import { Connection, PublicKey, Transaction, VersionedTransaction } from '@solana/web3.js';
 import { WalletConnectClient } from './walletconnect-client';
 import { ConnectionService } from './connection-service';
-import { getChainIdFromNetworkId } from '../utils/account-utils';
-import { parseError } from '../utils/error-utils';
-import { getSolanaTransaction } from '../utils/solana-transactions';
-import base58 from 'bs58';
-import { standardizeSignature } from '../utils/encoding-utils';
+import { EthereumTransactionService } from './ethereum/ethereum-transaction-service';
+import { SolanaTransactionService } from './solana/solana-transaction-service';
 /**
  * Service for handling transactions in WalletConnect
  */
 export class TransactionService {
     walletConnectClient;
     connectionService;
-    networkRpcMap;
+    ethereumService;
+    solanaService;
     constructor(walletConnectClient, connectionService, networkRpcMap = {}) {
         this.walletConnectClient = walletConnectClient;
         this.connectionService = connectionService;
-        this.networkRpcMap = networkRpcMap;
+        this.ethereumService = new EthereumTransactionService();
+        this.solanaService = new SolanaTransactionService(networkRpcMap);
     }
     /**
      * Send a transaction with the connected wallet
@@ -40,248 +36,14 @@ export class TransactionService {
         // Determine namespace from network ID
         const namespace = activeNetwork.id.split(':')[0];
         if (namespace === 'eip155') {
-            return this.sendEthereumTransaction(client, session, request, activeNetwork.id, activeAddress);
+            return this.ethereumService.sendTransaction(client, session, request, activeNetwork.id);
         }
         else if (namespace === 'solana') {
-            return this.sendSolanaTransaction(client, session, request, activeNetwork.id, activeAddress);
+            return this.solanaService.sendTransaction(client, session, request, activeNetwork.id, activeAddress);
         }
         else {
             throw new Error(`Unsupported namespace: ${namespace}`);
         }
     }
-    /**
-     * Send an Ethereum transaction
-     */
-    async sendEthereumTransaction(client, session, request, activeNetworkId, activeAddress) {
-        try {
-            // Handle different types of EVM transactions
-            if ('contractAddress' in request && 'abi' in request) {
-                // Contract call
-                return await this.sendContractCall(client, session, request, activeNetworkId, activeAddress);
-            }
-            else if ('calls' in request) {
-                // Batch transaction - not yet supported
-                throw new Error('Batch transactions are not yet supported for WalletConnect');
-            }
-            else if ('amount' in request && typeof request.amount === 'bigint') {
-                // Native transfer
-                return await this.sendNativeTransfer(client, session, request, activeNetworkId, activeAddress);
-            }
-            else {
-                throw new Error('Invalid transaction request type');
-            }
-        }
-        catch (error) {
-            throw parseError(error);
-        }
-    }
-    /**
-     * Send a Solana transaction
-     */
-    async sendSolanaTransaction(client, session, request, activeNetworkId, activeAddress) {
-        try {
-            // Verify the from address matches active address
-            if (request.from !== activeAddress) {
-                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 the transaction using the utility function
-            let transaction = getSolanaTransaction(request);
-            // Serialize the transaction for WalletConnect
-            const serializedTransaction = transaction
-                .serialize({
-                verifySignatures: false
-            })
-                .toString('base64');
-            // Get the chain ID (e.g., "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp" for mainnet)
-            const chainId = activeNetworkId;
-            try {
-                // First try signAndSendTransaction (preferred method)
-                const result = await client.request({
-                    topic: session.topic,
-                    chainId,
-                    request: {
-                        method: 'solana_signAndSendTransaction',
-                        params: {
-                            transaction: serializedTransaction
-                        }
-                    }
-                });
-                // WalletConnect returns the signature directly for Solana
-                return result;
-            }
-            catch (signAndSendError) {
-                const errorMessage = signAndSendError instanceof Error
-                    ? signAndSendError.message
-                    : String(signAndSendError);
-                // If signAndSendTransaction is not supported, fallback to signTransaction
-                if (errorMessage.includes('solana_signAndSendTransaction') ||
-                    errorMessage.includes('Missing or invalid')) {
-                    // Sign the transaction only
-                    const result = await client.request({
-                        topic: session.topic,
-                        chainId,
-                        request: {
-                            method: 'solana_signTransaction',
-                            params: {
-                                transaction: serializedTransaction
-                            }
-                        }
-                    });
-                    if ('signature' in result) {
-                        const decoded = base58.decode(result.signature);
-                        transaction.addSignature(new PublicKey(request.from), Buffer.from(decoded));
-                    }
-                    if ('transaction' in result) {
-                        const decodedTransaction = Buffer.from(result.transaction, 'base64');
-                        if (transaction instanceof VersionedTransaction) {
-                            transaction = VersionedTransaction.deserialize(new Uint8Array(decodedTransaction));
-                        }
-                        else {
-                            transaction = Transaction.from(decodedTransaction);
-                        }
-                    }
-                    // Get RPC URL from the network RPC map or fall back to public endpoint
-                    const rpcUrl = this.networkRpcMap[activeNetworkId] ||
-                        'https://api.mainnet-beta.solana.com';
-                    const connection = new Connection(rpcUrl);
-                    const rawSignature = await connection.sendRawTransaction(transaction.serialize(), {
-                        skipPreflight: false,
-                        maxRetries: 3,
-                        preflightCommitment: 'confirmed'
-                    });
-                    return standardizeSignature(rawSignature);
-                }
-                // If it's a different error, throw it
-                throw signAndSendError;
-            }
-        }
-        catch (error) {
-            throw parseError(error);
-        }
-    }
-    /**
-     * Send native token transfer (ETH, BNB, MATIC, etc.)
-     */
-    async sendNativeTransfer(client, session, request, activeNetworkId, activeAddress) {
-        try {
-            // Use the active network chainId
-            const chainId = getChainIdFromNetworkId(activeNetworkId);
-            // Build transaction using ethers
-            const tx = {
-                from: request.from || activeAddress,
-                to: request.to,
-                value: request.amount
-            };
-            // Add gas configuration if provided
-            if (request.gasConfig?.gasLimit) {
-                tx.gasLimit = BigInt(Math.floor(request.gasConfig.gasLimit));
-            }
-            if (request.gasConfig?.maxFeePerGas) {
-                tx.maxFeePerGas = BigInt(Math.floor(request.gasConfig.maxFeePerGas));
-            }
-            if (request.gasConfig?.maxPriorityFeePerGas) {
-                tx.maxPriorityFeePerGas = BigInt(Math.floor(request.gasConfig.maxPriorityFeePerGas));
-            }
-            // Convert to hex format for WalletConnect
-            const txParams = {
-                from: tx.from,
-                to: tx.to,
-                value: '0x' + (tx.value ? BigInt(tx.value).toString(16) : '0'),
-                data: '0x' // Empty data for native transfers
-            };
-            // Add gas params if present
-            if (tx.gasLimit) {
-                txParams['gasLimit'] = '0x' + tx.gasLimit.toString(16);
-            }
-            if (tx.maxFeePerGas) {
-                txParams['maxFeePerGas'] = '0x' + tx.maxFeePerGas.toString(16);
-            }
-            if (tx.maxPriorityFeePerGas) {
-                txParams['maxPriorityFeePerGas'] =
-                    '0x' + tx.maxPriorityFeePerGas.toString(16);
-            }
-            const hash = await client.request({
-                topic: session.topic,
-                chainId: `eip155:${chainId}`,
-                request: {
-                    method: 'eth_sendTransaction',
-                    params: [txParams]
-                }
-            });
-            return hash;
-        }
-        catch (error) {
-            throw parseError(error);
-        }
-    }
-    /**
-     * Send smart contract transaction (including ERC-20 transfers)
-     */
-    async sendContractCall(client, session, request, activeNetworkId, activeAddress) {
-        try {
-            // Use the active network chainId
-            const chainId = getChainIdFromNetworkId(activeNetworkId);
-            // Encode the contract call data using ethers
-            const iface = new ethers.Interface(request.abi);
-            const data = iface.encodeFunctionData(request.functionName, request.args);
-            // Build transaction using ethers
-            const tx = {
-                from: request.from || activeAddress,
-                to: request.contractAddress,
-                data
-            };
-            // Add value for payable functions
-            if (request.value) {
-                tx.value = BigInt(request.value);
-            }
-            // Add gas configuration if provided
-            if (request.gasConfig?.gasLimit) {
-                tx.gasLimit = BigInt(Math.floor(request.gasConfig.gasLimit));
-            }
-            if (request.gasConfig?.maxFeePerGas) {
-                tx.maxFeePerGas = BigInt(Math.floor(request.gasConfig.maxFeePerGas));
-            }
-            if (request.gasConfig?.maxPriorityFeePerGas) {
-                tx.maxPriorityFeePerGas = BigInt(Math.floor(request.gasConfig.maxPriorityFeePerGas));
-            }
-            // Convert to hex format for WalletConnect
-            const txParams = {
-                from: tx.from,
-                to: tx.to,
-                data: tx.data
-            };
-            // Add value if present
-            if (tx.value) {
-                txParams['value'] = '0x' + BigInt(tx.value).toString(16);
-            }
-            // Add gas params if present
-            if (tx.gasLimit) {
-                txParams['gasLimit'] = '0x' + tx.gasLimit.toString(16);
-            }
-            if (tx.maxFeePerGas) {
-                txParams['maxFeePerGas'] = '0x' + tx.maxFeePerGas.toString(16);
-            }
-            if (tx.maxPriorityFeePerGas) {
-                txParams['maxPriorityFeePerGas'] =
-                    '0x' + tx.maxPriorityFeePerGas.toString(16);
-            }
-            const hash = await client.request({
-                topic: session.topic,
-                chainId: `eip155:${chainId}`,
-                request: {
-                    method: 'eth_sendTransaction',
-                    params: [txParams]
-                }
-            });
-            return hash;
-        }
-        catch (error) {
-            throw parseError(error);
-        }
-    }
 }
 //# 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":"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"}
+{"version":3,"file":"transaction-service.js","sourceRoot":"","sources":["../../src/services/transaction-service.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AACxD,OAAO,EAAE,0BAA0B,EAAE,MAAM,yCAAyC,CAAA;AACpF,OAAO,EAAE,wBAAwB,EAAE,MAAM,qCAAqC,CAAA;AAE9E;;GAEG;AACH,MAAM,OAAO,kBAAkB;IAKnB;IACA;IALF,eAAe,CAA4B;IAC3C,aAAa,CAA0B;IAE/C,YACU,mBAAwC,EACxC,iBAAoC,EAC5C,gBAA+B,EAAE;QAFzB,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,sBAAiB,GAAjB,iBAAiB,CAAmB;QAG5C,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;QAE3B,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE,CAAA;QACnD,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAA;QAC7D,CAAC;QAED,MAAM,aAAa,GAAG,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,EAAE,CAAA;QAC/D,MAAM,aAAa,GAAG,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,EAAE,CAAA;QAE/D,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAA;QAC7D,CAAC;QAED,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAA;QAC7D,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,SAAS,EAAE,CAAA;QAEzD,sCAAsC;QACtC,MAAM,SAAS,GAAG,aAAa,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;QAEhD,IAAI,SAAS,KAAK,QAAQ,EAAE,CAAC;YAC3B,OAAO,IAAI,CAAC,eAAe,CAAC,eAAe,CACzC,MAAM,EACN,OAAO,EACP,OAAqC,EACrC,aAAa,CAAC,EAAE,CACjB,CAAA;QACH,CAAC;aAAM,IAAI,SAAS,KAAK,QAAQ,EAAE,CAAC;YAClC,OAAO,IAAI,CAAC,aAAa,CAAC,eAAe,CACvC,MAAM,EACN,OAAO,EACP,OAAmC,EACnC,aAAa,CAAC,EAAE,EAChB,aAAa,CACd,CAAA;QACH,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CAAC,0BAA0B,SAAS,EAAE,CAAC,CAAA;QACxD,CAAC;IACH,CAAC;CACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meshconnect/uwc-wallet-connect-connector",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "WalletConnect connector for Universal Wallet Connector",
   "type": "module",
   "main": "dist/index.js",
@@ -16,6 +16,7 @@
     "src"
   ],
   "dependencies": {
+    "@solana/spl-token": "^0.4.13",
     "@solana/web3.js": "^1.98.4",
     "@walletconnect/sign-client": "^2.21.8",
     "@walletconnect/types": "^2.21.8",
@@ -23,7 +24,7 @@
     "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/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
+  }
+}

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

@@ -0,0 +1,152 @@
+import type {
+  EthereumTransactionRequest,
+  EVMContractCallRequest,
+  EVMNativeTransferRequest,
+  NetworkId
+} from '@meshconnect/uwc-types'
+import type SignClient from '@walletconnect/sign-client'
+import type { SessionTypes } from '@walletconnect/types'
+import { getChainIdFromNetworkId } from '../../utils/account-utils'
+import { parseError } from '../../utils/error-utils'
+import { EthereumTransactionBuilder } from './ethereum-transaction-builder'
+import type { TransactionRequest } from 'ethers'
+
+export class EthereumTransactionService {
+  private builder: EthereumTransactionBuilder
+  constructor() {
+    this.builder = new EthereumTransactionBuilder()
+  }
+  /**
+   * Send an Ethereum transaction
+   */
+  async sendTransaction(
+    client: SignClient,
+    session: SessionTypes.Struct,
+    request: EthereumTransactionRequest,
+    activeNetworkId: string
+  ): Promise<string> {
+    try {
+      // Handle different types of EVM transactions
+      if ('contractAddress' in request && 'abi' in request) {
+        // Contract call
+        return await this.sendContractCall(
+          client,
+          session,
+          request as EVMContractCallRequest,
+          activeNetworkId
+        )
+      } else if ('calls' in request) {
+        // Batch transaction - not yet supported
+        throw new Error(
+          'Batch transactions are not yet supported for WalletConnect'
+        )
+      } else if ('amount' in request && typeof request.amount === 'bigint') {
+        // Native transfer
+        return await this.sendNativeTransaction(
+          client,
+          session,
+          request as EVMNativeTransferRequest,
+          activeNetworkId
+        )
+      } else {
+        throw new Error('Invalid transaction request type')
+      }
+    } catch (error) {
+      throw parseError(error)
+    }
+  }
+
+  /**
+   * Send native token transfer (ETH, BNB, MATIC, etc.)
+   */
+  private async sendNativeTransaction(
+    client: SignClient,
+    session: SessionTypes.Struct,
+    request: EVMNativeTransferRequest,
+    activeNetworkId: string
+  ): Promise<string> {
+    try {
+      // Use the active network chainId
+      const chainId = getChainIdFromNetworkId(activeNetworkId as NetworkId)
+
+      const params = this.parseTransaction(
+        await this.builder.getNativeTransaction(request)
+      )
+
+      const hash = await client.request({
+        topic: session.topic,
+        chainId: `eip155:${chainId}`,
+        request: {
+          method: 'eth_sendTransaction',
+          params: [params]
+        }
+      })
+
+      return hash as string
+    } catch (error) {
+      throw parseError(error)
+    }
+  }
+
+  /**
+   * Send smart contract transaction (including ERC-20 transfers)
+   */
+  private async sendContractCall(
+    client: SignClient,
+    session: SessionTypes.Struct,
+    request: EVMContractCallRequest,
+    activeNetworkId: string
+  ): Promise<string> {
+    try {
+      // Use the active network chainId
+      const chainId = getChainIdFromNetworkId(activeNetworkId as NetworkId)
+
+      const params = this.parseTransaction(
+        await this.builder.getContractTransaction(request)
+      )
+
+      const hash = await client.request({
+        topic: session.topic,
+        chainId: `eip155:${chainId}`,
+        request: {
+          method: 'eth_sendTransaction',
+          params: [params]
+        }
+      })
+
+      return hash as string
+    } catch (error) {
+      throw parseError(error)
+    }
+  }
+
+  private parseTransaction(tx: TransactionRequest): Record<string, string> {
+    // Convert to hex format for WalletConnect
+    const txParams: Record<string, string> = {
+      from: tx.from as string,
+      to: tx.to as string,
+      data: (tx.data ?? '0x') as string
+    }
+
+    // Add value if present
+    if (tx.value) {
+      txParams['value'] = '0x' + BigInt(tx.value).toString(16)
+    } else {
+      txParams['value'] = '0x'
+    }
+
+    // Add gas params if present
+    if (tx.gasLimit) {
+      txParams['gasLimit'] = '0x' + tx.gasLimit.toString(16)
+    }
+    if (tx.maxFeePerGas) {
+      txParams['maxFeePerGas'] = '0x' + tx.maxFeePerGas.toString(16)
+    }
+    if (tx.maxPriorityFeePerGas) {
+      txParams['maxPriorityFeePerGas'] =
+        '0x' + tx.maxPriorityFeePerGas.toString(16)
+    }
+
+    return txParams
+  }
+}