From 57bf618627364797907a78cd1fbd046b07e3f06d Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Fri, 17 Jan 2020 00:05:33 -0700
Subject: [PATCH] Enable config program at soft launch epoch 0 (#7854)

automerge
---
 genesis-programs/src/lib.rs          | 15 ++++-----------
 local-cluster/tests/local_cluster.rs |  4 ++--
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/genesis-programs/src/lib.rs b/genesis-programs/src/lib.rs
index bd1e42c6c..0d12db88f 100644
--- a/genesis-programs/src/lib.rs
+++ b/genesis-programs/src/lib.rs
@@ -55,11 +55,11 @@ pub fn get_programs(operating_mode: OperatingMode, epoch: Epoch) -> Option<Vec<(
             if epoch == 0 {
                 Some(vec![
                     // Enable all SoftLaunch programs
-                    solana_system_program(),
                     solana_bpf_loader_program!(),
                     solana_config_program!(),
                     solana_stake_program!(),
                     solana_storage_program!(),
+                    solana_system_program(),
                     solana_vest_program!(),
                     solana_vote_program!(),
                     // Programs that are only available in Development mode
@@ -73,25 +73,17 @@ pub fn get_programs(operating_mode: OperatingMode, epoch: Epoch) -> Option<Vec<(
         }
         OperatingMode::SoftLaunch => {
             if epoch == 0 {
-                // Nonce, Voting, Staking and System Program only at epoch 0
                 Some(vec![
+                    solana_config_program!(),
                     solana_stake_program!(),
                     solana_system_program(),
                     solana_vote_program!(),
                 ])
             } else if epoch == std::u64::MAX - 1 {
-                // Archivers are activated next
-                //
                 // The epoch of std::u64::MAX - 1 is a placeholder and is expected to be reduced in
                 // a future hard fork.
-                Some(vec![
-                    solana_config_program!(),
-                    solana_storage_program!(),
-                    solana_vest_program!(),
-                ])
+                Some(vec![solana_storage_program!(), solana_vest_program!()])
             } else if epoch == std::u64::MAX {
-                // Finally 3rd party BPF programs are available
-                //
                 // The epoch of std::u64::MAX is a placeholder and is expected to be reduced in a
                 // future hard fork.
                 Some(vec![solana_bpf_loader_program!()])
@@ -169,6 +161,7 @@ mod tests {
         assert_eq!(
             get_programs(OperatingMode::SoftLaunch, 0),
             Some(vec![
+                solana_config_program!(),
                 solana_stake_program!(),
                 solana_system_program(),
                 solana_vote_program!(),
diff --git a/local-cluster/tests/local_cluster.rs b/local-cluster/tests/local_cluster.rs
index 0e0cb9572..8e91885fa 100644
--- a/local-cluster/tests/local_cluster.rs
+++ b/local-cluster/tests/local_cluster.rs
@@ -572,9 +572,10 @@ fn test_softlaunch_operating_mode() {
 
     // Programs that are available at soft launch epoch 0
     for program_id in [
+        &solana_config_program::id(),
         &solana_sdk::system_program::id(),
-        &solana_vote_program::id(),
         &solana_stake_program::id(),
+        &solana_vote_program::id(),
     ]
     .iter()
     {
@@ -591,7 +592,6 @@ fn test_softlaunch_operating_mode() {
 
     // Programs that are not available at soft launch epoch 0
     for program_id in [
-        &solana_config_program::id(),
         &solana_sdk::bpf_loader::id(),
         &solana_storage_program::id(),
         &solana_vest_program::id(),