solana: add close_redeemed_fast_fill ix

Author: a5-pickle

solana/programs/matching-engine/src/error.rs

@@ -78,6 +78,7 @@ pub enum MatchingEngineError {
     AuctionConfigNotRequired = 0x430,
     BestOfferTokenNotRequired = 0x431,
     FastFillAlreadyRedeemed = 0x434,
+    FastFillNotRedeemed = 0x435,
 
     CannotCloseAuctionYet = 0x500,
     AuctionHistoryNotFull = 0x502,

solana/programs/matching-engine/src/lib.rs

@@ -428,6 +428,16 @@ pub mod matching_engine {
     ) -> Result<()> {
         processor::reserve_fast_fill_sequence_no_auction(ctx)
     }
+
+    /// This instruction is used to return lamports to the creator of the `FastFill` account only
+    /// when this fill was redeemed via the Token Router program.
+    ///
+    /// # Arguments
+    ///
+    /// * `ctx` - `CloseRedeemedFastFill` context.
+    pub fn close_redeemed_fast_fill(ctx: Context<CloseRedeemedFastFill>) -> Result<()> {
+        processor::close_redeemed_fast_fill(ctx)
+    }
 }
 
 #[cfg(test)]

solana/programs/matching-engine/src/processor/fast_fill/close_redeemed.rs

@@ -0,0 +1,19 @@
+use crate::{error::MatchingEngineError, state::FastFill};
+use anchor_lang::prelude::*;
+
+#[derive(Accounts)]
+pub struct CloseRedeemedFastFill<'info> {
+    #[account(mut)]
+    prepared_by: Signer<'info>,
+
+    #[account(
+        mut,
+        close = prepared_by,
+        constraint = !fast_fill.redeemed @ MatchingEngineError::FastFillNotRedeemed,
+    )]
+    fast_fill: Account<'info, FastFill>,
+}
+
+pub fn close_redeemed_fast_fill(_ctx: Context<CloseRedeemedFastFill>) -> Result<()> {
+    Ok(())
+}

solana/programs/matching-engine/src/processor/fast_fill/complete.rs

@@ -10,8 +10,15 @@ use common::wormhole_cctp_solana::wormhole::SOLANA_CHAIN;
 /// Accounts required for [complete_fast_fill].
 #[derive(Accounts)]
 pub struct CompleteFastFill<'info> {
+    /// Custodian, which may be used in the future.
     custodian: CheckedCustodian<'info>,
 
+    /// Fast fill account.
+    ///
+    /// NOTE: This account may have been closed if the fast fill was already redeemed, so this
+    /// deserialization will fail in this case.
+    ///
+    /// Seeds must be \["fast-fill", source_chain, order_sender, sequence\].
     #[account(
         mut,
         seeds = [

solana/programs/matching-engine/src/processor/fast_fill/mod.rs

@@ -1,3 +1,6 @@
+mod close_redeemed;
+pub use close_redeemed::*;
+
 mod complete;
 pub use complete::*;
 

solana/target/idl/matching_engine.json

@@ -320,6 +320,39 @@
       ],
       "args": []
     },
+    {
+      "name": "close_redeemed_fast_fill",
+      "docs": [
+        "This instruction is used to return lamports to the creator of the `FastFill` account only",
+        "when this fill was redeemed via the Token Router program.",
+        "",
+        "# Arguments",
+        "",
+        "* `ctx` - `CloseRedeemedFastFill` context."
+      ],
+      "discriminator": [
+        44,
+        104,
+        207,
+        178,
+        224,
+        7,
+        28,
+        219
+      ],
+      "accounts": [
+        {
+          "name": "prepared_by",
+          "writable": true,
+          "signer": true
+        },
+        {
+          "name": "fast_fill",
+          "writable": true
+        }
+      ],
+      "args": []
+    },
     {
       "name": "complete_fast_fill",
       "docs": [
@@ -353,6 +386,14 @@
         },
         {
           "name": "fast_fill",
+          "docs": [
+            "Fast fill account.",
+            "",
+            "NOTE: This account may have been closed if the fast fill was already redeemed, so this",
+            "deserialization will fail in this case.",
+            "",
+            "Seeds must be \\[\"fast-fill\", source_chain, order_sender, sequence\\]."
+          ],
           "writable": true
         },
         {
@@ -2955,6 +2996,10 @@
       "code": 7076,
       "name": "FastFillAlreadyRedeemed"
     },
+    {
+      "code": 7077,
+      "name": "FastFillNotRedeemed"
+    },
     {
       "code": 7280,
       "name": "CannotCloseAuctionYet"

solana/target/types/matching_engine.ts

@@ -326,6 +326,39 @@ export type MatchingEngine = {
       ],
       "args": []
     },
+    {
+      "name": "closeRedeemedFastFill",
+      "docs": [
+        "This instruction is used to return lamports to the creator of the `FastFill` account only",
+        "when this fill was redeemed via the Token Router program.",
+        "",
+        "# Arguments",
+        "",
+        "* `ctx` - `CloseRedeemedFastFill` context."
+      ],
+      "discriminator": [
+        44,
+        104,
+        207,
+        178,
+        224,
+        7,
+        28,
+        219
+      ],
+      "accounts": [
+        {
+          "name": "preparedBy",
+          "writable": true,
+          "signer": true
+        },
+        {
+          "name": "fastFill",
+          "writable": true
+        }
+      ],
+      "args": []
+    },
     {
       "name": "completeFastFill",
       "docs": [
@@ -359,6 +392,14 @@ export type MatchingEngine = {
         },
         {
           "name": "fastFill",
+          "docs": [
+            "Fast fill account.",
+            "",
+            "NOTE: This account may have been closed if the fast fill was already redeemed, so this",
+            "deserialization will fail in this case.",
+            "",
+            "Seeds must be \\[\"fast-fill\", source_chain, order_sender, sequence\\]."
+          ],
           "writable": true
         },
         {
@@ -2961,6 +3002,10 @@ export type MatchingEngine = {
       "code": 7076,
       "name": "fastFillAlreadyRedeemed"
     },
+    {
+      "code": 7077,
+      "name": "fastFillNotRedeemed"
+    },
     {
       "code": 7280,
       "name": "cannotCloseAuctionYet"