feat: fetch publisher buffer key

Author: Riateche

src/agent/services/exporter.rs

@@ -261,6 +261,7 @@ mod exporter {
                             config.exporter.staleness_threshold,
                             config.exporter.unchanged_publish_threshold,
                         ).await {
+                            let publisher_buffer_key = Exporter::get_publisher_buffer_key(&*state).await;
                             if let Err(err) = publish_batches(
                                 state.clone(),
                                 client.clone(),
@@ -270,7 +271,7 @@ mod exporter {
                                 &publish_keypair,
                                 key_store.oracle_program_key,
                                 key_store.publish_program_key,
-                                key_store.publisher_buffer_key,
+                                publisher_buffer_key,
                                 config.exporter.max_batch_size,
                                 config.exporter.staleness_threshold,
                                 config.exporter.compute_unit_limit,

src/agent/services/oracle.rs

@@ -62,6 +62,7 @@ where
         state.clone(),
         key_store.mapping_key,
         key_store.publish_keypair,
+        key_store.publish_program_key,
         config.oracle.max_lookup_batch_size,
     )));
 
@@ -159,6 +160,7 @@ async fn poller<S>(
     state: Arc<S>,
     mapping_key: Pubkey,
     publish_keypair: Option<Keypair>,
+    publish_program_key: Option<Pubkey>,
     max_lookup_batch_size: usize,
 ) where
     S: Oracle,
@@ -183,6 +185,7 @@ async fn poller<S>(
                 network,
                 mapping_key,
                 publish_keypair.as_ref(),
+                publish_program_key,
                 &client,
                 max_lookup_batch_size,
             )

src/agent/solana.rs

@@ -103,13 +103,6 @@ pub mod key_store {
             default
         )]
         pub publish_program_key:  Option<Pubkey>,
-        /// The public key of the publisher's buffer for the Publish program
-        #[serde(
-            serialize_with = "opt_pubkey_string_ser",
-            deserialize_with = "opt_pubkey_string_de",
-            default
-        )]
-        pub publisher_buffer_key: Option<Pubkey>,
         /// The public key of the root mapping account
         #[serde(
             serialize_with = "pubkey_string_ser",
@@ -129,18 +122,15 @@ pub mod key_store {
         /// The keypair used to publish price updates. When None,
         /// publishing will not start until a new keypair is supplied
         /// via the remote loading endpoint
-        pub publish_keypair:      Option<Keypair>,
+        pub publish_keypair:     Option<Keypair>,
         /// Public key of the Oracle program
-        pub oracle_program_key:   Pubkey,
+        pub oracle_program_key:  Pubkey,
         /// Public key of the Publish program
-        pub publish_program_key:  Option<Pubkey>,
-        /// Public key of the publisher's buffer for the publish program
-        pub publisher_buffer_key: Option<Pubkey>,
-
+        pub publish_program_key: Option<Pubkey>,
         /// Public key of the root mapping account
-        pub mapping_key:     Pubkey,
+        pub mapping_key:         Pubkey,
         /// Public key of the accumulator program (if provided)
-        pub accumulator_key: Option<Pubkey>,
+        pub accumulator_key:     Option<Pubkey>,
     }
 
     impl KeyStore {
@@ -161,7 +151,6 @@ pub mod key_store {
                 publish_keypair,
                 oracle_program_key: config.oracle_program_key,
                 publish_program_key: config.publish_program_key,
-                publisher_buffer_key: config.publisher_buffer_key,
                 mapping_key: config.mapping_key,
                 accumulator_key: config.accumulator_key,
             })

src/agent/state/exporter.rs

@@ -81,6 +81,9 @@ pub struct ExporterState {
     /// Currently known permissioned prices of this publisher along with their market hours
     our_prices: RwLock<HashMap<Pubkey, PricePublishingMetadata>>,
 
+    publisher_buffer_key: RwLock<Option<Pubkey>>,
+
+
     /// Recent compute unit price in micro lamports (set if dynamic compute unit pricing is enabled)
     recent_compute_unit_price_micro_lamports: RwLock<Option<u64>>,
 }
@@ -106,6 +109,7 @@ where
         staleness_threshold: Duration,
         unchanged_publish_threshold: Duration,
     ) -> Result<Vec<PermissionedUpdate>>;
+    async fn get_publisher_buffer_key(&self) -> Option<Pubkey>;
     async fn get_recent_compute_unit_price_micro_lamports(&self) -> Option<u64>;
     async fn update_recent_compute_unit_price(
         &self,
@@ -114,11 +118,12 @@ where
         staleness_threshold: Duration,
         unchanged_publish_threshold: Duration,
     ) -> Result<()>;
-    async fn update_permissions(
+    async fn update_on_chain_state(
         &self,
         network: Network,
         publish_keypair: Option<&Keypair>,
         publisher_permissions: HashMap<Pubkey, HashMap<Pubkey, PricePublishingMetadata>>,
+        publisher_buffer_key: Option<Pubkey>,
     ) -> Result<()>;
 }
 
@@ -267,6 +272,10 @@ where
             .collect::<Vec<_>>())
     }
 
+    async fn get_publisher_buffer_key(&self) -> Option<Pubkey> {
+        *self.into().publisher_buffer_key.read().await
+    }
+
     async fn get_recent_compute_unit_price_micro_lamports(&self) -> Option<u64> {
         *self
             .into()
@@ -313,11 +322,12 @@ where
     }
 
     #[instrument(skip(self, publish_keypair, publisher_permissions))]
-    async fn update_permissions(
+    async fn update_on_chain_state(
         &self,
         network: Network,
         publish_keypair: Option<&Keypair>,
         publisher_permissions: HashMap<Pubkey, HashMap<Pubkey, PricePublishingMetadata>>,
+        publisher_buffer_key: Option<Pubkey>,
     ) -> Result<()> {
         let publish_keypair = get_publish_keypair(self, network, publish_keypair).await?;
         *self.into().our_prices.write().await = publisher_permissions
@@ -330,6 +340,7 @@ where
                 );
                 HashMap::new()
             });
+            *self.into().publisher_buffer_key.write().await = publisher_buffer_key;
 
         Ok(())
     }

src/agent/state/oracle.rs

@@ -1,3 +1,6 @@
+use pyth_price_publisher::instruction::PUBLISHER_CONFIG_SEED;
+use solana_sdk::signer::Signer;
+
 #[allow(deprecated)]
 use crate::agent::legacy_schedule::LegacySchedule;
 use {
@@ -135,6 +138,7 @@ pub struct Data {
     pub price_accounts:        HashMap<Pubkey, PriceEntry>,
     /// publisher => {their permissioned price accounts => price publishing metadata}
     pub publisher_permissions: HashMap<Pubkey, HashMap<Pubkey, PricePublishingMetadata>>,
+    pub publisher_buffer_key: Option<Pubkey>,
 }
 
 #[derive(Clone, Serialize, Deserialize, Debug)]
@@ -193,6 +197,7 @@ pub trait Oracle {
         network: Network,
         mapping_key: Pubkey,
         publish_keypair: Option<&Keypair>,
+        publish_program_key: Option<Pubkey>,
         rpc_client: &RpcClient,
         max_lookup_batch_size: usize,
     ) -> Result<()>;
@@ -267,6 +272,7 @@ where
         network: Network,
         mapping_key: Pubkey,
         publish_keypair: Option<&Keypair>,
+        publish_program_key: Option<Pubkey>,
         rpc_client: &RpcClient,
         max_lookup_batch_size: usize,
     ) -> Result<()> {
@@ -311,22 +317,38 @@ where
             }
         }
 
+        let mut publisher_buffer_key = None;
+        if let (Some(publish_program_key), Some(publish_keypair)) = (publish_program_key, publish_keypair) {
+            match fetch_publisher_buffer_key(rpc_client, publish_program_key, publish_keypair.pubkey()).await {
+                Ok(r) => {
+                    publisher_buffer_key = Some(r);
+                }
+                Err(err) => {
+                    tracing::warn!(
+                        "failed to fetch publisher buffer key: {:?}", err
+                    );
+                }
+            }
+        }
+
         let new_data = Data {
             mapping_accounts,
             product_accounts,
             price_accounts,
             publisher_permissions,
+            publisher_buffer_key,
         };
 
         let mut data = self.into().data.write().await;
         log_data_diff(&data, &new_data);
         *data = new_data;
 
-        Exporter::update_permissions(
+        Exporter::update_on_chain_state(
             self,
             network,
             publish_keypair,
             data.publisher_permissions.clone(),
+            data.publisher_buffer_key,
         )
         .await?;
 
@@ -367,6 +389,23 @@ where
     }
 }
 
+async fn fetch_publisher_buffer_key(
+    rpc_client: &RpcClient,
+    publish_program_key: Pubkey,
+    publisher_pubkey: Pubkey,
+) -> Result<Pubkey> {
+    let (publisher_config_key, _bump) = Pubkey::find_program_address(
+        &[
+            PUBLISHER_CONFIG_SEED.as_bytes(),
+            &publisher_pubkey.to_bytes(),
+        ],
+        &publish_program_key,
+    );
+    let data = rpc_client.get_account_data(&publisher_config_key).await?;
+    let config = pyth_price_publisher::accounts::publisher_config::read(&data)?;
+    Ok(config.buffer_account.into())
+}
+
 #[instrument(skip(rpc_client))]
 async fn fetch_mapping_accounts(
     rpc_client: &RpcClient,