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.

Sign up for GitHub

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

Jump to bottom

Revert "change test validator from non upgradable bpf loader to upgra… #30409

Merged
merged 1 commit into from
Feb 20, 2023
Merged

Revert "change test validator from non upgradable bpf loader to upgra… #30409

merged 1 commit into from
Feb 20, 2023

Conversation

CriesofCarrots
Copy link
Contributor

@CriesofCarrots CriesofCarrots commented Feb 20, 2023 •
edited
Loading

…dable bpf loader (#29051)"

This reverts commit b43eaba.

Problem

#29051 broke solana-test-validator --bpf-program. To use the upgradeable bpf loader, a program must have a separate programdata account; simply changing the owning program is not enough.

Summary of Changes

Revert

Will follow with proper TestValidator support for the upgradeable loader.

Fixes #30402

@CriesofCarrots CriesofCarrots added the v1.15 (abandoned) The v1.15 branch has been abandoned label Feb 20, 2023
@CriesofCarrots
Copy link
Contributor Author

CriesofCarrots commented Feb 20, 2023 •
edited
Loading

Argument for v1.15 backport is the flag is currently broken in all v1.15 releases.
Backport of upgradeable-program support can be a separate discussion.

joncinque
joncinque approved these changes Feb 20, 2023
View reviewed changes
Copy link
Contributor

@joncinque joncinque left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for fixing this. That was short-sighted of me, apologies

@CriesofCarrots CriesofCarrots added the automerge Merge this Pull Request automatically once CI passes label Feb 20, 2023
@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Feb 20, 2023
@mergify
Copy link
Contributor

mergify bot commented Feb 20, 2023

automerge label removed due to a CI failure

@CriesofCarrots
Copy link
Contributor Author

CriesofCarrots commented Feb 20, 2023 •
edited
Loading

Merging on red assert_instruction_count: #30411 (comment)
(This PR doesn't touch programs or sdk)

@CriesofCarrots CriesofCarrots merged commit 47777c4 into solana-labs:master Feb 20, 2023
mergify bot pushed a commit that referenced this pull request Feb 20, 2023
@CriesofCarrots @mergify
Revert "change test validator from non upgradable bpf loader to upgra… (
3daa072 
#30409)

Revert "change test validator from non upgradable bpf loader to upgradable bpf loader (#29051)"

This reverts commit b43eaba.

(cherry picked from commit 47777c4)
@mergify mergify bot mentioned this pull request Feb 20, 2023
Closed
godmodegalactus
godmodegalactus reviewed Feb 21, 2023
View reviewed changes
validator/src/bin/solana-test-validator.rs
@@ -204,7 +204,7 @@ fn main() {

programs_to_load.push(ProgramInfo {
program_id: address,
loader: solana_sdk::bpf_loader_upgradeable::id(),
loader: solana_sdk::bpf_loader::id(),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey,

I had the same idea, But in genesis we pass the bootloader program id to specify which loader to use for the program.
Is old loader deprecated and we now use this loader for all the programs?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand your question. This change is a revert to the old immutable loader.
We are, however, considering proper support for the upgradeable loader in solana-test-validator, as well as defaulting to the upgradeable loader: #30412

nickfrosty pushed a commit to nickfrosty/solana that referenced this pull request Mar 12, 2023
@CriesofCarrots @nickfrosty
Revert "change test validator from non upgradable bpf loader to upgra… (
73c59f9 
solana-labs#30409)

Revert "change test validator from non upgradable bpf loader to upgradable bpf loader (solana-labs#29051)"

This reverts commit b43eaba.
@vadorovsky vadorovsky mentioned this pull request May 13, 2023
Merged
vadorovsky pushed a commit to Lightprotocol/solana that referenced this pull request May 13, 2023
@CriesofCarrots @vadorovsky
Revert "change test validator from non upgradable bpf loader to upgra… (
d1e28b2 
solana-labs#30409)

Revert "change test validator from non upgradable bpf loader to upgradable bpf loader (solana-labs#29051)"

This reverts commit b43eaba.

(cherry picked from commit 47777c4)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@godmodegalactus godmodegalactus godmodegalactus left review comments

@joncinque joncinque joncinque approved these changes

@mvines mvines Awaiting requested review from mvines

Assignees
No one assigned
Labels
v1.15 (abandoned) The v1.15 branch has been abandoned
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

v1.15.2 solana-test-validator --bpf-program flag seems to be broken
3 participants
@CriesofCarrots @joncinque @godmodegalactus