Skip to content

Commit 7a60b34

Browse files
jonastheisjonastheis
committed
Merge remote-tracking branch 'origin/omerfirmak/euclid' into feat/codec-v6
2 parents 4ef7bfc + 2817674 commit 7a60b34

File tree

8 files changed

+84
-19
lines changed

8 files changed

+84
-19
lines changed

‎encoding/codecv4.go‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,14 @@ import (
2020

2121
type DACodecV4 struct {
2222
DACodecV3
23+
forcedVersion *CodecVersion
2324
}
2425

2526
// Version returns the codec version.
2627
func (d *DACodecV4) Version() CodecVersion {
28+
if d.forcedVersion != nil {
29+
return *d.forcedVersion
30+
}
2731
return CodecV4
2832
}
2933

@@ -90,7 +94,7 @@ func (d *DACodecV4) NewDABatch(batch *Batch) (DABatch, error) {
9094
l1MessagePopped := totalL1MessagePoppedAfter - batch.TotalL1MessagePoppedBefore
9195

9296
return newDABatchV3(
93-
CodecV4, // version
97+
d.Version(), // version
9498
batch.Index, // batchIndex
9599
l1MessagePopped, // l1MessagePopped
96100
totalL1MessagePoppedAfter, // totalL1MessagePopped
@@ -112,8 +116,8 @@ func (d *DACodecV4) NewDABatchFromBytes(data []byte) (DABatch, error) {
112116
return nil, fmt.Errorf("invalid data length for DABatch, expected %d bytes but got %d", daBatchV3EncodedLength, len(data))
113117
}
114118

115-
if CodecVersion(data[daBatchOffsetVersion]) != CodecV4 {
116-
return nil, fmt.Errorf("codec version mismatch: expected %d but found %d", CodecV4, data[daBatchOffsetVersion])
119+
if CodecVersion(data[daBatchOffsetVersion]) != d.Version() {
120+
return nil, fmt.Errorf("codec version mismatch: expected %d but found %d", d.Version(), data[daBatchOffsetVersion])
117121
}
118122

119123
return newDABatchV3WithProof(

‎encoding/codecv5.go‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package encoding
2+
3+
type DACodecV5 struct {
4+
DACodecV4
5+
}
6+
7+
func NewDACodecV5() *DACodecV5 {
8+
v := CodecV5
9+
return &DACodecV5{
10+
DACodecV4: DACodecV4{
11+
forcedVersion: &v,
12+
},
13+
}
14+
}
15+
16+
// MaxNumChunksPerBatch returns the maximum number of chunks per batch.
17+
func (d *DACodecV5) MaxNumChunksPerBatch() int {
18+
return 1
19+
}

‎encoding/codecv6.go‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package encoding
2+
3+
type DACodecV6 struct {
4+
DACodecV4
5+
}
6+
7+
func NewDACodecV6() *DACodecV6 {
8+
v := CodecV6
9+
return &DACodecV6{
10+
DACodecV4: DACodecV4{
11+
forcedVersion: &v,
12+
},
13+
}
14+
}

‎encoding/da.go‎

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"encoding/binary"
66
"fmt"
77
"math/big"
8+
"slices"
89

910
"github.com/klauspost/compress/zstd"
1011

@@ -245,6 +246,15 @@ func (c *Chunk) CrcMax() (uint64, error) {
245246
// Map sub-circuit name to row count
246247
crc := make(map[string]uint64)
247248

249+
// if no blocks have row consumption, this is an euclid chunk
250+
isEuclidChunk := slices.IndexFunc(c.Blocks, func(block *Block) bool {
251+
return block.RowConsumption != nil
252+
}) == -1
253+
254+
if isEuclidChunk {
255+
return 0, nil
256+
}
257+
248258
// Iterate over blocks, accumulate row consumption
249259
for _, block := range c.Blocks {
250260
if block.RowConsumption == nil {
@@ -652,8 +662,10 @@ func GetHardforkName(config *params.ChainConfig, blockHeight, blockTimestamp uin
652662
return "curie"
653663
} else if !config.IsDarwinV2(blockTimestamp) {
654664
return "darwin"
655-
} else {
665+
} else if !config.IsEuclid(blockTimestamp) {
656666
return "darwinV2"
667+
} else {
668+
return "euclid"
657669
}
658670
}
659671

@@ -668,8 +680,11 @@ func GetCodecVersion(config *params.ChainConfig, blockHeight, blockTimestamp uin
668680
return CodecV2
669681
} else if !config.IsDarwinV2(blockTimestamp) {
670682
return CodecV3
671-
} else {
683+
} else if !config.IsEuclid(blockTimestamp) {
672684
return CodecV4
685+
} else {
686+
// V5 is skipped, because it is only used for the special Euclid transition batch that we handle explicitly
687+
return CodecV6
673688
}
674689
}
675690

@@ -698,7 +713,7 @@ func GetChunkEnableCompression(codecVersion CodecVersion, chunk *Chunk) (bool, e
698713
return false, nil
699714
case CodecV2, CodecV3:
700715
return true, nil
701-
case CodecV4:
716+
case CodecV4, CodecV5, CodecV6:
702717
return CheckChunkCompressedDataCompatibility(chunk, codecVersion)
703718
default:
704719
return false, fmt.Errorf("unsupported codec version: %v", codecVersion)
@@ -712,7 +727,7 @@ func GetBatchEnableCompression(codecVersion CodecVersion, batch *Batch) (bool, e
712727
return false, nil
713728
case CodecV2, CodecV3:
714729
return true, nil
715-
case CodecV4:
730+
case CodecV4, CodecV5, CodecV6:
716731
return CheckBatchCompressedDataCompatibility(batch, codecVersion)
717732
default:
718733
return false, fmt.Errorf("unsupported codec version: %v", codecVersion)

‎encoding/da_test.go‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,13 @@ func TestUtilFunctions(t *testing.T) {
7878
assert.Equal(t, uint64(5), chunk3.NumTransactions())
7979
assert.Equal(t, uint64(240000), chunk3.TotalGasUsed())
8080

81+
// euclid chunk
82+
chunk3.Blocks[0].RowConsumption = nil
83+
chunk3.Blocks[1].RowConsumption = nil
84+
crc3Max, err = chunk3.CrcMax()
85+
assert.NoError(t, err)
86+
assert.Equal(t, uint64(0), crc3Max)
87+
8188
// Test Batch methods
8289
assert.Equal(t, block6.Header.Root, batch.StateRoot())
8390
assert.Equal(t, block6.WithdrawRoot, batch.WithdrawRoot())

‎encoding/interfaces.go‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ const (
8585
CodecV2
8686
CodecV3
8787
CodecV4
88-
_
89-
_
88+
CodecV5
89+
CodecV6
9090
CodecV7
9191
)
9292

@@ -103,6 +103,10 @@ func CodecFromVersion(version CodecVersion) (Codec, error) {
103103
return &DACodecV3{}, nil
104104
case CodecV4:
105105
return &DACodecV4{}, nil
106+
case CodecV5:
107+
return NewDACodecV5(), nil
108+
case CodecV6:
109+
return NewDACodecV6(), nil
106110
case CodecV7:
107111
return &DACodecV7{}, nil
108112
default:
@@ -112,8 +116,10 @@ func CodecFromVersion(version CodecVersion) (Codec, error) {
112116

113117
// CodecFromConfig determines and returns the appropriate codec based on chain configuration, block number, and timestamp.
114118
func CodecFromConfig(chainCfg *params.ChainConfig, startBlockNumber *big.Int, startBlockTimestamp uint64) Codec {
115-
if chainCfg.IsDarwinV2(startBlockTimestamp) { // TODO: replace with correct fork
116-
return &DACodecV7{}
119+
// TODO: replace with correct fork
120+
if chainCfg.IsEuclid(startBlockTimestamp) {
121+
// V5 is skipped, because it is only used for the special Euclid transition batch that we handle explicitly
122+
return NewDACodecV6()
117123
} else if chainCfg.IsDarwinV2(startBlockTimestamp) {
118124
return &DACodecV4{}
119125
} else if chainCfg.IsDarwin(startBlockTimestamp) {

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.21
44

55
require (
66
github.com/agiledragon/gomonkey/v2 v2.12.0
7-
github.com/scroll-tech/go-ethereum v1.10.14-0.20241210104312-bdf64cfb39dc
7+
github.com/scroll-tech/go-ethereum v1.10.14-0.20250103082839-ea3ec93d8c1e
88
github.com/stretchr/testify v1.9.0
99
)
1010

@@ -31,7 +31,7 @@ require (
3131
github.com/tklauser/go-sysconf v0.3.12 // indirect
3232
github.com/tklauser/numcpus v0.6.1 // indirect
3333
github.com/yusufpapurcu/wmi v1.2.3 // indirect
34-
golang.org/x/crypto v0.17.0 // indirect
34+
golang.org/x/crypto v0.21.0 // indirect
3535
golang.org/x/sync v0.6.0 // indirect
3636
golang.org/x/sys v0.21.0 // indirect
3737
gopkg.in/yaml.v3 v3.0.1 // indirect

‎go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
github.com/VictoriaMetrics/fastcache v1.12.1 h1:i0mICQuojGDL3KblA7wUNlY5lOK6a4bwt3uRKnkZU40=
2-
github.com/VictoriaMetrics/fastcache v1.12.1/go.mod h1:tX04vaqcNoQeGLD+ra5pU5sWkuxnzWhEzLwhP9w653o=
1+
github.com/VictoriaMetrics/fastcache v1.12.2 h1:N0y9ASrJ0F6h0QaC3o6uJb3NIZ9VKLjCM7NQbSmF7WI=
2+
github.com/VictoriaMetrics/fastcache v1.12.2/go.mod h1:AmC+Nzz1+3G2eCPapF6UcsnkThDcMsQicp4xDukwJYI=
33
github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII=
44
github.com/agiledragon/gomonkey/v2 v2.12.0 h1:ek0dYu9K1rSV+TgkW5LvNNPRWyDZVIxGMCFI6Pz9o38=
55
github.com/agiledragon/gomonkey/v2 v2.12.0/go.mod h1:ap1AmDzcVOAz1YpeJ3TCzIgstoaWLA6jbbgxfB4w2iY=
@@ -78,8 +78,8 @@ github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=
7878
github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
7979
github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
8080
github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
81-
github.com/scroll-tech/go-ethereum v1.10.14-0.20241210104312-bdf64cfb39dc h1:ofQxDFg5aW0ANJcEXt5RJy5lDWz8jdKwKcZhEqvDjx8=
82-
github.com/scroll-tech/go-ethereum v1.10.14-0.20241210104312-bdf64cfb39dc/go.mod h1:xRDJvaNUe7lCU2fB+AqyS7gahar+dfJPrUJplfXF4dw=
81+
github.com/scroll-tech/go-ethereum v1.10.14-0.20250103082839-ea3ec93d8c1e h1:g8jtcGiHbjWYh/V7O245IDho3WfQT4CwEpBV+MhYDrg=
82+
github.com/scroll-tech/go-ethereum v1.10.14-0.20250103082839-ea3ec93d8c1e/go.mod h1:Ik3OBLl7cJxPC+CFyCBYNXBPek4wpdzkWehn/y5qLM8=
8383
github.com/scroll-tech/zktrie v0.8.4 h1:UagmnZ4Z3ITCk+aUq9NQZJNAwnWl4gSxsLb2Nl7IgRE=
8484
github.com/scroll-tech/zktrie v0.8.4/go.mod h1:XvNo7vAk8yxNyTjBDj5WIiFzYW4bx/gJ78+NK6Zn6Uk=
8585
github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI=
@@ -100,8 +100,8 @@ github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFi
100100
github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
101101
golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
102102
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
103-
golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
104-
golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
103+
golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
104+
golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
105105
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
106106
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
107107
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

0 commit comments

Comments
 (0)