Feature/memory align with proxy

Cargo.toml

@@ -26,19 +26,19 @@ 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" }
+# 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 = { path = "../pil2-proofman/common" }
-# proofman-macros = { path = "../pil2-proofman/macros" }
-# proofman-util = { path = "../pil2-proofman/util" }
-# proofman = { path = "../pil2-proofman/proofman" }
-# pil-std-lib = { path = "../pil2-proofman/pil2-components/lib/std/rs" }
-# stark = { path = "../pil2-proofman/provers/stark" }
+proofman-common = { path = "../pil2-proofman/common" }
+proofman-macros = { path = "../pil2-proofman/macros" }
+proofman-util = { path = "../pil2-proofman/util" }
+proofman = { path = "../pil2-proofman/proofman" }
+pil-std-lib = { path = "../pil2-proofman/pil2-components/lib/std/rs" }
+stark = { path = "../pil2-proofman/provers/stark" }
 
 p3-field = { git = "https://github.com/Plonky3/Plonky3.git", rev = "c3d754ef77b9fce585b46b972af751fe6e7a9803" }
 log = "0.4"

core/src/zisk_required_operation.rs

@@ -1,4 +1,4 @@
-use std::collections::HashMap;
+use std::{collections::HashMap, fmt};
 
 #[derive(Clone)]
 pub struct ZiskRequiredOperation {
@@ -10,13 +10,30 @@ pub struct ZiskRequiredOperation {
 
 #[derive(Clone)]
 pub struct ZiskRequiredMemory {
-    pub step: u64,
+    pub address: u32,
     pub is_write: bool,
-    pub address: u64,
-    pub width: u64,
+    pub width: u8,
+    pub step_offset: u8,
+    pub step: u64,
     pub value: u64,
 }
 
+impl fmt::Debug for ZiskRequiredMemory {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let label = if self.is_write { "WR" } else { "RD" };
+        write!(
+            f,
+            "{0} addr:{1:#08X}({1}) offset:{5} with:{2} value:{3:#016X}({3}) step:{4}",
+            label,
+            self.address,
+            self.width,
+            self.value,
+            self.step,
+            self.address & 0x07
+        )
+    }
+}
+
 #[derive(Clone, Default)]
 pub struct ZiskRequired {
     pub arith: Vec<ZiskRequiredOperation>,