Skip to content

Commit c7b8bb4

Browse files
Otter-0x4ka5hpratikbuildsAkash Thota0x4ka5h
authored
fix: missing solana-signer extration from solana-sdk (#3995)
* refactor: extract solana-signer from solana-sdk in anchor-client and anchor-cli * Revert "Revert "feat: tests"" This reverts commit c8cf603. * requested changes * fix: docs * fix: cargo.toml * fix: ci tests * fix: ci tests * add dependency * add dependency * add dependency * fix: remove from workspace --------- Co-authored-by: 0xPratik <sariapratik@gmail.com> Co-authored-by: Akash Thota <your.email@example.com> Co-authored-by: Akash Thota <0x4ka5h@gmail.com>
1 parent 83bb40c commit c7b8bb4

File tree

17 files changed

+33
-19
lines changed

17 files changed

+33
-19
lines changed

Cargo.lock

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,8 @@ resolver = "2"
1616
[profile.release]
1717
lto = true
1818

19+
[workspace.dependencies]
20+
solana-signer = "2"
21+
1922
[profile.release.package.anchor-cli]
2023
codegen-units = 1

cli/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ solana-cli-config = "2"
4040
solana-faucet = "2"
4141
solana-rpc-client = "2"
4242
solana-sdk = "2"
43+
solana-signer.workspace = true
4344
syn = { version = "1.0.60", features = ["full", "extra-traits"] }
4445
tar = "0.4.35"
4546
toml = "0.7.6"

cli/src/config.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ use serde::{Deserialize, Deserializer, Serialize, Serializer};
1212
use solana_cli_config::{Config as SolanaConfig, CONFIG_FILE};
1313
use solana_sdk::clock::Slot;
1414
use solana_sdk::pubkey::Pubkey;
15-
use solana_sdk::signature::{Keypair, Signer};
15+
use solana_sdk::signature::Keypair;
16+
use solana_signer::Signer;
1617
use std::collections::{BTreeMap, HashMap};
1718
use std::convert::TryFrom;
1819
use std::fs::{self, File};

cli/src/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,8 @@ use solana_sdk::compute_budget::ComputeBudgetInstruction;
2828
use solana_sdk::instruction::{AccountMeta, Instruction};
2929
use solana_sdk::pubkey::Pubkey;
3030
use solana_sdk::signature::Keypair;
31-
use solana_sdk::signature::Signer;
32-
use solana_sdk::signer::EncodableKey;
3331
use solana_sdk::transaction::Transaction;
32+
use solana_signer::{EncodableKey, Signer};
3433
use std::collections::BTreeMap;
3534
use std::collections::HashMap;
3635
use std::collections::HashSet;

cli/src/rust_template.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ use heck::{ToLowerCamelCase, ToPascalCase, ToSnakeCase};
88
use solana_sdk::{
99
pubkey::Pubkey,
1010
signature::{read_keypair_file, write_keypair_file, Keypair},
11-
signer::Signer,
1211
};
12+
use solana_signer::Signer;
1313
use std::{
1414
fmt::Write as _,
1515
fs::{self, File},

client/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ solana-pubsub-client = "2"
2727
solana-rpc-client = "2"
2828
solana-rpc-client-api = "2"
2929
solana-sdk = "2"
30+
solana-signer.workspace = true
3031
thiserror = "1"
3132
tokio = { version = "1", features = ["rt", "sync"] }
3233
url = "2"

client/example/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,4 @@ clap = { version = "4.2.4", features = ["derive"] }
2121
shellexpand = "2.1.0"
2222
solana-sdk = "2"
2323
tokio = { version = "1", features = ["full"] }
24+
solana-signer = "2"

client/example/src/blocking.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
use anchor_client::solana_sdk::pubkey::Pubkey;
2-
use anchor_client::solana_sdk::signature::{Keypair, Signer};
2+
use anchor_client::solana_sdk::signature::Keypair;
33
use anchor_client::solana_sdk::system_instruction;
44
use anchor_client::{Client, Cluster};
55
use anyhow::Result;
66
use clap::Parser;
77
use solana_sdk::commitment_config::CommitmentConfig;
88
use solana_sdk::signature::read_keypair_file;
99
use solana_sdk::system_program;
10+
use solana_signer::Signer;
1011
// The `accounts` and `instructions` modules are generated by the framework.
1112
use basic_2::accounts as basic_2_accounts;
1213
use basic_2::instruction as basic_2_instruction;

client/example/src/nonblocking.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
use anchor_client::solana_sdk::pubkey::Pubkey;
2-
use anchor_client::solana_sdk::signature::{Keypair, Signer};
2+
use anchor_client::solana_sdk::signature::Keypair;
33
use anchor_client::solana_sdk::system_instruction;
44
use anchor_client::{Client, Cluster};
55
use anyhow::Result;
66
use clap::Parser;
77
use solana_sdk::commitment_config::CommitmentConfig;
88
use solana_sdk::signature::read_keypair_file;
99
use solana_sdk::system_program;
10+
use solana_signer::Signer;
1011
// The `accounts` and `instructions` modules are generated by the framework.
1112
use basic_2::accounts as basic_2_accounts;
1213
use basic_2::instruction as basic_2_instruction;

0 commit comments

Comments
 (0)