fixup! pyth: introduce pyth accumulator library

Author: swimricky

runtime/src/bank.rs

@@ -1885,13 +1885,19 @@ impl Bank {
                 new.update_stake_history(Some(parent_epoch));
                 new.update_clock(Some(parent_epoch));
                 new.update_fees();
+            },
+            (),
+            "update_sysvars",
+        );
 
+        let (_, update_accumulator_time) = Measure::this(
+            |_| {
                 // Update the accumulator last to make sure that all sysvars are in a
                 // fully updated state before the accumulator sysvar updates.
                 new.update_accumulator();
             },
             (),
-            "update_sysvars",
+            "update_accumulator",
         );
 
         let (_, fill_sysvar_cache_time) = Measure::this(
@@ -1934,6 +1940,11 @@ impl Bank {
             ("ancestors_us", ancestors_time.as_us(), i64),
             ("update_epoch_us", update_epoch_time.as_us(), i64),
             ("update_sysvars_us", update_sysvars_time.as_us(), i64),
+            (
+                "update_accumulator_us",
+                update_accumulator_time.as_us(),
+                i64
+            ),
             ("fill_sysvar_cache_us", fill_sysvar_cache_time.as_us(), i64),
         );
 
@@ -2484,20 +2495,6 @@ impl Bank {
         });
     }
 
-    /// Loads the Accumulator Sysvar from disk, creating an empty account for it if it does not
-    /// exist already. See `clock` to see a similar sysvar this is based on.
-    pub fn accumulator(
-        &self,
-    ) -> sysvar::accumulator::MerkleAccumulator<pythnet_sdk::hashers::keccak256_160::Keccak160>
-    {
-        from_account(
-            &self
-                .get_account(&sysvar::accumulator::id())
-                .unwrap_or_default(),
-        )
-        .unwrap_or_default()
-    }
-
     /// Updates the Accumulator Sysvar at the start of a new slot. See `update_clock` to see a similar
     /// sysvar this is based on.
     ///
@@ -2510,10 +2507,13 @@ impl Bank {
             .feature_set
             .is_active(&feature_set::enable_accumulator_sysvar::id())
         {
-            info!("Accumulator: Skipping because the feature is disabled. Slot: {}", self.slot());
+            info!(
+                "Accumulator: Skipping because the feature is disabled. Slot: {}",
+                self.slot()
+            );
             return;
         }
- 
+
         info!("Accumulator: Updating accumulator. Slot: {}", self.slot());
         if let Err(e) = self.update_accumulator_impl() {
             error!("Error updating accumulator: {:?}", e);
@@ -2625,7 +2625,10 @@ impl Bank {
 
         // Write the Account Set into `accumulator_state` so that the hermes application can
         // request historical data to prove.
-        info!("Accumulator: Writing accumulator state to {:?}", accumulator_account);
+        info!(
+            "Accumulator: Writing accumulator state to {:?}",
+            accumulator_account
+        );
         self.store_account_and_update_capitalization(&accumulator_account, &accumulator_data);
 
         Ok(())
@@ -15111,10 +15114,7 @@ pub(crate) mod tests {
 
         // Derive the Wormhole Message Account that will be generated by the sysvar updater.
         let (wormhole_message_pubkey, _bump) = Pubkey::find_program_address(
-            &[
-                b"AccumulatorMessage",
-                &(bank.slot() as u32).to_be_bytes(),
-            ],
+            &[b"AccumulatorMessage", &(bank.slot() as u32).to_be_bytes()],
             &Pubkey::new_from_array(pythnet_sdk::pythnet::WORMHOLE_PID),
         );
 
@@ -15242,16 +15242,14 @@ pub(crate) mod tests {
         );
 
         // verify ring buffer cycles
-        let ring_index_before_buffer_cycle =
-            (bank.slot() % ACCUMULATOR_RING_SIZE as u64) as u32;
+        let ring_index_before_buffer_cycle = (bank.slot() % ACCUMULATOR_RING_SIZE as u64) as u32;
         let target_slot = bank.slot() + ACCUMULATOR_RING_SIZE as u64;
         // advance ACCUMULATOR_RING_SIZE slots using warp_from_parent since doing large loops
         // with new_from_parent takes a long time. warp_from_parent results in a bank that is frozen.
         bank = Bank::warp_from_parent(&Arc::new(bank), &Pubkey::default(), target_slot);
 
         // accumulator messages should still be the same before looping around
-        let ring_index_after_buffer_cycle =
-            (bank.slot() % ACCUMULATOR_RING_SIZE as u64) as u32;
+        let ring_index_after_buffer_cycle = (bank.slot() % ACCUMULATOR_RING_SIZE as u64) as u32;
         assert_eq!(
             ring_index_before_buffer_cycle,
             ring_index_after_buffer_cycle

sdk/program/src/sysvar/mod.rs

@@ -9,7 +9,6 @@ use {
     lazy_static::lazy_static,
 };
 
-pub mod accumulator;
 pub mod clock;
 pub mod epoch_schedule;
 pub mod fees;
@@ -35,7 +34,6 @@ lazy_static! {
         slot_history::id(),
         stake_history::id(),
         instructions::id(),
-        accumulator::id(),
     ];
 }