Skip to content
This repository has been archived by the owner on Jan 13, 2025. It is now read-only.

Keypair: implement clone() #26248

Merged
merged 2 commits into from
Aug 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions core/src/replay_stage.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3227,7 +3227,7 @@ pub(crate) mod tests {
hash::{hash, Hash},
instruction::InstructionError,
poh_config::PohConfig,
signature::{Keypair, Signer},
signature::{Keypair, KeypairInsecureClone, Signer},
system_transaction,
transaction::TransactionError,
},
Expand Down Expand Up @@ -3307,7 +3307,7 @@ pub(crate) mod tests {
let my_pubkey = my_keypairs.node_keypair.pubkey();
let cluster_info = ClusterInfo::new(
Node::new_localhost_with_pubkey(&my_pubkey).info,
Arc::new(Keypair::from_bytes(&my_keypairs.node_keypair.to_bytes()).unwrap()),
Arc::new(my_keypairs.node_keypair.clone()),
SocketAddrSpace::Unspecified,
);
assert_eq!(my_pubkey, cluster_info.id());
Expand Down
16 changes: 7 additions & 9 deletions local-cluster/src/local_cluster.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ use {
message::Message,
poh_config::PohConfig,
pubkey::Pubkey,
signature::{Keypair, Signer},
signature::{Keypair, KeypairInsecureClone, Signer},
stake::{
config as stake_config, instruction as stake_instruction,
state::{Authorized, Lockup},
Expand All @@ -55,6 +55,7 @@ use {
collections::HashMap,
io::{Error, ErrorKind, Result},
iter,
ops::Deref,
path::{Path, PathBuf},
sync::{Arc, RwLock},
},
Expand Down Expand Up @@ -203,10 +204,8 @@ impl LocalCluster {
if *in_genesis {
Some((
ValidatorVoteKeypairs {
node_keypair: Keypair::from_bytes(&node_keypair.to_bytes())
.unwrap(),
vote_keypair: Keypair::from_bytes(&vote_keypair.to_bytes())
.unwrap(),
node_keypair: node_keypair.deref().clone(),
vote_keypair: vote_keypair.deref().clone(),
stake_keypair: Keypair::new(),
},
stake,
Expand Down Expand Up @@ -265,9 +264,8 @@ impl LocalCluster {
let mut leader_config = safe_clone_config(&config.validator_configs[0]);
leader_config.rpc_addrs = Some((leader_node.info.rpc, leader_node.info.rpc_pubsub));
Self::sync_ledger_path_across_nested_config_fields(&mut leader_config, &leader_ledger_path);
let leader_keypair = Arc::new(Keypair::from_bytes(&leader_keypair.to_bytes()).unwrap());
let leader_vote_keypair =
Arc::new(Keypair::from_bytes(&leader_vote_keypair.to_bytes()).unwrap());
let leader_keypair = Arc::new(leader_keypair.clone());
let leader_vote_keypair = Arc::new(leader_vote_keypair.clone());

let leader_server = Validator::new(
leader_node,
Expand Down Expand Up @@ -315,7 +313,7 @@ impl LocalCluster {
.map(|keypairs| {
(
keypairs.node_keypair.pubkey(),
Arc::new(Keypair::from_bytes(&keypairs.vote_keypair.to_bytes()).unwrap()),
Arc::new(keypairs.vote_keypair.clone()),
)
})
.collect();
Expand Down
5 changes: 3 additions & 2 deletions local-cluster/tests/local_cluster_slow_1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,13 @@ use {
clock::{Slot, MAX_PROCESSING_AGE},
hash::Hash,
pubkey::Pubkey,
signature::{Keypair, Signer},
signature::{KeypairInsecureClone, Signer},
},
solana_streamer::socket::SocketAddrSpace,
solana_vote_program::{vote_state::MAX_LOCKOUT_HISTORY, vote_transaction},
std::{
collections::{BTreeSet, HashSet},
ops::Deref,
path::Path,
sync::{
atomic::{AtomicBool, Ordering},
Expand Down Expand Up @@ -462,7 +463,7 @@ fn test_duplicate_shreds_broadcast_leader() {
let (gossip_service, _tcp_listener, cluster_info) = gossip_service::make_gossip_node(
// Need to use our validator's keypair to gossip EpochSlots and votes for our
// node later.
Keypair::from_bytes(&node_keypair.to_bytes()).unwrap(),
node_keypair.deref().clone(),
Some(&cluster.entry_point_info.gossip),
&exit,
None,
Expand Down
5 changes: 2 additions & 3 deletions runtime/src/genesis_utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use {
genesis_config::{ClusterType, GenesisConfig},
pubkey::Pubkey,
rent::Rent,
signature::{Keypair, Signer},
signature::{Keypair, KeypairInsecureClone, Signer},
stake::state::StakeState,
system_program,
},
Expand Down Expand Up @@ -109,8 +109,7 @@ pub fn create_genesis_config_with_vote_accounts_and_cluster_type(
assert_eq!(voting_keypairs.len(), stakes.len());

let mint_keypair = Keypair::new();
let voting_keypair =
Keypair::from_bytes(&voting_keypairs[0].borrow().vote_keypair.to_bytes()).unwrap();
let voting_keypair = voting_keypairs[0].borrow().vote_keypair.clone();

let validator_pubkey = voting_keypairs[0].borrow().node_keypair.pubkey();
let genesis_config = create_genesis_config_with_leader_ex(
Expand Down
20 changes: 20 additions & 0 deletions sdk/src/signer/keypair.rs
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,26 @@ where
}
}

/// Allows Keypair cloning
///
/// Note that the `Clone` trait is intentionally unimplemented because making a
/// second copy of sensitive secret keys in memory is usually a bad idea.
///
/// Only use this in tests or when strictly required.
pub trait KeypairInsecureClone {
fn clone(&self) -> Self;
}

impl KeypairInsecureClone for Keypair {
fn clone(&self) -> Self {
Self(ed25519_dalek::Keypair {
// This will never error since self is a valid keypair
secret: ed25519_dalek::SecretKey::from_bytes(self.0.secret.as_bytes()).unwrap(),
public: self.0.public,
})
}
}

/// Reads a JSON-encoded `Keypair` from a `Reader` implementor
pub fn read_keypair<R: Read>(reader: &mut R) -> Result<Keypair, Box<dyn error::Error>> {
let bytes: Vec<u8> = serde_json::from_reader(reader)?;
Expand Down