merge

EspressoSystems · Mar 8, 2024 · cc73116 · cc73116
2 parents 9581c12 + 7f510c6
commit cc73116
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 27 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/contracts/rust/adapter/Cargo.toml b/contracts/rust/adapter/Cargo.toml
@@ -13,6 +13,7 @@ ark-ed-on-bn254 = { workspace = true }
 ark-ff = { workspace = true }
 ark-poly = { workspace = true }
 ark-serialize = { workspace = true }
+ark-srs = { git = "https://github.com/alxiong/ark-srs", tag = "v0.1.0" }
 ark-std = { workspace = true }
 contract-bindings = { path = "../../../contract-bindings" }
 diff-test-bn254 = { git = "https://github.com/EspressoSystems/solidity-bn254.git" }

diff --git a/contracts/rust/diff-test/Cargo.toml b/contracts/rust/diff-test/Cargo.toml
@@ -12,9 +12,9 @@ ark-ec = { workspace = true }
 ark-ed-on-bn254 = { workspace = true }
 ark-ff = { workspace = true }
 ark-poly = { workspace = true }
+ark-srs = { git = "https://github.com/alxiong/ark-srs", tag = "v0.1.0" }
 ark-std = { workspace = true }
 clap = { version = "^4.4", features = ["derive"] }
-crs = { git = "https://github.com/alxiong/crs" }
 diff-test-bn254 = { git = "https://github.com/EspressoSystems/solidity-bn254.git" }
 digest = { version = "0.10", default-features = false, features = ["alloc"] }
 ethers = { version = "2.0.4" }

diff --git a/contracts/rust/gen-vk-contract/Cargo.toml b/contracts/rust/gen-vk-contract/Cargo.toml
@@ -6,7 +6,7 @@ authors = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
-crs = { git = "https://github.com/alxiong/crs" }
+ark-srs = { git = "https://github.com/alxiong/ark-srs", tag = "v0.1.0" }
 hotshot-contract-adapter = { path = "../adapter" }
 hotshot-stake-table = { workspace = true }
 hotshot-state-prover = { path = "../../../hotshot-state-prover" }

diff --git a/contracts/rust/gen-vk-contract/src/main.rs b/contracts/rust/gen-vk-contract/src/main.rs
@@ -14,8 +14,8 @@ use jf_primitives::pcs::prelude::UnivariateUniversalParams;
 fn main() {
     let srs = {
         // load SRS from Aztec's ceremony
-        let srs =
-            crs::aztec20::kzg10_setup(2u64.pow(20) as usize + 2).expect("Aztec SRS fail to load");
+        let srs = ark_srs::aztec20::kzg10_setup(2u64.pow(20) as usize + 2)
+            .expect("Aztec SRS fail to load");
         // convert to Jellyfish type
         // TODO: (alex) use constructor instead https://github.com/EspressoSystems/jellyfish/issues/440
         UnivariateUniversalParams {

diff --git a/hotshot-state-prover/Cargo.toml b/hotshot-state-prover/Cargo.toml
@@ -12,6 +12,7 @@ ark-ec = { workspace = true }
 ark-ed-on-bn254 = { workspace = true }
 ark-ff = { workspace = true }
 ark-serialize = { workspace = true }
+ark-srs = { git = "https://github.com/alxiong/ark-srs", tag = "v0.1.0" }
 ark-std = { workspace = true }
 async-compatibility-layer = { workspace = true }
 async-std = { workspace = true }
@@ -20,7 +21,6 @@ blake3 = "1.5"
 clap = { workspace = true }
 cld = { workspace = true }
 contract-bindings = { path = "../contract-bindings" }
-crs = { git = "https://github.com/alxiong/crs" }
 derive_more = { workspace = true }
 displaydoc = { version = "0.2.3", default-features = false }
 ethers = { workspace = true }

diff --git a/hotshot-state-prover/src/mock_ledger.rs b/hotshot-state-prover/src/mock_ledger.rs
@@ -243,7 +243,7 @@ impl MockLedger {
 
         let srs = {
             // load SRS from Aztec's ceremony
-            let srs = crs::aztec20::kzg10_setup(2u64.pow(16) as usize + 2)
+            let srs = ark_srs::aztec20::kzg10_setup(2u64.pow(16) as usize + 2)
                 .expect("Aztec SRS fail to load");
             // convert to Jellyfish type
             // TODO: (alex) use constructor instead https://github.com/EspressoSystems/jellyfish/issues/440
@@ -301,7 +301,7 @@ impl MockLedger {
 
         let srs = {
             // load SRS from Aztec's ceremony
-            let srs = crs::aztec20::kzg10_setup(2u64.pow(16) as usize + 2)
+            let srs = ark_srs::aztec20::kzg10_setup(2u64.pow(16) as usize + 2)
                 .expect("Aztec SRS fail to load");
             // convert to Jellyfish type
             // TODO: (alex) use constructor instead https://github.com/EspressoSystems/jellyfish/issues/440
@@ -430,7 +430,7 @@ pub fn gen_plonk_proof_for_test(
     // 1. Simulate universal setup
     let rng = &mut jf_utils::test_rng();
     let srs = {
-        let aztec_srs = crs::aztec20::kzg10_setup(1024).expect("Aztec SRS fail to load");
+        let aztec_srs = ark_srs::aztec20::kzg10_setup(1024).expect("Aztec SRS fail to load");
 
         UnivariateUniversalParams {
             powers_of_g: aztec_srs.powers_of_g,

diff --git a/hotshot-state-prover/src/service.rs b/hotshot-state-prover/src/service.rs
@@ -107,7 +107,7 @@ pub fn load_proving_key() -> ProvingKey {
 
         std::println!("Loading SRS from Aztec's ceremony...");
         let srs_timer = Instant::now();
-        let srs = crs::aztec20::kzg10_setup(num_gates + 2).expect("Aztec SRS fail to load");
+        let srs = ark_srs::aztec20::kzg10_setup(num_gates + 2).expect("Aztec SRS fail to load");
         let srs_elapsed = srs_timer.elapsed();
         std::println!("Done in {srs_elapsed:.3}");
 
@@ -456,7 +456,7 @@ mod test {
 
         let srs = {
             // load SRS from Aztec's ceremony
-            let srs = crs::aztec20::kzg10_setup(2u64.pow(16) as usize + 2)
+            let srs = ark_srs::aztec20::kzg10_setup(2u64.pow(16) as usize + 2)
                 .expect("Aztec SRS fail to load");
             // convert to Jellyfish type
             // TODO: (alex) use constructor instead https://github.com/EspressoSystems/jellyfish/issues/440