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

Add ecrecover syscall (backport #17720) #18500

Merged
merged 2 commits into from
Jul 8, 2021
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 7, 2021

This is an automatic backport of pull request #17720 done by Mergify.
Cherry-pick of 1f288ce has failed:

On branch mergify/bp/v1.7/pr-17720
Your branch is up to date with 'origin/v1.7'.

You are currently cherry-picking commit 1f288ce52.
  (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:   programs/bpf/Cargo.toml
	modified:   programs/bpf/build.rs
	new file:   programs/bpf/c/src/secp256k1_recover/secp256k1_recover.c
	new file:   programs/bpf/rust/secp256k1_recover/Cargo.toml
	new file:   programs/bpf/rust/secp256k1_recover/src/lib.rs
	modified:   sdk/bpf/c/inc/solana_sdk.h
	modified:   sdk/program/src/lib.rs
	new file:   sdk/program/src/secp256k1_recover.rs
	modified:   sdk/src/feature_set.rs
	modified:   sdk/src/process_instruction.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Cargo.lock
	both modified:   programs/bpf/Cargo.lock
	both modified:   programs/bpf/tests/programs.rs
	both modified:   programs/bpf_loader/Cargo.toml
	both modified:   programs/bpf_loader/src/syscalls.rs
	both modified:   sdk/program/Cargo.toml

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Jul 7, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Jul 7, 2021

automerge label removed due to a CI failure

@mergify mergify bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Jul 8, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Jul 8, 2021

automerge label removed due to a CI failure

s-medvedev and others added 2 commits July 8, 2021 12:58
Co-authored-by: Anton Lisanin <lisanin.anton@gmail.com>
(cherry picked from commit 1f288ce)

# Conflicts:
#	Cargo.lock
#	programs/bpf/Cargo.lock
#	programs/bpf/tests/programs.rs
#	programs/bpf_loader/Cargo.toml
#	programs/bpf_loader/src/syscalls.rs
#	sdk/program/Cargo.toml
@jackcmay jackcmay force-pushed the mergify/bp/v1.7/pr-17720 branch from ec35831 to 52a9e26 Compare July 8, 2021 19:59
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jul 8, 2021
@jackcmay
Copy link
Contributor

jackcmay commented Jul 8, 2021

@Mergifyio rebase

@mergify
Copy link
Contributor Author

mergify bot commented Jul 8, 2021

Command rebase: success

Branch already up to date

@codecov
Copy link

codecov bot commented Jul 8, 2021

Codecov Report

Merging #18500 (52a9e26) into v1.7 (ef20559) will decrease coverage by 0.2%.
The diff coverage is 80.0%.

@@            Coverage Diff            @@
##             v1.7   #18500     +/-   ##
=========================================
- Coverage    82.5%    82.2%   -0.3%     
=========================================
  Files         428      433      +5     
  Lines      120239   121523   +1284     
=========================================
+ Hits        99199    99992    +793     
- Misses      21040    21531    +491     

@mergify mergify bot merged commit 8c32831 into v1.7 Jul 8, 2021
@mergify mergify bot deleted the mergify/bp/v1.7/pr-17720 branch July 8, 2021 21:56
@brooksprumo brooksprumo mentioned this pull request Aug 23, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Merge this Pull Request automatically once CI passes conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants