Initialize vault and load it with 1029$

Nitish-bot · Nitish-bot · commit c5c56f17ebb5 · 2024-11-02T00:41:20.000+05:30
diff --git a/basics/pda-rent-payer/steel/Cargo.toml b/basics/pda-rent-payer/steel/Cargo.toml
@@ -14,6 +14,7 @@ keywords = ["solana"]
 
 [workspace.dependencies]
 pda-rent-payer-api = { path = "./api", version = "0.1.0" }
+borsh = "1.5"
 bytemuck = "1.14"
 num_enum = "0.7"
 solana-program = "1.18"
diff --git a/basics/pda-rent-payer/steel/README.md b/basics/pda-rent-payer/steel/README.md
@@ -1,11 +1,11 @@
-# Steel
+# PDA Rent Payer
 
-**Steel** is a ...
+**PDA Rent Payer** is a program that uses a PDA to pay the rent
+for the creation of a system program by simply transferring lamports to it
         
 ## API
 - [`Consts`](api/src/consts.rs) – Program constants.
 - [`Error`](api/src/error.rs) – Custom program errors.
-- [`Event`](api/src/event.rs) – Custom program events.
 - [`Instruction`](api/src/instruction.rs) – Declared instructions.
 
 ## Instructions
diff --git a/basics/pda-rent-payer/steel/api/Cargo.toml b/basics/pda-rent-payer/steel/api/Cargo.toml
@@ -11,6 +11,7 @@ readme.workspace = true
 keywords.workspace = true
 
 [dependencies]
+borsh.workspace = true
 bytemuck.workspace = true
 num_enum.workspace = true
 solana-program.workspace = true
diff --git a/basics/pda-rent-payer/steel/api/src/instruction.rs b/basics/pda-rent-payer/steel/api/src/instruction.rs
@@ -1,3 +1,4 @@
+use borsh::{ BorshDeserialize, BorshSerialize };
 use steel::*;
 
 #[repr(u8)]
@@ -8,7 +9,7 @@ pub enum PdaRentPayerInstruction {
 }
 
 #[repr(C)]
-#[derive(Clone, Copy, Debug, Pod, Zeroable)]
+#[derive(BorshSerialize, BorshDeserialize, Clone, Copy, Debug, Pod, Zeroable)]
 pub struct InitializeRentVault {
     pub amount: u64,
 }
diff --git a/basics/pda-rent-payer/steel/api/src/lib.rs b/basics/pda-rent-payer/steel/api/src/lib.rs
@@ -15,4 +15,4 @@ pub mod prelude {
 use steel::*;
 
 // TODO Set program id
-declare_id!("H8ocBhDZmzxRvWnT1yu5EQyLN3D9AYZv9qsePcx8pidg");
+declare_id!("HK5TuboXztZv7anSa3GptyCZ5wMYiqbY8kNSVEtqWDuD");
diff --git a/basics/pda-rent-payer/steel/api/src/sdk.rs b/basics/pda-rent-payer/steel/api/src/sdk.rs
@@ -2,18 +2,15 @@ use steel::*;
 
 use crate::prelude::*;
 
-pub fn init_rent_vault(signer_info: Pubkey, system_program: Pubkey, data: &[u8]) -> Instruction {
+pub fn init_rent_vault(signer_info: Pubkey, system_program: Pubkey, amount: u64) -> Instruction {
     Instruction {
         program_id: crate::ID,
         accounts: vec![
             AccountMeta::new(signer_info, true),
             AccountMeta::new(rent_vault_pda().0, false),
             AccountMeta::new_readonly(system_program, false),
         ],
-        data: InitializeRentVault {
-            amount: u64::from_be_bytes(data[..8].try_into().unwrap()),
-        }
-        .to_bytes(),
+        data: InitializeRentVault { amount }.to_bytes(),
     }
 }
 
@@ -23,7 +20,6 @@ pub fn create_new_account(rent_vault: Pubkey, new_account: Pubkey) -> Instructio
         accounts: vec![
             AccountMeta::new(rent_vault, false),
             AccountMeta::new(new_account, true),
-            AccountMeta::new_readonly(system_program::ID, false),
         ],
         data: CreateNewAccount {}.to_bytes(),
     }
diff --git a/basics/pda-rent-payer/steel/api/src/state/accounts.rs b/basics/pda-rent-payer/steel/api/src/state/accounts.rs
@@ -1,4 +1,4 @@
-use super::PdaRentPayerAccount;
+use super::PdaRentPayerAccountDiscriminator;
 use steel::*;
 
 /// This empty struct represents the payer vault account
@@ -12,5 +12,5 @@ pub struct RentVault {}
 #[derive(Clone, Copy, Debug, PartialEq, Pod, Zeroable)]
 pub struct NewAccount {}
 
-account!(PdaRentPayerAccount, RentVault);
-account!(PdaRentPayerAccount, NewAccount);
+account!(PdaRentPayerAccountDiscriminator, RentVault);
+account!(PdaRentPayerAccountDiscriminator, NewAccount);
diff --git a/basics/pda-rent-payer/steel/api/src/state/mod.rs b/basics/pda-rent-payer/steel/api/src/state/mod.rs
@@ -8,7 +8,7 @@ use steel::*;
 /// accounts this program can interact with
 #[repr(u8)]
 #[derive(Clone, Copy, Debug, Eq, PartialEq, IntoPrimitive, TryFromPrimitive)]
-pub enum PdaRentPayerAccount {
+pub enum PdaRentPayerAccountDiscriminator {
     RentVault = 0,
     NewAccount = 1,
 }
@@ -17,8 +17,3 @@ pub enum PdaRentPayerAccount {
 pub fn rent_vault_pda() -> (Pubkey, u8) {
     Pubkey::find_program_address(&[RENT_VAULT], &crate::id())
 }
-
-// Fetch PDA of the newly_created account.
-// pub fn new_account_pda() -> (Pubkey, u8) {
-//     Pubkey::find_program_address(&[NEW_ACCOUNT], &crate::id())
-// }
diff --git a/basics/pda-rent-payer/steel/cicd.sh b/basics/pda-rent-payer/steel/cicd.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+# Buld and deploy this program with ease using a single command
+# Run this script with "bash cicd.sh" or "./cicd.sh"
+# Note: Try running "chmod +x cicd.sh" if you face any issues.
+
+# Check if cargo is installed
+if ! command -v cargo &> /dev/null
+then
+    echo "Cargo could not be found. Please install Rust."
+    exit 1
+fi
+
+# Check if solana CLI is installed
+if ! command -v solana &> /dev/null
+then
+    echo "Solana CLI could not be found. Please install Solana."
+    exit 1
+fi
+
+
+# Build
+cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so
+
+# Deploy
+solana program deploy ./program/target/so/pda_rent_payer_program.so
diff --git a/basics/pda-rent-payer/steel/package.json b/basics/pda-rent-payer/steel/package.json
@@ -4,14 +4,12 @@
   "type": "module",
   "description": "Use a PDA to pay the rent for the creation of a new account.",
   "scripts": {
-    "test": "pnpm ts-mocha -p ./tsconfig.json -t 1000000 ./tests/test.ts",
+    "test": "pnpm ts-mocha -p ./tsconfig.json -t 1000000 ./tests/*.test.ts",
     "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
     "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
     "deploy": "solana program deploy ./program/target/so/pda_rent_payer_program.so"
   },
-  "keywords": [
-    "solana"
-  ],
+  "keywords": ["solana"],
   "author": "",
   "license": "MIT",
   "dependencies": {
@@ -20,9 +18,10 @@
   "devDependencies": {
     "@types/chai": "^4.3.20",
     "@types/mocha": "^10.0.9",
-    "@types/node": "^22.8.2",
+    "@types/node": "^22.8.5",
+    "borsh": "^2.0.0",
     "chai": "^4.5.0",
-    "mocha": "^10.7.3",
+    "mocha": "^10.8.2",
     "solana-bankrun": "^0.4.0",
     "ts-mocha": "^10.0.0",
     "typescript": "^5.6.3"
diff --git a/basics/pda-rent-payer/steel/pnpm-lock.yaml b/basics/pda-rent-payer/steel/pnpm-lock.yaml
diff --git a/basics/pda-rent-payer/steel/program/Cargo.toml b/basics/pda-rent-payer/steel/program/Cargo.toml
@@ -14,6 +14,7 @@ keywords.workspace = true
 crate-type = ["cdylib", "lib"]
 
 [dependencies]
+borsh.workspace = true
 pda-rent-payer-api.workspace = true
 solana-program.workspace = true
 steel.workspace = true
diff --git a/basics/pda-rent-payer/steel/program/src/create_new_account.rs b/basics/pda-rent-payer/steel/program/src/create_new_account.rs
@@ -1,23 +1,38 @@
 use pda_rent_payer_api::prelude::*;
+use solana_program::msg;
+use steel::sysvar::rent::Rent;
 use steel::*;
 
-pub fn process_create_account(accounts: &[AccountInfo<'_>], _data: &[u8]) -> ProgramResult {
-    // // Parse args.
-    // let args = Add::try_from_bytes(data)?;
-    // let amount = u64::from_le_bytes(args.amount);
-
-    // Load and validate accounts.
-    let [payer_info, new_account_info] = accounts else {
+pub fn process_create_account(accounts: &[AccountInfo<'_>]) -> ProgramResult {
+    // Load accounts
+    let [rent_vault_info, new_account_info, system_program] = accounts else {
         return Err(ProgramError::NotEnoughAccountKeys);
     };
+
+    // Validate accounts
     new_account_info.is_signer()?.is_empty()?.is_writable()?;
-    payer_info
+    rent_vault_info
         .is_writable()?
         .has_seeds(&[RENT_VAULT], &pda_rent_payer_api::ID)?;
+    system_program.is_program(&system_program::ID)?;
+
+    let vault_balance = rent_vault_info.lamports();
 
-    // Create new account by simply sending a
+    msg!("Vault balance: {}", vault_balance);
+    // First we get the lamports required for rent
+    // assuming this account has no inner data
+    let lamports_required_for_rent = (Rent::get()?).minimum_balance(0);
+    
+    if vault_balance < lamports_required_for_rent {
+        return Err(ProgramError::InsufficientFunds);
+    }
+
+    // Then we create a new account by simply sending a
     // token amount to the new account.
-    payer_info.send(100, new_account_info);
+    rent_vault_info.send(lamports_required_for_rent, new_account_info);
+
+    msg!("Created new account.");
+    msg!("New account: {:?}", new_account_info.key);
 
     Ok(())
 }
diff --git a/basics/pda-rent-payer/steel/program/src/init_rent_vault.rs b/basics/pda-rent-payer/steel/program/src/init_rent_vault.rs
diff --git a/basics/pda-rent-payer/steel/program/src/lib.rs b/basics/pda-rent-payer/steel/program/src/lib.rs
diff --git a/basics/pda-rent-payer/steel/tests/main.test.ts b/basics/pda-rent-payer/steel/tests/main.test.ts
diff --git a/basics/pda-rent-payer/steel/tests/test.ts b/basics/pda-rent-payer/steel/tests/test.ts
diff --git a/basics/pda-rent-payer/steel/tsconfig.json b/basics/pda-rent-payer/steel/tsconfig.json

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+use borsh::{ BorshDeserialize, BorshSerialize };`
`1`	`2`	`use steel::*;`
`2`	`3`
`3`	`4`	`#[repr(u8)]`
`@@ -8,7 +9,7 @@ pub enum PdaRentPayerInstruction {`
`8`	`9`	`}`
`9`	`10`
`10`	`11`	`#[repr(C)]`
`11`		`-#[derive(Clone, Copy, Debug, Pod, Zeroable)]`
	`12`	`+#[derive(BorshSerialize, BorshDeserialize, Clone, Copy, Debug, Pod, Zeroable)]`
`12`	`13`	`pub struct InitializeRentVault {`
`13`	`14`	`pub amount: u64,`
`14`	`15`	`}`