Replace `tendermint` with `cometbft` by Ferret-san · Pull Request #793 · evstack/ev-node

Ferret-san · 2023-03-22T15:45:31Z

use commetbft types in rollkit in order to comply with cosmos-sdk 0.47.0 by replacing tendermint with cometbft, and then replacing cometbft with the rollkit fork of tendermint

codecov-commenter · 2023-03-23T09:29:45Z

Codecov Report

Patch coverage: 54.08% and project coverage change: -0.25 ⚠️

Comparison is base (a836166) 55.60% compared to head (48184e3) 55.36%.

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #793      +/-   ##
==========================================
- Coverage   55.60%   55.36%   -0.25%     
==========================================
  Files          63       63              
  Lines        6800     6808       +8     
==========================================
- Hits         3781     3769      -12     
- Misses       2607     2633      +26     
+ Partials      412      406       -6

Impacted Files	Coverage Δ
conv/crypto.go	`76.92% <ø> (ø)`
da/test/da_test_helpers.go	`100.00% <ø> (+21.81%)`	⬆️
libs/namespace/random_blob.go	`0.00% <ø> (ø)`
libs/namespace/random_namespace.go	`0.00% <ø> (ø)`
libs/shares/split_compact_shares.go	`66.66% <ø> (ø)`
libs/shares/utils.go	`73.91% <ø> (ø)`
mempool/cache.go	`49.12% <ø> (ø)`
mempool/clist/clist.go	`63.52% <ø> (ø)`
mempool/mempool.go	`0.00% <ø> (ø)`
mempool/v1/mempool_test_helpers.go	`87.17% <ø> (ø)`
... and 34 more

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

tzdybal

Few things:

Consider re-importing latest version of mempool from cometbft (as separate, follow-up PR).
tm prefix for imports should be changed - maybe comet would do the trick? cometbytes? cometmath? or cb - cbbytes, cbmath, cbquery`, etc.
Do not use string([]byte("string")). Even in tests.

Ferret-san · 2023-04-08T16:42:28Z

Few things:

Consider re-importing latest version of mempool from cometbft (as separate, follow-up PR).

tm prefix for imports should be changed - maybe comet would do the trick? cometbytes? cometmath? or cb - cbbytes, cbmath, cbquery`, etc.

Do not use string([]byte("string")). Even in tests.

Could you elaborate on what you mean by re-importing the latest version of mempool as a follow up PR?
On it
On it

Wondertan · 2023-04-08T17:09:00Z

I wonder if this can be a quick "dependency hell" fix as long as the app doesn't migrate to CometBFT.
We should try depending on celestia-node after this PR, to see if it works.
If works, it would make Rollkit being able to migrate to RPC/API much earlier and even use BlobModule right after it's done.

cc @nashqueue

Ferret-san · 2023-04-08T17:24:03Z

CometBFT is needed because of ABCI though

Wondertan · 2023-04-08T18:27:54Z

Yep, my point is that it can also bring additional benefit

nashqueue · 2023-04-10T13:25:08Z

I wonder if this can be a quick "dependency hell" fix as long as the app doesn't migrate to CometBFT.

Core is already on comet bft celestiaorg/celestia-core#980

Wondertan · 2023-04-10T13:49:52Z

Core is already on comet bft celestiaorg/celestia-core#980

It just pulls the changes; they didn't rename the module here. Node imports it as tendermint, not comet. And if you migrate to comet, then there will be no conflicts between comet and tendermint in Rollkits dependency graph, which essentially fixes "dependency hell"

Ferret-san · 2023-04-20T08:09:36Z

Few things:

Consider re-importing latest version of mempool from cometbft (as separate, follow-up PR).

tm prefix for imports should be changed - maybe comet would do the trick? cometbytes? cometmath? or cb - cbbytes, cbmath, cbquery`, etc.

Do not use string([]byte("string")). Even in tests.

Could you please elaborate further?
Done ✔️
Done ✔️

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>

… fully addressed

Adapting mempool for cometbft release

tzdybal

LGTM

tendermint -> cometbft 👉🥺👈

6563f8e

Ferret-san requested review from gupadhyaya, nashqueue and tzdybal as code owners March 22, 2023 15:45

Ferret-san added 2 commits March 22, 2023 17:01

update modules

f16a4c1

Update mod replace

6e788c1

Merge branch 'main' into diego/cometbft

4ab9757

Ferret-san self-assigned this Mar 23, 2023

Ferret-san added 3 commits March 23, 2023 11:57

more changes 🔧

623abd1

updates

fcd6685

bump btcsuite deps

9cd5034

tzdybal suggested changes Apr 4, 2023

View reviewed changes

Ferret-san added 3 commits April 20, 2023 16:47

remove unnecessary string([]byte)s

8fd15d9

switch tm prefix for cm

9207829

fix broken links

2434650

Ferret-san requested a review from tzdybal April 20, 2023 08:08

Ferret-san added 4 commits April 20, 2023 17:21

Merge branch 'main' into diego/cometbft

2db8f6e

Update node.go

9f2bf05

🔧

482f357

fix json

5a074df

gupadhyaya mentioned this pull request May 23, 2023

update tendermint dependency to cometbft 0.34.x w/ fraud proofs #955

Merged

Ferret-san and others added 4 commits June 29, 2023 10:22

Updating from main

e40e5a9

skip golangci-lint for math.rand, until math.rand and crypto.rand are…

791723f

… fully addressed

Merge branch 'diego/cometbft' into diego/cometbft-0.37.1-mempool

25373cc

fix go mod

ca05435

gupadhyaya reviewed Jun 29, 2023

View reviewed changes

Comment thread da/test/da_test.go

gupadhyaya reviewed Jun 29, 2023

View reviewed changes

Comment thread state/executor.go Outdated

Ferret-san and others added 6 commits July 7, 2023 13:04

Update executor.go

1a36c2c

Merge pull request #991 from rollkit/diego/cometbft-0.37.1-mempool

6b452f2

Adapting mempool for cometbft release

Merge branch 'main' into diego/cometbft

d811d37

updating dependencies on changes from main

3850f87

disable golangci-lint check for rand read

b6eb326

update to fixed rollkit cometbft version instead of commit hash

c1993c9

tzdybal reviewed Jul 13, 2023

View reviewed changes

Comment thread conv/abci/block.go Outdated

Comment thread state/txindex/kv/kv_test.go Outdated

Comment thread store/store_test.go

remove ToProto and string()

f8be03f

tzdybal previously approved these changes Jul 14, 2023

View reviewed changes

tzdybal dismissed their stale review via b62bc2e July 14, 2023 19:30

tzdybal enabled auto-merge July 14, 2023 19:31

tzdybal previously approved these changes Jul 14, 2023

View reviewed changes

nashqueue requested a review from gupadhyaya July 16, 2023 14:54

Ganesha Upadhyaya added 2 commits July 19, 2023 10:59

Merge remote-tracking branch 'origin/main' into diego/cometbft

e4f271d

fix cmproto link

48184e3

gupadhyaya dismissed tzdybal’s stale review via 48184e3 July 19, 2023 16:02

gupadhyaya force-pushed the diego/cometbft branch from 7f3c210 to 48184e3 Compare July 19, 2023 16:02

gupadhyaya requested a review from tzdybal July 19, 2023 16:02

tzdybal approved these changes Jul 19, 2023

View reviewed changes

gupadhyaya approved these changes Jul 19, 2023

View reviewed changes

tzdybal added this pull request to the merge queue Jul 19, 2023

Merged via the queue into main with commit c7fdc9e Jul 19, 2023

tzdybal deleted the diego/cometbft branch July 19, 2023 21:52

Conversation

Ferret-san commented Mar 22, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov-commenter commented Mar 23, 2023 • edited by codecov Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

tzdybal left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Ferret-san commented Apr 8, 2023

Uh oh!

Wondertan commented Apr 8, 2023

Uh oh!

Ferret-san commented Apr 8, 2023

Uh oh!

Wondertan commented Apr 8, 2023

Uh oh!

nashqueue commented Apr 10, 2023

Uh oh!

Wondertan commented Apr 10, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Ferret-san commented Apr 20, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

tzdybal left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Ferret-san commented Mar 22, 2023 •

edited

Loading

codecov-commenter commented Mar 23, 2023 •

edited by codecov Bot

Loading

Wondertan commented Apr 10, 2023 •

edited

Loading