Bring in v0.46.9 changes. #505

SpicyLemon · 2023-02-09T18:43:39Z

Description

This PR applies the v0.46.9 changes to our fork and restores the store changes from v0.46.8 that were reverted due to a bug (that has been fixed now).

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...

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 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)

…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>

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

…osmos#14921) Co-authored-by: mmsqe <mavis@crypto.com> Co-authored-by: Julien Robert <julien@rbrt.fr>

Co-authored-by: yihuang <huang@crypto.com> Co-authored-by: Julien Robert <julien@rbrt.fr> Co-authored-by: Elias Naur <103319121+elias-orijtech@users.noreply.github.com> Co-authored-by: Marko <marbar3778@yahoo.com>

This reverts commit cd9d192.

Release v0.46.9 # Conflicts: # RELEASE_NOTES.md # go.mod # go.sum # server/config/config.go

SpicyLemon · 2023-02-09T19:01:46Z

server/util.go

@@ -457,5 +457,6 @@ func DefaultBaseappOptions(appOpts types.AppOptions) []func(*baseapp.BaseApp) {
 		baseapp.SetSnapshot(snapshotStore, snapshotOptions),
 		baseapp.SetIAVLCacheSize(cast.ToInt(appOpts.Get(FlagIAVLCacheSize))),
 		baseapp.SetIAVLDisableFastNode(cast.ToBool(appOpts.Get(FlagDisableIAVLFastNode))),
+		baseapp.SetIAVLLazyLoading(cast.ToBool(appOpts.Get(FlagIAVLLazyLoading))),


Need to remember to add this in provenance's cmd/provenanced/cmd/root.go's newApp function.

SpicyLemon · 2023-02-09T19:41:48Z

go.mod

-	github.com/99designs/keyring => github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76
+	// use cosmos fork of keyring
+	github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0
+	// dgrijalva/jwt-go is deprecated and doesn't receive security updates.
+	// TODO: remove it: https://github.com/cosmos/cosmos-sdk/issues/13134
+	github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.4.2
 	// Fix upstream GHSA-h395-qcrw-5vmq vulnerability.
 	// TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409
 	github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.7.0
 	github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1

 	github.com/jhump/protoreflect => github.com/jhump/protoreflect v1.9.0
 	// use informal system fork of tendermint
-	github.com/tendermint/tendermint => github.com/informalsystems/tendermint v0.34.25
+	github.com/tendermint/tendermint => github.com/informalsystems/tendermint v0.34.26


We'll want the keyring and tendermint replaces in provenance too. We don't directly use jwt-go so the indirect require gets the right thing.

SpicyLemon · 2023-02-09T20:45:24Z

make test passes.

I also, locally, pulled this into provenance and ran make test over there too. It all passed.

~~I'll run some sims and update this comment when done.~~

The following commands also ran without issue:

$ make test-sim-nondeterminism
$ make test-sim-import-export
$ make test-sim-after-import
$ make test-sim-multi-seed-short

…518) * fix: Fix Evidence CLI query flag parsing (backport cosmos#13458) (cosmos#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) * chore: update IAVL (backport cosmos#14830) (cosmos#14835) Co-authored-by: Marko <marbar3778@yahoo.com> * Mark v0.46.8-pio-2 in the changelog and release notes. * feat: add config `iavl-lazy-loading` to enable lazy loading of iavl store (backport cosmos#14189) (cosmos#14862) Co-authored-by: yihuang <huang@crypto.com> Co-authored-by: marbar3778 <marbar3778@yahoo.com> * chore: bump IAVL to v0.19.5 (backport cosmos#14889) (cosmos#14892) Co-authored-by: Julien Robert <julien@rbrt.fr> * build(deps): bump tendermint to v0.34.25 (cosmos#14903) * build(deps): bump tendermint to v0.34.26 (cosmos#14911) * fix: return named error for write validators (backport cosmos#14919) (cosmos#14921) Co-authored-by: mmsqe <mavis@crypto.com> Co-authored-by: Julien Robert <julien@rbrt.fr> * Bump Tendermint to v0.34.25 (from v0.34.24). (#498) * Fix a few listener proto comments. (#499) * build(deps): bump btcd in v0.46 (cosmos#14846) Co-authored-by: yihuang <huang@crypto.com> Co-authored-by: Julien Robert <julien@rbrt.fr> Co-authored-by: Elias Naur <103319121+elias-orijtech@users.noreply.github.com> Co-authored-by: Marko <marbar3778@yahoo.com> * ci: update release slack channel and algolia api key (backport cosmos#14942) (cosmos#14945) Co-authored-by: Julien Robert <julien@rbrt.fr> * feat: support profiling block replay during abci handshake (backport cosmos#14953) (cosmos#14964) Co-authored-by: yihuang <huang@crypto.com> Co-authored-by: Julien Robert <julien@rbrt.fr> * Revert "Revert cosmos#14349 - cache iterator optimizations (#444)" This reverts commit cd9d192. * Mark v0.46.8-pio-3 in the changelog and release notes. * fix: avoid broadcasting tx through query (backport cosmos#15044) (cosmos#15047) Co-authored-by: Facundo Medica <14063057+facundomedica@users.noreply.github.com> Co-authored-by: Julien Robert <julien@rbrt.fr> * Add CLI commands for sanction Tx gov props (#510) * Fix the changelog. --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> 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> Co-authored-by: mmsqe <mavis@crypto.com> Co-authored-by: Robert Zaremba <robert@zaremba.ch> Co-authored-by: Elias Naur <103319121+elias-orijtech@users.noreply.github.com> Co-authored-by: Facundo Medica <14063057+facundomedica@users.noreply.github.com>

mergify bot and others added 11 commits January 27, 2023 11:04

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>

chore: bump IAVL to v0.19.5 (backport cosmos#14889) (cosmos#14892)

6654184

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

build(deps): bump tendermint to v0.34.25 (cosmos#14903)

d899eaf

build(deps): bump tendermint to v0.34.26 (cosmos#14911)

04de093

fix: return named error for write validators (backport cosmos#14919) (c…

82138c9

…osmos#14921) Co-authored-by: mmsqe <mavis@crypto.com> Co-authored-by: Julien Robert <julien@rbrt.fr>

build(deps): bump btcd in v0.46 (cosmos#14846)

0b64514

Co-authored-by: yihuang <huang@crypto.com> Co-authored-by: Julien Robert <julien@rbrt.fr> Co-authored-by: Elias Naur <103319121+elias-orijtech@users.noreply.github.com> Co-authored-by: Marko <marbar3778@yahoo.com>

Revert "Revert cosmos#14349 - cache iterator optimizations (#444)"

315dd07

This reverts commit cd9d192.

Merge tag 'v0.46.9' into prov/dwedul/to-v0.46.9

394f6ae

Release v0.46.9 # Conflicts: # RELEASE_NOTES.md # go.mod # go.sum # server/config/config.go

SpicyLemon force-pushed the prov/dwedul/to-v0.46.9 branch from 80d2b92 to 394f6ae Compare February 9, 2023 18:58

SpicyLemon commented Feb 9, 2023

View reviewed changes

SpicyLemon mentioned this pull request Feb 16, 2023

Bring in v0.46.10 changes. #517

Merged

19 tasks

iramiller approved these changes Feb 16, 2023

View reviewed changes

SpicyLemon merged commit 3f119f4 into main-pio Feb 16, 2023

nullpointer0x00 approved these changes Feb 16, 2023

View reviewed changes

SpicyLemon mentioned this pull request Feb 16, 2023

Backport: #505 (v0.46.9) #517 (v0.46.10) and #510 (sanction Tx CLI) #518

Merged

19 tasks

SpicyLemon deleted the prov/dwedul/to-v0.46.9 branch February 28, 2023 17:39

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bring in v0.46.9 changes. #505

Bring in v0.46.9 changes. #505

SpicyLemon commented Feb 9, 2023

SpicyLemon Feb 9, 2023

SpicyLemon Feb 9, 2023

SpicyLemon commented Feb 9, 2023 •

edited

Loading

Bring in v0.46.9 changes. #505

Bring in v0.46.9 changes. #505

Conversation

SpicyLemon commented Feb 9, 2023

Description

Author Checklist

Reviewers Checklist

SpicyLemon Feb 9, 2023

Choose a reason for hiding this comment

SpicyLemon Feb 9, 2023

Choose a reason for hiding this comment

SpicyLemon commented Feb 9, 2023 • edited Loading

SpicyLemon commented Feb 9, 2023 •

edited

Loading