Batch publish (pyth-network#313, pyth-network#314, pyth-network#315)

--- Batch publish (pyth-network#313) * feat: batch publish * feat: batch publish 2 (wip) * feat: verify that price feed index is set * refactor: add pyth module * feat: integrate pyth-price-publisher * refactor: rename and move get_accumulator_keys * test: make sure batch publish does not apply prices when price_index == 0 * chore: fix format * fix: update deps --- Update dependency, program id and test for pyth-price-store (pyth-network#314) * test: modify batch publish tests * chore: use real batch publish pid as default * chore: update pyth-price-store dependency --- Rename price store env var and bump version (pyth-network#315) * chore: rename variable for pyth store pid * chore: bump pythnet version to 1.14.179
ilya-bobyr · Dec 19, 2024 · cf9e64d · cf9e64d
1 parent 34d46d3
commit cf9e64d
Show file tree

Hide file tree

Showing 14 changed files with 526 additions and 94 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -97,14 +97,21 @@ exclude = [
 # This prevents a Travis CI error when building for Windows.
 resolver = "2"
 
-# At the moment, there is no `oracle-v2.33.1` release in the
-# `pyth-network/pyth-client` repository.  This is an unreleased version that is
-# almost identical to `oracle-v2.33.0`, except that it removes strict version
-# constraints from the Solana dependencies.
+# At the moment, there is no `oracle-v2.33.1` or `oracle-v2.33.2` releases in
+# the `pyth-network/pyth-client` repository.
 #
+# `pythnet-update-oracle-v2.33.1` removes strict version constraints from the
+#      Solana dependencies.
+#
+# `pythnet-update-oracle-v2.33.2` cheery picks
+#     `256b575a13e29bec93ba592c8f86cc5fad521915` "Add feed index for batch
+#     publish (#416)" on top.
+#
+# There is a similar override in `programs/bpf/Cargo.toml`.  Please keep both in
+# sync.
 [patch."https://github.com/pyth-network/pyth-client".pyth-oracle]
 git = "https://github.com/ilya-bobyr/pyth-client"
-branch = "pythnet-update-oracle-v2.33.1"
+branch = "pythnet-update-oracle-v2.33.2"
 
 [patch.crates-io]
 # We include a number of crates as our dependencies above from crates.io:

diff --git a/core/src/validator.rs b/core/src/validator.rs
@@ -76,7 +76,7 @@ use {
         accounts_db::{AccountShrinkThreshold, AccountsDbConfig},
         accounts_index::AccountSecondaryIndexes,
         accounts_update_notifier_interface::AccountsUpdateNotifier,
-        bank::{pyth_accumulator, Bank},
+        bank::{pyth, Bank},
         bank_forks::BankForks,
         commitment::BlockCommitmentCache,
         cost_model::CostModel,
@@ -1535,14 +1535,8 @@ fn load_blockstore(
         }
     }
 
-    for (key_name, pk_res) in pyth_accumulator::get_accumulator_keys() {
-        match pk_res {
-            Ok(pk) => info!("Accumulator {}: {}", key_name, pk),
-            Err(err) => {
-                error!("Failed to get Accumulator {}: {:?}", key_name, err);
-                std::process::abort();
-            }
-        }
+    for (key_name, pk) in pyth::get_pyth_keys() {
+        info!("Pyth key {}: {}", key_name, pk);
     }
 
     leader_schedule_cache.set_fixed_leader_schedule(config.fixed_leader_schedule.clone());

diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock
diff --git a/programs/bpf/Cargo.toml b/programs/bpf/Cargo.toml
@@ -104,7 +104,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 # sync.
 [patch."https://github.com/pyth-network/pyth-client".pyth-oracle]
 git = "https://github.com/ilya-bobyr/pyth-client"
-branch = "pythnet-update-oracle-v2.33.1"
+branch = "pythnet-update-oracle-v2.33.2"
 
 [patch.crates-io]
 # See root level `Cargo.toml` for an explanation of this patch.  Keep them in

diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
@@ -35,8 +35,9 @@ num-traits = { version = "0.2" }
 num_cpus = "1.13.1"
 once_cell = "1.12.0"
 ouroboros = "0.15.0"
-pyth-oracle = { git = "https://github.com/pyth-network/pyth-client", tag = "oracle-v2.33.0", features = ["library"] }
+pyth-oracle = { git = "https://github.com/pyth-network/pyth-client", rev = "256b57", features = ["library"] }
 pythnet-sdk = { git = "https://github.com/pyth-network/pyth-crosschain", version = "1.13.6", rev = "33f901aa45f4f0005aa5a84a1479b78ca9033074" }
+pyth-price-store = "0.1.0"
 rand = "0.7.0"
 rayon = "1.5.3"
 regex = "1.5.6"

diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs
@@ -198,10 +198,7 @@ mod builtin_programs;
 mod sysvar_cache;
 mod transaction_account_state_info;
 
-pub mod pyth_accumulator;
-
-#[cfg(test)]
-mod pyth_accumulator_tests;
+pub mod pyth;
 
 pub const SECONDS_PER_YEAR: f64 = 365.25 * 24.0 * 60.0 * 60.0;
 
@@ -1410,7 +1407,7 @@ impl Bank {
         // 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 {
-            pyth_accumulator::update_accumulator(&bank);
+            pyth::accumulator::update_accumulator(&bank);
         }
 
         bank
@@ -1796,7 +1793,7 @@ impl Bank {
             // the accumulator sysvar updates.  sysvars are in a fully updated
             // state before the accumulator sysvar updates.
             if !accumulator_moved_to_end_of_block {
-                pyth_accumulator::update_accumulator(&new);
+                pyth::accumulator::update_accumulator(&new);
             }
         });
 
@@ -3238,7 +3235,7 @@ impl Bank {
             // other tasks when freezing to avoid any conflicts.
             if accumulator_moved_to_end_of_block {
                 let mut measure = Measure::start("accumulator");
-                pyth_accumulator::update_accumulator(self);
+                pyth::accumulator::update_accumulator(self);
                 measure.stop();
 
                 debug!(

diff --git a/runtime/src/bank/pyth_accumulator.rs → runtime/src/bank/pyth/accumulator.rs b/runtime/src/bank/pyth_accumulator.rs → runtime/src/bank/pyth/accumulator.rs
@@ -1,7 +1,11 @@
 use {
-    super::Bank,
-    crate::accounts_index::{IndexKey, ScanConfig, ScanError},
+    super::batch_publish,
+    crate::{
+        accounts_index::{IndexKey, ScanConfig, ScanError},
+        bank::Bank,
+    },
     byteorder::{LittleEndian, ReadBytesExt},
+    itertools::Itertools,
     log::*,
     pyth_oracle::validator::AggregationError,
     pythnet_sdk::{
@@ -17,7 +21,10 @@ use {
         hash::hashv,
         pubkey::Pubkey,
     },
-    std::env::{self, VarError},
+    std::{
+        collections::HashMap,
+        env::{self, VarError},
+    },
 };
 
 pub const ACCUMULATOR_RING_SIZE: u32 = 10_000;
@@ -51,6 +58,12 @@ lazy_static! {
             .parse()
             .unwrap(),
     );
+    pub static ref PRICE_STORE_PID: Pubkey = env_pubkey_or(
+        "PRICE_STORE_PID",
+        "3m6sv6HGqEbuyLV84mD7rJn4MAC9LhUa1y1AUNVqcPfr"
+            .parse()
+            .unwrap(),
+    );
 }
 
 /// Accumulator specific error type. It would be nice to use `transaction::Error` but it does
@@ -116,25 +129,6 @@ fn env_pubkey_or(var: &str, default: Pubkey) -> Pubkey {
     }
 }
 
-/// Get all accumulator related pubkeys from environment variables
-/// or return default if the variable is not set.
-pub fn get_accumulator_keys() -> Vec<(
-    &'static str,
-    std::result::Result<Pubkey, AccumulatorUpdateErrorV1>,
-)> {
-    vec![
-        ("MESSAGE_BUFFER_PID", Ok(*MESSAGE_BUFFER_PID)),
-        ("ACCUMULATOR_EMITTER_ADDR", Ok(*ACCUMULATOR_EMITTER_ADDR)),
-        ("ACCUMULATOR_SEQUENCE_ADDR", Ok(*ACCUMULATOR_SEQUENCE_ADDR)),
-        ("WORMHOLE_PID", Ok(*WORMHOLE_PID)),
-        ("ORACLE_PID", Ok(*ORACLE_PID)),
-        (
-            "STAKE_CAPS_PARAMETERS_ADDR",
-            Ok(*STAKE_CAPS_PARAMETERS_ADDR),
-        ),
-    ]
-}
-
 pub fn update_v1(
     bank: &Bank,
     v2_messages: &[Vec<u8>],
@@ -425,21 +419,37 @@ pub fn update_v2(bank: &Bank) -> std::result::Result<(), AccumulatorUpdateErrorV
         v2_messages.push(publisher_stake_caps_message);
     }
 
-    let mut measure = Measure::start("update_v2_aggregate_price");
+    let mut measure = Measure::start("extract_batch_publish_prices");
+    let mut new_prices = batch_publish::extract_batch_publish_prices(bank).unwrap_or_else(|err| {
+        warn!("extract_batch_publish_prices failed: {}", err);
+        HashMap::new()
+    });
+    measure.stop();
+    debug!("batch publish: loaded prices in {}us", measure.as_us());
 
+    let mut measure = Measure::start("update_v2_aggregate_price");
     for (pubkey, mut account) in accounts {
         let mut price_account_data = account.data().to_owned();
+        let price_account =
+            match pyth_oracle::validator::checked_load_price_account_mut(&mut price_account_data) {
+                Ok(data) => data,
+                Err(_err) => {
+                    continue;
+                }
+            };
+
+        let mut need_save =
+            batch_publish::apply_published_prices(price_account, &mut new_prices, bank.slot());
 
         // Perform Accumulation
         match pyth_oracle::validator::aggregate_price(
             bank.slot(),
             bank.clock().unix_timestamp,
             &pubkey.to_bytes().into(),
-            &mut price_account_data,
+            price_account,
         ) {
             Ok(messages) => {
-                account.set_data(price_account_data);
-                bank.store_account_and_update_capitalization(&pubkey, &account);
+                need_save = true;
                 v2_messages.extend(messages);
             }
             Err(err) => match err {
@@ -449,6 +459,16 @@ pub fn update_v2(bank: &Bank) -> std::result::Result<(), AccumulatorUpdateErrorV
                 }
             },
         }
+        if need_save {
+            account.set_data(price_account_data);
+            bank.store_account_and_update_capitalization(&pubkey, &account);
+        }
+    }
+    if !new_prices.is_empty() {
+        warn!(
+            "pyth batch publish: missing price feed accounts for indexes: {}",
+            new_prices.keys().join(", ")
+        );
     }
 
     measure.stop();