Update from kayabaNerve/monero-oxide to monero-oxide/monero-oxide

2025-12-08 12:19:24 +00:00 · 2025-08-27 20:55:22 -04:00
parent 2f833dec77
commit 85949f4b04
14 changed files with 41 additions and 181 deletions
--- a/crypto/dkg/evrf/Cargo.toml
+++ b/crypto/dkg/evrf/Cargo.toml
@@ -34,10 +34,10 @@ generic-array = { version = "1", default-features = false, features = ["alloc"]
 blake2 = { version = "0.10", default-features = false }
 rand_chacha = { version = "0.3", default-features = false }

-generalized-bulletproofs = { git = "https://github.com/kayabaNerve/monero-oxide", rev = "54da48f27a05fa8656014942919da1dfbab4d8e3", default-features = false }
-ec-divisors = { git = "https://github.com/kayabaNerve/monero-oxide", rev = "54da48f27a05fa8656014942919da1dfbab4d8e3", default-features = false }
-generalized-bulletproofs-circuit-abstraction = { git = "https://github.com/kayabaNerve/monero-oxide", rev = "54da48f27a05fa8656014942919da1dfbab4d8e3", default-features = false }
-generalized-bulletproofs-ec-gadgets = { git = "https://github.com/kayabaNerve/monero-oxide", rev = "54da48f27a05fa8656014942919da1dfbab4d8e3", default-features = false }
+generalized-bulletproofs = { git = "https://github.com/monero-oxide/monero-oxide", rev = "59e3ae73b51c214afbc304efca8d748b3da62977", default-features = false }
+ec-divisors = { git = "https://github.com/monero-oxide/monero-oxide", rev = "59e3ae73b51c214afbc304efca8d748b3da62977", default-features = false }
+generalized-bulletproofs-circuit-abstraction = { git = "https://github.com/monero-oxide/monero-oxide", rev = "59e3ae73b51c214afbc304efca8d748b3da62977", default-features = false }
+generalized-bulletproofs-ec-gadgets = { git = "https://github.com/monero-oxide/monero-oxide", rev = "59e3ae73b51c214afbc304efca8d748b3da62977", default-features = false }

 dkg = { path = ".." }

@@ -52,7 +52,7 @@ rand = { version = "0.8", default-features = false, features = ["std"] }
 ciphersuite = { path = "../../ciphersuite", default-features = false, features = ["std"]  }
 embedwards25519 = { path = "../../evrf/embedwards25519", default-features = false, features = ["std"] }
 dalek-ff-group = { path = "../../dalek-ff-group", default-features = false, features = ["std"] }
-generalized-bulletproofs = { git = "https://github.com/kayabaNerve/monero-oxide", rev = "54da48f27a05fa8656014942919da1dfbab4d8e3", features = ["tests"] }
+generalized-bulletproofs = { git = "https://github.com/monero-oxide/monero-oxide", rev = "59e3ae73b51c214afbc304efca8d748b3da62977", features = ["tests"] }
 dkg-recovery = { path = "../recovery" }

 [features]
--- a/crypto/dkg/evrf/src/lib.rs
+++ b/crypto/dkg/evrf/src/lib.rs
@@ -222,21 +222,11 @@ impl<C: Curves> Dkg<C> {
      evrf_private_key,
    ) {
      Ok(res) => res,
-      Err(AcError::NotEnoughGenerators) => Err(Error::NotEnoughGenerators {
+      Err(AcProveError::IncorrectAmountOfGenerators) => Err(Error::NotEnoughGenerators {
        provided: generators.0.g_bold_slice().len(),
        required: Proof::<C>::generators_to_use(usize::from(t), evrf_public_keys.len()),
      })?,
-      Err(
-        AcError::DifferingLrLengths |
-        AcError::InconsistentAmountOfConstraints |
-        AcError::ConstrainedNonExistentTerm |
-        AcError::ConstrainedNonExistentCommitment |
-        AcError::InconsistentWitness |
-        AcError::Ip(_) |
-        AcError::IncompleteProof,
-      ) => {
-        panic!("failed to prove for the eVRF proof")
-      }
+      Err(AcProveError::InconsistentWitness) => panic!("failed to prove for the eVRF proof"),
    };

    let mut encrypted_secret_shares = HashMap::with_capacity(usize::from(n));
--- a/crypto/dkg/evrf/src/proof/mod.rs
+++ b/crypto/dkg/evrf/src/proof/mod.rs
@@ -327,7 +327,7 @@ impl<C: Curves> Proof<C> {
    coefficients: usize,
    participant_public_keys: &[<<C as Curves>::EmbeddedCurve as Ciphersuite>::G],
    evrf_private_key: &Zeroizing<<<C as Curves>::EmbeddedCurve as Ciphersuite>::F>,
-  ) -> Result<ProveResult<C>, AcError> {
+  ) -> Result<ProveResult<C>, AcProveError> {
    let curve_spec = CurveSpec {
      a: <<C as Curves>::EmbeddedCurve as Ciphersuite>::G::a(),
      b: <<C as Curves>::EmbeddedCurve as Ciphersuite>::G::b(),
@@ -469,7 +469,7 @@ impl<C: Curves> Proof<C> {
      Vec::with_capacity(vector_commitment_tape.len().div_ceil(generators_to_use));
    for chunk in vector_commitment_tape.chunks(generators_to_use) {
      vector_commitments.push(PedersenVectorCommitment {
-        g_values: chunk.to_vec().into(),
+        g_values: chunk.into(),
        mask: <C::ToweringCurve as Ciphersuite>::F::random(&mut *rng),
      });
    }
@@ -496,7 +496,7 @@ impl<C: Curves> Proof<C> {
        .map(|commitment| {
          commitment
            .commit(generators.g_bold_slice(), generators.h())
-            .ok_or(AcError::NotEnoughGenerators)
+            .ok_or(AcProveError::IncorrectAmountOfGenerators)
        })
        .collect::<Result<_, _>>()?,
      commitments
@@ -521,7 +521,7 @@ impl<C: Curves> Proof<C> {

    let (statement, Some(witness)) = circuit
      .statement(
-        generators.reduce(generators_to_use).ok_or(AcError::NotEnoughGenerators)?,
+        generators.reduce(generators_to_use).ok_or(AcProveError::IncorrectAmountOfGenerators)?,
        commited_commitments,
      )
      .unwrap()
--- a/crypto/dkg/evrf/src/tests/proof.rs
+++ b/crypto/dkg/evrf/src/tests/proof.rs
@@ -9,7 +9,7 @@ use ciphersuite::{
  Ciphersuite,
 };

-use generalized_bulletproofs::{Generators, tests::generators};
+use generalized_bulletproofs::{Generators, tests::insecure_test_generators};

 use crate::{
  Curves, Ristretto,
@@ -18,7 +18,7 @@ use crate::{
 };

 fn proof<C: Curves>() {
-  let generators = generators(2048);
+  let generators = insecure_test_generators(&mut OsRng, 2048).unwrap();
  let embedded_private_key =
    Zeroizing::new(<C::EmbeddedCurve as Ciphersuite>::F::random(&mut OsRng));
  let ecdh_public_keys: [_; PARTICIPANTS as usize] =
--- a/crypto/evrf/embedwards25519/Cargo.toml
+++ b/crypto/evrf/embedwards25519/Cargo.toml
@@ -31,8 +31,8 @@ dalek-ff-group = { path = "../../dalek-ff-group", version = "0.4", default-featu

 blake2 = { version = "0.10", default-features = false }
 ciphersuite = { path = "../../ciphersuite", version = "0.4", default-features = false }
-ec-divisors = { git = "https://github.com/kayabaNerve/monero-oxide", rev = "54da48f27a05fa8656014942919da1dfbab4d8e3", default-features = false }
-generalized-bulletproofs-ec-gadgets = { git = "https://github.com/kayabaNerve/monero-oxide", rev = "54da48f27a05fa8656014942919da1dfbab4d8e3", default-features = false }
+ec-divisors = { git = "https://github.com/monero-oxide/monero-oxide", rev = "59e3ae73b51c214afbc304efca8d748b3da62977", default-features = false }
+generalized-bulletproofs-ec-gadgets = { git = "https://github.com/monero-oxide/monero-oxide", rev = "59e3ae73b51c214afbc304efca8d748b3da62977", default-features = false }

 [dev-dependencies]
 hex = "0.4"
--- a/crypto/evrf/secq256k1/Cargo.toml
+++ b/crypto/evrf/secq256k1/Cargo.toml
@@ -23,8 +23,8 @@ k256 = { version = "0.13", default-features = false, features = ["arithmetic"] }

 blake2 = { version = "0.10", default-features = false }
 ciphersuite = { path = "../../ciphersuite", version = "0.4", default-features = false }
-ec-divisors = { git = "https://github.com/kayabaNerve/monero-oxide", rev = "54da48f27a05fa8656014942919da1dfbab4d8e3", default-features = false }
-generalized-bulletproofs-ec-gadgets = { git = "https://github.com/kayabaNerve/monero-oxide", rev = "54da48f27a05fa8656014942919da1dfbab4d8e3", default-features = false }
+ec-divisors = { git = "https://github.com/monero-oxide/monero-oxide", rev = "59e3ae73b51c214afbc304efca8d748b3da62977", default-features = false }
+generalized-bulletproofs-ec-gadgets = { git = "https://github.com/monero-oxide/monero-oxide", rev = "59e3ae73b51c214afbc304efca8d748b3da62977", default-features = false }

 [dev-dependencies]
 hex = "0.4"
--- a/crypto/ff-group-tests/Cargo.toml
+++ b/crypto/ff-group-tests/Cargo.toml
@@ -27,7 +27,3 @@ group = "0.13"
 [dev-dependencies]
 k256 = { version = "^0.13.1", default-features = false, features = ["std", "arithmetic", "bits"] }
 p256 = { version = "^0.13.1", default-features = false, features = ["std", "arithmetic", "bits"] }
-
-bls12_381 = "0.8"
-
-pasta_curves = "0.5"
--- a/crypto/ff-group-tests/src/group.rs
+++ b/crypto/ff-group-tests/src/group.rs
@@ -202,15 +202,3 @@ fn test_k256() {
 fn test_p256() {
  test_prime_group_bits::<_, p256::ProjectivePoint>(&mut rand_core::OsRng);
 }
-
-#[test]
-fn test_bls12_381() {
-  test_prime_group_bits::<_, bls12_381::G1Projective>(&mut rand_core::OsRng);
-  test_prime_group_bits::<_, bls12_381::G2Projective>(&mut rand_core::OsRng);
-}
-
-#[test]
-fn test_pallas_vesta() {
-  test_prime_group_bits::<_, pasta_curves::pallas::Point>(&mut rand_core::OsRng);
-  test_prime_group_bits::<_, pasta_curves::vesta::Point>(&mut rand_core::OsRng);
-}