Skip to content

Wrap SetupParameters in Arc to fix memory issue #12

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.

Sign up for GitHub

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

Open
ycscaly wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Wrap SetupParameters in Arc to fix memory issue #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41d8b69
Wrap SetupParameters in Arc to fix memory issue
ycscaly Dec 29, 2025
5d90f9c
Arc-wrap SetupParameters in DKG PublicInput for consistency
ycscaly Dec 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 2pc-mpc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ itertools = { workspace = true }
thiserror = { workspace = true }
crypto-bigint = { workspace = true, features = ["serde"], default-features = false }
merlin = { workspace = true, default-features = false }
serde = { workspace = true, features = ["derive"] }
serde = { workspace = true, features = ["derive", "rc"] }
serde_json = { workspace = true, default-features = false, features = ["alloc"] }
group = { path = "../group" }
proof = { path = "../proof" }
Expand Down
24 changes: 15 additions & 9 deletions 2pc-mpc/src/decentralized_party/dkg.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ use group::{
use mpc::{AsynchronousRoundResult, AsynchronouslyAdvanceable, WeightedThresholdAccessStructure};
use serde::{Deserialize, Serialize};
use std::collections::{HashMap, HashSet};
use std::sync::Arc;

use crate::BaseProtocolContext;
pub use public_output::PublicOutput;
Expand Down Expand Up @@ -126,6 +127,8 @@ pub enum Message {
}

/// The Public Input of the DKG party.
/// Note: SetupParameters are wrapped in Arc to avoid expensive deep clones
/// since they contain large accelerator tables (~8MB each).
#[derive(Clone, Debug, PartialEq, Eq, Serialize)]
pub struct PublicInput {
class_groups_public_input: class_groups::dkg::PublicInput<
Expand All @@ -134,9 +137,9 @@ pub struct PublicInput {
NON_FUNDAMENTAL_DISCRIMINANT_LIMBS,
group::PublicParameters<Scalar>,
>,
ristretto_setup_parameters: RistrettoSetupParameters,
curve25519_setup_parameters: Curve25519SetupParameters,
secp256r1_setup_parameters: Secp256r1SetupParameters,
ristretto_setup_parameters: Arc<RistrettoSetupParameters>,
curve25519_setup_parameters: Arc<Curve25519SetupParameters>,
secp256r1_setup_parameters: Arc<Secp256r1SetupParameters>,
}

impl PublicInput {
Expand All @@ -150,23 +153,26 @@ impl PublicInput {
); MAX_PRIMES],
>,
) -> crate::Result<Self> {
let ristretto_setup_parameters =
let ristretto_setup_parameters = Arc::new(
RistrettoSetupParameters::derive_from_plaintext_parameters::<ristretto::Scalar>(
ristretto::scalar::PublicParameters::default(),
DEFAULT_COMPUTATIONAL_SECURITY_PARAMETER,
)?;
)?,
);

let curve25519_setup_parameters =
let curve25519_setup_parameters = Arc::new(
Curve25519SetupParameters::derive_from_plaintext_parameters::<curve25519::Scalar>(
group::curve25519::scalar::PublicParameters::default(),
DEFAULT_COMPUTATIONAL_SECURITY_PARAMETER,
)?;
)?,
);

let secp256r1_setup_parameters =
let secp256r1_setup_parameters = Arc::new(
Secp256r1SetupParameters::derive_from_plaintext_parameters::<secp256r1::Scalar>(
secp256r1::scalar::PublicParameters::default(),
DEFAULT_COMPUTATIONAL_SECURITY_PARAMETER,
)?;
)?,
);

let class_groups_public_input =
class_groups::dkg::PublicInput::new::<secp256k1::GroupElement>(
Expand Down
46 changes: 28 additions & 18 deletions 2pc-mpc/src/decentralized_party/reconfiguration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ use mpc::{AsynchronousRoundResult, AsynchronouslyAdvanceable, WeightedThresholdA
pub use public_output::PublicOutput;
use serde::{Deserialize, Serialize};
use std::collections::{HashMap, HashSet};
use std::sync::Arc;

pub struct Party {}

Expand Down Expand Up @@ -76,6 +77,8 @@ pub enum Message {
}

/// The Public Input of the Reconfiguration party.
/// Note: SetupParameters are wrapped in Arc to avoid expensive deep clones
/// since they contain large accelerator tables (~8MB each).
#[derive(Clone, Debug, PartialEq, Eq, Serialize)]
pub struct PublicInput {
class_groups_public_input: class_groups::reconfiguration::PublicInput<
Expand All @@ -96,21 +99,21 @@ pub struct PublicInput {
CiphertextSpaceValue<NON_FUNDAMENTAL_DISCRIMINANT_LIMBS>,
ristretto_public_key_share_first_part: ristretto::GroupElement,
ristretto_public_key_share_second_part: ristretto::GroupElement,
ristretto_setup_parameters: RistrettoSetupParameters,
ristretto_setup_parameters: Arc<RistrettoSetupParameters>,
curve25519_encryption_of_secret_key_share_first_part:
CiphertextSpaceValue<NON_FUNDAMENTAL_DISCRIMINANT_LIMBS>,
curve25519_encryption_of_secret_key_share_second_part:
CiphertextSpaceValue<NON_FUNDAMENTAL_DISCRIMINANT_LIMBS>,
curve25519_public_key_share_first_part: curve25519::GroupElement,
curve25519_public_key_share_second_part: curve25519::GroupElement,
curve25519_setup_parameters: Curve25519SetupParameters,
curve25519_setup_parameters: Arc<Curve25519SetupParameters>,
secp256r1_encryption_of_secret_key_share_first_part:
CiphertextSpaceValue<NON_FUNDAMENTAL_DISCRIMINANT_LIMBS>,
secp256r1_encryption_of_secret_key_share_second_part:
CiphertextSpaceValue<NON_FUNDAMENTAL_DISCRIMINANT_LIMBS>,
secp256r1_public_key_share_first_part: secp256r1::group_element::Value,
secp256r1_public_key_share_second_part: secp256r1::group_element::Value,
secp256r1_setup_parameters: Secp256r1SetupParameters,
secp256r1_setup_parameters: Arc<Secp256r1SetupParameters>,
}

impl PublicInput {
Expand Down Expand Up @@ -139,23 +142,26 @@ impl PublicInput {
>,
public_output: PublicOutput,
) -> crate::Result<Self> {
let ristretto_setup_parameters =
let ristretto_setup_parameters = Arc::new(
RistrettoSetupParameters::derive_from_plaintext_parameters::<ristretto::Scalar>(
ristretto::scalar::PublicParameters::default(),
DEFAULT_COMPUTATIONAL_SECURITY_PARAMETER,
)?;
)?,
);

let curve25519_setup_parameters =
let curve25519_setup_parameters = Arc::new(
Curve25519SetupParameters::derive_from_plaintext_parameters::<curve25519::Scalar>(
group::curve25519::scalar::PublicParameters::default(),
DEFAULT_COMPUTATIONAL_SECURITY_PARAMETER,
)?;
)?,
);

let secp256r1_setup_parameters =
let secp256r1_setup_parameters = Arc::new(
Secp256r1SetupParameters::derive_from_plaintext_parameters::<secp256r1::Scalar>(
secp256r1::scalar::PublicParameters::default(),
DEFAULT_COMPUTATIONAL_SECURITY_PARAMETER,
)?;
)?,
);

let secp256k1_decryption_key_share_public_parameters = public_output
.secp256k1_decryption_key_share_public_parameters(current_access_structure)?;
Expand Down Expand Up @@ -233,23 +239,26 @@ impl PublicInput {
current_tangible_party_id_to_upcoming: HashMap<PartyID, Option<PartyID>>,
universal_public_output: decentralized_party::dkg::PublicOutput,
) -> crate::Result<Self> {
let ristretto_setup_parameters =
let ristretto_setup_parameters = Arc::new(
RistrettoSetupParameters::derive_from_plaintext_parameters::<ristretto::Scalar>(
ristretto::scalar::PublicParameters::default(),
DEFAULT_COMPUTATIONAL_SECURITY_PARAMETER,
)?;
)?,
);

let curve25519_setup_parameters =
let curve25519_setup_parameters = Arc::new(
Curve25519SetupParameters::derive_from_plaintext_parameters::<curve25519::Scalar>(
group::curve25519::scalar::PublicParameters::default(),
DEFAULT_COMPUTATIONAL_SECURITY_PARAMETER,
)?;
)?,
);

let secp256r1_setup_parameters =
let secp256r1_setup_parameters = Arc::new(
Secp256r1SetupParameters::derive_from_plaintext_parameters::<secp256r1::Scalar>(
secp256r1::scalar::PublicParameters::default(),
DEFAULT_COMPUTATIONAL_SECURITY_PARAMETER,
)?;
)?,
);

let secp256k1_decryption_key_share_public_parameters = universal_public_output
.secp256k1_decryption_key_share_public_parameters(current_access_structure)?;
Expand Down Expand Up @@ -484,6 +493,7 @@ impl AsynchronouslyAdvanceable for Party {
#[cfg(test)]
pub(crate) mod tests {
use super::*;
use std::sync::Arc;
use crate::test_helpers::mock_decentralized_party_dkg;
use class_groups::dkg::test_helpers::mock_dkg_output;
use class_groups::publicly_verifiable_secret_sharing::chinese_remainder_theorem::construct_setup_parameters_per_crt_prime;
Expand Down Expand Up @@ -673,17 +683,17 @@ pub(crate) mod tests {
ristretto_encryption_of_secret_key_share_second_part,
ristretto_public_key_share_first_part,
ristretto_public_key_share_second_part,
ristretto_setup_parameters,
ristretto_setup_parameters: Arc::new(ristretto_setup_parameters),
curve25519_public_key_share_first_part,
curve25519_public_key_share_second_part,
curve25519_encryption_of_secret_key_share_first_part,
curve25519_encryption_of_secret_key_share_second_part,
curve25519_setup_parameters,
curve25519_setup_parameters: Arc::new(curve25519_setup_parameters),
secp256r1_encryption_of_secret_key_share_first_part,
secp256r1_encryption_of_secret_key_share_second_part,
secp256r1_public_key_share_first_part,
secp256r1_public_key_share_second_part,
secp256r1_setup_parameters,
secp256r1_setup_parameters: Arc::new(secp256r1_setup_parameters),
};

reconfigures_internal_internal(
Expand Down
2 changes: 1 addition & 1 deletion class-groups/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ maurer = { path = "../maurer", optional = true }
rand = { workspace = true, default-features = false }
rand_chacha = { workspace = true, default-features = false }
rstest = { workspace = true, optional = true }
serde = { workspace = true, features = ["derive"] }
serde = { workspace = true, features = ["derive", "rc"] }
sha3 = { workspace = true }
thiserror = { workspace = true }
itertools = { workspace = true }
Expand Down
24 changes: 15 additions & 9 deletions class-groups/src/dkg.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// SPDX-License-Identifier: CC-BY-NC-ND-4.0

use std::collections::{HashMap, HashSet};
use std::sync::Arc;

use crypto_bigint::{Encoding, Int, Uint};
use serde::{Deserialize, Serialize};
Expand Down Expand Up @@ -129,6 +130,8 @@ pub type ProveEqualityOfDiscreteLog<
); NUM_ENCRYPTION_OF_DECRYPTION_KEY_PRIMES];

/// The Public Input of the Distributed Key Generation (DKG) party.
/// Note: SetupParameters are wrapped in Arc to avoid expensive deep clones
/// since they contain large accelerator tables (~8MB each).
#[derive(Clone, Debug, PartialEq, Eq, Serialize)]
pub struct PublicInput<
const PLAINTEXT_SPACE_SCALAR_LIMBS: usize,
Expand Down Expand Up @@ -169,12 +172,14 @@ pub struct PublicInput<
{
plaintext_space_public_parameters: ScalarPublicParameters,
computational_security_parameter: u32,
pub setup_parameters_per_crt_prime: [SecretKeyShareCRTPrimeSetupParameters; MAX_PRIMES],
pub setup_parameters: SetupParameters<
PLAINTEXT_SPACE_SCALAR_LIMBS,
FUNDAMENTAL_DISCRIMINANT_LIMBS,
NON_FUNDAMENTAL_DISCRIMINANT_LIMBS,
ScalarPublicParameters,
pub setup_parameters_per_crt_prime: Arc<[SecretKeyShareCRTPrimeSetupParameters; MAX_PRIMES]>,
pub setup_parameters: Arc<
SetupParameters<
PLAINTEXT_SPACE_SCALAR_LIMBS,
FUNDAMENTAL_DISCRIMINANT_LIMBS,
NON_FUNDAMENTAL_DISCRIMINANT_LIMBS,
ScalarPublicParameters,
>,
>,
encryption_key_values_and_proofs_per_crt_prime: HashMap<
PartyID,
Expand Down Expand Up @@ -317,17 +322,18 @@ where
}

let setup_parameters_per_crt_prime =
construct_setup_parameters_per_crt_prime(computational_security_parameter)?;
Arc::new(construct_setup_parameters_per_crt_prime(computational_security_parameter)?);

let n_factorial = factorial(access_structure.number_of_virtual_parties());
let binomial_coefficients =
compute_binomial_coefficients(access_structure.number_of_virtual_parties());

let setup_parameters =
let setup_parameters = Arc::new(
SetupParameters::derive_from_plaintext_parameters::<GroupElement::Scalar>(
plaintext_space_public_parameters.clone(),
computational_security_parameter,
)?;
)?,
);

Ok(Self {
plaintext_space_public_parameters,
Expand Down
2 changes: 1 addition & 1 deletion class-groups/src/dkg/fourth_round.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ where

let public_output = PublicOutput::new::<GroupElement>(
access_structure,
public_input.setup_parameters_per_crt_prime.clone(),
(*public_input.setup_parameters_per_crt_prime).clone(),
malicious_decryption_key_contribution_dealers.clone(),
interpolation_subset,
adjusted_lagrange_coefficients,
Expand Down
4 changes: 2 additions & 2 deletions class-groups/src/dkg/party.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,8 +371,8 @@ where
Some(tangible_party_id),
access_structure.clone(),
access_structure.clone(),
public_input.setup_parameters.clone(),
public_input.setup_parameters_per_crt_prime.clone(),
(*public_input.setup_parameters).clone(),
(*public_input.setup_parameters_per_crt_prime).clone(),
public_input
.encryption_key_values_and_proofs_per_crt_prime
.clone(),
Expand Down
2 changes: 1 addition & 1 deletion class-groups/src/dkg/third_round.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ where
NON_FUNDAMENTAL_DISCRIMINANT_LIMBS,
GroupElement,
>::decrypt_secrets(
public_input.setup_parameters_per_crt_prime.clone(),
(*public_input.setup_parameters_per_crt_prime).clone(),
SECRET_SHARE_CRT_COEFFICIENTS,
SECRET_SHARE_CRT_PRIMES_PRODUCT,
encryptions_of_shares_per_crt_prime
Expand Down
24 changes: 15 additions & 9 deletions class-groups/src/reconfiguration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// SPDX-License-Identifier: CC-BY-NC-ND-4.0

use std::collections::{HashMap, HashSet};
use std::sync::Arc;

use crypto_bigint::{Encoding, Int, Limb, Uint};
use serde::{Deserialize, Serialize};
Expand Down Expand Up @@ -80,6 +81,8 @@ pub const RANDOMIZER_WITNESS_LIMBS: usize = find_closest_crypto_bigint_size(
) / Limb::BITS as usize;

/// The Public Input of the Reconfiguration party.
/// Note: SetupParameters are wrapped in Arc to avoid expensive deep clones
/// since they contain large accelerator tables (~8MB each).
#[derive(Clone, Debug, PartialEq, Eq, Serialize)]
pub struct PublicInput<
const PLAINTEXT_SPACE_SCALAR_LIMBS: usize,
Expand Down Expand Up @@ -120,12 +123,14 @@ pub struct PublicInput<
{
pub upcoming_access_structure: WeightedThresholdAccessStructure,
pub plaintext_space_public_parameters: ScalarPublicParameters,
pub setup_parameters_per_crt_prime: [SecretKeyShareCRTPrimeSetupParameters; MAX_PRIMES],
pub setup_parameters: SetupParameters<
PLAINTEXT_SPACE_SCALAR_LIMBS,
FUNDAMENTAL_DISCRIMINANT_LIMBS,
NON_FUNDAMENTAL_DISCRIMINANT_LIMBS,
ScalarPublicParameters,
pub setup_parameters_per_crt_prime: Arc<[SecretKeyShareCRTPrimeSetupParameters; MAX_PRIMES]>,
pub setup_parameters: Arc<
SetupParameters<
PLAINTEXT_SPACE_SCALAR_LIMBS,
FUNDAMENTAL_DISCRIMINANT_LIMBS,
NON_FUNDAMENTAL_DISCRIMINANT_LIMBS,
ScalarPublicParameters,
>,
>,
pub computational_security_parameter: u32,
pub current_encryption_key_values_and_proofs_per_crt_prime: HashMap<
Expand Down Expand Up @@ -367,14 +372,15 @@ where
return Err(Error::InvalidParameters);
}

let setup_parameters =
let setup_parameters = Arc::new(
SetupParameters::derive_from_plaintext_parameters::<GroupElement::Scalar>(
plaintext_space_public_parameters.clone(),
computational_security_parameter,
)?;
)?,
);

let setup_parameters_per_crt_prime =
construct_setup_parameters_per_crt_prime(computational_security_parameter)?;
Arc::new(construct_setup_parameters_per_crt_prime(computational_security_parameter)?);

Ok(Self {
plaintext_space_public_parameters,
Expand Down
4 changes: 2 additions & 2 deletions class-groups/src/reconfiguration/party.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,8 +417,8 @@ where
upcoming_party_id,
current_access_structure.clone(),
public_input.upcoming_access_structure.clone(),
public_input.setup_parameters.clone(),
public_input.setup_parameters_per_crt_prime.clone(),
(*public_input.setup_parameters).clone(),
(*public_input.setup_parameters_per_crt_prime).clone(),
public_input
.upcoming_encryption_key_values_and_proofs_per_crt_prime
.clone(),
Expand Down
Loading