Merge branch 'master' into feat/blockdata-separate-eth-linea-constants

Consensys · Jan 14, 2025 · 84d818e · 84d818e
2 parents b1d26c4 + 8c920e4
commit 84d818e
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 25 deletions.
diff --git a/Makefile b/Makefile
@@ -59,7 +59,7 @@ 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/processing/gaslimit/constants-ethereum.lisp) \
 				 $(wildcard blockdata/lookups/*.lisp)
 
 # with gaslimit for linea file

diff --git a/constants/constants.lisp b/constants/constants.lisp
@@ -221,11 +221,12 @@
   LINEA_BASE_FEE                            7
   LINEA_DIFFICULTY                          2
   LINEA_MAX_NUMBER_OF_TRANSACTIONS_IN_BATCH 200
+  GAS_LIMIT_ADJUSTMENT_FACTOR               1024
+  ;; we keep the following constants as they are referenced in blockdata gas limit tests
   ETHEREUM_GAS_LIMIT_MINIMUM                5000
   ETHEREUM_GAS_LIMIT_MAXIMUM                0xffffffffffffffff ;; maxUint64
   LINEA_GAS_LIMIT_MINIMUM                   61000000
   LINEA_GAS_LIMIT_MAXIMUM                   2000000000
-  GAS_LIMIT_ADJUSTMENT_FACTOR               1024
   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;               ;;
   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; SIZE / LENGTH ;;

diff --git a/ecdata/constraints.lisp b/ecdata/constraints.lisp
@@ -477,32 +477,32 @@
 
 ;; Note: in the specs for simplicity we omit the last four arguments
 (defun (callToC1MembershipWCP k
-                              P_x_hi
-                              P_x_lo
-                              P_y_hi
-                              P_y_lo
-                              P_y_square_hi
-                              P_y_square_lo
-                              P_x_cube_plus_three_hi
-                              P_x_cube_plus_three_lo)
-  (begin (callToLT k P_x_hi P_x_lo P_BN_HI P_BN_LO)
-         (callToLT (+ k 1) P_y_hi P_y_lo P_BN_HI P_BN_LO)
-         (callToEQ (+ k 2) P_y_square_hi P_y_square_lo P_x_cube_plus_three_hi P_x_cube_plus_three_lo)))
+                              _P_x_hi
+                              _P_x_lo
+                              _P_y_hi
+                              _P_y_lo
+                              _P_y_square_hi
+                              _P_y_square_lo
+                              _P_x_cube_plus_three_hi
+                              _P_x_cube_plus_three_lo)
+  (begin (callToLT k _P_x_hi _P_x_lo P_BN_HI P_BN_LO)
+         (callToLT (+ k 1) _P_y_hi _P_y_lo P_BN_HI P_BN_LO)
+         (callToEQ (+ k 2) _P_y_square_hi _P_y_square_lo _P_x_cube_plus_three_hi _P_x_cube_plus_three_lo)))
 
 ;; Note: in the specs for simplicity we omit the last four arguments
 (defun (callToC1MembershipEXT k
-                              P_x_hi
-                              P_x_lo
-                              P_y_hi
-                              P_y_lo
-                              P_x_square_hi
-                              P_x_square_lo
-                              P_x_cube_hi
-                              P_x_cube_lo)
-  (begin (callToMULMOD k P_y_hi P_y_lo P_y_hi P_y_lo P_BN_HI P_BN_LO)
-         (callToMULMOD (+ k 1) P_x_hi P_x_lo P_x_hi P_x_lo P_BN_HI P_BN_LO)
-         (callToMULMOD (+ k 2) P_x_square_hi P_x_square_lo P_x_hi P_x_lo P_BN_HI P_BN_LO)
-         (callToADDMOD (+ k 3) P_x_cube_hi P_x_cube_lo 0 3 P_BN_HI P_BN_LO)))
+                              _P_x_hi
+                              _P_x_lo
+                              _P_y_hi
+                              _P_y_lo
+                              _P_x_square_hi
+                              _P_x_square_lo
+                              _P_x_cube_hi
+                              _P_x_cube_lo)
+  (begin (callToMULMOD k _P_y_hi _P_y_lo _P_y_hi _P_y_lo P_BN_HI P_BN_LO)
+         (callToMULMOD (+ k 1) _P_x_hi _P_x_lo _P_x_hi _P_x_lo P_BN_HI P_BN_LO)
+         (callToMULMOD (+ k 2) _P_x_square_hi _P_x_square_lo _P_x_hi _P_x_lo P_BN_HI P_BN_LO)
+         (callToADDMOD (+ k 3) _P_x_cube_hi _P_x_cube_lo 0 3 P_BN_HI P_BN_LO)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                     ;;