solana: add fill time (#146)

Co-authored-by: A5 Pickle <a5-pickle@users.noreply.github.com>

Author: a5-pickle

.github/workflows/solana.yml

@@ -44,7 +44,7 @@ jobs:
         run: make lint
         working-directory: ./solana
   make-anchor-build-idl:
-    name: make anchor-build-idl
+    name: make idl
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -56,8 +56,8 @@ jobs:
       - name: Set default Rust toolchain
         run: rustup default stable
         working-directory: ./solana
-      - name: make anchor-build-idl
-        run: make anchor-build-idl
+      - name: make idl
+        run: make idl
         working-directory: ./solana
   make-anchor-test:
     name: make anchor-test

solana/Makefile

@@ -25,7 +25,9 @@ clean:
 	anchor clean
 	rm -rf node_modules artifacts-mainnet artifacts-testnet artifacts-localnet ts/tests/artifacts
 
-node_modules: ../package-lock.json
+node_modules: ../node_modules
+
+../node_modules:
 	cd .. && npm ci
 
 .PHONY: cargo-test
@@ -53,16 +55,14 @@ anchor-test-setup: node_modules ts/tests/artifacts $(CLONED_MAINNET_PROGRAMS)
 	cp target/deploy/upgrade_manager.so ts/tests/artifacts/testnet_upgrade_manager.so
 	anchor build -- --features integration-test
 
-.PHONY: anchor-build-idl
-anchor-build-idl:
+.PHONY: idl
+idl:
 	anchor build -- --features localnet
-#	git diff --exit-code
-
-idl: anchor-build-idl
 	mkdir -p ts/src/idl/json
 	mkdir -p ts/src/idl/ts
 	cp -r target/idl/* ts/src/idl/json/
 	cp -r target/types/* ts/src/idl/ts/
+	git diff --exit-code
 
 $(BUILD_$(NETWORK)): cargo-test
 

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

@@ -9,7 +9,7 @@ pub struct CloseRedeemedFastFill<'info> {
     /// CHECK: Must equal the `prepared_by` field of the `fast_fill` account.
     #[account(
         mut,
-        address = fast_fill.prepared_by,
+        address = fast_fill.info.prepared_by,
     )]
     prepared_by: UncheckedAccount<'info>,
 

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

@@ -82,7 +82,7 @@ pub fn complete_fast_fill(ctx: Context<CompleteFastFill>) -> Result<()> {
 
     // Emit event that the fast fill is redeemed. Listeners can close this account.
     emit!(crate::events::FastFillRedeemed {
-        prepared_by: ctx.accounts.fast_fill.prepared_by,
+        prepared_by: ctx.accounts.fast_fill.info.prepared_by,
         fast_fill: ctx.accounts.fast_fill.key(),
     });
 

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

@@ -9,24 +9,44 @@ use common::messages::Fill;
 
 #[derive(Debug, AnchorSerialize, AnchorDeserialize, Clone, Copy, InitSpace)]
 pub struct FastFillInfo {
+    /// Who paid the lamports to create the [FastFill] account.
+    pub prepared_by: Pubkey,
+
+    /// Fill amount.
     pub amount: u64,
+
+    /// Authority allowed to redeem [FastFill].
     pub redeemer: Pubkey,
+
+    /// Timestamp at the time a fill was issued. When the fast fill is created, it is set using the
+    /// current [Clock] unix timestamp.
+    pub timestamp: i64,
 }
 
 #[derive(Debug, AnchorSerialize, AnchorDeserialize, Clone, Copy, InitSpace)]
 pub struct FastFillSeeds {
+    /// Wormhole chain ID reflecting where the order was created.
     pub source_chain: u16,
+
+    /// Universal address of the order sender.
     pub order_sender: [u8; 32],
+
+    /// Sequence generated by the [FastFillSequencer](crate::state::FastFillSequencer) when it
+    /// reserved a sequence number for this fill.
     pub sequence: u64,
+
+    /// Bump seed for the [FastFill] account.
     pub bump: u8,
 }
 
 #[account]
 #[derive(Debug)]
 pub struct FastFill {
     pub seeds: FastFillSeeds,
-    pub prepared_by: Pubkey,
+
+    /// Whether the [FastFill] has been redeemed via the local Token Router.
     pub redeemed: bool,
+
     pub info: FastFillInfo,
     pub redeemer_message: Vec<u8>,
 }
@@ -37,7 +57,6 @@ impl FastFill {
     pub(crate) fn checked_compute_size(redeemer_message_len: usize) -> Option<usize> {
         const FIXED: usize = 8 // DISCRIMINATOR
         + FastFillSeeds::INIT_SPACE
-        + 32 // prepared_by
         + 1 // redeemed
         + FastFillInfo::INIT_SPACE
         + 4 // redeemer_message len
@@ -62,11 +81,12 @@ impl FastFill {
                 sequence,
                 bump,
             },
-            prepared_by,
             redeemed: Default::default(),
             info: FastFillInfo {
+                prepared_by,
                 amount,
                 redeemer: Pubkey::from(redeemer),
+                timestamp: Clock::get().unwrap().unix_timestamp,
             },
             redeemer_message: redeemer_message.into(),
         }

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

@@ -262,6 +262,7 @@ fn handle_redeem_fill_cctp(ctx: Context<RedeemCctpFill>, args: CctpMessageArgs)
             fill_type: FillType::WormholeCctpDeposit,
             source_chain: fill.source_chain(),
             order_sender: fill.order_sender(),
+            timestamp: vaa.timestamp().into(),
         },
         redeemer_message: fill.message_to_vec(),
     });

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

@@ -134,6 +134,7 @@ fn handle_redeem_fast_fill(ctx: Context<RedeemFastFill>) -> Result<()> {
             fill_type: FillType::FastFill,
             source_chain: fast_fill.seeds.source_chain,
             order_sender: fast_fill.seeds.order_sender,
+            timestamp: fast_fill.info.timestamp,
         },
         redeemer_message,
     });

solana/programs/token-router/src/state/prepared_fill.rs

@@ -15,15 +15,31 @@ pub struct PreparedFillSeeds {
 
 #[derive(Debug, AnchorSerialize, AnchorDeserialize, Clone, InitSpace)]
 pub struct PreparedFillInfo {
+    /// Bump seed for the custody token account associated with [PreparedFill].
     pub prepared_custody_token_bump: u8,
 
+    /// Who paid the lamports to create the [PreparedFill] account.
     pub prepared_by: Pubkey,
 
+    /// NOTE: If [FillType::Unset], the [PreparedFill] account is invalid.
     pub fill_type: FillType,
 
+    /// Wormhole chain ID reflecting where the order was created.
     pub source_chain: u16,
+
+    /// Universal address of the order sender.
     pub order_sender: [u8; 32],
+
+    /// Authority allowed to redeem [PreparedFill].
     pub redeemer: Pubkey,
+
+    /// Timestamp at the time a fill was issued. This time will either be a VAA time for a direct
+    /// fill from another Token Router or timestamp from [matching_engine::state::FastFill] as a
+    /// result of a market order.
+    ///
+    /// NOTE: This timestamp is not used by the Token Router. It only provides more information for
+    /// an integrator so he can perform special handling based on when the fill happened.
+    pub timestamp: i64,
 }
 
 #[account]
@@ -40,12 +56,7 @@ impl PreparedFill {
     pub fn checked_compute_size(payload_len: usize) -> Option<usize> {
         const FIXED: usize = 8 // DISCRIMINATOR
             + PreparedFillSeeds::INIT_SPACE
-            + 1 // prepared_custody_token_bump
-            + 32 // prepared_by
-            + FillType::INIT_SPACE
-            + 2 // source_chain
-            + 32 // order_sender
-            + 32 // redeemer
+            + PreparedFillInfo::INIT_SPACE
             + 4 // payload len
         ;
 

solana/ts/src/idl/json/matching_engine.json

@@ -3360,7 +3360,7 @@
             "docs": [
               "Length of the redeemer message, which may impact the expense to execute the auction."
             ],
-            "type": "u32"
+            "type": "u16"
           },
           {
             "name": "destination_asset_info",
@@ -3556,7 +3556,7 @@
           },
           {
             "name": "redeemer_message_len",
-            "type": "u32"
+            "type": "u16"
           },
           {
             "name": "end_slot",
@@ -3732,12 +3732,11 @@
               }
             }
           },
-          {
-            "name": "prepared_by",
-            "type": "pubkey"
-          },
           {
             "name": "redeemed",
+            "docs": [
+              "Whether the [FastFill] has been redeemed via the local Token Router."
+            ],
             "type": "bool"
           },
           {
@@ -3760,13 +3759,34 @@
       "type": {
         "kind": "struct",
         "fields": [
+          {
+            "name": "prepared_by",
+            "docs": [
+              "Who paid the lamports to create the [FastFill] account."
+            ],
+            "type": "pubkey"
+          },
           {
             "name": "amount",
+            "docs": [
+              "Fill amount."
+            ],
             "type": "u64"
           },
           {
             "name": "redeemer",
+            "docs": [
+              "Authority allowed to redeem [FastFill]."
+            ],
             "type": "pubkey"
+          },
+          {
+            "name": "timestamp",
+            "docs": [
+              "Timestamp at the time a fill was issued. When the fast fill is created, it is set using the",
+              "current [Clock] unix timestamp."
+            ],
+            "type": "i64"
           }
         ]
       }
@@ -3794,10 +3814,16 @@
         "fields": [
           {
             "name": "source_chain",
+            "docs": [
+              "Wormhole chain ID reflecting where the order was created."
+            ],
             "type": "u16"
           },
           {
             "name": "order_sender",
+            "docs": [
+              "Universal address of the order sender."
+            ],
             "type": {
               "array": [
                 "u8",
@@ -3807,10 +3833,17 @@
           },
           {
             "name": "sequence",
+            "docs": [
+              "Sequence generated by the [FastFillSequencer](crate::state::FastFillSequencer) when it",
+              "reserved a sequence number for this fill."
+            ],
             "type": "u64"
           },
           {
             "name": "bump",
+            "docs": [
+              "Bump seed for the [FastFill] account."
+            ],
             "type": "u8"
           }
         ]