From fd730076aa14952d5ce4d7e44bde18c12705267d Mon Sep 17 00:00:00 2001
From: A5 Pickle <a5-pickle@users.noreply.github.com>
Date: Thu, 31 Oct 2024 14:08:52 -0500
Subject: [PATCH] solana: fix stack access violation

---
 solana/programs/token-router/src/composite/mod.rs           | 6 +++---
 .../programs/token-router/src/processor/redeem_fill/fast.rs | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/solana/programs/token-router/src/composite/mod.rs b/solana/programs/token-router/src/composite/mod.rs
index 9a442338..9d61b6ba 100644
--- a/solana/programs/token-router/src/composite/mod.rs
+++ b/solana/programs/token-router/src/composite/mod.rs
@@ -87,7 +87,7 @@ pub struct CheckedCustodian<'info> {
         seeds = [Custodian::SEED_PREFIX],
         bump = Custodian::BUMP,
     )]
-    pub custodian: Account<'info, Custodian>,
+    pub custodian: Box<Account<'info, Custodian>>,
 }
 
 impl<'info> Deref for CheckedCustodian<'info> {
@@ -128,7 +128,7 @@ pub struct OwnerOnlyMut<'info> {
         seeds = [Custodian::SEED_PREFIX],
         bump = Custodian::BUMP,
     )]
-    pub custodian: Account<'info, Custodian>,
+    pub custodian: Box<Account<'info, Custodian>>,
 }
 
 #[derive(Accounts)]
@@ -161,7 +161,7 @@ pub struct AdminMut<'info> {
         seeds = [Custodian::SEED_PREFIX],
         bump = Custodian::BUMP,
     )]
-    pub custodian: Account<'info, Custodian>,
+    pub custodian: Box<Account<'info, Custodian>>,
 }
 
 /// Registered router endpoint representing a foreign Token Router. This account may have a CCTP
diff --git a/solana/programs/token-router/src/processor/redeem_fill/fast.rs b/solana/programs/token-router/src/processor/redeem_fill/fast.rs
index cb8de64e..b06de243 100644
--- a/solana/programs/token-router/src/processor/redeem_fill/fast.rs
+++ b/solana/programs/token-router/src/processor/redeem_fill/fast.rs
@@ -25,7 +25,7 @@ pub struct RedeemFastFill<'info> {
         bump = fast_fill.seeds.bump,
         seeds::program = matching_engine_program,
     )]
-    fast_fill: Account<'info, FastFill>,
+    fast_fill: Box<Account<'info, FastFill>>,
 
     #[account(
         init_if_needed,
@@ -37,7 +37,7 @@ pub struct RedeemFastFill<'info> {
         ],
         bump,
     )]
-    prepared_fill: Account<'info, PreparedFill>,
+    prepared_fill: Box<Account<'info, PreparedFill>>,
 
     /// Mint recipient token account, which is encoded as the mint recipient in the CCTP message.
     /// The CCTP Token Messenger Minter program will transfer the amount encoded in the CCTP message