fixup! pyth: introduce pyth accumulator library

Author: Reisen

runtime/src/bank.rs

@@ -2486,7 +2486,7 @@ 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 {
+    pub fn accumulator(&self) -> sysvar::accumulator::MerkleAccumulator<pythnet_sdk::hashers::keccak256_160::Keccak160> {
         from_account(
             &self
                 .get_account(&sysvar::accumulator::id())
@@ -2524,7 +2524,6 @@ impl Bank {
 
         // Find all accounts owned by the Message Buffer program using get_program_accounts, and
         // extract the account data.
-
         let message_buffer_pid = self.env_pubkey_or(
             "MESSAGE_BUFFER_PID",
             Pubkey::new_from_array(MESSAGE_BUFFER_PID),
@@ -2579,15 +2578,12 @@ impl Bank {
             .sorted_unstable()
             .dedup();
 
-        let pyth_pid = self.env_pubkey_or("PYTH_PID", Pubkey::new_from_array(pythnet::PYTH_PID))?;
-
         // We now generate a Proof PDA (Owned by the System Program) to store the resulting Proof
         // Set. The derivation includes the ring buffer index to simulate a ring buffer in order
         // for RPC users to select the correct proof for an associated VAA.
         let (accumulator_account, _) = Pubkey::find_program_address(
             &[
                 b"AccumulatorState",
-                &pyth_pid.as_ref(),
                 &ring_index.to_be_bytes(),
             ],
             &solana_sdk::system_program::id(),
@@ -2711,7 +2707,6 @@ impl Bank {
         );
 
         self.store_account_and_update_capitalization(&accumulator_sequence_addr, &sequence_account);
-
         self.store_account_and_update_capitalization(&message_pda, &message_account);
 
         Ok(())
@@ -14995,6 +14990,167 @@ pub(crate) mod tests {
         );
     }
 
+    #[test]
+    fn test_update_accumulator_sysvar() {
+        let leader_pubkey = solana_sdk::pubkey::new_rand();
+        let GenesisConfigInfo {
+            mut genesis_config,
+            ..
+        } = create_genesis_config_with_leader(5, &leader_pubkey, 3);
+        genesis_config
+            .accounts
+            .remove(&feature_set::enable_accumulator_sysvar::id())
+            .unwrap();
+        let slots_in_epoch = 32;
+        genesis_config.epoch_schedule = EpochSchedule::new(slots_in_epoch);
+        let mut bank = Bank::new_for_tests(&genesis_config);
+        // Advance past slot 0, which has special handling.
+        bank = new_from_parent(&Arc::new(bank));
+        bank = new_from_parent(&Arc::new(bank));
+
+        // Create Message Account Bytes
+        //
+        // NOTE: This was serialized by hand, but should be replaced with the pythnet-sdk
+        // serializer once implemented. This contains a MessageBuffer with two 127 byte long
+        // messages: [1u8; 127] and [2u8; 127].
+        let preimage = b"account:MessageBuffer";
+        let mut sighash = [0u8; 8];
+        sighash.copy_from_slice(&hashv(&[preimage]).to_bytes()[..8]);
+
+        let mut message_buffer_bytes = vec![];
+        message_buffer_bytes.extend_from_slice(&sighash);
+
+        #[rustfmt::skip]
+        message_buffer_bytes.extend_from_slice(&[
+            // Bump
+            0,
+            // Version
+            1,
+            // Header Length
+            10, 2,
+            // Offsets
+            127, 0,
+            254, 0,
+
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+            1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+            1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+            1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+            1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2,
+            2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+            2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+            2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+            2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+            2, 2, 2, 2, 2, 2
+        ]);
+
+        // Create a Message account.
+        let price_message_key = keypair_from_seed(&[1u8; 32]).unwrap();
+        let mut price_message_account = bank
+            .get_account(&price_message_key.pubkey())
+            .unwrap_or_default();
+        price_message_account.set_lamports(1_000_000_000);
+        price_message_account.set_owner(Pubkey::new_from_array(pythnet_sdk::MESSAGE_BUFFER_PID));
+        price_message_account.set_data(message_buffer_bytes);
+
+        // Store Message account so the accumulator sysvar updater can find it.
+        bank.store_account(
+            &price_message_key.pubkey(),
+            &price_message_account,
+        );
+
+        // 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.clock().slot as u32).to_be_bytes()],
+            &Pubkey::new_from_array(pythnet_sdk::pythnet::WORMHOLE_PID),
+        );
+
+        // Account Data should be empty at this point. Check account data is [].
+        let wormhole_message_account = bank
+            .get_account(&wormhole_message_pubkey)
+            .unwrap_or_default();
+        assert_eq!(wormhole_message_account.data().len(), 0);
+
+        // Run accumulator, the feature is disabled so account data should still be empty. Check
+        // account data is still [].
+        bank.update_accumulator();
+        let wormhole_message_account = bank
+            .get_account(&wormhole_message_pubkey)
+            .unwrap_or_default();
+        assert_eq!(wormhole_message_account.data().len(), 0);
+        assert_eq!(bank
+            .feature_set
+            .is_active(&feature_set::enable_accumulator_sysvar::id()), false);
+
+        // Enable Accumulator Feature (42 = lamport balance, and the meaning of the universe).
+        let feature_id = feature_set::enable_accumulator_sysvar::id();
+        let feature = Feature { activated_at: Some(30) };
+        bank.store_account(&feature_id, &feature::create_account(&feature, 42));
+        bank.compute_active_feature_set(true);
+        for _ in 0..2*slots_in_epoch {
+            bank = new_from_parent(&Arc::new(bank));
+        }
+
+        // Feature should now be enabled on the new bank.
+        assert_eq!(bank
+            .feature_set
+            .is_active(&feature_set::enable_accumulator_sysvar::id()), true);
+
+        // Run accumulator again, the feature is now enabled so account data should contain a
+        // wormhole message.
+        let (wormhole_message_pubkey, _bump) = Pubkey::find_program_address(
+            &[b"AccumulatorMessage", &(bank.clock().slot as u32).to_be_bytes()],
+            &Pubkey::new_from_array(pythnet_sdk::pythnet::WORMHOLE_PID),
+        );
+
+        bank.update_accumulator();
+
+        let wormhole_message_account = bank
+            .get_account(&wormhole_message_pubkey)
+            .unwrap_or_default();
+
+        assert_ne!(wormhole_message_account.data().len(), 0);
+        assert_eq!(wormhole_message_account.data(), vec![
+            109, 115, 117, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 205, 169, 100, 100, 0, 0, 0, 0, 35, 0, 0, 0,
+            0, 0, 0, 0, 26, 0, 225, 1, 250, 237, 172, 88, 81, 227, 43, 155, 35, 181, 249, 65, 26,
+            140, 43, 172, 74, 174, 62, 212, 221, 123, 129, 29, 209, 167, 46, 164, 170, 113, 29, 0,
+            0, 0, 65, 85, 87, 86, 0, 0, 0, 0, 66, 81, 247, 26, 153, 42, 255, 65, 58, 116, 230, 225,
+            135, 123, 152, 229, 157, 49, 120, 78, 52
+        ]);
+
+        // TODO: Should be done here.
+        //
+        // 1. Deserialize the above structure that contains merkle data.
+        // 2. Verify the hashes verify in the merkle tree.
+        // 3. Verify the AccumulatorState account.
+        // 4. Verify the wormhole sequence is incrementing.
+        // 5. Verify the ring buffer actually cycles (advance slot 10_000 times)
+        //
+        // TODO: Should be done as additional tests.
+        //
+        // 1. Verify the accumulator state stays intact after the bank is advanced.
+        // 2. Intentionally add corrupted accounts that do not appear in the accumulator.
+        // 3. Check if message offset is > message size to prevent validator crash.
+    }
+
     fn poh_estimate_offset(bank: &Bank) -> Duration {
         let mut epoch_start_slot = bank.epoch_schedule.get_first_slot_in_epoch(bank.epoch());
         if epoch_start_slot == bank.slot() {

sdk/program/src/sysvar/accumulator.rs

@@ -49,14 +49,15 @@ use crate::sysvar::Sysvar;
 pub use {
     crate::{account_info::AccountInfo, program_error::ProgramError, slot_history::SlotHistory},
     pythnet_sdk::accumulators::merkle::MerkleAccumulator,
+    pythnet_sdk::hashers::keccak256_160::Keccak160,
 };
 
 crate::declare_sysvar_id!(
     "SysvarAccumu1ator11111111111111111111111111",
-    MerkleAccumulator
+    MerkleAccumulator<Keccak160>
 );
 
-impl Sysvar for MerkleAccumulator {
+impl Sysvar for MerkleAccumulator<Keccak160> {
     fn size_of() -> usize {
         0
     }

sdk/program/src/sysvar/mod.rs

@@ -35,6 +35,7 @@ lazy_static! {
         slot_history::id(),
         stake_history::id(),
         instructions::id(),
+        accumulator::id(),
     ];
 }