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: Feature - Lift CPI Caller Restriction (backport of #2202) #3500

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

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 6, 2024

See SIMD-0163


This is an automatic backport of pull request #2202 done by Mergify.

* Adds the feature.

* Adds the feature gate logic.

* Adjusts tests.

(cherry picked from commit 228d3b3)

# Conflicts:
#	program-runtime/src/invoke_context.rs
#	sdk/feature-set/src/lib.rs
@mergify mergify bot requested a review from a team as a code owner November 6, 2024 12:12
@mergify mergify bot added the conflicts label Nov 6, 2024
Copy link
Author

mergify bot commented Nov 6, 2024

Cherry-pick of 228d3b3 has failed:

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

You are currently cherry-picking commit 228d3b3427.
  (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:   programs/sbf/tests/programs.rs
	modified:   runtime/src/bank/tests.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   program-runtime/src/invoke_context.rs
	both modified:   sdk/feature-set/src/lib.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 mergify bot assigned Lichtso Nov 6, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant