From 1b7abd7be3a0fbbd182b0dbab596c5f3b0c02e38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michele=20Orr=C3=B9?= Date: Mon, 16 Dec 2024 22:04:02 +0100 Subject: [PATCH] Clean up ark dependencies in sub-packages. Co-Authored-By: Alex Xiong --- Cargo.toml | 19 ++++++++++--------- nimue-poseidon/Cargo.toml | 8 ++++---- nimue/Cargo.toml | 2 -- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index a8e67da..ea4d54b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,12 +9,13 @@ members = [ ] -[patch.crates-io] -ark-std = { git = "https://github.com/arkworks-rs/utils" } -ark-ec = { git = "https://github.com/arkworks-rs/algebra" } -ark-ff = { git = "https://github.com/arkworks-rs/algebra" } -ark-serialize = { git = "https://github.com/arkworks-rs/algebra" } -ark-bls12-381 = { git = "https://github.com/arkworks-rs/algebra" } -ark-curve25519 = { git = "https://github.com/arkworks-rs/algebra" } -ark-pallas = { git = "https://github.com/arkworks-rs/algebra" } -ark-vesta = { git = "https://github.com/arkworks-rs/algebra" } +# Un-comment below for latest arkworks libraries. +# [patch.crates-io] +# ark-std = { git = "https://github.com/arkworks-rs/utils" } +# ark-ec = { git = "https://github.com/arkworks-rs/algebra" } +# ark-ff = { git = "https://github.com/arkworks-rs/algebra" } +# ark-serialize = { git = "https://github.com/arkworks-rs/algebra" } +# ark-bls12-381 = { git = "https://github.com/arkworks-rs/algebra" } +# ark-curve25519 = { git = "https://github.com/arkworks-rs/algebra" } +# ark-pallas = { git = "https://github.com/arkworks-rs/algebra" } +# ark-vesta = { git = "https://github.com/arkworks-rs/algebra" } diff --git a/nimue-poseidon/Cargo.toml b/nimue-poseidon/Cargo.toml index 8642ab2..42b111e 100644 --- a/nimue-poseidon/Cargo.toml +++ b/nimue-poseidon/Cargo.toml @@ -6,19 +6,19 @@ license = "MIT/Apache-2.0" [dependencies] nimue = { path = "../nimue", features = ["ark"]} -ark-ff = "0.5.0" +ark-ff = "^0.5" zeroize = "1.8.1" ark-bls12-381 = {version = "^0.5", optional = true} ark-bn254 = {version = "^0.5", optional = true} [dev-dependencies] -ark-bls12-381 = "0.5.0" +ark-bls12-381 = "^0.5" [features] -bls12-381 = ["ark-bls12-381"] bn254 = ["ark-bn254"] solinas = [] +bls12-381 = ["nimue/ark", "dep:ark-bls12-381"] [[example]] name = "schnorr_algebraic_hash" -required-features = ["ark", "ark-bls112-381"] \ No newline at end of file +required-features = ["ark-bls12-381"] \ No newline at end of file diff --git a/nimue/Cargo.toml b/nimue/Cargo.toml index e6fb7c0..6d102a0 100644 --- a/nimue/Cargo.toml +++ b/nimue/Cargo.toml @@ -19,14 +19,12 @@ ark-ff = { version = "^0.5", optional = true } ark-ec = { version = "^0.5", optional = true } ark-serialize = { version = "^0.5", optional = true, features = ["std"] } group = { version = "0.13.0", optional = true } -ark-bls12-381 = { version = "^0.5", optional = true } hex = "0.4.3" [features] default = [] ark = ["dep:ark-ff", "dep:ark-ec", "dep:ark-serialize"] group = ["dep:group"] -ark-bls12-381 = ["ark", "dep:ark-bls12-381"] asm = ["keccak/asm", "keccak/simd"] [dev-dependencies]