From 85befbc8cdde5699d8f86012a17c17b4d2927f11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Mei=C3=9Fner?= <AlexanderMeissner@gmx.net>
Date: Wed, 11 Aug 2021 00:08:57 +0200
Subject: [PATCH] Removes bpf_loader_upgradeable_program feature gate. (#19102)

---
 ledger/src/builtins.rs               | 19 ++++++++-----------
 local-cluster/tests/local_cluster.rs |  3 ++-
 sdk/src/feature_set.rs               |  5 -----
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/ledger/src/builtins.rs b/ledger/src/builtins.rs
index d002d9126..63311e263 100644
--- a/ledger/src/builtins.rs
+++ b/ledger/src/builtins.rs
@@ -2,7 +2,7 @@ use solana_runtime::{
     bank::{Builtin, Builtins},
     builtins::ActivationType,
 };
-use solana_sdk::{feature_set, pubkey::Pubkey};
+use solana_sdk::pubkey::Pubkey;
 
 macro_rules! to_builtin {
     ($b:expr) => {
@@ -19,25 +19,22 @@ fn genesis_builtins(bpf_jit: bool) -> Vec<Builtin> {
         } else {
             to_builtin!(solana_bpf_loader_program!())
         },
-    ]
-}
-
-/// Builtin programs activated dynamically by feature
-fn feature_builtins(bpf_jit: bool) -> Vec<(Builtin, Pubkey, ActivationType)> {
-    vec![(
         if bpf_jit {
             to_builtin!(solana_bpf_loader_upgradeable_program_with_jit!())
         } else {
             to_builtin!(solana_bpf_loader_upgradeable_program!())
         },
-        feature_set::bpf_loader_upgradeable_program::id(),
-        ActivationType::NewProgram,
-    )]
+    ]
+}
+
+/// Builtin programs activated dynamically by feature
+fn feature_builtins() -> Vec<(Builtin, Pubkey, ActivationType)> {
+    vec![]
 }
 
 pub(crate) fn get(bpf_jit: bool) -> Builtins {
     Builtins {
         genesis_builtins: genesis_builtins(bpf_jit),
-        feature_builtins: feature_builtins(bpf_jit),
+        feature_builtins: feature_builtins(),
     }
 }
diff --git a/local-cluster/tests/local_cluster.rs b/local-cluster/tests/local_cluster.rs
index e97d864cd..19d632cef 100644
--- a/local-cluster/tests/local_cluster.rs
+++ b/local-cluster/tests/local_cluster.rs
@@ -1425,6 +1425,7 @@ fn test_mainnet_beta_cluster_type() {
         &solana_vote_program::id(),
         &solana_sdk::bpf_loader_deprecated::id(),
         &solana_sdk::bpf_loader::id(),
+        &solana_sdk::bpf_loader_upgradeable::id(),
     ]
     .iter()
     {
@@ -1440,7 +1441,7 @@ fn test_mainnet_beta_cluster_type() {
     }
 
     // Programs that are not available at epoch 0
-    for program_id in [&solana_sdk::bpf_loader_upgradeable::id()].iter() {
+    for program_id in [].iter() {
         assert_eq!(
             (
                 program_id,
diff --git a/sdk/src/feature_set.rs b/sdk/src/feature_set.rs
index b982b1f8a..de8b868da 100644
--- a/sdk/src/feature_set.rs
+++ b/sdk/src/feature_set.rs
@@ -75,10 +75,6 @@ pub mod filter_stake_delegation_accounts {
     solana_sdk::declare_id!("GE7fRxmW46K6EmCD9AMZSbnaJ2e3LfqCZzdHi9hmYAgi");
 }
 
-pub mod bpf_loader_upgradeable_program {
-    solana_sdk::declare_id!("FbhK8HN9qvNHvJcoFVHAEUCNkagHvu7DTWzdnLuVQ5u4");
-}
-
 pub mod stake_program_v3 {
     solana_sdk::declare_id!("Ego6nTu7WsBcZBvVqJQKp6Yku2N3mrfG8oYCfaLZkAeK");
 }
@@ -203,7 +199,6 @@ lazy_static! {
         (stake_program_v2::id(), "solana_stake_program v2"),
         (rewrite_stake::id(), "rewrite stake"),
         (filter_stake_delegation_accounts::id(), "filter stake_delegation_accounts #14062"),
-        (bpf_loader_upgradeable_program::id(), "upgradeable bpf loader"),
         (stake_program_v3::id(), "solana_stake_program v3"),
         (require_custodian_for_locked_stake_authorize::id(), "require custodian to authorize withdrawer change for locked stake"),
         (spl_token_v2_self_transfer_fix::id(), "spl-token self-transfer fix"),