cosmos / cosmos-sdk

:chains: A Framework for Building High Value Public Blockchains :sparkles:
https://cosmos.network/
Apache License 2.0
6.28k stars 3.64k forks source link

fix: match comets bls implmentation (backport #22613) #22621

Closed mergify[bot] closed 3 days ago

mergify[bot] commented 3 days ago

Description

This pr uses comet as a dependency for bls in order to make sure to match crypto design. We were using the cosmos/crypto pakg but the design became different between the two repos

closes https://github.com/cosmos/cosmos-sdk/issues/22549 & https://github.com/cosmos/cosmos-sdk/issues/22548

this can be a short term fix but it blocking meter.io currently


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.

Please see Pull Request Reviewer section in the contributing guide for more information on how to review a pull request.

I have...

Summary by CodeRabbit

mergify[bot] commented 3 days ago

Cherry-pick of 9d6d1067bc1d2e6b4a9a34a25a9eadad931fda50 has failed:

On branch mergify/bp/release/v0.52.x/pr-22613
Your branch is up to date with 'origin/release/v0.52.x'.

You are currently cherry-picking commit 9d6d1067b.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
    modified:   client/v2/go.mod
    modified:   client/v2/go.sum
    modified:   crypto/codec/amino.go
    modified:   crypto/codec/pubkey.go
    deleted:    crypto/keys/bls12_381/const.go
    modified:   crypto/keys/bls12_381/key.go
    modified:   crypto/keys/bls12_381/key_cgo.go
    modified:   crypto/keys/jsonkey.go
    modified:   crypto/keys/multisig/codec.go
    modified:   go.mod
    modified:   go.sum
    modified:   scripts/build/build.mk
    modified:   server/v2/cometbft/go.mod
    modified:   server/v2/cometbft/go.sum
    modified:   simapp/go.mod
    modified:   simapp/go.sum
    modified:   simapp/v2/go.mod
    modified:   simapp/v2/go.sum
    modified:   tests/go.mod
    modified:   tests/go.sum
    modified:   x/accounts/defaults/base/go.mod
    modified:   x/accounts/defaults/base/go.sum
    modified:   x/accounts/defaults/lockup/go.mod
    modified:   x/accounts/defaults/lockup/go.sum
    modified:   x/accounts/defaults/multisig/go.mod
    modified:   x/accounts/defaults/multisig/go.sum
    modified:   x/accounts/go.mod
    modified:   x/accounts/go.sum
    modified:   x/authz/go.sum
    modified:   x/bank/go.sum
    modified:   x/circuit/go.mod
    modified:   x/circuit/go.sum
    modified:   x/consensus/go.mod
    modified:   x/consensus/go.sum
    modified:   x/distribution/go.mod
    modified:   x/distribution/go.sum
    modified:   x/epochs/go.mod
    modified:   x/epochs/go.sum
    modified:   x/evidence/go.mod
    modified:   x/evidence/go.sum
    modified:   x/feegrant/go.mod
    modified:   x/feegrant/go.sum
    modified:   x/gov/go.mod
    modified:   x/gov/go.sum
    modified:   x/group/go.mod
    modified:   x/group/go.sum
    modified:   x/mint/go.sum
    modified:   x/nft/go.mod
    modified:   x/nft/go.sum
    modified:   x/params/go.mod
    modified:   x/params/go.sum
    modified:   x/protocolpool/go.mod
    modified:   x/protocolpool/go.sum
    modified:   x/slashing/go.mod
    modified:   x/slashing/go.sum
    modified:   x/staking/go.sum
    modified:   x/upgrade/go.mod
    modified:   x/upgrade/go.sum

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
    deleted by us:   tests/integration/type_check.go
    both modified:   x/authz/go.mod
    both modified:   x/bank/go.mod
    both modified:   x/mint/go.mod
    both modified:   x/staking/go.mod

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

coderabbitai[bot] commented 3 days ago

[!IMPORTANT]

Review skipped

Bot user detected.

To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.


🪧 Tips ### Chat There are 3 ways to chat with [CodeRabbit](https://coderabbit.ai): - Review comments: Directly reply to a review comment made by CodeRabbit. Example: - `I pushed a fix in commit , please review it.` - `Generate unit testing code for this file.` - `Open a follow-up GitHub issue for this discussion.` - Files and specific lines of code (under the "Files changed" tab): Tag `@coderabbitai` in a new review comment at the desired location with your query. Examples: - `@coderabbitai generate unit testing code for this file.` - `@coderabbitai modularize this function.` - PR comments: Tag `@coderabbitai` in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples: - `@coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.` - `@coderabbitai read src/utils.ts and generate unit testing code.` - `@coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.` - `@coderabbitai help me debug CodeRabbit configuration file.` Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. ### CodeRabbit Commands (Invoked using PR comments) - `@coderabbitai pause` to pause the reviews on a PR. - `@coderabbitai resume` to resume the paused reviews. - `@coderabbitai review` to trigger an incremental review. This is useful when automatic reviews are disabled for the repository. - `@coderabbitai full review` to do a full review from scratch and review all the files again. - `@coderabbitai summary` to regenerate the summary of the PR. - `@coderabbitai resolve` resolve all the CodeRabbit review comments. - `@coderabbitai configuration` to show the current CodeRabbit configuration for the repository. - `@coderabbitai help` to get help. ### Other keywords and placeholders - Add `@coderabbitai ignore` anywhere in the PR description to prevent this PR from being reviewed. - Add `@coderabbitai summary` to generate the high-level summary at a specific location in the PR description. - Add `@coderabbitai` anywhere in the PR title to generate the title automatically. ### Documentation and Community - Visit our [Documentation](https://docs.coderabbit.ai) for detailed information on how to use CodeRabbit. - Join our [Discord Community](http://discord.gg/coderabbit) to get help, request features, and share feedback. - Follow us on [X/Twitter](https://twitter.com/coderabbitai) for updates and announcements.
github-actions[bot] commented 3 days ago

@mergify[bot] your pull request is missing a changelog!