From 4f2e60fea46b3d12818d48320fc52598a22cbf5f Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 14 Oct 2020 04:47:07 +0000 Subject: [PATCH] Add nop feature set for upcoming ported rent fixes (bp #12841) (#12846) * Add nop feature set for upcoming ported rent fixes (#12841) (cherry picked from commit 7de7efe96c28ff232e304636795a1f1ff3431023) # Conflicts: # runtime/src/feature_set.rs * Update feature_set.rs * Add missing comma... Co-authored-by: Ryo Onodera Co-authored-by: Michael Vines --- runtime/src/feature_set.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/runtime/src/feature_set.rs b/runtime/src/feature_set.rs index 2b203edc94..7eed5960c5 100644 --- a/runtime/src/feature_set.rs +++ b/runtime/src/feature_set.rs @@ -49,6 +49,10 @@ pub mod max_program_call_depth_64 { solana_sdk::declare_id!("YCKSgA6XmjtkQrHBQjpyNrX6EMhJPcYcLWMVgWn36iv"); } +pub mod cumulative_rent_related_fixes { + solana_sdk::declare_id!("FtjnuAtJTWwX3Kx9m24LduNEhzaGuuPfDW6e14SX2Fy5"); +} + lazy_static! { /// Map of feature identifiers to user-visible description pub static ref FEATURE_NAMES: HashMap = [ @@ -63,7 +67,8 @@ lazy_static! { (compute_budget_balancing::id(), "compute budget balancing"), (no_overflow_rent_distribution::id(), "no overflow rent distribution"), (max_invoke_depth_4::id(), "max invoke call depth 4"), - (max_program_call_depth_64::id(), "max program call depth 64") + (max_program_call_depth_64::id(), "max program call depth 64"), + (cumulative_rent_related_fixes::id(), "rent fixes (#10206, #10468, #11342)"), /*************** ADD NEW FEATURES HERE ***************/ ] .iter()