feat: accumulator v2 (wip 3)

Author: Reisen

Cargo.lock

@@ -35,7 +35,7 @@ num-traits = { version = "0.2" }
 num_cpus = "1.13.1"
 once_cell = "1.12.0"
 ouroboros = "0.15.0"
-pyth-oracle = { path = "../../pyth-client/program/rust" }
+pyth-oracle = { path = "../../pyth-client/program/rust", features = ["library"] }
 pythnet-sdk = { git = "https://github.com/pyth-network/pyth-crosschain", version = "1.13.6", rev = "e670f57f89b05398ca352e4accb1e32724a8e1b4" }
 rand = "0.7.0"
 rayon = "1.5.3"

runtime/Cargo.toml

@@ -97,6 +97,7 @@ pub fn update_accumulator(bank: &Bank) {
             };
     }
 
+    // TODO: No longer a slot or feature flag, based on price account flag.
     if (*ACCUMULATOR_V2_SLOT).map_or(false, |v2_slot| bank.slot() >= v2_slot) {
         if let Err(e) = update_v2(bank) {
             error!("Error updating accumulator: {:?}", e);
@@ -398,14 +399,28 @@ pub fn update_v2(bank: &Bank) -> std::result::Result<(), AccumulatorUpdateErrorV
         .get_program_accounts(&oracle_pubkey, &ScanConfig::new(true))
         .map_err(AccumulatorUpdateErrorV2::GetProgramAccounts)?;
 
-    // 3. Filter for Price Accounts
-    let accounts = accounts.iter().filter(|(_, account)| true);
+    // 3. Call Aggregation on Price Accounts.
+    for (pubkey, mut account) in accounts {
+        let mut price_account_data = account.data().to_owned();
+
+        // Perform Accumulation
+        match pyth_oracle::validator::aggregate_price(
+            bank.slot(),
+            bank.clock().unix_timestamp,
+            &mut price_account_data,
+        ) {
+            Ok(success) => {
+                if success {
+                    account.set_data(price_account_data);
+                    bank.store_account_and_update_capitalization(&pubkey, &account);
+                }
+            }
+            Err(err) => trace!("Aggregation: failed to update_price_cumulative, {:?}", err),
+        }
+    }
 
-    // 4. Pass the PriceAccounts to the Oracle Code
-    //    - Change Oracle to not run update code.
-    //    - Change Oracle to have the aggregation code itself as a pure function.
-    //    - Call aggregation with PriceAccount as input.
     // 5. Merkleize the results.
+
     // 6. Create Wormhole Message Account
 
     Ok(())