pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-07-20 05:45:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation problems due to ed25519-dalek 1.0.0-pre.4 (#6676)

Browse Source 
* Fix compilation problems due to ed25519-dalek 1.0.0-pre.4

* Update libp2p-core

* Revert rand downgrade
This commit is contained in:
Pierre Krieger
2020-07-20 11:53:39 +02:00
committed by GitHub
parent 7e72a658c7
commit 8ae4faba51
3 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/Cargo.lock
Generated
+23 -6
View File
@@ -1141,15 +1141,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
[[package]] [[package]]
name = "ed25519-dalek" name = "ed25519"
version = "1.0.0-pre.3" version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "978710b352437433c97b2bff193f2fb1dfd58a093f863dd95e225a19baa599a2" checksum = "bf038a7b6fd7ef78ad3348b63f3a17550877b0e28f8d68bcc94894d1412158bc"
dependencies = [
"signature",
]
[[package]]
name = "ed25519-dalek"
version = "1.0.0-pre.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "21a8a37f4e8b35af971e6db5e3897e7a6344caa3f92f6544f88125a1f5f0035a"
dependencies = [ dependencies = [
"clear_on_drop",
"curve25519-dalek", "curve25519-dalek",
"ed25519",
"rand 0.7.3", "rand 0.7.3",
"serde",
"sha2", "sha2",
"zeroize",
] ]
[[package]] [[package]]
@@ -2759,9 +2770,9 @@ dependencies = [
[[package]] [[package]]
name = "libp2p-core" name = "libp2p-core"
version = "0.20.0" version = "0.20.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "11ca8d5a64a5d19b45e00e8f24afda6b8e1b605fb25ad7bcf62a42ecf19d7ff3" checksum = "6a694fd76d7c33a45a0e6e1525e9b9b5d11127c9c94e560ac0f8abba54ed80af"
dependencies = [ dependencies = [
"asn1_der", "asn1_der",
"bs58", "bs58",
@@ -7325,6 +7336,12 @@ dependencies = [
"libc", "libc",
] ]
[[package]]
name = "signature"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "65211b7b6fc3f14ff9fc7a2011a434e3e6880585bd2e9e9396315ae24cbf7852"
[[package]] [[package]]
name = "slab" name = "slab"
version = "0.4.2" version = "0.4.2"
substrate/primitives/core/Cargo.toml
+1 -1
View File
@@ -41,7 +41,7 @@ parity-util-mem = { version = "0.7.0", default-features = false, features = ["pr
futures = { version = "0.3.1", optional = true } futures = { version = "0.3.1", optional = true }
# full crypto # full crypto
ed25519-dalek = { version = "1.0.0-pre.3", default-features = false, features = ["u64_backend", "alloc"], optional = true } ed25519-dalek = { version = "1.0.0-pre.4", default-features = false, features = ["u64_backend", "alloc"], optional = true }
blake2-rfc = { version = "0.2.18", default-features = false, optional = true } blake2-rfc = { version = "0.2.18", default-features = false, optional = true }
tiny-keccak = { version = "2.0.1", features = ["keccak"], optional = true } tiny-keccak = { version = "2.0.1", features = ["keccak"], optional = true }
schnorrkel = { version = "0.9.1", features = ["preaudit_deprecated", "u64_backend"], default-features = false, optional = true } schnorrkel = { version = "0.9.1", features = ["preaudit_deprecated", "u64_backend"], default-features = false, optional = true }
substrate/primitives/core/src/ed25519.rs
+3 -1
View File
@@ -29,6 +29,8 @@ use codec::{Encode, Decode};
use blake2_rfc; use blake2_rfc;
#[cfg(feature = "full_crypto")] #[cfg(feature = "full_crypto")]
use core::convert::TryFrom; use core::convert::TryFrom;
#[cfg(feature = "full_crypto")]
use ed25519_dalek::{Signer as _, Verifier as _};
#[cfg(feature = "std")] #[cfg(feature = "std")]
use substrate_bip39::seed_from_entropy; use substrate_bip39::seed_from_entropy;
#[cfg(feature = "std")] #[cfg(feature = "std")]
@@ -513,7 +515,7 @@ impl TraitPair for Pair {
Err(_) => return false, Err(_) => return false,
}; };
let sig = match ed25519_dalek::Signature::from_bytes(sig) { let sig = match ed25519_dalek::Signature::try_from(sig) {
Ok(s) => s, Ok(s) => s,
Err(_) => return false Err(_) => return false
}; };