use original feature to enable ed25519 builtin

solana-labs · Feb 18, 2022 · e4c9a4a · e4c9a4a
1 parent 389ebcf
commit e4c9a4a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs
@@ -3224,7 +3224,7 @@ impl Bank {
         let (lamports, rent_epoch) = self.inherit_specially_retained_account_fields(&None);
         let account = AccountSharedData::from(Account {
             lamports,
-            owner: solana_sdk::system_program::id(),
+            owner: native_loader::id(),
             data: vec![],
             executable: true,
             rent_epoch,

diff --git a/runtime/src/builtins.rs b/runtime/src/builtins.rs
@@ -178,7 +178,7 @@ fn feature_builtins() -> Vec<(Builtin, Pubkey, ActivationType)> {
                 solana_sdk::ed25519_program::id(),
                 dummy_process_instruction,
             ),
-            feature_set::fix_ed25519_program_owner::id(),
+            feature_set::ed25519_program_enabled::id(),
             ActivationType::NewProgram,
         ),
         (

diff --git a/sdk/src/feature_set.rs b/sdk/src/feature_set.rs
@@ -299,10 +299,6 @@ pub mod add_get_processed_sibling_instruction_syscall {
     solana_sdk::declare_id!("CFK1hRCNy8JJuAAY8Pb2GjLFNdCThS2qwZNe3izzBMgn");
 }
 
-pub mod fix_ed25519_program_owner {
-    solana_sdk::declare_id!("J2bcyU6gyhVBASNT3ZwaMkd5dPFyi83vrT42JhLjJfm7");
-}
-
 lazy_static! {
     /// Map of feature identifiers to user-visible description
     pub static ref FEATURE_NAMES: HashMap<Pubkey, &'static str> = [
@@ -372,7 +368,6 @@ lazy_static! {
         (disable_bpf_deprecated_load_instructions::id(), "Disable ldabs* and ldind* BPF instructions"),
         (disable_bpf_unresolved_symbols_at_runtime::id(), "Disable reporting of unresolved BPF symbols at runtime"),
         (add_get_processed_sibling_instruction_syscall::id(), "add add_get_processed_sibling_instruction_syscall"),
-        (fix_ed25519_program_owner::id(), "fix ed25519 program owner"),
         /*************** ADD NEW FEATURES HERE ***************/
     ]
     .iter()