Fix/refacto blockdata files (#572)

Author: amkCha

Makefile

@@ -59,15 +59,13 @@ BLOCKDATA_FOR_REFERENCE_TESTS := $(wildcard blockdata/*.lisp) \
 				 $(wildcard blockdata/processing/*.lisp) \
 				 $(wildcard blockdata/processing/gaslimit/common.lisp) \
 				 $(wildcard blockdata/processing/gaslimit/ethereum.lisp) \
-		       $(wildcard blockdata/processing/gaslimit/constants-ethereum.lisp) \
 				 $(wildcard blockdata/lookups/*.lisp)
 
 # with gaslimit for linea file
 BLOCKDATA_FOR_LINEA := $(wildcard blockdata/*.lisp) \
 		       $(wildcard blockdata/processing/*.lisp) \
 		       $(wildcard blockdata/processing/gaslimit/common.lisp) \
 		       $(wildcard blockdata/processing/gaslimit/linea.lisp) \
-		       $(wildcard blockdata/processing/gaslimit/constants-linea.lisp) \
 		       $(wildcard blockdata/lookups/*.lisp)
 
 BLOCKHASH := $(wildcard blockhash/columns/*.lisp) \
@@ -139,12 +137,13 @@ TXN_DATA_FOR_REFERENCE_TESTS :=  $(wildcard txndata/*.lisp) \
 
 WCP := wcp
 
-ZKEVM_MODULES := ${ALU} \
+# Corset is order sensitive - to compile, we load the constants first
+ZKEVM_MODULES := ${CONSTANTS} \
+		 ${ALU} \
 		 ${BIN} \
 		 ${BLAKE2f_MODEXP_DATA} \
 		 ${BLOCKDATA_FOR_LINEA} \
 		 ${BLOCKHASH} \
-		 ${CONSTANTS} \
 		 ${EC_DATA} \
 		 ${EUC} \
 		 ${EXP} \
@@ -181,13 +180,13 @@ zkevm.bin: ${ZKEVM_MODULES}
 zkevm.go.bin: ${ZKEVM_MODULES}
 	${GO_CORSET} compile -o $@ ${ZKEVM_MODULES}
 
-
-ZKEVM_MODULES_FOR_REFERENCE_TESTS := ${ALU} \
+# Corset is order sensitive - to compile, we load the constants first
+ZKEVM_MODULES_FOR_REFERENCE_TESTS := ${CONSTANTS} \
+					 ${ALU} \
 				     ${BIN} \
 				     ${BLAKE2f_MODEXP_DATA} \
 				     ${BLOCKDATA_FOR_REFERENCE_TESTS} \
 				     ${BLOCKHASH} \
-				     ${CONSTANTS} \
 				     ${EC_DATA} \
 				     ${EUC} \
 				     ${EXP} \

blockdata/processing/gaslimit/common.lisp

@@ -22,7 +22,25 @@
 
 ;; row i + 0
 ;; row i + 1
-;; are ethereum vs. linea dependent, see ethereum.lisp and linea.lisp
+;; are ethereum vs. linea dependent, see constants in ethereum.lisp and linea.lisp
+
+(defconstraint   gaslimit---lower-bound
+                 (:guard (gaslimit-precondition))
+                 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+                 (wcp-call-to-GEQ   0
+                                    (curr-GASLIMIT-hi)
+                                    (curr-GASLIMIT-lo)
+                                    0
+                                    GAS_LIMIT_MINIMUM))
+
+(defconstraint   gaslimit---upper-bound
+                 (:guard (gaslimit-precondition))
+                 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+                 (wcp-call-to-LEQ   1
+                                    (curr-GASLIMIT-hi)
+                                    (curr-GASLIMIT-lo)
+                                    0
+                                    GAS_LIMIT_MAXIMUM))
 
 (defconstraint   gaslimit---compute-maximum-deviation
                  (:guard (gaslimit-precondition))

blockdata/processing/gaslimit/constants-ethereum.lisp

@@ -1,26 +1,4 @@
 (module blockdata)
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;                                 ;;
-;;  3 Computations and checks      ;;
-;;  3.X For GASLIMIT for Ethereum  ;;
-;;                                 ;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defconstraint   gaslimit---lower-bound---ETHEREUM
-                 (:guard (gaslimit-precondition))
-                 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-                 (wcp-call-to-GEQ   0
-                                    (curr-GASLIMIT-hi)
-                                    (curr-GASLIMIT-lo)
-                                    0
-                                    GAS_LIMIT_MINIMUM))
-
-(defconstraint   gaslimit---upper-bound---ETHEREUM
-                 (:guard (gaslimit-precondition))
-                 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-                 (wcp-call-to-LEQ   1 
-                                    (curr-GASLIMIT-hi)
-                                    (curr-GASLIMIT-lo)
-                                    0
-                                    GAS_LIMIT_MAXIMUM))
+(defconst GAS_LIMIT_MINIMUM ETHEREUM_GAS_LIMIT_MINIMUM)
+(defconst GAS_LIMIT_MAXIMUM ETHEREUM_GAS_LIMIT_MAXIMUM)

blockdata/processing/gaslimit/constants-linea.lisp

@@ -1,26 +1,4 @@
 (module blockdata)
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;                              ;;
-;;  3 Computations and checks   ;;
-;;  3.X For GASLIMIT for Linea  ;;
-;;                              ;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defconstraint   gaslimit---lower-bound---LINEA
-                 (:guard (gaslimit-precondition))
-                 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-                 (wcp-call-to-GEQ   0
-                                    (curr-GASLIMIT-hi)
-                                    (curr-GASLIMIT-lo)
-                                    0
-                                    GAS_LIMIT_MINIMUM))
-
-(defconstraint   gaslimit---upper-bound---LINEA
-                 (:guard (gaslimit-precondition))
-                 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-                 (wcp-call-to-LEQ   1 
-                                    (curr-GASLIMIT-hi)
-                                    (curr-GASLIMIT-lo)
-                                    0
-                                    GAS_LIMIT_MAXIMUM))
+(defconst GAS_LIMIT_MINIMUM LINEA_GAS_LIMIT_MINIMUM)
+(defconst GAS_LIMIT_MAXIMUM LINEA_GAS_LIMIT_MAXIMUM)