pythnet features

Include pythnet features from before 1.14.17 and an update to match the
current genesis state.

Genesis matches the current Pythnet production release when needed. The
activated features are added and the genesis cluster type is fixed to
match what we used to create the genesis at first.

Author: Reisen

genesis/src/main.rs

@@ -565,7 +565,7 @@ fn main() -> Result<(), Box<dyn error::Error>> {
     }
 
     solana_stake_program::add_genesis_accounts(&mut genesis_config);
-    if genesis_config.cluster_type == ClusterType::Development {
+    if genesis_config.cluster_type == ClusterType::MainnetBeta {
         solana_runtime::genesis_utils::activate_pythnet_genesis_features(&mut genesis_config);
     }
 

runtime/src/bank.rs

@@ -1409,7 +1409,28 @@ impl Bank {
         bank.update_epoch_schedule();
         bank.update_recent_blockhashes();
         bank.fill_missing_sysvar_cache_entries();
-        bank.update_accumulator();
+
+        // The features are activated one after another.
+        // The accumulator is moved to end of the block either if the
+        // move_accumulator_to_end_of_block feature is active or if all
+        // the features are active.
+        let accumulator_moved_to_end_of_block = bank
+            .feature_set
+            .is_active(&feature_set::move_accumulator_to_end_of_block::id())
+            ^ bank
+                .feature_set
+                .is_active(&feature_set::undo_move_accumulator_to_end_of_block::id())
+            ^ bank
+                .feature_set
+                .is_active(&feature_set::redo_move_accumulator_to_end_of_block::id());
+        // If the accumulator is not moved to end of block, update the
+        // accumulator last to make sure that the solana fully updated
+        // state before the accumulator is used.  bank is in a fully
+        // updated state before the accumulator is used.
+        if !accumulator_moved_to_end_of_block {
+            bank.update_accumulator();
+        }
+
         bank
     }
 
@@ -1775,7 +1796,26 @@ impl Bank {
         );
 
         let (_, update_accumulator_time) = measure!({
-            new.update_accumulator();
+            // The features are activated one after another.
+            // The accumulator is moved to end of the block either if the
+            // move_accumulator_to_end_of_block feature is active or if all
+            // the features are active.
+            let accumulator_moved_to_end_of_block = new
+                .feature_set
+                .is_active(&feature_set::move_accumulator_to_end_of_block::id())
+                ^ new
+                    .feature_set
+                    .is_active(&feature_set::undo_move_accumulator_to_end_of_block::id())
+                ^ new
+                    .feature_set
+                    .is_active(&feature_set::redo_move_accumulator_to_end_of_block::id());
+            // If the accumulator is not moved to end of block, update the
+            // accumulator last to make sure that all fully updated state before
+            // the accumulator sysvar updates.  sysvars are in a fully updated
+            // state before the accumulator sysvar updates.
+            if !accumulator_moved_to_end_of_block {
+                new.update_accumulator();
+            }
         });
 
         let (_, fill_sysvar_cache_time) =
@@ -2366,17 +2406,34 @@ impl Bank {
 
         // Generate the Message to emit via Wormhole.
         let message = PostedMessageUnreliableData {
-            message: MessageData {
-                vaa_version: 1,
-                consistency_level: 1,
-                vaa_time: 1u32,
-                vaa_signature_account: Pubkey::default().to_bytes(),
-                submission_time: self.clock().unix_timestamp as u32,
-                nonce: 0,
-                sequence: sequence.sequence,
-                emitter_chain: 26,
-                emitter_address: accumulator_emitter_addr.to_bytes(),
-                payload: acc.serialize(self.slot(), ACCUMULATOR_RING_SIZE),
+            message: if !self
+                .feature_set
+                .is_active(&feature_set::zero_wormhole_message_timestamps::id())
+            {
+                MessageData {
+                    vaa_version: 1,
+                    consistency_level: 1,
+                    vaa_time: 1u32,
+                    vaa_signature_account: Pubkey::default().to_bytes(),
+                    submission_time: self.clock().unix_timestamp as u32,
+                    nonce: 0,
+                    sequence: sequence.sequence,
+                    emitter_chain: 26,
+                    emitter_address: accumulator_emitter_addr.to_bytes(),
+                    payload: acc.serialize(self.slot(), ACCUMULATOR_RING_SIZE),
+                }
+            } else {
+                // Use Default::default() to ensure zeroed VAA fields.
+                MessageData {
+                    vaa_version: 1,
+                    consistency_level: 1,
+                    submission_time: self.clock().unix_timestamp as u32,
+                    sequence: sequence.sequence,
+                    emitter_chain: 26,
+                    emitter_address: accumulator_emitter_addr.to_bytes(),
+                    payload: acc.serialize(self.slot(), ACCUMULATOR_RING_SIZE),
+                    ..Default::default()
+                }
             },
         };
 
@@ -3490,6 +3547,30 @@ impl Bank {
         // committed before this write lock can be obtained here.
         let mut hash = self.hash.write().unwrap();
         if *hash == Hash::default() {
+            // The features are activated one after another.
+            // The accumulator is moved to end of the block either if the
+            // move_accumulator_to_end_of_block feature is active or if all
+            // the features are active.
+            let accumulator_moved_to_end_of_block = self
+                .feature_set
+                .is_active(&feature_set::move_accumulator_to_end_of_block::id())
+                ^ self
+                    .feature_set
+                    .is_active(&feature_set::undo_move_accumulator_to_end_of_block::id())
+                ^ self
+                    .feature_set
+                    .is_active(&feature_set::redo_move_accumulator_to_end_of_block::id());
+            // If accumulator move to end of block is active update the accumulator before doing
+            // other tasks when freezing to avoid any conflicts.
+            if accumulator_moved_to_end_of_block {
+                self.update_accumulator();
+            } else {
+                info!(
+                    "Accumulator: Skipping accumulating end of block because the feature is disabled. Slot: {}",
+                    self.slot()
+                );
+            }
+
             // finish up any deferred changes to account state
             self.collect_rent_eagerly(false);
             self.collect_fees();

sdk/src/feature_set.rs

@@ -548,6 +548,22 @@ pub mod enable_accumulator_sysvar {
     solana_sdk::declare_id!("BawYFA2oeA4CacxgQgLn6ZwRWDq1ZPXruUuEbko8oPT5");
 }
 
+pub mod move_accumulator_to_end_of_block {
+    solana_sdk::declare_id!("Ecz7cAP89wKDAoEJYhovFcxMcXRJiWGfFdefcSrx2Ynr");
+}
+
+pub mod zero_wormhole_message_timestamps {
+    solana_sdk::declare_id!("UMg4wFe51vKLHXpbdKWP8kFHWQBsCfbd67AoiyPSaH2");
+}
+
+pub mod undo_move_accumulator_to_end_of_block {
+    solana_sdk::declare_id!("EfmMYu7ajxsKNgtWmDWKYq9Pt5EUrC3qEHAXEVBBT1bs");
+}
+
+pub mod redo_move_accumulator_to_end_of_block {
+    solana_sdk::declare_id!("skyhwRBbP1LoHzWy1QrwLWy3vo2uHkzVV1zpN9UsGuw");
+}
+
 lazy_static! {
     /// Map of feature identifiers to user-visible description
     pub static ref FEATURE_NAMES: HashMap<Pubkey, &'static str> = [
@@ -679,6 +695,10 @@ lazy_static! {
         (move_serialized_len_ptr_in_cpi::id(), "cpi ignore serialized_len_ptr #29592"),
         (enable_request_heap_frame_ix::id(), "Enable transaction to request heap frame using compute budget instruction #30076"),
         (enable_accumulator_sysvar::id(), "enable accumulator sysvar #<GH_ISSUE_NUMBER>"),
+        (move_accumulator_to_end_of_block::id(), "move accumulator to end of block #<GH_ISSUE_NUMBER>"),
+        (zero_wormhole_message_timestamps::id(), "use zeroed timestamps in wormhole messages"),
+        (undo_move_accumulator_to_end_of_block::id(), "undo accumulator end of block change"),
+        (redo_move_accumulator_to_end_of_block::id(), "redo accumulator end of block change"),
         /*************** ADD NEW FEATURES HERE ***************/
     ]
     .iter()
@@ -778,6 +798,33 @@ lazy_static! {
        // expensive, account creation uses older harsher formula.
        // (tx_wide_compute_cap::id(), "transaction wide compute cap"),
        // (reduce_required_deploy_balance::id(), "reduce required payer balance for program deploys"),
+
+       // Features enabled later. This list will be updated as new features are enabled.
+
+       // Slot: 82172256
+       (enable_accumulator_sysvar::id(), "enable accumulator sysvar #<GH_ISSUE_NUMBER>"),
+
+       // Slot: 115868256
+       (preserve_rent_epoch_for_rent_exempt_accounts::id(), "preserve rent epoch for rent exempt accounts #26479"),
+       (nonce_must_be_authorized::id(), "nonce must be authorized"),
+       (nonce_must_be_advanceable::id(), "durable nonces must be advanceable"),
+       (vote_authorize_with_seed::id(), "An instruction you can use to change a vote accounts authority when the current authority is a derived key #25860"),
+       (prevent_crediting_accounts_that_end_rent_paying::id(), "prevent crediting rent paying accounts #26606"),
+       (return_none_for_zero_lamport_accounts::id(), "return none for zero lamport accounts #27800"),
+       (move_accumulator_to_end_of_block::id(), "move accumulator to end of block #<GH_ISSUE_NUMBER>"),
+       (quick_bail_on_panic::id(), "quick bail on panic"),
+       (check_syscall_outputs_do_not_overlap::id(), "check syscall outputs do_not overlap #28600"),
+       (tx_wide_compute_cap::id(), "transaction wide compute cap"),
+       (zero_wormhole_message_timestamps::id(), "use zeroed timestamps in wormhole messages"),
+
+       // Slot: 125372256
+       (move_serialized_len_ptr_in_cpi::id(), "cpi ignore serialized_len_ptr #29592"),
+
+       // Slot: 131852256
+       (undo_move_accumulator_to_end_of_block::id(), "undo accumulator end of block change"),
+
+       // Slot: 152588256
+       (redo_move_accumulator_to_end_of_block::id(), "redo accumulator end of block change"),
    ]
    .iter()
    .cloned()