Merge pull request #36 from terrancrypt/fix/send

Fix/send

Author: terranweb3

src/background/handlers/account-handler.ts

@@ -36,6 +36,50 @@ export const accountHandler = {
     }
   },
 
+  // Validate private key without importing
+  async validatePrivateKey(data: {
+    privateKey: string;
+    chain: ChainType;
+  }): Promise<{ isValid: boolean; address: string }> {
+    try {
+      if (!data.privateKey || typeof data.privateKey !== 'string') {
+        return { isValid: false, address: '' };
+      }
+
+      let walletKeys: any;
+      let isValid = false;
+
+      // Validate private key based on chain type
+      if (data.chain === 'eip155') {
+        isValid = evmWalletKeyUtils.isValidPrivateKey(data.privateKey);
+        if (isValid) {
+          walletKeys = evmWalletKeyUtils.fromPrivateKey(data.privateKey);
+        }
+      } else if (data.chain === 'solana') {
+        isValid = solanaWalletKeyUtils.isValidPrivateKey(data.privateKey);
+        if (isValid) {
+          walletKeys = solanaWalletKeyUtils.fromPrivateKey(data.privateKey);
+        }
+      } else if (data.chain === 'sui') {
+        isValid = suiWalletKeyUtils.isValidPrivateKey(data.privateKey);
+        if (isValid) {
+          walletKeys = suiWalletKeyUtils.fromPrivateKey(data.privateKey);
+        }
+      } else {
+        return { isValid: false, address: '' };
+      }
+
+      if (isValid && walletKeys) {
+        return { isValid: true, address: walletKeys.address };
+      } else {
+        return { isValid: false, address: '' };
+      }
+    } catch (error) {
+      console.error('Private key validation error:', error);
+      return { isValid: false, address: '' };
+    }
+  },
+
   async isPrivateKeyAlreadyImported(privateKey: string): Promise<boolean> {
     try {
       // Validate input

src/background/handlers/evm-rpc-handler.ts

@@ -78,6 +78,14 @@ const createSuccessResponse = (data: any): MessageResponse => {
   };
 };
 
+// Helper function to parse chainId from string to number
+const parseChainId = (chainId: string): number => {
+  // Handle both hex (0x...) and decimal string formats
+  return chainId.startsWith('0x')
+    ? parseInt(chainId, 16)
+    : parseInt(chainId, 10);
+};
+
 // Helper function to create error response
 const createErrorResponse = (error: string, code?: number): MessageResponse => {
   return {
@@ -104,7 +112,7 @@ export const evmRpcHandler = {
       // Convert chainId to number if it's a string
       let targetChainId: number;
       if (typeof chainId === 'string') {
-        targetChainId = parseInt(chainId, 10);
+        targetChainId = parseChainId(chainId);
         if (isNaN(targetChainId)) {
           return createErrorResponse(`Invalid chainId: ${chainId}`, 4001);
         }
@@ -144,7 +152,7 @@ export const evmRpcHandler = {
       // Convert chainId to number if it's a string
       let targetChainId: number;
       if (typeof chainId === 'string') {
-        targetChainId = parseInt(chainId, 10);
+        targetChainId = parseChainId(chainId);
         if (isNaN(targetChainId)) {
           return createErrorResponse(`Invalid chainId: ${chainId}`, 4001);
         }
@@ -177,7 +185,7 @@ export const evmRpcHandler = {
       // Convert chainId to number if it's a string
       let targetChainId: number;
       if (typeof chainId === 'string') {
-        targetChainId = parseInt(chainId, 10);
+        targetChainId = parseChainId(chainId);
         if (isNaN(targetChainId)) {
           return createErrorResponse(`Invalid chainId: ${chainId}`, 4001);
         }
@@ -219,7 +227,10 @@ export const evmRpcHandler = {
       // Convert chainId to number if it's a string
       let targetChainId: number;
       if (typeof chainId === 'string') {
-        targetChainId = parseInt(chainId, 10);
+        // Handle both hex (0x...) and decimal string formats
+        targetChainId = chainId.startsWith('0x')
+          ? parseInt(chainId, 16)
+          : parseChainId(chainId);
         if (isNaN(targetChainId)) {
           return createErrorResponse(`Invalid chainId: ${chainId}`, 4001);
         }
@@ -252,7 +263,10 @@ export const evmRpcHandler = {
       // Convert chainId to number if it's a string
       let targetChainId: number;
       if (typeof chainId === 'string') {
-        targetChainId = parseInt(chainId, 10);
+        // Handle both hex (0x...) and decimal string formats
+        targetChainId = chainId.startsWith('0x')
+          ? parseInt(chainId, 16)
+          : parseChainId(chainId);
         if (isNaN(targetChainId)) {
           return createErrorResponse(`Invalid chainId: ${chainId}`, 4001);
         }
@@ -287,7 +301,7 @@ export const evmRpcHandler = {
       // Convert chainId to number if it's a string
       let targetChainId: number;
       if (typeof chainId === 'string') {
-        targetChainId = parseInt(chainId, 10);
+        targetChainId = parseChainId(chainId);
         if (isNaN(targetChainId)) {
           return createErrorResponse(`Invalid chainId: ${chainId}`, 4001);
         }
@@ -326,7 +340,7 @@ export const evmRpcHandler = {
       // Convert chainId to number if it's a string
       let targetChainId: number;
       if (typeof chainId === 'string') {
-        targetChainId = parseInt(chainId, 10);
+        targetChainId = parseChainId(chainId);
         if (isNaN(targetChainId)) {
           return createErrorResponse(`Invalid chainId: ${chainId}`, 4001);
         }

src/background/message-handler.ts

@@ -125,6 +125,9 @@ export class MessageHandler {
             data.accountName
           );
           break;
+        case 'VALIDATE_PRIVATE_KEY':
+          result = await accountHandler.validatePrivateKey(data);
+          break;
         case 'IS_WATCH_ONLY_ADDRESS_EXISTS':
           result = await accountHandler.isWalletAddressExists(data.address);
           break;