remove solana-program from clap-v3-utils (#4364)

Cargo.lock

@@ -6485,15 +6485,16 @@ dependencies = [
  "solana-derivation-path",
  "solana-hash",
  "solana-keypair",
+ "solana-message",
  "solana-native-token",
  "solana-presigner",
- "solana-program",
  "solana-pubkey",
  "solana-remote-wallet",
  "solana-seed-derivable",
  "solana-seed-phrase",
  "solana-signature",
  "solana-signer",
+ "solana-system-interface",
  "solana-zk-token-sdk",
  "tempfile",
  "thiserror 2.0.9",

clap-v3-utils/Cargo.toml

@@ -17,11 +17,12 @@ solana-clock = { workspace = true }
 solana-cluster-type = { workspace = true }
 solana-commitment-config = { workspace = true }
 solana-derivation-path = { workspace = true }
-solana-hash = { workspace = true }
+# the borsh feature is required to use the value_parser macro
+solana-hash = { workspace = true, features = ["borsh"] }
 solana-keypair = { workspace = true, features = ["seed-derivable"] }
+solana-message = { workspace = true }
 solana-native-token = { workspace = true }
 solana-presigner = { workspace = true }
-solana-program = { workspace = true }
 solana-pubkey = { workspace = true }
 solana-remote-wallet = { workspace = true, features = ["default"] }
 solana-seed-derivable = { workspace = true }
@@ -37,6 +38,7 @@ url = { workspace = true }
 [dev-dependencies]
 assert_matches = { workspace = true }
 solana-pubkey = { workspace = true, features = ["rand"] }
+solana-system-interface = { workspace = true, features = ["bincode"] }
 tempfile = { workspace = true }
 
 [lib]

clap-v3-utils/src/keypair.rs

@@ -21,8 +21,8 @@ use {
     solana_derivation_path::DerivationPath,
     solana_hash::Hash,
     solana_keypair::{read_keypair, read_keypair_file, Keypair},
+    solana_message::Message,
     solana_presigner::Presigner,
-    solana_program::message::Message,
     solana_pubkey::Pubkey,
     solana_remote_wallet::{
         remote_keypair::generate_remote_keypair,
@@ -1211,8 +1211,8 @@ mod tests {
         crate::offline::OfflineArgs,
         clap::{Arg, Command},
         solana_keypair::write_keypair_file,
-        solana_program::system_instruction,
         solana_remote_wallet::remote_wallet::initialize_wallet_manager,
+        solana_system_interface::instruction::transfer,
         tempfile::TempDir,
     };
 
@@ -1233,11 +1233,7 @@ mod tests {
         let nonsigner2 = Keypair::new();
         let recipient = Pubkey::new_unique();
         let message = Message::new(
-            &[system_instruction::transfer(
-                &source.pubkey(),
-                &recipient,
-                42,
-            )],
+            &[transfer(&source.pubkey(), &recipient, 42)],
             Some(&fee_payer.pubkey()),
         );
         let signers = vec![