From 863f08f8d3c94af6b5989485e1f1c8c0d6022f2a Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Thu, 4 Feb 2021 21:54:58 -0800 Subject: [PATCH] Sort inflation candidates alphabetically --- sdk/src/feature_set.rs | 158 ++++++++++++++++++++--------------------- 1 file changed, 79 insertions(+), 79 deletions(-) diff --git a/sdk/src/feature_set.rs b/sdk/src/feature_set.rs index e1d7a23e4f..d2e348782f 100644 --- a/sdk/src/feature_set.rs +++ b/sdk/src/feature_set.rs @@ -49,12 +49,12 @@ pub mod full_inflation { } } - pub mod sotcsa { + pub mod bl { pub mod vote { - solana_sdk::declare_id!("EgoekfqCYoraFE5ZkiECGQ945Y5rGBXh3n85sQPuR85r"); + solana_sdk::declare_id!("HRzoLj4jufnYEWosm9kWVgBVFdxAuqB1hu7vLckCuQHa"); } pub mod enable { - solana_sdk::declare_id!("6f8Y2dACzRjM9R9RwiLp9HuAxo43QwtztgHm4BKUGyxU"); + solana_sdk::declare_id!("BLxyQtJPzYZLHyj1p9n5QHUvbPoJt4TtRh7BXbG4M6rR"); } } @@ -66,6 +66,7 @@ pub mod full_inflation { solana_sdk::declare_id!("BSsRT3AcddKioKwfHqzDNmgMPuzWeHKwocWokj21Xxnf"); } } + pub mod bunghi { pub mod vote { solana_sdk::declare_id!("E9hFUVEz29H8XMXk7ygk7ZpCuEuZQ8DJvJKJSTGu1RM6"); @@ -74,34 +75,6 @@ pub mod full_inflation { solana_sdk::declare_id!("5S9JDUb4vKY1CUxLf5oc96ZxjGrephj1jcPeTi62sYmP"); } } - pub mod bl { - pub mod vote { - // The private key for this address is held by the Solana Foundation - solana_sdk::declare_id!("HRzoLj4jufnYEWosm9kWVgBVFdxAuqB1hu7vLckCuQHa"); - } - pub mod enable { - // The private key for this address is held by BL - solana_sdk::declare_id!("BLxyQtJPzYZLHyj1p9n5QHUvbPoJt4TtRh7BXbG4M6rR"); - } - } - - pub mod stakeconomy { - pub mod vote { - solana_sdk::declare_id!("JCergKv4GcywaBzn4JHi3sYJfG7mWenTG3QQDNUJiGS4"); - } - pub mod enable { - solana_sdk::declare_id!("5NUfXNZUsP1ndyShQJ37H2dgHaEGaUNqgT9zn3BTiwct"); - } - } - - pub mod nam { - pub mod vote { - solana_sdk::declare_id!("Hb6tvjY81EmgapxNS4dos1v8Q2RSjQABphu7cnzM4ELa"); - } - pub mod enable { - solana_sdk::declare_id!("NamwT9ejvrfcPXrCHEwp7BvUUFKPgVznu66HZUgFD9w"); - } - } pub mod certusone { pub mod vote { @@ -121,15 +94,6 @@ pub mod full_inflation { } } - pub mod p2pvalidator { - pub mod vote { - solana_sdk::declare_id!("89xUFJyCb3JQ7WbYBK4vza5uyCCTXXv8UQEUCQjo4SbC"); - } - pub mod enable { - solana_sdk::declare_id!("C89S2MdjXuP6UmgmqKpszoUahfXLd4xVeikP8vJMioNE"); - } - } - pub mod lowfeevalidation { pub mod vote { solana_sdk::declare_id!("DcbTexLyN3fM3Y6UtteiYEpgDPbr3PrapczHYFagTPci"); @@ -139,6 +103,24 @@ pub mod full_inflation { } } + pub mod nam { + pub mod vote { + solana_sdk::declare_id!("Hb6tvjY81EmgapxNS4dos1v8Q2RSjQABphu7cnzM4ELa"); + } + pub mod enable { + solana_sdk::declare_id!("NamwT9ejvrfcPXrCHEwp7BvUUFKPgVznu66HZUgFD9w"); + } + } + + pub mod p2pvalidator { + pub mod vote { + solana_sdk::declare_id!("89xUFJyCb3JQ7WbYBK4vza5uyCCTXXv8UQEUCQjo4SbC"); + } + pub mod enable { + solana_sdk::declare_id!("C89S2MdjXuP6UmgmqKpszoUahfXLd4xVeikP8vJMioNE"); + } + } + pub mod rockx { pub mod vote { solana_sdk::declare_id!("8DaPPAGV9mf1YCHzrettgSMFcAT1ePtS3GSGfYka9Rjw"); @@ -147,6 +129,24 @@ pub mod full_inflation { solana_sdk::declare_id!("26Bq2mgEJr93MtGTErrHNnhkDYWMoW7r7VB54r9erb5u"); } } + + pub mod sotcsa { + pub mod vote { + solana_sdk::declare_id!("EgoekfqCYoraFE5ZkiECGQ945Y5rGBXh3n85sQPuR85r"); + } + pub mod enable { + solana_sdk::declare_id!("6f8Y2dACzRjM9R9RwiLp9HuAxo43QwtztgHm4BKUGyxU"); + } + } + + pub mod stakeconomy { + pub mod vote { + solana_sdk::declare_id!("JCergKv4GcywaBzn4JHi3sYJfG7mWenTG3QQDNUJiGS4"); + } + pub mod enable { + solana_sdk::declare_id!("5NUfXNZUsP1ndyShQJ37H2dgHaEGaUNqgT9zn3BTiwct"); + } + } } pub mod spl_token_v2_multisig_fix { @@ -315,34 +315,34 @@ lazy_static! { (use_loaded_executables::id(), "use loaded executable accounts"), (turbine_retransmit_peers_patch::id(), "turbine retransmit peers patch #14631"), (prevent_upgrade_and_invoke::id(), "prevent upgrade and invoke in same tx batch"), - (full_inflation::candidate_example::vote::id(), "community vote allowing candidate_example to enable full inflation"), - (full_inflation::candidate_example::enable::id(), "full inflation enabled by candidate_example"), (track_writable_deescalation::id(), "track account writable deescalation"), (spl_token_v2_self_transfer_fix::id(), "spl-token self-transfer fix"), (matching_buffer_upgrade_authorities::id(), "Upgradeable buffer and program authorities must match"), - (full_inflation::stakeconomy::vote::id(), "Community vote allowing Stakeconomy.com to enable full inflation"), - (full_inflation::stakeconomy::enable::id(), "Full inflation enabled by Stakeconomy.com"), - (full_inflation::nam::vote::id(), "community vote allowing Nam to enable full inflation"), - (full_inflation::nam::enable::id(), "full inflation enabled by Nam"), - (full_inflation::certusone::vote::id(), "Community vote allowing Certus One to enable full inflation"), - (full_inflation::certusone::enable::id(), "Full inflation enabled by Certus One"), - (full_inflation::bl::vote::id(), "Community vote allowing BL to enable full inflation"), + (full_inflation::candidate_example::vote::id(), "Community vote allowing candidate_example to enable full inflation"), + (full_inflation::candidate_example::enable::id(), "Full inflation enabled by candidate_example"), (full_inflation::bl::enable::id(), "Full inflation enabled by BL"), - (full_inflation::bunghi::vote::id(), "Community vote allowing bunghi to enable full inflation"), - (full_inflation::bunghi::enable::id(), "Full inflation enabled by bunghi"), - (full_inflation::buburuza::vote::id(), "Community vote allowing buburuza to enable full inflation"), + (full_inflation::bl::vote::id(), "Community vote allowing BL to enable full inflation"), (full_inflation::buburuza::enable::id(), "Full inflation enabled by buburuza"), - (full_inflation::diman::vote::id(), "Community vote allowing Diman to enable full inflation"), + (full_inflation::buburuza::vote::id(), "Community vote allowing buburuza to enable full inflation"), + (full_inflation::bunghi::enable::id(), "Full inflation enabled by bunghi"), + (full_inflation::bunghi::vote::id(), "Community vote allowing bunghi to enable full inflation"), + (full_inflation::certusone::enable::id(), "Full inflation enabled by Certus One"), + (full_inflation::certusone::vote::id(), "Community vote allowing Certus One to enable full inflation"), (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::lowfeevalidation::vote::id(), "Community vote allowing lowfeevalidation to enable full inflation"), + (full_inflation::diman::vote::id(), "Community vote allowing Diman to enable full inflation"), (full_inflation::lowfeevalidation::enable::id(), "Full inflation enabled by lowfeevalidation"), - (full_inflation::rockx::vote::id(), "Community vote allowing rockx to enable full inflation"), + (full_inflation::lowfeevalidation::vote::id(), "Community vote allowing lowfeevalidation to enable full inflation"), + (full_inflation::nam::enable::id(), "Full inflation enabled by Nam"), + (full_inflation::nam::vote::id(), "Community vote allowing Nam to enable full inflation"), + (full_inflation::p2pvalidator::enable::id(), "Full inflation enabled by p2pvalidator"), + (full_inflation::p2pvalidator::vote::id(), "Community vote allowing p2pvalidator to enable full inflation"), (full_inflation::rockx::enable::id(), "Full inflation enabled by rockx"), + (full_inflation::rockx::vote::id(), "Community vote allowing rockx to enable full inflation"), + (full_inflation::sotcsa::enable::id(), "Full inflation enabled by sotcsa"), + (full_inflation::sotcsa::vote::id(), "Community vote allowing sotcsa to enable full inflation"), + (full_inflation::stakeconomy::enable::id(), "Full inflation enabled by Stakeconomy.com"), + (full_inflation::stakeconomy::vote::id(), "Community vote allowing Stakeconomy.com to enable full inflation"), /*************** ADD NEW FEATURES HERE ***************/ - (full_inflation::sotcsa::vote::id(), "community vote allowing sotcsa to enable full inflation"), - (full_inflation::sotcsa::enable::id(), "full inflation enabled by sotcsa"), ] .iter() .cloned() @@ -373,22 +373,6 @@ lazy_static! { vote_id: full_inflation::candidate_example::vote::id(), enable_id: full_inflation::candidate_example::enable::id(), }, - FullInflationFeaturePair { - vote_id: full_inflation::sotcsa::vote::id(), - enable_id: full_inflation::sotcsa::enable::id(), - }, - FullInflationFeaturePair { - vote_id: full_inflation::stakeconomy::vote::id(), - enable_id: full_inflation::stakeconomy::enable::id(), - }, - FullInflationFeaturePair { - vote_id: full_inflation::nam::vote::id(), - enable_id: full_inflation::nam::enable::id(), - }, - FullInflationFeaturePair { - vote_id: full_inflation::certusone::vote::id(), - enable_id: full_inflation::certusone::enable::id(), - }, FullInflationFeaturePair { vote_id: full_inflation::bl::vote::id(), enable_id: full_inflation::bl::enable::id(), @@ -402,21 +386,37 @@ lazy_static! { enable_id: full_inflation::buburuza::enable::id(), }, FullInflationFeaturePair { - vote_id: full_inflation::diman::vote::id(), - enable_id: full_inflation::diman::enable::id(), + vote_id: full_inflation::certusone::vote::id(), + enable_id: full_inflation::certusone::enable::id(), }, FullInflationFeaturePair { - vote_id: full_inflation::p2pvalidator::vote::id(), - enable_id: full_inflation::p2pvalidator::enable::id(), + vote_id: full_inflation::diman::vote::id(), + enable_id: full_inflation::diman::enable::id(), }, FullInflationFeaturePair { vote_id: full_inflation::lowfeevalidation::vote::id(), enable_id: full_inflation::lowfeevalidation::enable::id(), }, + FullInflationFeaturePair { + vote_id: full_inflation::nam::vote::id(), + enable_id: full_inflation::nam::enable::id(), + }, + FullInflationFeaturePair { + 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(), }, + FullInflationFeaturePair { + vote_id: full_inflation::sotcsa::vote::id(), + enable_id: full_inflation::sotcsa::enable::id(), + }, + FullInflationFeaturePair { + vote_id: full_inflation::stakeconomy::vote::id(), + enable_id: full_inflation::stakeconomy::enable::id(), + }, ] .iter() .cloned()