update schnorrkel to 0.11.4

paritytech · Dec 8, 2023 · 6feaeaf · 6feaeaf
1 parent 4ccd741
commit 6feaeaf
Show file tree

Hide file tree

Showing 12 changed files with 80 additions and 52 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/polkadot/node/core/approval-voting/Cargo.toml b/polkadot/node/core/approval-voting/Cargo.toml
@@ -13,8 +13,8 @@ parity-scale-codec = { version = "3.6.1", default-features = false, features = [
 gum = { package = "tracing-gum", path = "../../gum" }
 bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] }
 schnellru = "0.2.1"
-merlin = "2.0"
-schnorrkel = "0.9.1"
+merlin = "3.0"
+schnorrkel = "0.11.4"
 kvdb = "0.13.0"
 derive_more = "0.99.17"
 thiserror = "1.0.48"
@@ -32,15 +32,14 @@ sp-consensus = { path = "../../../../substrate/primitives/consensus/common", def
 sp-consensus-slots = { path = "../../../../substrate/primitives/consensus/slots", default-features = false }
 sp-application-crypto = { path = "../../../../substrate/primitives/application-crypto", default-features = false, features = ["full_crypto"] }
 sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false }
-rand_core = "0.5.1"
+# should match schnorrkel
+rand_core = "0.6.2"
 rand_chacha = { version = "0.3.1" }
 rand = "0.8.5"
 
 [dev-dependencies]
 async-trait = "0.1.57"
 parking_lot = "0.12.0"
-# rand_core should match schnorrkel
-rand_core = "0.5.1"
 sp-keyring = { path = "../../../../substrate/primitives/keyring" }
 sp-keystore = { path = "../../../../substrate/primitives/keystore" }
 sp-core = { path = "../../../../substrate/primitives/core" }

diff --git a/polkadot/node/core/approval-voting/src/approval_db/v2/migration_helpers.rs b/polkadot/node/core/approval-voting/src/approval_db/v2/migration_helpers.rs
@@ -31,7 +31,7 @@ fn dummy_assignment_cert(kind: AssignmentCertKind) -> AssignmentCert {
 	let mut prng = rand_core::OsRng;
 	let keypair = schnorrkel::Keypair::generate_with(&mut prng);
 	let (inout, proof, _) = keypair.vrf_sign(ctx.bytes(msg));
-	let preout = inout.to_output();
+	let preout = inout.to_preout();
 
 	AssignmentCert {
 		kind,

diff --git a/polkadot/node/core/approval-voting/src/criteria.rs b/polkadot/node/core/approval-voting/src/criteria.rs
@@ -461,7 +461,7 @@ fn compute_relay_vrf_modulo_assignments_v1(
 			let cert = AssignmentCert {
 				kind: AssignmentCertKind::RelayVRFModulo { sample: rvm_sample },
 				vrf: VrfSignature {
-					pre_output: VrfPreOutput(vrf_in_out.to_output()),
+					pre_output: VrfPreOutput(vrf_in_out.to_preout()),
 					proof: VrfProof(vrf_proof),
 				},
 			};
@@ -541,7 +541,7 @@ fn compute_relay_vrf_modulo_assignments_v2(
 				core_bitfield: assignment_bitfield.clone(),
 			},
 			vrf: VrfSignature {
-				pre_output: VrfPreOutput(vrf_in_out.to_output()),
+				pre_output: VrfPreOutput(vrf_in_out.to_preout()),
 				proof: VrfProof(vrf_proof),
 			},
 		};
@@ -576,7 +576,7 @@ fn compute_relay_vrf_delay_assignments(
 		let cert = AssignmentCertV2 {
 			kind: AssignmentCertKindV2::RelayVRFDelay { core_index: core },
 			vrf: VrfSignature {
-				pre_output: VrfPreOutput(vrf_in_out.to_output()),
+				pre_output: VrfPreOutput(vrf_in_out.to_preout()),
 				proof: VrfProof(vrf_proof),
 			},
 		};

diff --git a/polkadot/node/core/approval-voting/src/tests.rs b/polkadot/node/core/approval-voting/src/tests.rs
@@ -415,7 +415,7 @@ fn garbage_assignment_cert(kind: AssignmentCertKind) -> AssignmentCert {
 	let mut prng = rand_core::OsRng;
 	let keypair = schnorrkel::Keypair::generate_with(&mut prng);
 	let (inout, proof, _) = keypair.vrf_sign(ctx.bytes(msg));
-	let preout = inout.to_output();
+	let preout = inout.to_preout();
 
 	AssignmentCert {
 		kind,
@@ -429,7 +429,7 @@ fn garbage_assignment_cert_v2(kind: AssignmentCertKindV2) -> AssignmentCertV2 {
 	let mut prng = rand_core::OsRng;
 	let keypair = schnorrkel::Keypair::generate_with(&mut prng);
 	let (inout, proof, _) = keypair.vrf_sign(ctx.bytes(msg));
-	let preout = inout.to_output();
+	let preout = inout.to_preout();
 
 	AssignmentCertV2 {
 		kind,

diff --git a/polkadot/node/network/approval-distribution/Cargo.toml b/polkadot/node/network/approval-distribution/Cargo.toml
@@ -30,9 +30,9 @@ polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
 polkadot-primitives-test-helpers = { path = "../../../primitives/test-helpers" }
 
 assert_matches = "1.4.0"
-schnorrkel = { version = "0.9.1", default-features = false }
+schnorrkel = { version = "0.11.4", default-features = false }
 # rand_core should match schnorrkel
-rand_core = "0.5.1"
+rand_core = "0.6.2"
 rand_chacha = "0.3.1"
 env_logger = "0.9.0"
 log = "0.4.17"
diff --git a/polkadot/node/network/approval-distribution/src/tests.rs b/polkadot/node/network/approval-distribution/src/tests.rs
@@ -298,7 +298,7 @@ fn fake_assignment_cert(block_hash: Hash, validator: ValidatorIndex) -> Indirect
 	let mut prng = rand_core::OsRng;
 	let keypair = schnorrkel::Keypair::generate_with(&mut prng);
 	let (inout, proof, _) = keypair.vrf_sign(ctx.bytes(msg));
-	let preout = inout.to_output();
+	let preout = inout.to_preout();
 
 	IndirectAssignmentCert {
 		block_hash,
@@ -320,7 +320,7 @@ fn fake_assignment_cert_v2(
 	let mut prng = rand_core::OsRng;
 	let keypair = schnorrkel::Keypair::generate_with(&mut prng);
 	let (inout, proof, _) = keypair.vrf_sign(ctx.bytes(msg));
-	let preout = inout.to_output();
+	let preout = inout.to_preout();
 
 	IndirectAssignmentCertV2 {
 		block_hash,

diff --git a/polkadot/node/primitives/Cargo.toml b/polkadot/node/primitives/Cargo.toml
@@ -18,7 +18,7 @@ sp-keystore = { path = "../../../substrate/primitives/keystore" }
 sp-maybe-compressed-blob = { path = "../../../substrate/primitives/maybe-compressed-blob" }
 sp-runtime = { path = "../../../substrate/primitives/runtime" }
 polkadot-parachain-primitives = { path = "../../parachain", default-features = false }
-schnorrkel = "0.9.1"
+schnorrkel = "0.11.4"
 thiserror = "1.0.48"
 bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] }
 serde = { version = "1.0.193", features = ["derive"] }

diff --git a/substrate/primitives/core/Cargo.toml b/substrate/primitives/core/Cargo.toml
@@ -47,8 +47,8 @@ array-bytes = { version = "6.1", optional = true }
 ed25519-zebra = { version = "3.1.0", default-features = false, optional = true }
 blake2 = { version = "0.10.4", default-features = false, optional = true }
 libsecp256k1 = { version = "0.7", default-features = false, features = ["static-context"], optional = true }
-schnorrkel = { version = "0.9.1", features = ["preaudit_deprecated", "u64_backend"], default-features = false }
-merlin = { version = "2.0", default-features = false }
+schnorrkel = { version = "0.11.4", features = ["preaudit_deprecated"], default-features = false }
+merlin = { version = "3.0", default-features = false }
 secp256k1 = { version = "0.28.0", default-features = false, features = ["alloc", "recovery"], optional = true }
 sp-core-hashing = { path = "hashing", default-features = false, optional = true }
 sp-runtime-interface = { path = "../runtime-interface", default-features = false }