adpating to the new proofman

0xPolygonHermez · Dec 17, 2024 · b5c0466 · b5c0466
1 parent 6319349
commit b5c0466
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 9 deletions.
diff --git a/state-machines/binary/src/binary_extension.rs b/state-machines/binary/src/binary_extension.rs
@@ -100,7 +100,7 @@ impl<F: PrimeField> BinaryExtensionSM<F> {
 
             self.binary_extension_table_sm.unregister_predecessor();
 
-            self.std.unregister_predecessor(self.wcm.get_pctx(), None);
+            self.std.unregister_predecessor();
         }
     }
 

diff --git a/state-machines/mem/pil/mem_align.pil b/state-machines/mem/pil/mem_align.pil
@@ -184,5 +184,5 @@ airtemplate MemAlign(const int N = 2**10, const int RC = 2, const int CHUNK_NUM
     for (int i = 0; i < RC; i++) {
         value[i] === sel_prove * prove_val[i] + sel_assume * assume_val[i];
     } 
-    permutation(MEMORY_ID, expressions: [wr * (MEMORY_STORE_OP - MEMORY_LOAD_OP) + MEMORY_LOAD_OP, addr * CHUNK_NUM + offset, step, width, ...value], sel: sel_prove - sel_assume, bus_type: PIOP_BUS_PROD);
+    permutation(MEMORY_ID, expressions: [wr * (MEMORY_STORE_OP - MEMORY_LOAD_OP) + MEMORY_LOAD_OP, addr * CHUNK_NUM + offset, step, width, ...value], sel: sel_prove - sel_assume);
 }
diff --git a/state-machines/mem/src/input_data_sm.rs b/state-machines/mem/src/input_data_sm.rs
@@ -70,8 +70,7 @@ impl<F: PrimeField> InputDataSM<F> {
 
     pub fn unregister_predecessor(&self) {
         if self.registered_predecessors.fetch_sub(1, Ordering::SeqCst) == 1 {
-            let pctx = self.wcm.get_pctx();
-            self.std.unregister_predecessor(pctx, None);
+            self.std.unregister_predecessor();
         }
     }
     pub fn prove(&self, inputs: &[MemInput]) {

diff --git a/state-machines/mem/src/mem_align_sm.rs b/state-machines/mem/src/mem_align_sm.rs
@@ -128,7 +128,7 @@ impl<F: PrimeField> MemAlignSM<F> {
             }
 
             self.mem_align_rom_sm.unregister_predecessor();
-            self.std.unregister_predecessor(pctx, None);
+            self.std.unregister_predecessor();
         }
     }
 

diff --git a/state-machines/mem/src/mem_sm.rs b/state-machines/mem/src/mem_sm.rs
@@ -75,8 +75,7 @@ impl<F: PrimeField> MemSM<F> {
 
     pub fn unregister_predecessor(&self) {
         if self.registered_predecessors.fetch_sub(1, Ordering::SeqCst) == 1 {
-            let pctx = self.wcm.get_pctx();
-            self.std.unregister_predecessor(pctx, None);
+            self.std.unregister_predecessor();
         }
     }
 

diff --git a/state-machines/mem/src/rom_data.rs b/state-machines/mem/src/rom_data.rs
@@ -62,8 +62,7 @@ impl<F: PrimeField> RomDataSM<F> {
 
     pub fn unregister_predecessor(&self) {
         if self.registered_predecessors.fetch_sub(1, Ordering::SeqCst) == 1 {
-            let pctx = self.wcm.get_pctx();
-            self.std.unregister_predecessor(pctx, None);
+            self.std.unregister_predecessor();
         }
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -100,7 +100,7 @@ impl<F: PrimeField> BinaryExtensionSM<F> { @@
                 self.binary_extension_table_sm.unregister_predecessor();
-                self.std.unregister_predecessor(self.wcm.get_pctx(), None);
+                self.std.unregister_predecessor();
             }
         }
@@ Expand Down @@