From 9d94cc3764c539cac5bd9ceedec85fc4bb36af1b Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 4 Feb 2021 10:50:13 -0800
Subject: [PATCH] Enable inflation candidate for RockX (#15099) (#15100)

(cherry picked from commit c6f572c331522ea28c674a8b6c067ec5c655d9a3)

Co-authored-by: calvinzhou-rockx <55546839+calvinzhou-rockx@users.noreply.github.com>
---
 sdk/src/feature_set.rs | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/sdk/src/feature_set.rs b/sdk/src/feature_set.rs
index 3a43d9bae0..084dc5d1a1 100644
--- a/sdk/src/feature_set.rs
+++ b/sdk/src/feature_set.rs
@@ -120,6 +120,15 @@ pub mod full_inflation {
             solana_sdk::declare_id!("C89S2MdjXuP6UmgmqKpszoUahfXLd4xVeikP8vJMioNE");
         }
     }
+
+    pub mod rockx {
+        pub mod vote {
+            solana_sdk::declare_id!("8DaPPAGV9mf1YCHzrettgSMFcAT1ePtS3GSGfYka9Rjw");
+        }
+        pub mod enable {
+            solana_sdk::declare_id!("26Bq2mgEJr93MtGTErrHNnhkDYWMoW7r7VB54r9erb5u");
+        }
+    }
 }
 
 pub mod spl_token_v2_multisig_fix {
@@ -309,6 +318,8 @@ lazy_static! {
         (full_inflation::diman::enable::id(), "Full inflation enabled by Diman"),
         (full_inflation::p2pvalidator::vote::id(), "Community vote allowing p2pvalidator to enable full inflation"),
         (full_inflation::p2pvalidator::enable::id(), "Full inflation enabled by p2pvalidator"),
+        (full_inflation::rockx::vote::id(), "Community vote allowing rockx to enable full inflation"),
+        (full_inflation::rockx::enable::id(), "Full inflation enabled by rockx"),
         /*************** ADD NEW FEATURES HERE ***************/
     ]
     .iter()
@@ -372,6 +383,10 @@ lazy_static! {
             vote_id: full_inflation::p2pvalidator::vote::id(),
             enable_id: full_inflation::p2pvalidator::enable::id(),
         },
+        FullInflationFeaturePair {
+            vote_id: full_inflation::rockx::vote::id(),
+            enable_id: full_inflation::rockx::enable::id(),
+        },
     ]
     .iter()
     .cloned()