Feature/custom commits (#166)

* Custom cols rom (#159) Custom cols working --------- Co-authored-by: Xavier Pinsach <[email protected]> * Cached custom commits * Updating proofman to 0.0.12 * Cargo fmt * Cargo fmt * Fix cargo clippy * Rom trace is now deterministic * cargo fmt * Global constraints verifying again * Optimizing the binary component (#167) * Optimizing the binary * Updating the executor * Updating to 0.0.13 * Not creating unnecessary instances of arith tables * Pil2-proofman 0.0.14 --------- Co-authored-by: Xavier Pinsach <[email protected]> Co-authored-by: Héctor Masip Ardevol <[email protected]>
0xPolygonHermez · Dec 3, 2024 · c598844 · c598844
1 parent 492330b
commit c598844
Show file tree

Hide file tree

Showing 13 changed files with 321 additions and 484 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -26,13 +26,13 @@ opt-level = 3
 opt-level = 3
 
 [workspace.dependencies]
-proofman-common = { git = "https://github.com/0xPolygonHermez/pil2-proofman.git", rev = "0.0.10" }
-proofman-macros = { git = "https://github.com/0xPolygonHermez/pil2-proofman.git", rev = "0.0.10" }
-proofman-util = { git = "https://github.com/0xPolygonHermez/pil2-proofman.git", rev = "0.0.10" }
-proofman = { git = "https://github.com/0xPolygonHermez/pil2-proofman.git", rev = "0.0.10" }
-pil-std-lib = { git = "https://github.com/0xPolygonHermez/pil2-proofman.git", rev = "0.0.10" }
-stark = { git = "https://github.com/0xPolygonHermez/pil2-proofman.git", rev = "0.0.10" }
-# Local development
+proofman-common = { git = "https://github.com/0xPolygonHermez/pil2-proofman.git", rev = "0.0.14" }
+proofman-macros = { git = "https://github.com/0xPolygonHermez/pil2-proofman.git", rev = "0.0.14" }
+proofman-util = { git = "https://github.com/0xPolygonHermez/pil2-proofman.git", rev = "0.0.14" }
+proofman = { git = "https://github.com/0xPolygonHermez/pil2-proofman.git", rev = "0.0.14" }
+pil-std-lib = { git = "https://github.com/0xPolygonHermez/pil2-proofman.git", rev = "0.0.14" }
+stark = { git = "https://github.com/0xPolygonHermez/pil2-proofman.git", rev = "0.0.14" }
+#Local development
 # proofman-common = { path = "../pil2-proofman/common" }
 # proofman-macros = { path = "../pil2-proofman/macros" }
 # proofman-util = { path = "../pil2-proofman/util" }

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.10  https://github.com/0xPolygonHermez/pil2-proofman.git
-git clone -b 0.0.10 https://github.com/0xPolygonHermez/pil2-proofman-js
-git clone -b 0.0.10 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.10 https://github.com/0xPolygonHermez/pil2-proofman.git
-git clone -b 0.0.10 https://github.com/0xPolygonHermez/pil2-stark-js.git
-git clone -b 0.0.10 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/pil/src/pil_helpers/traces.rs b/pil/src/pil_helpers/traces.rs
@@ -8,7 +8,7 @@ trace!(MainRow, MainTrace<F> {
 });
 
 trace!(RomRow, RomTrace<F> {
- line: F, a_offset_imm0: F, a_imm1: F, b_offset_imm0: F, b_imm1: F, ind_width: F, op: F, store_offset: F, jmp_offset1: F, jmp_offset2: F, flags: F, multiplicity: F,
+ multiplicity: F,
 });
 
 trace!(ArithRow, ArithTrace<F> {
@@ -24,7 +24,7 @@ trace!(ArithRangeTableRow, ArithRangeTableTrace<F> {
 });
 
 trace!(BinaryRow, BinaryTrace<F> {
- m_op: F, mode32: F, free_in_a: [F; 8], free_in_b: [F; 8], free_in_c: [F; 8], carry: [F; 8], use_last_carry: F, op_is_min_max: F, multiplicity: F, main_step: F,
+ m_op: F, mode32: F, free_in_a: [F; 8], free_in_b: [F; 8], free_in_c: [F; 8], carry: [F; 8], use_last_carry: F, op_is_min_max: F, cout: F, result_is_a: F, use_last_carry_mode32: F, use_last_carry_mode64: F, m_op_or_ext: F, free_in_a_or_c: [F; 4], free_in_b_or_zero: [F; 4], multiplicity: F, main_step: F,
 });
 
 trace!(BinaryTableRow, BinaryTableTrace<F> {
@@ -42,3 +42,7 @@ trace!(BinaryExtensionTableRow, BinaryExtensionTableTrace<F> {
 trace!(SpecifiedRangesRow, SpecifiedRangesTrace<F> {
  mul: [F; 1],
 });
+
+trace!(RomRomRow, RomRomTrace<F> {
+ line: F, a_offset_imm0: F, a_imm1: F, b_offset_imm0: F, b_imm1: F, ind_width: F, op: F, store_offset: F, jmp_offset1: F, jmp_offset2: F, flags: F,
+});
diff --git a/rom-merkle/Cargo.toml b/rom-merkle/Cargo.toml
@@ -8,6 +8,8 @@ sm-rom = { path = "../state-machines/rom" }
 log = { workspace = true }
 stark = { workspace = true }
 proofman-common = { workspace = true }
+zisk-pil = { path="../pil" }
+
 
 p3-goldilocks = { git = "https://github.com/Plonky3/Plonky3.git", rev = "c3d754ef77b9fce585b46b972af751fe6e7a9803" }
 p3-field = { workspace = true }