diff --git a/programs/bpf/rust/sysvar/src/lib.rs b/programs/bpf/rust/sysvar/src/lib.rs index f5994d09a..eba719eea 100644 --- a/programs/bpf/rust/sysvar/src/lib.rs +++ b/programs/bpf/rust/sysvar/src/lib.rs @@ -10,7 +10,6 @@ use solana_program::{ msg, program_error::ProgramError, pubkey::Pubkey, - system_program, sysvar::{ self, clock::Clock, epoch_schedule::EpochSchedule, instructions, rent::Rent, slot_hashes::SlotHashes, slot_history::SlotHistory, stake_history::StakeHistory, Sysvar, @@ -47,7 +46,7 @@ pub fn process_instruction( // Instructions msg!("Instructions identifier:"); sysvar::instructions::id().log(); - assert_eq!(*accounts[4].owner, system_program::id()); + assert_eq!(*accounts[4].owner, sysvar::id()); let index = instructions::load_current_index(&accounts[4].try_borrow_data()?); assert_eq!(0, index); diff --git a/sdk/src/feature_set.rs b/sdk/src/feature_set.rs index a6bdac9c8..d573f83b1 100644 --- a/sdk/src/feature_set.rs +++ b/sdk/src/feature_set.rs @@ -30,10 +30,6 @@ pub mod instructions_sysvar_enabled { solana_sdk::declare_id!("EnvhHCLvg55P7PDtbvR1NwuTuAeodqpusV3MR5QEK8gs"); } -pub mod instructions_sysvar_owned_by_sysvar { - solana_sdk::declare_id!("H3kBSaKdeiUsyHmeHqjJYNc27jesXZ6zWj3zWkowQbkV"); -} - pub mod deprecate_rewards_sysvar { solana_sdk::declare_id!("GaBtBJvmS4Arjj5W1NmFcyvPjsHN38UGYDq2MDwbs9Qu"); } @@ -199,6 +195,10 @@ pub mod libsecp256k1_fail_on_bad_count { solana_sdk::declare_id!("8aXvSuopd1PUj7UhehfXJRg6619RHp8ZvwTyyJHdUYsj"); } +pub mod instructions_sysvar_owned_by_sysvar { + solana_sdk::declare_id!("H3kBSaKdeiUsyHmeHqjJYNc27jesXZ6zWj3zWkowQbkV"); +} + pub mod close_upgradeable_program_accounts { solana_sdk::declare_id!("EQMtCuSAkMVF9ZdhGuABtgvyXJLtSRF5AQKv1RNsrhj7"); } @@ -231,6 +231,7 @@ lazy_static! { (blake3_syscall_enabled::id(), "blake3 syscall"), (dedupe_config_program_signers::id(), "dedupe config program signers"), (deterministic_shred_seed_enabled::id(), "deterministic shred seed"), + (verify_tx_signatures_len::id(), "prohibit extra transaction signatures"), (vote_stake_checked_instructions::id(), "vote/state program checked instructions #18345"), (updated_verify_policy::id(), "update verify policy"), (neon_evm_compute_budget::id(), "bump neon_evm's compute budget"), @@ -246,6 +247,7 @@ lazy_static! { (mem_overlap_fix::id(), "memory overlap fix"), (versioned_tx_message_enabled::id(), "enable versioned transaction message processing"), (libsecp256k1_fail_on_bad_count::id(), "Fail libsec256k1_verify if count appears wrong"), + (instructions_sysvar_owned_by_sysvar::id(), "fix owner for instructions sysvar"), (close_upgradeable_program_accounts::id(), "enable closing upgradeable program accounts"), /*************** ADD NEW FEATURES HERE ***************/ ]