Skip to content

Commit cb33236

Browse files
committed
Replace da-codec with internal
1 parent 0ad3a31 commit cb33236

File tree

13 files changed

+17
-32
lines changed

13 files changed

+17
-32
lines changed

core/rawdb/accessors_rollup_event.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ import (
55
"fmt"
66
"math/big"
77

8-
"github.com/scroll-tech/da-codec/encoding"
9-
108
"github.com/scroll-tech/go-ethereum/common"
9+
"github.com/scroll-tech/go-ethereum/da-codec/encoding"
1110
"github.com/scroll-tech/go-ethereum/ethdb"
1211
"github.com/scroll-tech/go-ethereum/log"
1312
"github.com/scroll-tech/go-ethereum/rlp"

go.mod

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ require (
4545
github.com/jedisct1/go-minisign v0.0.0-20190909160543-45766022959e
4646
github.com/julienschmidt/httprouter v1.2.0
4747
github.com/karalabe/usb v0.0.0-20211005121534-4c5740d64559
48+
github.com/klauspost/compress v1.17.9
4849
github.com/mattn/go-colorable v0.1.8
4950
github.com/mattn/go-isatty v0.0.12
5051
github.com/naoina/toml v0.1.2-0.20170918210437-9fafd6967416
@@ -53,7 +54,6 @@ require (
5354
github.com/prometheus/tsdb v0.7.1
5455
github.com/rjeczalik/notify v0.9.1
5556
github.com/rs/cors v1.7.0
56-
github.com/scroll-tech/da-codec v0.1.3-0.20250825071838-cddc263e5ef6
5757
github.com/scroll-tech/zktrie v0.8.4
5858
github.com/shirou/gopsutil v3.21.11+incompatible
5959
github.com/sourcegraph/conc v0.3.0
@@ -88,7 +88,6 @@ require (
8888
github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect
8989
github.com/gotestyourself/gotestyourself v1.4.0 // indirect
9090
github.com/influxdata/line-protocol v0.0.0-20210311194329-9aa0e372d097 // indirect
91-
github.com/klauspost/compress v1.17.9 // indirect
9291
github.com/kylelemons/godebug v1.1.0 // indirect
9392
github.com/mattn/go-ieproxy v0.0.0-20190702010315-6dee0af9227d // indirect
9493
github.com/mattn/go-runewidth v0.0.15 // indirect

go.sum

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -396,8 +396,6 @@ github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99
396396
github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik=
397397
github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
398398
github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
399-
github.com/scroll-tech/da-codec v0.1.3-0.20250825071838-cddc263e5ef6 h1:EiLZgoRfGgF0QzZ1jGSlo60A6W7g9L/8XLWMhwwtKJ0=
400-
github.com/scroll-tech/da-codec v0.1.3-0.20250825071838-cddc263e5ef6/go.mod h1:Z6kN5u2khPhiqHyk172kGB7o38bH/nj7Ilrb/46wZGg=
401399
github.com/scroll-tech/zktrie v0.8.4 h1:UagmnZ4Z3ITCk+aUq9NQZJNAwnWl4gSxsLb2Nl7IgRE=
402400
github.com/scroll-tech/zktrie v0.8.4/go.mod h1:XvNo7vAk8yxNyTjBDj5WIiFzYW4bx/gJ78+NK6Zn6Uk=
403401
github.com/segmentio/kafka-go v0.1.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo=

rollup/da_syncer/da/calldata_blob_source.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@ import (
55
"errors"
66
"fmt"
77

8-
"github.com/scroll-tech/da-codec/encoding"
9-
108
"github.com/scroll-tech/go-ethereum/accounts/abi"
119
"github.com/scroll-tech/go-ethereum/common"
10+
"github.com/scroll-tech/go-ethereum/da-codec/encoding"
1211
"github.com/scroll-tech/go-ethereum/ethdb"
1312
"github.com/scroll-tech/go-ethereum/log"
1413
"github.com/scroll-tech/go-ethereum/rollup/da_syncer/blob_client"

rollup/da_syncer/da/commitV0.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@ import (
44
"encoding/binary"
55
"fmt"
66

7-
"github.com/scroll-tech/da-codec/encoding"
8-
97
"github.com/scroll-tech/go-ethereum/common"
108
"github.com/scroll-tech/go-ethereum/core/rawdb"
119
"github.com/scroll-tech/go-ethereum/core/types"
10+
"github.com/scroll-tech/go-ethereum/da-codec/encoding"
1211
"github.com/scroll-tech/go-ethereum/ethdb"
1312
"github.com/scroll-tech/go-ethereum/log"
1413
"github.com/scroll-tech/go-ethereum/rollup/da_syncer/serrors"

rollup/da_syncer/da/commitV1.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,12 @@ import (
55
"crypto/sha256"
66
"fmt"
77

8-
"github.com/scroll-tech/da-codec/encoding"
9-
10-
"github.com/scroll-tech/go-ethereum/rollup/da_syncer/blob_client"
11-
"github.com/scroll-tech/go-ethereum/rollup/l1"
12-
138
"github.com/scroll-tech/go-ethereum/common"
149
"github.com/scroll-tech/go-ethereum/crypto/kzg4844"
10+
"github.com/scroll-tech/go-ethereum/da-codec/encoding"
1511
"github.com/scroll-tech/go-ethereum/ethdb"
12+
"github.com/scroll-tech/go-ethereum/rollup/da_syncer/blob_client"
13+
"github.com/scroll-tech/go-ethereum/rollup/l1"
1614
)
1715

1816
type CommitBatchDAV1 struct {

rollup/da_syncer/da/commitV7.go

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,17 @@ import (
55
"crypto/sha256"
66
"fmt"
77

8-
"github.com/scroll-tech/da-codec/encoding"
9-
8+
"github.com/scroll-tech/go-ethereum/common"
109
"github.com/scroll-tech/go-ethereum/core/rawdb"
1110
"github.com/scroll-tech/go-ethereum/core/types"
11+
"github.com/scroll-tech/go-ethereum/crypto/kzg4844"
12+
"github.com/scroll-tech/go-ethereum/da-codec/encoding"
13+
"github.com/scroll-tech/go-ethereum/ethdb"
1214
"github.com/scroll-tech/go-ethereum/log"
1315
"github.com/scroll-tech/go-ethereum/rollup/da_syncer/blob_client"
1416
"github.com/scroll-tech/go-ethereum/rollup/da_syncer/serrors"
1517
"github.com/scroll-tech/go-ethereum/rollup/l1"
1618
"github.com/scroll-tech/go-ethereum/rollup/missing_header_fields"
17-
18-
"github.com/scroll-tech/go-ethereum/common"
19-
"github.com/scroll-tech/go-ethereum/crypto/kzg4844"
20-
"github.com/scroll-tech/go-ethereum/ethdb"
2119
)
2220

2321
type CommitBatchDAV7 struct {

rollup/da_syncer/da/da.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ package da
33
import (
44
"math/big"
55

6-
"github.com/scroll-tech/da-codec/encoding"
7-
86
"github.com/scroll-tech/go-ethereum/common"
97
"github.com/scroll-tech/go-ethereum/core/types"
8+
"github.com/scroll-tech/go-ethereum/da-codec/encoding"
109
"github.com/scroll-tech/go-ethereum/rollup/l1"
1110
"github.com/scroll-tech/go-ethereum/rollup/missing_header_fields"
1211
)

rollup/fees/rollup_fee.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@ import (
77
"math/big"
88

99
"github.com/holiman/uint256"
10-
"github.com/scroll-tech/da-codec/encoding"
11-
1210
"github.com/scroll-tech/go-ethereum/common"
1311
"github.com/scroll-tech/go-ethereum/core/types"
1412
"github.com/scroll-tech/go-ethereum/crypto"
13+
"github.com/scroll-tech/go-ethereum/da-codec/encoding"
1514
"github.com/scroll-tech/go-ethereum/log"
1615
"github.com/scroll-tech/go-ethereum/params"
1716
"github.com/scroll-tech/go-ethereum/rollup/rcfg"

rollup/l1/reader.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@ import (
66
"fmt"
77
"math/big"
88

9-
"github.com/scroll-tech/da-codec/encoding"
10-
119
"github.com/scroll-tech/go-ethereum"
1210
"github.com/scroll-tech/go-ethereum/accounts/abi"
1311
"github.com/scroll-tech/go-ethereum/common"
1412
"github.com/scroll-tech/go-ethereum/core/types"
13+
"github.com/scroll-tech/go-ethereum/da-codec/encoding"
1514
"github.com/scroll-tech/go-ethereum/log"
1615
"github.com/scroll-tech/go-ethereum/rpc"
1716
)

0 commit comments

Comments
 (0)