Wicher/more dkg edits #18384

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.

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

Merged

waamm merged 44 commits into main from wicher/more-dkg-edits

Jan 17, 2026

Cargo.lock

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

crates/aptos-batch-encryption/Cargo.toml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -60,9 +60,9 @@ harness = false
  
    name = "multi_point_eval"

    harness = false

    [[bench]]

    name = "fptx"

    harness = false

    # [[bench]]

    # name = "fptx"

    # harness = false

    [[bench]]

    name = "fptx_succinct"

crates/aptos-batch-encryption/src/schemes/fptx_weighted.rs

-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,6 @@ use crate::{ @@
         errors::BatchEncryptionError,
         group::*,
         shared::{
-            ark_serialize::*,
             ciphertext::{CTDecrypt, CTEncrypt, PreparedCiphertext, StandardCiphertext},
             digest::{Digest, DigestKey, EvalProof, EvalProofs, EvalProofsPromise},
             encryption_key::EncryptionKey,
@@ Expand All / @@ -19,7 +18,11 @@ use crate::{ @@
         },
     };
     use anyhow::{anyhow, Result};
-    use aptos_crypto::{weighted_config::WeightedConfigArkworks, SecretSharingConfig as _};
+    use aptos_crypto::{
+        arkworks::serialization::{ark_de, ark_se},
+        weighted_config::WeightedConfigArkworks,
+        SecretSharingConfig as _,
+    };
     use aptos_dkg::pvss::{
         traits::{Reconstructable as _, Subtranscript},
         Player,
@@ Expand Down @@

crates/aptos-batch-encryption/src/shared/algebra/fk_algorithm.rs

-Original file line number
+Diff line change
@@ -1,7 +1,8 @@
     // Copyright (c) Aptos Foundation
     // Licensed pursuant to the Innovation-Enabling Source Code License, available at https://github.com/aptos-labs/aptos-core/blob/main/LICENSE
     use super::multi_point_eval::multi_point_eval;
-    use crate::shared::{algebra::multi_point_eval::multi_point_eval_naive, ark_serialize::*};
+    use crate::shared::algebra::multi_point_eval::multi_point_eval_naive;
+    use aptos_crypto::arkworks::serialization::{ark_de, ark_se};
     use ark_ec::VariableBaseMSM;
     use ark_ff::FftField;
     use ark_poly::{domain::DomainCoeff, EvaluationDomain, Radix2EvaluationDomain};
@@ Expand Down @@

crates/aptos-batch-encryption/src/shared/ciphertext/bibe.rs

-Original file line number
+Diff line change
@@ Expand Up / @@ -8,10 +8,11 @@ use super::super::{ @@
     use crate::{
         errors::BatchEncryptionError,
         group::{Fr, G1Affine, G2Affine, G2Prepared, PairingOutput, PairingSetting},
-        shared::{ark_serialize::*, digest::EvalProof, encryption_key::EncryptionKey, ids::Id},
+        shared::{digest::EvalProof, encryption_key::EncryptionKey, ids::Id},
         traits::Plaintext,
     };
     use anyhow::Result;
+    use aptos_crypto::arkworks::serialization::{ark_de, ark_se};
     use ark_ec::{pairing::Pairing, AffineRepr};
     use ark_serialize::CanonicalSerialize;
     use ark_std::{
@@ Expand Down @@

crates/aptos-batch-encryption/src/shared/ciphertext/bibe_succinct.rs

-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,6 @@ use crate::{ @@
         errors::BatchEncryptionError,
         group::{Fr, G1Affine, G2Affine, PairingOutput, PairingSetting},
         shared::{
-            ark_serialize::*,
             ciphertext::bibe::{BIBECTEncrypt, InnerCiphertext},
             digest::{Digest, EvalProof},
             encryption_key::AugmentedEncryptionKey,
@@ Expand All / @@ -20,6 +19,7 @@ use crate::{ @@
         traits::Plaintext,
     };
     use anyhow::Result;
+    use aptos_crypto::arkworks::serialization::{ark_de, ark_se};
     use ark_ec::{pairing::Pairing, AffineRepr};
     use ark_serialize::CanonicalSerialize;
     use ark_std::{
@@ Expand Down @@

crates/aptos-batch-encryption/src/shared/digest.rs

-Original file line number
+Diff line change
@@ Expand Up / @@ -6,9 +6,10 @@ use super::ids::{ComputedCoeffs, Id, IdSet}; @@
     use crate::{
         errors::BatchEncryptionError,
         group::{Fr, G1Affine, G1Projective, G2Affine, G2Projective, PairingSetting},
-        shared::{algebra::fk_algorithm::FKDomain, ark_serialize::*, ids::UncomputedCoeffs},
+        shared::{algebra::fk_algorithm::FKDomain, ids::UncomputedCoeffs},
     };
     use anyhow::{anyhow, Result};
+    use aptos_crypto::arkworks::serialization::{ark_de, ark_se};
     use ark_ec::{pairing::Pairing, AffineRepr, ScalarMul, VariableBaseMSM};
     use ark_std::{
         rand::{CryptoRng, RngCore},
@@ Expand Down @@

crates/aptos-batch-encryption/src/shared/encryption_key.rs

-Original file line number
+Diff line change
@@ Expand Up / @@ -3,12 +3,12 @@ @@
     use crate::{
         group::G2Affine,
         shared::{
-            ark_serialize::*,
             digest::Digest,
             key_derivation::{BIBEDecryptionKey, BIBEMasterPublicKey},
         },
     };
     use anyhow::Result;
+    use aptos_crypto::arkworks::serialization::{ark_de, ark_se};
     use serde::{Deserialize, Serialize};
     #[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
@@ Expand Down @@

crates/aptos-batch-encryption/src/shared/ids/mod.rs

-Original file line number
+Diff line change
@@ Expand Up / @@ -2,11 +2,9 @@ @@
     // Licensed pursuant to the Innovation-Enabling Source Code License, available at https://github.com/aptos-labs/aptos-core/blob/main/LICENSE
     use crate::{
         group::{Fr, G1Affine, G1Projective},
-        shared::{
-            algebra::mult_tree::{compute_mult_tree, quotient},
-            ark_serialize::*,
-        },
+        shared::algebra::mult_tree::{compute_mult_tree, quotient},
     };
+    use aptos_crypto::arkworks::serialization::{ark_de, ark_se};
     use ark_ec::VariableBaseMSM as _;
     use ark_ff::field_hashers::{DefaultFieldHasher, HashToField};
     use ark_poly::univariate::DensePolynomial;
@@ Expand Down @@

crates/aptos-batch-encryption/src/shared/key_derivation.rs

-Original file line number
+Diff line change
@@ Expand Up / @@ -4,12 +4,15 @@ use super::symmetric; @@
     use crate::{
         errors::BatchEncryptionError,
         group::{Fr, G1Affine, G2Affine, PairingSetting},
-        shared::{ark_serialize::*, digest::Digest},
+        shared::digest::Digest,
         traits::{DecryptionKeyShare, VerificationKey},
     };
     use anyhow::Result;
     use aptos_crypto::{
-        arkworks::shamir::{Reconstructable, ShamirGroupShare, ShamirThresholdConfig},
+        arkworks::{
+            serialization::{ark_de, ark_se},
+            shamir::{Reconstructable, ShamirGroupShare, ShamirThresholdConfig},
+        },
         player::Player,
     };
     use ark_ec::{pairing::Pairing as _, AffineRepr};
@@ Expand Down @@

crates/aptos-batch-encryption/src/shared/mod.rs

-Original file line number
+Diff line change
@@ -1,7 +1,6 @@
     // Copyright (c) Aptos Foundation
     // Licensed pursuant to the Innovation-Enabling Source Code License, available at https://github.com/aptos-labs/aptos-core/blob/main/LICENSE
     pub mod algebra;
-    pub mod ark_serialize;
     pub mod ciphertext;
     pub mod digest;
     pub mod encryption_key;
@@ Expand Down @@

crates/aptos-crypto-derive/src/unions.rs

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -277,20 +277,20 @@ pub fn impl_enum_signature(
  
                type VerifyingKeyMaterial = #pub_kt;

                type SigningKeyMaterial = #priv_kt;

                fn verify<T: aptos_crypto::hash::CryptoHash + serde::Serialize>(&self, message: &T, public_key: &Self::VerifyingKeyMaterial) -> std::result::Result<(), aptos_crypto::error::Error> {

                fn verify<T: aptos_crypto::hash::CryptoHash + serde::Serialize>(&self, message: &T, public_key: &Self::VerifyingKeyMaterial) -> std::result::Result<(), anyhow::Error> {

                    match (self, public_key) {

                        #match_struct_arms

                        _ => aptos_crypto::error::bail!(

                        _ => anyhow::bail!(

                            "provided the wrong alternative in {:?}!",

                            (self, public_key)

                        ),

                    }

                }

                fn verify_arbitrary_msg(&self, message: &[u8], public_key: &Self::VerifyingKeyMaterial) -> std::result::Result<(), aptos_crypto::error::Error> {

                fn verify_arbitrary_msg(&self, message: &[u8], public_key: &Self::VerifyingKeyMaterial) -> std::result::Result<(), anyhow::Error> {

                    match (self, public_key) {

                        #match_arms

                        _ => aptos_crypto::error::bail!(

                        _ => anyhow::bail!(

                            "provided the wrong alternative in {:?}!",

                            (self, public_key)

                        ),

crates/aptos-crypto/Cargo.toml

-Original file line number
+Diff line change
@@ Expand Up / @@ -58,6 +58,7 @@ proptest = { workspace = true, optional = true } @@
     proptest-derive = { workspace = true, optional = true }
     rand = { workspace = true }
     rand_core = { workspace = true }
+    rayon = { workspace = true }
     ring = { workspace = true }
     serde = { workspace = true }
     serde-name = { workspace = true }
@@ Expand Down @@

crates/aptos-crypto/benches/README.md

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -2,15 +2,15 @@
  
    ## Batched Bulletproofs and DeKART

    Go to `aptos-crypto`:

    Go to `aptos-crypto/benches`:

    ```

    cd crates/aptos-crypto

    cd crates/aptos-crypto/benches

    ```

    Install [`criterion-means`](https://crates.io/crates/cargo-criterion-means):

    Install [`cargo-criterion-means`](https://crates.io/crates/cargo-criterion-means):

    ```

    cargo install criterion-means

    cargo install cargo-criterion-means

    ```

    Run the Bulletproof and DeKART benchmarks in one line via:

    @@ -19,3 +19,11 @@ Run the Bulletproof and DeKART benchmarks in one line via:
  
    ```

    This will generate CSV data with the benchmark data, format it as Markdown and copy it to your clipboard!

    ## Chunky PVSS

    Follow the same steps, but run the benchmarks via:

    ```

    ./run-pvss-benches.sh

    ```

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Wicher/more dkg edits #18384

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!