Skip to content

Commit 91dc413

Browse files
tuxcanflytuxcanfly
authored
da: add celestia-openrpc dep (#994)
## Overview This PR adds a dependency on `celestia-openrpc` `505ff801e818` which will eventually replace `go-cnc`. `go-header` was pinned to `0.2.6` as `0.2.7` is breaking tests. Fixes #995 ## Checklist <!-- Please complete the checklist to ensure that the PR is ready to be reviewed. IMPORTANT: PRs should be left in Draft until the below checklist is completed. --> - [x] New and updated code has appropriate documentation - [x] New and updated code has new and/or updated testing - [x] Required CI checks are passing - [x] Visual proof for any user facing features like CLI or documentation updates - [x] Linked issues closed with keywords
1 parent 784a455 commit 91dc413

3 files changed

Lines changed: 106 additions & 69 deletions

File tree

‎da/celestia/celestia.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ import (
1212

1313
"github.com/celestiaorg/go-cnc"
1414

15+
openrpc "github.com/rollkit/celestia-openrpc"
16+
1517
"github.com/rollkit/rollkit/da"
1618
"github.com/rollkit/rollkit/log"
1719
"github.com/rollkit/rollkit/types"
@@ -20,6 +22,7 @@ import (
2022

2123
// DataAvailabilityLayerClient use celestia-node public API.
2224
type DataAvailabilityLayerClient struct {
25+
_ *openrpc.Client
2326
client *cnc.Client
2427

2528
namespaceID types.NamespaceID

‎go.mod‎

Lines changed: 33 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.18
55
require (
66
github.com/celestiaorg/go-cnc v0.3.0
77
github.com/celestiaorg/go-fraud v0.1.0
8-
github.com/celestiaorg/go-header v0.2.6
8+
github.com/celestiaorg/go-header v0.2.7
99
github.com/dgraph-io/badger/v3 v3.2103.5
1010
github.com/go-kit/kit v0.12.0
1111
github.com/gogo/protobuf v1.3.3
@@ -15,32 +15,37 @@ require (
1515
github.com/ipfs/go-datastore v0.6.0
1616
github.com/ipfs/go-ds-badger3 v0.0.2
1717
github.com/ipfs/go-log v1.0.5
18-
github.com/libp2p/go-libp2p v0.26.3
18+
github.com/libp2p/go-libp2p v0.27.3
1919
github.com/libp2p/go-libp2p-kad-dht v0.23.0
2020
github.com/libp2p/go-libp2p-pubsub v0.9.3
2121
github.com/multiformats/go-multiaddr v0.9.0
2222
github.com/prometheus/client_golang v1.15.1
23+
github.com/rollkit/celestia-openrpc v0.0.0-20230531022214-505ff801e818
2324
github.com/rs/cors v1.9.0
2425
github.com/spf13/cobra v1.7.0
2526
github.com/spf13/viper v1.16.0
2627
github.com/stretchr/testify v1.8.4
27-
github.com/tendermint/tendermint v0.34.21
28+
github.com/tendermint/tendermint v0.35.9
2829
go.uber.org/multierr v1.11.0
2930
golang.org/x/net v0.10.0
3031
google.golang.org/grpc v1.55.0
3132
google.golang.org/protobuf v1.30.0
3233
)
3334

3435
require (
36+
cosmossdk.io/math v1.0.1 // indirect
3537
github.com/benbjohnson/clock v1.3.0 // indirect
3638
github.com/beorn7/perks v1.0.1 // indirect
3739
github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
3840
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.2 // indirect
3941
github.com/celestiaorg/go-libp2p-messenger v0.2.0 // indirect
42+
github.com/celestiaorg/merkletree v0.0.0-20210714075610-a84dc3ddbbe4 // indirect
43+
github.com/celestiaorg/nmt v0.15.0 // indirect
44+
github.com/celestiaorg/rsmt2d v0.9.0 // indirect
4045
github.com/cespare/xxhash v1.1.0 // indirect
4146
github.com/cespare/xxhash/v2 v2.2.0 // indirect
4247
github.com/cometbft/cometbft-db v0.8.0 // indirect
43-
github.com/containerd/cgroups v1.0.4 // indirect
48+
github.com/containerd/cgroups v1.1.0 // indirect
4449
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
4550
github.com/cosmos/go-bip39 v1.0.0 // indirect
4651
github.com/davecgh/go-spew v1.1.1 // indirect
@@ -52,6 +57,7 @@ require (
5257
github.com/docker/go-units v0.5.0 // indirect
5358
github.com/dustin/go-humanize v1.0.0 // indirect
5459
github.com/elastic/gosigar v0.14.2 // indirect
60+
github.com/filecoin-project/go-jsonrpc v0.3.1 // indirect
5561
github.com/flynn/noise v1.0.0 // indirect
5662
github.com/francoispqt/gojay v1.2.13 // indirect
5763
github.com/fsnotify/fsnotify v1.6.0 // indirect
@@ -60,7 +66,7 @@ require (
6066
github.com/go-logr/logr v1.2.3 // indirect
6167
github.com/go-logr/stdr v1.2.2 // indirect
6268
github.com/go-resty/resty/v2 v2.7.0 // indirect
63-
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
69+
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
6470
github.com/godbus/dbus/v5 v5.1.0 // indirect
6571
github.com/golang/glog v1.0.0 // indirect
6672
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
@@ -70,34 +76,35 @@ require (
7076
github.com/google/btree v1.1.2 // indirect
7177
github.com/google/flatbuffers v1.12.1 // indirect
7278
github.com/google/gopacket v1.1.19 // indirect
73-
github.com/google/pprof v0.0.0-20221203041831-ce31453925ec // indirect
79+
github.com/google/pprof v0.0.0-20230405160723-4a4c7d95572b // indirect
7480
github.com/google/uuid v1.3.0 // indirect
7581
github.com/gopherjs/gopherjs v0.0.0-20190812055157-5d271430af9f // indirect
7682
github.com/gtank/merlin v0.1.1 // indirect
7783
github.com/hashicorp/errwrap v1.1.0 // indirect
7884
github.com/hashicorp/go-multierror v1.1.1 // indirect
7985
github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
80-
github.com/hashicorp/golang-lru/v2 v2.0.1 // indirect
86+
github.com/hashicorp/golang-lru/v2 v2.0.2 // indirect
8187
github.com/hashicorp/hcl v1.0.0 // indirect
82-
github.com/huin/goupnp v1.0.3 // indirect
88+
github.com/huin/goupnp v1.1.0 // indirect
8389
github.com/inconshreveable/mousetrap v1.1.0 // indirect
8490
github.com/ipfs/boxo v0.8.0 // indirect
85-
github.com/ipfs/go-cid v0.4.0 // indirect
91+
github.com/ipfs/go-cid v0.4.1 // indirect
8692
github.com/ipfs/go-ipfs-util v0.0.2 // indirect
8793
github.com/ipfs/go-log/v2 v2.5.1 // indirect
8894
github.com/ipld/go-ipld-prime v0.20.0 // indirect
8995
github.com/jackpal/go-nat-pmp v1.0.2 // indirect
9096
github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect
9197
github.com/jbenet/goprocess v0.1.4 // indirect
9298
github.com/jmhodges/levigo v1.0.0 // indirect
93-
github.com/klauspost/compress v1.15.12 // indirect
94-
github.com/klauspost/cpuid/v2 v2.2.3 // indirect
95-
github.com/koron/go-ssdp v0.0.3 // indirect
99+
github.com/klauspost/compress v1.16.4 // indirect
100+
github.com/klauspost/cpuid/v2 v2.2.4 // indirect
101+
github.com/klauspost/reedsolomon v1.11.1 // indirect
102+
github.com/koron/go-ssdp v0.0.4 // indirect
96103
github.com/lib/pq v1.10.7 // indirect
97104
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
98105
github.com/libp2p/go-cidranger v1.1.0 // indirect
99106
github.com/libp2p/go-flow-metrics v0.1.0 // indirect
100-
github.com/libp2p/go-libp2p-asn-util v0.2.0 // indirect
107+
github.com/libp2p/go-libp2p-asn-util v0.3.0 // indirect
101108
github.com/libp2p/go-libp2p-kbucket v0.5.0 // indirect
102109
github.com/libp2p/go-libp2p-record v0.2.0 // indirect
103110
github.com/libp2p/go-msgio v0.3.0 // indirect
@@ -108,9 +115,9 @@ require (
108115
github.com/linxGnu/grocksdb v1.7.16 // indirect
109116
github.com/magiconair/properties v1.8.7 // indirect
110117
github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd // indirect
111-
github.com/mattn/go-isatty v0.0.17 // indirect
118+
github.com/mattn/go-isatty v0.0.18 // indirect
112119
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
113-
github.com/miekg/dns v1.1.50 // indirect
120+
github.com/miekg/dns v1.1.53 // indirect
114121
github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b // indirect
115122
github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc // indirect
116123
github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect
@@ -121,12 +128,12 @@ require (
121128
github.com/multiformats/go-base36 v0.2.0 // indirect
122129
github.com/multiformats/go-multiaddr-dns v0.3.1 // indirect
123130
github.com/multiformats/go-multiaddr-fmt v0.1.0 // indirect
124-
github.com/multiformats/go-multibase v0.1.1 // indirect
131+
github.com/multiformats/go-multibase v0.2.0 // indirect
125132
github.com/multiformats/go-multicodec v0.8.1 // indirect
126133
github.com/multiformats/go-multihash v0.2.2-0.20221030163302-608669da49b6 // indirect
127134
github.com/multiformats/go-multistream v0.4.1 // indirect
128135
github.com/multiformats/go-varint v0.0.7 // indirect
129-
github.com/onsi/ginkgo/v2 v2.5.1 // indirect
136+
github.com/onsi/ginkgo/v2 v2.9.2 // indirect
130137
github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 // indirect
131138
github.com/opentracing/opentracing-go v1.2.0 // indirect
132139
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
@@ -139,8 +146,8 @@ require (
139146
github.com/prometheus/common v0.42.0 // indirect
140147
github.com/prometheus/procfs v0.9.0 // indirect
141148
github.com/quic-go/qpack v0.4.0 // indirect
142-
github.com/quic-go/qtls-go1-19 v0.2.1 // indirect
143-
github.com/quic-go/qtls-go1-20 v0.1.1 // indirect
149+
github.com/quic-go/qtls-go1-19 v0.3.2 // indirect
150+
github.com/quic-go/qtls-go1-20 v0.2.2 // indirect
144151
github.com/quic-go/quic-go v0.33.0 // indirect
145152
github.com/quic-go/webtransport-go v0.5.2 // indirect
146153
github.com/raulk/go-watchdog v1.3.0 // indirect
@@ -160,16 +167,17 @@ require (
160167
go.opentelemetry.io/otel/metric v0.34.0 // indirect
161168
go.opentelemetry.io/otel/trace v1.14.0 // indirect
162169
go.uber.org/atomic v1.10.0 // indirect
163-
go.uber.org/dig v1.15.0 // indirect
164-
go.uber.org/fx v1.18.2 // indirect
170+
go.uber.org/dig v1.16.1 // indirect
171+
go.uber.org/fx v1.19.2 // indirect
165172
go.uber.org/zap v1.24.0 // indirect
166173
golang.org/x/crypto v0.9.0 // indirect
167-
golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb // indirect
168-
golang.org/x/mod v0.8.0 // indirect
174+
golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
175+
golang.org/x/mod v0.10.0 // indirect
169176
golang.org/x/sync v0.1.0 // indirect
170177
golang.org/x/sys v0.8.0 // indirect
171178
golang.org/x/text v0.9.0 // indirect
172-
golang.org/x/tools v0.6.0 // indirect
179+
golang.org/x/tools v0.7.0 // indirect
180+
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
173181
gonum.org/v1/gonum v0.11.0 // indirect
174182
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
175183
gopkg.in/ini.v1 v1.67.0 // indirect
@@ -179,6 +187,7 @@ require (
179187
)
180188

181189
replace (
190+
github.com/celestiaorg/go-header => github.com/celestiaorg/go-header v0.2.6
182191
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.2-alpha.regen.4
183192
// github.com/tendermint/tendermint => github.com/celestiaorg/tendermint v0.34.22-0.20221202214355-3605c597500d
184193
github.com/tendermint/tendermint => github.com/rollkit/cometbft v0.0.0-20230524013001-2968c8b8b121

0 commit comments

Comments
 (0)