improv : optimize more cus

Author: Nagaprasadvr

Cargo.lock

@@ -1,6 +1,6 @@
 [workspace]
 resolver = "2"
-members = [ "api", "client", "cli", "network", "program", "example" ]
+members = [ "api", "client", "cli", "network", "program"]
 
 [workspace.package]
 version = "0.2.1"

Cargo.toml

@@ -50,7 +50,7 @@ pub fn build_register_ix(
     name: &str
 ) -> Instruction {
     let name = utils::to_name(name);
-    let (miner_address, _bump) = miner_find_pda(signer, name);
+    let (miner_address, _bump) = miner_find_pda(&signer, name);
 
     Instruction {
         program_id: crate::ID,

api/src/instruction/miner.rs

@@ -35,25 +35,25 @@ pub fn build_initialize_ix(
     let (block_pda, _block_bump) = block_pda();
     let (mint_pda, _mint_bump) = mint_pda();
     let (treasury_pda, _treasury_bump) = treasury_pda();
-    let (treasury_ata, _treasury_ata_bump) = treasury_ata();
+    let (treasury_ata, _treasury_ata_bump) = treasury_find_ata();
     let (metadata_pda, _metadata_bump) = metadata_find_pda(mint_pda);
 
     let name = utils::to_name("genesis");
-    let (tape_pda, _tape_bump) = tape_find_pda(signer, &name);
-    let (writer_pda, _writer_bump) = writer_find_pda(tape_pda);
+    let (tape_pda, _tape_bump) = tape_find_pda(&signer, &name);
+    let (writer_pda, _writer_bump) = writer_find_pda(&tape_pda);
 
     assert_eq!(treasury_ata, TREASURY_ATA);
 
     Instruction {
         program_id: crate::ID,
         accounts: vec![
             AccountMeta::new(signer, true),
-            AccountMeta::new(archive_pda, false),
-            AccountMeta::new(epoch_pda, false),
-            AccountMeta::new(block_pda, false),
+            AccountMeta::new(*archive_pda, false),
+            AccountMeta::new(*epoch_pda, false),
+            AccountMeta::new(*block_pda, false),
             AccountMeta::new(metadata_pda, false),
-            AccountMeta::new(mint_pda, false),
-            AccountMeta::new(treasury_pda, false),
+            AccountMeta::new(*mint_pda, false),
+            AccountMeta::new(*treasury_pda, false),
             AccountMeta::new(treasury_ata, false),
             AccountMeta::new(tape_pda, false),
             AccountMeta::new(writer_pda, false),
@@ -63,14 +63,15 @@ pub fn build_initialize_ix(
             AccountMeta::new_readonly(spl_associated_token_account::ID, false),
             AccountMeta::new_readonly(mpl_token_metadata::ID, false),
             AccountMeta::new_readonly(sysvar::slot_hashes::ID, false),
-            AccountMeta::new_readonly(sysvar::rent::ID, false)
+            AccountMeta::new_readonly(sysvar::rent::ID, false),
+            AccountMeta::new_readonly(sysvar::clock::ID, false)
+
         ],
         data: Initialize {}.to_bytes(),
     }
 }
 
 pub fn build_airdrop_ix(
-    signer: Pubkey,
     beneficiary: Pubkey, 
     amount: u64
 ) -> Instruction {
@@ -80,10 +81,9 @@ pub fn build_airdrop_ix(
     Instruction {
         program_id: crate::ID,
         accounts: vec![
-            AccountMeta::new(signer, true),
             AccountMeta::new(beneficiary, false),
-            AccountMeta::new(mint_pda, false),
-            AccountMeta::new(treasury_pda, false),
+            AccountMeta::new(*mint_pda, false),
+            AccountMeta::new(*treasury_pda, false),
             AccountMeta::new_readonly(spl_token::ID, false),
         ],
         data: Airdrop {

api/src/instruction/program.rs

@@ -1,6 +1,6 @@
 use steel::*;
 use crate::{
-    consts::*, pda::spool_find_pda,
+    consts::*, pda::spool_find_pda, types::ProofPath,
 };
 
 #[repr(u8)]
@@ -56,7 +56,7 @@ pub fn build_create_ix(
     miner_address: Pubkey, 
     number: u64,
 ) -> Instruction {
-    let (spool_address, _bump) = spool_find_pda(miner_address, number);
+    let (spool_address, _bump) = spool_find_pda(&miner_address, number);
 
     Instruction {
         program_id: crate::ID,
@@ -65,7 +65,6 @@ pub fn build_create_ix(
             AccountMeta::new(miner_address, false),
             AccountMeta::new(spool_address, false),
             AccountMeta::new_readonly(solana_program::system_program::ID, false),
-            AccountMeta::new_readonly(sysvar::slot_hashes::ID, false),
             AccountMeta::new_readonly(sysvar::clock::ID, false),
         ],
         data: Create {
@@ -79,14 +78,13 @@ pub fn build_destroy_ix(
     miner_address: Pubkey, 
     number: u64,
 ) -> Instruction {
-    let (spool_address, _bump) = spool_find_pda(miner_address, number);
+    let (spool_address, _bump) = spool_find_pda(&miner_address, number);
 
     Instruction {
         program_id: crate::ID,
         accounts: vec![
             AccountMeta::new(signer, true),
             AccountMeta::new(spool_address, false),
-            AccountMeta::new_readonly(solana_program::system_program::ID, false),
         ],
         data: Destroy {}.to_bytes(),
     }

api/src/instruction/spool.rs

@@ -68,8 +68,8 @@ pub fn build_create_ix(
 ) -> Instruction {
     let name = utils::to_name(name);
 
-    let (tape_address, _tape_bump) = tape_find_pda(signer, &name);
-    let (writer_address, _writer_bump) = writer_find_pda(tape_address);
+    let (tape_address, _tape_bump) = tape_find_pda(&signer, &name);
+    let (writer_address, _writer_bump) = writer_find_pda(&tape_address);
 
     Instruction {
         program_id: crate::ID,
@@ -78,7 +78,7 @@ pub fn build_create_ix(
             AccountMeta::new(tape_address, false),
             AccountMeta::new(writer_address, false),
             AccountMeta::new_readonly(solana_program::system_program::ID, false),
-            AccountMeta::new_readonly(sysvar::slot_hashes::ID, false),
+            AccountMeta::new_readonly(sysvar::clock::ID, false),
         ],
         data: Create {
             name,
@@ -119,6 +119,7 @@ pub fn build_write_ix(
             AccountMeta::new(signer, true),
             AccountMeta::new(tape, false),
             AccountMeta::new(writer, false),
+            AccountMeta::new_readonly(sysvar::clock::ID, false)
         ],
         data: ix_data,
     }

api/src/instruction/tape.rs

@@ -71,23 +71,23 @@ pub fn pda_derive_address<const N: usize>(
     unreachable!("deriving a pda is only available on target `solana`");
 }
 
-pub fn archive_pda() -> (Pubkey, u8) {
-    (ARCHIVE_ADDRESS, ARCHIVE_BUMP)
+pub const fn archive_pda() -> (&'static Pubkey, u8) {
+    (&ARCHIVE_ADDRESS, ARCHIVE_BUMP)
 }
 
-pub fn epoch_pda() -> (Pubkey, u8) {
-    (EPOCH_ADDRESS, EPOCH_BUMP)
+pub const fn epoch_pda() -> (&'static Pubkey, u8) {
+    (&EPOCH_ADDRESS, EPOCH_BUMP)
 }
 
-pub fn block_pda() -> (Pubkey, u8) {
-    (BLOCK_ADDRESS, BLOCK_BUMP)
+pub const fn block_pda() -> (&'static Pubkey, u8) {
+    (&BLOCK_ADDRESS, BLOCK_BUMP)
 }
 
-pub fn treasury_pda() -> (Pubkey, u8) {
-    (TREASURY_ADDRESS, TREASURY_BUMP)
+pub const fn treasury_pda() -> (&'static Pubkey, u8) {
+    (&TREASURY_ADDRESS, TREASURY_BUMP)
 }
 
-pub fn treasury_ata() -> (Pubkey, u8) {
+pub fn treasury_find_ata() -> (Pubkey, u8) {
     let (treasury_pda,_bump) = treasury_pda();
     let (mint_pda, _bump) = mint_pda();
     Pubkey::find_program_address(
@@ -100,42 +100,42 @@ pub fn treasury_ata() -> (Pubkey, u8) {
     )
 }
 
-pub fn mint_pda() -> (Pubkey, u8) {
-    (MINT_ADDRESS, MINT_BUMP)
+pub const fn mint_pda() -> (&'static Pubkey, u8) {
+    (&MINT_ADDRESS, MINT_BUMP)
 }
 
-pub fn metadata_find_pda(mint: Pubkey) -> (Pubkey, u8) {
+pub fn metadata_find_pda(mint: &Pubkey) -> (Pubkey, u8) {
     Pubkey::find_program_address(
         &[METADATA, mpl_token_metadata::ID.as_ref(), mint.as_ref() ],
         &mpl_token_metadata::ID,
     )
 }
 
-pub fn tape_find_pda(authority: Pubkey, name: &[u8; NAME_LEN]) -> (Pubkey, u8) {
+pub fn tape_find_pda(authority: &Pubkey, name: &[u8; NAME_LEN]) -> (Pubkey, u8) {
     Pubkey::find_program_address(&[TAPE, authority.as_ref(), name.as_ref()], &crate::id())
 }
 
-pub fn tape_derive_pda(authority: Pubkey, name: &[u8; NAME_LEN], bump: u8) -> Pubkey {
+pub fn tape_derive_pda(authority: &Pubkey, name: &[u8; NAME_LEN], bump: u8) -> Pubkey {
     pda_derive_address(
         &[TAPE, authority.as_ref(), name.as_ref()],
         Some(bump),
         &crate::id(),
     )
 }
 
-pub fn writer_find_pda(tape: Pubkey) -> (Pubkey, u8) {
+pub fn writer_find_pda(tape: &Pubkey) -> (Pubkey, u8) {
     Pubkey::find_program_address(&[WRITER, tape.as_ref()], &crate::id())
 }
 
-pub fn writer_derive_pda(tape: Pubkey, bump: u8) -> Pubkey {
+pub fn writer_derive_pda(tape: &Pubkey, bump: u8) -> Pubkey {
     pda_derive_address(&[WRITER, tape.as_ref()], Some(bump), &crate::id())
 }
 
-pub fn miner_find_pda(authority: Pubkey, name: [u8; NAME_LEN]) -> (Pubkey, u8) {
+pub fn miner_find_pda(authority: &Pubkey, name: [u8; NAME_LEN]) -> (Pubkey, u8) {
     Pubkey::find_program_address(&[MINER, authority.as_ref(), name.as_ref()], &crate::id())
 }
 
-pub fn miner_derive_pda(authority: Pubkey, name: &[u8; NAME_LEN], bump: u8) -> Pubkey {
+pub fn miner_derive_pda(authority: &Pubkey, name: &[u8; NAME_LEN], bump: u8) -> Pubkey {
     pda_derive_address(
         &[MINER, authority.as_ref(), name.as_ref()],
         Some(bump),
@@ -144,14 +144,14 @@ pub fn miner_derive_pda(authority: Pubkey, name: &[u8; NAME_LEN], bump: u8) -> P
 }
 
 
-pub fn spool_find_pda(miner: Pubkey, number: u64) -> (Pubkey, u8) {
+pub fn spool_find_pda(miner: &Pubkey, number: u64) -> (Pubkey, u8) {
     Pubkey::find_program_address(
         &[SPOOL, miner.as_ref(), number.to_le_bytes().as_ref()],
         &crate::id(),
     )
 }
 
-pub fn spool_derive_pda(miner: Pubkey, number: u64, bump: u8) -> Pubkey {
+pub fn spool_derive_pda(miner: &Pubkey, number: u64, bump: u8) -> Pubkey {
     pda_derive_address(
         &[SPOOL, miner.as_ref(), &number.to_le_bytes()],
         Some(bump),

api/src/pda.rs

@@ -21,9 +21,9 @@ pub struct Tape {
     pub last_rent_block: u64,
     pub total_segments:  u64,
 
-    pub total_segments: u64,
-
     pub pda_bump: u64,
+
+    // +Phantom Vec<Hash> for merkle subtree nodes (up to 4096).
 }
 
 #[repr(u64)]

api/src/state/tape.rs

@@ -110,7 +110,7 @@ pub async fn handle_register(
 
     log::print_info("Registering miner...");
 
-    let (miner_address, _) = miner_find_pda(context.payer().pubkey(), to_name(&name));
+    let (miner_address, _) = miner_find_pda(&context.payer().pubkey(), to_name(&name));
 
     register_miner(context.rpc(), context.payer(), &name).await?;
 
@@ -135,8 +135,8 @@ pub async fn get_or_create_miner(
     let (miner_address, name) = match (pubkey_opt, name_opt) {
         (Some(_), Some(_)) => bail!("Cannot provide both pubkey and name"),
         (Some(p), None) => (Pubkey::from_str(&p)?, None),
-        (None, Some(n)) => (miner_find_pda(payer.pubkey(), to_name(&n)).0, Some(n)),
-        (None, None) => (miner_find_pda(payer.pubkey(), to_name("default")).0, Some("default".to_string())),
+        (None, Some(n)) => (miner_find_pda(&payer.pubkey(), to_name(&n)).0, Some(n)),
+        (None, None) => (miner_find_pda(&payer.pubkey(), to_name("default")).0, Some("default".to_string())),
     };
 
     let miner_account = get_miner_account(client, &miner_address).await;

cli/src/commands/network.rs

@@ -18,7 +18,7 @@ pub async fn airdrop_tokens(
     amount: u64,
 ) -> Result<Signature> {
     let compute_budget_ix = ComputeBudgetInstruction::set_compute_unit_limit(50_000);
-    let airdrop_ix = build_airdrop_ix(signer.pubkey(), beneficiary, amount);
+    let airdrop_ix = build_airdrop_ix(beneficiary, amount);
 
     let signature = build_send_and_confirm_tx(
         &[compute_budget_ix, airdrop_ix],