Merge branch 'master' into 780-eip-7951-precompile-for-secp256r1-curve-support

Author: lorenzogentile404

Makefile

@@ -12,7 +12,8 @@ ALU := alu/add/add.zkasm alu/ext alu/mod alu/mul
 
 BIN := bin/bin.zkasm
 
-BLAKE2f_MODEXP_DATA := blake2fmodexpdata
+BLAKE2f_MODEXP_DATA_LONDON := blake2fmodexpdata/london
+BLAKE2f_MODEXP_DATA_OSAKA  := blake2fmodexpdata/osaka
 
 # constraints used in prod for LINEA, with linea block gas limit
 BLOCKDATA_LONDON := blockdata/london
@@ -53,7 +54,8 @@ LOG_DATA := logdata
 LOG_INFO_LONDON := loginfo/london
 LOG_INFO_CANCUN := loginfo/cancun
 
-MMU :=  mmu
+MMU_LONDON :=  mmu/london
+MMU_OSAKA  :=  mmu/osaka
 
 MMIO_LONDON := mmio/london
 MMIO_CANCUN := mmio/cancun
@@ -118,7 +120,6 @@ endef
 ZKEVM_MODULES_COMMON := ${CONSTANTS} \
 		 ${ALU} \
 		 ${BIN} \
-		 ${BLAKE2f_MODEXP_DATA} \
 		 ${BLOCKHASH} \
 		 ${EUC} \
 		 ${EXP} \
@@ -136,6 +137,7 @@ ZKEVM_MODULES_COMMON := ${CONSTANTS} \
 ZKEVM_MODULES_LONDON := ${ZKEVM_MODULES_COMMON} \
 		 ${CONSTANTS_LONDON} \
 		 ${TABLES_LONDON} \
+		 ${BLAKE2f_MODEXP_DATA_LONDON} \
 		 ${BLOCKDATA_LONDON} \
 		 ${EC_DATA_LONDON} \
 		 ${HUB_LONDON} \
@@ -155,6 +157,7 @@ ZKEVM_MODULES_LONDON := ${ZKEVM_MODULES_COMMON} \
 ZKEVM_MODULES_SHANGHAI := ${ZKEVM_MODULES_COMMON} \
 		 ${CONSTANTS_LONDON} \
 		 ${TABLES_LONDON} \
+		 ${BLAKE2f_MODEXP_DATA_LONDON} \
 		 ${BLOCKDATA_PARIS} \
 		 ${EC_DATA_LONDON} \
 		 ${HUB_SHANGHAI} \
@@ -169,8 +172,9 @@ ZKEVM_MODULES_SHANGHAI := ${ZKEVM_MODULES_COMMON} \
 		 ${TXN_DATA_SHANGHAI}
 
 ZKEVM_MODULES_CANCUN := ${ZKEVM_MODULES_COMMON} \
-         ${CONSTANTS_CANCUN} \
+		 ${CONSTANTS_CANCUN} \
 		 ${TABLES_CANCUN} \
+		 ${BLAKE2f_MODEXP_DATA_LONDON} \
 		 ${BLOCKDATA_CANCUN} \
 		 ${BLS_CANCUN} \
 		 ${EC_DATA_LONDON} \
@@ -189,6 +193,7 @@ ZKEVM_MODULES_CANCUN := ${ZKEVM_MODULES_COMMON} \
 ZKEVM_MODULES_PRAGUE := ${ZKEVM_MODULES_COMMON} \
 		 ${CONSTANTS_PRAGUE} \
 		 ${TABLES_PRAGUE} \
+		 ${BLAKE2f_MODEXP_DATA_LONDON} \
 		 ${BLOCKDATA_CANCUN} \
 		 ${BLS_PRAGUE} \
 		 ${EC_DATA_LONDON} \
@@ -207,6 +212,7 @@ ZKEVM_MODULES_PRAGUE := ${ZKEVM_MODULES_COMMON} \
 ZKEVM_MODULES_OSAKA := ${ZKEVM_MODULES_COMMON} \
 		 ${CONSTANTS_OSAKA} \
 		 ${TABLES_PRAGUE} \
+		 ${BLAKE2f_MODEXP_DATA_OSAKA} \
 		 ${BLOCKDATA_CANCUN} \
 		 ${BLS_PRAGUE} \
 		 ${EC_DATA_OSAKA} \

blake2fmodexpdata/columns.lisp renamed to blake2fmodexpdata/london/columns.lisp

@@ -0,0 +1,13 @@
+(module blake2fmodexpdata)
+
+(defconst
+  INDEX_MAX_MODEXP          31
+  INDEX_MAX_MODEXP_BASE     INDEX_MAX_MODEXP
+  INDEX_MAX_MODEXP_EXPONENT INDEX_MAX_MODEXP
+  INDEX_MAX_MODEXP_MODULUS  INDEX_MAX_MODEXP
+  INDEX_MAX_MODEXP_RESULT   INDEX_MAX_MODEXP
+  INDEX_MAX_BLAKE_DATA      12
+  INDEX_MAX_BLAKE_PARAMS    1
+  INDEX_MAX_BLAKE_RESULT    3)
+
+

blake2fmodexpdata/london/constants.lisp

@@ -0,0 +1,18 @@
+(module blake2fmodexpdata)
+
+(defcolumns
+  (STAMP                :i16)
+  (ID                   :i32)
+  (PHASE                :byte)
+  (INDEX                :byte :display :dec)
+  (INDEX_MAX            :byte :display :dec)
+  (LIMB                 :i128 :display :bytes)
+  (IS_MODEXP_BASE       :binary@prove)
+  (IS_MODEXP_EXPONENT   :binary@prove)
+  (IS_MODEXP_MODULUS    :binary@prove)
+  (IS_MODEXP_RESULT     :binary@prove)
+  (IS_BLAKE_DATA        :binary@prove)
+  (IS_BLAKE_PARAMS      :binary@prove)
+  (IS_BLAKE_RESULT      :binary@prove)
+  )
+

blake2fmodexpdata/constraints.lisp renamed to blake2fmodexpdata/london/constraints.lisp

@@ -0,0 +1,76 @@
+(module blake2fmodexpdata)
+
+(defun (flag-sum)
+  (+ IS_MODEXP_BASE
+     IS_MODEXP_EXPONENT
+     IS_MODEXP_MODULUS
+     IS_MODEXP_RESULT
+     IS_BLAKE_DATA
+     IS_BLAKE_PARAMS
+     IS_BLAKE_RESULT))
+
+(defun (phase-sum)
+  (+ (* PHASE_MODEXP_BASE IS_MODEXP_BASE)
+     (* PHASE_MODEXP_EXPONENT IS_MODEXP_EXPONENT)
+     (* PHASE_MODEXP_MODULUS IS_MODEXP_MODULUS)
+     (* PHASE_MODEXP_RESULT IS_MODEXP_RESULT)
+     (* PHASE_BLAKE_DATA IS_BLAKE_DATA)
+     (* PHASE_BLAKE_PARAMS IS_BLAKE_PARAMS)
+     (* PHASE_BLAKE_RESULT IS_BLAKE_RESULT)))
+
+(defun (index-max-sum)
+  (+ (* INDEX_MAX_MODEXP_BASE IS_MODEXP_BASE)
+     (* INDEX_MAX_MODEXP_EXPONENT IS_MODEXP_EXPONENT)
+     (* INDEX_MAX_MODEXP_MODULUS IS_MODEXP_MODULUS)
+     (* INDEX_MAX_MODEXP_RESULT IS_MODEXP_RESULT)
+     (* INDEX_MAX_BLAKE_DATA IS_BLAKE_DATA)
+     (* INDEX_MAX_BLAKE_PARAMS IS_BLAKE_PARAMS)
+     (* INDEX_MAX_BLAKE_RESULT IS_BLAKE_RESULT)))
+
+(defconstraint no-stamp-no-flag ()
+  (if-zero STAMP
+           (vanishes! (flag-sum))
+           (eq! (flag-sum) 1)))
+
+(defconstraint set-phase-and-index ()
+  (begin (eq! PHASE (phase-sum))
+         (eq! INDEX_MAX (index-max-sum))))
+
+(defconstraint stamp-constancies ()
+  (stamp-constancy STAMP ID))
+
+(defconstraint index-constancies (:guard INDEX)
+  (remained-constant! (phase-sum)))
+
+(defconstraint first-row (:domain {0})
+  (vanishes! STAMP))
+
+(defconstraint no-stamp-nothing ()
+  (if-zero STAMP
+           (begin (vanishes! ID)
+                  (vanishes! (next INDEX)))))
+
+(defun (stamp-increment)
+  (force-bin  (+ (* (- 1 IS_MODEXP_BASE) (next IS_MODEXP_BASE))
+                 (* (- 1 IS_BLAKE_DATA) (next IS_BLAKE_DATA)))))
+
+(defconstraint stamp-increases ()
+  (will-inc! STAMP (stamp-increment)))
+
+(defun (transition-bit)
+  (force-bin  (+ (* IS_MODEXP_BASE (next IS_MODEXP_EXPONENT))
+                 (* IS_MODEXP_EXPONENT (next IS_MODEXP_MODULUS))
+                 (* IS_MODEXP_MODULUS (next IS_MODEXP_RESULT))
+                 (* IS_MODEXP_RESULT
+                    (+ (next IS_MODEXP_BASE) (next IS_BLAKE_DATA)))
+                 (* IS_BLAKE_DATA (next IS_BLAKE_PARAMS))
+                 (* IS_BLAKE_PARAMS (next IS_BLAKE_RESULT))
+                 (* IS_BLAKE_RESULT
+                    (+ (next IS_MODEXP_BASE) (next IS_BLAKE_DATA))))))
+
+(defconstraint heartbeat (:guard STAMP)
+  (if-zero (- INDEX_MAX INDEX)
+           (eq! (transition-bit) 1)
+           (will-inc! INDEX 1)))
+
+

blake2fmodexpdata/lookups/blakemodexp_into_wcp.lisp renamed to blake2fmodexpdata/london/lookups/blakemodexp_into_wcp.lisp

@@ -0,0 +1,28 @@
+(defun (blake2fmodexpdata-into-wcp-oob-into-wcp-activation-flag)
+  (force-bin (* (~ blake2fmodexpdata.STAMP)
+                (- blake2fmodexpdata.STAMP (prev blake2fmodexpdata.STAMP)))))
+
+(defclookup
+  blake2fmodexpdata-into-wcp
+  ;; target colums (in WCP)
+  (
+    wcp.ARG_1_HI
+    wcp.ARG_1_LO
+    wcp.ARG_2_HI
+    wcp.ARG_2_LO
+    wcp.RES
+    wcp.INST
+  )
+  ;; source selector
+  (blake2fmodexpdata-into-wcp-oob-into-wcp-activation-flag)
+  ;; source columns
+  (
+    0
+    (prev blake2fmodexpdata.ID)
+    0
+    blake2fmodexpdata.ID
+    1
+    EVM_INST_LT
+  ))
+
+