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

Fix pubkey recovery to work with high/low s for k256 ^0.13.2 (backport #2014) #2198

Merged
merged 4 commits into from
Aug 6, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 5, 2024

This is based on #2000 to get extra test coverage before marking the change. Merge #2000 first.

Closes #2010


This is an automatic backport of pull request #2014 done by Mergify.

(cherry picked from commit d7bd81d)

# Conflicts:
#	Cargo.lock
#	contracts/empty/Cargo.lock
@mergify mergify bot added the conflicts label Aug 5, 2024
Copy link
Contributor Author

mergify bot commented Aug 5, 2024

Cherry-pick of d7bd81d has failed:

On branch mergify/bp/release/1.5/pr-2014
Your branch is up to date with 'origin/release/1.5'.

You are currently cherry-picking commit d7bd81dda.
  (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:   contracts/burner/Cargo.lock
	modified:   contracts/crypto-verify/Cargo.lock
	modified:   contracts/cyberpunk/Cargo.lock
	modified:   contracts/floaty/Cargo.lock
	modified:   contracts/hackatom/Cargo.lock
	modified:   contracts/ibc-reflect-send/Cargo.lock
	modified:   contracts/ibc-reflect/Cargo.lock
	modified:   contracts/queue/Cargo.lock
	modified:   contracts/reflect/Cargo.lock
	modified:   contracts/staking/Cargo.lock
	modified:   contracts/virus/Cargo.lock
	modified:   packages/crypto/Cargo.toml
	modified:   packages/crypto/src/secp256k1.rs

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   Cargo.lock
	deleted by us:   contracts/empty/Cargo.lock

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

Copy link
Collaborator

@chipshort chipshort left a comment

Choose a reason for hiding this comment

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

LGTM

@webmaster128 webmaster128 merged commit 8395b7c into release/1.5 Aug 6, 2024
28 of 29 checks passed
@webmaster128 webmaster128 deleted the mergify/bp/release/1.5/pr-2014 branch August 6, 2024 08:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants