Remove unneccesary pubkey arguments

Cargo.lock

@@ -48,6 +48,18 @@ dependencies = [
  "subtle",
 ]
 
+[[package]]
+name = "ahash"
+version = "0.8.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "version_check",
+ "zerocopy",
+]
+
 [[package]]
 name = "android-tzdata"
 version = "0.1.1"
@@ -254,9 +266,9 @@ checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"
 
 [[package]]
 name = "cmz"
-version = "0.1.0"
+version = "0.1.0-rc1"
 dependencies = [
- "cmz_derive",
+ "cmz-derive",
  "ff",
  "generic_static",
  "group",
@@ -266,13 +278,13 @@ dependencies = [
  "serde",
  "serde_bytes",
  "serde_with",
- "sigma_compiler",
+ "sigma-compiler",
  "thiserror 2.0.16",
 ]
 
 [[package]]
-name = "cmz_core"
-version = "0.1.0"
+name = "cmz-core"
+version = "0.1.0-rc1"
 dependencies = [
  "clap",
  "darling",
@@ -283,10 +295,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "cmz_derive"
-version = "0.1.0"
+name = "cmz-derive"
+version = "0.1.0-rc1"
 dependencies = [
- "cmz_core",
+ "cmz-core",
  "darling",
  "proc-macro2",
  "quote",
@@ -688,6 +700,12 @@ version = "0.2.175"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543"
 
+[[package]]
+name = "libm"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
+
 [[package]]
 name = "log"
 version = "0.4.28"
@@ -713,7 +731,6 @@ dependencies = [
  "serde_with",
  "sha1",
  "sha2",
- "sigma_compiler",
  "subtle",
  "thiserror 2.0.16",
  "time",
@@ -768,6 +785,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
+ "libm",
 ]
 
 [[package]]
@@ -1062,36 +1080,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
-name = "sigma-rs"
-version = "0.1.0"
-dependencies = [
- "ff",
- "group",
- "keccak",
- "num-bigint 0.4.6",
- "num-traits",
- "rand",
- "sha3",
- "subtle",
- "thiserror 1.0.69",
- "zerocopy",
- "zeroize",
-]
-
-[[package]]
-name = "sigma_compiler"
-version = "0.1.0"
+name = "sigma-compiler"
+version = "0.1.0-rc1"
 dependencies = [
  "group",
  "rand",
- "sigma-rs",
- "sigma_compiler_derive",
+ "sigma-compiler-derive",
+ "sigma-proofs",
  "subtle",
 ]
 
 [[package]]
-name = "sigma_compiler_core"
-version = "0.1.0"
+name = "sigma-compiler-core"
+version = "0.1.0-rc1"
 dependencies = [
  "clap",
  "prettyplease",
@@ -1101,13 +1102,35 @@ dependencies = [
 ]
 
 [[package]]
-name = "sigma_compiler_derive"
-version = "0.1.0"
+name = "sigma-compiler-derive"
+version = "0.1.0-rc1"
 dependencies = [
- "sigma_compiler_core",
+ "sigma-compiler-core",
  "syn 2.0.106",
 ]
 
+[[package]]
+name = "sigma-proofs"
+version = "0.1.0-sigma"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fe0d134228911458aa039f90582b9e512b06d193aa8fc460c78135367a18388"
+dependencies = [
+ "ahash",
+ "ff",
+ "group",
+ "hashbrown 0.15.5",
+ "keccak",
+ "num-bigint 0.4.6",
+ "num-traits",
+ "rand",
+ "rand_core",
+ "sha3",
+ "subtle",
+ "thiserror 1.0.69",
+ "zerocopy",
+ "zeroize",
+]
+
 [[package]]
 name = "signature"
 version = "2.2.0"

Cargo.toml

@@ -16,8 +16,8 @@ sha1 = "0.10"
 sha2 = "0.10.9"
 subtle = "2.5"
 time = "0.3.36"
-cmz = {path = "../cmz"}
-sigma_compiler = {path = "../sigma_compiler"}
+cmz = "0.1.0-rc1"
+sigma-compiler = "0.1.0-rc1"
 group = "0.13"
 ff = "0.13.1"
 bincode = "1"

src/mock_auth.rs

@@ -180,7 +180,7 @@ impl TestHarness {
         cred: Lox,
         mig_cred: Migration,
     ) -> Lox {
-        let migration_request = migration::request(rng, cred, mig_cred, self.ba.lox_pub.clone());
+        let migration_request = migration::request(rng, cred, mig_cred);
         assert!(
             migration_request.is_ok(),
             "Migration request should succeed"
@@ -215,13 +215,7 @@ impl TestHarness {
         let trust_level: u32 = scalar_u32(&cred.trust_level.unwrap()).unwrap();
         self.advance_days(LEVEL_INTERVAL[trust_level as usize] + 1);
         let reachcred = self.reach_cred(cred.clone());
-        let level_up_request = level_up::request(
-            rng,
-            cred.clone(),
-            reachcred,
-            self.ba.lox_pub.clone(),
-            self.ba.today(),
-        );
+        let level_up_request = level_up::request(rng, cred.clone(), reachcred, self.ba.today());
         assert!(level_up_request.is_ok(), "Level up request should succeed");
         let (level_up_request, level_up_client_state) = level_up_request.unwrap();
         let level_up_response = self.ba.handle_level_up(level_up_request);
@@ -244,7 +238,6 @@ impl TestHarness {
         let issue_invite_request = issue_invite::request(
             rng,
             cred.clone(),
-            self.ba.lox_pub.clone(),
             reachcred,
             self.ba.invitation_pub.clone(),
             self.ba.today(),
@@ -310,8 +303,7 @@ impl TestHarness {
         cred: Lox,
         mig_cred: Migration,
     ) -> Lox {
-        let migration_request =
-            blockage_migration::request(rng, cred, mig_cred, self.ba.lox_pub.clone());
+        let migration_request = blockage_migration::request(rng, cred, mig_cred);
         assert!(
             migration_request.is_ok(),
             "Migration request should succeed"

src/proto/blockage_migration.rs

@@ -67,7 +67,6 @@ pub fn request(
     rng: &mut (impl CryptoRng + RngCore),
     L: Lox,
     M: Migration,
-    pubkeys: CMZPubkey<G>,
 ) -> Result<(blockage_migration::Request, blockage_migration::ClientState), CredentialError> {
     cmz_group_init(G::hash_from_bytes::<Sha512>(b"CMZ Generator A"));
 
@@ -99,7 +98,7 @@ pub fn request(
         ));
     }
 
-    let mut N = Lox::using_pubkey(&pubkeys);
+    let mut N = Lox::using_pubkey(L.get_pubkey());
     N.bucket = M.to_bucket;
     N.trust_level = Some((level - 2).into());
     // The invites remaining is the appropriate number for the new

src/proto/issue_invite.rs

@@ -81,7 +81,6 @@ muCMZProtocol! { issue_invite,
 pub fn request(
     rng: &mut (impl CryptoRng + RngCore),
     L: Lox,
-    lox_pubkeys: CMZPubkey<G>,
     B: BucketReachability,
     inv_pub: CMZPubkey<G>,
     today: u32,
@@ -129,7 +128,7 @@ pub fn request(
     I.bucket = L.bucket;
     I.blockages = L.blockages;
 
-    let mut N: Lox = Lox::using_pubkey(&lox_pubkeys);
+    let mut N: Lox = Lox::using_pubkey(L.get_pubkey());
     N.bucket = L.bucket;
     N.trust_level = L.trust_level;
     N.level_since = L.level_since;

src/proto/level_up.rs

@@ -95,7 +95,6 @@ pub fn request(
     rng: &mut (impl CryptoRng + RngCore),
     L: Lox,
     B: BucketReachability,
-    pubkeys: CMZPubkey<G>,
     today: u32,
 ) -> Result<(level_up::Request, level_up::ClientState), CredentialError> {
     cmz_group_init(G::hash_from_bytes::<Sha512>(b"CMZ Generator A"));
@@ -186,7 +185,7 @@ pub fn request(
     } else {
         trust_level
     };
-    let mut N = Lox::using_pubkey(&pubkeys);
+    let mut N = Lox::using_pubkey(L.get_pubkey());
     N.bucket = L.bucket;
     N.trust_level = Some(new_level.into());
     N.invites_remaining = Some(LEVEL_INVITATIONS[trust_level as usize].into());

src/proto/migration.rs

@@ -63,7 +63,6 @@ pub fn request(
     rng: &mut (impl CryptoRng + RngCore),
     L: Lox,
     M: Migration,
-    pubkeys: CMZPubkey<G>,
 ) -> Result<(migration::Request, migration::ClientState), CredentialError> {
     cmz_group_init(G::hash_from_bytes::<Sha512>(b"CMZ Generator A"));
 
@@ -87,7 +86,7 @@ pub fn request(
         return Err(CredentialError::CredentialMismatch);
     }
 
-    let mut N = Lox::using_pubkey(&pubkeys);
+    let mut N = Lox::using_pubkey(L.get_pubkey());
     N.bucket = M.to_bucket;
     N.trust_level = Some(Scalar::ONE);
     N.invites_remaining = Some(Scalar::ZERO);