More mem improvements

Author: ChewingGlass

solana-programs/programs/tuktuk/src/instructions/queue_task_v0.rs

@@ -5,7 +5,6 @@ use anchor_lang::{
 
 use crate::{
     error::ErrorCode,
-    resize_to_fit::resize_to_fit,
     state::{TaskQueueAuthorityV0, TaskQueueDataWrapper, TaskV0, TransactionSourceV0, TriggerV0},
 };
 
@@ -41,7 +40,7 @@ pub struct QueueTaskV0<'info> {
     #[account(
         init,
         payer = payer,
-        space = 8 + std::mem::size_of::<TaskV0>() + 60 + args.description.len(),
+        space = 8 + std::mem::size_of::<TaskV0>() + args.transaction.size() + args.description.len() + 60,
         seeds = [b"task".as_ref(), task_queue.key().as_ref(), &args.id.to_le_bytes()[..]],
         bump,
     )]
@@ -81,11 +80,10 @@ pub fn handler(ctx: Context<QueueTaskV0>, args: QueueTaskArgsV0) -> Result<()> {
     require_gte!(crank_reward, task_queue.header().min_crank_reward);
 
     let mut transaction = args.transaction;
-    if let TransactionSourceV0::CompiledV0(mut compiled_tx) = transaction {
+    if let TransactionSourceV0::CompiledV0(ref mut compiled_tx) = transaction {
         compiled_tx
             .accounts
             .extend(ctx.remaining_accounts.iter().map(|a| a.key()));
-        transaction = TransactionSourceV0::CompiledV0(compiled_tx);
     }
     ctx.accounts.task.set_inner(TaskV0 {
         free_tasks: args.free_tasks,
@@ -106,15 +104,9 @@ pub fn handler(ctx: Context<QueueTaskV0>, args: QueueTaskArgsV0) -> Result<()> {
     task_queue.header_mut().updated_at = Clock::get()?.unix_timestamp;
     task_queue.save()?;
 
-    // Drop the borrow before calling resize_to_fit
+    // Drop the borrow
     drop(task_queue_data);
 
-    resize_to_fit(
-        &ctx.accounts.payer.to_account_info(),
-        &ctx.accounts.system_program.to_account_info(),
-        &ctx.accounts.task,
-    )?;
-
     let rented_amount = ctx.accounts.task.to_account_info().lamports();
     ctx.accounts.task.rent_amount = rented_amount;
 

solana-programs/programs/tuktuk/src/state.rs

@@ -308,7 +308,7 @@ pub struct CompiledInstructionV0 {
 
 impl CompiledInstructionV0 {
     pub fn size(&self) -> usize {
-        1 + self.accounts.len() + self.data.len()
+        1 + 4 + self.accounts.len() + 4 + self.data.len()
     }
 }
 
@@ -334,6 +334,26 @@ pub struct CompiledTransactionV0 {
 
 impl CompiledTransactionV0 {
     pub fn size(&self) -> usize {
-        1 + self.accounts.len() + self.instructions.iter().map(|i| i.size()).sum::<usize>()
+        // Calculate the size of the transaction header (3 u8 fields + 1 byte for instruction count)
+        let header_size = 3 + 1;
+        // Calculate the size of all accounts (each Pubkey is 32 bytes)
+        let accounts_size = 4 + self.accounts.len() * 32;
+        // Calculate the size of all instructions
+        let instructions_size = 4 + self.instructions.iter().map(|i| i.size()).sum::<usize>();
+
+        header_size + accounts_size + instructions_size
+    }
+}
+
+impl TransactionSourceV0 {
+    pub fn size(&self) -> usize {
+        match self {
+            TransactionSourceV0::CompiledV0(compiled_tx) => compiled_tx.size(),
+            TransactionSourceV0::RemoteV0 { url, signer: _ } => {
+                // For remote transactions, we need to account for the URL string length
+                // and the signer pubkey (32 bytes)
+                32 + 4 + url.len() // 4 bytes for string length prefix
+            }
+        }
     }
 }