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: Revert deprecate executable feature (backport of #309) #337

Merged
merged 3 commits into from
Mar 21, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Mar 20, 2024

Problem

We reevaluated the feature to deprecate executable. We felt that this feature is
too complex and too risky for v1.18.

Therefore, we would like to revert this feature.

Summary of Changes

  • revert deprecate executable feature
  • add a test to cover transfering lamports into native_loader owned account

Fixes #


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

* revert deprecate executable feature

* add native loader account transfer test

---------

Co-authored-by: HaoranYi <haoran.yi@solana.com>
(cherry picked from commit 0f8f8cd)

# Conflicts:
#	programs/bpf_loader/src/lib.rs
#	runtime/src/accounts/mod.rs
#	runtime/src/bank.rs
#	runtime/src/bank/tests.rs
#	sdk/src/account.rs
@mergify mergify bot added the conflicts label Mar 20, 2024
Copy link
Author

mergify bot commented Mar 20, 2024

Cherry-pick of 0f8f8cd has failed:

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

You are currently cherry-picking commit 0f8f8cd970.
  (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:   cli/src/program.rs
	modified:   cli/tests/program.rs
	modified:   ledger-tool/src/program.rs
	modified:   program-runtime/src/invoke_context.rs
	modified:   program-runtime/src/message_processor.rs
	modified:   program-test/src/lib.rs
	modified:   programs/address-lookup-table/src/processor.rs
	modified:   programs/bpf_loader/benches/serialization.rs
	modified:   programs/bpf_loader/src/serialization.rs
	modified:   programs/bpf_loader/src/syscalls/cpi.rs
	modified:   programs/config/src/config_processor.rs
	modified:   programs/loader-v4/src/lib.rs
	modified:   programs/sbf/benches/bpf_loader.rs
	modified:   programs/stake/src/stake_instruction.rs
	modified:   programs/stake/src/stake_state.rs
	modified:   programs/system/src/system_instruction.rs
	modified:   programs/system/src/system_processor.rs
	modified:   programs/vote/src/vote_state/mod.rs
	modified:   programs/zk-token-proof/src/lib.rs
	modified:   sdk/src/feature_set.rs
	modified:   sdk/src/transaction_context.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   programs/bpf_loader/src/lib.rs
	both modified:   runtime/src/accounts/mod.rs
	both modified:   runtime/src/bank.rs
	both modified:   runtime/src/bank/tests.rs
	both modified:   sdk/src/account.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

@HaoranYi HaoranYi requested review from pgarg66 and Lichtso March 20, 2024 20:19
@HaoranYi HaoranYi merged commit 85f7bef into v1.18 Mar 21, 2024
36 checks passed
@HaoranYi HaoranYi deleted the mergify/bp/v1.18/pr-309 branch March 21, 2024 14:14
anwayde pushed a commit to firedancer-io/agave that referenced this pull request Jul 23, 2024
…anza-xyz#337)

* Revert deprecate executable feature (anza-xyz#309)

* revert deprecate executable feature

* add native loader account transfer test

---------

Co-authored-by: HaoranYi <haoran.yi@solana.com>
(cherry picked from commit 0f8f8cd)

# Conflicts:
#	programs/bpf_loader/src/lib.rs
#	runtime/src/accounts/mod.rs
#	runtime/src/bank.rs
#	runtime/src/bank/tests.rs
#	sdk/src/account.rs

* fix merge conflict

* fix a test

---------

Co-authored-by: HaoranYi <haoran.yi@gmail.com>
Co-authored-by: HaoranYi <haoran.yi@solana.com>
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.

3 participants