Use Create Account Checked & Create Account with Seed Checked (#204)

* use Sysvar rent account

* implement invoke_signed_checked

* removed the checked files

* implement with_rent_check constructor

* fix imports

* remove checks

* Apply suggestions from code review

Co-authored-by: Fernando Otero <[email protected]>

* fix formatting

* Apply suggestions from code review

Co-authored-by: Fernando Otero <[email protected]>

---------

Co-authored-by: Fernando Otero <[email protected]>

Author: zubayr1

programs/system/src/instructions/create_account.rs

@@ -2,7 +2,9 @@ use pinocchio::{
     account_info::AccountInfo,
     instruction::{AccountMeta, Instruction, Signer},
     program::invoke_signed,
+    program_error::ProgramError,
     pubkey::Pubkey,
+    sysvars::rent::Rent,
     ProgramResult,
 };
 
@@ -28,7 +30,27 @@ pub struct CreateAccount<'a> {
     pub owner: &'a Pubkey,
 }
 
-impl CreateAccount<'_> {
+impl<'a> CreateAccount<'a> {
+    #[inline(always)]
+    pub fn with_minimal_balance(
+        from: &'a AccountInfo,
+        to: &'a AccountInfo,
+        rent_sysvar: &'a AccountInfo,
+        space: u64,
+        owner: &'a Pubkey,
+    ) -> Result<Self, ProgramError> {
+        let rent = Rent::from_account_info(rent_sysvar)?;
+        let lamports = rent.minimum_balance(space as usize);
+
+        Ok(Self {
+            from,
+            to,
+            lamports,
+            space,
+            owner,
+        })
+    }
+
     #[inline(always)]
     pub fn invoke(&self) -> ProgramResult {
         self.invoke_signed(&[])

programs/system/src/instructions/create_account_with_seed.rs

@@ -2,7 +2,9 @@ use pinocchio::{
     account_info::AccountInfo,
     instruction::{AccountMeta, Instruction, Signer},
     program::invoke_signed,
+    program_error::ProgramError,
     pubkey::Pubkey,
+    sysvars::rent::Rent,
     ProgramResult,
 };
 
@@ -40,7 +42,31 @@ pub struct CreateAccountWithSeed<'a, 'b, 'c> {
     pub owner: &'c Pubkey,
 }
 
-impl CreateAccountWithSeed<'_, '_, '_> {
+impl<'a, 'b, 'c> CreateAccountWithSeed<'a, 'b, 'c> {
+    #[inline(always)]
+    pub fn with_minimal_balance(
+        from: &'a AccountInfo,
+        to: &'a AccountInfo,
+        base: Option<&'a AccountInfo>,
+        seed: &'b str,
+        rent_sysvar: &'a AccountInfo,
+        space: u64,
+        owner: &'c Pubkey,
+    ) -> Result<Self, ProgramError> {
+        let rent = Rent::from_account_info(rent_sysvar)?;
+        let lamports = rent.minimum_balance(space as usize);
+
+        Ok(Self {
+            from,
+            to,
+            base,
+            seed,
+            lamports,
+            space,
+            owner,
+        })
+    }
+
     #[inline(always)]
     pub fn invoke(&self) -> ProgramResult {
         self.invoke_signed(&[])