chore: Fix pyth sdk (#59)

* chore: Fix pyth sdk

* Fix lints

Cargo.toml

@@ -29,6 +29,7 @@ anchor-spl = "=0.29.0"
 anyhow = "1.0"
 base64 = "~0.21"
 bincode = "1.3"
+borsh = "0.10.3"
 bytemuck = "1.17.1"
 bzip2 = "0.4"
 cargo_metadata = "=0.18.1"
@@ -40,7 +41,6 @@ indicatif = "0.17"
 log = "0.4"
 nom = "~7"
 proc-macro2 = "1.0"
-pyth-solana-receiver-sdk = "0.3.1"
 quote = "1.0"
 rayon = "1.10.0"
 regex = "1.10.6"

plugin/Cargo.toml

@@ -30,7 +30,6 @@ sablier-thread-program = { workspace = true, features = ["no-entrypoint"] }
 sablier-webhook-program = { workspace = true, features = ["no-entrypoint"] }
 sablier-utils.workspace = true
 log.workspace = true
-pyth-solana-receiver-sdk.workspace = true
 reqwest.workspace = true
 solana-account-decoder.workspace = true
 solana-client.workspace = true

plugin/src/builders/thread_exec.rs

@@ -4,7 +4,7 @@ use anchor_lang::{InstructionData, ToAccountMetas};
 use log::info;
 use sablier_network_program::state::Worker;
 use sablier_thread_program::state::{Trigger, VersionedThread};
-use sablier_utils::thread::PAYER_PUBKEY;
+use sablier_utils::{pyth::get_oracle_key, thread::PAYER_PUBKEY};
 use solana_account_decoder::UiAccountEncoding;
 use solana_client::{
     nonblocking::rpc_client::RpcClient,
@@ -21,7 +21,7 @@ use solana_sdk::{
     transaction::Transaction,
 };
 
-use crate::{error::PluginError, utils::get_oracle_key};
+use crate::error::PluginError;
 
 /// Max byte size of a serialized transaction.
 static TRANSACTION_MESSAGE_SIZE_LIMIT: usize = 1_232;

plugin/src/events.rs

@@ -1,6 +1,6 @@
 use anchor_lang::{AccountDeserialize, Discriminator};
-use pyth_solana_receiver_sdk::price_update::{PriceFeedMessage, PriceUpdateV2};
 use sablier_thread_program::state::{Thread, VersionedThread};
+use sablier_utils::pyth::{self, PriceFeedMessage, PriceUpdateV2};
 use sablier_webhook_program::state::Webhook;
 use solana_geyser_plugin_interface::geyser_plugin_interface::ReplicaAccountInfoVersions;
 use solana_sdk::{clock::Clock, pubkey::Pubkey, sysvar};
@@ -59,7 +59,7 @@ fn parse_event(
         }
     }
 
-    if owner == pyth_solana_receiver_sdk::ID {
+    if owner == pyth::ID {
         return Ok(Some(AccountUpdateEvent::PriceFeed {
             price_feed: PriceUpdateV2::try_deserialize(&mut data)?.price_message,
         }));

plugin/src/observers/thread.rs

@@ -7,12 +7,12 @@ use std::{
 
 use chrono::DateTime;
 use log::info;
-use pyth_solana_receiver_sdk::price_update::PriceFeedMessage;
 use sablier_cron::Schedule;
 use sablier_thread_program::state::{Equality, Trigger, TriggerContext, VersionedThread};
+use sablier_utils::pyth::{get_oracle_key, PriceFeedMessage};
 use solana_program::{clock::Clock, pubkey::Pubkey};
 
-use crate::{error::PluginError, observers::state::PythThread, utils::get_oracle_key};
+use crate::{error::PluginError, observers::state::PythThread};
 
 use super::state::{
     AccountThreads, Clocks, CronThreads, EpochThreads, NowThreads, PythThreads, SlotThreads,

plugin/src/utils.rs

@@ -1,15 +1,5 @@
-use pyth_solana_receiver_sdk::price_update::FeedId;
-use solana_program::pubkey::Pubkey;
 use solana_sdk::signature::{read_keypair_file, Keypair};
 
-pub fn get_oracle_key(shard_id: u16, feed_id: FeedId) -> Pubkey {
-    let (pubkey, _) = Pubkey::find_program_address(
-        &[&shard_id.to_be_bytes(), &feed_id],
-        &pyth_solana_receiver_sdk::PYTH_PUSH_ORACLE_ID,
-    );
-    pubkey
-}
-
 pub fn read_or_new_keypair(keypath: Option<String>) -> Keypair {
     match keypath {
         Some(keypath) => read_keypair_file(keypath).unwrap(),

programs/thread/Cargo.toml

@@ -27,5 +27,4 @@ chrono = { workspace = true, features = ["alloc"] }
 sablier-cron.workspace = true
 sablier-network-program = { features = ["cpi"], workspace = true }
 sablier-utils.workspace = true
-pyth-solana-receiver-sdk.workspace = true
 version.workspace = true

programs/thread/src/instructions/thread_kickoff.rs

@@ -6,10 +6,12 @@ use std::{
 
 use anchor_lang::prelude::*;
 use chrono::DateTime;
-use pyth_solana_receiver_sdk::price_update::PriceUpdateV2;
 use sablier_cron::Schedule;
 use sablier_network_program::state::{Worker, WorkerAccount};
-use sablier_utils::thread::Trigger;
+use sablier_utils::{
+    pyth::{self, PriceUpdateV2},
+    thread::Trigger,
+};
 
 use crate::{constants::*, errors::*, state::*};
 
@@ -207,7 +209,7 @@ pub fn handler(ctx: Context<ThreadKickoff>) -> Result<()> {
                 Some(account_info) => {
                     require_keys_eq!(
                         *account_info.owner,
-                        pyth_solana_receiver_sdk::ID,
+                        pyth::ID,
                         SablierError::TriggerConditionFailed
                     );
                     const STALENESS_THRESHOLD: u64 = 60; // staleness threshold in seconds

utils/Cargo.toml

@@ -16,10 +16,11 @@ name = "sablier_utils"
 [dependencies]
 anchor-lang.workspace = true
 base64.workspace = true
+borsh.workspace = true
 serde = { workspace = true, features = ["derive"] }
 static-pubkey.workspace = true
 sablier-macros.workspace = true
-pyth-solana-receiver-sdk.workspace = true
+solana-program.workspace = true
 
 [dev-dependencies]
 solana-sdk.workspace = true

utils/src/lib.rs

@@ -1,6 +1,7 @@
 pub mod account;
 pub mod explorer;
 pub mod pubkey;
+pub mod pyth;
 pub mod space;
 pub mod thread;