solana: fix comment; move constraint

Author: a5-pickle

solana/programs/token-router/src/processor/redeem_fill/cctp.rs

@@ -95,7 +95,7 @@ pub struct RedeemCctpFill<'info> {
     /// The CCTP Token Messenger Minter program will transfer the amount encoded in the CCTP message
     /// from its custody account to this account.
     ///
-    /// CHECK: Mutable. Seeds must be \["custody"\].
+    /// CHECK: Mutable. Seeds must be \["custody"\, prepared_fill.key()].
     #[account(
         init_if_needed,
         payer = payer,
@@ -122,8 +122,28 @@ pub struct RedeemCctpFill<'info> {
         bump = router_endpoint.bump,
         seeds::program = matching_engine::id(),
         constraint = {
-            router_endpoint.protocol != matching_engine::state::MessageProtocol::None
-        } @ TokenRouterError::EndpointDisabled,
+            require!(
+                router_endpoint.protocol != matching_engine::state::MessageProtocol::None,
+                TokenRouterError::EndpointDisabled
+            );
+
+            // Validate that this message originated from a registered emitter.
+            //
+            // TODO: Put into account context.
+            let endpoint = &router_endpoint;
+            let emitter = fill_vaa.load_unchecked().emitter_info();
+            require_eq!(
+                emitter.chain,
+                endpoint.chain,
+                TokenRouterError::InvalidSourceRouter
+            );
+            require!(
+                emitter.address == endpoint.address,
+                TokenRouterError::InvalidSourceRouter
+            );
+
+            true
+        }
     )]
     router_endpoint: Box<Account<'info, matching_engine::state::RouterEndpoint>>,
 
@@ -218,21 +238,6 @@ fn handle_redeem_fill_cctp(ctx: Context<RedeemCctpFill>, args: CctpMessageArgs)
         },
     )?;
 
-    // Validate that this message originated from a registered emitter.
-    //
-    // TODO: Put into account context.
-    let endpoint = &ctx.accounts.router_endpoint;
-    let emitter = vaa.emitter_info();
-    require_eq!(
-        emitter.chain,
-        endpoint.chain,
-        TokenRouterError::InvalidSourceRouter
-    );
-    require!(
-        emitter.address == endpoint.address,
-        TokenRouterError::InvalidSourceRouter
-    );
-
     // Wormhole CCTP deposit should be ours, so make sure this is a fill we recognize.
     let deposit = LiquidityLayerMessage::try_from(vaa.payload())
         .unwrap()

solana/programs/token-router/src/processor/redeem_fill/fast.rs

@@ -45,7 +45,7 @@ pub struct RedeemFastFill<'info> {
     /// The CCTP Token Messenger Minter program will transfer the amount encoded in the CCTP message
     /// from its custody account to this account.
     ///
-    /// CHECK: Mutable. Seeds must be \["custody"\].
+    /// CHECK: Mutable. Seeds must be \["custody"\, prepared_fill.key()].
     #[account(
         init_if_needed,
         payer = payer,
@@ -62,7 +62,6 @@ pub struct RedeemFastFill<'info> {
     usdc: Usdc<'info>,
 
     /// CHECK: Seeds must be \["emitter"] (Matching Engine program).
-    #[account(mut)]
     matching_engine_custodian: UncheckedAccount<'info>,
 
     /// CHECK: Seeds must be \["endpoint", source_chain.to_be_bytes()\] (Matching Engine program).