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

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

Closed
wants to merge 1 commit into from

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.17/pr-35283
Your branch is up to date with 'origin/v1.17'.

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
@Lichtso Lichtso force-pushed the mergify/bp/v1.17/pr-35283 branch 2 times, most recently from 60d4446 to 0a53dcd Compare February 23, 2024 15:43
* 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)
@Lichtso Lichtso force-pushed the mergify/bp/v1.17/pr-35283 branch from 0a53dcd to 56e2e43 Compare February 23, 2024 16:16
@Lichtso Lichtso removed the conflicts label Feb 23, 2024
@pgarg66
Copy link
Contributor

pgarg66 commented Feb 26, 2024

We should see if audit can be done for backport PRs to a stable branch before the PR is merged. (i.e. prevent it from getting into a release before audit is complete).
@willhickey wdyt?

@willhickey
Copy link
Contributor

This repository is no longer in use. Please re-open this pull request in the agave repo: https://github.com/anza-xyz/agave

@willhickey willhickey closed this Mar 3, 2024
@mergify mergify bot deleted the mergify/bp/v1.17/pr-35283 branch March 3, 2024 04:55
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants