Merge branch 'main' into test-resharing-from-single-party

topos-protocol · Mar 28, 2024 · 8235265 · 8235265
2 parents f1d94ba + 562b64e
commit 8235265
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -24,15 +24,24 @@ ark-ff = { version = "0.4", default-features = false }
 ark-ec = { version = "0.4", default-features = false }
 ark-serialize = { version = "0.4", default-features = false, features = ["derive"] }
 digest = { version = "0.10", default-features = false, features = ["alloc"] }
-getrandom = { version = "0.2", default-features = false, features = ["js"] }
 rand = { version = "0.8", default-features = false, features = ["alloc", "getrandom", "libc"] }
 sha2 = { version = "0.10", default-features = false }
 aes-gcm = { version = "0.10", default-features = false, features = ["aes", "alloc", "getrandom", "zeroize"] }
 hkdf = { version = "0.12", default-features = false }
 zeroize = { version = "1", default-features = false, features = ["alloc", "zeroize_derive"] }
 
+# Include the "js" feature for wasm32-unknown-unknown
+[target.'cfg(target_family = "wasm")'.dependencies.getrandom]
+version = "0.2"
+default-features = false
+features = ["js"]
+
+[target.'cfg(not(target_family = "wasm"))'.dependencies.getrandom]
+version = "0.2.0"
+default-features = false
+
 [dev-dependencies]
-criterion = { version = "0.3" }
+criterion = { version = "0.5" }
 
 [[bench]]
 name = "dkg"

diff --git a/src/sign/signature.rs b/src/sign/signature.rs
@@ -558,7 +558,6 @@ impl<C: CipherSuite> SignatureAggregator<C, Initial<'_>> {
         }
 
         // Ensure that our new state is ordered and deduplicated.
-
         let _ = self.get_signers();
 
         for signer in &self.state.signers {
-Original file line number
+Diff line change
@@ Expand Up / @@ -558,7 +558,6 @@ impl<C: CipherSuite> SignatureAggregator<C, Initial<'_>> { @@
             }
             // Ensure that our new state is ordered and deduplicated.
             let _ = self.get_signers();
             for signer in &self.state.signers {
@@ Expand Down @@