Merge branch 'develop' into fix-requests-hash-in-sdk

Author: Thegaram

.github/workflows/cloak.yml

@@ -0,0 +1,33 @@
+name: Cloak Docker
+
+on:
+  workflow_dispatch:
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    permissions: {}
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Extract commit digest
+        id: vars
+        run: echo "sha8=${GITHUB_SHA::8}" >> $GITHUB_OUTPUT
+
+      - name: Build and Push Docker image
+        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
+        with:
+          context: .
+          platforms: linux/amd64
+          push: true
+          tags: scrolltech/cloak-l2geth:${{ steps.vars.outputs.sha8 }}

.github/workflows/l2geth_ci.yml

@@ -23,7 +23,7 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v5
       with:
-        go-version: 1.21.x
+        go-version: 1.22.x
 
     - name: Checkout code
       uses: actions/checkout@v4
@@ -42,7 +42,7 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v5
       with:
-        go-version: 1.21.x
+        go-version: 1.22.x
 
     - name: Install rust
       uses: actions-rust-lang/setup-rust-toolchain@9399c7bb15d4c7d47b27263d024f0a4978346ba4 # v1.11.0
@@ -63,14 +63,15 @@ jobs:
         make geth
 
   check:
-    if: github.event.pull_request.draft == false
+    # if: github.event.pull_request.draft == false
+    if: false
     runs-on: ubuntu-latest
     permissions: {}
     steps:
     - name: Install Go
       uses: actions/setup-go@v5
       with:
-        go-version: 1.21.x
+        go-version: 1.22.x
 
     - name: Checkout code
       uses: actions/checkout@v4
@@ -117,7 +118,7 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v5
       with:
-        go-version: 1.21.x
+        go-version: 1.22.x
 
     - name: Checkout code
       uses: actions/checkout@v4
@@ -141,7 +142,7 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v5
       with:
-        go-version: 1.21.x
+        go-version: 1.22.x
 
     - name: Checkout code
       uses: actions/checkout@v4

Dockerfile

@@ -5,7 +5,7 @@ ARG BUILDNUM=""
 ARG SCROLL_LIB_PATH=/scroll/lib
 
 # Build libzkp dependency
-FROM scrolltech/go-rust-builder:go-1.21-rust-nightly-2023-12-03 as chef
+FROM scrolltech/go-rust-builder:go-1.22.12-rust-nightly-2025-02-14 as chef
 WORKDIR app
 
 FROM chef as planner
@@ -22,7 +22,7 @@ RUN cargo clean
 RUN cargo build --release
 
 # Build Geth in a stock Go builder container
-FROM scrolltech/go-rust-builder:go-1.21-rust-nightly-2023-12-03 as builder
+FROM scrolltech/go-rust-builder:go-1.22.12-rust-nightly-2025-02-14 as builder
 
 ADD . /go-ethereum
 

Dockerfile.alltools

@@ -4,7 +4,7 @@ ARG VERSION=""
 ARG BUILDNUM=""
 
 # Build Geth in a stock Go builder container
-FROM golang:1.21-alpine as builder
+FROM golang:1.22-alpine as builder
 
 RUN apk add --no-cache gcc musl-dev linux-headers git
 

Dockerfile.mockccc

@@ -5,7 +5,7 @@ ARG BUILDNUM=""
 ARG SCROLL_LIB_PATH=/scroll/lib
 
 # Build Geth in a stock Go builder container
-FROM scrolltech/go-rust-builder:go-1.21-rust-nightly-2023-12-03 as builder
+FROM scrolltech/go-rust-builder:go-1.22.12-rust-nightly-2025-02-14 as builder
 
 WORKDIR /go-ethereum
 COPY go.mod go.sum ./

Dockerfile.mockccc.alpine

@@ -4,7 +4,7 @@ ARG VERSION=""
 ARG BUILDNUM=""
 
 # Build Geth in a stock Go builder container
-FROM golang:1.21-alpine as builder
+FROM golang:1.22-alpine as builder
 
 RUN apk add --no-cache gcc musl-dev linux-headers git
 

cmd/geth/main.go

@@ -170,6 +170,8 @@ var (
 		utils.L1EndpointFlag,
 		utils.L1ConfirmationsFlag,
 		utils.L1DeploymentBlockFlag,
+		utils.L1SyncIntervalFlag,
+		utils.L1FetchBlockRangeFlag,
 		utils.L1DisableMessageQueueV2Flag,
 		utils.CircuitCapacityCheckEnabledFlag,
 		utils.CircuitCapacityCheckWorkersFlag,

cmd/geth/usage.go

@@ -233,6 +233,7 @@ var AppHelpFlagGroups = []flags.FlagGroup{
 			utils.L1EndpointFlag,
 			utils.L1ConfirmationsFlag,
 			utils.L1DeploymentBlockFlag,
+			utils.L1SyncIntervalFlag,
 			utils.L1DisableMessageQueueV2Flag,
 			utils.RollupVerifyEnabledFlag,
 			utils.DASyncEnabledFlag,

cmd/utils/flags.go

@@ -853,6 +853,14 @@ var (
 		Name:  "l1.sync.startblock",
 		Usage: "L1 block height to start syncing from. Should be set to the L1 message queue deployment block number.",
 	}
+	L1SyncIntervalFlag = cli.DurationFlag{
+		Name:  "l1.sync.interval",
+		Usage: "Poll interval for L1 message syncing (e.g., 2s, 10s, 1m)",
+	}
+	L1FetchBlockRangeFlag = cli.Int64Flag{
+		Name:  "l1.sync.fetchblockrange",
+		Usage: "Block range for L1 message fetching in a single eth_getLogs query",
+	}
 	L1DisableMessageQueueV2Flag = &cli.BoolFlag{
 		Name:  "l1.disablemqv2",
 		Usage: "Disable L1 message queue v2",
@@ -1470,6 +1478,12 @@ func setL1(ctx *cli.Context, cfg *node.Config) {
 	if ctx.GlobalIsSet(L1DeploymentBlockFlag.Name) {
 		cfg.L1DeploymentBlock = ctx.GlobalUint64(L1DeploymentBlockFlag.Name)
 	}
+	if ctx.GlobalIsSet(L1SyncIntervalFlag.Name) {
+		cfg.L1SyncInterval = ctx.GlobalDuration(L1SyncIntervalFlag.Name)
+	}
+	if ctx.GlobalIsSet(L1FetchBlockRangeFlag.Name) {
+		cfg.L1FetchBlockRange = ctx.GlobalUint64(L1FetchBlockRangeFlag.Name)
+	}
 	if ctx.GlobalIsSet(L1DisableMessageQueueV2Flag.Name) {
 		cfg.L1DisableMessageQueueV2 = ctx.GlobalBool(L1DisableMessageQueueV2Flag.Name)
 	}

consensus/system_contract/consensus.go

@@ -227,8 +227,42 @@ func (s *SystemContract) VerifyUncles(chain consensus.ChainReader, block *types.
 	return nil
 }
 
+// CalcBlocksPerSecond returns the number of blocks per second
+// Uses the BlocksPerSecond configuration parameter directly
+// Default is 1 block per second if not specified
+func CalcBlocksPerSecond(blocksPerSecond uint64) uint64 {
+	if blocksPerSecond == 0 {
+		return 1 // Default to 1 block per second
+	}
+	return blocksPerSecond
+}
+
+// CalcPeriodMs calculates the period in milliseconds between blocks
+// based on the blocks per second configuration
+func CalcPeriodMs(blocksPerSecond uint64) uint64 {
+	bps := CalcBlocksPerSecond(blocksPerSecond)
+	return 1000 / bps
+}
+
 func (s *SystemContract) CalcTimestamp(parent *types.Header) uint64 {
-	timestamp := parent.Time + s.config.Period
+	var timestamp uint64
+	if s.config.Period == 1 {
+		// Get the base timestamp (in seconds)
+		timestamp = parent.Time
+
+		blocksPerSecond := CalcBlocksPerSecond(s.config.BlocksPerSecond)
+
+		// Calculate the block index within the current period for the next block
+		blockIndex := parent.Number.Uint64() % blocksPerSecond
+
+		// If this block is the last one in the current second, increment the timestamp
+		// We compare with blocksPerSecond-1 because blockIndex is 0-based
+		if blockIndex == blocksPerSecond-1 {
+			timestamp++
+		}
+	} else {
+		timestamp = parent.Time + s.config.Period
+	}
 
 	// If RelaxedPeriod is enabled, always set the header timestamp to now (ie the time we start building it) as
 	// we don't know when it will be sealed