Merge branch 'master' into EIP-7823-set-upper-bounds-for-MODEXP---OOB-side

Author: OlivierBBB

Makefile

@@ -28,8 +28,11 @@ CONSTANTS := constants/constants.lisp
 CONSTANTS_LONDON := constants/london/constants.zkasm
 CONSTANTS_CANCUN := constants/cancun/constants.zkasm
 CONSTANTS_PRAGUE := constants/prague/constants.zkasm
+CONSTANTS_OSAKA := constants/osaka/constants.zkasm
 
-EC_DATA := ecdata
+EC_DATA_LONDON := ecdata/london
+
+EC_DATA_OSAKA := ecdata/osaka
 
 EUC := euc
 
@@ -95,7 +98,8 @@ TABLES_LONDON := reftables/london/*.lisp
 TABLES_CANCUN := reftables/cancun/*.lisp
 TABLES_PRAGUE := reftables/prague/*.lisp
 
-TRM := trm/trm.zkasm
+TRM_LONDON := trm/trm_london.zkasm
+TRM_OSAKA := trm/trm_osaka.zkasm
 
 TXN_DATA_LONDON := txndata/london
 TXN_DATA_SHANGHAI := txndata/shanghai
@@ -116,7 +120,6 @@ ZKEVM_MODULES_COMMON := ${CONSTANTS} \
 		 ${BIN} \
 		 ${BLAKE2f_MODEXP_DATA} \
 		 ${BLOCKHASH} \
-		 ${EC_DATA} \
 		 ${EUC} \
 		 ${EXP} \
 		 ${GAS} \
@@ -128,13 +131,13 @@ ZKEVM_MODULES_COMMON := ${CONSTANTS} \
 		 ${SHAKIRA_DATA} \
 		 ${SHIFT} \
 		 ${STP} \
-		 ${TRM} \
 		 ${WCP}
 
 ZKEVM_MODULES_LONDON := ${ZKEVM_MODULES_COMMON} \
 		 ${CONSTANTS_LONDON} \
 		 ${TABLES_LONDON} \
 		 ${BLOCKDATA_LONDON} \
+		 ${EC_DATA_LONDON} \
 		 ${HUB_LONDON} \
 		 ${LOG_INFO_LONDON} \
 		 ${MMIO_LONDON} \
@@ -143,6 +146,7 @@ ZKEVM_MODULES_LONDON := ${ZKEVM_MODULES_COMMON} \
 		 ${OOB_LONDON} \
 		 ${RLP_TXN_LONDON} \
 		 ${RLP_TXN_RCPT_LONDON} \
+		 ${TRM_LONDON} \
 		 ${TXN_DATA_LONDON}
 
 
@@ -152,6 +156,7 @@ ZKEVM_MODULES_SHANGHAI := ${ZKEVM_MODULES_COMMON} \
 		 ${CONSTANTS_LONDON} \
 		 ${TABLES_LONDON} \
 		 ${BLOCKDATA_PARIS} \
+		 ${EC_DATA_LONDON} \
 		 ${HUB_SHANGHAI} \
 		 ${LOG_INFO_LONDON} \
 		 ${MMIO_LONDON} \
@@ -160,13 +165,15 @@ ZKEVM_MODULES_SHANGHAI := ${ZKEVM_MODULES_COMMON} \
 		 ${OOB_SHANGHAI} \
 		 ${RLP_TXN_LONDON} \
 		 ${RLP_TXN_RCPT_LONDON} \
+		 ${TRM_LONDON} \
 		 ${TXN_DATA_SHANGHAI}
 
 ZKEVM_MODULES_CANCUN := ${ZKEVM_MODULES_COMMON} \
          ${CONSTANTS_CANCUN} \
 		 ${TABLES_CANCUN} \
 		 ${BLOCKDATA_CANCUN} \
 		 ${BLS_CANCUN} \
+		 ${EC_DATA_LONDON} \
 		 ${HUB_CANCUN} \
 		 ${LOG_INFO_CANCUN} \
 		 ${MMIO_CANCUN} \
@@ -176,13 +183,15 @@ ZKEVM_MODULES_CANCUN := ${ZKEVM_MODULES_COMMON} \
 		 ${RLP_TXN_CANCUN} \
 		 ${RLP_TXN_RCPT_LONDON} \
 		 ${RLP_UTILS_CANCUN} \
+		 ${TRM_LONDON} \
 		 ${TXN_DATA_CANCUN}
 
 ZKEVM_MODULES_PRAGUE := ${ZKEVM_MODULES_COMMON} \
 		 ${CONSTANTS_PRAGUE} \
 		 ${TABLES_PRAGUE} \
 		 ${BLOCKDATA_CANCUN} \
 		 ${BLS_PRAGUE} \
+		 ${EC_DATA_LONDON} \
 		 ${HUB_PRAGUE} \
 		 ${LOG_INFO_CANCUN} \
 		 ${MMIO_CANCUN} \
@@ -192,13 +201,15 @@ ZKEVM_MODULES_PRAGUE := ${ZKEVM_MODULES_COMMON} \
 		 ${RLP_TXN_PRAGUE} \
 		 ${RLP_TXN_RCPT_LONDON} \
 		 ${RLP_UTILS_CANCUN} \
+		 ${TRM_LONDON} \
 		 ${TXN_DATA_PRAGUE}
 
 ZKEVM_MODULES_OSAKA := ${ZKEVM_MODULES_COMMON} \
-		 ${CONSTANTS_PRAGUE} \
+		 ${CONSTANTS_OSAKA} \
 		 ${TABLES_PRAGUE} \
 		 ${BLOCKDATA_CANCUN} \
 		 ${BLS_PRAGUE} \
+		 ${EC_DATA_OSAKA} \
 		 ${HUB_OSAKA} \
 		 ${LOG_INFO_CANCUN} \
 		 ${MMIO_CANCUN} \
@@ -208,6 +219,7 @@ ZKEVM_MODULES_OSAKA := ${ZKEVM_MODULES_COMMON} \
 		 ${RLP_TXN_PRAGUE} \
 		 ${RLP_TXN_RCPT_OSAKA} \
 		 ${RLP_UTILS_CANCUN} \
+		 ${TRM_OSAKA} \
 		 ${TXN_DATA_OSAKA}
 
 all: zkevm_london.bin zkevm_paris.bin zkevm_shanghai.bin zkevm_cancun.bin zkevm_prague.bin zkevm_osaka.bin

bin/bin.zkasm

@@ -3,12 +3,15 @@ include "../constants/evm.zkasm"
 include "../util/bit_xoan.zkasm"
 include "../util/byte.zkasm"
 include "../util/signextend.zkasm"
+include "../util/log2.zkasm"
 
-;; The bin module (BIN) handles the following 6 EVM instructions :
+;; The bin module (BIN) handles the following EVM instructions :
 ;; 1. AND       2. OR        3. XOR
 ;; 4. NOT       5. BYTE      6. SIGNEXTEND
+;; 7. CLZ
 ;; The first four correspond to the bitwise operations.
 ;; BYTE and SIGNEXTEND need to extract a byte from ARGUMENT_2.
+
 pub fn bin(INST=0x16 u8, ARGUMENT_1 u256, ARGUMENT_2 u256) -> (RES u256) {
 
    if INST==EVM_INST_XOR        goto xor_call
@@ -17,6 +20,7 @@ pub fn bin(INST=0x16 u8, ARGUMENT_1 u256, ARGUMENT_2 u256) -> (RES u256) {
    if INST==EVM_INST_NOT        goto not_call
    if INST==EVM_INST_BYTE       goto byte_call
    if INST==EVM_INST_SIGNEXTEND goto signextend_call
+   if INST==EVM_INST_CLZ        goto clz_call
    fail
    var inst u2
 
@@ -50,9 +54,22 @@ signextend_call:
    if c1 != 0 goto exit_unchanged
    RES = signextend(size, ARGUMENT_2)
    return
+clz_call:
+  ;; special case for 0
+  if ARGUMENT_1 == 0 goto exit_256
+  var lg2 u8
+  var tmp u8
+  ;; TODO: we shouldn't those intermediate result ...
+  lg2 = log2(ARGUMENT_1)
+  tmp = 255 - lg2
+  RES = tmp
+  return
 exit_0:
    RES = 0
    return
+exit_256:
+   RES = 256
+   return
 exit_unchanged:
    RES = ARGUMENT_2
    return

constants/cancun/constants.zkasm

@@ -1 +1 @@
-const MAX_PRC_ADDRESS = 0x0a
+const MAX_PRC_CONTIGUOUS_ADDRESS = 0x0a

constants/constants.lisp

@@ -45,6 +45,7 @@
   EVM_INST_SHL                              0x1b
   EVM_INST_SHR                              0x1c
   EVM_INST_SAR                              0x1d
+  EVM_INST_CLZ                              0x1e ;; Osaka, EIP-7939
   ;; KECCAK256
   EVM_INST_SHA3                             0x20
   ;; Environmental Information

constants/evm.zkasm

@@ -13,6 +13,7 @@ const EVM_INST_BYTE                             = 0x1a
 const EVM_INST_SHL                              = 0x1b
 const EVM_INST_SHR                              = 0x1c
 const EVM_INST_SAR                              = 0x1d
+const EVM_INST_CLZ                              = 0x1e
 const EVM_INST_CREATE                           = 0xF0
 const EVM_INST_CALL                             = 0xF1
 const EVM_INST_CALLCODE                         = 0xF2

constants/london/constants.zkasm

@@ -1 +1 @@
-const MAX_PRC_ADDRESS = 0x09
+const MAX_PRC_CONTIGUOUS_ADDRESS = 0x09

constants/osaka/constants.zkasm

@@ -0,0 +1,3 @@
+const MAX_PRC_CONTIGUOUS_ADDRESS = 0x11
+;; this constant will be used once issue in go-corset is fixed https://github.com/Consensys/go-corset/issues/1284
+const P256_VERIFY_ADDRESS = 0x100

constants/prague/constants.zkasm

@@ -1 +1 @@
-const MAX_PRC_ADDRESS = 0x11
+const MAX_PRC_CONTIGUOUS_ADDRESS = 0x11