Merge branch 'CLZ' into fusaka-devnet-2

Author: advaita-saha

Dockerfile.debug

@@ -18,13 +18,10 @@ COPY ./ /nimbus-eth1
 
 WORKDIR /nimbus-eth1
 
-RUN mv vendor vendor.orig
-
-RUN  --mount=type=cache,target=/nimbus-eth1/build --mount=type=cache,target=/nimbus-eth1/vendor \
-  mv vendor.orig vendor && \
+RUN  --mount=type=cache,target=/nimbus-eth1/build \
   make -j${NPROC} NIMFLAGS="${NIMFLAGS_COMMON} --parallelBuild:${NPROC}" V=1 update
 
-RUN  --mount=type=cache,target=/nimbus-eth1/build --mount=type=cache,target=/nimbus-eth1/vendor \
+RUN  --mount=type=cache,target=/nimbus-eth1/build \
   make -j${NPROC} NIMFLAGS="${NIMFLAGS_COMMON} --parallelBuild:${NPROC}" nimbus_execution_client && \
   mv build/nimbus_execution_client /usr/local/bin/nimbus_execution_client
 

execution_chain/constants.nim

@@ -112,8 +112,4 @@ const
   HISTORY_STORAGE_ADDRESS* = address"0x0000F90827F1C53a10cb7A02335B175320002935"
   WITHDRAWAL_REQUEST_PREDEPLOY_ADDRESS* = address"0x00000961Ef480Eb55e80D19ad83579A64c007002"
   CONSOLIDATION_REQUEST_PREDEPLOY_ADDRESS* = address"0x0000BBdDc7CE488642fb579F8B00f3a590007251"
-
-  MAX_BLOCK_SIZE* = 10_485_760  # 10 MiB
-  SAFETY_MARGIN* = 2_097_152  # 2 MiB
-  MAX_RLP_BLOCK_SIZE* = MAX_BLOCK_SIZE - SAFETY_MARGIN
 # End

execution_chain/core/executor/process_block.nim

@@ -12,7 +12,6 @@
 
 import
   ../../common/common,
-  ../../constants,
   ../../utils/utils,
   ../../constants,
   ../../db/ledger,
@@ -119,10 +118,6 @@ proc procBlkPreamble(
     if blk.transactions.calcTxRoot != header.txRoot:
       return err("Mismatched txRoot")
 
-  if com.isOsakaOrLater(header.timestamp):
-    if rlp.getEncodedLength(blk) > MAX_RLP_BLOCK_SIZE:
-      return err("Post-Osaka block exceeded MAX_RLP_BLOCK_SIZE")
-
   if com.isPragueOrLater(header.timestamp):
     if header.requestsHash.isNone:
       return err("Post-Prague block header must have requestsHash")

execution_chain/core/tx_pool.nim

@@ -160,7 +160,6 @@ proc assembleBlock*(
     blobsBundle = BlobsBundle(
       wrapperVersion: getWrapperVersion(com, blk.header.timestamp)
     )
-    currentRlpSize = rlp.getEncodedLength(blk.header) + rlp.getEncodedLength(blk.withdrawals)
 
   for item in pst.packedTxs:
     let tx = item.pooledTx

execution_chain/evm/interpreter/gas_costs.nim

@@ -520,6 +520,7 @@ template gasCosts(fork: EVMFork, prefix, ResultGasCostsName: untyped) =
           Shl:             fixed GasVeryLow,
           Shr:             fixed GasVeryLow,
           Sar:             fixed GasVeryLow,
+          Clz:             fixed GasVeryLow,
 
           # 20s: SHA3
           Sha3:            memExpansion `prefix gasSha3`,

execution_chain/evm/interpreter/op_codes.nim

@@ -1,5 +1,5 @@
 # Nimbus
-# Copyright (c) 2018-2024 Status Research & Development GmbH
+# Copyright (c) 2018-2025 Status Research & Development GmbH
 # Licensed under either of
 #  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
 #    http://www.apache.org/licenses/LICENSE-2.0)
@@ -58,8 +58,9 @@ type
     Shl =            0x1B, ## Shift left
     Shr =            0x1C, ## Logical shift right
     Sar =            0x1D, ## Arithmetic shift right
+    Clz =            0x1E, ## Count leading zeros
 
-    Nop0x1E, Nop0x1F, ## ..
+    Nop0x1F, ## ..
 
     # 20s: SHA3
     Sha3 =           0x20, ## Compute Keccak-256 hash.

execution_chain/evm/interpreter/op_handlers/oph_arithmetic.nim

@@ -1,5 +1,5 @@
 # Nimbus
-# Copyright (c) 2018-2024 Status Research & Development GmbH
+# Copyright (c) 2018-2025 Status Research & Development GmbH
 # Licensed under either of
 #  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
 #    http://www.apache.org/licenses/LICENSE-2.0)
@@ -277,6 +277,26 @@ proc sarOp(cpt: VmCpt): EvmResultVoid =
 
   cpt.stack.binaryWithTop(sar256)
 
+proc clzOp(cpt: VmCpt): EvmResultVoid =
+  ## 0x1e, Count Leading Zeros
+  template clz256(top, value, toStackElem) =
+    if value.isZero:
+      toStackElem(256.u256, top)
+    else:
+      var count = 0
+      for i in 0 ..< 32:
+        let b = (value shr ((31 - i) * 8)).truncate(byte)
+        if b != 0:
+          var mask = 0x80'u8
+          while (b and mask) == 0:
+            inc count
+            mask = mask shr 1
+          break
+        inc count, 8
+      toStackElem(count.u256, top)
+
+  cpt.stack.unaryWithTop(clz256)
+
 # ------------------------------------------------------------------------------
 # Public, op exec table entries
 # ------------------------------------------------------------------------------
@@ -460,7 +480,13 @@ const
      forks: VmOpConstantinopleAndLater,
      name: "sarOp",
      info: "Arithmetic shift right",
-     exec: sarOp)]
+     exec: sarOp),
+
+    (opCode: Clz,     ## CLZ (Count Leading Zeros)
+     forks: VmOpOsakaAndLater, ## Or a newer fork gate, if appropriate
+     name: "clzOp",
+     info: "Count leading zero bits in a 256-bit word",
+     exec: clzOp)]
 
 # ------------------------------------------------------------------------------
 # End

execution_chain/evm/interpreter/op_handlers/oph_defs.nim

@@ -88,7 +88,6 @@ const
   VmOpOsakaAndLater* =
     VmOpPragueAndLater - {FkPrague}
 
-
 # ------------------------------------------------------------------------------
 # End
 # ------------------------------------------------------------------------------