feat!: merge cosmos/cosmos-sdk v0.46.16 #347

JimLarson · 2024-01-31T07:28:12Z

Description

Refs: Agoric/agoric-sdk#8224
Refs: Agoric/agoric-sdk#8719

Merge cosmos/cosmos-sdk v0.46.16 into the Agoric branch.

Note that the common ancestor between Cosmos release 0.45.16 (the most recent Cosmos base for the Agoric branch) and Cosmos release 0.46.16 is the point where the 0.45.x release branch forked off of the main trunk. Simply attempting to merge v0.46.16 into Agoric created hundreds of conflicting files, representing the divergence of the two Cosmos releases from their common ancestor. To avoid this, we merged Cosmos releases v0.45.16 and v0.46.16 to create our tag v0.45.16-46.16-merge, which used a strategy to only use the 0.46 version. With the intra-Comsos conflicts resolved, this merge only needed to deal with the conflicts from the Agoric modifications.

For reviewers - obviously the 2K changed files in this PR can't be meaningfully reviewed. The best comparison is a diff-of-diffs of v0.45.16 vs v0.45.16-alpha.agoric.3 versus v0.46.16 vs this branch. Pay particular attention to the snapshot differences.

The previous trial merge of 0.46 may also be of interest: https://github.com/agoric-labs/cosmos-sdk/tree/8224-nohistory

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)

…12170) (cosmos#12178)

…os#12177) (cosmos#12180)

… equal (cosmos#12174) (cosmos#12191)

…osmos#12204)

…) (cosmos#12209) * 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>

…(backport cosmos#12190) (cosmos#12247)

…12275) ## Description `ApproxRoot` return incorrect value for large `sdk.Dec` because maxApproxRootIterations is not big enough, I increase it to 300 --- ### 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... - [x] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [x] confirmed `!` in the type prefix if API or client breaking change - [x] confirmed all author checklist items have been addressed - [x] reviewed state machine logic - [x] reviewed API design and naming - [ ] reviewed documentation is accurate - [ ] reviewed tests and test coverage - [x] manually tested (if applicable) (cherry picked from commit 6a3d10b) Co-authored-by: khanh <50263489+catShaark@users.noreply.github.com>

* fix: GetTxsEvent pagination (cosmos#12261) ## Description Closes: cosmos#11538 Also see thread after cosmos#11538 (comment) --- ### 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 - [ ] added `!` to the type prefix if API or client breaking change - [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 - [ ] 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 c68fa3b) # Conflicts: # api/cosmos/orm/query/v1alpha1/query.pulsar.go * delete file Co-authored-by: Marie Gauthier <marie.gauthier63@gmail.com> Co-authored-by: marbar3778 <marbar3778@yahoo.com>

…osmos#12199) (cosmos#12267)

…osmos#12378)

…smos#12381)

cosmos#12402)

…anager.extensions (cosmos#12031) (cosmos#12458)

* feat: add query telemetry (cosmos#12405) Closes: cosmos#12333 --- ### 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 f70b67f) * Changelog fix Co-authored-by: Robert Zaremba <robert@zaremba.ch>

…mos#12452)

…legacy-proposal` for gov (cosmos#12410) (cosmos#12470)

…#12453) (cosmos#12489)

…ckport cosmos#12448) (cosmos#12483)

* chore: update gov router note (cosmos#12508) ## Description Clarifies the gov router usage in app.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... - [ ] 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 dc1677b) # Conflicts: # simapp/app_legacy.go * conflict fix * remove file Co-authored-by: Robert Zaremba <robert@zaremba.ch>

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

Release v0.45.16 Merging 0.45.16 into 0.46.16 with "ours" strategy to create a revision with common history of both. Will be used to merge 0.46.16 into Agoric branch.

Compare vs 8224-nohistory branch.

client/snapshot/load.go

gibson042 · 2024-02-01T21:13:11Z

My browser is struggling to let me actually approve, so consider this comment a record of intent to do so.

gibson042

Submitting approval before the tab crashes!

gibson042 · 2024-02-01T20:51:34Z

x/distribution/keeper/hooks.go

-				panic(err)
+				return err


michaelfig

Great! See #348 for my suggestions.

JimLarson · 2024-02-04T04:57:24Z

Notes on failing CI tests:

Dependency Review / dependency-review (pull_request) Lots of vulnerabilities in dependencies, but it doesn't matter since the actual dependency versions are determined by the application's go.mod file. It's not worth the divergence to silence this. Might disable it.
Lint / golangci-lint (pull_request) Remaining errors in our changes are for deprecations, and the Cosmos code doesn't fix all of those either. These will be addressed in time.
Pull Request Labeler / labeler (pull_request_target) This is a known bad result. The supposed fix doesn't seem to work. We'll see if it's fixed in the next upgrade.
Atlas / bank (pull_request) Not our code and this test goes away in the next release.
Protobuf / break-check (pull_request) Expected on a "major" upgrade like this.
Tests / Code Coverage / test-submodules (pull_request) Not our code and this test goes away in the next release.

mhofman

I note that:

The common ancestor commit in the trunk before our Agoric fork is cosmos@cab40b4
- Some earlier branches of cosmos-sdk were subsequently merged into our Agoric fork
The upstream branch containing the 0.46 releases here seem to have split from the upstream branch containing the 0.45 releases circa the 0.43 rc release. The common ancestor commit of these branches is cosmos@5326280
- The v0.43.0-rc0 tag is the first commit on the right hand side, and was merged into our Agoric branch
- That right hand side upstream branch contains the 0.43, 0.44 and 0.45 releases, all as a clean continuation from the 0.43-rc0. It seems to mostly contain backport commits, and is never merged into the branch containing the 0.46 releases.
Before this PR, v0.45.16 is the last ref that was merged (from that right hand branch) into our fork.

I have not fully reviewed the changes related to vesting accounts assuming @michaelfig did.

I mostly compared the diffs as instructed in the PR description, since it is the best way to validate these changes. Approving on condition that the few typos and unnecessary changes are fixed.

Makefile

CHANGELOG-Agoric.md

cosmovisor/README-Agoric.md

go.mod

snapshots/manager.go

mhofman · 2024-02-05T21:19:20Z

x/auth/vesting/types/msgs.go

@@ -326,7 +380,7 @@ func NewMsgReturnGrants(addr sdk.AccAddress) *MsgReturnGrants {
 func (msg MsgReturnGrants) Route() string { return RouterKey }

 // Type returns the message type for a MsgReturnGrants.
-func (msg MsgReturnGrants) Type() string { return TypeMsgClawback }
+func (msg MsgReturnGrants) Type() string { return TypeMsgReturnGrants }


mhofman · 2024-02-05T21:29:15Z

.github/CODEOWNERS

@@ -4,5 +4,4 @@
 # most precedence.

 # Primary repo maintainers
-*       @aaronc @alexanderbez
-
+*       @cosmos/sdk-core-dev


GitHub is complaining about this. I believe this is because the upstream team is not public.
We likely should not mention the upstream team anyway.

Unknown owner on line 7: make sure the team @cosmos/sdk-core-dev exists, is publicly visible, and has write access to the repository

`@cosmos/sdk-core-dev`

Yeah, we might want to fix that later. I'll confer with @michaelfig

.github/workflows/labeler.yml

mhofman · 2024-02-05T21:39:37Z

.mergify.yml

We probably should rework this whole config in a follow-up to adapt it better to our fork.

So noted, though I'd rather put that effort into shrinking our fork away.

mergify bot and others added 30 commits June 7, 2022 17:31

perf: modify DelegatorSharesInvariant for better performance (cosmos#…

25ecca6

…12170) (cosmos#12178)

chore: remove direct reliance on staking from slashing (backport cosm…

add5753

…os#12177) (cosmos#12180)

fix(upgrades): perform no-op if 'from' and 'to' migration version are…

405cb0b

… equal (cosmos#12174) (cosmos#12191)

chore(types): add MustAccAddressFromBech32 util func (cosmos#12201) (c…

7a6b38f

…osmos#12204)

fix: update vesting message server to handle base accounts correctly …

ecdc68a

…(backport cosmos#12190) (cosmos#12247)

feat(cli): add acc-address by id cli and grpc gateway api (backport c…

53d0cc9

…osmos#12199) (cosmos#12267)

chore: register codec with grpc server (cosmos#12359) (cosmos#12361)

bf97cee

remove api module from 0.46 (cosmos#12353)

3bfa03a

feat: add query.GenericFilteredPaginated (cosmos#12253) (cosmos#12370)

f0bf4c3

fix: remove dependency on tendermint internal library (cosmos#12368) (c…

d5fa0a7

…osmos#12378)

fix: update x/mint parameter validation (cosmos#12384) (cosmos#12395)

0f862da

fix: deadlock when querying group members (backport cosmos#12342) (co…

9921120

…smos#12381)

chore!: var-naming linter errors (backport cosmos#12135) (cosmos#12401)

85bf43b

refactor: Use GenericFilteredPaginate wherever possible (cosmos#12386) (

1d9f966

cosmos#12402)

fix!: prevent 0 gas txs (backport cosmos#12416) (cosmos#12432)

397119f

refactor: remove indexEventsStr from setAnteHandler (cosmos#12425)

1657edb

chore: update rosetta data cosmos#12413 (cosmos#12440)

f1f7328

chore: Revert to TM v0.34.x (cosmos#12221)

e7bac31

chore: v0.46.0-rc2 Changelog (cosmos#12451)

0d4fd41

fix: use empty map instead of nil value for setting BaseApp.snapshotM…

c7c6588

…anager.extensions (cosmos#12031) (cosmos#12458)

docs(x/feegrant): use coins instead of tokens (cosmos#12444) (cos…

c0a90ff

…mos#12452)

docs: clarify differences and usage of submit-proposal and `submit-…

846b32b

…legacy-proposal` for gov (cosmos#12410) (cosmos#12470)

feat: Support providing custom keyring for keystore. (backport cosmos…

865d58b

…#12453) (cosmos#12489)

fix(telemetry): start telemetry independently from the API server (ba…

c3b2c7c

…ckport cosmos#12448) (cosmos#12483)

fix: Call Register{Tx,Tendermint}Service (cosmos#12509)

c38a315

julienrbrt and others added 5 commits October 18, 2023 13:42

chore: prepare release notes v0.46.16 (cosmos#18118)

da33255

fix(server): don't hardcode grpc address to localhost (backport cosmo…

41d2a21

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

chore: update tag date v0.46.16 (cosmos#18385)

7799bba

Merge tag 'v0.45.16' into rel-45-16-46-16-merge

6e0ddf0

Release v0.45.16 Merging 0.45.16 into 0.46.16 with "ours" strategy to create a revision with common history of both. Will be used to merge 0.46.16 into Agoric branch.

Merge tag 'v0.45.16-46.16-merge' into 8224-merge-0-46-16

a27e1d1

Compare vs 8224-nohistory branch.

JimLarson added enhancement New feature or request agoric-cosmos Agoric tags for cosmos labels Jan 31, 2024

JimLarson self-assigned this Jan 31, 2024

github-advanced-security bot found potential problems Jan 31, 2024

View reviewed changes

client/snapshot/load.go Dismissed Show dismissed Hide dismissed

client/snapshot/load.go Dismissed Show dismissed Hide dismissed

JimLarson changed the title ~~feat: merge cosmos/cosmos-sdk v0.46.16~~ feat!: merge cosmos/cosmos-sdk v0.46.16 Jan 31, 2024

JimLarson marked this pull request as ready for review January 31, 2024 19:53

JimLarson requested review from mhofman and michaelfig January 31, 2024 19:53

JimLarson mentioned this pull request Jan 31, 2024

feat: upgrade interchain stack to ibc5 Agoric/agoric-sdk#8791

Merged

gibson042 reviewed Feb 1, 2024

View reviewed changes

x/distribution/keeper/hooks.go

Comment on lines -50 to +51

panic(err)

return err

Copy link

gibson042 Feb 1, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice

gibson042 approved these changes Feb 1, 2024

View reviewed changes

michaelfig mentioned this pull request Feb 2, 2024

Suggestions for 0.46.16 merge #348

Closed

19 tasks

michaelfig approved these changes Feb 2, 2024

View reviewed changes

JimLarson added 4 commits February 2, 2024 17:05

fix: backport fix for bad CI action version

b1bc808

fix: adjust intra-cosmovisor package paths for Agoric version

3cfe766

fix: golangci-lint errors

1b353fc

fix: address review comments

ce0dd31

test: disable CI tests which will never be relevant

8b020d0

mhofman approved these changes Feb 5, 2024

View reviewed changes

fix: review suggestions, including restoring an upstream typo

a919e0b

JimLarson merged commit d94ada4 into Agoric Feb 6, 2024
27 of 31 checks passed

JimLarson deleted the 8224-merge-0-46-16 branch February 6, 2024 04:25

mhofman restored the 8224-merge-0-46-16 branch April 12, 2024 02:14

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat!: merge cosmos/cosmos-sdk v0.46.16 #347

feat!: merge cosmos/cosmos-sdk v0.46.16 #347

JimLarson commented Jan 31, 2024 •

edited

Loading

gibson042 commented Feb 1, 2024

gibson042 left a comment

gibson042 Feb 1, 2024

michaelfig left a comment

JimLarson commented Feb 4, 2024

mhofman left a comment

mhofman Feb 5, 2024

mhofman Feb 5, 2024

JimLarson Feb 6, 2024

mhofman Feb 5, 2024

JimLarson Feb 6, 2024

feat!: merge cosmos/cosmos-sdk v0.46.16 #347

feat!: merge cosmos/cosmos-sdk v0.46.16 #347

Conversation

JimLarson commented Jan 31, 2024 • edited Loading

Description

Author Checklist

Reviewers Checklist

gibson042 commented Feb 1, 2024

gibson042 left a comment

Choose a reason for hiding this comment

gibson042 Feb 1, 2024

Choose a reason for hiding this comment

michaelfig left a comment

Choose a reason for hiding this comment

JimLarson commented Feb 4, 2024

mhofman left a comment

Choose a reason for hiding this comment

mhofman Feb 5, 2024

Choose a reason for hiding this comment

mhofman Feb 5, 2024

Choose a reason for hiding this comment

JimLarson Feb 6, 2024

Choose a reason for hiding this comment

mhofman Feb 5, 2024

Choose a reason for hiding this comment

JimLarson Feb 6, 2024

Choose a reason for hiding this comment

JimLarson commented Jan 31, 2024 •

edited

Loading