Merge pull request nucypher#171 from piotr-roslaniec/python-versions

Update supported Python versions

.github/workflows/workspace.yml

@@ -21,12 +21,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@v1
         with:
           toolchain: stable
-          components: clippy
-          override: true
-          profile: minimal
+          components: clippy, rustfmt
       - uses: actions/cache@v3
         continue-on-error: false
         with:
@@ -39,10 +37,7 @@ jobs:
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
           restore-keys: ${{ runner.os }}-cargo-
       - run: cargo clippy --all --all-features -- -D warnings
-      - uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all -- --check
+      - run: cargo fmt --all -- --check
       - name: Install cargo-machete
         uses: baptiste0928/cargo-install@v1
         with:
@@ -66,12 +61,10 @@ jobs:
             rust: stable
     steps:
       - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@v1
         with:
-          profile: minimal
           toolchain: ${{ matrix.rust }}
-          target: ${{ matrix.target }}
-          override: true
+          targets: ${{ matrix.target }}
       - uses: actions/cache@v3
         continue-on-error: false
         with:
@@ -100,12 +93,10 @@ jobs:
           - wasm32-unknown-unknown
     steps:
       - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@v1
         with:
-          profile: minimal
           toolchain: ${{ matrix.rust }}
-          target: ${{ matrix.target }}
-          override: true
+          targets: ${{ matrix.target }}
       - run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
       - run: wasm-pack test --node
         working-directory: ferveo-wasm
@@ -120,12 +111,10 @@ jobs:
           - wasm32-unknown-unknown
     steps:
       - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@v1
         with:
-          profile: minimal
           toolchain: ${{ matrix.rust }}
-          target: ${{ matrix.target }}
-          override: true
+          targets: ${{ matrix.target }}
       - run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
       - run: wasm-pack build --target nodejs
         working-directory: ferveo-wasm
@@ -148,6 +137,7 @@ jobs:
         target:
           - wasm32-unknown-unknown
         python:
+          - "3.11"
           - "3.12"
     steps:
       - uses: actions/checkout@v3
@@ -156,12 +146,10 @@ jobs:
           python-version: ${{ matrix.python }}
 
       - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@v1
         with:
-          profile: minimal
           toolchain: ${{ matrix.rust }}
-          target: ${{ matrix.target }}
-          override: true
+          targets: ${{ matrix.target }}
 
       - name: Install Ferveo Python package
         run: pip install -e .
@@ -195,12 +183,10 @@ jobs:
     needs: [ test ]
     steps:
       - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@v1
         with:
-          profile: minimal
           toolchain: stable
-          target: x86_64-unknown-linux-gnu
-          override: true
+          targets: x86_64-unknown-linux-gnu
       - name: Install cargo-llvm-cov
         uses: taiki-e/install-action@cargo-llvm-cov
       # Only checking the coverage of the main library,
@@ -219,12 +205,10 @@ jobs:
     needs: [ test ]
     steps:
       - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@v1
         with:
-          profile: minimal
           toolchain: stable
-          target: x86_64-unknown-linux-gnu
-          override: true
+          targets: x86_64-unknown-linux-gnu
       - name: Compile benchmarks
         run: cargo bench --no-run --no-default-features
 
@@ -244,12 +228,10 @@ jobs:
           - tpke
     steps:
       - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@v1
         with:
-          profile: minimal
           toolchain: nightly
-          target: x86_64-unknown-linux-gnu
-          override: true
+          targets: x86_64-unknown-linux-gnu
       - uses: actions/cache@v3
         continue-on-error: false
         with:

ferveo-python/setup.py

@@ -32,8 +32,6 @@
         "Programming Language :: Rust",
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: 3 :: Only",
-        "Programming Language :: Python :: 3.9",
-        "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
         "Topic :: Security :: Cryptography",

ferveo-tdec/benches/tpke.rs

@@ -189,7 +189,7 @@ pub fn bench_create_decryption_share(c: &mut Criterion) {
                         .map(|ctx| {
                             // Using create_unchecked here to avoid the cost of verifying the ciphertext
                             DecryptionShareSimple::create_unchecked(
-                                &ctx.validator_private_key,
+                                &ctx.setup_params.b,
                                 &ctx.private_key_share,
                                 &setup.shared.ciphertext.header().unwrap(),
                             )

ferveo-tdec/src/context.rs

@@ -29,7 +29,7 @@ pub struct PublicDecryptionContextSimple<E: Pairing> {
 
 #[derive(Clone, Debug)]
 pub struct SetupParams<E: Pairing> {
-    pub b: E::ScalarField,
+    pub b: E::ScalarField, // Validator private key
     pub b_inv: E::ScalarField,
     pub g: E::G1Affine,
     pub g_inv: E::G1Prepared,
@@ -71,8 +71,6 @@ pub struct PrivateDecryptionContextSimple<E: Pairing> {
     pub setup_params: SetupParams<E>,
     pub private_key_share: PrivateKeyShare<E>,
     pub public_decryption_contexts: Vec<PublicDecryptionContextSimple<E>>,
-    // TODO: Remove/replace with `setup_params.b` after refactoring
-    pub validator_private_key: E::ScalarField,
 }
 
 impl<E: Pairing> PrivateDecryptionContextSimple<E> {
@@ -82,7 +80,7 @@ impl<E: Pairing> PrivateDecryptionContextSimple<E> {
         aad: &[u8],
     ) -> Result<DecryptionShareSimple<E>> {
         DecryptionShareSimple::create(
-            &self.validator_private_key,
+            &self.setup_params.b,
             &self.private_key_share,
             ciphertext_header,
             aad,
@@ -104,7 +102,7 @@ impl<E: Pairing> PrivateDecryptionContextSimple<E> {
 
         DecryptionSharePrecomputed::new(
             self.index,
-            &self.validator_private_key,
+            &self.setup_params.b,
             &self.private_key_share,
             ciphertext_header,
             aad,

ferveo-tdec/src/lib.rs

@@ -243,7 +243,6 @@ pub mod test_common {
                     h,
                 },
                 private_key_share,
-                validator_private_key: b,
                 public_decryption_contexts: vec![],
             });
             public_contexts.push(PublicDecryptionContextSimple::<E> {

ferveo-wasm/examples/node/src/main.test.ts

@@ -22,11 +22,8 @@ const genEthAddr = (i: number) => {
   return EthereumAddress.fromString(ethAddr);
 };
 
-function setupTest() {
-  const tau = 1;
-  const sharesNum = 4;
-  const threshold = Math.floor((sharesNum * 2) / 3);
-
+const tau = 1;
+function setupTest(sharesNum :number, threshold: number) {
   const validatorKeypairs: Keypair[] = [];
   const validators: Validator[] = [];
   for (let i = 0; i < sharesNum; i++) {
@@ -63,9 +60,6 @@ function setupTest() {
   const ciphertext = ferveoEncrypt(msg, aad, dkg.publicKey());
 
   return {
-    tau,
-    sharesNum,
-    threshold,
     validatorKeypairs,
     validators,
     dkg,
@@ -79,17 +73,16 @@ function setupTest() {
 // This test suite replicates tests from ferveo-wasm/tests/node.rs
 describe("ferveo-wasm", () => {
   it("simple tdec variant", () => {
+      const sharesNum = 4;
+      const threshold = 3;
     const {
-      tau,
-      sharesNum,
-      threshold,
       validatorKeypairs,
       validators,
       messages,
       msg,
       aad,
       ciphertext,
-    } = setupTest();
+    } = setupTest(sharesNum, threshold);
 
     // Having aggregated the transcripts, the validators can now create decryption shares
     const decryptionShares: DecryptionShareSimple[] = [];
@@ -128,17 +121,16 @@ describe("ferveo-wasm", () => {
   });
 
   it("precomputed tdec variant", () => {
+      const sharesNum = 4;
+        const threshold = sharesNum; // threshold is equal to sharesNum in precomputed variant
     const {
-      tau,
-      sharesNum,
-      threshold,
       validatorKeypairs,
       validators,
       messages,
       msg,
       aad,
       ciphertext,
-    } = setupTest();
+    } = setupTest(sharesNum, threshold);
 
     // Having aggregated the transcripts, the validators can now create decryption shares
     const decryptionShares: DecryptionSharePrecomputed[] = [];