solana: reorg prepared order response schema

Author: a5-pickle

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

@@ -533,9 +533,9 @@ pub struct ClosePreparedOrderResponse<'info> {
         close = by,
         seeds = [
             PreparedOrderResponse::SEED_PREFIX,
-            order_response.fast_vaa_hash.as_ref()
+            order_response.seeds.fast_vaa_hash.as_ref()
         ],
-        bump = order_response.bump,
+        bump = order_response.seeds.bump,
     )]
     pub order_response: Box<Account<'info, PreparedOrderResponse>>,
 
@@ -553,7 +553,7 @@ pub struct ClosePreparedOrderResponse<'info> {
 
 impl<'info> VaaDigest for ClosePreparedOrderResponse<'info> {
     fn digest(&self) -> [u8; 32] {
-        self.order_response.fast_vaa_hash
+        self.order_response.seeds.fast_vaa_hash
     }
 }
 

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

@@ -1,7 +1,9 @@
 use crate::{
     composite::*,
     error::MatchingEngineError,
-    state::{Custodian, PreparedOrderResponse, PreparedOrderResponseInfo},
+    state::{
+        Custodian, PreparedOrderResponse, PreparedOrderResponseInfo, PreparedOrderResponseSeeds,
+    },
 };
 use anchor_lang::prelude::*;
 use anchor_spl::token;
@@ -209,9 +211,11 @@ fn handle_prepare_order_response_cctp(
     ctx.accounts
         .prepared_order_response
         .set_inner(PreparedOrderResponse {
-            bump: ctx.bumps.prepared_order_response,
-            info: PreparedOrderResponseInfo {
+            seeds: PreparedOrderResponseSeeds {
                 fast_vaa_hash: fast_vaa.digest().0,
+                bump: ctx.bumps.prepared_order_response,
+            },
+            info: PreparedOrderResponseInfo {
                 prepared_by: ctx.accounts.payer.key(),
                 source_chain: finalized_vaa.emitter_chain(),
                 base_fee: order_response.base_fee(),

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

@@ -37,9 +37,9 @@ pub struct SettleAuctionComplete<'info> {
         close = executor,
         seeds = [
             PreparedOrderResponse::SEED_PREFIX,
-            prepared_order_response.fast_vaa_hash.as_ref()
+            prepared_order_response.seeds.fast_vaa_hash.as_ref()
         ],
-        bump = prepared_order_response.bump,
+        bump = prepared_order_response.seeds.bump,
     )]
     prepared_order_response: Account<'info, PreparedOrderResponse>,
 
@@ -58,7 +58,7 @@ pub struct SettleAuctionComplete<'info> {
         mut,
         seeds = [
             Auction::SEED_PREFIX,
-            prepared_order_response.fast_vaa_hash.as_ref(),
+            prepared_order_response.seeds.fast_vaa_hash.as_ref(),
         ],
         bump = auction.bump,
     )]
@@ -96,8 +96,8 @@ fn handle_settle_auction_complete(
 
     let prepared_order_response_signer_seeds = &[
         PreparedOrderResponse::SEED_PREFIX,
-        prepared_order_response.fast_vaa_hash.as_ref(),
-        &[prepared_order_response.bump],
+        prepared_order_response.seeds.fast_vaa_hash.as_ref(),
+        &[prepared_order_response.seeds.bump],
     ];
 
     // We may deduct from this account if the winning participant was penalized.

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

@@ -57,7 +57,7 @@ pub struct SettleAuctionNoneCctp<'info> {
         space = 8 + Auction::INIT_SPACE_NO_AUCTION,
         seeds = [
             Auction::SEED_PREFIX,
-            prepared.order_response.fast_vaa_hash.as_ref(),
+            prepared.order_response.seeds.fast_vaa_hash.as_ref(),
         ],
         bump
     )]

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

@@ -46,7 +46,7 @@ pub struct SettleAuctionNoneLocal<'info> {
         space = 8 + Auction::INIT_SPACE_NO_AUCTION,
         seeds = [
             Auction::SEED_PREFIX,
-            prepared.order_response.fast_vaa_hash.as_ref(),
+            prepared.order_response.seeds.fast_vaa_hash.as_ref(),
         ],
         bump,
     )]

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

@@ -41,8 +41,8 @@ fn settle_none_and_prepare_fill(
 
     let prepared_order_response_signer_seeds = &[
         PreparedOrderResponse::SEED_PREFIX,
-        prepared_order_response.fast_vaa_hash.as_ref(),
-        &[prepared_order_response.bump],
+        prepared_order_response.seeds.fast_vaa_hash.as_ref(),
+        &[prepared_order_response.seeds.bump],
     ];
 
     // Pay the `fee_recipient` the base fee and init auction fee. This ensures that the protocol
@@ -83,7 +83,7 @@ fn settle_none_and_prepare_fill(
     // setting this could lead to trapped funds (which would require an upgrade to fix).
     auction.set_inner(Auction {
         bump: auction_bump_seed,
-        vaa_hash: prepared_order_response.fast_vaa_hash,
+        vaa_hash: prepared_order_response.seeds.fast_vaa_hash,
         vaa_timestamp: prepared_order_response.fast_vaa_timestamp,
         target_protocol: prepared_order_response.to_endpoint.protocol,
         status: AuctionStatus::Settled {

solana/programs/matching-engine/src/processor/fast_fill/reserve_sequence/no_auction.rs

@@ -16,7 +16,7 @@ pub struct ReserveFastFillSequenceNoAuction<'info> {
         constraint = {
             // Check association with fast order path.
             require!(
-                prepared_order_response.fast_vaa_hash
+                prepared_order_response.seeds.fast_vaa_hash
                     == reserve_sequence.fast_order_path.fast_vaa.load_unchecked().digest().0,
                 MatchingEngineError::VaaMismatch
             );
@@ -32,7 +32,7 @@ pub struct ReserveFastFillSequenceNoAuction<'info> {
     #[account(
         seeds = [
             Auction::SEED_PREFIX,
-            prepared_order_response.fast_vaa_hash.as_ref(),
+            prepared_order_response.seeds.fast_vaa_hash.as_ref(),
         ],
         bump,
         constraint = auction.data_is_empty() @ MatchingEngineError::AuctionExists,
@@ -48,7 +48,7 @@ pub fn reserve_fast_fill_sequence_no_auction(
     super::set_reserved_sequence_data(
         &mut ctx.accounts.reserve_sequence,
         &ctx.bumps.reserve_sequence,
-        prepared_order_response.fast_vaa_hash,
+        prepared_order_response.seeds.fast_vaa_hash,
         prepared_order_response.prepared_by,
     )
 }

solana/programs/matching-engine/src/state/prepared_order_response.rs

@@ -2,11 +2,14 @@ use anchor_lang::prelude::*;
 
 use super::EndpointInfo;
 
-// TODO: Change seeds
 #[derive(Debug, AnchorSerialize, AnchorDeserialize, Clone, InitSpace)]
-pub struct PreparedOrderResponseInfo {
+pub struct PreparedOrderResponseSeeds {
     pub fast_vaa_hash: [u8; 32],
+    pub bump: u8,
+}
 
+#[derive(Debug, AnchorSerialize, AnchorDeserialize, Clone, InitSpace)]
+pub struct PreparedOrderResponseInfo {
     pub prepared_by: Pubkey,
 
     pub fast_vaa_timestamp: u32,
@@ -21,7 +24,7 @@ pub struct PreparedOrderResponseInfo {
 #[account]
 #[derive(Debug)]
 pub struct PreparedOrderResponse {
-    pub bump: u8,
+    pub seeds: PreparedOrderResponseSeeds,
     pub info: PreparedOrderResponseInfo,
     pub to_endpoint: EndpointInfo,
     pub redeemer_message: Vec<u8>,
@@ -40,7 +43,7 @@ impl PreparedOrderResponse {
 
     pub fn compute_size(redeemer_message_len: usize) -> usize {
         const FIXED: usize = 8 // DISCRIMINATOR
-            + 1 // bump
+            + PreparedOrderResponseSeeds::INIT_SPACE
             + PreparedOrderResponseInfo::INIT_SPACE
             + EndpointInfo::INIT_SPACE
             + 4 // redeemer_message length

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

@@ -128,8 +128,6 @@ pub struct RedeemCctpFill<'info> {
             );
 
             // 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!(

solana/target/idl/matching_engine.json

@@ -3853,8 +3853,12 @@
         "kind": "struct",
         "fields": [
           {
-            "name": "bump",
-            "type": "u8"
+            "name": "seeds",
+            "type": {
+              "defined": {
+                "name": "PreparedOrderResponseSeeds"
+              }
+            }
           },
           {
             "name": "info",
@@ -3884,15 +3888,6 @@
       "type": {
         "kind": "struct",
         "fields": [
-          {
-            "name": "fast_vaa_hash",
-            "type": {
-              "array": [
-                "u8",
-                32
-              ]
-            }
-          },
           {
             "name": "prepared_by",
             "type": "pubkey"
@@ -3938,6 +3933,27 @@
         ]
       }
     },
+    {
+      "name": "PreparedOrderResponseSeeds",
+      "type": {
+        "kind": "struct",
+        "fields": [
+          {
+            "name": "fast_vaa_hash",
+            "type": {
+              "array": [
+                "u8",
+                32
+              ]
+            }
+          },
+          {
+            "name": "bump",
+            "type": "u8"
+          }
+        ]
+      }
+    },
     {
       "name": "Proposal",
       "type": {

solana/target/idl/token_router.json

@@ -819,8 +819,7 @@
           ]
         },
         {
-          "name": "matching_engine_custodian",
-          "writable": true
+          "name": "matching_engine_custodian"
         },
         {
           "name": "matching_engine_from_endpoint"

solana/target/types/matching_engine.ts

@@ -3859,8 +3859,12 @@ export type MatchingEngine = {
         "kind": "struct",
         "fields": [
           {
-            "name": "bump",
-            "type": "u8"
+            "name": "seeds",
+            "type": {
+              "defined": {
+                "name": "preparedOrderResponseSeeds"
+              }
+            }
           },
           {
             "name": "info",
@@ -3890,15 +3894,6 @@ export type MatchingEngine = {
       "type": {
         "kind": "struct",
         "fields": [
-          {
-            "name": "fastVaaHash",
-            "type": {
-              "array": [
-                "u8",
-                32
-              ]
-            }
-          },
           {
             "name": "preparedBy",
             "type": "pubkey"
@@ -3944,6 +3939,27 @@ export type MatchingEngine = {
         ]
       }
     },
+    {
+      "name": "preparedOrderResponseSeeds",
+      "type": {
+        "kind": "struct",
+        "fields": [
+          {
+            "name": "fastVaaHash",
+            "type": {
+              "array": [
+                "u8",
+                32
+              ]
+            }
+          },
+          {
+            "name": "bump",
+            "type": "u8"
+          }
+        ]
+      }
+    },
     {
       "name": "proposal",
       "type": {

solana/target/types/token_router.ts

@@ -825,8 +825,7 @@ export type TokenRouter = {
           ]
         },
         {
-          "name": "matchingEngineCustodian",
-          "writable": true
+          "name": "matchingEngineCustodian"
         },
         {
           "name": "matchingEngineFromEndpoint"

solana/ts/src/matchingEngine/index.ts

@@ -1513,13 +1513,11 @@ export class MatchingEngineProgram {
         let { auction, bestOfferToken } = accounts;
 
         if (auction === undefined) {
-            const {
-                info: { fastVaaHash },
-            } = await this.fetchPreparedOrderResponse({
+            const { seeds } = await this.fetchPreparedOrderResponse({
                 address: preparedOrderResponse,
             });
 
-            auction = this.auctionAddress(fastVaaHash);
+            auction = this.auctionAddress(seeds.fastVaaHash);
         }
 
         if (bestOfferToken === undefined) {

solana/ts/src/matchingEngine/state/PreparedOrderResponse.ts

@@ -3,9 +3,13 @@ import { PublicKey } from "@solana/web3.js";
 import { VaaHash } from "../../common";
 import { EndpointInfo } from "./RouterEndpoint";
 
+export type PreparedOrderResponseSeeds = {
+    fastVaaHash: Array<number>;
+    bump: number;
+};
+
 export type PreparedOrderResponseInfo = {
     preparedBy: PublicKey;
-    fastVaaHash: Array<number>;
     fastVaaTimestamp: number;
     sourceChain: number;
     baseFee: BN;
@@ -16,18 +20,18 @@ export type PreparedOrderResponseInfo = {
 };
 
 export class PreparedOrderResponse {
-    bump: number;
+    seeds: PreparedOrderResponseSeeds;
     info: PreparedOrderResponseInfo;
     toEndpoint: EndpointInfo;
     redeemerMessage: Buffer;
 
     constructor(
-        bump: number,
+        seeds: PreparedOrderResponseSeeds,
         info: PreparedOrderResponseInfo,
         toEndpoint: EndpointInfo,
         redeemerMessage: Buffer,
     ) {
-        this.bump = bump;
+        this.seeds = seeds;
         this.info = info;
         this.toEndpoint = toEndpoint;
         this.redeemerMessage = redeemerMessage;

solana/ts/tests/01__matchingEngine.ts

@@ -4672,7 +4672,7 @@ describe("Matching Engine", function () {
         const preparedOrderResponseData = await engine.fetchPreparedOrderResponse({
             address: preparedOrderResponse,
         });
-        const { bump } = preparedOrderResponseData;
+        const { seeds } = preparedOrderResponseData;
 
         const finalizedVaaAccount = await VaaAccount.fetch(connection, finalizedVaa);
         const { deposit } = LiquidityLayerMessage.decode(finalizedVaaAccount.payload());
@@ -4685,9 +4685,11 @@ describe("Matching Engine", function () {
 
         expect(preparedOrderResponseData).to.eql(
             new PreparedOrderResponse(
-                bump,
                 {
                     fastVaaHash: Array.from(fastVaaAccount.digest()),
+                    bump: seeds.bump,
+                },
+                {
                     preparedBy: accounts.payer,
                     fastVaaTimestamp: fastVaaAccount.timestamp(),
                     sourceChain: fastVaaAccount.emitterInfo().chain,