Ns/plug zk v2 #1846

nsarlin-zama · 2024-12-04T10:53:40Z

closes: https://github.com/zama-ai/tfhe-rs-internal/issues/772

PR content/description

Plugs ZK V2. The CompactPkeCrs type is now an enum with a variant for V1 and V2, each holding the right 'PublicParam' type from tfhe_zk_pok. The proof is similarly wrapped in an enum. A prove method has been added on the Crs object that will generate a proof compatible with this Crs. Similarly, a verify method will always reject proofs that are not of the right kind.

Backward compatibility is maintained and old crs/proofs are automatically wrapped in the V1 scheme. A fix was needed in versionable for this, to make it handle type that evolve from #[repr(transparent)] to their own type.

By default new Crs are created using v2, but methods have been added to create a Crs with v1.

Proof conformance checks the version of the scheme.

Check-list:

Tests for the changes have been added -> Need to add a v2 proof in data repo
Param update
Docs have been added / updated (for bug fixes / features)
Relevant issues are marked as resolved/closed, related issues are linked in the description
Check for breaking changes (including serialization changes) and add them to commit message following the conventional commit specification

IceTDrinker · 2024-12-05T10:07:33Z

tfhe/src/shortint/parameters/compact_public_key_only/p_fail_2_minus_64/ks_pbs.rs

+/// This parameter set should be used when doing zk proof of public key encryption
 pub const PARAM_PKE_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64: CompactPublicKeyEncryptionParameters =
    CompactPublicKeyEncryptionParameters {
-        encryption_lwe_dimension: LweDimension(1024),
-        encryption_noise_distribution: DynamicDistribution::new_t_uniform(42),
+        encryption_lwe_dimension: LweDimension(2048),


I'll check if the keyswitching parameters need an update as well

looks like the keyswitch to big key needs a small update, I'll give you the info to update and have legacy constants there as well

mayeul-zama

Just a few comments
FYI I only had a quick look at the "plug zk v2" commit

tfhe-zk-pok/src/backward_compatibility/pke_v2.rs

utils/tfhe-versionable/examples/transparent_then_not.rs

utils/tfhe-versionable-derive/src/version_type.rs

utils/tfhe-versionable/examples/transparent_then_not.rs

mayeul-zama

Thanks!

IceTDrinker · 2024-12-06T10:10:14Z

please don't merge right away, I'd like to have a chance to discuss the keyswitching parameters before you do (and read the PR as well)

utils/tfhe-versionable/examples/transparent_then_not.rs

IceTDrinker · 2024-12-12T14:43:00Z

tfhe/src/zk/mod.rs

+
+pub struct CompactPkeCrsConformanceParams {
+    lwe_dim: LweDimension,
+    max_num_message: usize,


IceTDrinker

It seems we are missing a check on k_max <= d it seems, otherwise we are looking good, after the parameter stuff

IceTDrinker · 2024-12-13T10:07:41Z

tfhe/src/shortint/parameters/compact_public_key_only/p_fail_2_minus_64/ks_pbs.rs

+/// This parameter set should be used when doing zk proof of public key encryption
 pub const PARAM_PKE_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64: CompactPublicKeyEncryptionParameters =
    CompactPublicKeyEncryptionParameters {
-        encryption_lwe_dimension: LweDimension(1024),
-        encryption_noise_distribution: DynamicDistribution::new_t_uniform(42),
+        encryption_lwe_dimension: LweDimension(2048),
+        encryption_noise_distribution: DynamicDistribution::new_t_uniform(17),
        message_modulus: MessageModulus(4),
        carry_modulus: CarryModulus(4),
        ciphertext_modulus: CiphertextModulus::new_native(),
        expansion_kind: CompactCiphertextListExpansionKind::RequiresCasting,
    }
    .validate();
+
+/// This legacy parameter set should be used with the v1 pke zk scheme
+pub const PARAM_PKE_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64_ZK_V1:
+    CompactPublicKeyEncryptionParameters = CompactPublicKeyEncryptionParameters {


did you do the keyswitch parameters update ?

IceTDrinker · 2024-12-13T10:08:19Z

tfhe/src/shortint/parameters/compact_public_key_only/p_fail_2_minus_64/ks_pbs.rs

+/// This legacy parameter set should be used with the v1 pke zk scheme
+pub const PARAM_PKE_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64_ZK_V1:


also this does not respect the potential TFHE-rs version being in the name of consts

I know, I did not reworked the params yet

BREAKING CHANGE: - The object ZkVerificationOutCome has been renamed ZkVerificationOutcome. - Conformance of proofs now checks the scheme version of the CRS. This is breaking at the shortint and core_crypto levels, and for manually built integer conformance params. New CRS will be generated with the V2 Scheme by default, but V1 CRS and proofs are still accepted, so this is not breaking. New methods have been added to generate a V1 CRS.

This allows to detect unused dispatch enums

cla-bot bot added the cla-signed label Dec 4, 2024

nsarlin-zama force-pushed the ns/plug_zk_v2 branch 2 times, most recently from dd5e5d0 to 74813d9 Compare December 4, 2024 14:13

nsarlin-zama mentioned this pull request Dec 4, 2024

feat: add data for proven list with zk v2 zama-ai/tfhe-backward-compat-data#30

Merged

nsarlin-zama force-pushed the ns/plug_zk_v2 branch from 74813d9 to 0768a5d Compare December 4, 2024 15:37

nsarlin-zama added the data_PR This is a PR that needs to fetch new data for backward compat tests label Dec 4, 2024

nsarlin-zama requested review from tmontaigu, mayeul-zama and IceTDrinker December 4, 2024 15:38

nsarlin-zama force-pushed the ns/plug_zk_v2 branch 2 times, most recently from 13a73e4 to 7e57b6a Compare December 5, 2024 10:00

IceTDrinker reviewed Dec 5, 2024

View reviewed changes

mayeul-zama reviewed Dec 5, 2024

View reviewed changes

tfhe-zk-pok/src/backward_compatibility/pke_v2.rs Show resolved Hide resolved

utils/tfhe-versionable/examples/transparent_then_not.rs Show resolved Hide resolved

tmontaigu reviewed Dec 5, 2024

View reviewed changes

utils/tfhe-versionable-derive/src/version_type.rs Outdated Show resolved Hide resolved

utils/tfhe-versionable/examples/transparent_then_not.rs Outdated Show resolved Hide resolved

nsarlin-zama force-pushed the ns/plug_zk_v2 branch from 7e57b6a to 5e55167 Compare December 5, 2024 13:57

nsarlin-zama requested review from mayeul-zama, tmontaigu and IceTDrinker December 5, 2024 15:19

mayeul-zama approved these changes Dec 6, 2024

View reviewed changes

zama-bot added the approved label Dec 6, 2024

tmontaigu reviewed Dec 6, 2024

View reviewed changes

utils/tfhe-versionable/examples/transparent_then_not.rs Outdated Show resolved Hide resolved

nsarlin-zama force-pushed the ns/plug_zk_v2 branch from eb461a7 to b700a24 Compare December 6, 2024 15:45

zama-bot removed the approved label Dec 6, 2024

nsarlin-zama requested a review from tmontaigu December 9, 2024 08:57

IceTDrinker reviewed Dec 12, 2024

View reviewed changes

nsarlin-zama force-pushed the ns/plug_zk_v2 branch 2 times, most recently from 3b94cf0 to 64c4476 Compare December 13, 2024 09:58

IceTDrinker reviewed Dec 13, 2024

View reviewed changes

nsarlin-zama force-pushed the ns/plug_zk_v2 branch from 64c4476 to 55dafc1 Compare December 13, 2024 11:20

nsarlin-zama requested a review from IceTDrinker December 13, 2024 11:21

nsarlin-zama force-pushed the ns/plug_zk_v2 branch from 55dafc1 to ad65d19 Compare December 13, 2024 11:22

nsarlin-zama added 6 commits December 16, 2024 13:04

feat(versionable): "Version" macro now handles transparent attribute

3e3737e

fix(zk-pok): missing Versionize for ComputeLoadProofFields

2a23976

chore(zk)!: update parameters for zk v2

c898e64

chore(backward): move allow(dead_code) to dispatch variants

1edb808

This allows to detect unused dispatch enums

chore(zk): check that k <= d for zk crs

a68f83e

nsarlin-zama force-pushed the ns/plug_zk_v2 branch from ad65d19 to a68f83e Compare December 16, 2024 12:05

nsarlin-zama added the approved label Dec 16, 2024

nsarlin-zama merged commit 03956a9 into main Dec 16, 2024
100 of 106 checks passed

nsarlin-zama deleted the ns/plug_zk_v2 branch December 16, 2024 15:00

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Ns/plug zk v2 #1846

Ns/plug zk v2 #1846

nsarlin-zama commented Dec 4, 2024 •

edited

Loading

IceTDrinker Dec 5, 2024

IceTDrinker Dec 5, 2024

mayeul-zama left a comment

mayeul-zama left a comment

IceTDrinker commented Dec 6, 2024

IceTDrinker Dec 12, 2024

IceTDrinker left a comment

IceTDrinker Dec 13, 2024

nsarlin-zama Dec 13, 2024

IceTDrinker Dec 13, 2024

nsarlin-zama Dec 13, 2024

		/// This legacy parameter set should be used with the v1 pke zk scheme
		pub const PARAM_PKE_MESSAGE_2_CARRY_2_KS_PBS_TUNIFORM_2M64_ZK_V1:

Ns/plug zk v2 #1846

Ns/plug zk v2 #1846

Conversation

nsarlin-zama commented Dec 4, 2024 • edited Loading

PR content/description

Check-list:

IceTDrinker Dec 5, 2024

Choose a reason for hiding this comment

IceTDrinker Dec 5, 2024

Choose a reason for hiding this comment

mayeul-zama left a comment

Choose a reason for hiding this comment

mayeul-zama left a comment

Choose a reason for hiding this comment

IceTDrinker commented Dec 6, 2024

IceTDrinker Dec 12, 2024

Choose a reason for hiding this comment

IceTDrinker left a comment

Choose a reason for hiding this comment

IceTDrinker Dec 13, 2024

Choose a reason for hiding this comment

nsarlin-zama Dec 13, 2024

Choose a reason for hiding this comment

IceTDrinker Dec 13, 2024

Choose a reason for hiding this comment

nsarlin-zama Dec 13, 2024

Choose a reason for hiding this comment

nsarlin-zama commented Dec 4, 2024 •

edited

Loading