Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update ed25519-dalek to v2 #1446

Merged
merged 7 commits into from
Sep 8, 2023
Merged

Update ed25519-dalek to v2 #1446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3c623b8
WIP
chevdor Sep 6, 2023
a0b7ce6
Update to ed25519-dalek v2
chevdor Sep 7, 2023
a75a940
Update Cargo.lock
chevdor Sep 7, 2023
f22c7c9
Merge branch 'master' into wk-230906-update-ed25519-dalek
chevdor Sep 7, 2023
e5b026a
Merge branch 'master' into wk-230906-update-ed25519-dalek
chevdor Sep 7, 2023
a3381fc
Remove default features
chevdor Sep 7, 2023
a5684c3
Update cumulus/bridges/primitives/test-utils/src/keyring.rs
chevdor Sep 7, 2023
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
35 changes: 6 additions & 29 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cumulus/bridges/primitives/test-utils/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ bp-parachains = { path = "../parachains", default-features = false }
bp-polkadot-core = { path = "../polkadot-core", default-features = false }
bp-runtime = { path = "../runtime", default-features = false }
codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false }
ed25519-dalek = { version = "1.0", default-features = false, features = ["u64_backend"] }
ed25519-dalek = { version = "2.0", default-features = false }
finality-grandpa = { version = "0.16.2", default-features = false }
sp-application-crypto = { path = "../../../../substrate/primitives/application-crypto", default-features = false }
sp-consensus-grandpa = { path = "../../../../substrate/primitives/consensus/grandpa", default-features = false }
Expand Down
24 changes: 5 additions & 19 deletions cumulus/bridges/primitives/test-utils/src/keyring.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

use bp_header_chain::{justification::JustificationVerificationContext, AuthoritySet};
use codec::Encode;
use ed25519_dalek::{Keypair, PublicKey, SecretKey, Signature};
use ed25519_dalek::{Signature, SigningKey, VerifyingKey};
use finality_grandpa::voter_set::VoterSet;
use sp_consensus_grandpa::{AuthorityId, AuthorityList, AuthorityWeight, SetId};
use sp_runtime::RuntimeDebug;
Expand All @@ -37,29 +37,15 @@ pub const FERDIE: Account = Account(5);
pub struct Account(pub u16);

impl Account {
pub fn public(&self) -> PublicKey {
(&self.secret()).into()
pub fn public(&self) -> VerifyingKey {
self.pair().verifying_key()
}

pub fn secret(&self) -> SecretKey {
pub fn pair(&self) -> SigningKey {
let data = self.0.encode();
let mut bytes = [0_u8; 32];
bytes[0..data.len()].copy_from_slice(&data);
SecretKey::from_bytes(&bytes)
.expect("A static array of the correct length is a known good.")
}

pub fn pair(&self) -> Keypair {
let mut pair: [u8; 64] = [0; 64];

let secret = self.secret();
pair[..32].copy_from_slice(&secret.to_bytes());

let public = self.public();
pair[32..].copy_from_slice(&public.to_bytes());

Keypair::from_bytes(&pair)
.expect("We expect the SecretKey to be good, so this must also be good.")
SigningKey::from_bytes(&bytes)
}

pub fn sign(&self, msg: &[u8]) -> Signature {
Expand Down
2 changes: 1 addition & 1 deletion substrate/primitives/io/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ tracing = { version = "0.1.29", default-features = false }
tracing-core = { version = "0.1.28", default-features = false}

# Required for backwards compatibility reason, but only used for verifying when `UseDalekExt` is set.
ed25519-dalek = { version = "2.0.0", default-features = false, optional = true }
ed25519-dalek = { version = "2.0", default-features = false, optional = true }

[build-dependencies]
rustversion = "1.0.6"
Expand Down