chore: port pythnet features

Author: Reisen

runtime/src/bank.rs

@@ -1409,7 +1409,18 @@ impl Bank {
         bank.update_epoch_schedule();
         bank.update_recent_blockhashes();
         bank.fill_missing_sysvar_cache_entries();
-        bank.update_accumulator();
+
+        // 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 !bank
+            .feature_set
+            .is_active(&feature_set::move_accumulator_to_end_of_block::id())
+        {
+            bank.update_accumulator();
+        }
+        
         bank
     }
 
@@ -1775,7 +1786,16 @@ impl Bank {
         );
 
         let (_, update_accumulator_time) = measure!({
-            new.update_accumulator();
+            // 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 !new
+                .feature_set
+                .is_active(&feature_set::move_accumulator_to_end_of_block::id())
+            {
+                new.update_accumulator();
+            }
         });
 
         let (_, fill_sysvar_cache_time) =
@@ -2367,18 +2387,35 @@ 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()
+                }
+            }
         };
 
         debug!("Accumulator: Wormhole message data: {:?}", message.message);
@@ -3491,6 +3528,19 @@ impl Bank {
         // committed before this write lock can be obtained here.
         let mut hash = self.hash.write().unwrap();
         if *hash == Hash::default() {
+            // Update the accumulator before doing other tasks when freezing to avoid any conflicts.
+            if self
+                .feature_set
+                .is_active(&feature_set::move_accumulator_to_end_of_block::id())
+            {
+                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,14 @@ 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");
+}
+
 lazy_static! {
     /// Map of feature identifiers to user-visible description
     pub static ref FEATURE_NAMES: HashMap<Pubkey, &'static str> = [
@@ -679,6 +687,8 @@ 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"),
         /*************** ADD NEW FEATURES HERE ***************/
     ]
     .iter()