chore: optimize get last completed upgrade by robert-zaremba · Pull Request #12268 · cosmos/cosmos-sdk

robert-zaremba · 2022-06-15T18:34:02Z

Description

Followup on #12264
Removes sort and finds latest upgrade in place rather than adding additional sorting.

PS: not sure if this should be ported to other branches.

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)

alexanderbez

I don't see this as necessary personally. We're not sorting millions of items. The current approach is clean and clear in intent.

robert-zaremba · 2022-06-16T17:01:07Z

yes, it's tiny optimization. I did it because I looked at your PR once it was merged and was thinking "why do we sort if we only need max"... hence this tiny PR. I think it's cleaner because we do only what we need and the code diff is -40%

alexanderbez · 2022-06-16T17:41:57Z

I mean I don't think it buys us anything personally. Others can chime and approve/merge if they see fit.

tac0turtle · 2022-06-16T20:24:46Z

x/upgrade/keeper/keeper.go

+	var latest upgrade
+	var found bool


Suggested change

var latest upgrade

var found bool

var (

latest upgrade

found bool

)

honestly I prefer simple var rather than var block

Consistency above all else, please group these.

https://github.com/uber-go/guide/blob/master/style.md#group-similar-declarations

I don't see this as a standard in our repo.
If we want to enforce uber-go style guide, then we should add it to the collaboration doc, and (ideally) apply linter rule.

I will update the block.

That is the standard -- hence why I added the comment. Anytime I see these multi-line var statements, I always comment on the PR to group them. Please group them :)

I already did that 4h ago ;) fde59da

tac0turtle

utACK. Should be fine to merge, every performance improvement helps.

ValarDragon · 2022-06-20T03:38:28Z

x/upgrade/keeper/keeper.go

 	for ; iter.Valid(); iter.Next() {
-		name := parseDoneKey(iter.Key())
 		value := int64(sdk.BigEndianToUint64(iter.Value()))
-
-		upgrades = append(upgrades, upgrade{Name: name, BlockHeight: value})
-	}
-
-	// sort upgrades in descending order by block height
-	sort.SliceStable(upgrades, func(i, j int) bool {
-		return upgrades[i].BlockHeight > upgrades[j].BlockHeight
-	})
-
-	if len(upgrades) > 0 {
-		return upgrades[0].Name, upgrades[0].BlockHeight
+		if !found || value >= latest.BlockHeight {


Lets add a comment here that were searching for any upgrade that was past the current blockheight.

I've renamed value -> upgradeHeight so I think now the code speaks for itself.

robert-zaremba · 2022-06-29T09:44:17Z

Ping, shall we merge it?

julienrbrt

lgtm!

robert-zaremba · 2022-06-30T12:38:21Z

why the automerge is not triggered?

julienrbrt · 2022-06-30T12:40:34Z

why the automerge is not triggered?

Because I am not code owner on v0.45.x

alexanderbez · 2022-06-30T14:22:16Z

why the automerge is not triggered?

automerge isn't configured against release branches and @aaronc has to approve, as I am not :)

* feat: improve GetLastCompletedUpgrade * rename * use var block

* Update tag.yml * fix: update index of crisis invariant check logs (backport cosmos#12208) (cosmos#12210) * fix: update index of crisis invariant check logs (cosmos#12208) ## Description the info log messages describing invariant checks use the index to state progress (eg. `asserting crisis invariants inv=0/15`). this simple change makes them 1-indexed (eg. `asserting crisis invariants inv=1/15`). example before: <img width="374" alt="Screen Shot 2022-06-09 at 12 06 58 PM" src="https://user-images.githubusercontent.com/14897503/172925006-8810706c-0948-4e36-85b8-22813ccc9311.png"> Closes: #XXXX --- ### 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... - [x] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [x] added `!` to the type prefix if API or client breaking change - N/A - [x] targeted the correct branch (see [PR Targeting](https://github.com/cosmos/cosmos-sdk/blob/main/CONTRIBUTING.md#pr-targeting)) - [x] provided a link to the relevant issue or specification - N/A - [x] followed the guidelines for [building modules](https://github.com/cosmos/cosmos-sdk/blob/main/docs/building-modules) - N/A - [x] included the necessary unit and integration [tests](https://github.com/cosmos/cosmos-sdk/blob/main/CONTRIBUTING.md#testing) - N/A - [x] added a changelog entry to `CHANGELOG.md` - [x] included comments for [documenting Go code](https://blog.golang.org/godoc) - N/A - [x] updated the relevant documentation or specification - N/A - [x] reviewed "Files changed" and left comments if necessary - N/A - [x] 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 907df32) # Conflicts: # CHANGELOG.md * fix conflict Co-authored-by: Robert Pirtle <Astropirtle@gmail.com> Co-authored-by: Julien Robert <julien@rbrt.fr> * fix: Refactor GetLastCompletedUpgrade [v0.45.x] (cosmos#12264) * fix: defaultGenTxGas to 10 times (cosmos#12314) * fix: edit validator bug from cli (cosmos#12317) * chore: update release notes (cosmos#12377) * feat: add query.GenericFilteredPaginated (backport cosmos#12253) (cosmos#12371) * fix: update x/mint parameter validation (backport cosmos#12384) (cosmos#12396) * chore: optimize get last completed upgrade (cosmos#12268) * feat: improve GetLastCompletedUpgrade * rename * use var block * fix: Simulation is not deterministic due to GenTx (backport cosmos#12374) (cosmos#12437) * fix: use go install instead of go get in makefile (cosmos#12435) * chore: fumpt sdk v45 series cosmos#12442 * feat: Move AppModule.BeginBlock and AppModule.EndBlock to extension interfaces (backport cosmos#12603) (cosmos#12638) * feat: Move AppModule.BeginBlock and AppModule.EndBlock to extension interfaces (cosmos#12603) ## Description Most modules right now have a no-op for AppModule.BeginBlock and AppModule.EndBlock. We should move these methods off the AppModule interface so we have less deadcode, and instead move them to extension interfaces. 1. I added `BeginBlockAppModule` and `EndBlockAppModule` interface. 2. Remove the dead-code from modules that do no implement them 3. Add type casting in the the module code to use the new interface Closes: cosmos#12462 --- ### 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 b65f3fe) # Conflicts: # CHANGELOG.md # x/authz/module/module.go # x/group/module/module.go # x/nft/module/module.go # x/params/module.go # x/slashing/module.go # x/upgrade/module.go * remove conflicts * remove conflicts * remove unused modules Co-authored-by: Sishir Giri <sishirg27@gmail.com> Co-authored-by: marbar3778 <marbar3778@yahoo.com> * feat: add message index event attribute to authz message execution (backport cosmos#12668) (cosmos#12673) * chore(store): upgrade iavl to v0.19.0 (backport cosmos#12626) (cosmos#12697) * feat: Add `GetParamSetIfExists` to prevent panic on breaking param changes (cosmos#12724) * feat: Add convenience method for constructing key to access account's balance for a given denom (backport cosmos#12674) (cosmos#12745) * feat: Add convenience method for constructing key to access account's balance for a given denom (cosmos#12674) This PR adds a convenience method for constructing the key necessary to query for the account's balance of a given denom. I ran into this issue since we are using ABCI query now to perform balance requests because we are also requesting merkle proofs for the returned balance [here](https://github.com/celestiaorg/celestia-node/pull/911/files#diff-0ee31f5a7bd88e9f758e6bebdf3ee36365519e55a451098d9638c39afe5eac42R144). It would be nice to have a definitive convenience method for constructing the key. [Ref.](github.com/celestiaorg/celestia-node/pull/911) (cherry picked from commit a1777a8) # Conflicts: # CHANGELOG.md # x/bank/legacy/v043/store.go # x/bank/types/keys.go * Update CHANGELOG.md * fix conflict Co-authored-by: rene <41963722+renaynay@users.noreply.github.com> Co-authored-by: Marko <marbar3778@yahoo.com> * chore: bump tm in 0.45.x (cosmos#12784) * bump tendermint version * add changelog entry * replace on jhump * updates * updates * updates Co-authored-by: Aleksandr Bezobchuk <aleks.bezobchuk@gmail.com> * chore: 0.45.7 changelog prep (cosmos#12821) * prepare for release * modify release notes * chore: migrate from registry to delegation keeper Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Robert Pirtle <Astropirtle@gmail.com> Co-authored-by: Julien Robert <julien@rbrt.fr> Co-authored-by: HaeSung <hea9549.github@gmail.com> Co-authored-by: likhita-809 <78951027+likhita-809@users.noreply.github.com> Co-authored-by: Robert Zaremba <robert@zaremba.ch> Co-authored-by: Adu <foriteration@gmail.com> Co-authored-by: Jacob Gadikian <jacobgadikian@gmail.com> Co-authored-by: Sishir Giri <sishirg27@gmail.com> Co-authored-by: marbar3778 <marbar3778@yahoo.com> Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com> Co-authored-by: rene <41963722+renaynay@users.noreply.github.com> Co-authored-by: Aleksandr Bezobchuk <aleks.bezobchuk@gmail.com>

* feat: improve GetLastCompletedUpgrade * rename * use var block

feat: improve GetLastCompletedUpgrade

4bd5555

robert-zaremba requested review from a team and alexanderbez June 15, 2022 18:34

robert-zaremba changed the base branch from main to release/v0.45.x June 15, 2022 19:07

robert-zaremba requested a review from aaronc as a code owner June 15, 2022 19:07

robert-zaremba removed C:x/staking C:CLI labels Jun 15, 2022

robert-zaremba added gas and removed Type: CI labels Jun 15, 2022

alexanderbez reviewed Jun 16, 2022

View reviewed changes

robert-zaremba changed the title ~~Robert/get last completed upgrade~~ chore: optimize get last completed upgrade Jun 16, 2022

tac0turtle reviewed Jun 16, 2022

View reviewed changes

tac0turtle approved these changes Jun 16, 2022

View reviewed changes

ValarDragon reviewed Jun 20, 2022

View reviewed changes

rename

73156d1

github-actions bot added C:x/upgrade and removed C:x/gov labels Jun 23, 2022

robert-zaremba added the A:automerge label Jun 23, 2022

robert-zaremba requested a review from ValarDragon June 23, 2022 22:38

use var block

fde59da

robert-zaremba requested a review from alexanderbez June 24, 2022 16:27

julienrbrt approved these changes Jun 30, 2022

View reviewed changes

tac0turtle approved these changes Jul 3, 2022

View reviewed changes

tac0turtle merged commit a99988f into release/v0.45.x Jul 3, 2022

tac0turtle deleted the robert/GetLastCompletedUpgrade branch July 3, 2022 07:58

randy75828 pushed a commit to Switcheo/cosmos-sdk that referenced this pull request Aug 10, 2022

chore: optimize get last completed upgrade (cosmos#12268)

2e28d4d

* feat: improve GetLastCompletedUpgrade * rename * use var block

faddat mentioned this pull request Dec 11, 2023

chore: update to v0.45.16 cudoventures/cosmos-sdk#16

Draft

19 tasks

JeancarloBarrios pushed a commit to agoric-labs/cosmos-sdk that referenced this pull request Sep 28, 2024

chore: optimize get last completed upgrade (cosmos#12268)

d1e0f0a

* feat: improve GetLastCompletedUpgrade * rename * use var block

Conversation

robert-zaremba commented Jun 15, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Author Checklist

Reviewers Checklist

Uh oh!

alexanderbez left a comment

Choose a reason for hiding this comment

Uh oh!

robert-zaremba commented Jun 16, 2022

Uh oh!

alexanderbez commented Jun 16, 2022

Uh oh!

tac0turtle Jun 16, 2022

Choose a reason for hiding this comment

Uh oh!

robert-zaremba Jun 23, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

alexanderbez Jun 24, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

robert-zaremba Jun 24, 2022

Choose a reason for hiding this comment

Uh oh!

alexanderbez Jun 24, 2022

Choose a reason for hiding this comment

Uh oh!

robert-zaremba Jun 24, 2022

Choose a reason for hiding this comment

Uh oh!

tac0turtle left a comment

Choose a reason for hiding this comment

Uh oh!

ValarDragon Jun 20, 2022

Choose a reason for hiding this comment

Uh oh!

robert-zaremba Jun 23, 2022

Choose a reason for hiding this comment

Uh oh!

robert-zaremba commented Jun 29, 2022

Uh oh!

julienrbrt left a comment

Choose a reason for hiding this comment

Uh oh!

robert-zaremba commented Jun 30, 2022

Uh oh!

julienrbrt commented Jun 30, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

alexanderbez commented Jun 30, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

robert-zaremba commented Jun 15, 2022 •

edited

Loading

robert-zaremba Jun 23, 2022 •

edited

Loading

alexanderbez Jun 24, 2022 •

edited

Loading

julienrbrt commented Jun 30, 2022 •

edited

Loading