Merge pull request #79 from staratlasmeta/sysvars

Feat: sysvar account set

Author: stegaBOB

Cargo.lock

@@ -28,7 +28,7 @@ daggy = "0.8.0"
 derivative = "2.2.0"
 derive_more = "0.99.17"
 easy_proc = "0.3.0"
-fixed = "1.26.0"
+fixed = "=1.26.0"
 half = "2.4.0"
 heck = "0.5.0"
 itertools = "0.12.1"

Cargo.toml

@@ -5,6 +5,7 @@ mod program;
 mod rest;
 mod single_set;
 mod system_account;
+mod sysvar;
 
 pub use data_account::*;
 pub use impls::*;
@@ -14,6 +15,7 @@ pub use rest::*;
 pub use single_set::*;
 pub use star_frame_proc::AccountSet;
 pub use system_account::*;
+pub use sysvar::*;
 
 use crate::syscalls::{SyscallAccountCache, SyscallInvoke};
 use crate::Result;

framework/star_frame/src/account_set/mod.rs

@@ -0,0 +1,28 @@
+use solana_program::sysvar::{Sysvar as SysvarTrait, SysvarId};
+use star_frame::prelude::*;
+use std::marker::PhantomData;
+
+#[derive(AccountSet, Debug, Clone)]
+#[idl(generics = [])]
+#[validate(generics = [])]
+pub struct Sysvar<'info, T>
+where
+    T: SysvarId,
+{
+    #[single_account_set]
+    #[idl(arg = T::id())]
+    #[validate(arg = &T::id())]
+    info: AccountInfo<'info>,
+    #[account_set(skip = PhantomData)]
+    phantom_t: PhantomData<fn() -> T>,
+}
+
+impl<'info, T> Sysvar<'info, T>
+where
+    T: SysvarTrait,
+{
+    pub fn from_account_info(info: &AccountInfo<'info>) -> Result<T> {
+        let sysvar = T::from_account_info(info)?;
+        Ok(sysvar)
+    }
+}

framework/star_frame/src/account_set/sysvar.rs

@@ -1,7 +1,10 @@
 use crate::empty_star_frame_instruction;
 use crate::prelude::*;
 use borsh::{BorshDeserialize, BorshSerialize};
+use solana_program::rent::Rent;
 use solana_program::system_program;
+#[allow(deprecated)]
+use solana_program::sysvar::recent_blockhashes::RecentBlockhashes;
 
 /// Solana's system program.
 #[derive(Debug, Copy, Clone, Align1)]
@@ -95,43 +98,57 @@ empty_star_frame_instruction!(Transfer, TransferAccounts);
 #[instruction_to_idl(program = SystemProgram)]
 pub struct AdvanceNonceAccount;
 /// Accounts for the [`AdvanceNonceAccount`] instruction.
-#[derive(Debug, Clone, AccountSet)]
-pub struct AdvanceNonceAccountAccounts<'info> {
-    pub nonce_account: Mut<AccountInfo<'info>>,
-    // todo: sysvars!
-    pub recent_blockhashes: AccountInfo<'info>,
-    pub nonce_authority: Signer<AccountInfo<'info>>,
+#[allow(deprecated)]
+mod advance_nonce {
+    use super::*;
+    #[derive(Debug, Clone, AccountSet)]
+    pub struct AdvanceNonceAccountAccounts<'info> {
+        pub nonce_account: Mut<AccountInfo<'info>>,
+        pub recent_blockhashes: Sysvar<'info, RecentBlockhashes>,
+        pub nonce_authority: Signer<AccountInfo<'info>>,
+    }
 }
+pub use advance_nonce::*;
 empty_star_frame_instruction!(AdvanceNonceAccount, AdvanceNonceAccountAccounts);
 
 // WithdrawNonceAccount
 /// Withdraws funds from a nonce account.
 #[derive(Copy, Clone, Debug, Eq, PartialEq, InstructionToIdl, BorshDeserialize, BorshSerialize)]
 #[instruction_to_idl(program = SystemProgram)]
 pub struct WithdrawNonceAccount(pub u64);
-/// Accounts for the [`WithdrawNonceAccount`] instruction.
-#[derive(Debug, Clone, AccountSet)]
-pub struct WithdrawNonceAccountAccounts<'info> {
-    pub nonce_account: Mut<AccountInfo<'info>>,
-    pub recipient: Mut<AccountInfo<'info>>,
-    pub recent_blockhashes: AccountInfo<'info>,
-    pub rent: AccountInfo<'info>,
-    pub nonce_authority: Signer<AccountInfo<'info>>,
+#[allow(deprecated)]
+mod withdraw_nonce {
+    use super::*;
+    /// Accounts for the [`WithdrawNonceAccount`] instruction.
+    #[derive(Debug, Clone, AccountSet)]
+    pub struct WithdrawNonceAccountAccounts<'info> {
+        pub nonce_account: Mut<AccountInfo<'info>>,
+        pub recipient: Mut<AccountInfo<'info>>,
+        pub recent_blockhashes: Sysvar<'info, RecentBlockhashes>,
+        pub rent: Sysvar<'info, Rent>,
+        pub nonce_authority: Signer<AccountInfo<'info>>,
+    }
 }
+pub use withdraw_nonce::*;
 empty_star_frame_instruction!(WithdrawNonceAccount, WithdrawNonceAccountAccounts);
 
 // InitializeNonceAccount
 /// Drives the state of an uninitialized nonce account to initialized, setting the nonce value.
 #[derive(Copy, Clone, Debug, Eq, PartialEq, InstructionToIdl, BorshDeserialize, BorshSerialize)]
 #[instruction_to_idl(program = SystemProgram)]
 pub struct InitializeNonceAccount(pub Pubkey);
-/// Accounts for the [`InitializeNonceAccount`] instruction.
-#[derive(Debug, Clone, AccountSet)]
-pub struct InitializeNonceAccountAccounts<'info> {
-    pub nonce_account: Mut<AccountInfo<'info>>,
-    pub recent_blockhashes: AccountInfo<'info>,
-    pub rent: AccountInfo<'info>,
+#[allow(deprecated)]
+mod initialize_nonce {
+    use super::*;
+    /// Accounts for the [`InitializeNonceAccount`] instruction.
+    #[derive(Debug, Clone, AccountSet)]
+    pub struct InitializeNonceAccountAccounts<'info> {
+        pub nonce_account: Mut<AccountInfo<'info>>,
+        pub recent_blockhashes: Sysvar<'info, RecentBlockhashes>,
+        pub rent: Sysvar<'info, Rent>,
+    }
 }
+pub use initialize_nonce::*;
 empty_star_frame_instruction!(InitializeNonceAccount, InitializeNonceAccountAccounts);
 
 // AuthorizeNonceAccount