Conditional compilation (#368)

* Yes

* Make size smaller

* Cleanup

* Add conditional compilation

* Let's go

* Cleanup

* Cleanup

* Clarify comments

* Comment

* Comment

Author: guibescos

docker/Dockerfile

@@ -57,7 +57,6 @@ RUN ./pyth-client/scripts/patch-solana.sh
 
 # Build and test the oracle program.
 RUN cd pyth-client && ./scripts/build-bpf.sh .
-RUN cd pyth-client && ./scripts/check-size.sh
 
 ENTRYPOINT []
 CMD []

program/rust/Cargo.toml

@@ -34,6 +34,7 @@ csv = "1.1"
 [features]
 debug = []
 library = []
+pythnet = []
 
 [lib]
 crate-type = ["cdylib", "lib"]

program/rust/src/accounts.rs

@@ -69,6 +69,7 @@ pub use {
 /// There is a single permissions account under `PERMISSIONS_SEED` that stores which keys
 /// are authorized to perform certain adminsitrative 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

@@ -230,11 +230,16 @@ pub struct PriceFeedMessage {
     /// as some price updates on pythnet may not be sent to other chains (because the message-sending
     /// logic may not have triggered). We can solve this problem by making the message-sending mandatory
     /// (which we can do once publishers have migrated over).
+    ///
+    /// Additionally, this field may be equal to publish_time if the message is sent on a slot where
+    /// where the aggregation was unsuccesful. This problem will go away once all publishers have
+    /// migrated over to a recent version of pyth-agent.
     pub prev_publish_time: i64,
     pub ema_price:         i64,
     pub ema_conf:          u64,
 }
 
+#[allow(dead_code)]
 impl PriceFeedMessage {
     // The size of the serialized message. Note that this is not the same as the size of the struct
     // (because of the discriminator & struct padding/alignment).
@@ -318,6 +323,7 @@ pub struct TwapMessage {
     pub publish_slot:      u64,
 }
 
+#[allow(dead_code)]
 impl TwapMessage {
     // The size of the serialized message. Note that this is not the same as the size of the struct
     // (because of the discriminator & struct padding/alignment).

program/rust/src/processor/upd_price.rs

@@ -1,13 +1,23 @@
+#[cfg(feature = "pythnet")]
+use {
+    crate::accounts::{
+        PriceFeedMessage,
+        TwapMessage,
+        UPD_PRICE_WRITE_SEED,
+    },
+    solana_program::instruction::{
+        AccountMeta,
+        Instruction,
+    },
+    solana_program::program::invoke_signed,
+};
 use {
     crate::{
         accounts::{
             PriceAccount,
             PriceAccountV2,
-            PriceFeedMessage,
             PriceInfo,
             PythAccount,
-            TwapMessage,
-            UPD_PRICE_WRITE_SEED,
         },
         deserialize::{
             load,
@@ -28,17 +38,13 @@ use {
         account_info::AccountInfo,
         clock::Clock,
         entrypoint::ProgramResult,
-        instruction::{
-            AccountMeta,
-            Instruction,
-        },
-        program::invoke_signed,
         program_error::ProgramError,
         pubkey::Pubkey,
         sysvar::Sysvar,
     },
 };
 
+
 #[cfg(target_arch = "bpf")]
 #[link(name = "cpyth-bpf")]
 extern "C" {
@@ -97,6 +103,7 @@ pub fn upd_price(
 ) -> ProgramResult {
     let cmd_args = load::<UpdPriceArgs>(instruction_data)?;
 
+    #[allow(unused_variables)]
     let (funding_account, price_account, clock_account, maybe_accumulator_accounts) = match accounts
     {
         [x, y, z] => Ok((x, y, z, None)),
@@ -179,7 +186,7 @@ pub fn upd_price(
             price_data.message_sent_ = 0;
         }
 
-
+        #[cfg(feature = "pythnet")]
         if let Some(accumulator_accounts) = maybe_accumulator_accounts {
             if price_data.message_sent_ == 0 {
                 // Check that the oracle PDA is correctly configured for the program we are calling.
@@ -261,7 +268,7 @@ pub fn upd_price(
     Ok(())
 }
 
-
+#[allow(dead_code)]
 // Wrapper struct for the accounts required to add data to the accumulator program.
 struct MessageBufferAccounts<'a, 'b: 'a> {
     program_id:          &'a AccountInfo<'b>,

scripts/build-bpf.sh

@@ -20,7 +20,15 @@ set -x
 cd "${PYTH_DIR}"
 cargo clean
 cargo test --locked
+
 cargo clean
 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
 
+cargo clean
+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"
+./scripts/check-size.sh 88429

scripts/check-size.sh

@@ -4,12 +4,10 @@
 # While Solana doesn't support resizing programs, the oracle binary needs to be smaller than 81760 bytes
 # (The available space for the oracle program on pythnet is 88429 and mainnet is 81760)
 ORACLE_SIZE=$(wc -c ./target/deploy/pyth_oracle.so | awk '{print $1}')
-if [ $ORACLE_SIZE -lt 88429 ]
+if [ $ORACLE_SIZE -lt ${1} ]
 then
-    echo "Size of pyth_oracle.so is small enough to be deployed to mainnet."
-    echo $ORACLE_SIZE
+    echo "Size of pyth_oracle.so is small enough to be deployed, since ${ORACLE_SIZE} is less than ${1}"
 else
-    echo "Size of pyth_oracle.so is too big to be deployed to mainnet."
-    echo $ORACLE_SIZE
+    echo "Size of pyth_oracle.so is too big to be deployed, since ${ORACLE_SIZE} is greater than ${1}"
     exit 1
 fi