Updating to 0.0.13

0xPolygonHermez · Nov 20, 2024 · b1c9daa · b1c9daa
1 parent 85ff00c
commit b1c9daa
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 41 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -26,16 +26,14 @@ opt-level = 3
 opt-level = 3
 
 [workspace.dependencies]
-proofman-common = { git = "https://github.com/0xPolygonHermez/pil2-proofman.git", rev = "0.0.12" }
-proofman-starks-lib-c = { git = "https://github.com/0xPolygonHermez/pil2-proofman.git", rev = "0.0.12" }
-proofman-macros = { git = "https://github.com/0xPolygonHermez/pil2-proofman.git", rev = "0.0.12" }
-proofman-util = { git = "https://github.com/0xPolygonHermez/pil2-proofman.git", rev = "0.0.12" }
-proofman = { git = "https://github.com/0xPolygonHermez/pil2-proofman.git", rev = "0.0.12" }
-pil-std-lib = { git = "https://github.com/0xPolygonHermez/pil2-proofman.git", rev = "0.0.12" }
-stark = { git = "https://github.com/0xPolygonHermez/pil2-proofman.git", rev = "0.0.12" }
+proofman-common = { git = "https://github.com/0xPolygonHermez/pil2-proofman.git", rev = "0.0.13" }
+proofman-macros = { git = "https://github.com/0xPolygonHermez/pil2-proofman.git", rev = "0.0.13" }
+proofman-util = { git = "https://github.com/0xPolygonHermez/pil2-proofman.git", rev = "0.0.13" }
+proofman = { git = "https://github.com/0xPolygonHermez/pil2-proofman.git", rev = "0.0.13" }
+pil-std-lib = { git = "https://github.com/0xPolygonHermez/pil2-proofman.git", rev = "0.0.13" }
+stark = { git = "https://github.com/0xPolygonHermez/pil2-proofman.git", rev = "0.0.13" }
 #Local development
 # proofman-common = { path = "../pil2-proofman/common" }
-# proofman-starks-lib-c = { path = "../pil2-proofman/provers/starks-lib-c" }
 # proofman-macros = { path = "../pil2-proofman/macros" }
 # proofman-util = { path = "../pil2-proofman/util" }
 # proofman = { path = "../pil2-proofman/proofman" }

diff --git a/book/getting_started/quickstart.md b/book/getting_started/quickstart.md
@@ -112,9 +112,9 @@ ziskup
 ```bash
 git clone https://github.com/0xPolygonHermez/zisk
 git clone -b develop https://github.com/0xPolygonHermez/pil2-compiler.git
-git clone -b 0.0.12 https://github.com/0xPolygonHermez/pil2-proofman.git
-git clone -b 0.0.12 https://github.com/0xPolygonHermez/pil2-proofman-js
-git clone -b 0.0.12 https://github.com/0xPolygonHermez/pil2-stark-js
+git clone -b 0.0.13 https://github.com/0xPolygonHermez/pil2-proofman.git
+git clone -b 0.0.13 https://github.com/0xPolygonHermez/pil2-proofman-js
+git clone -b 0.0.13 https://github.com/0xPolygonHermez/pil2-stark-js
 ```
 
 All following commands should be executed in the `zisk` folder.

diff --git a/book/getting_started/quickstart_dev.md b/book/getting_started/quickstart_dev.md
@@ -18,9 +18,9 @@ Run the following commands to clone the necessary repositories:
 ```bash
 git clone -b develop https://github.com/0xPolygonHermez/pil2-compiler.git
 git clone -b develop https://github.com/0xPolygonHermez/zisk.git
-git clone -b 0.0.12 https://github.com/0xPolygonHermez/pil2-proofman.git
-git clone -b 0.0.12 https://github.com/0xPolygonHermez/pil2-stark-js.git
-git clone -b 0.0.12 https://github.com/0xPolygonHermez/pil2-proofman-js
+git clone -b 0.0.13 https://github.com/0xPolygonHermez/pil2-proofman.git
+git clone -b 0.0.13 https://github.com/0xPolygonHermez/pil2-stark-js.git
+git clone -b 0.0.13 https://github.com/0xPolygonHermez/pil2-proofman-js
 ```
 
 ## Compile a Verifiable Rust Program

diff --git a/rom-merkle/Cargo.toml b/rom-merkle/Cargo.toml
@@ -8,7 +8,6 @@ sm-rom = { path = "../state-machines/rom" }
 log = { workspace = true }
 stark = { workspace = true }
 proofman-common = { workspace = true }
-proofman-starks-lib-c = { workspace = true }
 zisk-pil = { path="../pil" }
 
 

diff --git a/rom-merkle/src/main.rs b/rom-merkle/src/main.rs
@@ -1,11 +1,10 @@
 use clap::{Arg, Command};
 use colored::Colorize;
 use p3_goldilocks::Goldilocks;
-use proofman_common::{GlobalInfo, ProofType, SetupCtx};
-use proofman_starks_lib_c::{extend_and_merkelize_custom_commit_c, fri_proof_new_c, starks_new_c};
+use proofman_common::{get_custom_commit_trace, GlobalInfo, ProofType, SetupCtx};
 use sm_rom::RomSM;
 use stark::StarkBufferAllocator;
-use std::{ffi::c_void, path::Path, sync::Arc};
+use std::{path::Path, sync::Arc};
 use sysinfo::System;
 use zisk_pil::{ROM_AIR_IDS, ZISK_AIRGROUP_ID};
 
@@ -88,24 +87,13 @@ fn main() {
 
     let setup = sctx.get_setup(ZISK_AIRGROUP_ID, ROM_AIR_IDS[0]);
 
-    let p_stark = starks_new_c((&setup.p_setup).into(), std::ptr::null_mut());
-    let p_proof = fri_proof_new_c((&setup.p_setup).into());
-
     match RomSM::<Goldilocks>::compute_trace_rom_buffer(
         rom_path.to_path_buf(),
         buffer_allocator,
         &sctx,
     ) {
         Ok((commit_id, buffer_rom)) => {
-            extend_and_merkelize_custom_commit_c(
-                p_stark,
-                commit_id,
-                0,
-                buffer_rom.as_ptr() as *mut c_void,
-                p_proof,
-                std::ptr::null_mut(),
-                rom_buffer_str.as_str(),
-            );
+            get_custom_commit_trace(commit_id, 0, setup, buffer_rom, rom_buffer_str.as_str());
         }
         Err(e) => {
             log::error!("Error: {}", e);