Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge tag 'v0.50.5' into prov/dwedul/v50-bring-in-v0.50.5 #605

Merged
merged 20 commits into from
Mar 27, 2024
Merged

Merge tag 'v0.50.5' into prov/dwedul/v50-bring-in-v0.50.5 #605

merged 20 commits into from
Mar 27, 2024

Conversation

SpicyLemon
Copy link

@SpicyLemon SpicyLemon commented Mar 27, 2024 •
edited
Loading

Description

This brings in all the SDK changes through v0.50.5.

For this PR, we do NOT want to squash it; a normal merge commit would be better. If we squash+merge this, git might get confused about the common ancestor during a later bump, and show a ton of conflicts that are actually the exact same changes being applied.

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 in the PR title
  • added ! to the type prefix if API or client breaking change
  • targeted the correct branch (see PR Targeting)
  • provided a link to the relevant issue or specification
  • followed the guidelines for building modules
  • included the necessary unit and integration tests
  • added a changelog entry to CHANGELOG.md
  • included comments for documenting Go code
  • 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 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)

mergify bot and others added 20 commits February 23, 2024 01:27
@mergify @czarcas7ic
fix: in-place-testnet edgecases (backport cosmos#19516) (cosmos#19526)
aba4e2d 
Co-authored-by: Adam Tucker <[email protected]>
@yihuang
fix(simapp): typo in GetStoreKeys (cosmos#19544)
def228d
@dependabot
build(deps): Bump cosmossdk.io/math from 1.2.0 to 1.3.0 (cosmos#19562)
3dcf24e
@mergify @itsdevbear
@0x2d3c @julienrbrt
fix(depinject): Authtx was not accepting custom signers (backport cos…
a8b5e7f 
…mos#19549) (cosmos#19551)

Co-authored-by: Devon Bear <[email protected]>
Co-authored-by: Qt <[email protected]>
Co-authored-by: Julien Robert <[email protected]>
@dependabot @github-actions @julienrbrt
build(deps): Bump github.com/cosmos/cosmos-db from 1.0.0 to 1.0.2 (co…
fcfc099 
…smos#19566)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Julien Robert <[email protected]>
@catShaark @julienrbrt
Merge pull request from GHSA-86h5-xcpx-cfqc
c21c824 
* fix slashing hole with test

* release notes + changelog

* word

* date

* updates

---------

Co-authored-by: Julien Robert <[email protected]>
@julienrbrt
ci: run test pipeline on merge v0.50 branch (cosmos#19582)
e7bea5f
@GAtom22
fix(staking): fix impossible conditions (cosmos#19621)
b118a0a
@mergify @tac0turtle
docs: add section on creating a testnets from mainnet exports (backport
515bd8d 
cosmos#19475) (cosmos#19648)

Co-authored-by: Marko <[email protected]>
@dependabot @github-actions
build(deps): Bump cosmossdk.io/x/tx from 0.13.0 to 0.13.1 (cosmos#19665)
09a49fe 
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
@julienrbrt
feat(client/v2): marshal enum as string (cosmos#19653)
2abd2ec
@mergify @mmsqe @julienrbrt
refactor(x/auth): allow empty public keys for GetSignBytesAdapter (ba…
f9041cd 
…ckport cosmos#19651) (cosmos#19675)

Co-authored-by: mmsqe <[email protected]>
Co-authored-by: Julien Robert <[email protected]>
@julienrbrt
fix(types): check for HasABCIGenesis in CoreAppModuleBasicAdaptor (co…
3382e8e 
…smos#19709)
@mergify @julienrbrt
build(deps): Bump deps (backport cosmos#19655) (cosmos#19711)
6689e36 
Co-authored-by: Julien Robert <[email protected]>
@nivasan1 @tac0turtle
Merge pull request from GHSA-95rx-m9m5-m94v
4467110 
* validate ExtendedCommit against LastCommit

test cases

* account for core.comet types

* logging

* linting

* cherry-pick staking fix

* nits

* linting fix

* run tests

---------

Co-authored-by: Marko <[email protected]>
Co-authored-by: Marko Baricevic <[email protected]>
@yihuang
feat(baseapp): add option to disable block gas meter (cosmos#19626)
f055cde
@mergify @julienrbrt
feat(x/distribution): add rewards-by-validator autocli config (backport
c382225 
cosmos#19707) (cosmos#19714)

Co-authored-by: Julien Robert <[email protected]>
@mergify @traviolus @julienrbrt
fix(x/gov): grpc query tally for failed proposal (backport cosmos#19725…
a877c47 
…) (cosmos#19727)

Co-authored-by: David Tumcharoen <[email protected]>
Co-authored-by: Julien Robert <[email protected]>
@julienrbrt
chore: prepare v0.50.5 (cosmos#19715)
a321866
@SpicyLemon
Merge tag 'v0.50.5' into prov/dwedul/v50-bring-in-v0.50.5
597f1e7 
Release Cosmos SDK v0.50.5

# -----BEGIN PGP SIGNATURE-----
#
# iHUEABYKAB0WIQQQT/CpGzc0x0Rg2OeuqMIeYI8dAgUCZfBOgAAKCRCuqMIeYI8d
# AhMRAP9JvapI+Y5nGnNXAk96G6fcNBEDpHRg21SmibiGzA9ETQEA82FvBIwfY+A4
# a4jKirG7e7ZcdvqZWlMtSdLsWJS4fQA=
# =uC3d
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Mar 12 06:45:52 2024 MDT
# gpg:                using EDDSA key 104FF0A91B3734C74460D8E7AEA8C21E608F1D02
# gpg: Can't check signature: No public key

# Conflicts:
#	CHANGELOG.md
@SpicyLemon SpicyLemon force-pushed the prov/dwedul/v50-bring-in-v0.50.5 branch from 6671d39 to 597f1e7 Compare March 27, 2024 23:11
@SpicyLemon SpicyLemon enabled auto-merge March 27, 2024 23:13
@SpicyLemon SpicyLemon merged commit e451fd3 into release-pio/v0.50.x Mar 27, 2024
@SpicyLemon
Copy link
Author

I ran the following make targets locally and they all completed successfully:

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

@SpicyLemon SpicyLemon deleted the prov/dwedul/v50-bring-in-v0.50.5 branch December 17, 2024 18:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@iramiller iramiller iramiller approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@SpicyLemon @iramiller @yihuang @catShaark @julienrbrt @GAtom22 @nivasan1