From b8f0fb6cb028dc58bb22d36c05abfa9fb9c3cf7d Mon Sep 17 00:00:00 2001
From: timorl <tymorl@gmail.com>
Date: Tue, 14 Mar 2023 18:19:40 +0100
Subject: [PATCH] Revert "Bump ark-r1cs-std from 0.3.1 to 0.4.0 (#1005)"
 (#1019)

This reverts commit a286bdeb749504fa0da6519f5f275d2bbc618c3c.

Co-authored-by: timorl <timorl@disroot.org>
---
 Cargo.lock                      | 291 +++++++++-----------------------
 pallets/baby-liminal/Cargo.toml |   2 +-
 poseidon/Cargo.toml             |   2 +-
 3 files changed, 80 insertions(+), 215 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 80329c8b..73383d6f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -481,9 +481,9 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "65be532f9dd1e98ad0150b037276cde464c6f371059e6dd02c0222395761f6aa"
 dependencies = [
- "ark-ec 0.3.0",
- "ark-ff 0.3.0",
- "ark-std 0.3.0",
+ "ark-ec",
+ "ark-ff",
+ "ark-std",
 ]
 
 [[package]]
@@ -492,12 +492,12 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff773c0ef8c655c98071d3026a63950798a66b2f45baef22d8334c1756f1bd18"
 dependencies = [
- "ark-ec 0.3.0",
- "ark-ff 0.3.0",
- "ark-relations 0.3.0",
- "ark-serialize 0.3.0",
+ "ark-ec",
+ "ark-ff",
+ "ark-relations",
+ "ark-serialize",
  "ark-snark",
- "ark-std 0.3.0",
+ "ark-std",
  "blake2 0.9.2",
  "derivative",
  "digest 0.9.0",
@@ -509,41 +509,24 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dea978406c4b1ca13c2db2373b05cc55429c3575b8b21f1b9ee859aa5b03dd42"
 dependencies = [
- "ark-ff 0.3.0",
- "ark-serialize 0.3.0",
- "ark-std 0.3.0",
+ "ark-ff",
+ "ark-serialize",
+ "ark-std",
  "derivative",
  "num-traits",
  "zeroize",
 ]
 
-[[package]]
-name = "ark-ec"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c60370a92f8e1a5f053cad73a862e1b99bc642333cd676fa11c0c39f80f4ac2"
-dependencies = [
- "ark-ff 0.4.1",
- "ark-poly 0.4.1",
- "ark-serialize 0.4.1",
- "ark-std 0.4.0",
- "derivative",
- "hashbrown 0.13.2",
- "itertools",
- "num-traits",
- "zeroize",
-]
-
 [[package]]
 name = "ark-ff"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6b3235cc41ee7a12aaaf2c575a2ad7b46713a8a50bda2fc3b003a04845c05dd6"
 dependencies = [
- "ark-ff-asm 0.3.0",
- "ark-ff-macros 0.3.0",
- "ark-serialize 0.3.0",
- "ark-std 0.3.0",
+ "ark-ff-asm",
+ "ark-ff-macros",
+ "ark-serialize",
+ "ark-std",
  "derivative",
  "num-bigint",
  "num-traits",
@@ -552,26 +535,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "ark-ff"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c2d42532524bee1da5a4f6f733eb4907301baa480829557adcff5dfaeee1d9a"
-dependencies = [
- "ark-ff-asm 0.4.1",
- "ark-ff-macros 0.4.1",
- "ark-serialize 0.4.1",
- "ark-std 0.4.0",
- "derivative",
- "digest 0.10.6",
- "itertools",
- "num-bigint",
- "num-traits",
- "paste",
- "rustc_version 0.4.0",
- "zeroize",
-]
-
 [[package]]
 name = "ark-ff-asm"
 version = "0.3.0"
@@ -582,16 +545,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "ark-ff-asm"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d6873aaba7959593d89babed381d33e2329453368f1bf3c67e07686a1c1056f"
-dependencies = [
- "quote",
- "syn",
-]
-
 [[package]]
 name = "ark-ff-macros"
 version = "0.3.0"
@@ -604,19 +557,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "ark-ff-macros"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3c2e7d0f2d67cc7fc925355c74d36e7eda19073639be4a0a233d4611b8c959d"
-dependencies = [
- "num-bigint",
- "num-traits",
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "ark-gm17"
 version = "0.3.0"
@@ -624,12 +564,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94713045868e99a606a89825ff5a901667ba707ad1966a32c7f3a4d4dbcc0e9a"
 dependencies = [
  "ark-crypto-primitives",
- "ark-ec 0.3.0",
- "ark-ff 0.3.0",
- "ark-poly 0.3.0",
- "ark-relations 0.3.0",
- "ark-serialize 0.3.0",
- "ark-std 0.3.0",
+ "ark-ec",
+ "ark-ff",
+ "ark-poly",
+ "ark-relations",
+ "ark-serialize",
+ "ark-std",
 ]
 
 [[package]]
@@ -639,12 +579,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "38f8fff7468e947130b5caf9bdd27de8b913cf30e15104b4f0cd301726b3d897"
 dependencies = [
  "ark-crypto-primitives",
- "ark-ec 0.3.0",
- "ark-ff 0.3.0",
- "ark-poly 0.3.0",
- "ark-relations 0.3.0",
- "ark-serialize 0.3.0",
- "ark-std 0.3.0",
+ "ark-ec",
+ "ark-ff",
+ "ark-poly",
+ "ark-relations",
+ "ark-serialize",
+ "ark-std",
 ]
 
 [[package]]
@@ -653,12 +593,12 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "caa8510faa8e64f0a6841ee4b58efe2d56f7a80d86fa0ce9891bbb3aa20166d9"
 dependencies = [
- "ark-ff 0.3.0",
- "ark-poly 0.3.0",
+ "ark-ff",
+ "ark-poly",
  "ark-poly-commit",
- "ark-relations 0.3.0",
- "ark-serialize 0.3.0",
- "ark-std 0.3.0",
+ "ark-relations",
+ "ark-serialize",
+ "ark-std",
  "derivative",
  "digest 0.9.0",
  "rand_chacha 0.3.1",
@@ -670,11 +610,11 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "440ad4569974910adbeb84422b7e622b79e08d27142afd113785b7fcfb446186"
 dependencies = [
- "ark-ec 0.3.0",
- "ark-ff 0.3.0",
- "ark-r1cs-std 0.3.1",
- "ark-relations 0.3.0",
- "ark-std 0.3.0",
+ "ark-ec",
+ "ark-ff",
+ "ark-r1cs-std",
+ "ark-relations",
+ "ark-std",
  "derivative",
  "num-bigint",
  "num-integer",
@@ -688,39 +628,26 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7b0f78f47537c2f15706db7e98fe64cc1711dbf9def81218194e17239e53e5aa"
 dependencies = [
- "ark-ff 0.3.0",
- "ark-serialize 0.3.0",
- "ark-std 0.3.0",
+ "ark-ff",
+ "ark-serialize",
+ "ark-std",
  "derivative",
  "hashbrown 0.11.2",
 ]
 
-[[package]]
-name = "ark-poly"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f6ec811462cabe265cfe1b102fcfe3df79d7d2929c2425673648ee9abfd0272"
-dependencies = [
- "ark-ff 0.4.1",
- "ark-serialize 0.4.1",
- "ark-std 0.4.0",
- "derivative",
- "hashbrown 0.13.2",
-]
-
 [[package]]
 name = "ark-poly-commit"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a71ddfa72bad1446cab7bbecb6018dbbdc9abcbc3a0065483ae5186ad2a64dcd"
 dependencies = [
- "ark-ec 0.3.0",
- "ark-ff 0.3.0",
+ "ark-ec",
+ "ark-ff",
  "ark-nonnative-field",
- "ark-poly 0.3.0",
- "ark-relations 0.3.0",
- "ark-serialize 0.3.0",
- "ark-std 0.3.0",
+ "ark-poly",
+ "ark-relations",
+ "ark-serialize",
+ "ark-std",
  "derivative",
  "digest 0.9.0",
  "tracing",
@@ -732,53 +659,24 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "22e8fdacb1931f238a0d866ced1e916a49d36de832fd8b83dc916b718ae72893"
 dependencies = [
- "ark-ec 0.3.0",
- "ark-ff 0.3.0",
- "ark-relations 0.3.0",
- "ark-std 0.3.0",
+ "ark-ec",
+ "ark-ff",
+ "ark-relations",
+ "ark-std",
  "derivative",
  "num-bigint",
  "num-traits",
  "tracing",
 ]
 
-[[package]]
-name = "ark-r1cs-std"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de1d1472e5cb020cb3405ce2567c91c8d43f21b674aef37b0202f5c3304761db"
-dependencies = [
- "ark-ec 0.4.1",
- "ark-ff 0.4.1",
- "ark-relations 0.4.0",
- "ark-std 0.4.0",
- "derivative",
- "num-bigint",
- "num-integer",
- "num-traits",
- "tracing",
-]
-
 [[package]]
 name = "ark-relations"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4cba4c1c99792a6834bd97f7fd76578ec2cd58d2afc5139a17e1d1bec65b38f6"
 dependencies = [
- "ark-ff 0.3.0",
- "ark-std 0.3.0",
- "tracing",
- "tracing-subscriber",
-]
-
-[[package]]
-name = "ark-relations"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00796b6efc05a3f48225e59cb6a2cda78881e7c390872d5786aaf112f31fb4f0"
-dependencies = [
- "ark-ff 0.4.1",
- "ark-std 0.4.0",
+ "ark-ff",
+ "ark-std",
  "tracing",
  "tracing-subscriber",
 ]
@@ -789,23 +687,11 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d6c2b318ee6e10f8c2853e73a83adc0ccb88995aa978d8a3408d492ab2ee671"
 dependencies = [
- "ark-serialize-derive 0.3.0",
- "ark-std 0.3.0",
+ "ark-serialize-derive",
+ "ark-std",
  "digest 0.9.0",
 ]
 
-[[package]]
-name = "ark-serialize"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7e735959bc173ea4baf13327b19c22d452b8e9e8e8f7b7fc34e6bf0e316c33e"
-dependencies = [
- "ark-serialize-derive 0.4.1",
- "ark-std 0.4.0",
- "digest 0.10.6",
- "num-bigint",
-]
-
 [[package]]
 name = "ark-serialize-derive"
 version = "0.3.0"
@@ -817,26 +703,15 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "ark-serialize-derive"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd34f0920d995d2c932f38861c416f70de89a6de9875876b012557079603e6cc"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "ark-snark"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0dc3dff1a5f67a9c0b34df32b079752d8dd17f1e9d06253da0453db6c1b7cc8a"
 dependencies = [
- "ark-ff 0.3.0",
- "ark-relations 0.3.0",
- "ark-std 0.3.0",
+ "ark-ff",
+ "ark-relations",
+ "ark-std",
 ]
 
 [[package]]
@@ -844,13 +719,13 @@ name = "ark-sponge"
 version = "0.3.0"
 source = "git+https://github.com/penumbra-zone/sponge?branch=r1cs#113469aef48a9c5f458dbf523a509d4769affbf2"
 dependencies = [
- "ark-ec 0.3.0",
- "ark-ff 0.3.0",
+ "ark-ec",
+ "ark-ff",
  "ark-nonnative-field",
- "ark-r1cs-std 0.3.1",
- "ark-relations 0.3.0",
- "ark-serialize 0.3.0",
- "ark-std 0.3.0",
+ "ark-r1cs-std",
+ "ark-relations",
+ "ark-serialize",
+ "ark-std",
  "derivative",
  "digest 0.9.0",
  "rand_chacha 0.3.1",
@@ -867,16 +742,6 @@ dependencies = [
  "rand 0.8.5",
 ]
 
-[[package]]
-name = "ark-std"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185"
-dependencies = [
- "num-traits",
- "rand 0.8.5",
-]
-
 [[package]]
 name = "array-bytes"
 version = "4.2.0"
@@ -4725,9 +4590,9 @@ name = "liminal-ark-poseidon"
 version = "0.1.0"
 dependencies = [
  "ark-bls12-381",
- "ark-ff 0.3.0",
- "ark-r1cs-std 0.4.0",
- "ark-relations 0.3.0",
+ "ark-ff",
+ "ark-r1cs-std",
+ "ark-relations",
  "ark-sponge",
  "paste",
  "poseidon-parameters",
@@ -5673,18 +5538,18 @@ version = "0.1.0"
 dependencies = [
  "ark-bls12-381",
  "ark-crypto-primitives",
- "ark-ec 0.3.0",
- "ark-ff 0.3.0",
+ "ark-ec",
+ "ark-ff",
  "ark-gm17",
  "ark-groth16",
  "ark-marlin",
- "ark-poly 0.3.0",
+ "ark-poly",
  "ark-poly-commit",
- "ark-r1cs-std 0.4.0",
- "ark-relations 0.3.0",
- "ark-serialize 0.3.0",
+ "ark-r1cs-std",
+ "ark-relations",
+ "ark-serialize",
  "ark-snark",
- "ark-std 0.3.0",
+ "ark-std",
  "blake2 0.9.2",
  "digest 0.9.0",
  "frame-benchmarking",
@@ -6395,7 +6260,7 @@ version = "0.1.0"
 source = "git+https://github.com/penumbra-zone/poseidon377?rev=50699746#50699746c031a915d5434088a1240f4b568d9ee8"
 dependencies = [
  "anyhow",
- "ark-ff 0.3.0",
+ "ark-ff",
  "num-integer",
 ]
 
@@ -6405,8 +6270,8 @@ version = "0.1.1"
 source = "git+https://github.com/penumbra-zone/poseidon377?rev=50699746#50699746c031a915d5434088a1240f4b568d9ee8"
 dependencies = [
  "anyhow",
- "ark-ff 0.3.0",
- "ark-std 0.3.0",
+ "ark-ff",
+ "ark-std",
  "getrandom 0.2.8",
  "merlin 3.0.0",
  "num",
@@ -6420,8 +6285,8 @@ name = "poseidon-permutation"
 version = "0.1.1"
 source = "git+https://github.com/penumbra-zone/poseidon377?rev=50699746#50699746c031a915d5434088a1240f4b568d9ee8"
 dependencies = [
- "ark-ff 0.3.0",
- "ark-std 0.3.0",
+ "ark-ff",
+ "ark-std",
  "poseidon-parameters",
 ]
 
diff --git a/pallets/baby-liminal/Cargo.toml b/pallets/baby-liminal/Cargo.toml
index 06cea00f..bea11a15 100644
--- a/pallets/baby-liminal/Cargo.toml
+++ b/pallets/baby-liminal/Cargo.toml
@@ -19,7 +19,7 @@ ark-poly-commit = { version = "^0.3.0", default-features = false }
 ark-relations = { version = "^0.3.0", default-features = false }
 ark-serialize = { version = "^0.3.0", default-features = false }
 ark-std = { version = "^0.3.0", default-features = false }
-ark-r1cs-std = { version = "^0.4.0", default-features = false }
+ark-r1cs-std = { version = "^0.3.0", default-features = false }
 ark-snark = { version = "^0.3.0", default-features = false }
 
 ark-bls12-381 = { version = "^0.3.0" }
diff --git a/poseidon/Cargo.toml b/poseidon/Cargo.toml
index 6e7d2ecf..b357ab02 100644
--- a/poseidon/Cargo.toml
+++ b/poseidon/Cargo.toml
@@ -14,7 +14,7 @@ description = "An instantiation of the Poseidon SNARK-friendly hash function."
 [dependencies]
 ark-bls12-381 = { version = "^0.3.0" }
 ark-ff = { version = "^0.3.0", default-features = false }
-ark-r1cs-std = {version = "^0.4.0" , default-features = false, optional = true }
+ark-r1cs-std = {version = "^0.3.0" , default-features = false, optional = true }
 ark-relations = { version = "^0.3.0", default-features = false, optional = true }
 paste = { version = "1.0.11" }