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

v2.1: use new feature gate for cu depletion (backport of #3994) #4068

Open
wants to merge 1 commit into
base: v2.1
Choose a base branch
from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Dec 11, 2024

Problem

Firedancer prefers to have a separate feature gate for each SIMD, so rather than reusing and rekeying the existing replay cost tracker feature, we should create a new feature gate for solana-foundation/solana-improvement-documents#182.

Summary of Changes

  • Revert feature id change for the replay cost tracker feature
  • Add new feature gate for cu depletion

Fixes #
Feature Gate Issue: #3993


This is an automatic backport of pull request #3994 done by [Mergify](https://mergify.com).

(cherry picked from commit 11467d9)

# Conflicts:
#	programs/bpf_loader/src/lib.rs
#	programs/sbf/tests/programs.rs
#	sdk/feature-set/src/lib.rs
@mergify mergify bot requested a review from a team as a code owner December 11, 2024 19:51
@mergify mergify bot added conflicts feature-gate Pull Request adds or modifies a runtime feature gate labels Dec 11, 2024
Copy link
Author

mergify bot commented Dec 11, 2024

Cherry-pick of 11467d9 has failed:

On branch mergify/bp/v2.1/pr-3994
Your branch is up to date with 'origin/v2.1'.

You are currently cherry-picking commit 11467d9221.
  (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:   programs/bpf_loader/src/lib.rs
	both modified:   programs/sbf/tests/programs.rs
	both modified:   sdk/feature-set/src/lib.rs

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

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

Copy link
Author

mergify bot commented Dec 11, 2024

The Firedancer team maintains a line-for-line reimplementation of the
native programs, and until native programs are moved to BPF, those
implementations must exactly match their Agave counterparts.
If this PR represents a change to a native program implementation (not
tests), please include a reviewer from the Firedancer team. And please
keep refactors to a minimum.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts feature-gate Pull Request adds or modifies a runtime feature gate
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants