xx

.github/workflows/docker.yml

@@ -2,8 +2,6 @@ name: Docker
 
 on:
   push:
-    tags:
-      - v**
 
 env:
   AWS_REGION: us-west-2

README.md

@@ -1,6 +1,7 @@
 # Scroll Monorepo
 
 [![rollup](https://github.com/scroll-tech/scroll/actions/workflows/rollup.yml/badge.svg)](https://github.com/scroll-tech/scroll/actions/workflows/rollup.yml)
+[![contracts](https://github.com/scroll-tech/scroll/actions/workflows/contracts.yml/badge.svg)](https://github.com/scroll-tech/scroll/actions/workflows/contracts.yml)
 [![bridge-history](https://github.com/scroll-tech/scroll/actions/workflows/bridge_history_api.yml/badge.svg)](https://github.com/scroll-tech/scroll/actions/workflows/bridge_history_api.yml)
 [![coordinator](https://github.com/scroll-tech/scroll/actions/workflows/coordinator.yml/badge.svg)](https://github.com/scroll-tech/scroll/actions/workflows/coordinator.yml)
 [![prover](https://github.com/scroll-tech/scroll/actions/workflows/prover.yml/badge.svg)](https://github.com/scroll-tech/scroll/actions/workflows/prover.yml)

bridge-history-api/conf/config.json

@@ -19,7 +19,7 @@
 		"ScrollChainAddr": "0xa13BAF47339d63B743e7Da8741db5456DAc1E556",
 		"GatewayRouterAddr": "0xF8B1378579659D8F7EE5f3C929c2f3E332E41Fd6",
 		"MessageQueueAddr": "0x0d7E906BD9cAFa154b048cFa766Cc1E54E39AF9B",
-		"BatchBridgeGatewayAddr": "0x5Bcfd99c34cf7E06fc756f6f5aE7400504852bc4"
+		"BatchBridgeGatewayAddr": "0x0000000000000000000000000000000000000000"
 	},
 	"L2": {
 		"confirmation": 0,
@@ -39,7 +39,7 @@
 		"PufferGatewayAddr": "0x9eBf2f33526CD571f8b2ad312492cb650870CFd6",
 		"GatewayRouterAddr": "0x4C0926FF5252A435FD19e10ED15e5a249Ba19d79",
 		"MessageQueueAddr": "0x5300000000000000000000000000000000000000",
-		"BatchBridgeGatewayAddr": "0xa1a12158bE6269D7580C63eC5E609Cdc0ddD82bC"
+		"BatchBridgeGatewayAddr": "0x0000000000000000000000000000000000000000"
 	},
 	"db": {
 		"dsn": "postgres://postgres:123456@localhost:5444/test?sslmode=disable",

bridge-history-api/internal/controller/fetcher/l2_fetcher.go

@@ -141,7 +141,7 @@ func (c *L2MessageFetcher) fetchAndSaveEvents(confirmation uint64) {
 			return
 		}
 
-		if updateErr := c.eventUpdateLogic.UpdateL2WithdrawMessageProofs(c.ctx, c.l2SyncHeight); updateErr != nil {
+		if updateErr := c.eventUpdateLogic.UpdateL1BatchIndexAndStatus(c.ctx, c.l2SyncHeight); updateErr != nil {
 			log.Error("failed to update L1 batch index and status", "from", from, "to", to, "err", updateErr)
 			return
 		}

bridge-history-api/internal/logic/event_update.go

@@ -125,11 +125,6 @@ func (b *EventUpdateLogic) L1InsertOrUpdate(ctx context.Context, l1FetcherResult
 }
 
 func (b *EventUpdateLogic) updateL2WithdrawMessageInfos(ctx context.Context, batchIndex, startBlock, endBlock uint64) error {
-	if startBlock > endBlock {
-		log.Warn("start block is greater than end block", "start", startBlock, "end", endBlock)
-		return nil
-	}
-
 	l2WithdrawMessages, err := b.crossMessageOrm.GetL2WithdrawalsByBlockRange(ctx, startBlock, endBlock)
 	if err != nil {
 		log.Error("failed to get L2 withdrawals by batch index", "batch index", batchIndex, "err", err)
@@ -178,42 +173,24 @@ func (b *EventUpdateLogic) updateL2WithdrawMessageInfos(ctx context.Context, bat
 	return nil
 }
 
-// UpdateL2WithdrawMessageProofs updates L2 withdrawal message proofs.
-func (b *EventUpdateLogic) UpdateL2WithdrawMessageProofs(ctx context.Context, height uint64) error {
-	lastUpdatedFinalizedBlockHeight, err := b.batchEventOrm.GetLastUpdatedFinalizedBlockHeight(ctx)
+// UpdateL1BatchIndexAndStatus updates L1 finalized batch index and status
+func (b *EventUpdateLogic) UpdateL1BatchIndexAndStatus(ctx context.Context, height uint64) error {
+	finalizedBatches, err := b.batchEventOrm.GetFinalizedBatchesLEBlockHeight(ctx, height)
 	if err != nil {
-		log.Error("failed to get last updated finalized block height", "error", err)
-		return err
-	}
-
-	finalizedBatches, err := b.batchEventOrm.GetUnupdatedFinalizedBatchesLEBlockHeight(ctx, height)
-	if err != nil {
-		log.Error("failed to get unupdated finalized batches >= block height", "error", err)
+		log.Error("failed to get batches >= block height", "error", err)
 		return err
 	}
 
 	for _, finalizedBatch := range finalizedBatches {
-		log.Info("update finalized batch or bundle info of L2 withdrawals", "index", finalizedBatch.BatchIndex, "lastUpdatedFinalizedBlockHeight", lastUpdatedFinalizedBlockHeight, "start", finalizedBatch.StartBlockNumber, "end", finalizedBatch.EndBlockNumber)
-		// This method is compatible with both "finalize by batch" and "finalize by bundle" modes:
-		// - In "finalize by batch" mode, each batch emits a FinalizedBatch event.
-		// - In "finalize by bundle" mode, all batches in the bundle emit only one FinalizedBatch event, using the last batch's index and hash.
-		//
-		// The method updates two types of information in L2 withdrawal messages:
-		// 1. Withdraw proof generation:
-		//    - finalize by batch: Generates proofs for each batch.
-		//    - finalize by bundle: Generates proofs for the entire bundle at once.
-		// 2. Batch index updating:
-		//    - finalize by batch: Updates the batch index for withdrawal messages in each processed batch.
-		//    - finalize by bundle: Updates the batch index for all withdrawal messages in the bundle, using the index of the last batch in the bundle.
-		if updateErr := b.updateL2WithdrawMessageInfos(ctx, finalizedBatch.BatchIndex, lastUpdatedFinalizedBlockHeight+1, finalizedBatch.EndBlockNumber); updateErr != nil {
-			log.Error("failed to update L2 withdraw message infos", "index", finalizedBatch.BatchIndex, "lastUpdatedFinalizedBlockHeight", lastUpdatedFinalizedBlockHeight, "start", finalizedBatch.StartBlockNumber, "end", finalizedBatch.EndBlockNumber, "error", updateErr)
+		log.Info("update finalized batch info of L2 withdrawals", "index", finalizedBatch.BatchIndex, "start", finalizedBatch.StartBlockNumber, "end", finalizedBatch.EndBlockNumber)
+		if updateErr := b.updateL2WithdrawMessageInfos(ctx, finalizedBatch.BatchIndex, finalizedBatch.StartBlockNumber, finalizedBatch.EndBlockNumber); updateErr != nil {
+			log.Error("failed to update L2 withdraw message infos", "index", finalizedBatch.BatchIndex, "start", finalizedBatch.StartBlockNumber, "end", finalizedBatch.EndBlockNumber, "error", updateErr)
 			return updateErr
 		}
 		if dbErr := b.batchEventOrm.UpdateBatchEventStatus(ctx, finalizedBatch.BatchIndex); dbErr != nil {
-			log.Error("failed to update batch event status as updated", "index", finalizedBatch.BatchIndex, "lastUpdatedFinalizedBlockHeight", lastUpdatedFinalizedBlockHeight, "start", finalizedBatch.StartBlockNumber, "end", finalizedBatch.EndBlockNumber, "error", dbErr)
+			log.Error("failed to update batch event status as updated", "index", finalizedBatch.BatchIndex, "start", finalizedBatch.StartBlockNumber, "end", finalizedBatch.EndBlockNumber, "error", dbErr)
 			return dbErr
 		}
-		lastUpdatedFinalizedBlockHeight = finalizedBatch.EndBlockNumber
 		b.eventUpdateLogicL1FinalizeBatchEventL2BlockUpdateHeight.Set(float64(finalizedBatch.EndBlockNumber))
 	}
 	return nil

bridge-history-api/internal/logic/l1_event_parser.go

@@ -273,7 +273,6 @@ func (e *L1EventParser) ParseL1BatchEventLogs(ctx context.Context, logs []types.
 			l1BatchEvents = append(l1BatchEvents, &orm.BatchEvent{
 				BatchStatus:   int(btypes.BatchStatusTypeFinalized),
 				BatchIndex:    event.BatchIndex.Uint64(),
-				BatchHash:     event.BatchHash.String(),
 				L1BlockNumber: vlog.BlockNumber,
 			})
 		}

bridge-history-api/internal/orm/batch_event.go

@@ -53,26 +53,8 @@ func (c *BatchEvent) GetBatchEventSyncedHeightInDB(ctx context.Context) (uint64,
 	return batch.L1BlockNumber, nil
 }
 
-// GetLastUpdatedFinalizedBlockHeight returns the last updated finalized block height in db.
-func (c *BatchEvent) GetLastUpdatedFinalizedBlockHeight(ctx context.Context) (uint64, error) {
-	var batch BatchEvent
-	db := c.db.WithContext(ctx)
-	db = db.Model(&BatchEvent{})
-	db = db.Where("batch_status = ?", btypes.BatchStatusTypeFinalized)
-	db = db.Where("update_status = ?", btypes.UpdateStatusTypeUpdated)
-	db = db.Order("batch_index desc")
-	if err := db.First(&batch).Error; err != nil {
-		if err == gorm.ErrRecordNotFound {
-			// No finalized batch found, return genesis batch's end block number.
-			return 0, nil
-		}
-		return 0, fmt.Errorf("failed to get last updated finalized block height, error: %w", err)
-	}
-	return batch.EndBlockNumber, nil
-}
-
-// GetUnupdatedFinalizedBatchesLEBlockHeight returns the finalized batches with end block <= given block height in db.
-func (c *BatchEvent) GetUnupdatedFinalizedBatchesLEBlockHeight(ctx context.Context, blockHeight uint64) ([]*BatchEvent, error) {
+// GetFinalizedBatchesLEBlockHeight returns the finalized batches with end block <= given block height in db.
+func (c *BatchEvent) GetFinalizedBatchesLEBlockHeight(ctx context.Context, blockHeight uint64) ([]*BatchEvent, error) {
 	var batches []*BatchEvent
 	db := c.db.WithContext(ctx)
 	db = db.Model(&BatchEvent{})
@@ -84,13 +66,16 @@ func (c *BatchEvent) GetUnupdatedFinalizedBatchesLEBlockHeight(ctx context.Conte
 		if err == gorm.ErrRecordNotFound {
 			return nil, nil
 		}
-		return nil, fmt.Errorf("failed to get unupdated finalized batches >= block height, error: %w", err)
+		return nil, fmt.Errorf("failed to get batches >= block height, error: %w", err)
 	}
 	return batches, nil
 }
 
 // InsertOrUpdateBatchEvents inserts a new batch event or updates an existing one based on the BatchStatusType.
 func (c *BatchEvent) InsertOrUpdateBatchEvents(ctx context.Context, l1BatchEvents []*BatchEvent) error {
+	var maxFinalizedBatchIndex uint64
+	var containsFinalizedEvent bool
+	var maxL1BlockNumber uint64
 	for _, l1BatchEvent := range l1BatchEvents {
 		db := c.db
 		db = db.WithContext(ctx)
@@ -107,12 +92,13 @@ func (c *BatchEvent) InsertOrUpdateBatchEvents(ctx context.Context, l1BatchEvent
 				return fmt.Errorf("failed to insert or ignore batch event, error: %w", err)
 			}
 		case btypes.BatchStatusTypeFinalized:
-			db = db.Where("batch_index = ?", l1BatchEvent.BatchIndex)
-			db = db.Where("batch_hash = ?", l1BatchEvent.BatchHash)
-			updateFields["batch_status"] = btypes.BatchStatusTypeFinalized
-			updateFields["l1_block_number"] = l1BatchEvent.L1BlockNumber
-			if err := db.Updates(updateFields).Error; err != nil {
-				return fmt.Errorf("failed to update batch event, error: %w", err)
+			containsFinalizedEvent = true
+			// get the maxFinalizedBatchIndex, which signals all the batch before it are all finalized
+			if l1BatchEvent.BatchIndex > maxFinalizedBatchIndex {
+				maxFinalizedBatchIndex = l1BatchEvent.BatchIndex
+			}
+			if l1BatchEvent.L1BlockNumber > maxL1BlockNumber {
+				maxL1BlockNumber = l1BatchEvent.L1BlockNumber
 			}
 		case btypes.BatchStatusTypeReverted:
 			db = db.Where("batch_index = ?", l1BatchEvent.BatchIndex)
@@ -127,6 +113,21 @@ func (c *BatchEvent) InsertOrUpdateBatchEvents(ctx context.Context, l1BatchEvent
 			}
 		}
 	}
+	if containsFinalizedEvent {
+		db := c.db
+		db = db.WithContext(ctx)
+		db = db.Model(&BatchEvent{})
+		updateFields := make(map[string]interface{})
+		// After darwin, FinalizeBatch event signals a range of batches are finalized,
+		// thus losing the batch hash info. Meanwhile, only batch_index is enough to update finalized batches.
+		db = db.Where("batch_index <= ?", maxFinalizedBatchIndex)
+		db = db.Where("batch_status != ?", btypes.BatchStatusTypeFinalized)
+		updateFields["batch_status"] = btypes.BatchStatusTypeFinalized
+		updateFields["l1_block_number"] = maxL1BlockNumber
+		if err := db.Updates(updateFields).Error; err != nil {
+			return fmt.Errorf("failed to update batch event, error: %w", err)
+		}
+	}
 	return nil
 }
 

build/dockerfiles/bridgehistoryapi-api.Dockerfile

@@ -1,5 +1,5 @@
 # Download Go dependencies
-FROM scrolltech/go-rust-builder:go-1.21-rust-nightly-2023-12-03 as base
+FROM golang:1.21-alpine3.19 as base
 
 WORKDIR /src
 COPY go.mod* ./
@@ -11,13 +11,11 @@ FROM base as builder
 
 RUN --mount=target=. \
     --mount=type=cache,target=/root/.cache/go-build \
-    cd /src/bridge-history-api/cmd/api && CGO_LDFLAGS="-Wl,--no-as-needed -ldl" go build -v -p 4 -o /bin/bridgehistoryapi-api
+    cd /src/bridge-history-api/cmd/api && go build -v -p 4 -o /bin/bridgehistoryapi-api
 
-# Pull bridgehistoryapi-api into a second stage deploy ubuntu container
-FROM ubuntu:20.04
-
-ENV CGO_LDFLAGS="-Wl,--no-as-needed -ldl"
+# Pull bridgehistoryapi-api into a second stage deploy alpine container
+FROM alpine:latest
 
 COPY --from=builder /bin/bridgehistoryapi-api /bin/
 WORKDIR /app
-ENTRYPOINT ["bridgehistoryapi-api"]
+ENTRYPOINT ["bridgehistoryapi-api"]

build/dockerfiles/bridgehistoryapi-fetcher.Dockerfile

@@ -1,5 +1,5 @@
 # Download Go dependencies
-FROM scrolltech/go-rust-builder:go-1.21-rust-nightly-2023-12-03 as base
+FROM golang:1.21-alpine3.19 as base
 
 WORKDIR /src
 COPY go.mod* ./
@@ -11,13 +11,11 @@ FROM base as builder
 
 RUN --mount=target=. \
     --mount=type=cache,target=/root/.cache/go-build \
-    cd /src/bridge-history-api/cmd/fetcher && CGO_LDFLAGS="-Wl,--no-as-needed -ldl" go build -v -p 4 -o /bin/bridgehistoryapi-fetcher
+    cd /src/bridge-history-api/cmd/fetcher && go build -v -p 4 -o /bin/bridgehistoryapi-fetcher
 
-# Pull bridgehistoryapi-fetcher into a second stage deploy ubuntu container
-FROM ubuntu:20.04
-
-ENV CGO_LDFLAGS="-Wl,--no-as-needed -ldl"
+# Pull bridgehistoryapi-fetcher into a second stage deploy alpine container
+FROM alpine:latest
 
 COPY --from=builder /bin/bridgehistoryapi-fetcher /bin/
 WORKDIR /app
-ENTRYPOINT ["bridgehistoryapi-fetcher"]
+ENTRYPOINT ["bridgehistoryapi-fetcher"]

build/dockerfiles/coordinator-api.Dockerfile

@@ -23,6 +23,7 @@ COPY ./rollup/go.* ./rollup/
 COPY ./common/go.* ./common/
 COPY ./coordinator/go.* ./coordinator/
 COPY ./database/go.* ./database/
+COPY ./prover/go.* ./prover/
 COPY ./tests/integration-test/go.* ./tests/integration-test/
 COPY ./bridge-history-api/go.* ./bridge-history-api/
 RUN go mod download -x
@@ -35,10 +36,9 @@ RUN cp -r ./common/libzkp/interface ./coordinator/internal/logic/verifier/lib
 COPY --from=zkp-builder /app/target/release/libzkp.so ./coordinator/internal/logic/verifier/lib/
 RUN cd ./coordinator && CGO_LDFLAGS="-Wl,--no-as-needed -ldl" make coordinator_api_skip_libzkp && mv ./build/bin/coordinator_api /bin/coordinator_api && mv internal/logic/verifier/lib /bin/
 
-# Pull coordinator into a second stage deploy ubuntu container
+# Pull coordinator into a second stage deploy alpine container
 FROM ubuntu:20.04
 ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/src/coordinator/internal/logic/verifier/lib
-ENV CGO_LDFLAGS="-Wl,--no-as-needed -ldl"
 # ENV CHAIN_ID=534353
 RUN mkdir -p /src/coordinator/internal/logic/verifier/lib
 COPY --from=builder /bin/lib /src/coordinator/internal/logic/verifier/lib

build/dockerfiles/coordinator-cron.Dockerfile

@@ -1,5 +1,5 @@
 # Download Go dependencies
-FROM scrolltech/go-rust-builder:go-1.21-rust-nightly-2023-12-03 as base
+FROM scrolltech/go-alpine-builder:1.21 as base
 
 WORKDIR /src
 COPY go.work* ./
@@ -7,6 +7,7 @@ COPY ./rollup/go.* ./rollup/
 COPY ./common/go.* ./common/
 COPY ./coordinator/go.* ./coordinator/
 COPY ./database/go.* ./database/
+COPY ./prover/go.* ./prover/
 COPY ./tests/integration-test/go.* ./tests/integration-test/
 COPY ./bridge-history-api/go.* ./bridge-history-api/
 RUN go mod download -x
@@ -15,13 +16,10 @@ RUN go mod download -x
 FROM base as builder
 RUN --mount=target=. \
     --mount=type=cache,target=/root/.cache/go-build \
-    cd /src/coordinator/cmd/cron/ && CGO_LDFLAGS="-Wl,--no-as-needed -ldl" go build -v -p 4 -o /bin/coordinator_cron
-
-# Pull coordinator into a second stage deploy ubuntu container
-FROM ubuntu:20.04
-
-ENV CGO_LDFLAGS="-Wl,--no-as-needed -ldl"
+    cd /src/coordinator/cmd/cron/ && go build -v -p 4 -o /bin/coordinator_cron
 
+# Pull coordinator into a second stage deploy alpine container
+FROM alpine:latest
 COPY --from=builder /bin/coordinator_cron /bin/
 WORKDIR /app
-ENTRYPOINT ["coordinator_cron"]
+ENTRYPOINT ["coordinator_cron"]

build/dockerfiles/db_cli.Dockerfile

@@ -7,6 +7,7 @@ COPY ./rollup/go.* ./rollup/
 COPY ./common/go.* ./common/
 COPY ./coordinator/go.* ./coordinator/
 COPY ./database/go.* ./database/
+COPY ./prover/go.* ./prover/
 COPY ./tests/integration-test/go.* ./tests/integration-test/
 COPY ./bridge-history-api/go.* ./bridge-history-api/
 RUN go mod download -x

build/dockerfiles/gas_oracle.Dockerfile

@@ -7,6 +7,7 @@ COPY ./rollup/go.* ./rollup/
 COPY ./common/go.* ./common/
 COPY ./coordinator/go.* ./coordinator/
 COPY ./database/go.* ./database/
+COPY ./prover/go.* ./prover/
 COPY ./tests/integration-test/go.* ./tests/integration-test/
 COPY ./bridge-history-api/go.* ./bridge-history-api/
 RUN go mod download -x
@@ -14,17 +15,15 @@ RUN go mod download -x
 # Build gas_oracle
 FROM base as builder
 
-RUN apt update && apt install ca-certificates -y
-
 RUN --mount=target=. \
     --mount=type=cache,target=/root/.cache/go-build \
     cd /src/rollup/cmd/gas_oracle/ && CGO_LDFLAGS="-ldl" go build -v -p 4 -o /bin/gas_oracle
 
-# Pull gas_oracle into a second stage deploy ubuntu container
+# Pull gas_oracle into a second stage deploy alpine container
 FROM ubuntu:20.04
 
 ENV CGO_LDFLAGS="-ldl"
 
 COPY --from=builder /bin/gas_oracle /bin/
 WORKDIR /app
-ENTRYPOINT ["gas_oracle"]
+ENTRYPOINT ["gas_oracle"]

build/dockerfiles/rollup_relayer.Dockerfile

@@ -7,6 +7,7 @@ COPY ./rollup/go.* ./rollup/
 COPY ./common/go.* ./common/
 COPY ./coordinator/go.* ./coordinator/
 COPY ./database/go.* ./database/
+COPY ./prover/go.* ./prover/
 COPY ./tests/integration-test/go.* ./tests/integration-test/
 COPY ./bridge-history-api/go.* ./bridge-history-api/
 RUN go mod download -x
@@ -14,13 +15,11 @@ RUN go mod download -x
 # Build rollup_relayer
 FROM base as builder
 
-RUN apt update && apt install ca-certificates -y
-
 RUN --mount=target=. \
     --mount=type=cache,target=/root/.cache/go-build \
     cd /src/rollup/cmd/rollup_relayer/ && CGO_LDFLAGS="-ldl" go build -v -p 4 -o /bin/rollup_relayer
 
-# Pull rollup_relayer into a second stage deploy ubuntu container
+# Pull rollup_relayer into a second stage deploy alpine container
 FROM ubuntu:20.04
 
 ENV CGO_LDFLAGS="-ldl"

common/version/version.go

@@ -5,7 +5,7 @@ import (
 	"runtime/debug"
 )
 
-var tag = "v4.4.27"
+var tag = "v4.4.23"
 
 var commit = func() string {
 	if info, ok := debug.ReadBuildInfo(); ok {

coordinator/internal/controller/api/auth.go

@@ -43,6 +43,7 @@ func (a *AuthController) Login(c *gin.Context) (interface{}, error) {
 	if err := a.loginLogic.InsertChallengeString(c, login.Message.Challenge); err != nil {
 		return "", fmt.Errorf("login insert challenge string failure:%w", err)
 	}
+
 	return login, nil
 }
 

rollup/go.mod

@@ -10,8 +10,8 @@ require (
 	github.com/go-resty/resty/v2 v2.7.0
 	github.com/holiman/uint256 v1.2.4
 	github.com/prometheus/client_golang v1.16.0
-	github.com/scroll-tech/da-codec v0.0.0-20240710085339-459342e9a542
-	github.com/scroll-tech/go-ethereum v1.10.14-0.20240607130425-e2becce6a1a4
+	github.com/scroll-tech/da-codec v0.0.0-20240605080813-32bfc9fccde7
+	github.com/scroll-tech/go-ethereum v1.10.14-0.20240426041101-a860446ebaea
 	github.com/smartystreets/goconvey v1.8.0
 	github.com/stretchr/testify v1.9.0
 	github.com/urfave/cli/v2 v2.25.7
@@ -86,7 +86,7 @@ require (
 	github.com/rjeczalik/notify v0.9.1 // indirect
 	github.com/rs/cors v1.7.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/scroll-tech/zktrie v0.8.4 // indirect
+	github.com/scroll-tech/zktrie v0.8.2 // indirect
 	github.com/shirou/gopsutil v3.21.11+incompatible // indirect
 	github.com/smartystreets/assertions v1.13.1 // indirect
 	github.com/status-im/keycard-go v0.2.0 // indirect

rollup/go.sum

@@ -236,12 +236,12 @@ github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik=
 github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/scroll-tech/da-codec v0.0.0-20240710085339-459342e9a542 h1:if1EeBvoNf7eLzGJYpTt0aJ6Jvw5n274TUDD+9uj9sA=
-github.com/scroll-tech/da-codec v0.0.0-20240710085339-459342e9a542/go.mod h1:D6XEESeNVJkQJlv3eK+FyR+ufPkgVQbJzERylQi53Bs=
-github.com/scroll-tech/go-ethereum v1.10.14-0.20240607130425-e2becce6a1a4 h1:gheWXra3HdZsz6q+w4LrXy8ybHOO6/t6Kb/V64bR5wE=
-github.com/scroll-tech/go-ethereum v1.10.14-0.20240607130425-e2becce6a1a4/go.mod h1:byf/mZ8jLYUCnUePTicjJWn+RvKdxDn7buS6glTnMwQ=
-github.com/scroll-tech/zktrie v0.8.4 h1:UagmnZ4Z3ITCk+aUq9NQZJNAwnWl4gSxsLb2Nl7IgRE=
-github.com/scroll-tech/zktrie v0.8.4/go.mod h1:XvNo7vAk8yxNyTjBDj5WIiFzYW4bx/gJ78+NK6Zn6Uk=
+github.com/scroll-tech/da-codec v0.0.0-20240605080813-32bfc9fccde7 h1:CDrPMqifvAVyYqu0x1J5qickVV0b51tApPnOwDYLESI=
+github.com/scroll-tech/da-codec v0.0.0-20240605080813-32bfc9fccde7/go.mod h1:1wWYii0OPwd5kw+xrz0PFgS420xNadrNF1x/ELJT+TM=
+github.com/scroll-tech/go-ethereum v1.10.14-0.20240426041101-a860446ebaea h1:CH1WXWrpEpLaP3N+bFs2a1xdE0+lRm1AuJQb5YvE6Ls=
+github.com/scroll-tech/go-ethereum v1.10.14-0.20240426041101-a860446ebaea/go.mod h1:i4VBgWoaW/y0D8MmQb7hSOulyw1dKhuiSFAbznwivCA=
+github.com/scroll-tech/zktrie v0.8.2 h1:UMuIfA+jdgWMLmTgTL64Emo+zzMOdcnH0+eYdDcshxQ=
+github.com/scroll-tech/zktrie v0.8.2/go.mod h1:XvNo7vAk8yxNyTjBDj5WIiFzYW4bx/gJ78+NK6Zn6Uk=
 github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI=
 github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=

rollup/internal/controller/watcher/batch_proposer.go

@@ -2,7 +2,6 @@ package watcher
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"math/big"
 	"time"
@@ -53,9 +52,6 @@ type BatchProposer struct {
 	batchEstimateGasTime               prometheus.Gauge
 	batchEstimateCalldataSizeTime      prometheus.Gauge
 	batchEstimateBlobSizeTime          prometheus.Gauge
-
-	// total number of times that batch proposer stops early due to compressed data compatibility breach
-	compressedDataCompatibilityBreachTotal prometheus.Counter
 }
 
 // NewBatchProposer creates a new BatchProposer instance.
@@ -99,10 +95,6 @@ func NewBatchProposer(ctx context.Context, cfg *config.BatchProposerConfig, chai
 			Name: "rollup_propose_batch_update_info_failure_total",
 			Help: "Total number of propose batch update info failure total.",
 		}),
-		compressedDataCompatibilityBreachTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{
-			Name: "rollup_propose_batch_due_to_compressed_data_compatibility_breach_total",
-			Help: "Total number of propose batch due to compressed data compatibility breach.",
-		}),
 		totalL1CommitGas: promauto.With(reg).NewGauge(prometheus.GaugeOpts{
 			Name: "rollup_propose_batch_total_l1_commit_gas",
 			Help: "The total l1 commit gas",
@@ -239,19 +231,6 @@ func (p *BatchProposer) proposeBatch() error {
 	for i, chunk := range daChunks {
 		batch.Chunks = append(batch.Chunks, chunk)
 		metrics, calcErr := utils.CalculateBatchMetrics(&batch, codecVersion)
-
-		var compressErr *encoding.CompressedDataCompatibilityError
-		if errors.As(calcErr, &compressErr) {
-			if i == 0 {
-				// The first chunk fails compressed data compatibility check, manual fix is needed.
-				return fmt.Errorf("the first chunk fails compressed data compatibility check; start block number: %v, end block number: %v", dbChunks[0].StartBlockNumber, dbChunks[0].EndBlockNumber)
-			}
-			log.Warn("breaking limit condition in proposing a new batch due to a compressed data compatibility breach", "start chunk index", dbChunks[0].Index, "end chunk index", dbChunks[len(dbChunks)-1].Index)
-			batch.Chunks = batch.Chunks[:len(batch.Chunks)-1]
-			p.compressedDataCompatibilityBreachTotal.Inc()
-			return p.updateDBBatchInfo(&batch, codecVersion, *metrics)
-		}
-
 		if calcErr != nil {
 			return fmt.Errorf("failed to calculate batch metrics: %w", calcErr)
 		}

rollup/internal/controller/watcher/chunk_proposer.go

@@ -2,7 +2,6 @@ package watcher
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"time"
 
@@ -55,9 +54,6 @@ type ChunkProposer struct {
 	chunkEstimateGasTime               prometheus.Gauge
 	chunkEstimateCalldataSizeTime      prometheus.Gauge
 	chunkEstimateBlobSizeTime          prometheus.Gauge
-
-	// total number of times that chunk proposer stops early due to compressed data compatibility breach
-	compressedDataCompatibilityBreachTotal prometheus.Counter
 }
 
 // NewChunkProposer creates a new ChunkProposer instance.
@@ -105,10 +101,6 @@ func NewChunkProposer(ctx context.Context, cfg *config.ChunkProposerConfig, chai
 			Name: "rollup_propose_chunk_update_info_failure_total",
 			Help: "Total number of propose chunk update info failure total.",
 		}),
-		compressedDataCompatibilityBreachTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{
-			Name: "rollup_propose_chunk_due_to_compressed_data_compatibility_breach_total",
-			Help: "Total number of propose chunk due to compressed data compatibility breach.",
-		}),
 		chunkTxNum: promauto.With(reg).NewGauge(prometheus.GaugeOpts{
 			Name: "rollup_propose_chunk_tx_num",
 			Help: "The chunk tx num",
@@ -242,18 +234,6 @@ func (p *ChunkProposer) proposeChunk() error {
 		chunk.Blocks = append(chunk.Blocks, block)
 
 		metrics, calcErr := utils.CalculateChunkMetrics(&chunk, codecVersion)
-		var compressErr *encoding.CompressedDataCompatibilityError
-		if errors.As(calcErr, &compressErr) {
-			if i == 0 {
-				// The first block fails compressed data compatibility check, manual fix is needed.
-				return fmt.Errorf("the first block fails compressed data compatibility check; block number: %v", block.Header.Number)
-			}
-			log.Warn("breaking limit condition in proposing a new chunk due to a compressed data compatibility breach", "start block number", chunk.Blocks[0].Header.Number, "block count", len(chunk.Blocks))
-			chunk.Blocks = chunk.Blocks[:len(chunk.Blocks)-1]
-			p.compressedDataCompatibilityBreachTotal.Inc()
-			return p.updateDBChunkInfo(&chunk, codecVersion, *metrics)
-		}
-
 		if calcErr != nil {
 			return fmt.Errorf("failed to calculate chunk metrics: %w", calcErr)
 		}

rollup/internal/controller/watcher/chunk_proposer_test.go

@@ -568,11 +568,11 @@ func testChunkProposerCodecv2Limits(t *testing.T) {
 }
 
 func testChunkProposerBlobSizeLimit(t *testing.T) {
-	codecVersions := []encoding.CodecVersion{encoding.CodecV0, encoding.CodecV1, encoding.CodecV2}
-	for _, codecVersion := range codecVersions {
+	compressionTests := []bool{false, true} // false for uncompressed, true for compressed
+	for _, compressed := range compressionTests {
 		db := setupDB(t)
-		block := readBlockFromJSON(t, "../../../testdata/blockTrace_03.json")
-		for i := int64(0); i < 510; i++ {
+		block := readBlockFromJSON(t, "../../../testdata/blockTrace_02.json")
+		for i := int64(0); i < 2000; i++ {
 			l2BlockOrm := orm.NewL2Block(db)
 			block.Header.Number = big.NewInt(i + 1)
 			err := l2BlockOrm.InsertL2Blocks(context.Background(), []*encoding.Block{block})
@@ -580,26 +580,24 @@ func testChunkProposerBlobSizeLimit(t *testing.T) {
 		}
 
 		var chainConfig *params.ChainConfig
-		if codecVersion == encoding.CodecV0 { // will never hit blob size limit
-			chainConfig = &params.ChainConfig{}
-		} else if codecVersion == encoding.CodecV1 {
-			chainConfig = &params.ChainConfig{BernoulliBlock: big.NewInt(0)}
-		} else {
+		if compressed {
 			chainConfig = &params.ChainConfig{BernoulliBlock: big.NewInt(0), CurieBlock: big.NewInt(0)}
+		} else {
+			chainConfig = &params.ChainConfig{BernoulliBlock: big.NewInt(0)}
 		}
 
 		cp := NewChunkProposer(context.Background(), &config.ChunkProposerConfig{
-			MaxBlockNumPerChunk:             255,
+			MaxBlockNumPerChunk:             math.MaxUint64,
 			MaxTxNumPerChunk:                math.MaxUint64,
 			MaxL1CommitGasPerChunk:          math.MaxUint64,
 			MaxL1CommitCalldataSizePerChunk: math.MaxUint64,
 			MaxRowConsumptionPerChunk:       math.MaxUint64,
-			ChunkTimeoutSec:                 math.MaxUint32,
+			ChunkTimeoutSec:                 math.MaxUint64,
 			GasCostIncreaseMultiplier:       1,
 			MaxUncompressedBatchBytesSize:   math.MaxUint64,
 		}, chainConfig, db, nil)
 
-		for i := 0; i < 2; i++ {
+		for i := 0; i < 10; i++ {
 			cp.TryProposeChunk()
 		}
 
@@ -607,14 +605,14 @@ func testChunkProposerBlobSizeLimit(t *testing.T) {
 		chunks, err := chunkOrm.GetChunksGEIndex(context.Background(), 0, 0)
 		assert.NoError(t, err)
 
-		var expectedNumChunks int = 2
+		var expectedNumChunks int
 		var numBlocksMultiplier uint64
-		if codecVersion == encoding.CodecV0 {
-			numBlocksMultiplier = 255
-		} else if codecVersion == encoding.CodecV1 {
-			numBlocksMultiplier = 22
-		} else if codecVersion == encoding.CodecV2 {
-			numBlocksMultiplier = 255
+		if compressed {
+			expectedNumChunks = 1
+			numBlocksMultiplier = 2000
+		} else {
+			expectedNumChunks = 4
+			numBlocksMultiplier = 551
 		}
 		assert.Len(t, chunks, expectedNumChunks)
 

rollup/internal/utils/utils.go

@@ -1,7 +1,6 @@
 package utils
 
 import (
-	"errors"
 	"fmt"
 	"time"
 
@@ -92,12 +91,7 @@ func CalculateChunkMetrics(chunk *encoding.Chunk, codecVersion encoding.CodecVer
 		metrics.L1CommitUncompressedBatchBytesSize, metrics.L1CommitBlobSize, err = codecv2.EstimateChunkL1CommitBatchSizeAndBlobSize(chunk)
 		metrics.EstimateBlobSizeTime = time.Since(start)
 		if err != nil {
-			var compressErr *encoding.CompressedDataCompatibilityError
-			if errors.As(err, &compressErr) {
-				return nil, err
-			} else {
-				return nil, fmt.Errorf("failed to estimate codecv2 chunk L1 commit batch size and blob size: %w", err)
-			}
+			return nil, fmt.Errorf("failed to estimate codecv2 chunk L1 commit blob size: %w", err)
 		}
 		return metrics, nil
 	default:
@@ -177,12 +171,7 @@ func CalculateBatchMetrics(batch *encoding.Batch, codecVersion encoding.CodecVer
 		metrics.L1CommitUncompressedBatchBytesSize, metrics.L1CommitBlobSize, err = codecv2.EstimateBatchL1CommitBatchSizeAndBlobSize(batch)
 		metrics.EstimateBlobSizeTime = time.Since(start)
 		if err != nil {
-			var compressErr *encoding.CompressedDataCompatibilityError
-			if errors.As(err, &compressErr) {
-				return nil, err
-			} else {
-				return nil, fmt.Errorf("failed to estimate codecv2 batch L1 commit batch size and blob size: %w", err)
-			}
+			return nil, fmt.Errorf("failed to estimate codecv2 batch L1 commit blob size: %w", err)
 		}
 		return metrics, nil
 	default:

rollup/internal/utils/utils_test.go

@@ -1,53 +0,0 @@
-package utils
-
-import (
-	"errors"
-	"math/big"
-	"testing"
-
-	"github.com/agiledragon/gomonkey/v2"
-	"github.com/scroll-tech/da-codec/encoding"
-	"github.com/scroll-tech/da-codec/encoding/codecv2"
-	"github.com/scroll-tech/go-ethereum/common"
-	"github.com/scroll-tech/go-ethereum/core/types"
-	"github.com/stretchr/testify/assert"
-)
-
-// regression test
-func TestCompressedDataCompatibilityErrorCatching(t *testing.T) {
-	block := &encoding.Block{
-		Header: &types.Header{
-			Number: big.NewInt(0),
-		},
-		RowConsumption: &types.RowConsumption{},
-	}
-	chunk := &encoding.Chunk{
-		Blocks: []*encoding.Block{block},
-	}
-	batch := &encoding.Batch{
-		Index:                      0,
-		TotalL1MessagePoppedBefore: 0,
-		ParentBatchHash:            common.Hash{},
-		Chunks:                     []*encoding.Chunk{chunk},
-	}
-
-	patchGuard1 := gomonkey.ApplyFunc(codecv2.EstimateChunkL1CommitBatchSizeAndBlobSize, func(b *encoding.Chunk) (uint64, uint64, error) {
-		return 0, 0, &encoding.CompressedDataCompatibilityError{Err: errors.New("test-error-1")}
-	})
-	defer patchGuard1.Reset()
-
-	var compressErr *encoding.CompressedDataCompatibilityError
-
-	_, err := CalculateChunkMetrics(chunk, encoding.CodecV2)
-	assert.Error(t, err)
-	assert.ErrorAs(t, err, &compressErr)
-
-	patchGuard2 := gomonkey.ApplyFunc(codecv2.EstimateBatchL1CommitBatchSizeAndBlobSize, func(b *encoding.Batch) (uint64, uint64, error) {
-		return 0, 0, &encoding.CompressedDataCompatibilityError{Err: errors.New("test-error-2")}
-	})
-	defer patchGuard2.Reset()
-
-	_, err = CalculateBatchMetrics(batch, encoding.CodecV2)
-	assert.Error(t, err)
-	assert.ErrorAs(t, err, &compressErr)
-}