feat(lazer): add treasury and fees to solana contract

Author: Riateche

lazer/contracts/solana/programs/pyth-lazer-solana-contract/src/lib.rs

@@ -1,23 +1,8 @@
 mod signature;
 
-pub mod storage {
-    use anchor_lang::prelude::{pubkey, Pubkey};
-
-    pub const ID: Pubkey = pubkey!("3rdJbqfnagQ4yx9HXJViD4zc4xpiSqmFsKpPuSCQVyQL");
-
-    #[test]
-    fn test_storage_id() {
-        use {crate::STORAGE_SEED, anchor_lang::prelude::Pubkey};
-
-        assert_eq!(
-            Pubkey::find_program_address(&[STORAGE_SEED], &super::ID).0,
-            ID
-        );
-    }
-}
-
 use {
-    anchor_lang::{prelude::*, solana_program::pubkey::PUBKEY_BYTES},
+    crate::signature::VerifiedMessage,
+    anchor_lang::{prelude::*, solana_program::pubkey::PUBKEY_BYTES, system_program},
     std::mem::size_of,
 };
 
@@ -28,6 +13,21 @@ pub use {
 
 declare_id!("pytd2yyk641x7ak7mkaasSJVXh6YYZnC7wTmtgAyxPt");
 
+pub const STORAGE_ID: Pubkey = pubkey!("3rdJbqfnagQ4yx9HXJViD4zc4xpiSqmFsKpPuSCQVyQL");
+pub const TREASURY_ID: Pubkey = pubkey!("EN4aB3soE5iuCG2fGj2r5fksh4kLRVPV8g7N86vXm8WM");
+
+#[test]
+fn test_ids() {
+    assert_eq!(
+        Pubkey::find_program_address(&[STORAGE_SEED], &ID).0,
+        STORAGE_ID
+    );
+    assert_eq!(
+        Pubkey::find_program_address(&[TREASURY_SEED], &ID).0,
+        TREASURY_ID
+    );
+}
+
 pub const MAX_NUM_TRUSTED_SIGNERS: usize = 2;
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Default, AnchorSerialize, AnchorDeserialize)]
@@ -44,12 +44,14 @@ impl TrustedSignerInfo {
 pub struct Storage {
     pub top_authority: Pubkey,
     pub num_trusted_signers: u8,
+    pub single_update_fee_in_lamports: u64,
     pub trusted_signers: [TrustedSignerInfo; MAX_NUM_TRUSTED_SIGNERS],
 }
 
 impl Storage {
     const SERIALIZED_LEN: usize = PUBKEY_BYTES
         + size_of::<u8>()
+        + size_of::<u64>()
         + TrustedSignerInfo::SERIALIZED_LEN * MAX_NUM_TRUSTED_SIGNERS;
 
     pub fn initialized_trusted_signers(&self) -> &[TrustedSignerInfo] {
@@ -58,15 +60,15 @@ impl Storage {
 }
 
 pub const STORAGE_SEED: &[u8] = b"storage";
+pub const TREASURY_SEED: &[u8] = b"treasury";
 
 #[program]
 pub mod pyth_lazer_solana_contract {
-    use signature::VerifiedMessage;
-
     use super::*;
 
     pub fn initialize(ctx: Context<Initialize>, top_authority: Pubkey) -> Result<()> {
         ctx.accounts.storage.top_authority = top_authority;
+        ctx.accounts.storage.single_update_fee_in_lamports = 1;
         Ok(())
     }
 
@@ -128,9 +130,20 @@ pub mod pyth_lazer_solana_contract {
         signature_index: u8,
         message_offset: u16,
     ) -> Result<VerifiedMessage> {
+        system_program::transfer(
+            CpiContext::new(
+                ctx.accounts.system_program.to_account_info(),
+                system_program::Transfer {
+                    from: ctx.accounts.payer.to_account_info(),
+                    to: ctx.accounts.treasury.to_account_info(),
+                },
+            ),
+            ctx.accounts.storage.single_update_fee_in_lamports,
+        )?;
+
         signature::verify_message(
             &ctx.accounts.storage,
-            &ctx.accounts.sysvar,
+            &ctx.accounts.instructions_sysvar,
             &message_data,
             ed25519_instruction_index,
             signature_index,
@@ -155,6 +168,18 @@ pub struct Initialize<'info> {
         bump,
     )]
     pub storage: Account<'info, Storage>,
+    #[account(
+        init,
+        payer = payer,
+        space = 0,
+        owner = system_program::ID,
+        seeds = [TREASURY_SEED],
+        bump,
+    )]
+    /// CHECK: this is a system program account but using anchor's `SystemAccount`
+    /// results in invalid output from the Accounts proc macro. No extra checks
+    /// are necessary because all necessary constraints are specified in the attribute.
+    pub treasury: AccountInfo<'info>,
     pub system_program: Program<'info, System>,
 }
 
@@ -172,10 +197,26 @@ pub struct Update<'info> {
 
 #[derive(Accounts)]
 pub struct VerifyMessage<'info> {
+    #[account(mut)]
+    pub payer: Signer<'info>,
     #[account(
         seeds = [STORAGE_SEED],
         bump,
     )]
     pub storage: Account<'info, Storage>,
-    pub sysvar: AccountInfo<'info>,
+    #[account(
+        mut,
+        owner = system_program::ID,
+        seeds = [TREASURY_SEED],
+        bump,
+    )]
+    /// CHECK: this is a system program account but using anchor's `SystemAccount`
+    /// results in invalid output from the Accounts proc macro. No extra checks
+    /// are necessary because all necessary constraints are specified in the attribute.
+    pub treasury: AccountInfo<'info>,
+    pub system_program: Program<'info, System>,
+    /// CHECK: account ID is checked in Solana SDK during calls
+    /// (e.g. in `sysvar::instructions::load_instruction_at_checked`).
+    /// This account is not usable with anchor's `Program` account type because it's not executable.
+    pub instructions_sysvar: AccountInfo<'info>,
 }

lazer/contracts/solana/programs/pyth-lazer-solana-contract/src/signature.rs

@@ -159,7 +159,7 @@ impl From<SignatureVerificationError> for anchor_lang::error::Error {
 ///   input data for the current instruction.
 pub fn verify_message(
     storage: &Storage,
-    instruction_sysvar: &AccountInfo,
+    instructions_sysvar: &AccountInfo,
     message_data: &[u8],
     ed25519_instruction_index: u16,
     signature_index: u8,
@@ -168,7 +168,7 @@ pub fn verify_message(
     const SOLANA_FORMAT_MAGIC_LE: u32 = 2182742457;
 
     let self_instruction_index =
-        sysvar::instructions::load_current_index_checked(instruction_sysvar)
+        sysvar::instructions::load_current_index_checked(instructions_sysvar)
             .map_err(SignatureVerificationError::LoadCurrentIndexFailed)?;
 
     if ed25519_instruction_index >= self_instruction_index {
@@ -177,7 +177,7 @@ pub fn verify_message(
 
     let instruction = sysvar::instructions::load_instruction_at_checked(
         ed25519_instruction_index.into(),
-        instruction_sysvar,
+        instructions_sysvar,
     )
     .map_err(SignatureVerificationError::LoadInstructionAtFailed)?;
 

lazer/contracts/solana/programs/pyth-lazer-solana-contract/tests/test1.rs

@@ -37,7 +37,8 @@ async fn test1() {
             .data(),
             vec![
                 AccountMeta::new(payer.pubkey(), true),
-                AccountMeta::new(pyth_lazer_solana_contract::storage::ID, false),
+                AccountMeta::new(pyth_lazer_solana_contract::STORAGE_ID, false),
+                AccountMeta::new(pyth_lazer_solana_contract::TREASURY_ID, false),
                 AccountMeta::new_readonly(system_program::ID, false),
             ],
         )],
@@ -68,7 +69,7 @@ async fn test1() {
             .data(),
             vec![
                 AccountMeta::new(payer.pubkey(), true),
-                AccountMeta::new(pyth_lazer_solana_contract::storage::ID, false),
+                AccountMeta::new(pyth_lazer_solana_contract::STORAGE_ID, false),
             ],
         )],
         Some(&payer.pubkey()),
@@ -90,7 +91,12 @@ async fn test1() {
         message_offset,
     ));
 
-    println!("ok1");
+    let treasury_starting_lamports = banks_client
+        .get_account(pyth_lazer_solana_contract::TREASURY_ID)
+        .await
+        .unwrap()
+        .unwrap()
+        .lamports;
     let mut transaction_verify = Transaction::new_with_payer(
         &[
             Instruction::new_with_bytes(
@@ -108,7 +114,10 @@ async fn test1() {
                 }
                 .data(),
                 vec![
-                    AccountMeta::new_readonly(pyth_lazer_solana_contract::storage::ID, false),
+                    AccountMeta::new(payer.pubkey(), true),
+                    AccountMeta::new_readonly(pyth_lazer_solana_contract::STORAGE_ID, false),
+                    AccountMeta::new(pyth_lazer_solana_contract::TREASURY_ID, false),
+                    AccountMeta::new_readonly(system_program::ID, false),
                     AccountMeta::new_readonly(sysvar::instructions::ID, false),
                 ],
             ),
@@ -120,4 +129,13 @@ async fn test1() {
         .process_transaction(transaction_verify)
         .await
         .unwrap();
+    assert_eq!(
+        banks_client
+            .get_account(pyth_lazer_solana_contract::TREASURY_ID)
+            .await
+            .unwrap()
+            .unwrap()
+            .lamports,
+        treasury_starting_lamports + 1
+    );
 }