fix: missing solana-signer extration from solana-sdk

Cargo.toml

@@ -16,5 +16,8 @@ resolver = "2"
 [profile.release]
 lto = true
 
+[workspace.dependencies]
+solana-signer = "2"
+
 [profile.release.package.anchor-cli]
 codegen-units = 1

cli/Cargo.toml

@@ -40,6 +40,7 @@ solana-cli-config = "2"
 solana-faucet = "2"
 solana-rpc-client = "2"
 solana-sdk = "2"
+solana-signer.workspace = true
 syn = { version = "1.0.60", features = ["full", "extra-traits"] }
 tar = "0.4.35"
 toml = "0.7.6"

cli/src/config.rs

@@ -12,7 +12,8 @@ use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use solana_cli_config::{Config as SolanaConfig, CONFIG_FILE};
 use solana_sdk::clock::Slot;
 use solana_sdk::pubkey::Pubkey;
-use solana_sdk::signature::{Keypair, Signer};
+use solana_sdk::signature::Keypair;
+use solana_signer::Signer;
 use std::collections::{BTreeMap, HashMap};
 use std::convert::TryFrom;
 use std::fs::{self, File};

cli/src/lib.rs

@@ -28,9 +28,8 @@ use solana_sdk::compute_budget::ComputeBudgetInstruction;
 use solana_sdk::instruction::{AccountMeta, Instruction};
 use solana_sdk::pubkey::Pubkey;
 use solana_sdk::signature::Keypair;
-use solana_sdk::signature::Signer;
-use solana_sdk::signer::EncodableKey;
 use solana_sdk::transaction::Transaction;
+use solana_signer::{EncodableKey, Signer};
 use std::collections::BTreeMap;
 use std::collections::HashMap;
 use std::collections::HashSet;

cli/src/rust_template.rs

@@ -8,8 +8,8 @@ use heck::{ToLowerCamelCase, ToPascalCase, ToSnakeCase};
 use solana_sdk::{
     pubkey::Pubkey,
     signature::{read_keypair_file, write_keypair_file, Keypair},
-    signer::Signer,
 };
+use solana_signer::Signer;
 use std::{
     fmt::Write as _,
     fs::{self, File},

client/Cargo.toml

@@ -27,6 +27,7 @@ solana-rpc-client = "2"
 solana-rpc-client-api = "2"
 solana-account = "2"
 solana-sdk = "2"
+solana-signer.workspace = true
 thiserror = "1"
 tokio = { version = "1", features = ["rt", "sync"] }
 url = "2"

client/example/Cargo.toml

@@ -21,3 +21,4 @@ clap = { version = "4.2.4", features = ["derive"] }
 shellexpand = "2.1.0"
 solana-sdk = "2"
 tokio = { version = "1", features = ["full"] }
+solana-signer = "2"

client/example/src/blocking.rs

@@ -1,12 +1,13 @@
 use anchor_client::solana_sdk::pubkey::Pubkey;
-use anchor_client::solana_sdk::signature::{Keypair, Signer};
+use anchor_client::solana_sdk::signature::Keypair;
 use anchor_client::solana_sdk::system_instruction;
 use anchor_client::{Client, Cluster};
 use anyhow::Result;
 use clap::Parser;
 use solana_sdk::commitment_config::CommitmentConfig;
 use solana_sdk::signature::read_keypair_file;
 use solana_sdk::system_program;
+use solana_signer::Signer;
 // The `accounts` and `instructions` modules are generated by the framework.
 use basic_2::accounts as basic_2_accounts;
 use basic_2::instruction as basic_2_instruction;

client/example/src/nonblocking.rs

@@ -1,12 +1,13 @@
 use anchor_client::solana_sdk::pubkey::Pubkey;
-use anchor_client::solana_sdk::signature::{Keypair, Signer};
+use anchor_client::solana_sdk::signature::Keypair;
 use anchor_client::solana_sdk::system_instruction;
 use anchor_client::{Client, Cluster};
 use anyhow::Result;
 use clap::Parser;
 use solana_sdk::commitment_config::CommitmentConfig;
 use solana_sdk::signature::read_keypair_file;
 use solana_sdk::system_program;
+use solana_signer::Signer;
 // The `accounts` and `instructions` modules are generated by the framework.
 use basic_2::accounts as basic_2_accounts;
 use basic_2::instruction as basic_2_instruction;

client/src/blocking.rs

@@ -8,9 +8,9 @@ use solana_rpc_client::nonblocking::rpc_client::RpcClient as AsyncRpcClient;
 use solana_rpc_client::rpc_client::RpcClient;
 use solana_rpc_client_api::{config::RpcSendTransactionConfig, filter::RpcFilterType};
 use solana_sdk::{
-    commitment_config::CommitmentConfig, signature::Signature, signer::Signer,
-    transaction::Transaction,
+    commitment_config::CommitmentConfig, signature::Signature, transaction::Transaction,
 };
+use solana_signer::Signer;
 use std::{marker::PhantomData, ops::Deref, sync::Arc};
 use tokio::{
     runtime::{Builder, Handle},

client/src/lib.rs

@@ -90,8 +90,9 @@ use solana_rpc_client_api::{
 use solana_sdk::commitment_config::CommitmentConfig;
 use solana_sdk::hash::Hash;
 use solana_sdk::instruction::{AccountMeta, Instruction};
-use solana_sdk::signature::{Signature, Signer};
+use solana_sdk::signature::Signature;
 use solana_sdk::transaction::Transaction;
+use solana_signer::{Signer, SignerError};
 use std::iter::Map;
 use std::marker::PhantomData;
 use std::ops::Deref;
@@ -184,7 +185,7 @@ impl Signer for DynSigner {
         self.0.pubkey()
     }
 
-    fn try_pubkey(&self) -> Result<Pubkey, solana_sdk::signer::SignerError> {
+    fn try_pubkey(&self) -> Result<Pubkey, SignerError> {
         self.0.try_pubkey()
     }
 
@@ -195,7 +196,7 @@ impl Signer for DynSigner {
     fn try_sign_message(
         &self,
         message: &[u8],
-    ) -> Result<solana_sdk::signature::Signature, solana_sdk::signer::SignerError> {
+    ) -> Result<solana_sdk::signature::Signature, SignerError> {
         self.0.try_sign_message(message)
     }
 

client/src/nonblocking.rs

@@ -6,9 +6,9 @@ use anchor_lang::{prelude::Pubkey, AccountDeserialize, Discriminator};
 use solana_rpc_client::nonblocking::rpc_client::RpcClient as AsyncRpcClient;
 use solana_rpc_client_api::{config::RpcSendTransactionConfig, filter::RpcFilterType};
 use solana_sdk::{
-    commitment_config::CommitmentConfig, signature::Signature, signer::Signer,
-    transaction::Transaction,
+    commitment_config::CommitmentConfig, signature::Signature, transaction::Transaction,
 };
+use solana_signer::Signer;
 use std::{marker::PhantomData, ops::Deref, sync::Arc};
 use tokio::sync::RwLock;
 

docs/content/docs/clients/rust.mdx

@@ -173,8 +173,9 @@ use anchor_client::{
     solana_client::rpc_client::RpcClient,
     solana_sdk::{
         commitment_config::CommitmentConfig, native_token::LAMPORTS_PER_SOL, signature::Keypair,
-        signer::Signer, system_program,
+        system_program,
     },
+    solana_signer::Signer,
     Client, Cluster,
 };
 use anchor_lang::prelude::*;

docs/content/docs/features/declare-program.mdx

@@ -593,8 +593,9 @@ use anchor_client::{
     solana_client::rpc_client::RpcClient,
     solana_sdk::{
         commitment_config::CommitmentConfig, native_token::LAMPORTS_PER_SOL, signature::Keypair,
-        signer::Signer, system_program,
+        system_program,
     },
+    solana_signer::Signer,
     Client, Cluster,
 };
 use anchor_lang::prelude::*;

tests/bench/bench.json

@@ -1398,9 +1398,9 @@
       },
       "stackMemory": {
         "account_info1": 46,
-        "account_info2": 80,
-        "account_info4": 80,
-        "account_info8": 80,
+        "account_info2": 88,
+        "account_info4": 88,
+        "account_info8": 88,
         "account_empty_init1": 88,
         "account_empty_init2": 88,
         "account_empty_init4": 88,

tests/zero-copy/programs/zero-copy/tests/compute_unit_test.rs

@@ -7,9 +7,10 @@ use {
         solana_sdk::{
             commitment_config::CommitmentConfig,
             pubkey::Pubkey,
-            signature::{Keypair, Signer},
+            signature::Keypair,
             transaction::Transaction,
         },
+        solana_signer::Signer,
         Client, Cluster,
     },
     solana_program_test::{tokio, ProgramTest},