diff --git a/pallets/exodus/Cargo.toml b/pallets/exodus/Cargo.toml index a6ee67e..101c19f 100644 --- a/pallets/exodus/Cargo.toml +++ b/pallets/exodus/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ghost-exodus" -version = "0.0.18" +version = "0.0.19" description = "Threshold signature generation with DKG included" license.workspace = true authors.workspace = true diff --git a/pallets/exodus/src/benchmarking.rs b/pallets/exodus/src/benchmarking.rs index fcf8949..e9f1064 100644 --- a/pallets/exodus/src/benchmarking.rs +++ b/pallets/exodus/src/benchmarking.rs @@ -352,11 +352,8 @@ mod benchmarks { dummy_verifying_key, ).expect("Bounded verifying key should be correct"); - let metadata_hashes = [ - SubstrateBlake2Hasher::hash(dummy_merkle_root.as_ref()), - SubstrateBlake2Hasher::hash(bounded_verifying_key.as_ref()), - ]; - let verifying_hash = sequential_hash::(metadata_hashes); + let metadata_hashes = [dummy_merkle_root.as_ref(), bounded_verifying_key.as_ref()]; + let verifying_hash = cumulative_hash::(metadata_hashes); let verification_key = (network_curve, dkg_index, verifying_hash); let participants = Verifications::::get(verification_key); diff --git a/pallets/exodus/src/lib.rs b/pallets/exodus/src/lib.rs index e879e24..54bcf19 100644 --- a/pallets/exodus/src/lib.rs +++ b/pallets/exodus/src/lib.rs @@ -31,7 +31,7 @@ use sp_io::hashing::blake2_256; use ghost_helpers::{ get_byzantium_quorum_threshold, SubstrateBlake2Hasher, - hash_chain::{cumulative_hash, sequential_hash}, + hash_chain::cumulative_hash, networks::{NetworkData, NetworkCurve, NetworkType}, bounded_bitmap::{validate_bitmap_sizes, BoundedBitmap}, }; @@ -40,7 +40,6 @@ use ghost_helpers::{ use ghost_traits::exodus::IdentifierConverter; use ghost_traits::{ - hashing::GhostHasher, bounded_bitmap::{ BoundedBitmapGenerator, BoundedBitmapWriter, BoundedBitmapReader, BoundedBitmapIterable, @@ -1254,11 +1253,9 @@ pub mod pallet { return Err(Error::::Round5PackageInvalidProof.into()); }; - let metadata_hashes = [ - SubstrateBlake2Hasher::hash(round5.merkle_root.as_ref()), - SubstrateBlake2Hasher::hash(round5.verifying_key.as_ref()), - ]; - let verifying_hash = sequential_hash::(metadata_hashes); + let metadata_hashes = [round5.merkle_root.as_ref(), round5.verifying_key.as_ref()]; + let verifying_hash = cumulative_hash::(metadata_hashes); + let state = QualificationDkgState::::get(&network_curve); ensure!(state.is_fifth_phase(), Error::::DkgWrongRound);