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.

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

Problem: barberry not patched #986

Merged

Conversation

yihuang
Copy link
Collaborator

@yihuang yihuang commented Jun 8, 2023

Solution:

  • cherry-pick barberry fix in cosmos-sdk

👮🏻👮🏻👮🏻 !!!! REFERENCE THE PROBLEM YOUR ARE SOLVING IN THE PR TITLE AND DESCRIBE YOUR SOLUTION HERE !!!! DO NOT FORGET !!!! 👮🏻👮🏻👮🏻

PR Checklist:

  • Have you read the CONTRIBUTING.md?
  • Does your PR follow the C4 patch requirements?
  • Have you rebased your work on top of the latest master?
  • Have you checked your code compiles? (make)
  • Have you included tests for any non-trivial functionality?
  • Have you checked your code passes the unit tests? (make test)
  • Have you checked your code formatting is correct? (go fmt)
  • Have you checked your basic code style is fine? (golangci-lint run)
  • If you added any dependencies, have you checked they do not contain any known vulnerabilities? (go list -json -m all | nancy sleuth)
  • If your changes affect the client infrastructure, have you run the integration test?
  • If your changes affect public APIs, does your PR follow the C4 evolution of public contracts?
  • If your code changes public APIs, have you incremented the crate version numbers and documented your changes in the CHANGELOG.md?
  • If you are contributing for the first time, please read the agreement in CONTRIBUTING.md now and add a comment to this pull request stating that your PR is in accordance with the Developer's Certificate of Origin.

Thank you for your code, it's appreciated! :)

Solution:
- cherry-pick barberry fix in cosmos-sdk
@yihuang yihuang requested a review from a team as a code owner June 8, 2023 18:45
CHANGELOG.md Outdated Show resolved Hide resolved
Signed-off-by: yihuang <[email protected]>
@yihuang yihuang requested a review from calvinaco June 8, 2023 18:46
@@ -178,7 +178,8 @@ require (
replace (
github.com/99designs/keyring => github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76
github.com/cometbft/cometbft-db => github.com/crypto-org-chain/cometbft-db v0.0.0-20230412133340-ac70df4b45f6
github.com/cosmos/cosmos-sdk => github.com/crypto-org-chain/cosmos-sdk v0.46.3-0.20230530021201-0a93ffb1f9d4
// https://github.com/crypto-org-chain/cosmos-sdk/tree/release/v0.46.12-hotfix
github.com/cosmos/cosmos-sdk => github.com/crypto-org-chain/cosmos-sdk v0.46.3-0.20230608170216-c8ad6f2b4074
Copy link
Collaborator Author

@yihuang yihuang Jun 8, 2023

Choose a reason for hiding this comment

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

@codecov
Copy link

codecov bot commented Jun 8, 2023

Codecov Report

Merging #986 (4763662) into release/v4.2.6-hotfix (9c403c8) will not change coverage.
The diff coverage is n/a.

@@                  Coverage Diff                   @@
##           release/v4.2.6-hotfix     #986   +/-   ##
======================================================
  Coverage                  33.25%   33.25%           
======================================================
  Files                        125      125           
  Lines                      19976    19976           
======================================================
  Hits                        6643     6643           
  Misses                     12253    12253           
  Partials                    1080     1080           
Flag Coverage Δ
integration_tests 20.52% <ø> (ø)
integration_tests_byzantine 9.58% <ø> (ø)
integration_tests_gov 9.80% <ø> (ø)
integration_tests_grpc 9.78% <ø> (ø)
integration_tests_ibc 24.72% <ø> (ø)
integration_tests_ledger 9.78% <ø> (ø)
integration_tests_slow 9.78% <ø> (ø)
integration_tests_solomachine 9.58% <ø> (ø)
integration_tests_upgrade 10.78% <ø> (ø)
unit_tests 10.95% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

@mmsqe mmsqe merged commit 7eef93e into crypto-org-chain:release/v4.2.6-hotfix Jun 9, 2023
@yihuang yihuang deleted the release/v4.2.6-hotfix branch June 9, 2023 01:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants