From 35750a37ba7e88b235ad090c9e44834b39360041 Mon Sep 17 00:00:00 2001
From: Jon C <me@jonc.dev>
Date: Fri, 1 Nov 2024 14:10:42 +0100
Subject: [PATCH] associated-token-account-client: Remove solana-program
 (#7443)

#### Problem

The ATA client crate still uses solana-program, but it doesn't need it.

#### Summary of changes

Remove its usage, but it's still needed in dev-dependencies until the
system program client has been extracted.
---
 Cargo.lock                                    |  2 ++
 associated-token-account/client/Cargo.toml    |  4 ++++
 .../client/src/address.rs                     |  4 ++--
 .../client/src/instruction.rs                 | 21 +++++++++++++------
 associated-token-account/client/src/lib.rs    |  2 +-
 5 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5a0d77ae88f..6595b167b52 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7781,7 +7781,9 @@ dependencies = [
 name = "spl-associated-token-account-client"
 version = "1.0.0"
 dependencies = [
+ "solana-instruction",
  "solana-program",
+ "solana-pubkey",
 ]
 
 [[package]]
diff --git a/associated-token-account/client/Cargo.toml b/associated-token-account/client/Cargo.toml
index 8873f66d7ba..88770072af1 100644
--- a/associated-token-account/client/Cargo.toml
+++ b/associated-token-account/client/Cargo.toml
@@ -8,6 +8,10 @@ license = "Apache-2.0"
 edition = "2021"
 
 [dependencies]
+solana-instruction = { version = "2.1.0", features = ["std"] }
+solana-pubkey = { version = "2.1.0", features = ["curve25519"] }
+
+[dev-dependencies]
 solana-program = "2.1.0"
 
 [package.metadata.docs.rs]
diff --git a/associated-token-account/client/src/address.rs b/associated-token-account/client/src/address.rs
index 9bb3db719ec..6a608299600 100644
--- a/associated-token-account/client/src/address.rs
+++ b/associated-token-account/client/src/address.rs
@@ -1,6 +1,6 @@
 //! Address derivation functions
 
-use solana_program::pubkey::Pubkey;
+use solana_pubkey::Pubkey;
 
 /// Derives the associated token account address and bump seed
 /// for the given wallet address, token mint and token program id
@@ -19,7 +19,7 @@ pub fn get_associated_token_address_and_bump_seed(
 }
 
 mod inline_spl_token {
-    solana_program::declare_id!("TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA");
+    solana_pubkey::declare_id!("TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA");
 }
 
 /// Derives the associated token account address for the given wallet address
diff --git a/associated-token-account/client/src/instruction.rs b/associated-token-account/client/src/instruction.rs
index 6cad63d9306..4f000d619d0 100644
--- a/associated-token-account/client/src/instruction.rs
+++ b/associated-token-account/client/src/instruction.rs
@@ -1,13 +1,12 @@
 //! Instruction creators for the program
 use {
     crate::{address::get_associated_token_address_with_program_id, program::id},
-    solana_program::{
-        instruction::{AccountMeta, Instruction},
-        pubkey::Pubkey,
-        system_program,
-    },
+    solana_instruction::{AccountMeta, Instruction},
+    solana_pubkey::Pubkey,
 };
 
+const SYSTEM_PROGRAM_ID: Pubkey = Pubkey::from_str_const("11111111111111111111111111111111");
+
 fn build_associated_token_account_instruction(
     funding_address: &Pubkey,
     wallet_address: &Pubkey,
@@ -29,7 +28,7 @@ fn build_associated_token_account_instruction(
             AccountMeta::new(associated_account_address, false),
             AccountMeta::new_readonly(*wallet_address, false),
             AccountMeta::new_readonly(*token_mint_address, false),
-            AccountMeta::new_readonly(system_program::id(), false),
+            AccountMeta::new_readonly(SYSTEM_PROGRAM_ID, false),
             AccountMeta::new_readonly(*token_program_id, false),
         ],
         data: vec![instruction],
@@ -105,3 +104,13 @@ pub fn recover_nested(
         data: vec![2], // AssociatedTokenAccountInstruction::RecoverNested
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use {super::*, solana_program::system_program};
+
+    #[test]
+    fn system_program_id() {
+        assert_eq!(system_program::id(), SYSTEM_PROGRAM_ID);
+    }
+}
diff --git a/associated-token-account/client/src/lib.rs b/associated-token-account/client/src/lib.rs
index 6a40abf2ed0..ef32c233b0a 100644
--- a/associated-token-account/client/src/lib.rs
+++ b/associated-token-account/client/src/lib.rs
@@ -7,5 +7,5 @@ pub mod instruction;
 
 /// Module defining the program id
 pub mod program {
-    solana_program::declare_id!("ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL");
+    solana_pubkey::declare_id!("ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL");
 }