Address code review feedback - Add constants and fix Cargo.lock

Co-authored-by: 0xrinegade <[email protected]>

Author: Copilot

.gitignore

@@ -1,6 +1,5 @@
 # Rust build artifacts
 /target/
-Cargo.lock
 
 # IDE files
 .vscode/

src/key_validator.rs

@@ -4,6 +4,10 @@ use std::fs;
 use std::fs::File;
 use std::io;
 
+// Solana keypair constants
+const KEYPAIR_BYTES: usize = 64; // Full keypair: 32 bytes secret + 32 bytes public
+const SECRET_KEY_BYTES: usize = 32; // Just the secret key portion
+
 /// Validates if the content of a given JSON file represents a Solana private key.
 /// A Solana private key is typically represented as a JSON array of 64 u8 values.
 pub fn is_solana_wallet_json_file(file_path: &str) -> io::Result<bool> {
@@ -15,8 +19,8 @@ pub fn is_solana_wallet_json_file(file_path: &str) -> io::Result<bool> {
     match parsed_json {
         Ok(Value::Array(arr)) => {
             // Check if the array contains 64 numbers (u8 values for a private key)
-            if arr.len() == 64 {
-                let mut key_bytes: Vec<u8> = Vec::with_capacity(64);
+            if arr.len() == KEYPAIR_BYTES {
+                let mut key_bytes: Vec<u8> = Vec::with_capacity(KEYPAIR_BYTES);
                 for val in arr {
                     if let Value::Number(num) = val {
                         if let Some(byte_val) = num.as_u64() {
@@ -35,8 +39,8 @@ pub fn is_solana_wallet_json_file(file_path: &str) -> io::Result<bool> {
                 // If we successfully collected 64 bytes, try to create a Keypair from it.
                 // This is the definitive check for a valid Solana secret key.
                 // new_from_array expects only the 32-byte secret key
-                let mut secret_key = [0u8; 32];
-                secret_key.copy_from_slice(&key_bytes[0..32]);
+                let mut secret_key = [0u8; SECRET_KEY_BYTES];
+                secret_key.copy_from_slice(&key_bytes[0..SECRET_KEY_BYTES]);
                 let _keypair = Keypair::new_from_array(secret_key);
                 // Successfully created a keypair, this is a valid Solana secret key
                 Ok(true)

src/tui.rs

@@ -24,6 +24,9 @@ use crate::secure_storage;
 use crate::wallet_manager; // To interact with wallet data
 use crate::vanity_wallet::{self, VanityConfig, VanityStatus}; // For vanity wallet creation
 
+// Solana keypair constants
+const SECRET_KEY_BYTES: usize = 32; // Just the secret key portion
+
 // Define different views for the TUI
 enum View {
     WalletList,
@@ -346,7 +349,6 @@ impl App {
 
         // Start vanity wallet generation in a separate thread
         let vanity_config = self.vanity_config.clone();
-        let _cancelled = Arc::clone(&self.vanity_cancelled);
         let result = Arc::clone(&self.vanity_result);
 
         let handle = thread::spawn(move || {
@@ -395,8 +397,8 @@ impl App {
 
                     // Reconstruct the keypair from bytes
                     // new_from_array expects only the 32-byte secret key
-                    let mut secret_key = [0u8; 32];
-                    secret_key.copy_from_slice(&keypair_bytes[0..32]);
+                    let mut secret_key = [0u8; SECRET_KEY_BYTES];
+                    secret_key.copy_from_slice(&keypair_bytes[0..SECRET_KEY_BYTES]);
                     let keypair_copy = solana_sdk::signer::keypair::Keypair::new_from_array(secret_key);
                     self.save_vanity_wallet(&keypair_copy);
                 }

src/wallet_manager.rs

@@ -6,6 +6,10 @@ use std::fs;
 use std::io::{self, Error, ErrorKind};
 use std::path::Path; // To validate a key from a file before adding
 
+// Solana keypair constants
+const KEYPAIR_BYTES: usize = 64; // Full keypair: 32 bytes secret + 32 bytes public
+const SECRET_KEY_BYTES: usize = 32; // Just the secret key portion
+
 /// Adds a new wallet by reading a private key from a JSON file and storing it securely.
 /// The wallet will be stored under the given `wallet_name`.
 pub fn add_wallet_from_file(wallet_name: &str, key_file_path: &str) -> io::Result<()> {
@@ -162,14 +166,14 @@ pub fn get_wallet_keypair(
         Some(key_bytes) => {
             // new_from_array expects only the 32-byte secret key, not the full 64-byte keypair
             // Convert Vec<u8> to [u8; 32] array
-            if key_bytes.len() != 64 {
+            if key_bytes.len() != KEYPAIR_BYTES {
                 return Err(io::Error::new(
                     io::ErrorKind::InvalidData,
-                    format!("Invalid key length: expected 64 bytes, got {}", key_bytes.len())
+                    format!("Invalid key length: expected {} bytes, got {}", KEYPAIR_BYTES, key_bytes.len())
                 ));
             }
-            let mut secret_key = [0u8; 32];
-            secret_key.copy_from_slice(&key_bytes[0..32]);
+            let mut secret_key = [0u8; SECRET_KEY_BYTES];
+            secret_key.copy_from_slice(&key_bytes[0..SECRET_KEY_BYTES]);
             let keypair = solana_sdk::signer::keypair::Keypair::new_from_array(secret_key);
             Ok(Some(keypair))
         }