diff --git a/Cargo.lock b/Cargo.lock index 6de52dcea9..6688f6847e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -600,18 +600,6 @@ name = "dtoa" version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "ed25519-dalek" -version = "1.0.0-pre.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "clear_on_drop 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "curve25519-dalek 1.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", - "sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "either" version = "1.5.1" @@ -2174,7 +2162,6 @@ dependencies = [ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)", - "ed25519-dalek 1.0.0-pre.1 (registry+https://github.com/rust-lang/crates.io-index)", "hashbrown 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "hex-literal 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2202,6 +2189,7 @@ dependencies = [ "solana-budget-program 0.15.0", "solana-client 0.15.0", "solana-drone 0.15.0", + "solana-ed25519-dalek 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "solana-kvstore 0.15.0", "solana-logger 0.15.0", "solana-metrics 0.15.0", @@ -2391,6 +2379,18 @@ dependencies = [ "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "solana-ed25519-dalek" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "clear_on_drop 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "curve25519-dalek 1.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "solana-exchange-api" version = "0.15.0" @@ -2625,7 +2625,6 @@ dependencies = [ "bs58 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "ed25519-dalek 1.0.0-pre.1 (registry+https://github.com/rust-lang/crates.io-index)", "generic-array 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2638,6 +2637,7 @@ dependencies = [ "serde_derive 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)", "sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-ed25519-dalek 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "untrusted 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3459,7 +3459,6 @@ dependencies = [ "checksum digest 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "05f47366984d3ad862010e22c7ce81a7dbcaebbdfb37241a620f8b6596ee135c" "checksum dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" "checksum dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e" -"checksum ed25519-dalek 1.0.0-pre.1 (registry+https://github.com/rust-lang/crates.io-index)" = "81956bcf7ef761fb4e1d88de3fa181358a0d26cbcb9755b587a08f9119824b86" "checksum either 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c67353c641dc847124ea1902d69bd753dee9bb3beff9aa3662ecf86c971d1fac" "checksum elf 0.0.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4841de15dbe0e49b9b62a417589299e3be0d557e0900d36acb87e6dae47197f5" "checksum elfkit 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "02f182eda16a7360c80a2f8638d0726e9d5478173058f1505c42536ca666ecd2" @@ -3631,6 +3630,7 @@ dependencies = [ "checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" "checksum smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c4488ae950c49d403731982257768f48fada354a5203fe81f9bb6f43ca9002be" "checksum socket2 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "4e626972d3593207547f14bf5fc9efa4d0e7283deb73fef1dff313dae9ab8878" +"checksum solana-ed25519-dalek 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5a1bcc2cff3ecfee3ff892aef944f46378e84598c5017591d45f50d5a5c2cae7" "checksum solana_rbpf 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ad37128dd7524e96cce18dec21be28fa369785842fcedb530b22df3a94b5fe5c" "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" "checksum string 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b639411d0b9c738748b5397d5ceba08e648f4f1992231aa859af1a017f31f60b" diff --git a/core/Cargo.toml b/core/Cargo.toml index d9ecd50a06..c584889fd9 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -25,7 +25,6 @@ bs58 = "0.2.0" byteorder = "1.3.1" chrono = { version = "0.4.0", features = ["serde"] } crc = { version = "1.8.1", optional = true } -ed25519-dalek = "1.0.0-pre.0" hashbrown = "0.2.0" indexmap = "1.0" itertools = "0.8.0" @@ -51,6 +50,7 @@ solana-budget-api = { path = "../programs/budget_api", version = "0.15.0" } solana-budget-program = { path = "../programs/budget_program", version = "0.15.0" } solana-client = { path = "../client", version = "0.15.0" } solana-drone = { path = "../drone", version = "0.15.0" } +solana-ed25519-dalek = "0.1.0" solana-kvstore = { path = "../kvstore", version = "0.15.0" , optional = true } solana-logger = { path = "../logger", version = "0.15.0" } solana-metrics = { path = "../metrics", version = "0.15.0" } diff --git a/core/src/replicator.rs b/core/src/replicator.rs index 2e27ee1c50..941d127b06 100644 --- a/core/src/replicator.rs +++ b/core/src/replicator.rs @@ -14,12 +14,12 @@ use crate::streamer::receiver; use crate::streamer::responder; use crate::window_service::WindowService; use bincode::deserialize; -use ed25519_dalek; use rand::thread_rng; use rand::Rng; use solana_client::rpc_client::RpcClient; use solana_client::rpc_request::RpcRequest; use solana_client::thin_client::{create_client, ThinClient}; +use solana_ed25519_dalek as ed25519_dalek; use solana_sdk::client::{AsyncClient, SyncClient}; use solana_sdk::hash::{Hash, Hasher}; use solana_sdk::message::Message; diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml index 3196dba6ae..db9d81f80e 100644 --- a/sdk/Cargo.toml +++ b/sdk/Cargo.toml @@ -11,7 +11,6 @@ edition = "2018" [dependencies] bincode = "1.1.3" bs58 = "0.2.0" -ed25519-dalek = "1.0.0-pre.0" hex = "0.3.2" byteorder = "1.2.1" chrono = { version = "0.4.0", features = ["serde"] } @@ -26,4 +25,5 @@ sha2 = "0.8.0" serde = "1.0.91" serde_derive = "1.0.91" serde_json = "1.0.39" +solana-ed25519-dalek = "0.1.0" untrusted = "0.6.2" diff --git a/sdk/src/signature.rs b/sdk/src/signature.rs index db39005e50..c4680ef442 100644 --- a/sdk/src/signature.rs +++ b/sdk/src/signature.rs @@ -2,12 +2,12 @@ use crate::pubkey::Pubkey; use bs58; -use ed25519_dalek; use generic_array::typenum::U64; use generic_array::GenericArray; use rand::rngs::OsRng; use rand::{CryptoRng, Rng}; use serde_json; +use solana_ed25519_dalek as ed25519_dalek; use std::error; use std::fmt; use std::fs::{self, File};