solana: fix lamport beneficiaries

solana/.gitignore

@@ -1,5 +1,6 @@
 .anchor
 .env
+.validator_pid
 **/*.rs.bk
 /artifacts-*
 /cfg/**/*.json

solana/programs/matching-engine/src/composite/mod.rs

@@ -380,6 +380,11 @@ pub struct ExecuteOrder<'info> {
         address = active_auction.info.as_ref().unwrap().initial_offer_token,
     )]
     pub initial_offer_token: UncheckedAccount<'info>,
+
+    /// CHECK: Must be the owner of initial offer token account. If the initial offer token account
+    /// does not exist anymore, we will attempt to perform this check.
+    #[account(mut)]
+    pub initial_participant: UncheckedAccount<'info>,
 }
 
 #[derive(Accounts)]

solana/programs/matching-engine/src/processor/auction/execute_fast_order/cctp.rs

@@ -79,6 +79,7 @@ pub fn handle_execute_fast_order_cctp(
     let super::PreparedOrderExecution {
         user_amount: amount,
         fill,
+        beneficiary,
     } = super::prepare_order_execution(super::PrepareFastExecution {
         execute_order: &mut ctx.accounts.execute_order,
         custodian: &ctx.accounts.custodian,
@@ -187,7 +188,7 @@ pub fn handle_execute_fast_order_cctp(
         token_program.to_account_info(),
         token::CloseAccount {
             account: auction_custody_token.to_account_info(),
-            destination: payer.to_account_info(),
+            destination: beneficiary.unwrap_or(payer.to_account_info()),
             authority: custodian.to_account_info(),
         },
         &[Custodian::SIGNER_SEEDS],

solana/programs/matching-engine/src/processor/auction/execute_fast_order/local.rs

@@ -60,6 +60,7 @@ pub fn execute_fast_order_local(ctx: Context<ExecuteFastOrderLocal>) -> Result<(
     let super::PreparedOrderExecution {
         user_amount: amount,
         fill,
+        beneficiary,
     } = super::prepare_order_execution(super::PrepareFastExecution {
         execute_order: &mut ctx.accounts.execute_order,
         custodian,
@@ -108,7 +109,7 @@ pub fn execute_fast_order_local(ctx: Context<ExecuteFastOrderLocal>) -> Result<(
         token_program.to_account_info(),
         token::CloseAccount {
             account: auction_custody_token.to_account_info(),
-            destination: payer.to_account_info(),
+            destination: beneficiary.unwrap_or(payer.to_account_info()),
             authority: custodian.to_account_info(),
         },
         &[Custodian::SIGNER_SEEDS],

solana/programs/matching-engine/src/processor/auction/execute_fast_order/mod.rs

@@ -23,38 +23,36 @@ struct PrepareFastExecution<'ctx, 'info> {
     token_program: &'ctx Program<'info, token::Token>,
 }
 
-struct PreparedOrderExecution {
+struct PreparedOrderExecution<'info> {
     pub user_amount: u64,
     pub fill: Fill,
+    pub beneficiary: Option<AccountInfo<'info>>,
 }
 
-fn prepare_order_execution(accounts: PrepareFastExecution) -> Result<PreparedOrderExecution> {
+fn prepare_order_execution<'info>(
+    accounts: PrepareFastExecution<'_, 'info>,
+) -> Result<PreparedOrderExecution<'info>> {
     let PrepareFastExecution {
         execute_order,
         custodian,
         token_program,
     } = accounts;
 
-    let ExecuteOrder {
-        fast_vaa,
-        active_auction,
-        executor_token,
-        initial_offer_token,
-    } = execute_order;
-
-    let ActiveAuction {
-        auction,
-        custody_token,
-        config,
-        best_offer_token,
-    } = active_auction;
+    let auction = &mut execute_order.active_auction.auction;
+    let fast_vaa = &execute_order.fast_vaa;
+    let custody_token = &execute_order.active_auction.custody_token;
+    let config = &execute_order.active_auction.config;
+    let executor_token = &execute_order.executor_token;
+    let best_offer_token = &execute_order.active_auction.best_offer_token;
+    let initial_offer_token = &execute_order.initial_offer_token;
+    let initial_participant = &execute_order.initial_participant;
 
     let vaa = fast_vaa.load_unchecked();
     let order = LiquidityLayerMessage::try_from(vaa.payload())
         .unwrap()
         .to_fast_market_order_unchecked();
 
-    let (user_amount, new_status) = {
+    let (user_amount, new_status, beneficiary) = {
         let auction_info = auction.info.as_ref().unwrap();
 
         let current_slot = Clock::get().unwrap().slot;
@@ -98,9 +96,25 @@ fn prepare_order_execution(accounts: PrepareFastExecution) -> Result<PreparedOrd
             deposit_and_fee = deposit_and_fee.saturating_sub(penalty);
         }
 
+        let mut beneficiary = None;
+
         // If the initial offer token account doesn't exist anymore, we have nowhere to send the
         // init auction fee. The executor will get these funds instead.
         if !initial_offer_token.data_is_empty() {
+            // Deserialize to token account to find owner. We know this is a legitimate token
+            // account, so it is safe to borrow and unwrap here.
+            {
+                let mut acc_data: &[_] = &initial_offer_token.data.borrow();
+                let token_data = token::TokenAccount::try_deserialize(&mut acc_data).unwrap();
+                require_keys_eq!(
+                    token_data.owner,
+                    initial_participant.key(),
+                    ErrorCode::ConstraintTokenOwner
+                );
+
+                beneficiary.replace(initial_participant.to_account_info());
+            }
+
             if best_offer_token.key() != initial_offer_token.key() {
                 // Pay the auction initiator their fee.
                 token::transfer(
@@ -218,6 +232,7 @@ fn prepare_order_execution(accounts: PrepareFastExecution) -> Result<PreparedOrd
                 slot: current_slot,
                 execute_penalty: if penalized { Some(penalty) } else { None },
             },
+            beneficiary,
         )
     };
 
@@ -235,5 +250,6 @@ fn prepare_order_execution(accounts: PrepareFastExecution) -> Result<PreparedOrd
                 .try_into()
                 .map_err(|_| MatchingEngineError::RedeemerMessageTooLarge)?,
         },
+        beneficiary,
     })
 }

solana/programs/matching-engine/src/processor/auction/settle/none/cctp.rs

@@ -84,6 +84,7 @@ fn handle_settle_auction_none_cctp(
     ctx: Context<SettleAuctionNoneCctp>,
     destination_cctp_domain: u32,
 ) -> Result<()> {
+    let prepared_by = &ctx.accounts.prepared.by;
     let prepared_custody_token = &ctx.accounts.prepared.custody_token;
     let custodian = &ctx.accounts.custodian;
     let token_program = &ctx.accounts.token_program;
@@ -206,7 +207,7 @@ fn handle_settle_auction_none_cctp(
         token_program.to_account_info(),
         token::CloseAccount {
             account: prepared_custody_token.to_account_info(),
-            destination: payer.to_account_info(),
+            destination: prepared_by.to_account_info(),
             authority: custodian.to_account_info(),
         },
         &[Custodian::SIGNER_SEEDS],

solana/programs/matching-engine/src/processor/auction/settle/none/local.rs

@@ -70,6 +70,7 @@ pub struct SettleAuctionNoneLocal<'info> {
 }
 
 pub fn settle_auction_none_local(ctx: Context<SettleAuctionNoneLocal>) -> Result<()> {
+    let prepared_by = &ctx.accounts.prepared.by;
     let prepared_custody_token = &ctx.accounts.prepared.custody_token;
     let custodian = &ctx.accounts.custodian;
     let token_program = &ctx.accounts.token_program;
@@ -124,7 +125,7 @@ pub fn settle_auction_none_local(ctx: Context<SettleAuctionNoneLocal>) -> Result
         token_program.to_account_info(),
         token::CloseAccount {
             account: prepared_custody_token.to_account_info(),
-            destination: payer.to_account_info(),
+            destination: prepared_by.to_account_info(),
             authority: custodian.to_account_info(),
         },
         &[Custodian::SIGNER_SEEDS],

solana/programs/token-router/src/processor/market_order/place_cctp.rs

@@ -290,7 +290,7 @@ fn handle_place_market_order_cctp(
         token_program.to_account_info(),
         token::CloseAccount {
             account: prepared_custody_token.to_account_info(),
-            destination: payer.to_account_info(),
+            destination: ctx.accounts.prepared_by.to_account_info(),
             authority: custodian.to_account_info(),
         },
         &[Custodian::SIGNER_SEEDS],

solana/target/idl/matching_engine.json

@@ -643,6 +643,13 @@
             {
               "name": "initial_offer_token",
               "writable": true
+            },
+            {
+              "name": "initial_participant",
+              "docs": [
+                "does not exist anymore, we will attempt to perform this check."
+              ],
+              "writable": true
             }
           ]
         },
@@ -831,6 +838,13 @@
             {
               "name": "initial_offer_token",
               "writable": true
+            },
+            {
+              "name": "initial_participant",
+              "docs": [
+                "does not exist anymore, we will attempt to perform this check."
+              ],
+              "writable": true
             }
           ]
         },

solana/target/types/matching_engine.ts

@@ -649,6 +649,13 @@ export type MatchingEngine = {
             {
               "name": "initialOfferToken",
               "writable": true
+            },
+            {
+              "name": "initialParticipant",
+              "docs": [
+                "does not exist anymore, we will attempt to perform this check."
+              ],
+              "writable": true
             }
           ]
         },
@@ -837,6 +844,13 @@ export type MatchingEngine = {
             {
               "name": "initialOfferToken",
               "writable": true
+            },
+            {
+              "name": "initialParticipant",
+              "docs": [
+                "does not exist anymore, we will attempt to perform this check."
+              ],
+              "writable": true
             }
           ]
         },

solana/ts/src/matchingEngine/index.ts

@@ -1704,26 +1704,29 @@ export class MatchingEngineProgram {
             auctionConfig?: PublicKey;
             bestOfferToken?: PublicKey;
             initialOfferToken?: PublicKey;
+            initialParticipant?: PublicKey;
         },
         opts: {
             targetChain?: wormholeSdk.ChainId;
         } = {},
     ) {
+        const connection = this.program.provider.connection;
+
         const { payer, fastVaa, auctionConfig, bestOfferToken } = accounts;
 
-        let { auction, executorToken, initialOfferToken } = accounts;
+        let { auction, executorToken, initialOfferToken, initialParticipant } = accounts;
         let { targetChain } = opts;
 
         executorToken ??= splToken.getAssociatedTokenAddressSync(this.mint, payer);
 
         let fastVaaAccount: VaaAccount | undefined;
         if (auction === undefined) {
-            fastVaaAccount = await VaaAccount.fetch(this.program.provider.connection, fastVaa);
+            fastVaaAccount = await VaaAccount.fetch(connection, fastVaa);
             auction = this.auctionAddress(fastVaaAccount.digest());
         }
 
         if (targetChain === undefined) {
-            fastVaaAccount ??= await VaaAccount.fetch(this.program.provider.connection, fastVaa);
+            fastVaaAccount ??= await VaaAccount.fetch(connection, fastVaa);
 
             const { fastMarketOrder } = LiquidityLayerMessage.decode(fastVaaAccount.payload());
             if (fastMarketOrder === undefined) {
@@ -1742,6 +1745,11 @@ export class MatchingEngineProgram {
             initialOfferToken = info.initialOfferToken;
         }
 
+        if (initialParticipant === undefined) {
+            const token = await splToken.getAccount(connection, initialOfferToken);
+            initialParticipant = token.owner;
+        }
+
         const {
             custodian,
             routerEndpoint: toRouterEndpoint,
@@ -1781,6 +1789,7 @@ export class MatchingEngineProgram {
                     ),
                     executorToken,
                     initialOfferToken,
+                    initialParticipant,
                 },
                 toRouterEndpoint: this.routerEndpointComposite(toRouterEndpoint),
                 custodian: this.checkedCustodianComposite(custodian),
@@ -1818,21 +1827,25 @@ export class MatchingEngineProgram {
             auctionConfig?: PublicKey;
             bestOfferToken?: PublicKey;
             initialOfferToken?: PublicKey;
+            initialParticipant?: PublicKey;
             toRouterEndpoint?: PublicKey;
         },
         opts: {
             sourceChain?: wormholeSdk.ChainId;
         } = {},
     ) {
+        const connection = this.program.provider.connection;
+
         const { payer, fastVaa, auctionConfig, bestOfferToken } = accounts;
 
-        let { auction, executorToken, toRouterEndpoint, initialOfferToken } = accounts;
+        let { auction, executorToken, toRouterEndpoint, initialOfferToken, initialParticipant } =
+            accounts;
         let { sourceChain } = opts;
         executorToken ??= splToken.getAssociatedTokenAddressSync(this.mint, payer);
         toRouterEndpoint ??= this.routerEndpointAddress(wormholeSdk.CHAIN_ID_SOLANA);
 
         if (auction === undefined) {
-            const vaaAccount = await VaaAccount.fetch(this.program.provider.connection, fastVaa);
+            const vaaAccount = await VaaAccount.fetch(connection, fastVaa);
             auction = this.auctionAddress(vaaAccount.digest());
         }
 
@@ -1852,6 +1865,11 @@ export class MatchingEngineProgram {
             initialOfferToken ??= auctionInfo.initialOfferToken;
         }
 
+        if (initialParticipant === undefined) {
+            const token = await splToken.getAccount(connection, initialOfferToken);
+            initialParticipant = token.owner;
+        }
+
         const {
             custodian,
             coreMessage,
@@ -1879,6 +1897,7 @@ export class MatchingEngineProgram {
                     ),
                     executorToken,
                     initialOfferToken,
+                    initialParticipant,
                 },
                 toRouterEndpoint: this.routerEndpointComposite(toRouterEndpoint),
                 wormhole: {

solana/ts/tests/01__matchingEngine.ts

@@ -2544,6 +2544,7 @@ describe("Matching Engine", function () {
                 const ix = await engine.executeFastOrderCctpIx({
                     payer: liquidator.publicKey,
                     fastVaa,
+                    initialParticipant: payer.publicKey,
                 });
 
                 const computeIx = ComputeBudgetProgram.setComputeUnitLimit({