diff --git a/Cargo.lock b/Cargo.lock
index 9b6d186d..ad31a575 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1577,19 +1577,6 @@ dependencies = [
  "generic-array 0.14.7",
 ]
 
-[[package]]
-name = "bls12_381"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7bc6d6292be3a19e6379786dac800f551e5865a5bb51ebbe3064ab80433f403"
-dependencies = [
- "ff",
- "group",
- "pairing",
- "rand_core 0.6.4",
- "subtle",
-]
-
 [[package]]
 name = "blst"
 version = "0.3.15"
@@ -2876,9 +2863,8 @@ checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555"
 [[package]]
 name = "ec-divisors"
 version = "0.1.0"
-source = "git+https://github.com/kayabaNerve/monero-oxide?rev=54da48f27a05fa8656014942919da1dfbab4d8e3#54da48f27a05fa8656014942919da1dfbab4d8e3"
+source = "git+https://github.com/monero-oxide/monero-oxide?rev=59e3ae73b51c214afbc304efca8d748b3da62977#59e3ae73b51c214afbc304efca8d748b3da62977"
 dependencies = [
- "crypto-bigint",
  "dalek-ff-group",
  "ff",
  "group",
@@ -3217,12 +3203,10 @@ dependencies = [
 name = "ff-group-tests"
 version = "0.13.2"
 dependencies = [
- "bls12_381",
  "ff",
  "group",
  "k256",
  "p256",
- "pasta_curves",
  "rand_core 0.6.4",
  "subtle",
 ]
@@ -3534,24 +3518,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "full-chain-membership-proofs"
-version = "0.1.0"
-source = "git+https://github.com/kayabaNerve/monero-oxide?rev=54da48f27a05fa8656014942919da1dfbab4d8e3#54da48f27a05fa8656014942919da1dfbab4d8e3"
-dependencies = [
- "blake2",
- "ciphersuite 0.4.99",
- "ec-divisors",
- "generalized-bulletproofs",
- "generalized-bulletproofs-circuit-abstraction",
- "generalized-bulletproofs-ec-gadgets",
- "generic-array 1.2.0",
- "multiexp",
- "rand_core 0.6.4",
- "std-shims",
- "zeroize",
-]
-
 [[package]]
 name = "funty"
 version = "2.0.0"
@@ -3750,10 +3716,12 @@ dependencies = [
 [[package]]
 name = "generalized-bulletproofs"
 version = "0.1.0"
-source = "git+https://github.com/kayabaNerve/monero-oxide?rev=54da48f27a05fa8656014942919da1dfbab4d8e3#54da48f27a05fa8656014942919da1dfbab4d8e3"
+source = "git+https://github.com/monero-oxide/monero-oxide?rev=59e3ae73b51c214afbc304efca8d748b3da62977#59e3ae73b51c214afbc304efca8d748b3da62977"
 dependencies = [
  "blake2",
  "ciphersuite 0.4.99",
+ "ff",
+ "flexible-transcript",
  "multiexp",
  "rand_core 0.6.4",
  "std-shims",
@@ -3763,7 +3731,7 @@ dependencies = [
 [[package]]
 name = "generalized-bulletproofs-circuit-abstraction"
 version = "0.1.0"
-source = "git+https://github.com/kayabaNerve/monero-oxide?rev=54da48f27a05fa8656014942919da1dfbab4d8e3#54da48f27a05fa8656014942919da1dfbab4d8e3"
+source = "git+https://github.com/monero-oxide/monero-oxide?rev=59e3ae73b51c214afbc304efca8d748b3da62977#59e3ae73b51c214afbc304efca8d748b3da62977"
 dependencies = [
  "ciphersuite 0.4.99",
  "generalized-bulletproofs",
@@ -3774,7 +3742,7 @@ dependencies = [
 [[package]]
 name = "generalized-bulletproofs-ec-gadgets"
 version = "0.1.0"
-source = "git+https://github.com/kayabaNerve/monero-oxide?rev=54da48f27a05fa8656014942919da1dfbab4d8e3#54da48f27a05fa8656014942919da1dfbab4d8e3"
+source = "git+https://github.com/monero-oxide/monero-oxide?rev=59e3ae73b51c214afbc304efca8d748b3da62977#59e3ae73b51c214afbc304efca8d748b3da62977"
 dependencies = [
  "ciphersuite 0.4.99",
  "generalized-bulletproofs-circuit-abstraction",
@@ -4001,25 +3969,6 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
-[[package]]
-name = "helioselene"
-version = "0.1.0"
-source = "git+https://github.com/kayabaNerve/monero-oxide?rev=54da48f27a05fa8656014942919da1dfbab4d8e3#54da48f27a05fa8656014942919da1dfbab4d8e3"
-dependencies = [
- "blake2",
- "ciphersuite 0.4.99",
- "crypto-bigint",
- "dalek-ff-group",
- "ec-divisors",
- "ff",
- "group",
- "rand_core 0.6.4",
- "rustversion",
- "std-shims",
- "subtle",
- "zeroize",
-]
-
 [[package]]
 name = "hermit-abi"
 version = "0.5.2"
@@ -4783,9 +4732,6 @@ dependencies = [
 name = "lazy_static"
 version = "1.5.0"
 source = "git+https://github.com/rust-lang-nursery/lazy-static.rs?rev=5735630d46572f1e5377c8f2ba0f79d18f53b10c#5735630d46572f1e5377c8f2ba0f79d18f53b10c"
-dependencies = [
- "spin 0.9.8",
-]
 
 [[package]]
 name = "leb128"
@@ -6081,7 +6027,7 @@ dependencies = [
 [[package]]
 name = "monero-address"
 version = "0.1.0"
-source = "git+https://github.com/kayabaNerve/monero-oxide?rev=54da48f27a05fa8656014942919da1dfbab4d8e3#54da48f27a05fa8656014942919da1dfbab4d8e3"
+source = "git+https://github.com/monero-oxide/monero-oxide?rev=6966575e05fe09b77674c46984b21686ed9304ff#6966575e05fe09b77674c46984b21686ed9304ff"
 dependencies = [
  "curve25519-dalek",
  "monero-base58",
@@ -6093,7 +6039,7 @@ dependencies = [
 [[package]]
 name = "monero-base58"
 version = "0.1.0"
-source = "git+https://github.com/kayabaNerve/monero-oxide?rev=54da48f27a05fa8656014942919da1dfbab4d8e3#54da48f27a05fa8656014942919da1dfbab4d8e3"
+source = "git+https://github.com/monero-oxide/monero-oxide?rev=6966575e05fe09b77674c46984b21686ed9304ff#6966575e05fe09b77674c46984b21686ed9304ff"
 dependencies = [
  "monero-primitives",
  "std-shims",
@@ -6102,7 +6048,7 @@ dependencies = [
 [[package]]
 name = "monero-borromean"
 version = "0.1.0"
-source = "git+https://github.com/kayabaNerve/monero-oxide?rev=54da48f27a05fa8656014942919da1dfbab4d8e3#54da48f27a05fa8656014942919da1dfbab4d8e3"
+source = "git+https://github.com/monero-oxide/monero-oxide?rev=6966575e05fe09b77674c46984b21686ed9304ff#6966575e05fe09b77674c46984b21686ed9304ff"
 dependencies = [
  "curve25519-dalek",
  "monero-generators",
@@ -6115,7 +6061,7 @@ dependencies = [
 [[package]]
 name = "monero-bulletproofs"
 version = "0.1.0"
-source = "git+https://github.com/kayabaNerve/monero-oxide?rev=54da48f27a05fa8656014942919da1dfbab4d8e3#54da48f27a05fa8656014942919da1dfbab4d8e3"
+source = "git+https://github.com/monero-oxide/monero-oxide?rev=6966575e05fe09b77674c46984b21686ed9304ff#6966575e05fe09b77674c46984b21686ed9304ff"
 dependencies = [
  "curve25519-dalek",
  "monero-generators",
@@ -6130,7 +6076,7 @@ dependencies = [
 [[package]]
 name = "monero-clsag"
 version = "0.1.0"
-source = "git+https://github.com/kayabaNerve/monero-oxide?rev=54da48f27a05fa8656014942919da1dfbab4d8e3#54da48f27a05fa8656014942919da1dfbab4d8e3"
+source = "git+https://github.com/monero-oxide/monero-oxide?rev=6966575e05fe09b77674c46984b21686ed9304ff#6966575e05fe09b77674c46984b21686ed9304ff"
 dependencies = [
  "curve25519-dalek",
  "dalek-ff-group",
@@ -6148,42 +6094,15 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "monero-fcmp-plus-plus"
-version = "0.1.0"
-source = "git+https://github.com/kayabaNerve/monero-oxide?rev=54da48f27a05fa8656014942919da1dfbab4d8e3#54da48f27a05fa8656014942919da1dfbab4d8e3"
-dependencies = [
- "blake2",
- "ciphersuite 0.4.99",
- "curve25519-dalek",
- "dalek-ff-group",
- "ec-divisors",
- "full-chain-membership-proofs",
- "generalized-bulletproofs",
- "generalized-bulletproofs-ec-gadgets",
- "generic-array 1.2.0",
- "helioselene",
- "monero-generators",
- "multiexp",
- "rand_core 0.6.4",
- "std-shims",
- "zeroize",
-]
-
 [[package]]
 name = "monero-generators"
 version = "0.4.0"
-source = "git+https://github.com/kayabaNerve/monero-oxide?rev=54da48f27a05fa8656014942919da1dfbab4d8e3#54da48f27a05fa8656014942919da1dfbab4d8e3"
+source = "git+https://github.com/monero-oxide/monero-oxide?rev=6966575e05fe09b77674c46984b21686ed9304ff#6966575e05fe09b77674c46984b21686ed9304ff"
 dependencies = [
- "blake2",
- "ciphersuite 0.4.99",
  "crypto-bigint",
  "curve25519-dalek",
  "dalek-ff-group",
- "full-chain-membership-proofs",
- "generalized-bulletproofs",
  "group",
- "helioselene",
  "monero-io",
  "sha3",
  "std-shims",
@@ -6193,7 +6112,7 @@ dependencies = [
 [[package]]
 name = "monero-io"
 version = "0.1.0"
-source = "git+https://github.com/kayabaNerve/monero-oxide?rev=54da48f27a05fa8656014942919da1dfbab4d8e3#54da48f27a05fa8656014942919da1dfbab4d8e3"
+source = "git+https://github.com/monero-oxide/monero-oxide?rev=6966575e05fe09b77674c46984b21686ed9304ff#6966575e05fe09b77674c46984b21686ed9304ff"
 dependencies = [
  "curve25519-dalek",
  "std-shims",
@@ -6202,7 +6121,7 @@ dependencies = [
 [[package]]
 name = "monero-mlsag"
 version = "0.1.0"
-source = "git+https://github.com/kayabaNerve/monero-oxide?rev=54da48f27a05fa8656014942919da1dfbab4d8e3#54da48f27a05fa8656014942919da1dfbab4d8e3"
+source = "git+https://github.com/monero-oxide/monero-oxide?rev=6966575e05fe09b77674c46984b21686ed9304ff#6966575e05fe09b77674c46984b21686ed9304ff"
 dependencies = [
  "curve25519-dalek",
  "monero-generators",
@@ -6216,14 +6135,13 @@ dependencies = [
 [[package]]
 name = "monero-oxide"
 version = "0.1.4-alpha"
-source = "git+https://github.com/kayabaNerve/monero-oxide?rev=54da48f27a05fa8656014942919da1dfbab4d8e3#54da48f27a05fa8656014942919da1dfbab4d8e3"
+source = "git+https://github.com/monero-oxide/monero-oxide?rev=6966575e05fe09b77674c46984b21686ed9304ff#6966575e05fe09b77674c46984b21686ed9304ff"
 dependencies = [
  "curve25519-dalek",
  "hex-literal",
  "monero-borromean",
  "monero-bulletproofs",
  "monero-clsag",
- "monero-fcmp-plus-plus",
  "monero-generators",
  "monero-io",
  "monero-mlsag",
@@ -6235,7 +6153,7 @@ dependencies = [
 [[package]]
 name = "monero-primitives"
 version = "0.1.0"
-source = "git+https://github.com/kayabaNerve/monero-oxide?rev=54da48f27a05fa8656014942919da1dfbab4d8e3#54da48f27a05fa8656014942919da1dfbab4d8e3"
+source = "git+https://github.com/monero-oxide/monero-oxide?rev=6966575e05fe09b77674c46984b21686ed9304ff#6966575e05fe09b77674c46984b21686ed9304ff"
 dependencies = [
  "curve25519-dalek",
  "monero-generators",
@@ -6248,7 +6166,7 @@ dependencies = [
 [[package]]
 name = "monero-rpc"
 version = "0.1.0"
-source = "git+https://github.com/kayabaNerve/monero-oxide?rev=54da48f27a05fa8656014942919da1dfbab4d8e3#54da48f27a05fa8656014942919da1dfbab4d8e3"
+source = "git+https://github.com/monero-oxide/monero-oxide?rev=6966575e05fe09b77674c46984b21686ed9304ff#6966575e05fe09b77674c46984b21686ed9304ff"
 dependencies = [
  "curve25519-dalek",
  "hex",
@@ -6264,7 +6182,7 @@ dependencies = [
 [[package]]
 name = "monero-simple-request-rpc"
 version = "0.1.0"
-source = "git+https://github.com/kayabaNerve/monero-oxide?rev=54da48f27a05fa8656014942919da1dfbab4d8e3#54da48f27a05fa8656014942919da1dfbab4d8e3"
+source = "git+https://github.com/monero-oxide/monero-oxide?rev=6966575e05fe09b77674c46984b21686ed9304ff#6966575e05fe09b77674c46984b21686ed9304ff"
 dependencies = [
  "digest_auth",
  "hex",
@@ -6277,7 +6195,7 @@ dependencies = [
 [[package]]
 name = "monero-wallet"
 version = "0.1.0"
-source = "git+https://github.com/kayabaNerve/monero-oxide?rev=54da48f27a05fa8656014942919da1dfbab4d8e3#54da48f27a05fa8656014942919da1dfbab4d8e3"
+source = "git+https://github.com/monero-oxide/monero-oxide?rev=6966575e05fe09b77674c46984b21686ed9304ff#6966575e05fe09b77674c46984b21686ed9304ff"
 dependencies = [
  "curve25519-dalek",
  "dalek-ff-group",
@@ -6791,15 +6709,6 @@ dependencies = [
  "sha2 0.10.9",
 ]
 
-[[package]]
-name = "pairing"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81fec4625e73cf41ef4bb6846cafa6d44736525f442ba45e407c4a000a13996f"
-dependencies = [
- "group",
-]
-
 [[package]]
 name = "pallet-authorship"
 version = "4.0.0-dev"
@@ -7047,21 +6956,6 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7924d1d0ad836f665c9065e26d016c673ece3993f30d340068b16f282afc1156"
 
-[[package]]
-name = "pasta_curves"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3e57598f73cc7e1b2ac63c79c517b31a0877cd7c402cdcaa311b5208de7a095"
-dependencies = [
- "blake2b_simd",
- "ff",
- "group",
- "lazy_static",
- "rand 0.8.5",
- "static_assertions",
- "subtle",
-]
-
 [[package]]
 name = "paste"
 version = "1.0.15"
@@ -11759,12 +11653,6 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
 
-[[package]]
-name = "spin"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
-
 [[package]]
 name = "spin"
 version = "0.10.0"
diff --git a/Cargo.toml b/Cargo.toml
index 839630ab..83adf1a4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -152,7 +152,6 @@ group = { opt-level = 3 }
 crypto-bigint = { opt-level = 3 }
 curve25519-dalek = { opt-level = 3 }
 dalek-ff-group = { opt-level = 3 }
-helioselene = { opt-level = 3 }
 
 multiexp = { opt-level = 3 }
 
diff --git a/crypto/dkg/evrf/Cargo.toml b/crypto/dkg/evrf/Cargo.toml
index 4e3a4268..739be1da 100644
--- 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]
diff --git a/crypto/dkg/evrf/src/lib.rs b/crypto/dkg/evrf/src/lib.rs
index 1c3b21c1..93d7b1d5 100644
--- 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));
diff --git a/crypto/dkg/evrf/src/proof/mod.rs b/crypto/dkg/evrf/src/proof/mod.rs
index a5e2e67a..64318b92 100644
--- 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()
diff --git a/crypto/dkg/evrf/src/tests/proof.rs b/crypto/dkg/evrf/src/tests/proof.rs
index 64fb7896..59b69ccf 100644
--- 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] =
diff --git a/crypto/evrf/embedwards25519/Cargo.toml b/crypto/evrf/embedwards25519/Cargo.toml
index c4083265..de142f4f 100644
--- 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"
diff --git a/crypto/evrf/secq256k1/Cargo.toml b/crypto/evrf/secq256k1/Cargo.toml
index b57ecad6..174dd1c0 100644
--- 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"
diff --git a/crypto/ff-group-tests/Cargo.toml b/crypto/ff-group-tests/Cargo.toml
index a9b784ca..c50d56c6 100644
--- 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"
diff --git a/crypto/ff-group-tests/src/group.rs b/crypto/ff-group-tests/src/group.rs
index f2b69acc..90ff4110 100644
--- 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);
-}
diff --git a/deny.toml b/deny.toml
index 0be67806..2be57ee8 100644
--- a/deny.toml
+++ b/deny.toml
@@ -133,8 +133,7 @@ allow-registry = ["https://github.com/rust-lang/crates.io-index"]
 allow-git = [
   "https://github.com/rust-lang-nursery/lazy-static.rs",
   "https://github.com/kayabaNerve/elliptic-curves",
-  "https://github.com/kayabaNerve/pasta_curves",
-  "https://github.com/kayabaNerve/monero-oxide",
+  "https://github.com/monero-oxide/monero-oxide",
   "https://github.com/serai-dex/substrate-bip39",
   "https://github.com/serai-dex/substrate",
   "https://github.com/serai-dex/polkadot-sdk",
diff --git a/processor/monero/Cargo.toml b/processor/monero/Cargo.toml
index 796d2040..d2be0ae8 100644
--- a/processor/monero/Cargo.toml
+++ b/processor/monero/Cargo.toml
@@ -30,8 +30,8 @@ dalek-ff-group = { path = "../../crypto/dalek-ff-group", default-features = fals
 dkg = { package = "dkg-evrf", path = "../../crypto/dkg/evrf", default-features = false, features = ["std", "ed25519"] }
 frost = { package = "modular-frost", path = "../../crypto/frost", default-features = false }
 
-monero-wallet = { git = "https://github.com/kayabaNerve/monero-oxide", rev = "54da48f27a05fa8656014942919da1dfbab4d8e3", default-features = false, features = ["std", "multisig"] }
-monero-simple-request-rpc = { git = "https://github.com/kayabaNerve/monero-oxide", rev = "54da48f27a05fa8656014942919da1dfbab4d8e3", default-features = false }
+monero-wallet = { git = "https://github.com/monero-oxide/monero-oxide", rev = "6966575e05fe09b77674c46984b21686ed9304ff", default-features = false, features = ["std", "multisig"] }
+monero-simple-request-rpc = { git = "https://github.com/monero-oxide/monero-oxide", rev = "6966575e05fe09b77674c46984b21686ed9304ff", default-features = false }
 
 serai-client = { path = "../../substrate/client", default-features = false, features = ["monero"] }
 
diff --git a/substrate/client/Cargo.toml b/substrate/client/Cargo.toml
index 2abf68d0..8fc55fb7 100644
--- a/substrate/client/Cargo.toml
+++ b/substrate/client/Cargo.toml
@@ -43,7 +43,7 @@ bitcoin = { version = "0.32", optional = true }
 
 dalek-ff-group = { path = "../../crypto/dalek-ff-group", optional = true }
 ciphersuite = { path = "../../crypto/ciphersuite", version = "0.4", optional = true }
-monero-address = { git = "https://github.com/kayabaNerve/monero-oxide", rev = "54da48f27a05fa8656014942919da1dfbab4d8e3", version = "0.1.0", default-features = false, features = ["std"], optional = true }
+monero-address = { git = "https://github.com/monero-oxide/monero-oxide", rev = "6966575e05fe09b77674c46984b21686ed9304ff", version = "0.1.0", default-features = false, features = ["std"], optional = true }
 
 [dev-dependencies]
 rand_core = "0.6"
diff --git a/substrate/node/Cargo.toml b/substrate/node/Cargo.toml
index 10f56264..7ddd2df2 100644
--- a/substrate/node/Cargo.toml
+++ b/substrate/node/Cargo.toml
@@ -82,7 +82,7 @@ serai-env = { path = "../../common/env" }
 
 curve25519-dalek = { version = "4", default-features = false, features = ["alloc", "zeroize"] }
 bitcoin-serai = { path = "../../networks/bitcoin", default-features = false, features = ["std", "hazmat"] }
-monero-address = { git = "https://github.com/kayabaNerve/monero-oxide", rev = "54da48f27a05fa8656014942919da1dfbab4d8e3", default-features = false, features = ["std"] }
+monero-address = { git = "https://github.com/monero-oxide/monero-oxide", rev = "6966575e05fe09b77674c46984b21686ed9304ff", default-features = false, features = ["std"] }
 
 [build-dependencies]
 substrate-build-script-utils = { git = "https://github.com/serai-dex/substrate" }