chore: bump upstream v0.46.13 #324

evan-forbes · 2023-06-09T02:00:08Z

Description

pulls the latest from upstream, which include bareberry patch. also bumps core to v0.34.28

closes #310

ready for review, but blocked by celestiaorg/celestia-core#1021

…s#13996) * chore: add group and gov/v1 in swagger (cosmos#13984) Co-authored-by: Marko <marbar3778@yahoo.com> (cherry picked from commit cfa224c) # Conflicts: # client/docs/config.json # client/docs/swagger-ui/swagger.yaml * updates Co-authored-by: Julien Robert <julien@rbrt.fr>

…os#14053)

…cosmos#13651) (cosmos#14082)

…4071) (cosmos#14091) * fix(group)!: Don't re-tally proposals after VP end (cosmos#14071) (cherry picked from commit 4ebe3aa) # Conflicts: # CHANGELOG.md * fix changelog and test Co-authored-by: Amaury <1293565+amaurym@users.noreply.github.com> Co-authored-by: Julien Robert <julien@rbrt.fr>

…mos#14101) * fix: do not shadow clientCtx in start.go (cosmos#14086) (cherry picked from commit f96072d) # Conflicts: # server/start.go * updates Co-authored-by: Julien Robert <julien@rbrt.fr>

(cherry picked from commit 9f46665) Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

@mbreithecker

* fix: remove duplicate ante events (cosmos#13983) ## Description After enabling the post-handler on our chain, we realised something odd with our transaction events. The ordering was `[ANTE, MSGS, ANTE, POST]`. After doing some digging, we realised that the context used inside the post-handler still contains the events from the ante-handler. This should be backported to v0.46.x and v0.47.x 😄 Happy to make it compatible with cosmos#13940 when that gets merged! cc @mbreithecker --- ### Author Checklist *All items are required. Please add a note to the item if the item is not applicable and please add links to any relevant follow up issues.* I have... - [ ] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] added `!` to the type prefix if API or client breaking change - [ ] targeted the correct branch (see [PR Targeting](https://github.com/cosmos/cosmos-sdk/blob/main/CONTRIBUTING.md#pr-targeting)) - [ ] provided a link to the relevant issue or specification - [ ] followed the guidelines for [building modules](https://github.com/cosmos/cosmos-sdk/blob/main/docs/building-modules) - [ ] included the necessary unit and integration [tests](https://github.com/cosmos/cosmos-sdk/blob/main/CONTRIBUTING.md#testing) - [ ] added a changelog entry to `CHANGELOG.md` - [ ] included comments for [documenting Go code](https://blog.golang.org/godoc) - [ ] updated the relevant documentation or specification - [ ] reviewed "Files changed" and left comments if necessary - [ ] confirmed all CI checks have passed ### Reviewers Checklist *All items are required. Please add a note if the item is not applicable and please add your handle next to the items reviewed if you only reviewed selected items.* I have... - [ ] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] confirmed `!` in the type prefix if API or client breaking change - [ ] confirmed all author checklist items have been addressed - [ ] reviewed state machine logic - [ ] reviewed API design and naming - [ ] reviewed documentation is accurate - [ ] reviewed tests and test coverage - [ ] manually tested (if applicable) (cherry picked from commit 25449b5) # Conflicts: # CHANGELOG.md * fix changelog Co-authored-by: John Letey <john@kyve.network> Co-authored-by: Julien Robert <julien@rbrt.fr>

…osmos#14169) * feat: support alternative query multistore (cosmos#13529) * support customize query multistore * Update CHANGELOG.md * fix test * Update baseapp/abci.go Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com> * Update baseapp/baseapp.go Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com> * Update baseapp/options.go Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: Marko <marbar3778@yahoo.com> Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com> (cherry picked from commit 15accd7) # Conflicts: # CHANGELOG.md # baseapp/baseapp.go # baseapp/options.go * fix conflicts Co-authored-by: yihuang <huang@crypto.com>

…) (cosmos#14138) * fix: state listener observe writes at wrong time (cosmos#13516) * fix: state listener observe writes at wrong time Closes: cosmos#13457 Currently state listener is notified when the cache store write, which happens in commit event only, which breaks the current design. The solution (as discussed in the issue) is to listen state writes on rootmulti store only. It also changes the file streamer to output single data file for the writes in the whole block, since we can't distinguish writes from different stage of abci events. It adds new config items for file streamer: - streamers.file.output-metadata - streamers.file.stop-node-on-error - streamers.file.fsync * synchronous abci call, and format doc * fix comment * update file streamer readme and fix typos * typo * fix: state listener observe writes at wrong time Closes: cosmos#13457 Currently state listener is notified when the cache store write, which happens in commit event only, which breaks the current design. The solution (as discussed in the issue) is to listen state writes on rootmulti store only. It also changes the file streamer to output single data file for the writes in the whole block, since we can't distinguish writes from different stage of abci events. It adds new config items for file streamer: - streamers.file.output-metadata - streamers.file.stop-node-on-error - streamers.file.fsync synchronous abci call, and format doc fix comment update file streamer readme and fix typos typo * improve UX of file streamer, make it immediately usable after enabled - set default value to write_dir. - make write_dir based on home directory by default. - auto-create the directory if not exists. * get homePage from opts Co-authored-by: Marko <marbar3778@yahoo.com> (cherry picked from commit 1f91ee2) # Conflicts: # CHANGELOG.md # api/cosmos/base/store/v1beta1/listening.pulsar.go # baseapp/streaming.go # docs/architecture/adr-038-state-listening.md # server/config/toml.go # simapp/app_v2.go # store/cachemulti/store.go # store/iavl/store.go # store/mem/store.go # store/streaming/constructor.go # store/streaming/file/service.go # store/streaming/file/service_test.go # store/types/listening.pb.go # store/types/store.go * `make proto-gen`, update changelog, delete uncessary files * fix conflicts * fix conflicts * revert api breaking change * fix build * fix unit test Co-authored-by: yihuang <huang@crypto.com> Co-authored-by: Julien Robert <julien@rbrt.fr> Co-authored-by: Marko <marbar3778@yahoo.com>

cosmos#14178) * refactor: provide a helper for baseapp options (cosmos#14175) * provide a helper for baseapp options * rename * changelog entry * fix spelling (cherry picked from commit 1b6192f) # Conflicts: # CHANGELOG.md # server/mock/app_test.go # simapp/simd/cmd/root.go * conflicts * lint Co-authored-by: Marko <marbar3778@yahoo.com>

Co-authored-by: Aaron Craelius <aaron@regen.network> Co-authored-by: Julien Robert <julien@rbrt.fr>

…) (cosmos#14236)

…osmos#14241) Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com> Co-authored-by: Julien Robert <julien@rbrt.fr>

Co-authored-by: Amaury <1293565+amaurym@users.noreply.github.com> Co-authored-by: Julien Robert <julien@rbrt.fr>

…mos#14305) (cosmos#14309) Co-authored-by: Daniel Wedul <github@wedul.com> Co-authored-by: Julien Robert <julien@rbrt.fr>

…osmos#14347) (cosmos#14400)

…14422)

…osmos#14459) Co-authored-by: yihuang <huang@crypto.com>

Co-authored-by: yihuang <huang@crypto.com> Co-authored-by: Julien Robert <julien@rbrt.fr> Co-authored-by: Matt Kocubinski <mkocubinski@gmail.com>

…4526) (cosmos#14528) Co-authored-by: Julien Robert <julien@rbrt.fr>

…) (cosmos#14638) Co-authored-by: Julien Robert <julien@rbrt.fr>

Co-authored-by: Julien Robert <julien@rbrt.fr>

…mos#14799) Co-authored-by: Likhita Polavarapu <78951027+likhita-809@users.noreply.github.com> Co-authored-by: HuangYi <huang@crypto.com> Co-authored-by: Julien Robert <julien@rbrt.fr>

Co-authored-by: Marko <marbar3778@yahoo.com>

…tore (backport cosmos#14189) (cosmos#14862) Co-authored-by: yihuang <huang@crypto.com> Co-authored-by: marbar3778 <marbar3778@yahoo.com>

…p-upstream-v0.46.13

codecov-commenter · 2023-06-09T02:13:15Z

Codecov Report

Merging #324 (643c2b8) into release/v0.46.x-celestia (390a17f) will decrease coverage by 0.03%.
The diff coverage is 50.65%.

@@                     Coverage Diff                      @@
##           release/v0.46.x-celestia     #324      +/-   ##
============================================================
- Coverage                     65.54%   65.52%   -0.03%     
============================================================
  Files                           666      666              
  Lines                         71016    71263     +247     
============================================================
+ Hits                          46550    46693     +143     
- Misses                        21884    21976      +92     
- Partials                       2582     2594      +12

Impacted Files	Coverage Δ
baseapp/msg_service_router.go	`62.50% <0.00%> (-9.87%)`	⬇️
simapp/state.go	`0.00% <0.00%> (ø)`
types/simulation/types.go	`0.00% <ø> (ø)`
x/auth/vesting/types/msgs.go	`0.00% <0.00%> (ø)`
x/group/client/cli/query.go	`0.00% <0.00%> (ø)`
x/group/keeper/grpc_query.go	`60.76% <0.00%> (-4.53%)`	⬇️
baseapp/baseapp.go	`77.63% <27.27%> (-0.99%)`	⬇️
snapshots/manager.go	`45.42% <42.37%> (-2.16%)`	⬇️
x/group/keeper/keeper.go	`56.34% <60.00%> (+1.00%)`	⬆️
x/group/keeper/msg_server.go	`68.63% <62.50%> (-0.07%)`	⬇️
... and 10 more

... and 1 file with indirect coverage changes

client/snapshot/load.go

+	"fmt"
+	"io"
+	"os"
+	"reflect"


client/snapshot/load.go

+			go func() {
+				defer close(quitChan)
+
+				savedSnapshot, err := snapshotStore.Save(snapshot.Height, snapshot.Format, chunks)
+				if err != nil {
+					cmd.Println("failed to save snapshot", err)
+					return
+				}
+				quitChan <- savedSnapshot
+			}()


evan-forbes · 2023-06-09T03:10:40Z

called make proto-check-deps which downloaded the most recent stuff, which caused the proto breakage

evan-forbes · 2023-06-09T12:32:01Z

hmm apparently we can't sync mocha-2 using this because of

7:29AM ERR Rejected proposal block: err="failed to load state at height 0; no commit info found (latest height: 0): invalid request" proposer="�6�\v��0®����e\x14\x02��E�" reason="failure to load query context"

looking into this now, but we can still merge this PR as is and patch whatever is needed after

cmwaters · 2023-06-12T08:56:51Z

proto/tendermint/types/types.proto

-  uint64                 original_square_size     = 5;
-  bytes                  hash                     = 6;


We still have square size and hash in our fork. I'm not sure if this is used though

👀 whoops might have forgot to update the link in the makefile. same tho I'm not sure we use it

cmwaters · 2023-06-12T08:57:25Z

proto/tendermint/types/types.proto

-// https://github.com/celestiaorg/celestia-specs/blob/master/specs/data_structures.md#availabledataheader
-// Note that currently we list row and column roots in separate fields
-// (different from the spec).
-message DataAvailabilityHeader {


We don't need this because we import it directly from core right?

we just don't need this period for the sdk. I also believe its in the app now

cmwaters · 2023-06-12T09:04:26Z

hmm apparently we can't sync mocha-2 using this because of
7:29AM ERR Rejected proposal block: err="failed to load state at height 0; no commit info found (latest height: 0): invalid request" proposer="�6�\v��0®����e\x14\x02��E�" reason="failure to load query context"
looking into this now, but we can still merge this PR as is and patch whatever is needed after

We haven't added prepareProposalState and processProposalState yet right?

I assume this comes from running process proposal on the first block. In our CometBFT fork we run ProcessProposal in blocksync however mainline CometBFT doesn't actually do this.

I agree that we should just merge this change as it is now and then follow up in a separate PR (or maybe #326) addresses it

evan-forbes · 2023-06-12T13:14:49Z

We haven't added prepareProposalState and processProposalState yet right?
I assume this comes from running process proposal on the first block. In our CometBFT fork we run ProcessProposal in blocksync however mainline CometBFT doesn't actually do this.

#326 addresses a portion of this by replicating what is done in upstream v0.47.x, which is branching the state directly from the commit multi store to create a context which is passed to the new ABCI methods. However, this still doesn't fix being able to access that state at height 1, so we still have the same issues as we had before 🙁 celestiaorg/celestia-app#1899

I'm still unsure of how upstream handles this with the baseapp refactor, since as far as state access goes for the Prepare/Process #326 is doing the exact same thing as upstream

we will likely have to change something else as the current fix is pretty hacky
https://github.com/celestiaorg/celestia-app/blob/958ba9bb65bc7540e1d62d56ffba20d2dce8ec6b/app/square_size.go#L17-L20

cmwaters · 2023-06-12T14:05:33Z

But it looks like its trying to access the state at height 0.

Also as I said, in blocksync we are calling ProcessProposal but in CometBFT they don't call it (i.e. it might not be SDK but at the Tendermint level)

evan-forbes · 2023-06-12T14:20:20Z

But it looks like its trying to access the state at height 0.
Also as I said, in blocksync we are calling ProcessProposal but in CometBFT they don't call it (i.e. it might not be SDK but at the Tendermint level)

yeah I remember that, the

7:29AM ERR Rejected proposal block: err="failed to load state at height 0;

part was caused by us not passing the correct height (1) during ProcessProposal, which is fixed by #326 since we're passing the header instead of relying on the header included in other baseapp state.

However, we're still having issues in Prepare/ProcessProposal for accessing state at height 1, which upstream has solved.

julienrbrt and others added 30 commits November 22, 2022 15:54

chore: bump tendermint to 0.34.24 (cosmos#13972)

8339276

fix(baseapp): fix snapshot interval bug (backport cosmos#14049) (cosm…

7bb7fa9

…os#14053)

refactor: use viper unmarshal in config.GetConfig function (backport …

c1f4ca1

…cosmos#13651) (cosmos#14082)

fix: do not shadow clientCtx in start.go (backport cosmos#14086) (cos…

85d6f66

…mos#14101) * fix: do not shadow clientCtx in start.go (cosmos#14086) (cherry picked from commit f96072d) # Conflicts: # server/start.go * updates Co-authored-by: Julien Robert <julien@rbrt.fr>

chore: Test for Server Config Read cosmos#14125 (cosmos#14127)

6e5e302

(cherry picked from commit 9f46665) Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

feat: add --grpc client option (backport cosmos#14051) (cosmos#14192)

463f4e4

Co-authored-by: Aaron Craelius <aaron@regen.network> Co-authored-by: Julien Robert <julien@rbrt.fr>

refactor: cleanup store/streaming/constructor.go (backport cosmos#14044…

eb6d0ef

…) (cosmos#14236)

chore: audit store/streaming/file/service.go (backport cosmos#14234) (c…

fcfa361

…osmos#14241) Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com> Co-authored-by: Julien Robert <julien@rbrt.fr>

fix: fix grpc flag conflict (backport cosmos#14244) (cosmos#14248)

79ac73d

chore: prepare 0.46.7 release (cosmos#14103)

4153b12

fix(gov): Fix v3 votes migrations (backport cosmos#14214) (cosmos#14277)

f71df80

Co-authored-by: Amaury <1293565+amaurym@users.noreply.github.com> Co-authored-by: Julien Robert <julien@rbrt.fr>

fix(store): Fix the TestFileStreamingService unit test. (backport cos…

9122aad

…mos#14305) (cosmos#14309) Co-authored-by: Daniel Wedul <github@wedul.com> Co-authored-by: Julien Robert <julien@rbrt.fr>

feat(gov): support v1.Proposal in v1beta1.Proposal.Content (backport c…

e641907

…osmos#14347) (cosmos#14400)

feat!: remove x/gov/migrations/v046.Migrate_V046_6_To_V046_7 (cosmos#…

4ed7888

…14422)

fix: return anteEvents when postHandler fail (backport cosmos#14448) (c…

e7dd5e0

…osmos#14459) Co-authored-by: yihuang <huang@crypto.com>

chore: backport pr 13881 (cosmos#14349)

93fd49d

Co-authored-by: yihuang <huang@crypto.com> Co-authored-by: Julien Robert <julien@rbrt.fr> Co-authored-by: Matt Kocubinski <mkocubinski@gmail.com>

fix: wrong address set in EventUpdateGroupPolicy (backport cosmos#1…

36784a8

…4526) (cosmos#14528) Co-authored-by: Julien Robert <julien@rbrt.fr>

build: bump bgentry/speakasy to pseudo version (backport cosmos#14633…

b7a62fe

…) (cosmos#14638) Co-authored-by: Julien Robert <julien@rbrt.fr>

refactor: reduce tendermint deps (backport cosmos#14616) (cosmos#14663)

89e956c

Co-authored-by: Julien Robert <julien@rbrt.fr>

chore: prepare v0.46.8 release (cosmos#14624)

3a051e1

fix: Fix Evidence CLI query flag parsing (backport cosmos#13458) (cos…

c8d250a

…mos#14799) Co-authored-by: Likhita Polavarapu <78951027+likhita-809@users.noreply.github.com> Co-authored-by: HuangYi <huang@crypto.com> Co-authored-by: Julien Robert <julien@rbrt.fr>

fix: nested iterator on cache store (cosmos#14798)

76d47b4

chore: update IAVL (backport cosmos#14830) (cosmos#14835)

5e7dcbc

Co-authored-by: Marko <marbar3778@yahoo.com>

feat: add config iavl-lazy-loading to enable lazy loading of iavl s…

70589eb

…tore (backport cosmos#14189) (cosmos#14862) Co-authored-by: yihuang <huang@crypto.com> Co-authored-by: marbar3778 <marbar3778@yahoo.com>

julienrbrt and others added 4 commits June 8, 2023 18:05

fix: patch barberry (cosmos#16466)

fd90480

Merge commit 'fd90480b0a922611e366552751a9037e309d8410' into evan/bum…

b470cab

…p-upstream-v0.46.13

chore: go mod tidy

1c697f9

chore: bump to new version of core

0b9f494

evan-forbes added the dependencies Pull requests that update a dependency file label Jun 9, 2023

evan-forbes added this to the Mainnet milestone Jun 9, 2023

evan-forbes requested a review from liamsi as a code owner June 9, 2023 02:00

evan-forbes self-assigned this Jun 9, 2023

github-advanced-security bot found potential problems Jun 9, 2023

View reviewed changes

chore: regenerate proto

01790eb

evan-forbes requested review from rootulp, cmwaters and rach-id June 9, 2023 03:09

chore: linter

643c2b8

This was referenced Jun 11, 2023

chore!: prepare process proposal state #326

Merged

chore!: bump sdk v0.46.13 and core v0.34.28 celestiaorg/celestia-app#1903

Closed

cmwaters approved these changes Jun 12, 2023

View reviewed changes

evan-forbes mentioned this pull request Jun 12, 2023

chore!: bump sdk and core celestiaorg/celestia-app#1912

Merged

rootulp approved these changes Jun 13, 2023

View reviewed changes

chore: use official tag

174f691

evan-forbes merged commit 95b3fdc into release/v0.46.x-celestia Jun 13, 2023

evan-forbes deleted the evan/bump-upstream-v0.46.13 branch June 13, 2023 13:24

rootulp mentioned this pull request Jun 14, 2023

Upgrade gogoproto #319

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: bump upstream v0.46.13 #324

chore: bump upstream v0.46.13 #324

evan-forbes commented Jun 9, 2023 •

edited

Loading

codecov-commenter commented Jun 9, 2023 •

edited

Loading

evan-forbes commented Jun 9, 2023

evan-forbes commented Jun 9, 2023 •

edited

Loading

cmwaters Jun 12, 2023

evan-forbes Jun 12, 2023

cmwaters Jun 12, 2023

evan-forbes Jun 12, 2023

cmwaters commented Jun 12, 2023 •

edited

Loading

evan-forbes commented Jun 12, 2023 •

edited

Loading

cmwaters commented Jun 12, 2023 •

edited

Loading

evan-forbes commented Jun 12, 2023

chore: bump upstream v0.46.13 #324

chore: bump upstream v0.46.13 #324

Conversation

evan-forbes commented Jun 9, 2023 • edited Loading

Description

codecov-commenter commented Jun 9, 2023 • edited Loading

Codecov Report

evan-forbes commented Jun 9, 2023

evan-forbes commented Jun 9, 2023 • edited Loading

cmwaters Jun 12, 2023

Choose a reason for hiding this comment

evan-forbes Jun 12, 2023

Choose a reason for hiding this comment

cmwaters Jun 12, 2023

Choose a reason for hiding this comment

evan-forbes Jun 12, 2023

Choose a reason for hiding this comment

cmwaters commented Jun 12, 2023 • edited Loading

evan-forbes commented Jun 12, 2023 • edited Loading

cmwaters commented Jun 12, 2023 • edited Loading

evan-forbes commented Jun 12, 2023

evan-forbes commented Jun 9, 2023 •

edited

Loading

codecov-commenter commented Jun 9, 2023 •

edited

Loading

evan-forbes commented Jun 9, 2023 •

edited

Loading

cmwaters commented Jun 12, 2023 •

edited

Loading

evan-forbes commented Jun 12, 2023 •

edited

Loading

cmwaters commented Jun 12, 2023 •

edited

Loading