remove solana specific code

Author: cctdaniel

.github/workflows/docker.yaml

@@ -61,17 +61,7 @@ jobs:
         run : |
             docker create -ti --name container "${DOCKER_IMAGE}" bash
             docker cp container:/home/pyth/pyth-client/target/pyth/pythnet/pyth_oracle_pythnet.so .
-            docker cp container:/home/pyth/pyth-client/target/pyth/solana/pyth_oracle_solana.so .
             docker rm -f container
-
-      - name : Publish Solana binary
-        if : env.IS_ORACLE_RELEASE == 'true'
-        uses: svenstaro/upload-release-action@133984371c30d34e38222a64855679a414cb7575
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ./pyth_oracle_solana.so
-          asset_name: pyth_oracle_solana.so
-          tag: ${{ github.ref }}
   
       - name : Publish Pythnet binary
         if : env.IS_ORACLE_RELEASE == 'true'

README.md

@@ -155,10 +155,10 @@ Finally, in docker extension inside VS Code click right and choose "Attach VS Co
 
 Oracle program upgrades are managed by the Pythian Council multisig. The steps to deploy a new version are:
 
-1. Create a release branch from `main`. This should include binaries for both the Solana mainnet and Pythnet oracle programs (`pyth_oracle_solana.so` and `pyth_oracle_pythnet.so`).
+1. Create a release branch from `main`. This should include binary for both the Pythnet oracle programs (`pyth_oracle_pythnet.so`).
 2. [Install Solana CLI](https://docs.solana.com/cli/install-solana-cli-tools#use-solanas-install-tool) if not already installed.
 3. Set Solana config for the target network, e.g., devnet: `solana config set --url https://api.devnet.solana.com`.
-4. Execute `solana program write-buffer <ORACLE_PROGRAM_BINARY_FILENAME>` where `<ORACLE_PROGRAM_BINARY_FILENAME>` can be `pyth_oracle_solana.so` or `pyth_oracle_pythnet.so` to obtain the buffer address.
+4. Execute `solana program write-buffer pyth_oracle_pythnet.so` to obtain the buffer address.
 5. Run `solana program show <ORACLE_PROGRAM_PUBKEY>` to obtain the authority of the current program.
 6. Use `solana program set-buffer-authority <BUFFER_PUBKEY> --new-buffer-authority <NEW_BUFFER_AUTHORITY>` to assign the upgrade authority from the previous step to the buffer address.
 7. Submit a proposal with [`xc-admin`](https://github.com/pyth-network/pyth-crosschain/tree/main/governance/xc_admin/packages/xc_admin_cli) for program upgrade using the `upgrade-program` command.

program/rust/Cargo.toml

@@ -43,6 +43,7 @@ lazy_static = "1.4.0"
 # to cargo-build-bpf at that point - we manually capture them at
 # compile-time and pass on to the child process.
 [features]
+default = ["pythnet"]
 check = [] # Skips make build in build.rs, use with cargo-clippy and cargo-check
 debug = []
 library = []

program/rust/src/accounts.rs

@@ -43,8 +43,6 @@ mod product;
 // Some types only exist during use as a library.
 #[cfg(feature = "strum")]
 pub use price::MessageType;
-#[cfg(feature = "pythnet")]
-pub use price::PriceCumulative;
 #[cfg(test)]
 pub use product::{
     account_has_key_values,
@@ -56,6 +54,7 @@ pub use {
     price::{
         PriceAccount,
         PriceComponent,
+        PriceCumulative,
         PriceEma,
         PriceInfo,
         PythOracleSerialize,
@@ -72,7 +71,6 @@ pub use {
 /// are authorized to perform certain administrative actions.
 pub const PERMISSIONS_SEED: &str = "permissions";
 
-#[cfg(feature = "pythnet")]
 /// The update price instruction can optionally invoke another program via CPI. The
 /// CPI will be signed with the PDA `[UPD_PRICE_WRITE_SEED, invoked_program_public_key]`
 /// such that the caller can authenticate its origin.

program/rust/src/accounts/price.rs

@@ -1,7 +1,4 @@
-#[cfg(feature = "pythnet")]
 pub use price_pythnet::*;
-#[cfg(not(feature = "pythnet"))]
-pub use price_solana::*;
 use {
     super::{
         AccountHeader,
@@ -21,7 +18,6 @@ use {
 };
 
 /// Pythnet-specific PriceAccount implementation
-#[cfg(feature = "pythnet")]
 mod price_pythnet {
     pub type PriceAccount = PriceAccountPythnet;
 
@@ -191,79 +187,6 @@ mod price_pythnet {
     }
 }
 
-/// Solana-specific PriceAccount implementation
-#[cfg(not(feature = "pythnet"))]
-mod price_solana {
-    pub type PriceAccount = PriceAccountSolana;
-
-    use {
-        super::*,
-        crate::c_oracle_header::PC_NUM_COMP_SOLANA,
-    };
-
-    /// Legacy Solana-only price account format. This price account
-    /// schema is maintained for compatibility reasons.
-    ///
-    /// The main source of incompatibility on mainnet/devnet is the
-    /// possibility of strict account size checks which could break
-    /// existing users if they encountered a longer struct like
-    /// PriceAccountPythnet (see mod price_pythnet for details)
-    #[repr(C)]
-    #[derive(Copy, Clone, Pod, Zeroable)]
-    pub struct PriceAccountSolana {
-        pub header:             AccountHeader,
-        /// Type of the price account
-        pub price_type:         u32,
-        /// Exponent for the published prices
-        pub exponent:           i32,
-        /// Current number of authorized publishers
-        pub num_:               u32,
-        /// Number of valid quotes for the last aggregation
-        pub num_qt_:            u32,
-        /// Last slot with a succesful aggregation (status : TRADING)
-        pub last_slot_:         u64,
-        /// Second to last slot where aggregation was attempted
-        pub valid_slot_:        u64,
-        /// Ema for price
-        pub twap_:              PriceEma,
-        /// Ema for confidence
-        pub twac_:              PriceEma,
-        /// Last time aggregation was attempted
-        pub timestamp_:         i64,
-        /// Minimum valid publisher quotes for a succesful aggregation
-        pub min_pub_:           u8,
-        /// Whether the current aggregate price has been sent as a message to the message buffer.
-        /// 0 = false, 1 = true. (this is a u8 to make the Pod trait happy)
-        pub message_sent_:      u8,
-        /// Configurable max latency in slots between send and receive
-        pub max_latency_:       u8,
-        /// Unused placeholder for alignment
-        pub unused_2_:          i8,
-        pub unused_3_:          i32,
-        /// Corresponding product account
-        pub product_account:    Pubkey,
-        /// Next price account in the list
-        pub next_price_account: Pubkey,
-        /// Second to last slot where aggregation was succesful (i.e. status : TRADING)
-        pub prev_slot_:         u64,
-        /// Aggregate price at prev_slot_
-        pub prev_price_:        i64,
-        /// Confidence interval at prev_slot_
-        pub prev_conf_:         u64,
-        /// Timestamp of prev_slot_
-        pub prev_timestamp_:    i64,
-        /// Last attempted aggregate results
-        pub agg_:               PriceInfo,
-        /// Publishers' price components
-        pub comp_:              [PriceComponent; PC_NUM_COMP_SOLANA as usize],
-    }
-
-    impl PythAccount for PriceAccountSolana {
-        const ACCOUNT_TYPE: u32 = PC_ACCTYPE_PRICE;
-        const INITIAL_SIZE: u32 = size_of::<PriceAccountSolana>() as u32;
-    }
-}
-
 #[repr(C)]
 #[derive(Copy, Clone, Pod, Zeroable)]
 pub struct PriceComponent {

program/rust/src/processor/upd_price.rs

@@ -1,20 +1,10 @@
-#[cfg(feature = "pythnet")]
-use {
-    crate::accounts::{
-        PythOracleSerialize,
-        UPD_PRICE_WRITE_SEED,
-    },
-    solana_program::instruction::{
-        AccountMeta,
-        Instruction,
-    },
-    solana_program::program::invoke_signed,
-};
 use {
     crate::{
         accounts::{
             PriceAccount,
             PriceInfo,
+            PythOracleSerialize,
+            UPD_PRICE_WRITE_SEED,
         },
         deserialize::{
             load,
@@ -35,6 +25,11 @@ use {
         account_info::AccountInfo,
         clock::Clock,
         entrypoint::ProgramResult,
+        instruction::{
+            AccountMeta,
+            Instruction,
+        },
+        program::invoke_signed,
         program_error::ProgramError,
         pubkey::Pubkey,
         sysvar::Sysvar,
@@ -44,10 +39,7 @@ use {
 #[cfg(target_arch = "bpf")]
 #[link(name = "cpyth-bpf")]
 extern "C" {
-    #[cfg(feature = "pythnet")]
     pub fn c_upd_aggregate_pythnet(_input: *mut u8, clock_slot: u64, clock_timestamp: i64) -> bool;
-    #[cfg(not(feature = "pythnet"))]
-    pub fn c_upd_aggregate_solana(_input: *mut u8, clock_slot: u64, clock_timestamp: i64) -> bool;
 
     #[allow(unused)]
     pub fn c_upd_twap(_input: *mut u8, nslots: i64);
@@ -56,21 +48,15 @@ extern "C" {
 #[cfg(not(target_arch = "bpf"))]
 #[link(name = "cpyth-native")]
 extern "C" {
-    #[cfg(feature = "pythnet")]
     pub fn c_upd_aggregate_pythnet(_input: *mut u8, clock_slot: u64, clock_timestamp: i64) -> bool;
-    #[cfg(not(feature = "pythnet"))]
-    pub fn c_upd_aggregate_solana(_input: *mut u8, clock_slot: u64, clock_timestamp: i64) -> bool;
 
     #[allow(unused)]
     pub fn c_upd_twap(_input: *mut u8, nslots: i64);
 }
 
 #[inline]
 pub unsafe fn c_upd_aggregate(input: *mut u8, clock_slot: u64, clock_timestamp: i64) -> bool {
-    #[cfg(feature = "pythnet")]
-    return c_upd_aggregate_pythnet(input, clock_slot, clock_timestamp);
-    #[cfg(not(feature = "pythnet"))]
-    return c_upd_aggregate_solana(input, clock_slot, clock_timestamp);
+    c_upd_aggregate_pythnet(input, clock_slot, clock_timestamp)
 }
 
 /// Publish component price, never returning an error even if the update failed
@@ -197,7 +183,6 @@ pub fn upd_price(
     let mut price_data = load_checked::<PriceAccount>(price_account, cmd_args.header.version)?;
 
     // Feature-gated accumulator-specific code, used only on pythnet/pythtest
-    #[cfg(feature = "pythnet")]
     {
         // We want to send a message every time the aggregate price updates. However, during the migration,
         // not every publisher will necessarily provide the accumulator accounts. The message_sent_ flag

program/rust/src/tests/mod.rs

@@ -26,7 +26,6 @@ mod test_upd_price_no_fail_on_error;
 mod test_upd_product;
 mod test_utils;
 
-#[cfg(feature = "pythnet")]
+
 mod test_twap;
-#[cfg(feature = "pythnet")]
 mod test_upd_price_v2;

program/rust/src/tests/pyth_simulator.rs

@@ -78,11 +78,7 @@ lazy_static::lazy_static! {
 
     // Detect features and pass them onto cargo-build-bpf.
     // IMPORTANT: All features of this crate must have gates added to this vector.
-    let features: Vec<&str> = vec![
-    #[cfg(feature = "pythnet")]
-    "pythnet",
-
-    ];
+    let features: Vec<&str> = vec!["pythnet"];
 
     let mut cmd = std::process::Command::new("cargo");
     cmd.arg("build-bpf");
@@ -215,7 +211,6 @@ impl PythSimulator {
             .await
             .unwrap();
 
-
         result
     }
 

program/rust/src/tests/test_sizes.rs

@@ -53,7 +53,6 @@ fn test_sizes() {
         size_of::<Pubkey>() + 2 * size_of::<PriceInfo>()
     );
 
-    #[cfg(feature = "pythnet")]
     {
         use crate::{
             accounts::PriceCumulative,
@@ -77,24 +76,6 @@ fn test_sizes() {
         assert_eq!(size_of::<PriceCumulative>(), 48);
     }
 
-    #[cfg(not(feature = "pythnet"))]
-    {
-        use crate::c_oracle_header::PC_NUM_COMP_SOLANA;
-
-        // Sanity-check the Solana PC_NUM_COMP
-        assert_eq!(PC_NUM_COMP, PC_NUM_COMP_SOLANA);
-
-        assert_eq!(
-            size_of::<PriceAccount>(),
-            48 + u64::BITS as usize
-                + 3 * size_of::<Pubkey>()
-                + size_of::<PriceInfo>()
-                + (PC_NUM_COMP_SOLANA as usize) * size_of::<PriceComponent>()
-        );
-        assert_eq!(size_of::<PriceAccount>(), 3312);
-        assert!(size_of::<PriceAccount>() <= try_convert::<_, usize>(ZSTD_UPPER_BOUND).unwrap());
-    }
-
     assert_eq!(size_of::<CommandHeader>(), 8);
     assert_eq!(size_of::<AddPriceArgs>(), 16);
     assert_eq!(size_of::<InitPriceArgs>(), 16);

scripts/build-bpf.sh

@@ -24,13 +24,6 @@ cargo test --locked
 # Re-run tests affected by features
 cargo test --locked --features pythnet
 
-cargo-build-bpf -- --locked -Z build-std=std,panic_abort -Z build-std-features=panic_immediate_abort
-sha256sum ./target/**/*.so
-echo "Checking size of pyth_oracle.so for mainnet"
-./scripts/check-size.sh 81760
-mkdir -p target/pyth/solana/
-mv target/deploy/pyth_oracle.so target/pyth/solana/pyth_oracle_solana.so
-
 cargo-build-bpf -- --locked -Z build-std=std,panic_abort -Z build-std-features=panic_immediate_abort --features pythnet
 sha256sum ./target/**/*.so
 echo "Checking size of pyth_oracle.so for pythnet"