gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

unfork dalek ed25519 (#6776)

Browse Source
This commit is contained in:
Rob Walker
2019-11-07 17:08:10 -08:00
committed by GitHub
parent 20a52f153b
commit b64b54f48f
16 changed files with 105 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sdk/Cargo.toml
View File

@ -21,7 +21,7 @@ default = [
"rand_chacha",
"rayon",
"serde_json",
"solana-ed25519-dalek",
"ed25519-dalek",
"solana-logger",
"untrusted",
"solana-crate-features"
@ -48,7 +48,7 @@ serde_bytes = "0.11"
serde_derive = "1.0.102"
serde_json = { version = "1.0.41", optional = true }
sha2 = "0.8.0"
solana-ed25519-dalek = { version = "0.2.0", optional = true }
ed25519-dalek = { version = "1.0.0-pre.1", optional = true }
solana-logger = { path = "../logger", version = "0.21.0", optional = true }
untrusted = { version = "0.7.0", optional = true }
solana-crate-features = { path = "../crate-features", version = "0.21.0", optional = true }

25
sdk/src/signature.rs
View File

@ -2,20 +2,19 @@
use crate::pubkey::Pubkey;
use bs58;
use generic_array::typenum::U64;
use generic_array::GenericArray;
use ed25519_dalek;
use generic_array::{typenum::U64, GenericArray};
use rand::rngs::OsRng;
use serde_json;
use solana_ed25519_dalek as ed25519_dalek;
use std::borrow::Borrow;
use std::borrow::Cow;
use std::error;
use std::fmt;
use std::fs::{self, File};
use std::io::{Read, Write};
use std::mem;
use std::path::Path;
use std::str::FromStr;
use std::{
borrow::{Borrow, Cow},
error, fmt,
fs::{self, File},
io::{Read, Write},
mem,
path::Path,
str::FromStr,
};
pub type Keypair = ed25519_dalek::Keypair;
@ -117,7 +116,7 @@ impl KeypairUtil for Keypair {
/// Return the public key for the given keypair
fn pubkey(&self) -> Pubkey {
Pubkey::new(&self.public.as_ref())
Pubkey::new(self.public.as_ref())
}
fn sign_message(&self, message: &[u8]) -> Signature {