Refactor - Makes loader-v4 the default #2796
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The Firedancer team maintains a line-for-line reimplementation of the |
Lichtso
force-pushed
the
rekey/enable_loader_v4
branch
5 times, most recently
from
43b7b38 to
221fd7d
Compare
Lichtso
changed the title
enable_loader_v4
Lichtso
force-pushed
the
rekey/enable_loader_v4
branch
5 times, most recently
from
a1303e6 to
f984bbc
Compare
Lichtso
force-pushed
the
rekey/enable_loader_v4
branch
2 times, most recently
from
eec5813 to
1cb4d44
Compare
Lichtso
force-pushed
the
rekey/enable_loader_v4
branch
6 times, most recently
from
8a2a279 to
19c1df9
Compare
Lichtso
force-pushed
the
rekey/enable_loader_v4
branch
from
19c1df9 to
30f3fcb
Compare
Merged
Lichtso
force-pushed
the
rekey/enable_loader_v4
branch
2 times, most recently
from
95261f9 to
64c09b6
Compare
Lichtso
force-pushed
the
rekey/enable_loader_v4
branch
from
64c09b6 to
2d4b884
Compare
Lichtso
force-pushed
the
rekey/enable_loader_v4
branch
from
2d4b884 to
489694d
Compare
Lichtso
force-pushed
the
rekey/enable_loader_v4
branch
from
489694d to
33f0270
Compare
Lichtso
force-pushed
the
rekey/enable_loader_v4
branch
from
33f0270 to
fc55020
Compare
Lichtso
force-pushed
the
rekey/enable_loader_v4
branch
6 times, most recently
from
8a2d4bc to
f7b5eb0
Compare
Lichtso
force-pushed
the
rekey/enable_loader_v4
branch
3 times, most recently
from
dbb8d90 to
47a487f
Compare
Lichtso
force-pushed
the
rekey/enable_loader_v4
branch
2 times, most recently
from
d2ab272 to
38dacf0
Compare
pgarg66
reviewed
Jan 22, 2025
| @@ -13277,12 +13278,10 @@ fn test_deploy_last_epoch_slot() { | |||
| solana_logger::setup(); | |||
|
|
|||
| // Bank Setup | |||
| let (mut genesis_config, mint_keypair) = create_genesis_config(1_000_000 * LAMPORTS_PER_SOL); | |||
| genesis_config | |||
There was a problem hiding this comment.
Was this line removed on purpose? It doesn't seem related to loader-v4.
There was a problem hiding this comment.
I refactored the test to use loader-v4 and have remove_accounts_executable_flag_checks instead of disable_fees_sysvar as the dummy feature to trigger an environment change.
pgarg66
reviewed
Jan 22, 2025
cli/tests/program.rs
Outdated
| @@ -82,8 +82,17 @@ fn test_cli_program_deploy_non_upgradeable() { | |||
| let mint_keypair = Keypair::new(); | |||
| let mint_pubkey = mint_keypair.pubkey(); | |||
| let faucet_addr = run_local_faucet(mint_keypair, None); | |||
| let test_validator = | |||
| TestValidator::with_no_fees(mint_pubkey, Some(faucet_addr), SocketAddrSpace::Unspecified); | |||
| let test_validator = TestValidatorGenesis::default() | |||
There was a problem hiding this comment.
Maybe it's worth adding a wrapper function, as this block of code is being repeated in multiple tests.
Lichtso
force-pushed
the
rekey/enable_loader_v4
branch
from
38dacf0 to
0c10a9f
Compare
pgarg66
approved these changes
Jan 23, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Problem
Loader-v4 was originally planned as a PRv2 loader, but will be used as default loader (superseding loader-v3) in PRv1 now.
Summary of Changes
enable_program_runtime_v2_and_loader_v4toenable_loader_v4.test_program_upgradeable_locks()(which was introduced in Prevent the invoke and upgrade of programs in the same tx batch solana-labs/solana#14653) and is superseded bytest_program_sbf_invoke_in_same_tx_as_redeployment().test_program_sbf_invoke_upgradeable()intotest_program_sbf_upgrade().test_program_sbf_invoke_upgradeable_via_cpi()andtest_program_sbf_set_upgrade_authority_via_cpi()intotest_program_sbf_upgrade_via_cpi().test_program_sbf_invoke_in_same_tx_as_redeployment()andtest_program_sbf_invoke_in_same_tx_as_undeployment()