Skip to content

Commit 5c5ab15

Browse files
author
colinlyguo
committed
update limits
1 parent a140d2e commit 5c5ab15

File tree

10 files changed

+33
-33
lines changed

10 files changed

+33
-33
lines changed

‎bridge-history-api/go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ require (
1010
github.com/go-redis/redis/v8 v8.11.5
1111
github.com/pressly/goose/v3 v3.16.0
1212
github.com/prometheus/client_golang v1.19.0
13-
github.com/scroll-tech/da-codec v0.1.3-0.20250616065246-17bf3e4990cd
14-
github.com/scroll-tech/go-ethereum v1.10.14-0.20250616074821-cba908db071d
13+
github.com/scroll-tech/da-codec v0.1.3-0.20250626091118-58b899494da6
14+
github.com/scroll-tech/go-ethereum v1.10.14-0.20250626101020-47bc86cd961c
1515
github.com/stretchr/testify v1.9.0
1616
github.com/urfave/cli/v2 v2.25.7
1717
golang.org/x/sync v0.11.0
1818
gorm.io/gorm v1.25.7-0.20240204074919-46816ad31dde
1919
)
2020

21-
replace github.com/scroll-tech/go-ethereum => github.com/scroll-tech/go-ethereum v1.10.14-0.20250616074821-cba908db071d // It's a hotfix for the header hash incompatibility issue, pls change this with caution
21+
replace github.com/scroll-tech/go-ethereum => github.com/scroll-tech/go-ethereum v1.10.14-0.20250626101020-47bc86cd961c // It's a hotfix for the header hash incompatibility issue, pls change this with caution
2222

2323
require (
2424
dario.cat/mergo v1.0.0 // indirect

‎bridge-history-api/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -309,10 +309,10 @@ github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik=
309309
github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
310310
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
311311
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
312-
github.com/scroll-tech/da-codec v0.1.3-0.20250616065246-17bf3e4990cd h1:VKVDPtKJZIaQNQvhXptVhS7O9GLKl1314egD1fln8SA=
313-
github.com/scroll-tech/da-codec v0.1.3-0.20250616065246-17bf3e4990cd/go.mod h1:T+370kLxwACnmWaq4rgtKGyLCd7QSE6iy0JLfCp1qj4=
314-
github.com/scroll-tech/go-ethereum v1.10.14-0.20250616074821-cba908db071d h1:JoEtZN6aCV5MUBjacsrPd2S6fl8sDGZE9Xd4UUhg5Oo=
315-
github.com/scroll-tech/go-ethereum v1.10.14-0.20250616074821-cba908db071d/go.mod h1:756YMENiSfx/5pCwKq3+uSTWjXuHTbiCB+TirJjsQT8=
312+
github.com/scroll-tech/da-codec v0.1.3-0.20250626091118-58b899494da6 h1:vb2XLvQwCf+F/ifP6P/lfeiQrHY6+Yb/E3R4KHXLqSE=
313+
github.com/scroll-tech/da-codec v0.1.3-0.20250626091118-58b899494da6/go.mod h1:Z6kN5u2khPhiqHyk172kGB7o38bH/nj7Ilrb/46wZGg=
314+
github.com/scroll-tech/go-ethereum v1.10.14-0.20250626101020-47bc86cd961c h1:IpEBKM6O+xOK2qZVZztGxcobFXkKMb5hAkBEVzfXjVg=
315+
github.com/scroll-tech/go-ethereum v1.10.14-0.20250626101020-47bc86cd961c/go.mod h1:pDCZ4iGvEGmdIe4aSAGBrb7XSrKEML6/L/wEMmNxOdk=
316316
github.com/scroll-tech/zktrie v0.8.4 h1:UagmnZ4Z3ITCk+aUq9NQZJNAwnWl4gSxsLb2Nl7IgRE=
317317
github.com/scroll-tech/zktrie v0.8.4/go.mod h1:XvNo7vAk8yxNyTjBDj5WIiFzYW4bx/gJ78+NK6Zn6Uk=
318318
github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys=

‎coordinator/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ require (
99
github.com/google/uuid v1.6.0
1010
github.com/mitchellh/mapstructure v1.5.0
1111
github.com/prometheus/client_golang v1.19.0
12-
github.com/scroll-tech/da-codec v0.1.3-0.20250616065246-17bf3e4990cd
13-
github.com/scroll-tech/go-ethereum v1.10.14-0.20250611141528-cf3d22ef8707
12+
github.com/scroll-tech/da-codec v0.1.3-0.20250626091118-58b899494da6
13+
github.com/scroll-tech/go-ethereum v1.10.14-0.20250626110859-cc9a1dd82de7
1414
github.com/shopspring/decimal v1.3.1
1515
github.com/stretchr/testify v1.10.0
1616
github.com/urfave/cli/v2 v2.25.7

‎coordinator/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,10 +177,10 @@ github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU
177177
github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
178178
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
179179
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
180-
github.com/scroll-tech/da-codec v0.1.3-0.20250616065246-17bf3e4990cd h1:VKVDPtKJZIaQNQvhXptVhS7O9GLKl1314egD1fln8SA=
181-
github.com/scroll-tech/da-codec v0.1.3-0.20250616065246-17bf3e4990cd/go.mod h1:T+370kLxwACnmWaq4rgtKGyLCd7QSE6iy0JLfCp1qj4=
182-
github.com/scroll-tech/go-ethereum v1.10.14-0.20250611141528-cf3d22ef8707 h1:rC6eEsAwSG1VzNT48fLM00rqwTGWPckiipmFC8D6D5o=
183-
github.com/scroll-tech/go-ethereum v1.10.14-0.20250611141528-cf3d22ef8707/go.mod h1:756YMENiSfx/5pCwKq3+uSTWjXuHTbiCB+TirJjsQT8=
180+
github.com/scroll-tech/da-codec v0.1.3-0.20250626091118-58b899494da6 h1:vb2XLvQwCf+F/ifP6P/lfeiQrHY6+Yb/E3R4KHXLqSE=
181+
github.com/scroll-tech/da-codec v0.1.3-0.20250626091118-58b899494da6/go.mod h1:Z6kN5u2khPhiqHyk172kGB7o38bH/nj7Ilrb/46wZGg=
182+
github.com/scroll-tech/go-ethereum v1.10.14-0.20250626110859-cc9a1dd82de7 h1:1rN1qocsQlOyk1VCpIEF1J5pfQbLAi1pnMZSLQS37jQ=
183+
github.com/scroll-tech/go-ethereum v1.10.14-0.20250626110859-cc9a1dd82de7/go.mod h1:pDCZ4iGvEGmdIe4aSAGBrb7XSrKEML6/L/wEMmNxOdk=
184184
github.com/scroll-tech/zktrie v0.8.4 h1:UagmnZ4Z3ITCk+aUq9NQZJNAwnWl4gSxsLb2Nl7IgRE=
185185
github.com/scroll-tech/zktrie v0.8.4/go.mod h1:XvNo7vAk8yxNyTjBDj5WIiFzYW4bx/gJ78+NK6Zn6Uk=
186186
github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI=

‎rollup/conf/config.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,13 @@
9595
"max_block_num_per_chunk": 100,
9696
"max_l2_gas_per_chunk": 20000000,
9797
"chunk_timeout_sec": 300,
98-
"max_uncompressed_batch_bytes_size": 4000000
98+
"max_uncompressed_batch_bytes_size": 4194304
9999
},
100100
"batch_proposer_config": {
101101
"propose_interval_milliseconds": 1000,
102102
"batch_timeout_sec": 300,
103103
"max_chunks_per_batch": 45,
104-
"max_uncompressed_batch_bytes_size": 4000000
104+
"max_uncompressed_batch_bytes_size": 4194304
105105
},
106106
"bundle_proposer_config": {
107107
"max_batch_num_per_bundle": 20,

‎rollup/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ require (
1515
github.com/holiman/uint256 v1.3.2
1616
github.com/mitchellh/mapstructure v1.5.0
1717
github.com/prometheus/client_golang v1.16.0
18-
github.com/scroll-tech/da-codec v0.1.3-0.20250623141222-9e6ea1d439fa
19-
github.com/scroll-tech/go-ethereum v1.10.14-0.20250611141528-cf3d22ef8707
18+
github.com/scroll-tech/da-codec v0.1.3-0.20250626091118-58b899494da6
19+
github.com/scroll-tech/go-ethereum v1.10.14-0.20250626110859-cc9a1dd82de7
2020
github.com/smartystreets/goconvey v1.8.0
2121
github.com/spf13/viper v1.19.0
2222
github.com/stretchr/testify v1.10.0

‎rollup/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -285,10 +285,10 @@ github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6ke
285285
github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4=
286286
github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE=
287287
github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ=
288-
github.com/scroll-tech/da-codec v0.1.3-0.20250623141222-9e6ea1d439fa h1:IwobY81o8LeI1kV4WkbaYFh6oDtAfheFjUO/dapkNlE=
289-
github.com/scroll-tech/da-codec v0.1.3-0.20250623141222-9e6ea1d439fa/go.mod h1:T+370kLxwACnmWaq4rgtKGyLCd7QSE6iy0JLfCp1qj4=
290-
github.com/scroll-tech/go-ethereum v1.10.14-0.20250611141528-cf3d22ef8707 h1:rC6eEsAwSG1VzNT48fLM00rqwTGWPckiipmFC8D6D5o=
291-
github.com/scroll-tech/go-ethereum v1.10.14-0.20250611141528-cf3d22ef8707/go.mod h1:756YMENiSfx/5pCwKq3+uSTWjXuHTbiCB+TirJjsQT8=
288+
github.com/scroll-tech/da-codec v0.1.3-0.20250626091118-58b899494da6 h1:vb2XLvQwCf+F/ifP6P/lfeiQrHY6+Yb/E3R4KHXLqSE=
289+
github.com/scroll-tech/da-codec v0.1.3-0.20250626091118-58b899494da6/go.mod h1:Z6kN5u2khPhiqHyk172kGB7o38bH/nj7Ilrb/46wZGg=
290+
github.com/scroll-tech/go-ethereum v1.10.14-0.20250626110859-cc9a1dd82de7 h1:1rN1qocsQlOyk1VCpIEF1J5pfQbLAi1pnMZSLQS37jQ=
291+
github.com/scroll-tech/go-ethereum v1.10.14-0.20250626110859-cc9a1dd82de7/go.mod h1:pDCZ4iGvEGmdIe4aSAGBrb7XSrKEML6/L/wEMmNxOdk=
292292
github.com/scroll-tech/zktrie v0.8.4 h1:UagmnZ4Z3ITCk+aUq9NQZJNAwnWl4gSxsLb2Nl7IgRE=
293293
github.com/scroll-tech/zktrie v0.8.4/go.mod h1:XvNo7vAk8yxNyTjBDj5WIiFzYW4bx/gJ78+NK6Zn6Uk=
294294
github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI=

‎rollup/internal/controller/watcher/batch_proposer_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -287,8 +287,8 @@ func testBatchProposerUncompressedBatchBytesLimitCodecV8(t *testing.T) {
287287
// Create blocks with large calldata
288288
block := readBlockFromJSON(t, "../../../testdata/blockTrace_03.json")
289289

290-
// Create large calldata (3MB per block)
291-
largeCalldata := make([]byte, 3*1024*1024) // 3MB calldata
290+
// Create large calldata (3KiB per block)
291+
largeCalldata := make([]byte, 3*1024) // 3KiB calldata
292292
for i := range largeCalldata {
293293
largeCalldata[i] = byte(i % 256)
294294
}
@@ -329,12 +329,12 @@ func testBatchProposerUncompressedBatchBytesLimitCodecV8(t *testing.T) {
329329
cp.TryProposeChunk() // Each call creates one chunk with one block
330330
}
331331

332-
// Create batch proposer with 4MB uncompressed batch bytes limit
333-
// Each chunk is ~3MB, so 1 chunk (~3MB) should fit, but 2 chunks (~6MB) should exceed limit
332+
// Create batch proposer with 4KiB uncompressed batch bytes limit
333+
// Each chunk is ~3KiB, so 1 chunk (~3KiB) should fit, but 2 chunks (~6KiB) should exceed limit
334334
bp := NewBatchProposer(context.Background(), &config.BatchProposerConfig{
335335
MaxChunksPerBatch: math.MaxInt32, // No chunk count limit
336336
BatchTimeoutSec: math.MaxUint32, // No timeout limit
337-
MaxUncompressedBatchBytesSize: 4 * 1024 * 1024, // 4MB limit
337+
MaxUncompressedBatchBytesSize: 4 * 1024, // 4KiB limit
338338
}, encoding.CodecV8, chainConfig, db, nil)
339339

340340
bp.TryProposeBatch()

‎rollup/internal/controller/watcher/chunk_proposer_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,8 @@ func testChunkProposerUncompressedBatchBytesLimitCodecV8(t *testing.T) {
164164
// Create a block with very large calldata to test uncompressed batch bytes limit
165165
block := readBlockFromJSON(t, "../../../testdata/blockTrace_03.json")
166166

167-
// Create a transaction with large calldata (around 3MB)
168-
largeCalldata := make([]byte, 3*1024*1024) // 3MB calldata
167+
// Create a transaction with large calldata (around 3KiB)
168+
largeCalldata := make([]byte, 3*1024) // 3KiB calldata
169169
for i := range largeCalldata {
170170
largeCalldata[i] = byte(i % 256)
171171
}
@@ -201,13 +201,13 @@ func testChunkProposerUncompressedBatchBytesLimitCodecV8(t *testing.T) {
201201
FeynmanTime: new(uint64),
202202
}
203203

204-
// Set max_uncompressed_batch_bytes_size to 4MB (4 * 1024 * 1024)
205-
// One block (~3MB) should fit, but two blocks (~6MB) should exceed the limit
204+
// Set max_uncompressed_batch_bytes_size to 4KiB (4 * 1024)
205+
// One block (~3KiB) should fit, but two blocks (~6KiB) should exceed the limit
206206
cp := NewChunkProposer(context.Background(), &config.ChunkProposerConfig{
207207
MaxBlockNumPerChunk: math.MaxUint64, // No block number limit
208208
MaxL2GasPerChunk: math.MaxUint64, // No gas limit
209209
ChunkTimeoutSec: math.MaxUint32, // No timeout limit
210-
MaxUncompressedBatchBytesSize: 4 * 1024 * 1024, // 4MB limit
210+
MaxUncompressedBatchBytesSize: 4 * 1024, // 4KiB limit
211211
}, encoding.CodecV8, chainConfig, db, nil)
212212

213213
// Try to propose chunk

‎rollup/proposer-tool-config.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
"max_block_num_per_chunk": 100,
66
"max_l2_gas_per_chunk": 20000000,
77
"chunk_timeout_sec": 72000000000,
8-
"max_uncompressed_batch_bytes_size": 4000000
8+
"max_uncompressed_batch_bytes_size": 4194304
99
},
1010
"batch_proposer_config": {
1111
"batch_timeout_sec": 72000000000,
1212
"max_chunks_per_batch": 45,
13-
"max_uncompressed_batch_bytes_size": 4000000
13+
"max_uncompressed_batch_bytes_size": 4194304
1414
},
1515
"bundle_proposer_config": {
1616
"max_batch_num_per_bundle": 45,

0 commit comments

Comments
 (0)