Remove jf_utils::tagged_blob, replace with tagged_base64::tagged (#143)

* Remove jf_utils::tagged_blob, replace with tagged_base64::tagged * Remove references to jf-utils-derive
EspressoSystems · Nov 22, 2022 · e5321ee · e5321ee
1 parent 9bc08d2
commit e5321ee
Show file tree

Hide file tree

Showing 12 changed files with 35 additions and 391 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,5 +4,4 @@ members = [
   "primitives",
   "relation",
   "utilities",
-  "utilities_derive",
 ]
diff --git a/plonk/Cargo.toml b/plonk/Cargo.toml
@@ -32,6 +32,7 @@ rand_chacha = { version = "0.3.1" }
 rayon = { version = "1.5.0", optional = true }
 serde = { version = "1.0", default-features = false, features = ["derive"] }
 sha3 = "^0.10"
+tagged-base64 = { git = "https://github.com/espressosystems/tagged-base64", tag = "0.2.4" }
 
 [dev-dependencies]
 ark-ed-on-bls12-377 = { git = "https://github.com/arkworks-rs/curves", rev = "677b4ae751a274037880ede86e9b6f30f62635af" }

diff --git a/plonk/src/proof_system/structs.rs b/plonk/src/proof_system/structs.rs
@@ -41,7 +41,8 @@ use jf_relation::{
     },
     PlonkCircuit,
 };
-use jf_utils::{field_switching, fq_to_fr, fr_to_fq, tagged_blob};
+use jf_utils::{field_switching, fq_to_fr, fr_to_fq};
+use tagged_base64::tagged;
 
 /// Universal StructuredReferenceString
 pub type UniversalSrs<E> = UnivariateUniversalParams<E>;
@@ -51,7 +52,7 @@ pub type CommitKey<E> = UnivariateProverParam<<E as PairingEngine>::G1Affine>;
 pub type OpenKey<E> = UnivariateVerifierParam<E>;
 
 /// A Plonk SNARK proof.
-#[tagged_blob(tag::PROOF)]
+#[tagged(tag::PROOF)]
 #[derive(Debug, Clone, PartialEq, Eq, CanonicalSerialize, CanonicalDeserialize, Derivative)]
 #[derivative(Hash(bound = "E:PairingEngine"))]
 pub struct Proof<E: PairingEngine> {
@@ -226,7 +227,7 @@ pub struct PlookupProof<E: PairingEngine> {
 }
 
 /// An aggregated SNARK proof that batchly proving multiple instances.
-#[tagged_blob(tag::BATCHPROOF)]
+#[tagged(tag::BATCHPROOF)]
 #[derive(Debug, Clone, PartialEq, Eq, CanonicalSerialize, CanonicalDeserialize, Derivative)]
 #[derivative(Hash(bound = "E:PairingEngine"))]
 pub struct BatchProof<E: PairingEngine> {

diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml
@@ -34,6 +34,7 @@ rand_chacha = { version = "0.3.1", default-features = false }
 rayon = { version = "1.5.0", optional = true }
 serde = { version = "1.0", default-features = false, features = ["derive"] }
 sha2 = { version = "0.10.1", default-features = false }
+tagged-base64 = { git = "https://github.com/espressosystems/tagged-base64", tag = "0.2.4" }
 zeroize = { version = "1.3", default-features = false }
 
 [dev-dependencies]

diff --git a/primitives/src/merkle_tree.rs b/primitives/src/merkle_tree.rs
@@ -31,10 +31,14 @@ use ark_std::{
     vec,
     vec::Vec,
 };
-use core::{convert::TryFrom, fmt::Debug};
+use core::{
+    convert::{TryFrom, TryInto},
+    fmt::Debug,
+};
 use espresso_systems_common::jellyfish::tag;
-use jf_utils::tagged_blob;
+use jf_utils::field_elem;
 use serde::{Deserialize, Serialize};
+use tagged_base64::tagged;
 
 #[derive(Clone, Copy, PartialEq, Eq, Debug, Hash, Deserialize, Serialize)]
 /// Enum for identifying a position of a node (left, middle or right).
@@ -192,7 +196,7 @@ impl<F: PrimeField> MerklePath<F> {
 }
 
 /// Represents the value for a node in the merkle tree.
-#[tagged_blob(tag::NODE)]
+#[tagged(tag::NODE)]
 #[derive(
     Clone, Debug, PartialEq, Eq, Hash, Default, CanonicalSerialize, CanonicalDeserialize, Copy,
 )]
@@ -337,7 +341,7 @@ where
     Leaf {
         value: NodeValue<F>,
         uid: u64,
-        #[serde(with = "jf_utils::field_elem")]
+        #[serde(with = "field_elem")]
         elem: F,
     },
 }
@@ -820,7 +824,7 @@ where
 }
 
 /// Data struct for a merkle leaf.
-#[tagged_blob(tag::LEAF)]
+#[tagged(tag::LEAF)]
 #[derive(
     Clone, Debug, PartialEq, Eq, Hash, Default, CanonicalSerialize, CanonicalDeserialize, Copy,
 )]

diff --git a/primitives/src/signatures/schnorr.rs b/primitives/src/signatures/schnorr.rs
@@ -28,8 +28,10 @@ use ark_std::{
     string::ToString,
     vec,
 };
+use core::convert::TryInto;
 use espresso_systems_common::jellyfish::tag;
-use jf_utils::{fq_to_fr, fq_to_fr_with_mask, fr_to_fq, tagged_blob};
+use jf_utils::{fq_to_fr, fq_to_fr_with_mask, fr_to_fq};
+use tagged_base64::tagged;
 use zeroize::Zeroize;
 
 /// Schnorr signature scheme.
@@ -125,7 +127,7 @@ impl<F: PrimeField> SignKey<F> {
 
 /// Signature public verification key
 // derive zeroize here so that keypair can be zeroized
-#[tagged_blob(tag::SCHNORRVERKEY)]
+#[tagged(tag::SCHNORRVERKEY)]
 #[derive(CanonicalSerialize, CanonicalDeserialize, Derivative)]
 #[derivative(
     Debug(bound = "P: Parameters"),
@@ -194,7 +196,7 @@ impl<P: Parameters> VerKey<P> {
 
 /// Signature secret key pair used to sign messages
 // make sure sk can be zeroized
-#[tagged_blob(tag::SIGNKEYPAIR)]
+#[tagged(tag::SIGNKEYPAIR)]
 #[derive(CanonicalSerialize, CanonicalDeserialize, Derivative)]
 #[derivative(
     Debug(bound = "P: Parameters"),
@@ -215,7 +217,7 @@ where
 // =====================================================
 
 /// The signature of Schnorr signature scheme
-#[tagged_blob(tag::SIG)]
+#[tagged(tag::SIG)]
 #[derive(CanonicalSerialize, CanonicalDeserialize, Derivative)]
 #[derivative(
     Debug(bound = "P: Parameters"),

diff --git a/scripts/check_no_std.sh b/scripts/check_no_std.sh
@@ -2,7 +2,6 @@
 
 set -x
 
-cargo-nono check --no-default-features --package jf-utils-derive
 cargo-nono check --no-default-features --package jf-utils
 cargo-nono check --no-default-features --package jf-rescue
 cargo-nono check --no-default-features --package jf-primitives

diff --git a/scripts/run_tests.sh b/scripts/run_tests.sh
@@ -8,5 +8,4 @@ cargo test --release -p jf-plonk -- -Zunstable-options --report-time
 cargo test --release -p jf-primitives -- -Zunstable-options --report-time
 cargo test --release -p jf-rescue -- -Zunstable-options --report-time
 cargo test --release -p jf-utils -- -Zunstable-options --report-time
-cargo test --release -p jf-utils-derive -- -Zunstable-options --report-time
 
diff --git a/utilities/Cargo.toml b/utilities/Cargo.toml
@@ -13,12 +13,10 @@ ark-ff = { version = "0.3.0", default-features = false, features = [ "asm" ] }
 ark-serialize = { version = "0.3.0", default-features = false }
 ark-std = { version = "0.3.0", default-features = false }
 digest = { version = "0.10.1", default-features = false }
-displaydoc = { version = "0.2.3", default-features = false }
-jf-utils-derive = { path = "../utilities_derive" }
 rayon = { version = "1.5.0", optional = true }
 serde = { version = "1.0", default-features = false, features = ["derive"] }
 sha2 = { version = "0.10.1", default-features = false }
-tagged-base64 = { git = "https://github.com/EspressoSystems/tagged-base64", tag = "0.2.0" }
+tagged-base64 = { git = "https://github.com/espressosystems/tagged-base64", tag = "0.2.4" }
 
 [dev-dependencies]
 ark-bls12-377 =  { git = "https://github.com/arkworks-rs/curves", rev = "677b4ae751a274037880ede86e9b6f30f62635af" }
@@ -28,8 +26,6 @@ ark-ed-on-bls12-377 = { git = "https://github.com/arkworks-rs/curves", rev = "67
 ark-ed-on-bls12-381 = "0.3.0"
 ark-ed-on-bls12-381-bandersnatch = { git = "https://github.com/arkworks-rs/curves", rev = "677b4ae751a274037880ede86e9b6f30f62635af" }
 ark-ed-on-bn254 = "0.3.0"
-ark-serialize = { version = "0.3.0", features = ["derive"] }
-serde_json = "1.0"
 
 [features]
 default = []