Merge branch 'feat/cherry_pick_eip7823' of github.com:scroll-tech/go-ethereum into feat/cherry_pick_eip7823

Author: georgehao

.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

@@ -171,6 +171,7 @@ var (
 		utils.L1ConfirmationsFlag,
 		utils.L1DeploymentBlockFlag,
 		utils.L1SyncIntervalFlag,
+		utils.L1FetchBlockRangeFlag,
 		utils.L1DisableMessageQueueV2Flag,
 		utils.CircuitCapacityCheckEnabledFlag,
 		utils.CircuitCapacityCheckWorkersFlag,

cmd/utils/flags.go

@@ -857,6 +857,10 @@ var (
 		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",
@@ -1477,6 +1481,9 @@ func setL1(ctx *cli.Context, cfg *node.Config) {
 	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)
 	}