chore: Pull changes from upstream 0.34.x release #562
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
(cherry picked from commit a4cc831) Co-authored-by: Sam Kleinman <garen@tychoish.com>
I realized after my last commit that my change made a following line of code a bit redundant. (alternatively my last change was redunadnt to the existing code.) I took this oppertunity to make some minor cleanups and logging changes to the node changes which I hope will make tests a bit more clear. (cherry picked from commit a374f74) Co-authored-by: Sam Kleinman <garen@tychoish.com>
Issues reported in Osmosis, where the message is extremely long. Also, there is absolutely no reason to log the message IMO. If we must, we can make the message log DEBUG. (cherry picked from commit 58a6cff) Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>
This change backports the PostgreSQL indexing sink, addressing part of #6828. Development on the main branch has diverged substantially since the v0.34.x release. It includes package moves, breaking API and protobuf schema changes, and new APIs, all of which together have a large footprint on the mapping between the implementation at tip and the v0.34 release branch. To avoid the need to retrofit all of those improvements, this change works by injecting the new indexing sink into the existing (v0.34) indexing interfaces by delegation. This means the backport does _not_ pull in all the newer APIs for event handling, and thus has minimal impact on existing code written against the v0.34 package structure. This change includes the test for the `psql` implementation, and thus updates some Go module dependencies. Because it does not interact with any other types, however, I did not add any unit tests to other packages in this change. Related changes: * Update module dependencies for psql backport. * Update test data to be type-compatible with the old protobuf types. * Add config settings for the PostgreSQL indexer. * Clean up some linter settings. * Hook up the psql indexer in the node main.
I accidentally omitted this from the backport in #6906. Fixes #7043.
…78) (#7085) * e2e: abci protocol should be consistent across networks (#7078) It seems weird in retrospect that we allow networks to contain applications that use different ABCI protocols. (cherry picked from commit f2a8f5e)
(cherry picked from commit befd669) Co-authored-by: Sam Kleinman <garen@tychoish.com>
…kport #7106) (#7109)
…pull-0.34.x-release-changes
adlerjohn
approved these changes
Oct 16, 2021
was thinking about this earlier, and the best way to do this might be to hard reset merge all upstream commits, then add an additional commit that merges origin master and shows all the conflicts. will try this fix this tmrw and see how much extra work it is. |
|
will try the new approach that will hopefully make it easier to review this friday when we pull the changes again |
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
didn't want to get too far behind upstream, so pulling in changes while we decide on what to do with the bot #558