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

v1.18: Fix - program loading with effective slot at epoch boundary (backport of #35283) #35302

Merged
merged 1 commit into from Feb 26, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 23, 2024

This is an automatic backport of pull request #35283 done by Mergify.
Cherry-pick of 2891ce8 has failed:

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

You are currently cherry-picking commit 2891ce886b.
  (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:   runtime/src/bank/tests.rs

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   svm/src/transaction_processor.rs

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


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 the conflicts label Feb 23, 2024
* Always limit effective slot to the begin of the current epoch.

* Adds comments.

* Optimizes to avoid having two entries if there is no relevant feature activation.

* Adds test_feature_activation_loaded_programs_epoch_transition().

(cherry picked from commit 2891ce8)
Copy link

codecov bot commented Feb 23, 2024

Codecov Report

Attention: Patch coverage is 97.43590% with 1 lines in your changes are missing coverage. Please review.

Project coverage is 81.6%. Comparing base (b369831) to head (8a57e2b).

Additional details and impacted files
@@           Coverage Diff            @@
##            v1.18   #35302    +/-   ##
========================================
  Coverage    81.6%    81.6%            
========================================
  Files         827      827            
  Lines      224081   224117    +36     
========================================
+ Hits       182879   182994   +115     
+ Misses      41202    41123    -79     

@Lichtso Lichtso merged commit e302417 into v1.18 Feb 26, 2024
36 checks passed
@Lichtso Lichtso deleted the mergify/bp/v1.18/pr-35283 branch February 26, 2024 13:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants