update dependencies

.github/workflows/nucypher-core.yml

@@ -125,7 +125,7 @@ jobs:
         run: pip install mypy
 
       - name: Run mypy.stubtest
-        run: python -m mypy.stubtest nucypher_core
+        run: python -m mypy.stubtest nucypher_core --allowlist stubtest-allowlist.txt
         working-directory: nucypher-core-python
 
   trigger-wheels:

nucypher-core-python/Cargo.toml

@@ -10,8 +10,8 @@ crate-type = ["cdylib"]
 [dependencies]
 pyo3 = "0.18"
 nucypher-core = { path = "../nucypher-core" }
-umbral-pre = { version = "0.10.0", features = ["bindings-python"], git = "https://github.com/piotr-roslaniec/rust-umbral.git", ref = "4b28a85c494e4e2640abb131460da0680a74134d" }
-ferveo = { package = "ferveo-pre-release", features = ["bindings-python"], git = "https://github.com/nucypher/ferveo.git", ref = "fbb97be59d991a263233a0b876da982143b2cbf2" }
+umbral-pre = { version = "0.10.0", features = ["bindings-python"], git = "https://github.com/piotr-roslaniec/rust-umbral.git", rev = "fd2e16f9304b9dab85c9a8947a61d962ff136131" }
+ferveo = { package = "ferveo-pre-release", features = ["bindings-python"], git = "https://github.com/nucypher/ferveo.git", rev = "cea467e0bd48a096f70dd1c7ca24a7e4bd88b3d4" }
 derive_more = { version = "0.99", default-features = false, features = ["from", "as_ref"] }
 
 [build-dependencies]

nucypher-core-python/README.md

@@ -9,6 +9,13 @@ This repo contains the Python bindings for the [main Rust project][nucypher-core
 
 You will need to have `setuptools-rust` installed. Then, for development you can just do `pip install -e .` as usual.
 
+## Development
+
+Update `nucypher-core-python/stubtest-allowlist.txt` with:
+```bash
+cd umbral-pre-python
+python -m mypy.stubtest nucypher_core --generate-allowlist > stubtest-allowlist.txt
+```
 
 [pypi-image]: https://img.shields.io/pypi/v/nucypher-core
 [pypi-link]: https://pypi.org/project/nucypher-core/

nucypher-core-python/nucypher_core/__init__.pyi

@@ -12,7 +12,8 @@ from .umbral import (
 
 from .ferveo import (
     FerveoPublicKey,
-    Ciphertext
+    Ciphertext,
+    FerveoVariant
 )
 
 
@@ -431,7 +432,7 @@ class MetadataResponse:
 @final
 class ThresholdDecryptionRequest:
 
-    def __init__(self, ritual_id: int, variant: int, ciphertext: Ciphertext, conditions: Optional[Conditions],
+    def __init__(self, ritual_id: int, variant: FerveoVariant, ciphertext: Ciphertext, conditions: Optional[Conditions],
                  context: Optional[Context]):
         ...
 
@@ -441,7 +442,7 @@ class ThresholdDecryptionRequest:
 
     context: Optional[Context]
 
-    variant: int
+    variant: FerveoVariant
 
     ciphertext: Ciphertext
 

nucypher-core-python/nucypher_core/ferveo.pyi

@@ -1,5 +1,6 @@
 from typing import Sequence, final
 
+
 @final
 class Keypair:
     @staticmethod
@@ -24,6 +25,7 @@ class Keypair:
     def public_key(self) -> FerveoPublicKey:
         ...
 
+
 @final
 class FerveoPublicKey:
     @staticmethod
@@ -40,6 +42,10 @@ class FerveoPublicKey:
     def serialized_size() -> int:
         ...
 
+    def __eq__(self, other: object) -> bool:
+        ...
+
+
 @final
 class Validator:
 
@@ -50,6 +56,7 @@ class Validator:
 
     public_key: FerveoPublicKey
 
+
 @final
 class Transcript:
     @staticmethod
@@ -59,6 +66,7 @@ class Transcript:
     def __bytes__(self) -> bytes:
         ...
 
+
 @final
 class DkgPublicKey:
     @staticmethod
@@ -72,6 +80,7 @@ class DkgPublicKey:
     def serialized_size() -> int:
         ...
 
+
 @final
 class ValidatorMessage:
 
@@ -85,6 +94,7 @@ class ValidatorMessage:
     validator: Validator
     transcript: Transcript
 
+
 @final
 class Dkg:
 
@@ -106,6 +116,7 @@ class Dkg:
     def aggregate_transcripts(self, messages: Sequence[ValidatorMessage]) -> AggregatedTranscript:
         ...
 
+
 @final
 class Ciphertext:
     @staticmethod
@@ -115,6 +126,7 @@ class Ciphertext:
     def __bytes__(self) -> bytes:
         ...
 
+
 @final
 class DecryptionShareSimple:
     @staticmethod
@@ -123,6 +135,8 @@ class DecryptionShareSimple:
 
     def __bytes__(self) -> bytes:
         ...
+
+
 @final
 class DecryptionSharePrecomputed:
     @staticmethod
@@ -132,6 +146,7 @@ class DecryptionSharePrecomputed:
     def __bytes__(self) -> bytes:
         ...
 
+
 @final
 class AggregatedTranscript:
 
@@ -166,6 +181,7 @@ class AggregatedTranscript:
     def __bytes__(self) -> bytes:
         ...
 
+
 @final
 class SharedSecret:
 
@@ -179,22 +195,25 @@ class SharedSecret:
 
 @final
 class FerveoVariant:
-    simple: str
-    precomputed: str
+    simple: FerveoVariant
+    precomputed: FerveoVariant
+
+    def __eq__(self, other: object) -> bool:
+        ...
 
 
 def encrypt(message: bytes, aad: bytes, dkg_public_key: DkgPublicKey) -> Ciphertext:
     ...
 
 
 def combine_decryption_shares_simple(
-        shares: Sequence[DecryptionShareSimple],
+        decryption_shares: Sequence[DecryptionShareSimple],
 ) -> bytes:
     ...
 
 
 def combine_decryption_shares_precomputed(
-        shares: Sequence[DecryptionSharePrecomputed],
+        decryption_shares: Sequence[DecryptionSharePrecomputed],
 ) -> SharedSecret:
     ...
 

nucypher-core-python/nucypher_core/umbral.pyi

@@ -1,4 +1,4 @@
-from typing import Optional, Tuple, List, final
+from typing import Optional, Tuple, List, final, Sequence
 
 
 @final
@@ -124,8 +124,8 @@ class KeyFrag:
     def verify(
             self,
             verifying_pk: PublicKey,
-            delegating_pk: Optional[PublicKey] = ...,
-            receiving_pk: Optional[PublicKey] = ...,
+            delegating_pk: Optional[PublicKey] = None,
+            receiving_pk: Optional[PublicKey] = None,
     ) -> VerifiedKeyFrag:
         ...
 
@@ -207,13 +207,13 @@ def reencrypt(capsule: Capsule, kfrag: VerifiedKeyFrag) -> VerifiedCapsuleFrag:
 
 @final
 class CurvePoint:
-    coordinates: Tuple[bytes, bytes]
+    coordinates: Optional[Tuple[bytes, bytes]]
 
 
 @final
 class Parameters:
 
-    def __init__(self, *args) -> None:
+    def __init__(self) -> None:
         ...
 
     u: CurvePoint

nucypher-core-python/src/lib.rs

@@ -749,7 +749,7 @@ impl ThresholdDecryptionRequest {
     #[new]
     pub fn new(
         ritual_id: u32,
-        variant: &str,
+        variant: FerveoVariant,
         ciphertext: &Ciphertext,
         conditions: Option<&Conditions>,
         context: Option<&Context>,
@@ -762,7 +762,7 @@ impl ThresholdDecryptionRequest {
                     .map(|conditions| conditions.backend.clone())
                     .as_ref(),
                 context.map(|context| context.backend.clone()).as_ref(),
-                variant,
+                variant.into(),
             ),
         })
     }
@@ -796,8 +796,8 @@ impl ThresholdDecryptionRequest {
     }
 
     #[getter]
-    pub fn variant(&self) -> String {
-        self.backend.variant.to_string()
+    pub fn variant(&self) -> FerveoVariant {
+        self.backend.variant.into()
     }
 
     pub fn encrypt(

nucypher-core-python/stubtest-allowlist.txt

@@ -0,0 +1 @@
+nucypher_core.umbral.Parameters.__init__

nucypher-core-wasm/Cargo.toml

@@ -19,8 +19,8 @@ crate-type = ["cdylib", "rlib"]
 default = ["console_error_panic_hook"]
 
 [dependencies]
-umbral-pre = { version = "0.10.0", features = ["bindings-wasm"], git = "https://github.com/piotr-roslaniec/rust-umbral.git", ref = "4b28a85c494e4e2640abb131460da0680a74134d" }
-ferveo = { package = "ferveo-pre-release", features = ["bindings-wasm"], git = "https://github.com/nucypher/ferveo.git", ref = "fbb97be59d991a263233a0b876da982143b2cbf2" }
+umbral-pre = { version = "0.10.0", features = ["bindings-wasm"], git = "https://github.com/piotr-roslaniec/rust-umbral.git", rev = "fd2e16f9304b9dab85c9a8947a61d962ff136131" }
+ferveo = { package = "ferveo-pre-release", features = ["bindings-wasm"], git = "https://github.com/nucypher/ferveo.git", rev = "cea467e0bd48a096f70dd1c7ca24a7e4bd88b3d4" }
 nucypher-core = { path = "../nucypher-core" }
 wasm-bindgen = "0.2.86"
 js-sys = "0.3.63"

nucypher-core-wasm/src/lib.rs

@@ -12,7 +12,7 @@ use alloc::{
 };
 use core::fmt;
 
-use ferveo::{api::FerveoVariant, bindings_wasm::Ciphertext};
+use ferveo::bindings_wasm::{Ciphertext, FerveoVariant};
 use js_sys::Error;
 use umbral_pre::bindings_wasm::{
     Capsule, PublicKey, RecoverableSignature, SecretKey, Signer, VerifiedCapsuleFrag,
@@ -664,26 +664,20 @@ impl ThresholdDecryptionRequest {
     #[wasm_bindgen(constructor)]
     pub fn new(
         ritual_id: u32,
-        variant: u8,
+        variant: &FerveoVariant,
         ciphertext: &Ciphertext,
         conditions: &OptionConditions,
         context: &OptionContext,
     ) -> Result<ThresholdDecryptionRequest, Error> {
         let typed_conditions = try_from_js_option::<Conditions>(conditions)?;
         let typed_context = try_from_js_option::<Context>(context)?;
 
-        let ferveo_variant = match variant {
-            0 => FerveoVariant::Simple,
-            1 => FerveoVariant::Precomputed,
-            _ => return Err(Error::new("Invalid variant")),
-        };
-
         Ok(Self(nucypher_core::ThresholdDecryptionRequest::new(
             ritual_id,
             ciphertext.as_ref(),
             typed_conditions.as_ref().map(|conditions| &conditions.0),
             typed_context.as_ref().map(|context| &context.0),
-            ferveo_variant,
+            variant.clone().into(),
         )))
     }
 
@@ -693,11 +687,8 @@ impl ThresholdDecryptionRequest {
     }
 
     #[wasm_bindgen(getter)]
-    pub fn variant(&self) -> u8 {
-        match self.0.variant {
-            FerveoVariant::Simple => 0,
-            FerveoVariant::Precomputed => 1,
-        }
+    pub fn variant(&self) -> FerveoVariant {
+        self.0.variant.into()
     }
 
     #[wasm_bindgen(getter)]

nucypher-core-wasm/tests/wasm.rs

@@ -1,6 +1,6 @@
 use nucypher_core_wasm::*;
 
-use ferveo::bindings_wasm::{ferveo_encrypt, DkgPublicKey, Keypair};
+use ferveo::bindings_wasm::{ferveo_encrypt, DkgPublicKey, FerveoVariant, Keypair};
 use umbral_pre::bindings_wasm::{
     generate_kfrags, reencrypt, Capsule, RecoverableSignature, SecretKey, Signer,
     VerifiedCapsuleFrag, VerifiedKeyFrag,
@@ -704,7 +704,7 @@ fn threshold_decryption_request() {
 
     let request = ThresholdDecryptionRequest::new(
         ritual_id,
-        0,
+        &FerveoVariant::simple(),
         &ciphertext,
         &conditions_js.unchecked_into::<OptionConditions>(),
         &context.unchecked_into::<OptionContext>(),

nucypher-core/Cargo.toml

@@ -10,8 +10,8 @@ readme = "README.md"
 categories = ["cryptography", "no-std"]
 
 [dependencies]
-umbral-pre = { version = "0.10.0", features = ["serde"], git = "https://github.com/piotr-roslaniec/rust-umbral.git", ref = "4b28a85c494e4e2640abb131460da0680a74134d" }
-ferveo = { package = "ferveo-pre-release", git = "https://github.com/nucypher/ferveo.git", ref = "fbb97be59d991a263233a0b876da982143b2cbf2" }
+umbral-pre = { version = "0.10.0", features = ["serde"], git = "https://github.com/piotr-roslaniec/rust-umbral.git", rev = "fd2e16f9304b9dab85c9a8947a61d962ff136131" }
+ferveo = { package = "ferveo-pre-release", git = "https://github.com/nucypher/ferveo.git", rev = "cea467e0bd48a096f70dd1c7ca24a7e4bd88b3d4" }
 serde = { version = "1", default-features = false, features = ["derive"] }
 generic-array = { version = "0.14", features = ["zeroize"] }
 sha3 = "0.10"