redefine DepositAndDelegateShuttleArgs with fixed_layout

snawaz · snawaz · commit 3de1482fe56f · 2026-04-13T16:38:07.000+05:30
diff --git a/e-token/src/lib.rs b/e-token/src/lib.rs
@@ -9,6 +9,7 @@ pub use crate::entrypoint::process_instruction;
 pub use ephemeral_spl_api::ID;
 
 pub use processor::{
-    DelegateArgs, DelegateShuttleArgs, DepositAndDelegateShuttleWithPrivateTransferArgs,
-    DepositAndQueueTransferArgs, ExecuteQueuedTransferArgs, InitializeTransferQueueArgs,
+    DelegateArgs, DelegateShuttleArgs, DepositAndDelegateShuttleArgs,
+    DepositAndDelegateShuttleWithPrivateTransferArgs, DepositAndQueueTransferArgs,
+    ExecuteQueuedTransferArgs, InitializeTransferQueueArgs,
 };
diff --git a/e-token/src/processor/deposit_and_delegate_shuttle_ephemeral_ata_with_merge.rs b/e-token/src/processor/deposit_and_delegate_shuttle_ephemeral_ata_with_merge.rs
@@ -70,7 +70,7 @@ pub fn process_deposit_and_delegate_shuttle_ephemeral_ata_with_merge(
         vault_token_info,
     ] = require_n_accounts!(accounts, 19);
 
-    let args = DepositAndDelegateShuttleArgs::try_from_bytes(instruction_data)?;
+    let args = DepositAndDelegateShuttleArgs::try_view_from(instruction_data)?;
 
     let accounts = DepositAndDelegateShuttleWithMergeAccounts {
         common: DepositAndDelegateShuttleAccounts {
diff --git a/e-token/src/processor/deposit_and_delegate_shuttle_ephemeral_ata_with_merge_and_private_transfer.rs b/e-token/src/processor/deposit_and_delegate_shuttle_ephemeral_ata_with_merge_and_private_transfer.rs
@@ -1,4 +1,3 @@
-use alloc::borrow::ToOwned;
 #[cfg(feature = "logging")]
 use alloc::string::ToString;
 use alloc::vec::Vec;
@@ -202,11 +201,11 @@ pub struct DepositAndDelegateShuttleWithPrivateTransferArgs {
 }
 
 impl DepositAndDelegateShuttleWithPrivateTransferArgsView<'_> {
-    fn common_args(&self) -> Result<DepositAndDelegateShuttleCommonArgs, ProgramError> {
+    fn common_args(&self) -> Result<DepositAndDelegateShuttleCommonArgs<'_>, ProgramError> {
         Ok(DepositAndDelegateShuttleCommonArgs {
             shuttle_id: self.shuttle_id(),
             amount: self.amount(),
-            validator: self.validator().map(|r| r.to_owned()),
+            validator: self.validator(),
         })
     }
 }
diff --git a/e-token/src/processor/internal/mod.rs b/e-token/src/processor/internal/mod.rs
@@ -3,3 +3,5 @@ pub(crate) mod lamports_pda;
 pub(crate) mod shuttle_delegation;
 pub(crate) mod token_vault;
 pub(crate) mod transfer_queue_refill;
+
+pub use shuttle_delegation::DepositAndDelegateShuttleArgs;
diff --git a/e-token/src/processor/internal/shuttle_delegation.rs b/e-token/src/processor/internal/shuttle_delegation.rs
@@ -1,7 +1,8 @@
 #[cfg(feature = "logging")]
 use alloc::string::ToString;
+use data_layout::fixed_layout;
 
-use core::{marker::PhantomData, mem::MaybeUninit};
+use core::mem::MaybeUninit;
 use dlp_api::args::PostDelegationActions;
 use ephemeral_rollups_pinocchio::{
     consts::{
@@ -59,78 +60,22 @@ pub(crate) struct PreparedShuttleDelegation {
 }
 
 #[derive(Clone, Copy)]
-pub(crate) struct DepositAndDelegateShuttleCommonArgs {
+pub(crate) struct DepositAndDelegateShuttleCommonArgs<'a> {
     pub(crate) shuttle_id: u32,
     pub(crate) amount: u64,
-    pub(crate) validator: Option<[u8; 32]>,
+    pub(crate) validator: Option<&'a [u8; 32]>,
 }
 
-//
-// DataLayout:
-//
-//     00..04 : shuttle_id (u32)
-//     04..12 : amount (u64)
-//     12..44 : validator (optional [u8; 32])
-//
-// ValidLength:
-//
-//     12 (without validator)
-//     44 (with validator)
-//
-pub struct DepositAndDelegateShuttleArgs<'a> {
-    raw: *const u8,
-    len: usize,
-    _data: PhantomData<&'a [u8]>,
+#[fixed_layout]
+pub struct DepositAndDelegateShuttleArgs {
+    pub shuttle_id: u32,
+    pub amount: u64,
+    pub validator: Option<[u8; 32]>,
 }
 
-impl DepositAndDelegateShuttleArgs<'_> {
+impl DepositAndDelegateShuttleArgsView<'_> {
     #[inline]
-    pub fn try_from_bytes(bytes: &[u8]) -> Result<DepositAndDelegateShuttleArgs<'_>, ProgramError> {
-        require!(
-            bytes.len() == 12 || bytes.len() == 44,
-            ProgramError::InvalidInstructionData
-        );
-
-        Ok(DepositAndDelegateShuttleArgs {
-            raw: bytes.as_ptr(),
-            len: bytes.len(),
-            _data: PhantomData,
-        })
-    }
-
-    #[inline]
-    pub fn shuttle_id(&self) -> u32 {
-        let mut buf = [0u8; 4];
-        unsafe {
-            core::ptr::copy_nonoverlapping(self.raw, buf.as_mut_ptr(), 4);
-        }
-        u32::from_le_bytes(buf)
-    }
-
-    #[inline]
-    pub fn amount(&self) -> u64 {
-        let mut buf = [0u8; 8];
-        unsafe {
-            core::ptr::copy_nonoverlapping(self.raw.add(4), buf.as_mut_ptr(), 8);
-        }
-        u64::from_le_bytes(buf)
-    }
-
-    #[inline]
-    pub fn validator(&self) -> Option<[u8; 32]> {
-        if self.len == 12 {
-            return None;
-        }
-
-        let mut validator = [0u8; 32];
-        unsafe {
-            core::ptr::copy_nonoverlapping(self.raw.add(12), validator.as_mut_ptr(), 32);
-        }
-        Some(validator)
-    }
-
-    #[inline]
-    pub(crate) fn common_args(&self) -> DepositAndDelegateShuttleCommonArgs {
+    pub(crate) fn common_args(&self) -> DepositAndDelegateShuttleCommonArgs<'_> {
         DepositAndDelegateShuttleCommonArgs {
             shuttle_id: self.shuttle_id(),
             amount: self.amount(),
@@ -141,7 +86,7 @@ impl DepositAndDelegateShuttleArgs<'_> {
 
 pub(crate) fn process_deposit_and_delegate_shuttle_ephemeral_ata_with_post_actions(
     accounts: &DepositAndDelegateShuttleAccounts<'_>,
-    args: DepositAndDelegateShuttleCommonArgs,
+    args: DepositAndDelegateShuttleCommonArgs<'_>,
     extra_setup_lamports: u64,
     post_actions: PostDelegationActions,
 ) -> ProgramResult {
@@ -376,7 +321,7 @@ pub(crate) fn delegate_sponsored_shuttle_with_post_actions(
 
     let seeds: &[&[u8]] = &[shuttle_info.address().as_ref(), mint.as_ref()];
     let config = DelegateConfig {
-        validator: args.validator.map(Address::new_from_array),
+        validator: args.validator.map(|slice| Address::new_from_array(*slice)),
         ..DelegateConfig::default()
     };
 
diff --git a/e-token/src/processor/mod.rs b/e-token/src/processor/mod.rs
@@ -35,6 +35,8 @@ pub(crate) mod utils;
 pub mod withdraw_spl_tokens;
 pub mod withdraw_through_delegated_shuttle_with_merge;
 
+pub use internal::DepositAndDelegateShuttleArgs;
+
 pub use allocate_transfer_queue::process_allocate_transfer_queue;
 pub use close_ephemeral_ata::process_close_ephemeral_ata;
 pub use close_lamports_pda_intent::process_close_lamports_pda_intent;
diff --git a/e-token/src/processor/withdraw_through_delegated_shuttle_with_merge.rs b/e-token/src/processor/withdraw_through_delegated_shuttle_with_merge.rs
@@ -83,7 +83,7 @@ pub fn process_withdraw_through_delegated_shuttle_with_merge(
         token_program_info,
     ] = require_n_accounts!(accounts, 16);
 
-    let args = DepositAndDelegateShuttleArgs::try_from_bytes(instruction_data)?;
+    let args = DepositAndDelegateShuttleArgs::try_view_from(instruction_data)?;
 
     let accounts = WithdrawThroughDelegatedShuttleAccounts {
         payer_info,
diff --git a/e-token/tests/deposit_and_delegate_shuttle_ephemeral_ata_with_merge.rs b/e-token/tests/deposit_and_delegate_shuttle_ephemeral_ata_with_merge.rs
@@ -8,6 +8,7 @@ use ephemeral_spl_api::state::ephemeral_ata::EphemeralAta;
 use ephemeral_spl_api::state::load_initialized;
 use ephemeral_spl_api::state::shuttle_ephemeral_ata::ShuttleMetadata;
 use ephemeral_spl_api::ID as PROGRAM;
+use ephemeral_token_program::DepositAndDelegateShuttleArgs;
 use solana_account::Account;
 use solana_instruction::{AccountMeta, Instruction};
 use solana_program::rent::Rent;
@@ -153,12 +154,6 @@ async fn deposit_and_delegate_shuttle_ephemeral_ata_with_merge_deposits_and_stor
     let delegation_record_pda = delegation_record_pda_from_delegated_account(&shuttle_eata);
     let delegation_metadata_pda = delegation_metadata_pda_from_delegated_account(&shuttle_eata);
 
-    let mut delegate_data =
-        instruction::ESplInstruction::SetupAndDelegateShuttleEphemeralAtaWithMerge.to_vec();
-    delegate_data.extend_from_slice(&shuttle_id.to_le_bytes());
-    delegate_data.extend_from_slice(&DEPOSIT_AMOUNT.to_le_bytes());
-    delegate_data.extend_from_slice(&validator.to_bytes());
-
     let ix_delegate = Instruction {
         program_id: PROGRAM,
         accounts: vec![
@@ -182,7 +177,15 @@ async fn deposit_and_delegate_shuttle_ephemeral_ata_with_merge_deposits_and_stor
             AccountMeta::new(owner_source_ata, false),
             AccountMeta::new(vault_ata, false),
         ],
-        data: delegate_data,
+        data: instruction::ESplInstruction::SetupAndDelegateShuttleEphemeralAtaWithMerge.with_data(
+            &DepositAndDelegateShuttleArgs {
+                shuttle_id,
+                amount: DEPOSIT_AMOUNT,
+                validator: Some(validator.to_bytes()),
+            }
+            .encode()
+            .unwrap(),
+        ),
     };
 
     let tx_delegate = Transaction::new_signed_with_payer(
diff --git a/e-token/tests/withdraw_through_delegated_shuttle_with_merge.rs b/e-token/tests/withdraw_through_delegated_shuttle_with_merge.rs
@@ -12,6 +12,7 @@ use ephemeral_spl_api::{
     },
 };
 use ephemeral_spl_api::{state::load_initialized, ID as PROGRAM};
+use ephemeral_token_program::DepositAndDelegateShuttleArgs;
 use magicblock_magic_program_api::{
     args::{MagicIntentBundleArgs, UndelegateTypeArgs},
     instruction::MagicBlockInstruction,
@@ -250,12 +251,6 @@ async fn withdraw_through_delegated_shuttle_with_merge_stores_transfer_and_clean
         &ephemeral_spl_api::program::DELEGATION_PROGRAM_ID,
     );
 
-    let mut withdraw_data =
-        instruction::ESplInstruction::WithdrawThroughDelegatedShuttleWithMerge.to_vec();
-    withdraw_data.extend_from_slice(&shuttle_id.to_le_bytes());
-    withdraw_data.extend_from_slice(&TRANSFER_AMOUNT.to_le_bytes());
-    withdraw_data.extend_from_slice(&validator.to_bytes());
-
     let ix_withdraw = Instruction {
         program_id: PROGRAM,
         accounts: vec![
@@ -276,7 +271,15 @@ async fn withdraw_through_delegated_shuttle_with_merge_stores_transfer_and_clean
             AccountMeta::new_readonly(mint, false),
             AccountMeta::new_readonly(spl_token_interface::ID, false),
         ],
-        data: withdraw_data,
+        data: instruction::ESplInstruction::WithdrawThroughDelegatedShuttleWithMerge.with_data(
+            &DepositAndDelegateShuttleArgs {
+                shuttle_id,
+                amount: TRANSFER_AMOUNT,
+                validator: Some(validator.to_bytes()),
+            }
+            .encode()
+            .unwrap(),
+        ),
     };
 
     let tx_withdraw = Transaction::new_signed_with_payer(

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-use alloc::borrow::ToOwned;`
`2`	`1`	`#[cfg(feature = "logging")]`
`3`	`2`	`use alloc::string::ToString;`
`4`	`3`	`use alloc::vec::Vec;`
`@@ -202,11 +201,11 @@ pub struct DepositAndDelegateShuttleWithPrivateTransferArgs {`
`202`	`201`	`}`
`203`	`202`
`204`	`203`	`impl DepositAndDelegateShuttleWithPrivateTransferArgsView<'_> {`
`205`		`- fn common_args(&self) -> Result<DepositAndDelegateShuttleCommonArgs, ProgramError> {`
	`204`	`+ fn common_args(&self) -> Result<DepositAndDelegateShuttleCommonArgs<'_>, ProgramError> {`
`206`	`205`	`Ok(DepositAndDelegateShuttleCommonArgs {`
`207`	`206`	`shuttle_id: self.shuttle_id(),`
`208`	`207`	`amount: self.amount(),`
`209`		`- validator: self.validator().map(\|r\| r.to_owned()),`
	`208`	`+ validator: self.validator(),`
`210`	`209`	`})`
`211`	`210`	`}`
`212`	`211`	`}`