feat: merge cosmos-sdk v0.45.16 #306
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ed (cosmos#13896) * fix: return err instead of empty values when pruned height is queried * fix tests * fix more tests * final fixes * add changelog
* feat: add store name in `tracekv`-emitted store traces (cosmos#11646) * feature: Clone and Merge methods on TraceContext * chore: use TraceContext.Merge method in SetTracingContext * feature: add Store name in TraceContext during execution * chore: update rootmulti Store TraceContext on *Store after Merge() * add changelog entry Co-authored-by: Gianguido Sorà <gsora@users.noreply.github.com>
…) (cosmos#14139) * 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/abci.go # baseapp/streaming.go # docs/architecture/adr-038-state-listening.md # server/config/config.go # server/config/toml.go # simapp/app.go # simapp/app_v2.go # store/cachemulti/store.go # store/iavl/store.go # store/mem/store.go # store/rootmulti/store.go # store/streaming/constructor.go # store/streaming/constructor_test.go # store/streaming/file/README.md # 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 GetConfig Co-authored-by: yihuang <huang@crypto.com> Co-authored-by: Julien Robert <julien@rbrt.fr>
…osmos#14242) Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com> Co-authored-by: Julien Robert <julien@rbrt.fr>
…) (cosmos#14341) Co-authored-by: yihuang <huang@crypto.com> Co-authored-by: marbar3778 <marbar3778@yahoo.com> Co-authored-by: Matt Kocubinski <mkocubinski@gmail.com>
…) (cosmos#14639) Co-authored-by: Julien Robert <julien@rbrt.fr>
Co-authored-by: Julien Robert <julien@rbrt.fr>
Co-authored-by: Marko <marbar3778@yahoo.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>
…mos#14906) Co-authored-by: Julien Robert <julien@rbrt.fr>
…mos#14913) Co-authored-by: Julien Robert <julien@rbrt.fr>
…#14942) (cosmos#14946) Co-authored-by: Julien Robert <julien@rbrt.fr>
Co-authored-by: Facundo Medica <facundomedica@gmail.com>
…mos#15048) Co-authored-by: Facundo Medica <14063057+facundomedica@users.noreply.github.com> Co-authored-by: Julien Robert <julien@rbrt.fr>
…osmos#15114) Co-authored-by: khanh-notional <50263489+catShaark@users.noreply.github.com> Co-authored-by: marbar3778 <marbar3778@yahoo.com>
Co-authored-by: Robert Zaremba <robert@zaremba.ch> Co-authored-by: Julien Robert <julien@rbrt.fr>
Release v0.45.16 Manual resolution for the following conflicts: Makefile Updated to our tendermint fork baseapp/abci.go Complex merge - please review contrib/images/simd-env/Dockerfile Accept their changes go.mod Use our tendermint fork go.sum Regenerate with go mod tidy ics23/go/go.mod ics23/go/go.sum Accept their deletion snapshots/manager_test.go store/rootmulti/snapshot_test.go Opaque binary data in tests - use ours.
|
@mhofman please take a look at the merge of |
|
Reviewing nit: The switch to |
michaelfig
approved these changes
Sep 16, 2023
19 tasks
mhofman
reviewed
Sep 19, 2023
There was a problem hiding this comment.
@michaelfig's command indeed showed only the changes from conflict resolution, not sure why GH didn't manage to do the same (my experience is that it can normally show a condensed diff of such merges)
Anyway, I have replicated this merge step by step and arrived at a similar outcome. (I tried to similarly replicate the cometbft 0.34.27 merge but that caused a flurry of merge conflicts I didn't understand and didn't feel like tracking down)
I believe that unlike upstream we're not impacted by the hash changes in snapshots when switching to cometbft because we backported a fix from 0.47 that insulated us from it. See 17f1103
mhofman
approved these changes
Sep 19, 2023
mhofman
reviewed
Sep 19, 2023
CHANGELOG-Agoric.md
Outdated
|
|
||
| # Changelog | ||
|
|
||
| ## [v0.46.16-alpha.agoric.1] - 2023-09-15 |
There was a problem hiding this comment.
Nit: this is assuming we're tagging this branch or the resulting merge commit of this PR. Why not use the ## [Unreleased] convention?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Refs: Agoric/agoric-sdk#8223
Merges cosmos/cosmos-sdk v0.45.16.
See commit for description of merge conflict resolutions. Pay particular attention to
baseapp/abci.go.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...
!to the type prefix if API or client breaking changeCHANGELOG.mdmake lintandmake testReviewers 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...
!in the type prefix if API or client breaking change