Skip to content
This repository has been archived by the owner on Jan 22, 2025. It is now read-only.

Gate libsecp256k1 update (backport #18656) #18701

Merged
merged 4 commits into from
Jul 16, 2021
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 15, 2021

This is an automatic backport of pull request #18656 done by Mergify.
Cherry-pick of 568660b has failed:

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

You are currently cherry-picking commit 568660b40.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   core/src/banking_stage.rs

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 3a85b77 has failed:

On branch mergify/bp/v1.7/pr-18656
Your branch is ahead of 'origin/v1.7' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 3a85b77bb.
  (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:   banks-server/src/banks_server.rs
	modified:   ledger-tool/src/main.rs
	modified:   ledger/src/blockstore_processor.rs
	modified:   ledger/src/entry.rs
	modified:   programs/secp256k1/src/lib.rs
	modified:   rpc/src/rpc.rs
	modified:   runtime/src/accounts.rs
	modified:   runtime/src/bank.rs
	modified:   runtime/src/builtins.rs
	modified:   runtime/src/non_circulating_supply.rs
	modified:   sdk/program/src/fee_calculator.rs
	modified:   sdk/src/feature_set.rs
	modified:   sdk/src/transaction.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   core/src/banking_stage.rs

Cherry-pick of abe5a0a has failed:

On branch mergify/bp/v1.7/pr-18656
Your branch is ahead of 'origin/v1.7' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit abe5a0a34.
  (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:   sdk/program/src/secp256k1_recover.rs
	modified:   sdk/src/transaction.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   programs/bpf_loader/src/syscalls.rs
	both modified:   sdk/src/secp256k1_instruction.rs

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/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 15, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Jul 15, 2021

automerge label removed due to a CI failure

@t-nelson t-nelson force-pushed the mergify/bp/v1.7/pr-18656 branch from c171537 to 6c29704 Compare July 16, 2021 05:23
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jul 16, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Jul 16, 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 16, 2021
@codecov
Copy link

codecov bot commented Jul 16, 2021

Codecov Report

Merging #18701 (6c29704) into v1.7 (ef20559) will decrease coverage by 0.1%.
The diff coverage is 77.2%.

@@            Coverage Diff            @@
##             v1.7   #18701     +/-   ##
=========================================
- Coverage    82.5%    82.3%   -0.2%     
=========================================
  Files         428      432      +4     
  Lines      120239   121786   +1547     
=========================================
+ Hits        99199   100232   +1033     
- Misses      21040    21554    +514     

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

Successfully merging this pull request may close these issues.

1 participant