Skip to content

Commit eb66b72

Browse files
gupadhyayaGanesha Upadhyaya
andauthored
update tendermint dependency to cometbft 0.34.x w/ fraud proofs (#955)
Since cosmos-sdk release/v0.45.x and release/0.46.x only depend on cometbft v0.34.x, i have pushed a branch v0.34.x to https://github.com/rollkit/cometbft/tree/v0.34.x and applied the fraud proof changes from rollkit/tendermint. This PR is simply replacing the `github.com/tendermint/tendermint` with `github.com/rollkit/cometbft v0.0.0-20230523181933-31b0a76c97d9` which corresponds to latest commit from https://github.com/rollkit/cometbft/tree/v0.34.x. This builds without any issues, however some tests are failing and needs to be fixed. After this, we can release rollkit with this cometbft change and sync our cosmos-sdk forks (release/v0.45.x and release/v0.46.x) and also add the newly released rollkit (w/ cometbft). #793 PR and https://github.com/rollkit/cometbft/tree/rollkit/v0.37.0 is still needed when we add support for cosmos-sdk release/v0.47.x, which uses module `github.com/cometbft/cometbft` path and not `github.com/tendermint/tendermint` --------- Co-authored-by: Ganesha Upadhyaya <gupadhyaya@Ganeshas-MacBook-Pro-2.local>
1 parent e90a07b commit eb66b72

2 files changed

Lines changed: 35 additions & 42 deletions

File tree

go.mod

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,25 +27,25 @@ require (
2727
github.com/tendermint/tendermint v0.34.21
2828
go.uber.org/multierr v1.11.0
2929
golang.org/x/net v0.10.0
30-
google.golang.org/grpc v1.52.0
30+
google.golang.org/grpc v1.53.0
3131
google.golang.org/protobuf v1.30.0
3232
)
3333

3434
require (
35-
github.com/DataDog/zstd v1.4.5 // indirect
3635
github.com/benbjohnson/clock v1.3.0 // indirect
3736
github.com/beorn7/perks v1.0.1 // indirect
38-
github.com/btcsuite/btcd v0.22.1 // indirect
37+
github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
3938
github.com/celestiaorg/go-libp2p-messenger v0.2.0 // indirect
4039
github.com/cespare/xxhash v1.1.0 // indirect
4140
github.com/cespare/xxhash/v2 v2.2.0 // indirect
41+
github.com/cometbft/cometbft-db v0.8.0 // indirect
4242
github.com/containerd/cgroups v1.0.4 // indirect
4343
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
4444
github.com/cosmos/go-bip39 v1.0.0 // indirect
4545
github.com/davecgh/go-spew v1.1.1 // indirect
4646
github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
4747
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
48-
github.com/dgraph-io/badger/v2 v2.2007.2 // indirect
48+
github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
4949
github.com/dgraph-io/ristretto v0.1.1 // indirect
5050
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
5151
github.com/docker/go-units v0.5.0 // indirect
@@ -66,7 +66,7 @@ require (
6666
github.com/golang/mock v1.6.0 // indirect
6767
github.com/golang/protobuf v1.5.3 // indirect
6868
github.com/golang/snappy v0.0.4 // indirect
69-
github.com/google/btree v1.0.0 // indirect
69+
github.com/google/btree v1.1.2 // indirect
7070
github.com/google/flatbuffers v1.12.1 // indirect
7171
github.com/google/gopacket v1.1.19 // indirect
7272
github.com/google/pprof v0.0.0-20221203041831-ce31453925ec // indirect
@@ -103,6 +103,7 @@ require (
103103
github.com/libp2p/go-netroute v0.2.1 // indirect
104104
github.com/libp2p/go-reuseport v0.2.0 // indirect
105105
github.com/libp2p/go-yamux/v4 v4.0.0 // indirect
106+
github.com/linxGnu/grocksdb v1.7.16 // indirect
106107
github.com/magiconair/properties v1.8.7 // indirect
107108
github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd // indirect
108109
github.com/mattn/go-isatty v0.0.17 // indirect
@@ -141,7 +142,7 @@ require (
141142
github.com/quic-go/quic-go v0.33.0 // indirect
142143
github.com/quic-go/webtransport-go v0.5.2 // indirect
143144
github.com/raulk/go-watchdog v1.3.0 // indirect
144-
github.com/sasha-s/go-deadlock v0.2.1-0.20190427202633-1595213edefa // indirect
145+
github.com/sasha-s/go-deadlock v0.3.1 // indirect
145146
github.com/spaolacci/murmur3 v1.1.0 // indirect
146147
github.com/spf13/afero v1.9.3 // indirect
147148
github.com/spf13/cast v1.5.0 // indirect
@@ -150,10 +151,8 @@ require (
150151
github.com/stretchr/objx v0.5.0 // indirect
151152
github.com/subosito/gotenv v1.4.2 // indirect
152153
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
153-
github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect
154-
github.com/tendermint/tm-db v0.6.6 // indirect
155154
github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 // indirect
156-
go.etcd.io/bbolt v1.3.6 // indirect
155+
go.etcd.io/bbolt v1.3.7 // indirect
157156
go.opencensus.io v0.24.0 // indirect
158157
go.opentelemetry.io/otel v1.14.0 // indirect
159158
go.opentelemetry.io/otel/metric v0.34.0 // indirect
@@ -162,15 +161,15 @@ require (
162161
go.uber.org/dig v1.15.0 // indirect
163162
go.uber.org/fx v1.18.2 // indirect
164163
go.uber.org/zap v1.24.0 // indirect
165-
golang.org/x/crypto v0.7.0 // indirect
164+
golang.org/x/crypto v0.9.0 // indirect
166165
golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb // indirect
167166
golang.org/x/mod v0.8.0 // indirect
168167
golang.org/x/sync v0.1.0 // indirect
169168
golang.org/x/sys v0.8.0 // indirect
170169
golang.org/x/text v0.9.0 // indirect
171170
golang.org/x/tools v0.6.0 // indirect
172171
gonum.org/v1/gonum v0.11.0 // indirect
173-
google.golang.org/genproto v0.0.0-20221227171554-f9683d7f8bef // indirect
172+
google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
174173
gopkg.in/ini.v1 v1.67.0 // indirect
175174
gopkg.in/yaml.v3 v3.0.1 // indirect
176175
lukechampine.com/blake3 v1.1.7 // indirect
@@ -179,6 +178,7 @@ require (
179178

180179
replace (
181180
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.2-alpha.regen.4
182-
github.com/tendermint/tendermint => github.com/celestiaorg/tendermint v0.34.22-0.20221202214355-3605c597500d
181+
// github.com/tendermint/tendermint => github.com/celestiaorg/tendermint v0.34.22-0.20221202214355-3605c597500d
182+
github.com/tendermint/tendermint => github.com/rollkit/cometbft v0.0.0-20230524013001-2968c8b8b121
183183
google.golang.org/grpc => google.golang.org/grpc v1.33.2
184184
)

0 commit comments

Comments
 (0)