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 ed25519 builtin program handling (backport #23182) #23195

Merged
merged 2 commits into from
Feb 17, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 16, 2022

This is an automatic backport of pull request #23182 done by Mergify.
Cherry-pick of 813725d has failed:

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

You are currently cherry-picking commit 813725dfe.
  (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:   Cargo.lock
	modified:   Cargo.toml
	modified:   program-test/src/lib.rs
	new file:   programs/ed25519-tests/Cargo.toml
	new file:   programs/ed25519-tests/tests/process_transaction.rs
	modified:   runtime/src/builtins.rs
	modified:   sdk/src/precompiles.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   runtime/src/bank.rs
	both modified:   runtime/src/genesis_utils.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.com

@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Feb 16, 2022
@t-nelson
Copy link
Contributor

Sigh... I love when CI is green despite conflics

@solana-grimes
Copy link
Contributor

😱 New commits were pushed while the automerge label was present.

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Feb 16, 2022
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Feb 16, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Feb 16, 2022

automerge label removed due to a CI failure

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Feb 16, 2022
@t-nelson
Copy link
Contributor

I didn't say go, robot. Chill

* Fix ed25519 builtin program handling

* Fix tests

* Add integration tests for processing transactions with ed25519 ixs

* Fix another test

* fix formatting

(cherry picked from commit 813725d)
@t-nelson t-nelson force-pushed the mergify/bp/v1.9/pr-23182 branch from 8bfcb21 to 6d246ab Compare February 16, 2022 20:29
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Feb 16, 2022
Comment on lines 13041 to 13065
if bank.slot == 0 {
assert_eq!(
bank.hash().to_string(),
"DqaWg7EVKzb5Fpe92zNBtXAWqLwcedgHDicYrCBnf3QK"
"CMCWTWsU67zjmayMhSMGBTzHbW1WMCtkM5m7xk9qSnY5"
);
}
if bank.slot == 32 {
assert_eq!(
bank.hash().to_string(),
"AYdhzhKrM74r9XuZBDGcHeFzg2DEtp1boggnEnzDjZSq"
"4kbXeShX8vMnRuuADCkxSEir1oc2PrBNbx6vPkWcDtJU"
);
}
if bank.slot == 64 {
assert_eq!(
bank.hash().to_string(),
"EsbPVYzo1qz5reEUH5okKW4ExB6WbcidkVdW5mzpFn7C"
"CSZ8QCDF8qhqKDxafPzjNJpHcRAXmQzAb8eUi1Emt35E"
);
}
if bank.slot == 128 {
assert_eq!(
bank.hash().to_string(),
"H3DWrQ6FqbLkFNDxbWQ62UKRbw2dbuxf3oVF2VpBk6Ga"
"Ewh1SYKy8eiSE77sEvjav33SznfWYSwa5TwqbiYWseG2"
);
break;
}
Copy link
Contributor

Choose a reason for hiding this comment

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

This test is annoying. Maybe we should make it four tests?

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Feb 16, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Feb 16, 2022

automerge label removed due to a CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Feb 16, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Feb 16, 2022

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 Feb 16, 2022
@solana-grimes
Copy link
Contributor

😱 New commits were pushed while the automerge label was present.

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Feb 16, 2022
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Feb 16, 2022
@codecov
Copy link

codecov bot commented Feb 17, 2022

Codecov Report

Merging #23195 (a49190a) into v1.9 (e343a17) will decrease coverage by 0.0%.
The diff coverage is 52.0%.

@@            Coverage Diff            @@
##             v1.9   #23195     +/-   ##
=========================================
- Coverage    81.2%    81.2%   -0.1%     
=========================================
  Files         534      534             
  Lines      149149   149168     +19     
=========================================
+ Hits       121193   121208     +15     
- Misses      27956    27960      +4     

@mergify mergify bot merged commit 2120ef5 into v1.9 Feb 17, 2022
@mergify mergify bot deleted the mergify/bp/v1.9/pr-23182 branch February 17, 2022 00:47
@github-actions
Copy link
Contributor

This PR has been automatically locked since there has not been any activity in past 14 days after it was merged.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 30, 2022
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 locked PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants